[Libreoffice-commits] core.git: include/svx
include/svx/obj3d.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 166fe80d65f1d46e52d313cf8894d9604b6a2ab8 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 5 09:06:40 2014 +0100 -Werror,-Winconsistent-missing-override ...looks like loplugin:saloverride has problems detecting missing overrides in case of covariant return types Change-Id: I08f2f67a33cd1cfaf9308cd87d7a5f92203980ed diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index f370f20..b11f1d5 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -85,7 +85,7 @@ public: E3dObjList(SdrModel* pNewModel = 0, SdrPage* pNewPage = 0, E3dObjList* pNewUpList = 0); SVX_DLLPUBLIC virtual ~E3dObjList(); -virtual E3dObjList* Clone() const; +virtual E3dObjList* Clone() const SAL_OVERRIDE; virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=NULL) SAL_OVERRIDE; virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=NULL) SAL_OVERRIDE; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source include/editeng sw/source
editeng/source/items/textitem.cxx |9 +
include/editeng/postitem.hxx|2 ++
sw/source/core/docnode/nodedump.cxx | 20 +---
3 files changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 3434327a5f2559a6d24146b35236042fe8741038
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 5 09:07:36 2014 +0100
Factor out SvxPostureItem::dumpAsXml() from sw
Again, the motivation is that dumper for something in editeng should be
in that module as well, before home-grown dumpers are invented and
duplicated e.g. in all sw/sc/sd.
Change-Id: Icfeed9549efbd80226ff04e9070766188cc8646e
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index b4f5303..aa0e57c 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -93,6 +93,7 @@
#include editeng/charreliefitem.hxx
#include editeng/itemtype.hxx
#include editeng/eerdll.hxx
+#include libxml/xmlwriter.h
#define STORE_UNICODE_MAGIC_MARKER 0xFE331188
@@ -588,6 +589,14 @@ void SvxPostureItem::SetBoolValue( bool bVal )
SetValue( (sal_uInt16)(bVal ? ITALIC_NORMAL : ITALIC_NONE) );
}
+void SvxPostureItem::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST(svxPostureItem));
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST(whichId), %
SAL_PRIuUINT32, Which());
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST(presentation),
BAD_CAST(GetValueTextByPos(GetValue()).toUtf8().getStr()));
+xmlTextWriterEndElement(pWriter);
+}
+
// class SvxWeightItem ---
SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) :
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 00cbbf4..2651415 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -69,6 +69,8 @@ public:
{ return (FontItalic)GetValue(); }
voidSetPosture( FontItalic eNew )
{ SetValue( (sal_uInt16)eNew ); }
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
#endif // INCLUDED_EDITENG_POSTITEM_HXX
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 190f753..705e34a 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -45,6 +45,7 @@
#include editeng/fhgtitem.hxx
#include editeng/editobj.hxx
#include editeng/outlobj.hxx
+#include editeng/postitem.hxx
#include svx/xdef.hxx
#include svx/svdpage.hxx
#include svx/svdmodel.hxx
@@ -386,17 +387,30 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const
SfxItemSet* pSet)
const SfxPoolItem* pItem = aIter.FirstItem();
while (pItem)
{
+bool bDone = true;
+switch (pItem-Which())
+{
+case RES_CHRATR_POSTURE:
+case RES_CHRATR_CJK_POSTURE:
+case RES_CHRATR_CTL_POSTURE:
+static_castconst SvxPostureItem*(pItem)-dumpAsXml(writer);
+break;
+default: bDone = false; break;
+}
+if (bDone)
+{
+pItem = aIter.NextItem();
+continue;
+}
+
writer.startElement(item);
writer.writeFormatAttribute(whichId, TMP_FORMAT, pItem-Which());
const char* pWhich = 0;
boost::optionalOString oValue;
switch (pItem-Which())
{
-case RES_CHRATR_POSTURE: pWhich = character posture; break;
case RES_CHRATR_WEIGHT: pWhich = character weight; break;
-case RES_CHRATR_CJK_POSTURE: pWhich = character cjk posture;
break;
case RES_CHRATR_CJK_WEIGHT: pWhich = character cjk weight; break;
-case RES_CHRATR_CTL_POSTURE: pWhich = character ctl posture;
break;
case RES_CHRATR_CTL_WEIGHT: pWhich = character ctl weight; break;
case RES_CHRATR_RSID:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 78d58bc5b0ff535551c819d214535067fcaa05f0 Author: Herbert Dürr h...@apache.org Date: Fri Dec 5 07:46:41 2014 + #i125921# fix autodetection of the OSX 10.10 SDK which failed because the autodetection only worked with single-digit minor-versions. Patch-by: Thorsten Wagner thorsten.wagne...@gmail.com Found-by: Thorsten Wagner thorsten.wagne...@gmail.com Review-by: Herbert Duerr h...@apache.org diff --git a/configure.in b/configure.in index b7d1fc3..ea90014 100644 --- a/configure.in +++ b/configure.in @@ -3936,7 +3936,7 @@ if test $_os = Darwin; then else MACOSX_DEPLOYMENT_TARGET=$sdk_target - sdk_found=`xcodebuild -showsdks | grep sdk macosx10.[[789]] | sed -e s/.*sdk // | head -n1` + sdk_found=`xcodebuild -showsdks | egrep sdk macosx10.(7|8|9|10) | sed -e s/.*sdk // | tail -n1` if test -z $sdk_found; then AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 9 commits - include/osl include/toolkit include/vcl svtools/source tools/source vcl/source vcl/unx
include/osl/mutex.hxx |2 +-
include/osl/socket.hxx |3 ++-
include/toolkit/awt/vclxdevice.hxx |3 ++-
include/vcl/menu.hxx |2 +-
svtools/source/inc/unoiface.hxx|4 ++--
svtools/source/uno/unoiface.cxx|8
tools/source/memtools/mempool.cxx |8
vcl/source/window/menu.cxx |4
vcl/unx/generic/app/i18n_ic.cxx|2 +-
vcl/unx/gtk/window/gtksalframe.cxx |2 +-
vcl/unx/gtk/window/gtksalmenu.cxx |6 +++---
11 files changed, 29 insertions(+), 15 deletions(-)
New commits:
commit bcaf496cd250bd4b3b9ab5434229175e2c4f
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 09:09:19 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: Iffdb3d72b24b44cb895f1729aadbbae1802e80bc
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 8a5865a..684c964 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -187,7 +187,7 @@ public:
::com::sun::star::uno::Any SAL_CALL getProperty( const OUString
PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
protected:
-::com::sun::star::uno::Reference
::com::sun::star::util::XNumberFormatsSupplier getFormatsSupplier(void)
const { return ::com::sun::star::uno::Reference
::com::sun::star::util::XNumberFormatsSupplier
((::com::sun::star::util::XNumberFormatsSupplier*)m_pCurrentSupplier);}
+::com::sun::star::uno::Reference
::com::sun::star::util::XNumberFormatsSupplier getFormatsSupplier(void)
const;
voidsetFormatsSupplier(const ::com::sun::star::uno::Reference
::com::sun::star::util::XNumberFormatsSupplier xSupplier);
sal_Int32 getFormatKey(void) const;
voidsetFormatKey(sal_Int32 nKey);
@@ -250,7 +250,7 @@ private:
RMItemData GetRMItemData( const
::com::sun::star::container::ContainerEvent _rEvent );
protected:
-::svt::ORoadmap*GetRoadmap() const { return
(::svt::ORoadmap*)GetWindow(); }
+::svt::ORoadmap*GetRoadmap() const;
voidProcessWindowEvent( const VclWindowEvent
rVclWindowEvent ) SAL_OVERRIDE;
virtual ~SVTXRoadmap();
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index bc4ba57..d59d92b 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1024,6 +1024,10 @@ void SVTXFormattedField::setProperty( const OUString
PropertyName, const ::com:
return aReturn;
}
+::com::sun::star::uno::Reference
::com::sun::star::util::XNumberFormatsSupplier
SVTXFormattedField::getFormatsSupplier(void) const
+{
+return ::com::sun::star::uno::Reference
::com::sun::star::util::XNumberFormatsSupplier (m_pCurrentSupplier);
+}
::com::sun::star::uno::Any SVTXFormattedField::convertEffectiveValue(const
::com::sun::star::uno::Any rValue)
{
@@ -1399,6 +1403,10 @@ void SVTXFormattedField::ImplGetPropertyIds( std::list
sal_uInt16 rIds )
using namespace svt;
+::svt::ORoadmap* SVTXRoadmap::GetRoadmap() const
+{
+return static_castsvt::ORoadmap*(GetWindow());
+}
SVTXRoadmap::SVTXRoadmap() : maItemListeners( *this )
{
commit 8dbc966794f95cb6000f127a8615333de5cd70ff
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 08:57:03 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: Ibd0cc43ff210ffaae291f4f4467ba8ebe265c446
diff --git a/include/toolkit/awt/vclxdevice.hxx
b/include/toolkit/awt/vclxdevice.hxx
index 3de7931..61d5689 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -26,6 +26,7 @@
#include com/sun/star/lang/XUnoTunnel.hpp
#include cppuhelper/weak.hxx
#include osl/mutex.hxx
+#include vcl/virdev.hxx
#include com/sun/star/awt/XUnitConversion.hpp
@@ -107,7 +108,7 @@ class VCLXVirtualDevice : public VCLXDevice
public:
virtual ~VCLXVirtualDevice();
-voidSetVirtualDevice( VirtualDevice* pVDev ) {
SetOutputDevice( (OutputDevice*)pVDev ); }
+voidSetVirtualDevice( VirtualDevice* pVDev ) {
SetOutputDevice( pVDev ); }
};
commit 2f7a386ab2876223da1be73410bf1e7486f724ba
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 08:40:21 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: I73850d2b2ea6ff4376e25e0be39c65c35328a9a6
diff --git a/tools/source/memtools/mempool.cxx
b/tools/source/memtools/mempool.cxx
index cf043f9..415f188 100644
--- a/tools/source/memtools/mempool.cxx
+++ b/tools/source/memtools/mempool.cxx
@@ -28,24 +28,24 @@ FixedMemPool::FixedMemPool(char const * pTypeName,
sal_uInt16 nTypeSize)
{
char name[RTL_CACHE_NAME_LENGTH + 1];
snprintf (name, sizeof(name), FixedMemPool_%d, (int)nTypeSize);
-m_pImpl = (FixedMemPool_Impl*)rtl_cache_create (name, nTypeSize, 0,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 76480df6a2cc5731a93cf46be80d3b25e839b0c8 Author: Andras Timar andras.ti...@collabora.com Date: Fri Dec 5 09:16:03 2014 +0100 Updated core Project: translations 531c86bbe975e79327c4d9c9ac233fb3cb3fc16e diff --git a/translations b/translations index 6f495a7..531c86b 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 6f495a7b8861c4e507c879e752f2d510c41ded17 +Subproject commit 531c86bbe975e79327c4d9c9ac233fb3cb3fc16e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4' - source/sl
source/sl/basctl/uiconfig/basicide/ui.po |4 source/sl/cui/source/options.po | 47 + source/sl/cui/uiconfig/ui.po | 288 -- source/sl/dbaccess/source/ui/dlg.po | 12 source/sl/desktop/uiconfig/ui.po |4 source/sl/extensions/source/bibliography.po | 10 source/sl/filter/source/pdf.po| 22 source/sl/framework/source/classes.po |4 source/sl/helpcontent2/source/text/scalc/01.po| 110 +-- source/sl/helpcontent2/source/text/sdraw/guide.po | 10 source/sl/helpcontent2/source/text/shared/guide.po|8 source/sl/helpcontent2/source/text/swriter/04.po |4 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po | 158 - source/sl/sc/source/ui/StatisticsDialogs.po |4 source/sl/sc/source/ui/src.po | 130 ++-- source/sl/sc/uiconfig/scalc/ui.po | 202 --- source/sl/sd/source/ui/app.po | 65 -- source/sl/sfx2/source/sidebar.po | 17 source/sl/starmath/source.po |6 source/sl/svx/source/stbctrls.po |4 source/sl/svx/source/tbxctrls.po | 28 source/sl/svx/uiconfig/ui.po | 60 +- source/sl/sw/source/uibase/uiview.po |4 source/sl/sw/source/uibase/utlui.po |8 source/sl/sw/uiconfig/swriter/ui.po | 22 25 files changed, 719 insertions(+), 512 deletions(-) New commits: commit 531c86bbe975e79327c4d9c9ac233fb3cb3fc16e Author: Andras Timar andras.ti...@collabora.com Date: Fri Dec 5 09:16:03 2014 +0100 Updated Slovenian translation Change-Id: Ib7db61ffa4c8954f653a903aa6728d7486167546 diff --git a/source/sl/basctl/uiconfig/basicide/ui.po b/source/sl/basctl/uiconfig/basicide/ui.po index 8a6ab2c..345a1c0 100644 --- a/source/sl/basctl/uiconfig/basicide/ui.po +++ b/source/sl/basctl/uiconfig/basicide/ui.po @@ -3,14 +3,14 @@ msgid msgstr Project-Id-Version: LibreOffice 4.4\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2014-11-21 22:01+0100\n +POT-Creation-Date: 2014-11-28 10:07+0100\n PO-Revision-Date: 2014-11-21 23:31+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n -Language: sl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: sl\n Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n X-Generator: Virtaal 0.7.1\n X-Accelerator-Marker: ~\n diff --git a/source/sl/cui/source/options.po b/source/sl/cui/source/options.po index 4d53595..7435f73 100644 --- a/source/sl/cui/source/options.po +++ b/source/sl/cui/source/options.po @@ -3,14 +3,14 @@ msgid msgstr Project-Id-Version: LibreOffice 4.4\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2014-11-21 22:01+0100\n -PO-Revision-Date: 2014-11-19 12:14+0200\n +POT-Creation-Date: 2014-12-04 21:59+0100\n +PO-Revision-Date: 2014-12-05 01:16+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n +Language: sl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: sl\n Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n X-Generator: Virtaal 0.7.1\n X-Accelerator-Marker: ~\n @@ -671,6 +671,38 @@ msgctxt msgid Applying Theme... msgstr Nalaganje teme ... +#: personalization.src +msgctxt +personalization.src\n +RID_SVXSTR_PERSONA_ABSTRACT\n +string.text +msgid Abstract +msgstr Abstraktno + +#: personalization.src +msgctxt +personalization.src\n +RID_SVXSTR_PERSONA_COLOR\n +string.text +msgid Color +msgstr Barva + +#: personalization.src +msgctxt +personalization.src\n +RID_SVXSTR_PERSONA_MUSIC\n +string.text +msgid Music +msgstr Glasba + +#: personalization.src +msgctxt +personalization.src\n +RID_SVXSTR_PERSONA_NATURE\n +string.text +msgid Nature +msgstr Narava + #: treeopt.src msgctxt treeopt.src\n @@ -818,6 +850,15 @@ msgstr Spletna posodobitev #: treeopt.src msgctxt treeopt.src\n +RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS\n +OpenCL\n +itemlist.text +msgid OpenCL +msgstr OpenCL + +#: treeopt.src +msgctxt +treeopt.src\n RID_OFADLG_OPTIONS_TREE_PAGES.SID_LANGUAGE_OPTIONS\n Language Settings\n itemlist.text diff --git a/source/sl/cui/uiconfig/ui.po
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit eba50fadbe5b1a6c27745b3e8ea7b60ba2dfc903 Author: David Tardon dtar...@redhat.com Date: Fri Dec 5 09:41:29 2014 +0100 upload libpagemaker 0.0.2 Change-Id: I5dd7cf6ede401b0271296d4f76df266ec4680f74 diff --git a/download.lst b/download.lst index fd8197af..860feeb 100644 --- a/download.lst +++ b/download.lst @@ -118,8 +118,8 @@ export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENSSL_MD5SUM := f7175c9cd3c39bb1907ac8bba9df8ed3 export OPENSSL_TARBALL := openssl-1.0.1j.tar.gz export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 -export PAGEMAKER_MD5SUM := 3572175bd4e7d134f26b6762d322a1d1 -export PAGEMAKER_TARBALL := libpagemaker-0.0.1.tar.bz2 +export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671 +export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 export PNG_TARBALL := libpng-1.5.18.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/icgm/chart.hxx | 12
1 file changed, 12 deletions(-)
New commits:
commit e2e94f1a1241481941548fa94f32bf63e162967b
Author: Jennifer Liebel jliebe...@gmail.com
Date: Fri Dec 5 08:24:07 2014 +
fdo#84938: removed unused defines
Change-Id: Iaccc5ab6804c290b26e641c724051e497d00e32e
Reviewed-on: https://gerrit.libreoffice.org/13308
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/filter/source/graphicfilter/icgm/chart.hxx
b/filter/source/graphicfilter/icgm/chart.hxx
index 3fced99..e92b1a9 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -46,18 +46,6 @@
#define ALLCHART 127 /* Applies to all chart types */
#define ALLCHART_TPL 255 /* Applies to all chart types */
-#define IOC_CHTTITLE1 /* Title for any chart. */
-#define IOC_CHTFOOTNOTE 2 /* ::com::sun::star::text::Footnote for
any chart. */
-#define IOC_XYAXIS 3 /* Axis title for XY charts. */
-#define IOC_XYSERIESLEGEND 4 /* Series legend titles for XY charts. */
-#define IOC_PIETITLE5 /* Title for pie charts. */
-#define IOC_TABLEBODY 6 /* Table chart text element. */
-#define IOC_TITLEBODY 7 /* Title chart text element. */
-#define IOC_BULLETBODY 8 /* Bullet chart text element.*/
-#define IOC_XYLEGENDTITLE 9 /* Legend title for XY charts. */
-#define IOC_PIELEGENDTITLE 10 /* Legend title for pie charts. */
-#define IOC_TABLEGENDTITLE 11 /* Legend title for table charts.*/
-
typedef struct TextAttribute
{
sal_uInt16 nTextAttribCount;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 84938] replace #defined constants with ‘enum class’
https://bugs.freedesktop.org/show_bug.cgi?id=84938 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Jennifer Liebel committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e2e94f1a1241481941548fa94f32bf63e162967b fdo#84938: removed unused defines It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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
[Bug 87003] Kill BOOST_FOREACH on master and use C++11s range-based for() loops instead
https://bugs.freedesktop.org/show_bug.cgi?id=87003 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #2 from Stephan Bergmann sberg...@redhat.com --- (In reply to Björn Michaelsen from comment #0) Most uses of BOOST_FOREACH should be replacable with a simple C++11 range-based for() iteration ...or for-each and a lambda (depending on what looks more natural in a given case) -- 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: editeng/source include/editeng
editeng/source/outliner/outlin2.cxx |5 +
include/editeng/outliner.hxx|2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 4ac083b0c905e4b7b854940c796e387399d58026
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 09:58:23 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: Ibe4613e2fd77eec8e6e6d1c5e880b596e103a7b8
diff --git a/editeng/source/outliner/outlin2.cxx
b/editeng/source/outliner/outlin2.cxx
index 168f103..3fc587e 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -522,6 +522,11 @@ bool Outliner::ShouldCreateBigTextObject() const
return pEditEngine-ShouldCreateBigTextObject();
}
+const EditEngine Outliner::GetEditEngine() const
+{
+return *pEditEngine;
+}
+
void Outliner::SetVertical( bool b )
{
pEditEngine-SetVertical( b );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 932cc9f..7e250c4 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -960,7 +960,7 @@ public:
boolShouldCreateBigTextObject() const;
-const EditEngine GetEditEngine() const { return
*((EditEngine*)pEditEngine); }
+const EditEngine GetEditEngine() const;
// this is needed for StarOffice Api
void SetLevelDependendStyleSheet( sal_Int32 nPara );
___
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' - 2 commits - basctl/source download.lst include/svx reportdesign/inc reportdesign/source sc/inc sd/inc sd/source svx/source sw/inc
basctl/source/dlged/dlgedpage.cxx| 10 +++
basctl/source/inc/dlgedpage.hxx |5 +
download.lst |4 -
include/svx/fmpage.hxx |9 ++-
include/svx/obj3d.hxx|8 ++
include/svx/svdpage.hxx | 27 +++--
reportdesign/inc/RptPage.hxx |2
reportdesign/source/core/sdr/RptPage.cxx |4 +
sc/inc/drawpage.hxx |3 +
sd/inc/sdpage.hxx|6 +-
sd/source/core/sdpage2.cxx | 28 ++
svx/source/engine3d/obj3d.cxx| 11 +++-
svx/source/form/fmpage.cxx | 11 +++-
svx/source/svdraw/svdpage.cxx| 84 ---
sw/inc/dpage.hxx |3 +
15 files changed, 124 insertions(+), 91 deletions(-)
New commits:
commit d49e5761f359020c349c268ee78a4256cc46541e
Author: David Tardon dtar...@redhat.com
Date: Wed Dec 3 22:01:57 2014 +0100
ooo#93212 avoid slicing during construction of SdrPage
Also hide copy ctor and assignment operator of all derived classes, to
ensure that Clone() is the only method to make copies of them.
Change-Id: Icb3b50c63b086abe8c9add32e3041fe19692d20b
(cherry picked from commit 9638e6207c7fc48712b1b238177462c00f5011e8)
diff --git a/basctl/source/dlged/dlgedpage.cxx
b/basctl/source/dlged/dlgedpage.cxx
index 86a792f..15f7f12 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -33,6 +33,12 @@ DlgEdPage::DlgEdPage(DlgEdModel rModel, bool bMasterPage)
{
}
+DlgEdPage::DlgEdPage(const DlgEdPage rSrcPage)
+: SdrPage(rSrcPage)
+, pDlgEdForm(0)
+{
+}
+
DlgEdPage::~DlgEdPage()
{
Clear();
@@ -41,7 +47,9 @@ DlgEdPage::~DlgEdPage()
SdrPage* DlgEdPage::Clone() const
{
-return new DlgEdPage( *this );
+DlgEdPage* const pNewPage = new DlgEdPage( *this );
+pNewPage-lateInit( *this );
+return pNewPage;
}
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index b92760f..0275292 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -34,6 +34,8 @@ class DlgEdForm;
class DlgEdPage : public SdrPage
{
+DlgEdPage operator=(const DlgEdPage) SAL_DELETED_FUNCTION;
+
private:
DlgEdForm* pDlgEdForm;
@@ -50,6 +52,9 @@ public:
DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum)
SAL_OVERRIDE;
+
+protected:
+DlgEdPage(const DlgEdPage rSrcPage);
};
} // namespace basctl
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index e381a64..a48df9c 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -40,6 +40,8 @@ class HelpEvent;
class SVX_DLLPUBLIC FmFormPage : public SdrPage
{
+FmFormPage operator=(const FmFormPage) SAL_DELETED_FUNCTION;
+
friend class FmFormObj;
FmFormPageImpl* m_pImpl;
OUStringm_sPageName;
@@ -48,12 +50,12 @@ public:
TYPEINFO_OVERRIDE();
FmFormPage(FmFormModel rModel, bool bMasterPage=false);
-FmFormPage(const FmFormPage rPage);
virtual ~FmFormPage();
virtual voidSetModel(SdrModel* pNewModel) SAL_OVERRIDE;
virtual SdrPage* Clone() const SAL_OVERRIDE;
+// TODO: Uh huh, how is this supposed to work? Creating a SdrPage from
FmFormPage?
using SdrPage::Clone;
virtual voidInsertObject(SdrObject* pObj, size_t nPos = SAL_MAX_SIZE,
@@ -73,6 +75,11 @@ public:
vcl::Window* pWin,
SdrView* pView,
const HelpEvent rEvt );
+
+protected:
+FmFormPage(const FmFormPage rPage);
+
+void lateInit(const FmFormPage rPage);
};
#endif // INCLUDED_SVX_FMPAGE_HXX
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index bdba2c3..f370f20 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -78,16 +78,22 @@ public:
class E3dObjList : public SdrObjList
{
+E3dObjList operator=(const E3dObjList rSrcList) SAL_DELETED_FUNCTION;
+
public:
TYPEINFO_OVERRIDE();
E3dObjList(SdrModel* pNewModel = 0, SdrPage* pNewPage = 0, E3dObjList*
pNewUpList = 0);
-SVX_DLLPUBLIC E3dObjList(const E3dObjList rSrcList);
SVX_DLLPUBLIC virtual ~E3dObjList();
+virtual E3dObjList* Clone() const;
+
virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE,
const SdrInsertReason* pReason=NULL) SAL_OVERRIDE;
virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const
SdrInsertReason* pReason=NULL) SAL_OVERRIDE;
virtual SdrObject* NbcRemoveObject(size_t nObjNum) SAL_OVERRIDE;
virtual SdrObject* RemoveObject(size_t nObjNum) SAL_OVERRIDE;
+
+protected:
+SVX_DLLPUBLIC E3dObjList(const E3dObjList rSrcList);
};
/*
[Bug 87026] Move accessibility relations to .ui files
https://bugs.freedesktop.org/show_bug.cgi?id=87026 Katarina Behrens bu...@bubli.org changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||libreoffice@lists.freedeskt ||op.org Ever confirmed|0 |1 Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup -- 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-3' - extensions/source
extensions/source/propctrlr/formcomponenthandler.cxx | 25 ---
1 file changed, 22 insertions(+), 3 deletions(-)
New commits:
commit c5133d6f9c909619a3534c1e3f7f3c7bb3f69ab7
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Dec 4 19:04:46 2014 +0100
Revert coverity#735424 Logically dead code
This reverts commit 1f22e2f954baeec825190ded03510cb6c8069d93.
in preparation for fix for fdo#65163
Conflicts:
extensions/source/propctrlr/formcomponenthandler.cxx
Change-Id: Ifa252ac66724dd3e4b257e3bb6679d9503f8a9db
Reviewed-on: https://gerrit.libreoffice.org/13302
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 460371e..f3ae47c 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2765,6 +2765,7 @@ namespace pcr
bool FormComponentPropertyHandler::impl_browseForImage_nothrow( Any
_out_rNewValue, ::osl::ClearableMutexGuard _rClearBeforeDialog ) const
{
+bool bIsLink = true;// reflect the legacy behavior
OUString aStrTrans = m_pInfoService-getPropertyTranslation(
PROPERTY_ID_IMAGE_URL );
::sfx2::FileDialogHelper aFileDlg(
@@ -2775,6 +2776,7 @@ namespace pcr
// non-linked images ( e.g. those located in the document
// stream ) only if document is available
Reference XModel xModel( impl_getContextDocument_nothrow() );
+bool bHandleNonLink = false;
Reference XFilePickerControlAccess
xController(aFileDlg.GetFilePicker(), UNO_QUERY);
DBG_ASSERT(xController.is(),
FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the
controller interface on the file picker!);
@@ -2783,8 +2785,8 @@ namespace pcr
// do a preview by default
xController-setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0,
css::uno::Any(true));
-xController-setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK,
0, css::uno::Any(true));
-
xController-enableControl(ExtendedFilePickerElementIds::CHECKBOX_LINK, false);
+xController-setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK,
0, css::uno::Any(bIsLink));
+
xController-enableControl(ExtendedFilePickerElementIds::CHECKBOX_LINK,
bHandleNonLink );
}
@@ -2800,7 +2802,24 @@ namespace pcr
bool bSuccess = ( 0 == aFileDlg.Execute() );
if ( bSuccess )
{
-_out_rNewValue = (OUString)aFileDlg.GetPath();
+if ( bHandleNonLink xController.is() )
+{
+
xController-getValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) =
bIsLink;
+}
+if ( !bIsLink )
+{
+Graphic aGraphic;
+aFileDlg.GetGraphic( aGraphic );
+
+Reference graphic::XGraphicObject xGrfObj =
graphic::GraphicObject::create( m_xContext );
+xGrfObj-setGraphic( aGraphic.GetXGraphic() );
+
+
+_out_rNewValue = xGrfObj;
+
+}
+else
+_out_rNewValue = (OUString)aFileDlg.GetPath();
}
return bSuccess;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - extensions/source
extensions/source/propctrlr/formcomponenthandler.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 86cc39cc51074788f59dc56f9371d1d4ed615eb6
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Dec 4 19:14:52 2014 +0100
fdo#65163 reintroduce embedded picture for form components
but not for report components (fdo#53001)
Change-Id: Ie07e1c2993304d4deb2124e72baa7a326b587918
Reviewed-on: https://gerrit.libreoffice.org/13303
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index f3ae47c..84dda32 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -69,6 +69,7 @@
#include com/sun/star/inspection/PropertyLineElement.hpp
#include com/sun/star/resource/XStringResourceManager.hpp
#include com/sun/star/resource/MissingResourceException.hpp
+#include com/sun/star/report/XReportDefinition.hpp
#include com/sun/star/graphic/GraphicObject.hpp
#include com/sun/star/text/WritingMode2.hpp
@@ -127,6 +128,7 @@ namespace pcr
using namespace sdb;
using namespace sdbc;
using namespace sdbcx;
+using namespace report;
using namespace container;
using namespace ui::dialogs;
using namespace inspection;
@@ -2775,8 +2777,17 @@ namespace pcr
aFileDlg.SetTitle(aStrTrans);
// non-linked images ( e.g. those located in the document
// stream ) only if document is available
-Reference XModel xModel( impl_getContextDocument_nothrow() );
-bool bHandleNonLink = false;
+bool bHandleNonLink;
+{
+Reference XModel xModel( impl_getContextDocument_nothrow() );
+bHandleNonLink = xModel.is();
+// Not implemented in reports
+if (bHandleNonLink)
+{
+Reference XReportDefinition xReportDef( xModel,
::com::sun::star::uno::UNO_QUERY );
+bHandleNonLink = !xReportDef.is();
+}
+}
Reference XFilePickerControlAccess
xController(aFileDlg.GetFilePicker(), UNO_QUERY);
DBG_ASSERT(xController.is(),
FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the
controller interface on the file picker!);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 78/d58bc5b0ff535551c819d214535067fcaa05f0
78/d58bc5b0ff535551c819d214535067fcaa05f0 |1 + 1 file changed, 1 insertion(+) New commits: commit 2f93c71b986a8f8201f92f03d911102e02681772 Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 5 09:15:20 2014 + Notes added by 'git notes add' diff --git a/78/d58bc5b0ff535551c819d214535067fcaa05f0 b/78/d58bc5b0ff535551c819d214535067fcaa05f0 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/78/d58bc5b0ff535551c819d214535067fcaa05f0 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - bean/com filter/qa jurt/com jurt/workbench jvmfwk/plugins nlpsolver/src nlpsolver/ThirdParty qadevOOo/runner reportbuilder/java scripting/java swext/mediawi
bean/com/sun/star/comp/beans/LocalOfficeConnection.java
|3
bean/com/sun/star/comp/beans/OOoBean.java
| 18 ++---
filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
|1
jurt/com/sun/star/lib/uno/environments/remote/Job.java
|1
jurt/workbench/com/sun/star/comp/urlresolver/UrlResolver_Test.java
|2
jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
|2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
| 35 --
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
|1
qadevOOo/runner/convwatch/PerformanceContainer.java
|2
qadevOOo/runner/convwatch/SimpleFileSemaphore.java
|2
qadevOOo/runner/graphical/PerformanceContainer.java
|2
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
|1
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
|2
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
| 12 +--
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
| 10 +-
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
|2
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
| 12 ---
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
|1
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
|2
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
|5 -
sw/qa/complex/writer/CheckBookmarks.java
|4 -
sw/qa/complex/writer/TextPortionEnumerationTest.java
|2
swext/mediawiki/src/com/sun/star/wiki/Helper.java
|4 -
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
|9 --
testtools/com/sun/star/comp/bridge/TestComponent.java
|5 -
toolkit/test/accessibility/TopWindowListener.java
|1
toolkit/test/accessibility/ov/StateSetView.java
|1
wizards/com/sun/star/wizards/common/NumberFormatter.java
| 26 ++-
wizards/com/sun/star/wizards/db/TableDescriptor.java
|2
wizards/com/sun/star/wizards/document/Control.java
|4 -
wizards/com/sun/star/wizards/document/FormHandler.java
|1
wizards/com/sun/star/wizards/form/FieldLinker.java
|2
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
| 30 ++--
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
|2
wizards/com/sun/star/wizards/ui/TitlesComponent.java
|2
35 files changed, 69 insertions(+), 142 deletions(-)
New commits:
commit 7716243236a047932240de275ecac17b149b88a9
Author: Noel Grandin n...@peralex.com
Date: Fri Dec 5 11:07:01 2014 +0200
java: remove some comment noise
Change-Id: I51118fecf9de27407b4c5a66cd6577574939e001
diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java
b/qadevOOo/runner/convwatch/PerformanceContainer.java
index 81cbb95..0590ef3 100644
--- a/qadevOOo/runner/convwatch/PerformanceContainer.java
+++ b/qadevOOo/runner/convwatch/PerformanceContainer.java
@@ -22,7 +22,7 @@ import java.io.File;
import java.io.FileWriter;
import java.io.RandomAccessFile;
-public class PerformanceContainer /* extends *//* implements */ {
+public class PerformanceContainer {
/*
simple helper functions to start/stop a timer, to know how long a
process need in milliseconds
*/
diff --git a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
index 7f1864f..0fd9882 100644
--- a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
+++ b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
@@ -22,7 +22,7 @@
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/basdoc.cxx |3 --- basctl/source/basicide/basdoc.hxx |1 - basctl/source/basicide/basicbox.cxx|7 --- basctl/source/basicide/basicbox.hxx|1 - basctl/source/basicide/basicrenderable.cxx |2 -- basctl/source/basicide/baside2.cxx |8 basctl/source/basicide/baside2.hxx | 10 -- basctl/source/basicide/baside2b.cxx| 14 +- basctl/source/basicide/baside3.cxx |4 basctl/source/basicide/basidectrlr.cxx |2 -- basctl/source/basicide/basides1.cxx|6 +- basctl/source/basicide/basides2.cxx| 10 -- basctl/source/basicide/basides3.cxx|7 --- basctl/source/basicide/basidesh.cxx|4 basctl/source/basicide/basidesh.src|1 - basctl/source/basicide/basobj2.cxx | 11 --- basctl/source/basicide/basobj3.cxx | 16 basctl/source/basicide/bastype2.cxx| 12 basctl/source/basicide/bastype2.hxx|3 --- basctl/source/basicide/bastype3.cxx|5 - basctl/source/basicide/bastypes.cxx|5 - basctl/source/basicide/breakpoint.cxx |1 - basctl/source/basicide/brkdlg.cxx |2 -- basctl/source/basicide/brkdlg.hxx |2 -- basctl/source/basicide/doceventnotifier.cxx|3 --- basctl/source/basicide/documentenumeration.cxx |3 --- basctl/source/basicide/documentenumeration.hxx |2 -- basctl/source/basicide/iderdll.cxx | 10 -- basctl/source/basicide/iderdll2.hxx|1 - basctl/source/basicide/layout.hxx |4 basctl/source/basicide/linenumberwindow.cxx|2 -- basctl/source/basicide/linenumberwindow.hxx|1 - basctl/source/basicide/localizationmgr.cxx |3 +-- basctl/source/basicide/macrodlg.cxx| 12 basctl/source/basicide/macrodlg.hrc|1 - basctl/source/basicide/macrodlg.hxx|2 -- basctl/source/basicide/macrodlg.src|2 -- basctl/source/basicide/moduldl2.cxx| 14 -- basctl/source/basicide/moduldlg.cxx|8 basctl/source/basicide/moduldlg.hxx|3 --- basctl/source/basicide/moduldlg.src|1 - basctl/source/basicide/objdlg.cxx |9 - basctl/source/basicide/objdlg.hxx |3 --- basctl/source/basicide/objdlg.src |1 - basctl/source/basicide/register.cxx|3 --- basctl/source/basicide/scriptdocument.cxx | 17 +++-- basctl/source/basicide/tbxctl.cxx |1 - basctl/source/basicide/tbxctl.hxx |1 - basctl/source/basicide/unomodel.cxx|3 --- basctl/source/basicide/unomodel.hxx|1 - 50 files changed, 6 insertions(+), 242 deletions(-) New commits: commit 4758ab313de3cb2c8cb9ea5792425a808e94b7df Author: Andrea Gelmini andrea.gelm...@gelma.net Date: Wed Nov 19 08:53:14 2014 +0100 Removed useless includes in basctl/source/basicide/ tree It compiles on Windows and Linux, here, with flags: --with-help --with-java --with-lang=it Made with the ignorant brute force of removing each include one by one. The tree with each commit (used to bisect) it's here: https://github.com/Gelma/core/commits/gr_push_brute_force_slot_2 Conflicts: basctl/source/basicide/bastype2.cxx Change-Id: If88eebb6ecba6ae7ab1e98713b66b10f1ad57dca Reviewed-on: https://gerrit.libreoffice.org/12963 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 3dd04bf..d11bf03 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -18,11 +18,8 @@ */ #include sfx2/app.hxx -#include sfx2/docfac.hxx #include sfx2/printer.hxx #include sfx2/objface.hxx -#include sfx2/objsh.hxx -#include svl/itemset.hxx #include unomodel.hxx diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index 1502bd5..f86bff4 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -22,7 +22,6 @@ #include iderid.hxx #include sfx2/docfac.hxx -#include sfx2/objsh.hxx #include svx/ifaceids.hxx #include boost/scoped_ptr.hpp diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 9735c59..198e003 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -19,21 +19,14 @@ #include basidesh.hrc #include basidesh.hxx -#include basobj.hxx #include basicbox.hxx -#include iderid.hxx
[Libreoffice-commits] core.git: uui/uiconfig
uui/uiconfig/ui/logindialog.ui | 54 uui/uiconfig/ui/macrowarnmedium.ui | 11 -- uui/uiconfig/ui/masterpassworddlg.ui|6 ++- uui/uiconfig/ui/password.ui | 11 +- uui/uiconfig/ui/setmasterpassworddlg.ui |9 - uui/uiconfig/ui/simplenameclash.ui |9 ++--- uui/uiconfig/ui/sslwarndialog.ui|7 ++-- uui/uiconfig/ui/unknownauthdialog.ui| 14 ++-- 8 files changed, 49 insertions(+), 72 deletions(-) New commits: commit c483ac1f20354170fe66fc42823932bd6aa7d210 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Thu Dec 4 11:01:10 2014 -0600 uui: HIG fixes Change-Id: I92045fe661e4d1d667c860dfd47559d2303ca531 Reviewed-on: https://gerrit.libreoffice.org/13301 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/uui/uiconfig/ui/logindialog.ui b/uui/uiconfig/ui/logindialog.ui index 4c92cf2..22de1e6 100644 --- a/uui/uiconfig/ui/logindialog.ui +++ b/uui/uiconfig/ui/logindialog.ui @@ -1,10 +1,12 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkDialog id=LoginDialog property name=can_focusFalse/property property name=border_width6/property property name=title translatable=yesAuthentication Required/property +property name=resizableFalse/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 @@ -57,6 +59,7 @@ property name=expandFalse/property property name=fillTrue/property property name=position2/property +property name=secondaryTrue/property /packing /child /object @@ -87,7 +90,6 @@ property name=left_attach0/property property name=top_attach9/property property name=width2/property -property name=height1/property /packing /child child @@ -104,7 +106,6 @@ property name=left_attach0/property property name=top_attach8/property property name=width2/property -property name=height1/property /packing /child child @@ -117,40 +118,34 @@ packing property name=left_attach1/property property name=top_attach7/property -property name=width1/property -property name=height1/property /packing /child child object class=GtkLabel id=accountft property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yesA_ccount/property +property name=xalign1/property +property name=label translatable=yesA_ccount:/property property name=use_underlineTrue/property property name=mnemonic_widgetaccounted/property /object packing property name=left_attach0/property property name=top_attach7/property -property name=width1/property -property name=height1/property /packing /child child object class=GtkLabel id=passwordft property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yesPass_word/property +property name=xalign1/property +property name=label translatable=yesPass_word:/property property name=use_underlineTrue/property property name=mnemonic_widgetpassworded/property /object packing property name=left_attach0/property property name=top_attach6/property -property name=width1/property -property name=height1/property /packing /child child @@ -160,13 +155,10 @@ property name=hexpandTrue/property property name=visibilityFalse/property property name=invisible_charâ/property -property name=invisible_char_setTrue/property /object packing property name=left_attach1/property property name=top_attach6/property -property name=width1/property -property name=height1/property /packing /child child @@
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.4.0.0.beta2'
Tag 'libreoffice-4.4.0.0.beta2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-12-05 09:23 -0800 Tag libreoffice-4.4.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUgXmYAAoJEPQ0oe+v7q6j96EP/2ID+ly1sQX6fku5b5jRDNan y3JyaKNpiZKSvntIkK0yKkx0ClpVaEnY37DLep78cQ9YQAieZ8N6nSHGQIlyXCVz vChR4tqszCIzu3CiruCpgQBpFsiHO8MKtpcJiuU/6kKMUzQibOHF6w/Ie/a9dVkj FJciWnZJbujSqNVK69FnML2NJJNKUJ31HB0w9Wj0GO2gP1zRJ4oRAWBSjhiSQ8aQ eSJV4sucBUWhtGn5Ytd6HMcNcZifXI5PIdvS1JK23IiCK6xr0+cTjJptF1EpnYe1 o4qtVxCUWNaB8HIgTZVXJH9/0QrLEoTWZpsJQp4pMCMhBUbWr3zGrwHc8FRTyBh+ 5RUuhlRqpJvZ/yIsBNJNB0dCzbGy42+P2pQKEjGyXKAKGKkzpIwOPmbJYVbNxKW8 wPcgbj3OE+rEDzU3bYMka/aVacd6YT1cEfvnheO+XFpU9vdYvrmfKjpQ7i80DnL7 PueAcPPR4sOfkQEFVko8682+WfbNTaEMjfHLbHnF07wvXZJNJKkddKd2NSDSXCv7 OJJLRElEErX2D7mIhQYFGkwvR9UoRgdz/yNAwmLT2VAl8CxR7aeQolqCMIlnDITN DvA3VJU2EDLrg5zl8eGqxc41SJQCr2D7nIYehlzoGLvNgmzXbn/QZaFVn+w+c299 68Pja0X1mTLTN4CZI1x7 =/R4g -END PGP SIGNATURE- Changes since libreoffice-4-4-branch-point-4: --- 0 files changed --- ___ 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' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe6b8143ca7166856249fc22121d4cba1fa93652 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Fri Dec 5 10:24:35 2014 +0100 bump product version to 4.4.0.0.beta2+ Change-Id: Ie88c83ea11469238ff1b096f7f7c337ee362146d diff --git a/configure.ac b/configure.ac index efa867b..146397d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.4.0.0.beta1+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.4.0.0.beta2+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.4.0.0.beta2'
Tag 'libreoffice-4.4.0.0.beta2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-12-05 09:23 -0800 Tag libreoffice-4.4.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUgXmVAAoJEPQ0oe+v7q6jdfAQAIfOZyHojEi46LzNd0vgEdVI 5QbpYTeiCEsvNLDwToRabHG63gr8jm3yBKXgx2ZnpWoXK+J6p62EfPhy5FUTUAQQ +iJNxitGfIFC6+6BDGVy1jD3Jq5p+BfTRd6GEbwnybVCjE/Vl/Doj/BUzQlzzdrr +0tIuZZ1Wk0zAqtXSlQCJudkADLxTxhAor9SL2IBNDU7YMzSygSQPnpZSTPDOmn0 Fy/Ds6f6ytA1/9OAx34cjVOUeu5YoD3TJhMWSfZxJt9Sijmlty5HO0cLXm6S4iBJ k7M90P6WxJDiqJEBCtntmwIswYdvgTAo6eG9HPQP97W0/oL8Nv7OLd4xbBO6mtrq bNvxz+lcYniajS8w4zJ33M5uAe8A6MPM/lAb8g8RDHHQqcd1koFV+7/9jiBeLrXT AIpE46PEyJkNuz6tUtotZYXjZPSNeuTWYWiU2aUI8M+XB9zf66mUEmxuXOFnpUP3 UPdNwiy3NSLvc2JQ7R4VBVu11mr/SglEqKA5FAPSKNjKD8z0yAvcpGJSiMBYmtKs MKw8HvtKvl/LdSAABE61JFKQ0M+FxXQnz2d71RY+MapR2igFQyCvZDgAOr0MDfGK Hju/53cePn2GKWTHyHmAscUrxZUZ91DrY9rsJXSR6ME9ajNG4+voFqUAMSn1JQK/ fzasavhBZwQiIK3KVEiZ =jLQg -END PGP SIGNATURE- Changes since libreoffice-4-4-branch-point-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.4.0.0.beta2'
Tag 'libreoffice-4.4.0.0.beta2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-12-05 09:23 -0800 Tag libreoffice-4.4.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUgXmbAAoJEPQ0oe+v7q6jXj4P/jjXnxcmrfdcoWbiH+wguBgf APB0nz+veH2+7DBKyW+9L9HHUpkmnZDnt+ZSANwCFEAg5OqYDrLGIqOJqV1FdVVJ 6B7hCEUTvaVWL+jqxe5o3scFc4Drft1GyE8jCegwqTK63g58eX2CwhGH4mJEFqdW 4cdulOcpEa7kQOxuqhie8rsTw+ix702oa2tuHCfl+X2Q6oJ9z5ffjr9hMCxZSBRC yFpu7f6CBk8eQQHeRiRx6C/cFepKu7OOCUobRfp0I5g7gBtXRPJdzJK2aUupXgz8 NpKNLFH5cpZnRTzmpWWFWk3w9Tihilfh0B7ysZwyO/Vivkj8QfaduGP5x2hb2MQl UkEmTDUdd6NjKCEHMo8PmMhCfvlQlm5o2kD3jWPc0EGP25EFze1eaEKjsh+nYmGa 59HryXJnsUc09JfMqvQOtHDS+1OjUrfMA6kmDmvg13yAn/8lU84CGULwhM4onWb9 uOeuGqK1nIEIdPSpkbLC61A9PyaeJv7HopesbU8behUBLeDHhT/vXDqbJhoKKrrf DjXicnCbduRAYEbf8M1y5fU3ULmC+ns29vBR/K8fP9hM6mr8d98n2sgQH+5k6O7C 8q9d7W5dv+a9mGwSZ4ubF8OxgRB7e0izNN5ET+I+GJf7tBbeqGAm8KsVUaT0+qqL n4YiC8BSzn3rEda5kGCu =bF0F -END PGP SIGNATURE- Changes since libreoffice-4-4-branch-point-337: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.4.0.0.beta2'
Tag 'libreoffice-4.4.0.0.beta2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-12-05 09:23 -0800 Tag libreoffice-4.4.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUgXmRAAoJEPQ0oe+v7q6jCfoQALU6xZ3GrqlpZV3mZG7GT2Ld YW+J3LeOey6u339T5uVsSI2dtovFJPGloX2Njilu+v3smryif1gBKvOqWE5E1as1 O0k9qIIuEhoDhqex5mliMybX5zHtm7qG1x7pYqPpzwxinekGTRYSV5lRdnMHqSIl zKijA5BcZKCysgdEo7/2MJ9JvY+i7woJoumdeIx0CMhjeLgOlD8g3d9OEiHmwSR6 Nq9MT18tuQLB4nB8cWJHz+xYOqDa1CT2v/9okpn0dclg6JGGZLWjyKUu9k0gWTqO FypWuBspmi4J0/qvYBU/G2XgHtOWhjdIP4PB39CERLdlCh0NCVmsAl7JMk+Fgm8t fThHSnSat3iYvSD0J0Nw2OobIZT8o6mOAEO9tiFQbamK1z/Lk2Tbe8Y0prlQORnl PVcPKwz6fQYHoeLw7CxU+9/VA67xyZm4y37mfc6Ffr8R9OzQmQT7quQnm9bsQPK3 nDTDPTlC8eeiDiE6Doh+Gqm4wh1UJNCk+8eGg3THIFKMP+P47PXa4kWeeGm7k1hD W8vnKxq508WS5aF7/dsX7BjnIYxPyI2LSZ7+28Nz1H4TzOxDO6xgN2/6cDgiwl+f qlWsoDoqEEhmijBQycnJimrQVoivuuBp+gsEf9G4m+XjC6BfdqhNjpu3RoG74myz jnOi1F1Hk46mI3PZtSGU =YR2P -END PGP SIGNATURE- Changes since libreoffice-4-4-branch-point: Christian Lohmaier (1): Version 4.4.0.0.beta2, tag libreoffice-4.4.0.0.beta2 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source oox/source sdext/source tools/source vcl/unx
l10ntools/source/localize.cxx |2
l10ntools/source/merge.cxx |2
l10ntools/source/po.cxx|4
oox/source/drawingml/customshapepresetdata.cxx | 106 -
sdext/source/pdfimport/wrapper/wrapper.cxx | 16 +--
tools/source/inet/inetmsg.cxx | 96 +++---
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx |2
7 files changed, 98 insertions(+), 130 deletions(-)
New commits:
commit 0375504f7be34d857859dfbaa312501e0ed1
Author: Noel Grandin n...@peralex.com
Date: Thu Dec 4 14:19:41 2014 +0200
fdo#38835 strip out OString globals
Change-Id: Id2eb27132fd6c1734e50c02617ce1bbb75e294a0
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 5546e9e..5c107a6 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -261,7 +261,7 @@ void handleFilesOfDir(
}
bool includeProject(const OString rProject) {
-static const OString projects[] = {
+static const char *projects[] = {
accessibility,
avmedia,
basctl,
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index ee98009..a8323be 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -439,7 +439,7 @@ void MergeDataFile::InsertEntry(
OString MergeDataFile::CreateKey(const OString rTYP, const OString rGID,
const OString rLID, const OString rFilename, bool bCaseSensitive)
{
-static const OString sStroke('-');
+static const char sStroke[] = -;
OString sKey( rTYP );
sKey += sStroke;
sKey += rGID;
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index bc599a0..a4e60b9 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -396,12 +396,12 @@ OString PoEntry::genKeyId(const OString rGenerator)
aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength());
sal_uInt32 nCRC = aCRC32.checksum();
// Use simple ASCII characters, exclude I, l, 1 and O, 0 to avoid
confusing IDs
-static const OString sSymbols =
+static const char sSymbols[] =
ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789;
char sKeyId[6];
for( short nKeyInd = 0; nKeyInd 5; ++nKeyInd )
{
-sKeyId[nKeyInd] = sSymbols[(nCRC 63) % sSymbols.getLength()];
+sKeyId[nKeyInd] = sSymbols[(nCRC 63) % strlen(sSymbols)];
nCRC = 6;
}
sKeyId[5] = '\0';
diff --git a/oox/source/drawingml/customshapepresetdata.cxx
b/oox/source/drawingml/customshapepresetdata.cxx
index 2edc40c..945825e 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -29,16 +29,16 @@ void
lcl_parseAdjustmentValue(comphelper::SequenceAsVectordrawing::EnhancedCust
do
{
OString aToken = rValue.getToken(0, ',', nIndex).trim();
-static const OString aNamePrefix(Name = \);
-static const OString aValuePrefix(Value = (any) { (long) );
+static const char aNamePrefix[] = Name = \;
+static const char aValuePrefix[] = Value = (any) { (long) ;
if (aToken.startsWith(aNamePrefix))
{
-OString aName = aToken.copy(aNamePrefix.getLength(),
aToken.getLength() - aNamePrefix.getLength() - strlen(\));
+OString aName = aToken.copy(strlen(aNamePrefix),
aToken.getLength() - strlen(aNamePrefix) - strlen(\));
aAdjustmentValue.Name = OUString::fromUtf8(aName);
}
else if (aToken.startsWith(aValuePrefix))
{
-OString aValue = aToken.copy(aValuePrefix.getLength(),
aToken.getLength() - aValuePrefix.getLength() - strlen( }));
+OString aValue = aToken.copy(strlen(aValuePrefix),
aToken.getLength() - strlen(aValuePrefix) - strlen( }));
aAdjustmentValue.Value = uno::makeAny(aValue.toInt32());
}
else if (!aToken.startsWith(State = ))
@@ -77,27 +77,27 @@ drawing::EnhancedCustomShapeParameterPair
lcl_parseEnhancedCustomShapeParameterP
drawing::EnhancedCustomShapeParameterPair aPair;
OString aToken = rValue;
// We expect the followings here: First.Value, First.Type, Second.Value,
Second.Type
-static const OString aExpectedFVPrefix = First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) ;
+static const char aExpectedFVPrefix[] = First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) ;
assert(aToken.startsWith(aExpectedFVPrefix));
-sal_Int32 nIndex = aExpectedFVPrefix.getLength();
+sal_Int32 nIndex = strlen(aExpectedFVPrefix);
aPair.First.Value =
uno::makeAny(static_castsal_uInt32(aToken.getToken(0, '}',
nIndex).toInt32()));
-static const OString aExpectedFTPrefix = , Type = (short) ;
+static const char aExpectedFTPrefix[] = , Type = (short) ;
aToken = aToken.copy(nIndex);
[Bug 38835] strip out non-trivial globals before main
https://bugs.freedesktop.org/show_bug.cgi?id=38835 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup |target:4.4.0|target:4.4.0 target:4.5.0 -- 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
[Bug 38835] strip out non-trivial globals before main
https://bugs.freedesktop.org/show_bug.cgi?id=38835 --- Comment #15 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0375504f7be34d857859dfbaa312501e0ed1 fdo#38835 strip out OString globals It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: include/comphelper include/sot sfx2/source
include/comphelper/classids.hxx |4
include/sot/object.hxx |1 -
sfx2/source/doc/sfxbasemodel.cxx | 13 ++---
3 files changed, 2 insertions(+), 16 deletions(-)
New commits:
commit bcd4f99e9dafaa41fe9311b32182e73b3b554007
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 10:59:28 2014 +0100
Remove dead SO3_GLOBAL_CLASSID and SvObject
Change-Id: I57c1c4bf6482be7c3cf13c424972d4ed3b9a6b62
diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx
index 635f51f..7cc708f 100644
--- a/include/comphelper/classids.hxx
+++ b/include/comphelper/classids.hxx
@@ -376,10 +376,6 @@
0x1a8a6701, 0xde58, 0x11cf, \
0x89, 0xca, 0x0, 0x80, 0x29, 0xe4, 0xb0, 0xb1
-#define SO3_GLOBAL_CLASSID \
- 0x475198a8, 0x694c, 0x4bd8, \
-0xb0, 0x2f, 0xd9, 0xb7, 0x6b, 0xcf, 0x31, 0x28
-
#define SO3_RPT_CLASSID_90 \
0xd7896d52, 0xb7af, 0x4820, \
0x9d, 0xfe, 0xd4, 0x04, 0xd0, 0x15, 0x96, 0x0f
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 4ee7297..0bcfdc7 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -94,7 +94,6 @@ struct IUnknown;
class SOT_DLLPUBLIC SotObject : virtual public SvRefBase
{
friend class SotFactory;
-friend class SvObject;
sal_uInt16 nOwnerLockCount;
boolbOwner;
boolbSVObject;// Ist Proxy, dann TRUE wenn andere Seite SV
ist
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 19cbdf4..090a455 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3312,25 +3312,16 @@ void SAL_CALL SfxBaseModel::removePrintJobListener(
const Reference view::XPrin
}
}
-// simple declaration of class SvObject is enough
-// the corresponding so3/iface.hxx cannon be included because it provides
-// declaration of class SvBorder that conflicts with ../../inc/viewfrm.hxx
-class SvObject;
sal_Int64 SAL_CALL SfxBaseModel::getSomething( const Sequence sal_Int8
aIdentifier ) throw(RuntimeException, std::exception)
{
SvGlobalName aName( aIdentifier );
-if ((aName == SvGlobalName( SO3_GLOBAL_CLASSID )) ||
-(aName == SvGlobalName( SFX_GLOBAL_CLASSID )))
+if (aName == SvGlobalName( SFX_GLOBAL_CLASSID ))
{
SolarMutexGuard aGuard;
SfxObjectShell *const pObjectShell(GetObjectShell());
if (pObjectShell)
{
-// SO3_GLOBAL_CLASSID is apparently used by binfilter :(
-if ( aName == SvGlobalName( SO3_GLOBAL_CLASSID ) )
- return reinterpret_castsal_Int64((SvObject*) pObjectShell);
-else if ( aName == SvGlobalName( SFX_GLOBAL_CLASSID ) )
- return reinterpret_castsal_Int64((SfxObjectShell*)
pObjectShell);
+return reinterpret_castsal_Int64((SfxObjectShell*) pObjectShell);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/generic/gendata.hxx |8
vcl/inc/unx/gtk/gtkdata.hxx |5 +
2 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit e09cd23cea227fc40110650488c5bd09f72b3a52
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 11:01:02 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
...though it's unclear to me why loplugin:csytlecast doesn't complain about
the
C-style cast in GtkData::GetGtkDisplay; needs further investigation.
Change-Id: Ie5c42dd2c1c97cf4092b2cb6bafa599cc36daab7
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 384c20a..6c34226 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -14,8 +14,6 @@
#include saldatabasic.hxx
-// Not the prettiest - but helpful for migrating old code ...
-class GtkSalDisplay;
class SalGenericDisplay;
enum SalGenericDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
@@ -59,12 +57,6 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
// Mostly useful for remote protocol backends
virtual void ErrorTrapPush() = 0;
virtual bool ErrorTrapPop( bool bIgnoreError = true ) = 0; // true on error
-
-// Not the prettiest - but helpful for migrating old code ...
-inline GtkSalDisplay *GetGtkDisplay() const
-{
-return (GtkSalDisplay *)GetDisplay();
-}
};
inline SalGenericData * GetGenericData()
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 0622f59..235c599 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -118,6 +118,11 @@ public:
virtual void ErrorTrapPush() SAL_OVERRIDE;
virtual bool ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE;
+
+inline GtkSalDisplay *GetGtkDisplay() const
+{
+return (GtkSalDisplay *)GetDisplay();
+}
};
class GtkSalFrame;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/iderdll.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 991457df432fc2b386d9c5b6e14e8c0b02415563 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 5 11:11:30 2014 +0100 loplugin:unreffun Change-Id: I6dbb20c82b58b81aa4cfb8cc3cf80f6d1202075d diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 53fd2c1..b6d5e29 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -20,7 +20,7 @@ #include comphelper/scoped_disposing_ptr.hxx #include comphelper/processfactory.hxx - +#include iderdll.hxx #include iderdll2.hxx #include iderid.hxx #include basidesh.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/calc/CTables.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 05a651d2dd574cf82aa81bb624904ad746e0c5a5
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 11:16:20 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: Ib3127eb72ca72f55ce6082ebcb05fceb80608c47
diff --git a/connectivity/source/drivers/calc/CTables.cxx
b/connectivity/source/drivers/calc/CTables.cxx
index 8a2fae9..5eb 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+
+#include calc/CConnection.hxx
#include calc/CTables.hxx
#include calc/CTable.hxx
#include file/FCatalog.hxx
@@ -37,7 +40,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType OCalcTables::createObject(const OUString _rName)
{
-OCalcTable* pTable = new
OCalcTable(this,(OCalcConnection*)static_castOFileCatalog(m_rParent).getConnection(),
+OCalcTable* pTable = new OCalcTable(this,
static_castOCalcConnection*(static_castOFileCatalog(m_rParent).getConnection()),
_rName,OUString(TABLE));
sdbcx::ObjectType xRet = pTable;
pTable-construct();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/dbase/DTables.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e5a63993f68edb8182abbf50d24321ec22137889
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 11:28:08 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: I4b291f0d40fd8622094a706f8241c8917e4f0cf3
diff --git a/connectivity/source/drivers/dbase/DTables.cxx
b/connectivity/source/drivers/dbase/DTables.cxx
index 8ec47ad..ae1361e 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+
+#include dbase/DConnection.hxx
#include dbase/DTables.hxx
#include dbase/DTable.hxx
#include com/sun/star/sdbc/XRow.hpp
@@ -45,7 +48,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType ODbaseTables::createObject(const OUString _rName)
{
-ODbaseTable* pRet = new
ODbaseTable(this,(ODbaseConnection*)static_castOFileCatalog(m_rParent).getConnection(),
+ODbaseTable* pRet = new ODbaseTable(this,
static_castODbaseConnection*(static_castOFileCatalog(m_rParent).getConnection()),
_rName,OUString(TABLE));
sdbcx::ObjectType xRet = pRet;
@@ -60,7 +63,7 @@ void ODbaseTables::impl_refresh( ) throw(RuntimeException)
Reference XPropertySet ODbaseTables::createDescriptor()
{
-return new
ODbaseTable(this,(ODbaseConnection*)static_castOFileCatalog(m_rParent).getConnection());
+return new ODbaseTable(this,
static_castODbaseConnection*(static_castOFileCatalog(m_rParent).getConnection()));
}
// XAppend
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/inc/java/sql/JStatement.hxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 4e77f102e2cfbf72e15ed85a8f5dc3b9a5f6c0ef
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 11:42:09 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: I614bd8433a105a2855e0efa039f4a9986197435f
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx
b/connectivity/source/inc/java/sql/JStatement.hxx
index 998c9f8..b2b321a 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -35,6 +35,7 @@
#include com/sun/star/lang/XServiceInfo.hpp
#include comphelper/broadcasthelper.hxx
+#include java/sql/Connection.hxx
#include java/sql/ConnectionLog.hxx
namespace connectivity
@@ -47,9 +48,6 @@ namespace connectivity
::com::sun::star::sdbc::XGeneratedResultSet,
::com::sun::star::sdbc::XMultipleResults java_sql_Statement_BASE;
-class java_sql_Connection;
-
-
// Class: java.sql.Statement
class java_sql_Statement_Base : public comphelper::OBaseMutex,
@@ -172,7 +170,7 @@ namespace connectivity
friend class OSubComponentOStatement_BASE2, java_sql_Statement_BASE;
public:
OStatement_BASE2(JNIEnv * pEnv, java_sql_Connection _rCon ) :
java_sql_Statement_Base( pEnv, _rCon ),
-OSubComponentOStatement_BASE2,
java_sql_Statement_BASE((::cppu::OWeakObject*)(_rCon), this){}
+OSubComponentOStatement_BASE2,
java_sql_Statement_BASE(static_castcppu::OWeakObject*(_rCon), this){}
// OComponentHelper
virtual void SAL_CALL disposing(void) SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: C++11 on master (towards LO 4.5)
On 12/04/2014 09:55 PM, Terrence Enger wrote: It's not a big deal for me (because I am just looking for trouble, not trying to get work done), but maybe somebody cares: my attempt to run LibreOffice installed from (I am retyping this with newlines added) http://dev-build.libreoffice.org/daily/master/Win-x86@43/current/ libo-master~2014-12-04_02.44.11_LibreOfficeDev_4.5.0.0.alpha0_Win_x86.msi on Windows Vista fails with message This application has failed to start because MSVCR120.dll was not found. Re-installing the application may fix this problem. A comparison with my previous installation, TinderBox: Win-x86@51-TDF, Branch:MASTER, Time: 2014-11-28_08:54:54, shows that program/ within the older installation has msvc480.dll but the newer version does not. Neither program/ has MSVCR120.dll. I assume you mean @42, not @43? Looking into http://dev-builds.libreoffice.org/daily/master/Win-x86@42/2014-12-04_22.57.23/libo-master~2014-12-04_22.57.23_LibreOfficeDev_4.5.0.0.alpha0_Win_x86.msi with Orca, there /is/ a msvcr120.dll included in the File table. It is not clear to me why that apparently does not get installed onto your machine or is not found by LO (and it is neither clear to me where it would be installed to, into the LO program directory or into some global Windows directory). Maybe Timar knows more. (Older dailies would likely not contain nor require msvcr120.dll, as that is the runtime corresponding to the MSVC 2013 compiler. Older dailies had likely been built with the MSVC 2012 compiler, with corresponding runtime msvcr110.dll.) I assume you mean msvcr80.dll, not msvc480.dll? msvcr80.dll (corresponding to MSVC 2005, I think) is included in LO installation sets because LO's Mozilla address book driver needs it. It is only included if the build has been configured --enable-win-mozab-driver. There appears to be no useful accounting for the daily builds, but I'd assume that the given libo-master~2014-12-04_22.57.23_LibreOfficeDev_4.5.0.0.alpha0_Win_x86.msi has been configured --disable-win-mozab-driver. Thorsten should know more. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 on master (towards LO 4.5)
On Fri, Dec 5, 2014 at 11:49 AM, Stephan Bergmann sberg...@redhat.com wrote: On 12/04/2014 09:55 PM, Terrence Enger wrote: It's not a big deal for me (because I am just looking for trouble, not trying to get work done), but maybe somebody cares: my attempt to run LibreOffice installed from (I am retyping this with newlines added) http://dev-build.libreoffice.org/daily/master/Win-x86@43/current/ libo-master~2014-12-04_02.44.11_LibreOfficeDev_4.5.0.0.alpha0_Win_x86.msi on Windows Vista fails with message This application has failed to start because MSVCR120.dll was not found. Re-installing the application may fix this problem. A comparison with my previous installation, TinderBox: Win-x86@51-TDF, Branch:MASTER, Time: 2014-11-28_08:54:54, shows that program/ within the older installation has msvc480.dll but the newer version does not. Neither program/ has MSVCR120.dll. I assume you mean @42, not @43? Looking into http://dev-builds.libreoffice.org/daily/master/Win-x86@42/2014-12-04_22.57.23/libo-master~2014-12-04_22.57.23_LibreOfficeDev_4.5.0.0.alpha0_Win_x86.msi with Orca, there /is/ a msvcr120.dll included in the File table. It is not clear to me why that apparently does not get installed onto your machine or is not found by LO (and it is neither clear to me where it would be installed to, into the LO program directory or into some global Windows directory). Maybe Timar knows more. It is to be installed into System directory of Windows (provided by the VC++ Runtime merge module). It is not enough to unpack the msi with msiexex /a (so called parallel install), if the correct VC++ Runtime was never installed to the system. Regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdpntv.hxx |4 ++--
svx/source/svdraw/svdpntv.cxx |7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit d2a90d997abb13fa994de9803a6357eda494a2c3
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 12:05:26 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: I877e3b362dd8b2f9c94e28d2ffa56c378d0d094e
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 21d4474..a1bede0 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -519,8 +519,8 @@ public:
// bei bShow=sal_False wird der Browser destruiert
#ifdef DBG_UTIL
void ShowItemBrowser(bool bShow=true);
-bool IsItemBrowserVisible() const { return pItemBrowser!=NULL
((vcl::Window*)pItemBrowser)-IsVisible(); }
-vcl::Window* GetItemBrowser() const { return (vcl::Window*)pItemBrowser; }
+bool IsItemBrowserVisible() const { return pItemBrowser!=NULL
GetItemBrowser()-IsVisible(); }
+vcl::Window* GetItemBrowser() const;
#endif
// Muss von App beim Scrollen usw. gerufen werden, damit ein u.U.
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 4ea0087..f48611f 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -1191,6 +1191,13 @@ void SdrPaintView::SetAnimationEnabled( bool bEnable )
SetAnimationMode( bEnable ? SDR_ANIMATION_ANIMATE : SDR_ANIMATION_DISABLE
);
}
+#if defined DBG_UTIL
+vcl::Window* SdrPaintView::GetItemBrowser() const
+{
+return pItemBrowser;
+}
+#endif
+
void SdrPaintView::SetAnimationPause( bool bSet )
{
if((bool)bAnimationPause != bSet)
___
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' - 3 commits - bin/run sfx2/source
bin/run | 28 +---
sfx2/source/doc/sfxbasemodel.cxx |1 +
2 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 39ce75b14650819f88362b0e2fd2db9b1a8dcf71
Author: Michael Stahl mst...@redhat.com
Date: Thu Dec 4 21:46:44 2014 +0100
sfx2: reset the error code before 2nd load with repair (related: fdo#56245)
(regression from c7c385bb8e42d2051bcf05fd75b2146fe9852317)
Change-Id: I39eca96b45ad974a7e1a6913aa811c6b03ceced7
(cherry picked from commit ef1f3b6713118c5eb43da7fa85caf40107b468c1)
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index cbefd53..7d72879 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1882,6 +1882,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence
beans::PropertyValue seqA
pMedium-ResetError();
pMedium-CloseStorage();
m_pData-m_pObjectShell-PrepareSecondTryLoad_Impl();
+nError = ERRCODE_NONE;
if ( !m_pData-m_pObjectShell-DoLoad(pMedium) )
nError=ERRCODE_IO_GENERAL;
if (m_pData-m_pObjectShell-GetErrorCode())
commit 564f74ce4f70211290c93881f3c0e4e5f1587b2e
Author: Michael Stahl mst...@redhat.com
Date: Thu Dec 4 16:08:42 2014 +0100
bin/run: add WNT support
Change-Id: I9dd1ae23d27c5733770314ca907b5d36b749fd74
(cherry picked from commit 79233d98d98df1a56e623f35806183071499b194)
diff --git a/bin/run b/bin/run
index e61adec..382ff73 100755
--- a/bin/run
+++ b/bin/run
@@ -9,7 +9,29 @@
# simple wrapper script to run non-installed executables from workdir
-if [ $(uname) = Darwin ]; then
+if uname | grep -i CYGWIN /dev/null; then
+
+dir=$(realpath $(pwd))
+
+while test ! -d ${dir}/instdir/program ; do
+if test ${dir} = /; then
+echo error: cannot find \program\ dir from \$(pwd)\
+exit 1
+fi
+dir=$(realpath ${dir}/..)
+done
+
+exedir=${dir}/workdir/LinkTarget/Executable
+export URE_BOOTSTRAP=file:///$(cygpath -m
${dir})/instdir/program/fundamental.ini
+export PATH=${PATH:+$PATH:}${dir}/instdir/program
+
+echo setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}
+echo setting search path to: ${PATH}
+echo execing: ${exedir}/$1
+
+exec ${exedir}/$@
+
+elif [ $(uname) = Darwin ]; then
dir=$(pwd)
commit 375e8582dbd1fb82bdd90959fbdc325304e08802
Author: Michael Stahl mst...@redhat.com
Date: Thu Dec 4 15:33:24 2014 +0100
bin/run: Adapt to run on Debian so-called GNU/Linux systems too
Amazingly Debian does not ship the realpath(1) from coreutils but has a
separate source package for it, and it's not installed by default.
Use readlink -f instead.
Change-Id: I6e97c851e6ab96dac08771145e2ab39dd9c11c22
(cherry picked from commit 9eda6b307ba6c5426c40c4cad95e07e43858230e)
diff --git a/bin/run b/bin/run
index dffa9cf..e61adec 100755
--- a/bin/run
+++ b/bin/run
@@ -30,14 +30,14 @@ exec ${exedir}/$@
else
-dir=$(realpath $(pwd))
+dir=$(readlink -f $(pwd))
while test ! -d ${dir}/instdir/program ; do
if test ${dir} = /; then
echo error: cannot find \program\ dir from \$(pwd)\
exit 1
fi
-dir=$(realpath ${dir}/..)
+dir=$(readlink -f ${dir}/..)
done
exedir=${dir}/workdir/LinkTarget/Executable
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svddrgv.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 06e8e1574ef743cb565d01ada8381cf6a9881e82 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 5 12:09:44 2014 +0100 loplugin:cstylecast, involving pointer to incomplete type Change-Id: I901ab5100e3f4fa2089bb85de1293207225d1adc diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 1bf74e5..0500402 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -19,6 +19,7 @@ #include svx/svddrgv.hxx +#include svx/svdview.hxx #include svx/xattr.hxx #include svx/xpoly.hxx #include svx/svdetc.hxx @@ -235,7 +236,7 @@ bool SdrDragView::BegDragObj(const Point rPnt, OutputDevice* pOut, SdrHdl* pHdl aDragStat.Reset(pHdl-GetPos()); } -aDragStat.SetView((SdrView*)this); +aDragStat.SetView(static_castSdrView*(this)); aDragStat.SetPageView(pMarkedPV); // -- DragPV has to go here!!! aDragStat.SetMinMove(ImpGetMinMovLogic(nMinMov,pOut)); aDragStat.SetHdl(pHdl); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/items/textitem.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9284699648fec713a0b5d6c49157be0ee894d592
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 5 12:45:38 2014 +0100
-Werror=format on Android
Probably 32bit vs 64bit.
Change-Id: I3ca93e88393538ba20cce23a7165d406db3144c4
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index aa0e57c..5ccc7c7 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -592,7 +592,7 @@ void SvxPostureItem::SetBoolValue( bool bVal )
void SvxPostureItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST(svxPostureItem));
-xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST(whichId), %
SAL_PRIuUINT32, Which());
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST(whichId), %d,
Which());
xmlTextWriterWriteAttribute(pWriter, BAD_CAST(presentation),
BAD_CAST(GetValueTextByPos(GetValue()).toUtf8().getStr()));
xmlTextWriterEndElement(pWriter);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 svx/source
include/sfx2/childwin.hxx |2 +-
svx/source/dialog/hyperdlg.cxx | 15 +--
2 files changed, 2 insertions(+), 15 deletions(-)
New commits:
commit 0cb6a92f86e02f6342be5e8f931dc1849114230c
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 12:42:34 2014 +0100
Broken cast
All the way back since 2001 (ed53aaf5842e82f9a8d4d053b39e7db61c6d62ce
#89611#
react for (Beamer!)Frame-dispose() from outside, adding member
SfxChildWindow_Impl::xListener), that MyStruct hack was not in sync with
SfxChildWindow_Impl, so
((MyStruct*)pImp)-bVisible = false;
probably corrputed pFact rather than change bVisible. The origin of that
MyStruct hack is lost to history, but probably stems from an ancient time
when
changes across modules where prohibitively expensive, esp. when some
feature had
to be crammed in shortly before release...
Change-Id: I13dc30c96ef70b2cc09dc117231c021910e0ce1e
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 81b78f8..592ab9a 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -205,7 +205,7 @@ public:
voidSetFrame( const ::com::sun::star::uno::Reference
::com::sun::star::frame::XFrame );
SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16,
SfxChildWinInfo);
-SAL_DLLPRIVATE void SetVisible_Impl( bool bVis );
+void SetVisible_Impl( bool bVis );
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
SAL_DLLPRIVATE void Activate_Impl();
SAL_DLLPRIVATE void Deactivate_Impl();
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 9aeefe8..40464de 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -32,19 +32,6 @@
SFX_IMPL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper, SID_HYPERLINK_DIALOG)
-
-
-struct MyStruct
-{
-::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame xFrame;
-SfxChildWinFactory* pFact;
-boolbHideNotDelete;
-boolbVisible;
-boolbHideAtToggle;
-SfxModule* pContextModule;
-SfxWorkWindow* pWorkWin;
-};
-
SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
@@ -58,7 +45,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window*
_pParent, sal_uInt16 nId,
mpDlg = pFact-CreateSvxHpLinkDlg( _pParent, pBindings,
SID_HYPERLINK_DIALOG );
DBG_ASSERT(mpDlg, Dialog creation failed!);
pWindow = mpDlg-GetWindow();
-((MyStruct*)pImp)-bVisible = false;
+SetVisible_Impl(false);
vcl::Window* pTopWindow = 0;
if ( pInfo-aSize.Width() != 0 pInfo-aSize.Height() != 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/bootstrap.cxx | 25 -
1 file changed, 25 deletions(-)
New commits:
commit e6aa6daccf14827d92fd50a300738dda68527eb5
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 12:51:23 2014 +0100
[API CHANGE] Remove .link feature from bootstrap variables
This feature had never been documented in include/rtl/bootstrap.h and had
only
been used internally in LO on Windows for the multi-layer installations
(thus is
unused since 827430c8c0417396b3c1d2a049ccddb818c89646 Fold URE: Windows),
so
it should not hurt to remove it even if it could be considered part of the
stable URE interface.
Change-Id: If0f59f30dad8b2c3ff5f7931c19cd254073ccf80
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 39b7665..01f5331 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -930,31 +930,6 @@ rtl::OUString expandMacros(
}
if (n == 1) {
buf.append(lookup(file, mode, false, seg[0],
requestStack));
-} else if (n == 2 seg[0] == .link) {
-osl::File f(seg[1]);
-rtl::ByteSequence seq;
-rtl::OUString line;
-rtl::OUString url;
-// Silently ignore any errors (is that good?):
-if ((f.open(osl_File_OpenFlag_Read) ==
- osl::FileBase::E_None)
-f.readLine(seq) == osl::FileBase::E_None
-rtl_convertStringToUString(
-line.pData,
-reinterpret_cast char const * (
-seq.getConstArray()),
-seq.getLength(), RTL_TEXTENCODING_UTF8,
-(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
- RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
- RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))
-(osl::File::getFileURLFromSystemPath(line, url) ==
- osl::FileBase::E_None))
-{
-try {
-buf.append(
-rtl::Uri::convertRelToAbs(seg[1], url));
-} catch (const rtl::MalformedUriException ) {}
-}
} else if (n == 3 seg[0] == .override) {
rtl::Bootstrap b(seg[1]);
Bootstrap_Impl * f = static_cast Bootstrap_Impl * (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/sdi sc/source
sc/sdi/scalc.sdi |2 +-
sc/source/ui/view/tabvwsh3.cxx | 16 ++--
sc/source/ui/view/tabvwsha.cxx |6 --
3 files changed, 7 insertions(+), 17 deletions(-)
New commits:
commit 2f90974fd06870457301ec0be0ab8c43981689ec
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Fri Dec 5 13:22:06 2014 +0100
fdo85897 Make 'Function List' only accessible in sidebar
Change-Id: I875d1dd75c02f617814a934b34b5099f9c2279cc
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index e196e85..2fbf373 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2866,7 +2866,7 @@ SfxVoidItem FreezePanes SID_WINDOW_FIX
]
-SfxBoolItem FunctionBox FID_FUNCTION_BOX
+SfxVoidItem FunctionBox FID_FUNCTION_BOX
[
/* flags: */
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 312ff21..8253b37 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -25,6 +25,7 @@
#include sfx2/dispatch.hxx
#include sfx2/passwd.hxx
#include sfx2/request.hxx
+#include sfx2/sidebar/Sidebar.hxx
#include svl/ptitem.hxx
#include svl/stritem.hxx
#include tools/urlobj.hxx
@@ -540,16 +541,11 @@ void ScTabViewShell::Execute( SfxRequest rReq )
case FID_FUNCTION_BOX:
{
-sal_uInt16 nChildId =
ScFunctionChildWindow::GetChildWindowId();
-if ( rReq.GetArgs() )
-pThisFrame-SetChildWindow( nChildId, static_castconst
SfxBoolItem(rReq.GetArgs()-Get(FID_FUNCTION_BOX)).GetValue());
-else
-{
-pThisFrame-ToggleChildWindow( nChildId );
-rReq.AppendItem( SfxBoolItem( FID_FUNCTION_BOX ,
pThisFrame-HasChildWindow( nChildId ) ) );
-}
+// First make sure that the sidebar is visible
+pThisFrame-ShowChildWindow(SID_SIDEBAR);
-GetViewFrame()-GetBindings().Invalidate(FID_FUNCTION_BOX);
+::sfx2::sidebar::Sidebar::ShowPanel(FunctionsPanel,
+
pThisFrame-GetFrame().GetFrameInterface());
rReq.Done ();
}
break;
@@ -1107,7 +1103,7 @@ void ScTabViewShell::Execute( SfxRequest rReq )
break;
default:
-OSL_FAIL(Unbekannter Slot bei ScTabViewShell::Execute);
+OSL_FAIL(Unknown Slot at ScTabViewShell::Execute);
break;
}
}
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index e543588..6c2896d 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -152,7 +152,6 @@ void ScTabViewShell::GetState( SfxItemSet rSet )
SCCOL nPosX = rViewData.GetCurX();
SCROW nPosY = rViewData.GetCurY();
SCTAB nTab= rViewData.GetTabNo();
-sal_uInt16 nMyId = 0;
SfxViewFrame* pThisFrame = GetViewFrame();
bool bOle = GetViewFrame()-GetFrame().IsInPlace();
@@ -344,11 +343,6 @@ void ScTabViewShell::GetState( SfxItemSet rSet )
}
break;
-case FID_FUNCTION_BOX:
-nMyId = ScFunctionChildWindow::GetChildWindowId();
-rSet.Put(SfxBoolItem(FID_FUNCTION_BOX,
pThisFrame-HasChildWindow(nMyId)));
-break;
-
case FID_PROTECT_DOC:
{
if ( pDocShell pDocShell-IsDocShared() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/inc/swmodeltestbase.hxx| 14 ++
sw/qa/extras/uiwriter/data/fdo87005.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 11 +++
sw/source/core/text/itrform2.cxx|7 +++
4 files changed, 28 insertions(+), 4 deletions(-)
New commits:
commit 25c50ff9fb0f277da9bc164d8244a774ef1ebba4
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 5 12:12:50 2014 +0100
fdo#87005 SwTxtFormatter::NewPortion: fix lost SwFlyPortion
In case there are two flys anchored to the paragraph and it's empty,
then the situation is that SwTxtFormatter::BuildPortions() calls
NewPortion() two times, second time the SwTxtFormatInfo has no fly set
initially, only after NewPortion() calls CalcFlyWidth(). When that
happens, we used to return pPor, even in case it was 0, and we the
SwTxtFormatInfo had a fly portion.
Fix the problem by checking if SwTxtFormatInfo has a fly portion after
CalcFlyWidth(), and in case otherwise we would return 0, return the fly
portion of SwTxtFormatInfo instead. As a result, the paragraph delimiter
in the bugdoc will be positioned at the correct position, as the
SwTxtFrm will properly have two layout portions, just like non-empty
SwTxtFrms.
Change-Id: I51e5ba61e79b4353c7b11c6d76b8c370ac3d4d37
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 4f71ff6..cc18a77 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -392,6 +392,15 @@ protected:
return xAutoStyleFamily;
}
+/// Similar to parseExport(), but this gives the xmlDocPtr of the layout
dump.
+xmlDocPtr parseLayoutDump()
+{
+if (!mpXmlBuffer)
+dumpLayout();
+
+return xmlParseMemory((const char*)xmlBufferContent(mpXmlBuffer),
xmlBufferLength(mpXmlBuffer));;
+}
+
/**
* Extract a value from the layout dump using an XPath expression and an
attribute name.
*
@@ -399,10 +408,7 @@ protected:
*/
OUString parseDump(const OString aXPath, const OString aAttribute =
OString())
{
-if (!mpXmlBuffer)
-dumpLayout();
-
-xmlDocPtr pXmlDoc = xmlParseMemory((const
char*)xmlBufferContent(mpXmlBuffer), xmlBufferLength(mpXmlBuffer));;
+xmlDocPtr pXmlDoc = parseLayoutDump();
xmlXPathContextPtr pXmlXpathCtx = xmlXPathNewContext(pXmlDoc);
xmlXPathObjectPtr pXmlXpathObj =
xmlXPathEvalExpression(BAD_CAST(aXPath.getStr()), pXmlXpathCtx);
diff --git a/sw/qa/extras/uiwriter/data/fdo87005.odt
b/sw/qa/extras/uiwriter/data/fdo87005.odt
new file mode 100644
index 000..54d7119
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/fdo87005.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 6fe83c2..7352983 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -61,6 +61,7 @@ public:
void testChineseConversionSimplifiedToTraditional();
void testFdo85554();
void testAutoCorr();
+void testFdo87005();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -85,6 +86,7 @@ public:
CPPUNIT_TEST(testChineseConversionSimplifiedToTraditional);
CPPUNIT_TEST(testFdo85554);
CPPUNIT_TEST(testAutoCorr);
+CPPUNIT_TEST(testFdo87005);
CPPUNIT_TEST_SUITE_END();
@@ -620,6 +622,15 @@ void SwUiWriterTest::testAutoCorr()
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable-getColumns()-getCount());
}
+void SwUiWriterTest::testFdo87005()
+{
+createDoc(fdo87005.odt);
+xmlDocPtr pXmlDoc = parseLayoutDump();
+CPPUNIT_ASSERT(pXmlDoc);
+// This was 1, no SwFlyPortion was created for the second fly.
+assertXPath(pXmlDoc, //Special[@nType='POR_FLY'], 2);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 37ae1bab..fca53ab 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1301,6 +1301,13 @@ SwLinePortion *SwTxtFormatter::NewPortion(
SwTxtFormatInfo rInf )
{
rInf.SetFull(true);
CalcFlyWidth( rInf );
+
+// In case we have no portion to return, but CalcFlyWidth()
+// created a fly portion, then return that. Otherwise such a
+// fly portion would not be ever inserted to the layout.
+if (!pPor)
+pPor = rInf.GetFly();
+
return pPor;
}
cChar = rInf.GetChar( rInf.GetIdx() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa dbaccess/qa extensions/source sc/source svx/source
basic/qa/cppunit/test_scanner.cxx | 12 +--
dbaccess/qa/unit/embeddeddb_performancetest.cxx |6 -
extensions/source/abpilot/admininvokationimpl.cxx |7 +-
sc/source/ui/vba/vbavalidation.cxx| 72 +-
svx/source/form/dbtoolsclient.cxx |3
5 files changed, 44 insertions(+), 56 deletions(-)
New commits:
commit 86b44e8e78716fbfc1783d692debcbb201fb9bd4
Author: Noel Grandin n...@peralex.com
Date: Fri Dec 5 15:06:44 2014 +0200
fdo#38835 strip out OUString globals
Change-Id: I8bc386ffa88e31988bdc778a845403bec0772799
diff --git a/basic/qa/cppunit/test_scanner.cxx
b/basic/qa/cppunit/test_scanner.cxx
index f9421b2..2618c08 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -67,12 +67,12 @@ namespace
CPPUNIT_TEST_SUITE_END();
};
- const static OUString cr(\n);
- const static OUString rem(REM);
- const static OUString asdf(asdf);
- const static OUString dot(.);
- const static OUString goto_(goto);
- const static OUString excl(!);
+ static const char cr[] = \n;
+ static const char rem[] = REM;
+ static const char asdf[] = asdf;
+ static const char dot[] = .;
+ static const char goto_[] = goto;
+ static const char excl[] = !;
std::vectorSymbol getSymbols(const OUString source, sal_Int32 errors,
bool bCompatible = false)
{
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index 662ed73..5c0a6b6 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -86,7 +86,7 @@ class EmbeddedDBPerformanceTest
: public DBTestBase
{
private:
-const static OUString our_sEnableTestEnvVar;
+static const char our_sEnableTestEnvVar[];
// We store the results and print them at the end due to the amount of
warning
// noise present which otherwise obscures the results.
@@ -154,14 +154,14 @@ void EmbeddedDBPerformanceTest::printTimes(
);
}
-const OUString
EmbeddedDBPerformanceTest::our_sEnableTestEnvVar(DBA_PERFTEST);
+const char EmbeddedDBPerformanceTest::our_sEnableTestEnvVar[] = DBA_PERFTEST;
// TODO: we probably should create a document from scratch instead?
void EmbeddedDBPerformanceTest::testPerformance()
{
OUString sEnabled;
-osl_getEnvironment(our_sEnableTestEnvVar.pData, sEnabled.pData);
+osl_getEnvironment(OUString(our_sEnableTestEnvVar).pData, sEnabled.pData);
if (sEnabled.isEmpty())
return;
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx
b/extensions/source/abpilot/admininvokationimpl.cxx
index d924faf..424ef33 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -67,8 +67,8 @@ namespace abp
try
{
// the service name of the administration dialog
-const static OUString s_sAdministrationServiceName =
com.sun.star.sdb.DatasourceAdministrationDialog;
-const static OUString s_sDataSourceTypeChangeDialog =
com.sun.star.sdb.DataSourceTypeChangeDialog;
+static const char s_sAdministrationServiceName[] =
com.sun.star.sdb.DatasourceAdministrationDialog;
+static const char s_sDataSourceTypeChangeDialog[] =
com.sun.star.sdb.DataSourceTypeChangeDialog;
// the parameters for the call
Sequence Any aArguments(3);
@@ -91,7 +91,8 @@ namespace abp
// creating the dialog service is potentially expensive (if
all the libraries invoked need to be loaded)
// so we display a wait cursor
WaitObject aWaitCursor(m_pMessageParent);
-xDialog = Reference XExecutableDialog (
m_xContext-getServiceManager()-createInstanceWithArgumentsAndContext(_bFixedType
? s_sAdministrationServiceName : s_sDataSourceTypeChangeDialog, aArguments,
m_xContext), UNO_QUERY );
+ReferenceXInterface x =
m_xContext-getServiceManager()-createInstanceWithArgumentsAndContext(_bFixedType
? OUString(s_sAdministrationServiceName) :
OUString(s_sDataSourceTypeChangeDialog), aArguments, m_xContext);
+xDialog = Reference XExecutableDialog ( x, UNO_QUERY );
// just for a smoother UI: What the dialog does upon
execution, is (amongst other things) creating
// the DriverManager service
diff --git a/sc/source/ui/vba/vbavalidation.cxx
b/sc/source/ui/vba/vbavalidation.cxx
index b40de14..95585a0 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -35,23 +35,11 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-const static OUString VALIDATION( SC_UNONAME_VALIDAT );
-const static OUString IGNOREBLANK( SC_UNONAME_IGNOREBL );
-const static OUString SHOWINPUT( SC_UNONAME_SHOWINP );
-const static OUString SHOWERROR( SC_UNONAME_SHOWERR );
-const static
[Bug 38835] strip out non-trivial globals before main
https://bugs.freedesktop.org/show_bug.cgi?id=38835 --- Comment #16 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=86b44e8e78716fbfc1783d692debcbb201fb9bd4 fdo#38835 strip out OUString globals It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: jurt/source
jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c | 18 +--
jurt/source/pipe/wrapper/wrapper.c | 51
+++---
2 files changed, 46 insertions(+), 23 deletions(-)
New commits:
commit b21f2439ad2681f906c63c2192ef141d9abb9e37
Author: Juergen Funk juergen.funk...@cib.de
Date: Thu Nov 27 11:35:57 2014 +0100
fdo#86745 - Possible exception/segfault in jurt jpipe.dll under Windows ...
- Remove the LoadLibrary from DLLMain (from windows not recommended)
see
http://msdn.microsoft.com/en-us/library/windows/desktop/ms682583(v=vs.85).aspx
in section Remarks
- Improve the comment why we need two dll's (jpipe.dll and jpipx.dll)
- Integrate CriticalSection, init in DllMain see link
http://msdn.microsoft.com/en-us/library/windows/desktop/dn633971(v=vs.85).aspx#general_best_practices
Signed-off-by: Stephan Bergmann sberg...@redhat.com: removed the unsafe
module
== NULL check around the critical section in getFunction
Change-Id: I6d5f655a4942437f6dc722236f6c371063e2c407
diff --git
a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
index d47bfa0..6cdb2d1 100644
--- a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
+++ b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
@@ -21,15 +21,15 @@
#include osl/security.h
#include osl/pipe.h
-/* On Windows, jpipe.dll must not have dependencies on any other URE DLLs, as
- Java System.LoadLibrary could otherwise not load it. Therefore, on Windows,
- this code goes into a jpipx.dll that the jpipe.dll wrapper loads with
- LoadLibraryEx(LOAD_WITH_ALTERED_SEARCH_PATH). The function names in this
- wrapped code are truncated from the long JNICALL names, as JNICALL causes
- some @N with different numeric values for N (and probably different across
- 32 and 64 bit) to be added to the symbol names, which the calls to
- GetProcAddress in wrapper/wrapper.c would otheriwse have to take into
- account.
+/* On Windows, jpipe.dll must not have static dependencies on any other URE
DLLs
+ (sal3.dll, uwinapi.dll), as Java System.LoadLibrary could otherwise not load
+ it. Therefore, on Windows, this code goes into a jpipx.dll that the
jpipe.dll
+ wrapper loads with LoadLibraryEx(LOAD_WITH_ALTERED_SEARCH_PATH).
+ The function names in this wrapped code are truncated from the long JNICALL
+ names, as JNICALL causes some @N with different numeric values for
+ N (and probably different across 32 and 64 bit) to be added to the symbol
+ names, which the calls to GetProcAddress in wrapper/wrapper.c would
otherwise
+ have to take into account.
*/
/*/
diff --git a/jurt/source/pipe/wrapper/wrapper.c
b/jurt/source/pipe/wrapper/wrapper.c
index e9969bc..632b19a 100644
--- a/jurt/source/pipe/wrapper/wrapper.c
+++ b/jurt/source/pipe/wrapper/wrapper.c
@@ -26,27 +26,50 @@
#include jni.h
#include sal/types.h
-static HMODULE module;
-static FARPROC getFunction(char const * name) {
+static HMODULE module = NULL;
+static HINSTANCE hInstDLL = NULL;
+static CRITICAL_SECTION CriticalSection;
+
+void InitWrapper(void) {
+#define MAXPATH 512
+wchar_t path[MAXPATH];
+DWORD size;
+
+size = GetModuleFileNameW(hInstDLL, path, MAXPATH);
+if (size == 0) {
+abort();
+}
+path[size - 5] = L'x'; /* ...\jpipe.dll - ...\jpipx.dll */
+module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+if (module == NULL) {
+abort();
+}
+}
+
+static FARPROC getFunction(char const * name)
+{
+{
+EnterCriticalSection(CriticalSection);
+
+if(module == NULL)
+InitWrapper();
+
+LeaveCriticalSection(CriticalSection);
+}
+
return GetProcAddress(module, name);
}
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
(void) lpvReserved;
-if (fdwReason == DLL_PROCESS_ATTACH) {
-wchar_t path[32767];
-DWORD size;
-size = GetModuleFileNameW(hinstDLL, path, 32767);
-if (size == 0) {
-return FALSE;
-}
-path[size - 5] = L'x'; /* ...\jpipe.dll - ...\jpipx.dll */
-module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-if (module == NULL) {
-return FALSE;
-}
+
+if (fdwReason == DLL_PROCESS_ATTACH)
+{
+InitializeCriticalSection(CriticalSection);
+hInstDLL = hinstDLL;
}
+
return TRUE;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CustomTarget_generated.mk sw/Library_sw.mk sw/Module_sw.mk sw/source
sw/CustomTarget_generated.mk| 34 -- sw/Library_sw.mk|1 sw/Module_sw.mk |1 sw/source/core/inc/SwXMLBlockImport.hxx | 76 -- sw/source/core/swg/BlockListTokens.txt |7 sw/source/core/swg/SwXMLBlockImport.cxx | 404 sw/source/core/swg/SwXMLTextBlocks1.cxx | 93 --- sw/source/core/swg/TextBlockTokens.txt |5 8 files changed, 225 insertions(+), 396 deletions(-) New commits: commit 7ef4457b9fc06b5c25c607d7e0149f45c7015b10 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 5 14:22:55 2014 +0100 Revert fdo#80403: Writer specific AutoCorr use FastParser This reverts commit c1e90457d2ecc6e1171b7a296ab8bd05821e39e6 (plus follow-up c940d4d30673dc02ea34b5e60a4a8140648a0dba loplugin:saloverride and 5f0f3d4e91e9eb1d1f60b0cd073e7bbd8ea38c29 Work around -Werror,-Wdeprecated-register), it broke JunitTest_sw_unoapi. Change-Id: I21499f8a7810eef637bb51a30380ae60b3d915cd diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk deleted file mode 100644 index 2752799..000 --- a/sw/CustomTarget_generated.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,sw/generated)) - -sw_SRC := $(SRCDIR)/sw/source/core/swg -sw_PL := $(SRCDIR)/solenv/bin/gentoken.pl -sw_INC := $(call gb_CustomTarget_get_workdir,sw/generated) - -$(sw_INC)/TextBlockTokens.gperf : $(sw_SRC)/TextBlockTokens.txt $(sw_PL) - mkdir -p $(sw_INC) - $(PERL) $(sw_PL) $(sw_SRC)/TextBlockTokens.txt $(sw_INC)/TextBlockTokens.gperf - -$(sw_INC)/BlockListTokens.gperf : $(sw_SRC)/BlockListTokens.txt $(sw_PL) - mkdir -p $(sw_INC) - $(PERL) $(sw_PL) $(sw_SRC)/BlockListTokens.txt $(sw_INC)/BlockListTokens.gperf - -$(sw_INC)/tokens.cxx : $(sw_INC)/TextBlockTokens.gperf $(sw_INC)/BlockListTokens.gperf - $(GPERF) --compare-strncmp --readonly-tables --output-file=$(sw_INC)/tokens.cxx \ - --class-name=TextBlockTokens --word-array-name=textBlockList --enum $(sw_INC)/TextBlockTokens.gperf - $(GPERF) --compare-strncmp --readonly-tables -T $(sw_INC)/BlockListTokens.gperf \ - --class-name=BlockListTokens --word-array-name=blockListList $(sw_INC)/tokens.cxx - sed -i -e s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g $(sw_INC)/tokens.cxx - sed -i -e /^#line/d $(sw_INC)/tokens.cxx - -$(call gb_CustomTarget_get_target,sw/generated) : $(sw_INC)/tokens.cxx - -# vim: set noet sw=4 ts=4: diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 2816b05..c475315 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,sw,\ $(eval $(call gb_Library_use_custom_headers,sw,\ officecfg/registry \ - sw/generated \ )) $(eval $(call gb_Library_use_sdk_api,sw)) diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index bf110be..a7a31ef 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Module_Module,sw)) $(eval $(call gb_Module_add_targets,sw,\ $(call gb_Helper_optional,DESKTOP,Executable_tiledrendering) \ -CustomTarget_generated \ Library_msword \ Library_sw \ Library_swd \ diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 9c4e77c..ac166fd 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -21,14 +21,6 @@ #define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKIMPORT_HXX #include xmloff/xmlimp.hxx -#include xmloff/nmspmap.hxx -#include xmloff/xmlnmspe.hxx -#include com/sun/star/xml/sax/XFastTokenHandler.hpp -#include com/sun/star/xml/sax/FastToken.hpp -#include sax/fastattribs.hxx - -using namespace css::xml::sax; -using namespace xmloff::token; class SwXMLTextBlocks; class SwXMLBlockListImport : public SvXMLImport @@ -39,8 +31,10 @@ private: protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. -virtual SvXMLImportContext* CreateFastContext( sal_Int32 Element, -const css::uno::Reference css::xml::sax::XFastAttributeList xAttrList ) SAL_OVERRIDE; +virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, + const OUString rLocalName, + const ::com::sun::star::uno::Reference +::com::sun::star::xml::sax::XAttributeList xAttrList ) SAL_OVERRIDE; public: SwXMLBlockListImport( @@ -63,8 +57,10 @@ private: protected: // This method is called after the namespace map has
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/parsemanager.cxx |6 +++---
configmgr/source/parsemanager.hxx |1 -
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 161681e40bc281404275e12b775e8267fe790100
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 14:32:31 2014 +0100
Revert Log parsing time of each xcd file
This reverts commit ca85c87bf66d15e689cb09daf5dab5c4467046bc,
c57fb9ea459f08c33a4b8c129938411a59a19b77 Use xmlreader::XmlReader::getUrl
was
meant for real.
diff --git a/configmgr/source/parsemanager.cxx
b/configmgr/source/parsemanager.cxx
index 008f2bf..dab0c49 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -35,7 +35,7 @@ namespace configmgr {
ParseManager::ParseManager(
OUString const url, rtl::Reference Parser const parser)
- : url_(url), reader_(url), parser_(parser), itemNamespaceId_(-1)
+ : reader_(url), parser_(parser), itemNamespaceId_(-1)
{
assert(parser.is());
int id;
@@ -67,7 +67,7 @@ bool ParseManager::parse(std::set OUString const *
existingDependencies) {
if (!parser_-startElement(
reader_, itemNamespaceId_, itemData_,
existingDependencies))
{
-SAL_INFO(configmgr, parsing url_ took
(osl_getGlobalTimer() - startTime) ms, fail);
+SAL_INFO(configmgr, parsing reader_.getUrl() took
(osl_getGlobalTimer() - startTime) ms, fail);
return false;
}
break;
@@ -78,7 +78,7 @@ bool ParseManager::parse(std::set OUString const *
existingDependencies) {
parser_-characters(itemData_);
break;
case xmlreader::XmlReader::RESULT_DONE:
-SAL_INFO(configmgr, parsing url_ took
(osl_getGlobalTimer() - startTime) ms, success);
+SAL_INFO(configmgr, parsing reader_.getUrl() took
(osl_getGlobalTimer() - startTime) ms, success);
return true;
}
itemData_.clear();
diff --git a/configmgr/source/parsemanager.hxx
b/configmgr/source/parsemanager.hxx
index 74fa131..85ed3c5 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -47,7 +47,6 @@ public:
enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
private:
-OUString url_;
virtual ~ParseManager();
xmlreader::XmlReader reader_;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/Library_vcl.mk vcl/source
vcl/Library_vcl.mk|4
vcl/source/gdi/pdfwriter_impl.cxx | 220 --
2 files changed, 212 insertions(+), 12 deletions(-)
New commits:
commit 7e3c931786c3cbe83ee170b8b0746d141b520ce6
Author: Tor Lillqvist t...@collabora.com
Date: Fri Dec 5 16:06:08 2014 +0200
fdo#87030: PDF signing using Windows API, work in progress
Started writing a Windows version of PDFWriterImpl::finalizeSignature(). The
certificate we get from the selection dialog (in xmlsecurity) is from the
Windows built-in store anyway, so it is pointless to try to use it with
NSS. (See bug for longer discussion.)
So far it was pretty straightforward. The WinCrypt API seems clean and easy
to
use. But for some reason the CryptSignHash() call fails with Keyset does
not
exist (NTE_BAD_KEYSET). What am I missing?
Anyway, comitting this now as it does compile and doesn't make things worse.
Change-Id: I0941995ad6e22c5487c6e6fe0084d3df0b2341c7
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 1adccab..7c8ccb5 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -60,7 +60,8 @@ $(eval $(call gb_Library_use_custom_headers,vcl,\
$(eval $(call gb_Library_use_externals,vcl,\
jpeg \
- nss3 \
+ $(if $(filter-out WNT,$(OS)), \
+ nss3) \
libeot \
))
@@ -674,6 +675,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
$(eval $(call gb_Library_use_system_win32_libs,vcl,\
advapi32 \
+ crypt32 \
gdi32 \
gdiplus \
glu32 \
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index f8cc4a2..b459a8d 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -68,8 +68,8 @@
#include pdfwriter_impl.hxx
-#if !defined(ANDROID) !defined(IOS)
-// NSS header files for PDF signing support
+#if !defined(ANDROID) !defined(IOS) !defined(_WIN32)
+// NSS headers for PDF signing
#include nss.h
#include cert.h
#include hasht.h
@@ -78,6 +78,13 @@
#include cmst.h
#endif
+#ifdef _WIN32
+// WinCrypt headers for PDF signing
+#include prewin.h
+#include wincrypt.h
+#include postwin.h
+#endif
+
#include config_eot.h
#if ENABLE_EOT
@@ -5971,6 +5978,8 @@ bool PDFWriterImpl::emitSignature()
return true;
}
+#if !defined(ANDROID) !defined(IOS) !defined(_WIN32)
+
char *PDFSigningPKCS7PasswordCallback(PK11SlotInfo * /*slot*/, PRBool
/*retry*/, void *arg)
{
return (char *)arg;
@@ -5987,6 +5996,39 @@ namespace {
};
}
+#endif
+
+#ifdef _WIN32
+
+namespace {
+
+OUString WindowsError(DWORD nErrorCode)
+{
+LPWSTR pMsgBuf;
+
+if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL,
+ nErrorCode,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPWSTR)pMsgBuf,
+ 0,
+ NULL) == 0)
+return OUString::number(nErrorCode, 16);
+
+if (pMsgBuf[wcslen(pMsgBuf)-1] == '\n')
+pMsgBuf[wcslen(pMsgBuf)-1] = '\0';
+
+OUString result(pMsgBuf);
+
+LocalFree(pMsgBuf);
+
+return result;
+}
+
+}
+
+#endif
+
bool PDFWriterImpl::finalizeSignature()
{
@@ -6021,7 +6063,7 @@ bool PDFWriterImpl::finalizeSignature()
sal_Int8* n_derArray = derEncoded.getArray();
sal_Int32 n_derLength = derEncoded.getLength();
-NSS_NoDB_Init(.);
+#ifndef _WIN32
CERTCertificate *cert = CERT_DecodeCertFromPackage(reinterpret_castchar
*(n_derArray), n_derLength);
@@ -6170,6 +6212,170 @@ bool PDFWriterImpl::finalizeSignature()
CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut,
nOffset)) );
return true;
+
+#else
+
+PCCERT_CONTEXT pCertContext =
CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
reinterpret_castconst BYTE*(n_derArray), n_derLength);
+if (pCertContext == NULL)
+{
+SAL_WARN(vcl.pdfwriter, CertCreateCertificateContext failed:
WindowsError(GetLastError()));
+return false;
+}
+
+#if SAL_LOG_INFO
+DWORD nProperty(0);
+bool first(true);
+while ((nProperty = CertEnumCertificateContextProperties(pCertContext,
nProperty)) != 0)
+{
+if (first)
+SAL_INFO(vcl.pdfwriter, Certificate context properties:);
+first = false;
+#if 0
+DWORD nSize(0);
+if (!CertGetCertificateContextProperty(pCertContext, nProperty, NULL,
nSize))
+SAL_INFO(vcl.pdfwriter, (missing?) std::hex
nProperty);
+else
+{
+boost::scoped_arraychar aData(new char[nSize]);
+if (!CertGetCertificateContextProperty(pCertContext, nProperty,
aData.get(), nSize))
+SAL_INFO(vcl.pdfwriter, (missing?) std::hex::
nProperty);
+else
+SAL_INFO(vcl.pdfwriter,
Re: libcmis integration status
Hi Miklos, On Thu, 2014-12-04 at 16:30 +0100, Miklos Vajna wrote: Do you plan to do a libcmis release for LO 4.4 and then merge feature/gsoc14-libcmis2 to at least master? I'm asking as https://bugs.freedesktop.org/show_bug.cgi?id=62437 mentions this is not yet working on master at the moment (I can confirm that), and it seems that the current blocker for this is the lack of libcmis release. :-) I was planning to improve the unit tests before a release, but I never manage to find time for it... it seems like I'll need to release and fix bugs later when they are found ;) -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LO Bug 84873
Hi, regarding bug https://bugs.freedesktop.org/show_bug.cgi?id=84873, in case the assumption that LO isn't able to create the lock file is right, what would be the desired behaviour? just open the document readonly (disadvantage: Some users might be confused, why readonly)show a dialog box, with a text saying LO cant create a lock file because the directory is read-only.?Greetings, Ulrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/address.hxx |2 +-
sc/source/core/data/bcaslot.cxx | 12 ++--
sc/source/core/tool/address.cxx |2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit c62cf85d482b82b41551ab5e7893c3b22ae5df6f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Dec 5 10:01:42 2014 -0500
I got the terms 'union' and 'intersection' mixed up.
When I said 'Union' originally, I meant 'Intersection'. Let's fix that.
Change-Id: Iaef5035bb1dbb676c63bd17b3650266605104181
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index bf41328..a7e1a07 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -564,7 +564,7 @@ public:
SC_DLLPUBLIC void ExtendTo( const ScRange rRange );
SC_DLLPUBLIC bool Intersects( const ScRange rRange ) const;// do two
ranges intersect?
-ScRange Union( const ScRange rOther ) const;
+ScRange Intersection( const ScRange rOther ) const;
void PutInOrder();
inline bool operator==( const ScRange rRange ) const;
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 8a5913f..31b665c 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -326,26 +326,26 @@ bool ScBroadcastAreaSlot::AreaBroadcast( const ScRange
rRange, sal_uLong nHint
ScBroadcastArea* pArea = (*aIter).mpArea;
const ScRange rAreaRange = pArea-GetRange();
-// Take the union of the area range and the broadcast range.
-ScRange aUnion = rAreaRange.Union(rRange);
-if (!aUnion.IsValid())
+// Take the intersection of the area range and the broadcast range.
+ScRange aIntersection = rAreaRange.Intersection(rRange);
+if (!aIntersection.IsValid())
continue;
if (pArea-IsGroupListening())
{
if (pBASM-IsInBulkBroadcast())
{
-pBASM-InsertBulkGroupArea(pArea, aUnion);
+pBASM-InsertBulkGroupArea(pArea, aIntersection);
}
else
{
-broadcastRangeByCell(pArea-GetBroadcaster(), aUnion, nHint);
+broadcastRangeByCell(pArea-GetBroadcaster(), aIntersection,
nHint);
bIsBroadcasted = true;
}
}
else if (!pBASM-IsInBulkBroadcast() || pBASM-InsertBulkArea( pArea))
{
-broadcastRangeByCell(pArea-GetBroadcaster(), aUnion, nHint);
+broadcastRangeByCell(pArea-GetBroadcaster(), aIntersection,
nHint);
bIsBroadcasted = true;
}
}
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 7cb2935..1efcac7 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1374,7 +1374,7 @@ bool ScRange::Intersects( const ScRange rRange ) const
);
}
-ScRange ScRange::Union( const ScRange rOther ) const
+ScRange ScRange::Intersection( const ScRange rOther ) const
{
SCCOL nCol1 = std::max(aStart.Col(), rOther.aStart.Col());
SCCOL nCol2 = std::min(aEnd.Col(), rOther.aEnd.Col());
___
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' - sc/inc sc/source
sc/inc/address.hxx |2 +-
sc/source/core/data/bcaslot.cxx | 12 ++--
sc/source/core/tool/address.cxx |2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 4377676c353236618d8d8e50649cf0ace8267b3f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Dec 5 10:01:42 2014 -0500
I got the terms 'union' and 'intersection' mixed up.
When I said 'Union' originally, I meant 'Intersection'. Let's fix that.
Change-Id: Iaef5035bb1dbb676c63bd17b3650266605104181
(cherry picked from commit c62cf85d482b82b41551ab5e7893c3b22ae5df6f)
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index bf41328..a7e1a07 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -564,7 +564,7 @@ public:
SC_DLLPUBLIC void ExtendTo( const ScRange rRange );
SC_DLLPUBLIC bool Intersects( const ScRange rRange ) const;// do two
ranges intersect?
-ScRange Union( const ScRange rOther ) const;
+ScRange Intersection( const ScRange rOther ) const;
void PutInOrder();
inline bool operator==( const ScRange rRange ) const;
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 8a5913f..31b665c 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -326,26 +326,26 @@ bool ScBroadcastAreaSlot::AreaBroadcast( const ScRange
rRange, sal_uLong nHint
ScBroadcastArea* pArea = (*aIter).mpArea;
const ScRange rAreaRange = pArea-GetRange();
-// Take the union of the area range and the broadcast range.
-ScRange aUnion = rAreaRange.Union(rRange);
-if (!aUnion.IsValid())
+// Take the intersection of the area range and the broadcast range.
+ScRange aIntersection = rAreaRange.Intersection(rRange);
+if (!aIntersection.IsValid())
continue;
if (pArea-IsGroupListening())
{
if (pBASM-IsInBulkBroadcast())
{
-pBASM-InsertBulkGroupArea(pArea, aUnion);
+pBASM-InsertBulkGroupArea(pArea, aIntersection);
}
else
{
-broadcastRangeByCell(pArea-GetBroadcaster(), aUnion, nHint);
+broadcastRangeByCell(pArea-GetBroadcaster(), aIntersection,
nHint);
bIsBroadcasted = true;
}
}
else if (!pBASM-IsInBulkBroadcast() || pBASM-InsertBulkArea( pArea))
{
-broadcastRangeByCell(pArea-GetBroadcaster(), aUnion, nHint);
+broadcastRangeByCell(pArea-GetBroadcaster(), aIntersection,
nHint);
bIsBroadcasted = true;
}
}
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 7cb2935..1efcac7 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1374,7 +1374,7 @@ bool ScRange::Intersects( const ScRange rRange ) const
);
}
-ScRange ScRange::Union( const ScRange rOther ) const
+ScRange ScRange::Intersection( const ScRange rOther ) const
{
SCCOL nCol1 = std::max(aStart.Col(), rOther.aStart.Col());
SCCOL nCol2 = std::min(aEnd.Col(), rOther.aEnd.Col());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/filter sd/source
filter/source/msfilter/svdfppt.cxx | 10 +-
include/filter/msfilter/svdfppt.hxx | 18 +-
sd/source/filter/ppt/pptin.cxx | 14 --
sd/source/filter/ppt/pptin.hxx |2 +-
4 files changed, 27 insertions(+), 17 deletions(-)
New commits:
commit e9a3d259c71ceddb88c92a0c17dfe3d8d03fb5a4
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 16:08:25 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: If8d2be68a75e69226f2a5a1d2936a257fa032c23
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 6a80926..0400f5b 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -576,7 +576,7 @@ PptFontEntityAtom* SdrEscherImport::GetFontEnityAtom(
sal_uInt32 nNum ) const
return pRetValue;
}
-SdrObject* SdrEscherImport::ReadObjText( PPTTextObj* /*pTextObj*/, SdrObject*
pObj, SdPage* /*pPage*/) const
+SdrObject* SdrEscherImport::ReadObjText( PPTTextObj* /*pTextObj*/, SdrObject*
pObj, SdPageCapsule /*pPage*/) const
{
return pObj;
}
@@ -1211,7 +1211,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream rSt,
DffObjData rObjData, voi
{
if ( rObjData.nSpFlags SP_FBACKGROUND )
{
-pRet-NbcSetSnapRect( Rectangle( Point(),
((SdrPage*)rData.pPage)-GetSize() ) ); // set size
+pRet-NbcSetSnapRect( Rectangle( Point(),
rData.pPage.page-GetSize() ) ); // set size
}
if ( rPersistEntry.pSolverContainer )
{
@@ -2176,7 +2176,7 @@ SdrOutliner* SdrPowerPointImport::GetDrawOutliner(
SdrTextObj* pSdrText ) const
}
-SdrObject* SdrPowerPointImport::ReadObjText( PPTTextObj* pTextObj, SdrObject*
pSdrObj, SdPage* pPage ) const
+SdrObject* SdrPowerPointImport::ReadObjText( PPTTextObj* pTextObj, SdrObject*
pSdrObj, SdPageCapsule pPage ) const
{
SdrTextObj* pText = PTR_CAST( SdrTextObj, pSdrObj );
if ( pText )
@@ -2188,7 +2188,7 @@ SdrObject* SdrPowerPointImport::ReadObjText( PPTTextObj*
pTextObj, SdrObject* pS
}
-SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj,
SdrTextObj* pSdrText, SdPage* /*pPage*/,
+SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj,
SdrTextObj* pSdrText, SdPageCapsule /*pPage*/,
SfxStyleSheet* pSheet,
SfxStyleSheet** ppStyleSheetAry ) const
{
SdrTextObj* pText = pSdrText;
@@ -2706,7 +2706,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet,
const PptSlidePersistEntry*
if ( SeekToAktPage( aPageHd ) )
{
rSlidePersist.pHeaderFooterEntry = new HeaderFooterEntry(
pMasterPersist );
-ProcessData aProcessData( rSlidePersist, (SdPage*)pRet );
+ProcessData aProcessData( rSlidePersist, SdPageCapsule(pRet) );
while ( ( rStCtrl.GetError() == 0 ) ( rStCtrl.Tell()
aPageHd.GetRecEndFilePos() ) )
{
DffRecordHeader aHd;
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index 6bbe818..c7a1912 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -404,6 +404,14 @@ public:
friend SvStream ReadPptExOleObjAtom( SvStream rIn, PptExOleObjAtom
rAtom );
};
+// SdPage derives from SdrPage, is only known inside sd, and needs to be
carried
+// around as an opaque pointer here:
+struct SdPageCapsule {
+explicit SdPageCapsule(SdrPage * thePage): page(thePage) {}
+
+SdrPage * page;
+};
+
typedef ::std::vector PPTOleEntry* PPTOleEntryList;
class PPTExtParaProv;
class MSFILTER_DLLPUBLIC SdrEscherImport : public SvxMSDffManager
@@ -449,7 +457,7 @@ public:
virtual boolSeekToShape( SvStream rSt, void* pClientData,
sal_uInt32 nId ) const SAL_OVERRIDE;
PptFontEntityAtom* GetFontEnityAtom( sal_uInt32 nNum ) const;
voidRecolorGraphic( SvStream rSt, sal_uInt32 nRecLen,
Graphic rGraph );
-virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj,
SdPage* pPage ) const;
+virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj,
SdPageCapsule pPage ) const;
virtual SdrObject* ProcessObj( SvStream rSt, DffObjData rData, void*
pData, Rectangle rTextRect, SdrObject* pObj ) SAL_OVERRIDE;
virtual voidProcessClientAnchor2( SvStream rSt, DffRecordHeader
rHd, void* pData, DffObjData rObj ) SAL_OVERRIDE;
voidImportHeaderFooterContainer( DffRecordHeader rHeader,
HeaderFooterEntry rEntry );
@@ -506,11 +514,11 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry
struct ProcessData
{
PptSlidePersistEntry rPersistEntry;
-SdPage* pPage;
+SdPageCapsule pPage;
::std::vector SdrObject* aBackgroundColoredObjects;
sal_uInt32* pTableRowProperties;
-ProcessData( PptSlidePersistEntry rP, SdPage* pP ) :
+ProcessData(
[Libreoffice-commits] core.git: 9 commits - sw/inc sw/qa sw/source
sw/inc/crsrsh.hxx |2
sw/inc/pam.hxx | 10
sw/inc/ring.hxx | 173
sw/inc/viewsh.hxx |8
sw/qa/core/uwriter.cxx | 14 +
sw/source/core/crsr/crsrsh.cxx | 12 -
sw/source/core/crsr/crstrvl.cxx |2
sw/source/core/crsr/findattr.cxx|2
sw/source/core/crsr/findtxt.cxx |4
sw/source/core/crsr/swcrsr.cxx |8
sw/source/core/crsr/viscrs.cxx | 18 -
sw/source/core/doc/DocumentContentOperationsManager.cxx |2
sw/source/core/doc/doccomp.cxx |4
sw/source/core/doc/docruby.cxx |8
sw/source/core/doc/extinput.cxx |2
sw/source/core/docnode/ndtbl1.cxx |2
sw/source/core/edit/acorrect.cxx|4
sw/source/core/edit/autofmt.cxx |4
sw/source/core/edit/eddel.cxx |2
sw/source/core/edit/edfld.cxx |2
sw/source/core/edit/editsh.cxx |4
sw/source/core/edit/ednumber.cxx| 12 -
sw/source/core/frmedt/fefly1.cxx|2
sw/source/core/layout/layact.cxx|2
sw/source/core/unocore/unoobj2.cxx |4
sw/source/uibase/uiview/formatclipboard.cxx |2
sw/source/uibase/uiview/viewling.cxx|2
27 files changed, 176 insertions(+), 135 deletions(-)
New commits:
commit c17ca4c2088a7092733b67a509b5c0afb799c293
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Dec 5 14:19:51 2014 +0100
move use of IsMultiSelection()
Change-Id: Ie99906ef2a97617857f5243353e51d8ab4bd6218
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index e9ea189..d57520c 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -890,7 +890,7 @@ inline bool SwCrsrShell::IsMultiSelection() const
inline bool SwCrsrShell::IsSelOnePara() const
{
-return m_pCurCrsr == m_pCurCrsr-GetNext()
+return !m_pCurCrsr-IsMultiSelection()
m_pCurCrsr-GetPoint()-nNode == m_pCurCrsr-GetMark()-nNode;
}
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 5dd77ab..45cfd13 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -146,7 +146,7 @@ bool SwCrsrShell::DestroyCrsr()
OSL_ENSURE( !IsTableMode(), in table Selection );
// Is there a next one? Don't do anything if not.
-if(m_pCurCrsr-GetNext() == m_pCurCrsr)
+if(!m_pCurCrsr-IsMultiSelection())
return false;
SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -993,7 +993,7 @@ bool SwCrsrShell::ChgCurrPam(
void SwCrsrShell::KillPams()
{
// Does any exist for deletion?
-if( !m_pTblCrsr !m_pBlockCrsr m_pCurCrsr-GetNext() == m_pCurCrsr )
+if( !m_pTblCrsr !m_pBlockCrsr !m_pCurCrsr-IsMultiSelection() )
return;
while( m_pCurCrsr-GetNext() != m_pCurCrsr )
@@ -1196,8 +1196,7 @@ sal_uInt16 SwCrsrShell::GetPageCnt()
/// go to the next SSelection
bool SwCrsrShell::GoNextCrsr()
{
-// is there a ring of cursors?
-if( m_pCurCrsr-GetNext() == m_pCurCrsr )
+if( !m_pCurCrsr-IsMultiSelection() )
return false;
SET_CURR_SHELL( this );
@@ -1216,8 +1215,7 @@ bool SwCrsrShell::GoNextCrsr()
/// go to the previous SSelection
bool SwCrsrShell::GoPrevCrsr()
{
-// is there a ring of cursors?
-if( m_pCurCrsr-GetNext() == m_pCurCrsr )
+if( !m_pCurCrsr-IsMultiSelection() )
return false;
SET_CURR_SHELL( this );
@@ -3040,7 +3038,7 @@ bool SwCrsrShell::IsSelFullPara() const
bool bRet = false;
if( m_pCurCrsr-GetPoint()-nNode.GetIndex() ==
-m_pCurCrsr-GetMark()-nNode.GetIndex() m_pCurCrsr ==
m_pCurCrsr-GetNext() )
+m_pCurCrsr-GetMark()-nNode.GetIndex()
!m_pCurCrsr-IsMultiSelection() )
{
sal_Int32 nStt = m_pCurCrsr-GetPoint()-nContent.GetIndex();
sal_Int32 nEnd = m_pCurCrsr-GetMark()-nContent.GetIndex();
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 347ae36..d0f0005 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2210,7 +2210,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
if( !pNd-IsCntntNode() )
pNd = rNds.GoNextSection( aIdx, true, false );
-SwPaM *const pNew = (pAktCrsr-GetNext() == pAktCrsr
!pAktCrsr-HasMark())
+SwPaM *const pNew = (!pAktCrsr-IsMultiSelection()
!pAktCrsr-HasMark())
? pAktCrsr
:
[Libreoffice-commits] core.git: canvas/source dbaccess/source reportdesign/source slideshow/source
canvas/source/cairo/cairo_spritecanvashelper.cxx|3 +--
canvas/source/vcl/spritecanvashelper.cxx|4 ++--
dbaccess/source/ui/tabledesign/TableController.cxx |3 +--
reportdesign/source/core/api/ReportDefinition.cxx |3 +--
slideshow/source/engine/rehearsetimingsactivity.cxx |3 +--
slideshow/source/engine/shapes/appletshape.cxx |6 ++
slideshow/source/engine/shapes/drawshape.cxx|3 +--
slideshow/source/engine/shapes/mediashape.cxx |3 +--
slideshow/source/engine/unoviewcontainer.cxx|3 +--
9 files changed, 11 insertions(+), 20 deletions(-)
New commits:
commit 7d68c0f5ade7b7324b5a2d03bca042019dfd27f5
Author: Thorsten Behrens t...@documentfoundation.org
Date: Thu Dec 4 20:39:09 2014 +0100
Slightly less verbose adaptation to boost-1.56.0
This fixes up 45dfbdca6a9afba1a6aef21623ec025ded635a4d
Change-Id: I754fec5c94d51cbae69ad1155f57b0bb53788ba5
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx
b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index 741dbb3..3f638a8 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -402,12 +402,11 @@ namespace cairocanvas
::basegfx::computeSetDifference( aUncoveredAreas,
rUpdateArea.maTotalBounds,
::basegfx::B2DRange( rDestRect ) );
-SurfaceSharedPtr surface(mpOwningSpriteCanvas-getBufferSurface());
::std::for_each( aUncoveredAreas.begin(),
aUncoveredAreas.end(),
::boost::bind( repaintBackground,
boost::cref(pCompositingCairo),
-boost::cref(surface),
+
mpOwningSpriteCanvas-getBufferSurface(),
_1 ) );
cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY()
);
diff --git a/canvas/source/vcl/spritecanvashelper.cxx
b/canvas/source/vcl/spritecanvashelper.cxx
index a4ad7fa..037bc48 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -573,12 +573,12 @@ namespace vclcanvas
// repaint all affected sprites on top of background into
// VDev.
-::basegfx::B2DPoint outPos(
::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
::std::for_each( rSortedUpdateSprites.begin(),
rSortedUpdateSprites.end(),
::boost::bind( spriteRedrawStub2,
::boost::ref( maVDev.get() ),
-::boost::cref( outPos ),
+::vcl::unotools::b2DPointFromPoint(
+aOutputPosition),
_1 ) );
// flush to screen
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 1536dfe..ef36c4d 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1396,8 +1396,7 @@ void OTableController::assignTable()
setEditable( xMeta.is() !xMeta-isReadOnly()
(isAlterAllowed() || isDropAllowed() || isAddAllowed()) );
if(!isEditable())
{
-bool t( true );
-
::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind(
OTableRow::SetReadOnly, _1, boost::cref( t )));
+
::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind(
OTableRow::SetReadOnly, _1, true));
}
m_bNew = false;
// be notified when the table is in disposing
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 6deca0a..3931191 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1622,9 +1622,8 @@ void SAL_CALL OReportDefinition::switchToStorage( const
uno::Reference embed::X
m_pImpl-m_pObjectContainer-SwitchPersistence(m_pImpl-m_xStorage);
}
// notify our container listeners
-OWeakObject *weakObjectThis = static_castOWeakObject*(this);
m_pImpl-m_aStorageChangeListeners.forEachdocument::XStorageChangeListener(
-
::boost::bind(document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage)));
+
::boost::bind(document::XStorageChangeListener::notifyStorageChange,_1,static_castOWeakObject*(this),boost::cref(_xStorage)));
}
uno::Reference embed::XStorage SAL_CALL
OReportDefinition::getDocumentStorage( ) throw (io::IOException,
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - xmloff/source
xmloff/source/text/txtprmap.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 20a8df00b31e313167bd650b80319cdda7e14144 Author: Eike Rathke er...@redhat.com Date: Fri Dec 20 22:10:46 2013 +0100 fdo#58112 write loext:contextual-spacing accept style:contextual-spacing Change-Id: I3e6698d9d9399dd5a13658641847df8a5f34f6ae diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index 1e4ed6f..023c9a9 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -95,8 +95,8 @@ XMLPropertyMapEntry aXMLParaPropMap[] = MP_E( ParaTopMarginRelative, FO, MARGIN_TOP, XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ), MP_E( ParaBottomMargin, FO, MARGIN_BOTTOM, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARABOTTOMMARGIN ), MP_E( ParaBottomMarginRelative,FO,MARGIN_BOTTOM, XML_TYPE_PERCENT16, CTF_PARABOTTOMMARGIN_REL ), -MAP_EXT( ParaContextMargin, XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // proposed ODF 1.2+ -MAP_EXT_I( ParaContextMargin, XML_NAMESPACE_LO_EXT, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // extension namespace +MAP_EXT_I( ParaContextMargin, XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),// proposed ODF 1.2+ and was written by LO=4.2 +MAP_EXT( ParaContextMargin, XML_NAMESPACE_LO_EXT, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // extension namespace // RES_CHRATR_CASEMAP MT_E( CharCaseMap,FO, FONT_VARIANT, XML_TYPE_TEXT_CASEMAP_VAR, 0 ), MT_E( CharCaseMap,FO, TEXT_TRANSFORM, XML_TYPE_TEXT_CASEMAP, 0 ), ___ 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' - 8 commits - extensions/source include/sfx2 include/svx include/vcl slideshow/source svx/source vcl/workben
extensions/source/propctrlr/propertycomposer.hxx |4 ++--
include/sfx2/childwin.hxx|2 +-
include/svx/obj3d.hxx|2 +-
include/vcl/opengl/OpenGLContext.hxx |1 -
slideshow/source/engine/shapes/gdimtftools.cxx |4 +---
svx/source/dialog/hyperdlg.cxx | 15 +--
svx/source/inc/GraphCtlAccessibleContext.hxx |4 +++-
svx/source/table/tablemodel.hxx |4 ++--
vcl/workben/vcldemo.cxx |2 +-
9 files changed, 12 insertions(+), 26 deletions(-)
New commits:
commit 0888dfe7f25abac100b5a23c078c3582e1f6a6a9
Author: Noel Grandin n...@peralex.com
Date: Tue Dec 2 14:54:44 2014 +0200
loplugin:saloverride
Change-Id: I62e8c07faf1fb38b39dfb41e0ba408d5c534312f
(cherry picked from commit 63fbe59d054a99224dac5fa25ff1a16890365746)
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index d65ea20..95329f3 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1275,7 +1275,7 @@ public:
virtual ~DemoWidgets()
{
}
-virtual void Paint(const Rectangle)
+virtual void Paint(const Rectangle) SAL_OVERRIDE
{
Rectangle aWholeSize(Point(0, 0),GetOutputSizePixel());
vcl::Region aClip(aWholeSize);
commit 34c2b231b057ab6c1cf7af83aeb046ac4fea2b90
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 10:34:30 2014 +0100
-Werror,-Wuninitialized
(in DummyRenderer ctor: base class 'comphelper::OBaseMutex' is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: I5b151176c676a58593933b3f2e33a3e2dfdcc630
(cherry picked from commit 34d464316872fec13fc024d630cbfcc26b77185a)
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx
b/slideshow/source/engine/shapes/gdimtftools.cxx
index 4d2b046..f3a52ca 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -107,9 +107,7 @@ namespace {
typedef ::cppu::WeakComponentImplHelper1 graphic::XGraphicRenderer
DummyRenderer_Base;
-class DummyRenderer :
-public DummyRenderer_Base,
-public cppu::BaseMutex
+class DummyRenderer: public cppu::BaseMutex, public DummyRenderer_Base
{
public:
DummyRenderer() :
commit 2da946d4789716aa5480eae3ce8ccde99dd1af25
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 09:46:13 2014 +0100
-Werror,-Wuninitialized
(in PropertyComposer ctor: base class 'comphelper::OBaseMutex' is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: I41ede9ab34e89c8dde23ce2e4fd6393b05c979c6
(cherry picked from commit da9fd02a4d1a36cf9d22d5b36ba36240585284f6)
diff --git a/extensions/source/propctrlr/propertycomposer.hxx
b/extensions/source/propctrlr/propertycomposer.hxx
index 4c71696..159d437 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -50,8 +50,8 @@ namespace pcr
/** implements an typeXPropertyHandler/type which composes it's
information
from a set of other property handlers
*/
-class PropertyComposer :public PropertyComposer_Base
-,public ::comphelper::OBaseMutex
+class PropertyComposer :public ::comphelper::OBaseMutex
+,public PropertyComposer_Base
,public IPropertyExistenceCheck
{
public:
commit 5bb5ddf9336ae2ee5a17598716e1c86196c1403a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 09:06:36 2014 +0100
-Werror,-Wuninitialized
(in SvxGraphCtrlAccessibleContext ctor: base class 'comphelper::OBaseMutex'
is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: Ic6791043828b7b9f69c76867e26ee02a5ee66817
(cherry picked from commit a8a8cb216fd2b25a1ed8b9c217685dccacaa428e)
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx
b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 95cbf3a..b2c6650 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -77,7 +77,9 @@ typedef ::cppu::WeakAggComponentImplHelper7
::com::sun::star::lang::XServiceName
SvxGraphCtrlAccessibleContext_Base;
-class SvxGraphCtrlAccessibleContext : public
SvxGraphCtrlAccessibleContext_Base, ::comphelper::OBaseMutex, SfxListener,
::accessibility::IAccessibleViewForwarder
+class SvxGraphCtrlAccessibleContext:
+comphelper::OBaseMutex, public SvxGraphCtrlAccessibleContext_Base,
+SfxListener, accessibility::IAccessibleViewForwarder
{
public:
friend class GraphCtrl;
commit 8cddcb48c63b5fafb6e9c573fd6aef9f505de74e
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 08:58:32 2014 +0100
-Werror,-Wuninitialized
(in TableModel ctor:
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/zh_CN.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d00a3722b46314c927ba392a31fe4ff5ebc5c0b5 Author: Kevin Suo suokunl...@gmail.com Date: Fri Dec 5 12:48:48 2014 +0800 fdo#83752: date-time cell becomes text string when editing, zh_CN locale In the locale data xml file, formatindex 47 is used for date-and-time editing. If the format code does not match the defined date/time separators, it will cause the cell value to be treated as string text (rather than a date time value). Change-Id: I75a59d943d832f28a0a6153a17e6f671e5328abd Reviewed-on: https://gerrit.libreoffice.org/13306 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/i18npool/source/localedata/data/zh_CN.xml b/i18npool/source/localedata/data/zh_CN.xml index 8fc15de..6cd5879 100644 --- a/i18npool/source/localedata/data/zh_CN.xml +++ b/i18npool/source/localedata/data/zh_CN.xml @@ -225,7 +225,7 @@ FormatCodeå¹´MMæDæ¥HHæ¶MMåSSç§/FormatCode /FormatElement FormatElement msgid=DateTimeFormatskey3 default=false type=long usage=DATE_TIME formatindex=47 - FormatCodeYYå¹´MæDæ¥HHæ¶MMå/FormatCode + FormatCode/MM/DD HH:MM:SS/FormatCode /FormatElement FormatElement msgid=DateTimeFormatskey1 default=false type=long usage=DATE_TIME formatindex=58 FormatCodeM/D/YY HH:MM/FormatCode ___ 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/localedata/data/zh_CN.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fabdb9356fe2b4d04b7e3ae4f2bfbd92fc306d76 Author: Kevin Suo suokunl...@gmail.com Date: Fri Dec 5 12:48:48 2014 +0800 fdo#83752: date-time cell becomes text string when editing, zh_CN locale In the locale data xml file, formatindex 47 is used for date-and-time editing. If the format code does not match the defined date/time separators, it will cause the cell value to be treated as string text (rather than a date time value). Change-Id: I75a59d943d832f28a0a6153a17e6f671e5328abd Reviewed-on: https://gerrit.libreoffice.org/13306 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com (cherry picked from commit d00a3722b46314c927ba392a31fe4ff5ebc5c0b5) Reviewed-on: https://gerrit.libreoffice.org/13309 diff --git a/i18npool/source/localedata/data/zh_CN.xml b/i18npool/source/localedata/data/zh_CN.xml index 8fc15de..6cd5879 100644 --- a/i18npool/source/localedata/data/zh_CN.xml +++ b/i18npool/source/localedata/data/zh_CN.xml @@ -225,7 +225,7 @@ FormatCodeå¹´MMæDæ¥HHæ¶MMåSSç§/FormatCode /FormatElement FormatElement msgid=DateTimeFormatskey3 default=false type=long usage=DATE_TIME formatindex=47 - FormatCodeYYå¹´MæDæ¥HHæ¶MMå/FormatCode + FormatCode/MM/DD HH:MM:SS/FormatCode /FormatElement FormatElement msgid=DateTimeFormatskey1 default=false type=long usage=DATE_TIME formatindex=58 FormatCodeM/D/YY HH:MM/FormatCode ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/page.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 48637482d2fb22baef261238f17df00f0149dd08
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 16:39:30 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: I45e34a9369b31fa284bc0fc0176c7efd81b527d4
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 74f1091..3c411a5 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -19,6 +19,7 @@
#include sfx2/app.hxx
#include sfx2/objsh.hxx
+#include sfx2/printer.hxx
#include tools/resary.hxx
#include vcl/graph.hxx
#include sfx2/viewsh.hxx
@@ -295,7 +296,7 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent,
const SfxItemSet rAttr
if ( SfxViewShell::Current() SfxViewShell::Current()-GetPrinter() )
{
-mpDefPrinter = (Printer*)SfxViewShell::Current()-GetPrinter();
+mpDefPrinter = SfxViewShell::Current()-GetPrinter();
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - i18npool/source
i18npool/source/localedata/data/zh_CN.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ac54387bcee173e0af448d71b8890e5e255285c Author: Kevin Suo suokunl...@gmail.com Date: Fri Dec 5 12:48:48 2014 +0800 fdo#83752: date-time cell becomes text string when editing, zh_CN locale In the locale data xml file, formatindex 47 is used for date-and-time editing. If the format code does not match the defined date/time separators, it will cause the cell value to be treated as string text (rather than a date time value). Change-Id: I75a59d943d832f28a0a6153a17e6f671e5328abd Reviewed-on: https://gerrit.libreoffice.org/13306 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com (cherry picked from commit d00a3722b46314c927ba392a31fe4ff5ebc5c0b5) Reviewed-on: https://gerrit.libreoffice.org/13313 diff --git a/i18npool/source/localedata/data/zh_CN.xml b/i18npool/source/localedata/data/zh_CN.xml index e58c59a..cca9d3f 100644 --- a/i18npool/source/localedata/data/zh_CN.xml +++ b/i18npool/source/localedata/data/zh_CN.xml @@ -225,7 +225,7 @@ FormatCodeå¹´MMæDæ¥HHæ¶MMåSSç§/FormatCode /FormatElement FormatElement msgid=DateTimeFormatskey3 default=false type=long usage=DATE_TIME formatindex=47 - FormatCodeYYå¹´MæDæ¥HHæ¶MMå/FormatCode + FormatCode/MM/DD HH:MM:SS/FormatCode /FormatElement FormatElement msgid=DateTimeFormatskey1 default=false type=long usage=DATE_TIME formatindex=58 FormatCodeMï¼Dï¼YY HH:MM/FormatCode ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table3.cxx | 226 ++---
1 file changed, 126 insertions(+), 100 deletions(-)
New commits:
commit 718086d2e0fa0a8774554c395594c2312fd30694
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Dec 5 10:49:06 2014 -0500
Extract this code block into an own function.
This code block is sufficiently self-contained.
Change-Id: I0eb2d3ee8175af60394ff4c408a9c245f77044d8
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 280cb32..0b5b27f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -596,6 +596,16 @@ struct SortedRowFlags
{
miPosFiltered = maRowsFiltered.insert(miPosFiltered, nRow, nRow+1,
b).first;
}
+
+void swap( SortedRowFlags r )
+{
+maRowsHidden.swap(r.maRowsHidden);
+maRowsFiltered.swap(r.maRowsFiltered);
+
+// Just reset the position hints.
+miPosHidden = maRowsHidden.begin();
+miPosFiltered = maRowsFiltered.begin();
+}
};
struct PatternSpan
@@ -699,6 +709,121 @@ public:
}
};
+void fillSortedColumnArray(
+boost::ptr_vectorSortedColumn rSortedCols,
+SortedRowFlags rRowFlags,
+ScSortInfoArray* pArray, SCTAB nTab, SCCOL nCol1, SCCOL nCol2, ScProgress*
pProgress )
+{
+SCROW nRow1 = pArray-GetStart();
+SCROW nRow2 = pArray-GetLast();
+ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
+
+size_t nColCount = nCol2 - nCol1 + 1;
+boost::ptr_vectorSortedColumn aSortedCols; // storage for copied cells.
+SortedRowFlags aRowFlags;
+aSortedCols.reserve(nColCount);
+for (size_t i = 0; i nColCount; ++i)
+{
+// In the sorted column container, element positions and row
+// positions must match, else formula cells may mis-behave during
+// grouping.
+aSortedCols.push_back(new SortedColumn(nRow1));
+}
+
+for (size_t i = 0; i pRows-size(); ++i)
+{
+ScSortInfoArray::Row* pRow = (*pRows)[i];
+for (size_t j = 0; j pRow-maCells.size(); ++j)
+{
+ScAddress aCellPos(nCol1 + j, nRow1 + i, nTab);
+
+ScSortInfoArray::Cell rCell = pRow-maCells[j];
+
+sc::CellStoreType rCellStore = aSortedCols.at(j).maCells;
+switch (rCell.maCell.meType)
+{
+case CELLTYPE_STRING:
+assert(rCell.mpAttr);
+rCellStore.push_back(*rCell.maCell.mpString);
+break;
+case CELLTYPE_VALUE:
+assert(rCell.mpAttr);
+rCellStore.push_back(rCell.maCell.mfValue);
+break;
+case CELLTYPE_EDIT:
+assert(rCell.mpAttr);
+rCellStore.push_back(rCell.maCell.mpEditText-Clone());
+break;
+case CELLTYPE_FORMULA:
+{
+assert(rCell.mpAttr);
+ScAddress aOldPos = rCell.maCell.mpFormula-aPos;
+
+ScFormulaCell* pNew = rCell.maCell.mpFormula-Clone(
aCellPos, SC_CLONECELL_DEFAULT);
+if (pArray-IsUpdateRefs())
+{
+pNew-CopyAllBroadcasters(*rCell.maCell.mpFormula);
+pNew-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
aCellPos);
+}
+else
+{
+
pNew-GetCode()-AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos, aCellPos);
+}
+
+rCellStore.push_back(pNew);
+}
+break;
+default:
+assert(!rCell.mpAttr);
+rCellStore.push_back_empty();
+}
+
+sc::CellTextAttrStoreType rAttrStore =
aSortedCols.at(j).maCellTextAttrs;
+if (rCell.mpAttr)
+rAttrStore.push_back(*rCell.mpAttr);
+else
+rAttrStore.push_back_empty();
+
+if (pArray-IsUpdateRefs())
+{
+// At this point each broadcaster instance is managed by 2
+// containers. We will release those in the original storage
+// below before transferring them to the document.
+sc::BroadcasterStoreType rBCStore =
aSortedCols.at(j).maBroadcasters;
+if (rCell.mpBroadcaster)
+// A const pointer would be implicitly converted to a bool
type.
+
rBCStore.push_back(const_castSvtBroadcaster*(rCell.mpBroadcaster));
+else
+rBCStore.push_back_empty();
+}
+
+// The same with cell note instances ...
+sc::CellNoteStoreType rNoteStore = aSortedCols.at(j).maCellNotes;
+if (rCell.mpNote)
+rNoteStore.push_back(const_castScPostIt*(rCell.mpNote));
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/core/data/table3.cxx | 226 ++---
1 file changed, 126 insertions(+), 100 deletions(-)
New commits:
commit dd4dca78bf9016c3ef89bb27e869011eceb77313
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Dec 5 10:49:06 2014 -0500
Extract this code block into an own function.
This code block is sufficiently self-contained.
Change-Id: I0eb2d3ee8175af60394ff4c408a9c245f77044d8
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 7e1d24a..bff310e 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -595,6 +595,16 @@ struct SortedRowFlags
{
miPosFiltered = maRowsFiltered.insert(miPosFiltered, nRow, nRow+1,
b).first;
}
+
+void swap( SortedRowFlags r )
+{
+maRowsHidden.swap(r.maRowsHidden);
+maRowsFiltered.swap(r.maRowsFiltered);
+
+// Just reset the position hints.
+miPosHidden = maRowsHidden.begin();
+miPosFiltered = maRowsFiltered.begin();
+}
};
struct PatternSpan
@@ -698,6 +708,121 @@ public:
}
};
+void fillSortedColumnArray(
+boost::ptr_vectorSortedColumn rSortedCols,
+SortedRowFlags rRowFlags,
+ScSortInfoArray* pArray, SCTAB nTab, SCCOL nCol1, SCCOL nCol2, ScProgress*
pProgress )
+{
+SCROW nRow1 = pArray-GetStart();
+SCROW nRow2 = pArray-GetLast();
+ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
+
+size_t nColCount = nCol2 - nCol1 + 1;
+boost::ptr_vectorSortedColumn aSortedCols; // storage for copied cells.
+SortedRowFlags aRowFlags;
+aSortedCols.reserve(nColCount);
+for (size_t i = 0; i nColCount; ++i)
+{
+// In the sorted column container, element positions and row
+// positions must match, else formula cells may mis-behave during
+// grouping.
+aSortedCols.push_back(new SortedColumn(nRow1));
+}
+
+for (size_t i = 0; i pRows-size(); ++i)
+{
+ScSortInfoArray::Row* pRow = (*pRows)[i];
+for (size_t j = 0; j pRow-maCells.size(); ++j)
+{
+ScAddress aCellPos(nCol1 + j, nRow1 + i, nTab);
+
+ScSortInfoArray::Cell rCell = pRow-maCells[j];
+
+sc::CellStoreType rCellStore = aSortedCols.at(j).maCells;
+switch (rCell.maCell.meType)
+{
+case CELLTYPE_STRING:
+assert(rCell.mpAttr);
+rCellStore.push_back(*rCell.maCell.mpString);
+break;
+case CELLTYPE_VALUE:
+assert(rCell.mpAttr);
+rCellStore.push_back(rCell.maCell.mfValue);
+break;
+case CELLTYPE_EDIT:
+assert(rCell.mpAttr);
+rCellStore.push_back(rCell.maCell.mpEditText-Clone());
+break;
+case CELLTYPE_FORMULA:
+{
+assert(rCell.mpAttr);
+ScAddress aOldPos = rCell.maCell.mpFormula-aPos;
+
+ScFormulaCell* pNew = rCell.maCell.mpFormula-Clone(
aCellPos, SC_CLONECELL_DEFAULT);
+if (pArray-IsUpdateRefs())
+{
+pNew-CopyAllBroadcasters(*rCell.maCell.mpFormula);
+pNew-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
aCellPos);
+}
+else
+{
+
pNew-GetCode()-AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos, aCellPos);
+}
+
+rCellStore.push_back(pNew);
+}
+break;
+default:
+assert(!rCell.mpAttr);
+rCellStore.push_back_empty();
+}
+
+sc::CellTextAttrStoreType rAttrStore =
aSortedCols.at(j).maCellTextAttrs;
+if (rCell.mpAttr)
+rAttrStore.push_back(*rCell.mpAttr);
+else
+rAttrStore.push_back_empty();
+
+if (pArray-IsUpdateRefs())
+{
+// At this point each broadcaster instance is managed by 2
+// containers. We will release those in the original storage
+// below before transferring them to the document.
+sc::BroadcasterStoreType rBCStore =
aSortedCols.at(j).maBroadcasters;
+if (rCell.mpBroadcaster)
+// A const pointer would be implicitly converted to a bool
type.
+
rBCStore.push_back(const_castSvtBroadcaster*(rCell.mpBroadcaster));
+else
+rBCStore.push_back_empty();
+}
+
+// The same with cell note instances ...
+sc::CellNoteStoreType rNoteStore = aSortedCols.at(j).maCellNotes;
+if (rCell.mpNote)
+rNoteStore.push_back(const_castScPostIt*(rCell.mpNote));
+
[Libreoffice-commits] core.git: sc/source
sc/source/ui/condformat/condformatdlgentry.cxx | 323 +
sc/source/ui/inc/condformatdlgentry.hxx| 11
2 files changed, 140 insertions(+), 194 deletions(-)
New commits:
commit 170dbaf19f856085f0e1d2a4679248d55c7ba1d7
Author: Renato Ferreira renato.w...@gmail.com
Date: Thu Dec 4 07:16:54 2014 -0500
Refactor + minor bugfix in conditional formatting
Use lookup table to translate between listbox positions
and condition modes in the condformat dialog. Use function
to get the number of necessary edit fields instead
of hard-coded if/switch statements.
Fixed minor bug where conditions with no parameter, after
created, would cause one edit field to appear when
opening the dialog, even though it is not used, and would
correctly disappear after selecting the option in the
listbox again.
Change-Id: I7310674162acc33825233866aac3196905dfe8ab
Reviewed-on: https://gerrit.libreoffice.org/13300
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 81d9076..87c7f45 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -164,6 +164,33 @@ void FillStyleListBox( ScDocument* pDoc, ListBox rLbStyle
)
}
+const ScConditionMode
ScConditionFrmtEntry::mpEntryToCond[ScConditionFrmtEntry::NUM_COND_ENTRIES] = {
+SC_COND_EQUAL,
+SC_COND_LESS,
+SC_COND_GREATER,
+SC_COND_EQLESS,
+SC_COND_EQGREATER,
+SC_COND_NOTEQUAL,
+SC_COND_BETWEEN,
+SC_COND_NOTBETWEEN,
+SC_COND_DUPLICATE,
+SC_COND_NOTDUPLICATE,
+SC_COND_TOP10,
+SC_COND_BOTTOM10,
+SC_COND_TOP_PERCENT,
+SC_COND_BOTTOM_PERCENT,
+SC_COND_ABOVE_AVERAGE,
+SC_COND_BELOW_AVERAGE,
+SC_COND_ABOVE_EQUAL_AVERAGE,
+SC_COND_BELOW_EQUAL_AVERAGE,
+SC_COND_ERROR,
+SC_COND_NOERROR,
+SC_COND_BEGINS_WITH,
+SC_COND_ENDS_WITH,
+SC_COND_CONTAINS_TEXT,
+SC_COND_NOT_CONTAINS_TEXT
+};
+
ScConditionFrmtEntry::ScConditionFrmtEntry( vcl::Window* pParent, ScDocument*
pDoc, ScCondFormatDlg* pDialogParent,
const ScAddress rPos, const ScCondFormatEntry* pFormatEntry ):
ScCondFrmtEntry( pParent, pDoc, rPos ),
@@ -189,97 +216,25 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( vcl::Window*
pParent, ScDocument* pD
maLbStyle.SelectEntry(aStyleName);
StyleSelectHdl(NULL);
ScConditionMode eMode = pFormatEntry-GetOperation();
-maEdVal1.SetText(pFormatEntry-GetExpression(maPos, 0));
-maEdVal2.Hide();
-switch(eMode)
+
+maLbCondType.SelectEntryPos(ConditionModeToEntryPos(eMode));
+
+switch(GetNumberEditFields(eMode))
{
-case SC_COND_EQUAL:
-maLbCondType.SelectEntryPos(0);
-break;
-case SC_COND_LESS:
-maLbCondType.SelectEntryPos(1);
-break;
-case SC_COND_GREATER:
-maLbCondType.SelectEntryPos(2);
-break;
-case SC_COND_EQLESS:
-maLbCondType.SelectEntryPos(3);
-break;
-case SC_COND_EQGREATER:
-maLbCondType.SelectEntryPos(4);
+case 0:
+maEdVal1.Hide();
+maEdVal2.Hide();
break;
-case SC_COND_NOTEQUAL:
-maLbCondType.SelectEntryPos(5);
+case 1:
+maEdVal1.Show();
+maEdVal1.SetText(pFormatEntry-GetExpression(maPos, 0));
+maEdVal2.Hide();
break;
-case SC_COND_BETWEEN:
+case 2:
+maEdVal1.Show();
+maEdVal1.SetText(pFormatEntry-GetExpression(maPos, 0));
maEdVal2.Show();
maEdVal2.SetText(pFormatEntry-GetExpression(maPos, 1));
-maLbCondType.SelectEntryPos(6);
-break;
-case SC_COND_NOTBETWEEN:
-maEdVal2.Show();
-maEdVal2.SetText(pFormatEntry-GetExpression(maPos, 1));
-maLbCondType.SelectEntryPos(7);
-break;
-case SC_COND_DUPLICATE:
-maLbCondType.SelectEntryPos(8);
-break;
-case SC_COND_NOTDUPLICATE:
-maLbCondType.SelectEntryPos(9);
-break;
-case SC_COND_DIRECT:
-assert(false);
-//maLbType.SelectEntryPos(2);
-break;
-case SC_COND_TOP10:
-maLbCondType.SelectEntryPos(10);
-break;
-case SC_COND_BOTTOM10:
-maLbCondType.SelectEntryPos(11);
-break;
-case SC_COND_TOP_PERCENT:
-maLbCondType.SelectEntryPos(12);
-
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/xfilter/xfparastyle.hxx|2 +-
lotuswordpro/source/filter/xfilter/xfstylemanager.cxx | 17 +++--
2 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 42e9c74001b4799d8b874a000af2b11ebad2d8cc
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 17:02:38 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: I4a53ebf42add80bbac2d6698ac5d2950c0a6a067
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index 9f3c4af..58ce28c 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -66,6 +66,7 @@
#include rtl/ref.hxx
+#include xffont.hxx
#include xfglobal.hxx
#include xfstyle.hxx
#include xfcolor.hxx
@@ -81,7 +82,6 @@
#define XFPARA_FLAG_DROPCAP 0X0002
#define XFPARA_FLAG_BACKCOLOR 0X0004
-class XFFont;
class XFBorders;
class XFBGImage;
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
index 5503805..c5857988 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -57,7 +57,12 @@
* @file
* Style manager for the filter.
/
+
+#include sal/config.h
+
+#include xfparastyle.hxx
#include xfstylemanager.hxx
+#include xftextstyle.hxx
#include ixfstyle.hxx
XFStyleManager::XFStyleManager() : s_aStdArrowStyles( arrow ),
s_aTextStyles( T ),
@@ -226,10 +231,10 @@ IXFStyleRet XFStyleManager::AddStyle(IXFStyle *pStyle)
IXFStyle* XFStyleManager::FindStyle(const OUString name)
{
-IXFStyle *pStyle = (IXFStyle*)FindParaStyle(name);
+IXFStyle *pStyle = FindParaStyle(name);
if( pStyle )
return pStyle;
-pStyle = (IXFStyle*)FindTextStyle(name);
+pStyle = FindTextStyle(name);
if( pStyle )
return pStyle;
pStyle = s_aListStyles.FindStyle(name);
@@ -281,18 +286,18 @@ XFParaStyle*XFStyleManager::FindParaStyle(const
OUString name)
{
IXFStyle *pStyle = s_aParaStyles.FindStyle(name);
if( pStyle )
-return (XFParaStyle*)pStyle;
+return static_castXFParaStyle*(pStyle);
else
-return (XFParaStyle*)s_aStdParaStyles.FindStyle(name);
+return static_castXFParaStyle*(s_aStdParaStyles.FindStyle(name));
}
XFTextStyle*XFStyleManager::FindTextStyle(const OUString name)
{
IXFStyle *pStyle = s_aTextStyles.FindStyle(name);
if( pStyle )
-return (XFTextStyle*)pStyle;
+return static_castXFTextStyle*(pStyle);
else
-return (XFTextStyle*)s_aStdTextStyles.FindStyle(name);
+return static_castXFTextStyle*(s_aStdTextStyles.FindStyle(name));
}
voidXFStyleManager::SetLineNumberConfig(XFLineNumberConfig *pLNConf)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/table.hxx |2
sc/source/core/data/table3.cxx | 318 +++--
2 files changed, 213 insertions(+), 107 deletions(-)
New commits:
commit 13d64505214c33555dfbd61dbd9a177906df4981
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Dec 5 11:11:01 2014 -0500
Create 2 variants of SortReorderByRow.
One for IsUpdateRefs() true, the other for IsUpdateRefs() false.
Change-Id: I2b18e2b8a9770fd9499dd9fc0d26397e67c1e8ae
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 318805a..ba5529d 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1053,7 +1053,9 @@ private:
bool bKeepQuery, bool bUpdateRefs );
voidQuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi);
void SortReorderByColumn( ScSortInfoArray* pArray, SCROW nRow1, SCROW
nRow2, bool bPattern, ScProgress* pProgress );
+
void SortReorderByRow( ScSortInfoArray* pArray, SCCOL nCol1, SCCOL nCol2,
ScProgress* pProgress );
+void SortReorderByRowRefUpdate( ScSortInfoArray* pArray, SCCOL nCol1,
SCCOL nCol2, ScProgress* pProgress );
boolCreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScQueryParam rQueryParam);
boolCreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScQueryParam rQueryParam);
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 0b5b27f..769b20d 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -715,7 +715,6 @@ void fillSortedColumnArray(
ScSortInfoArray* pArray, SCTAB nTab, SCCOL nCol1, SCCOL nCol2, ScProgress*
pProgress )
{
SCROW nRow1 = pArray-GetStart();
-SCROW nRow2 = pArray-GetLast();
ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
size_t nColCount = nCol2 - nCol1 + 1;
@@ -971,38 +970,39 @@ void ScTable::SortReorderByColumn(
void ScTable::SortReorderByRow(
ScSortInfoArray* pArray, SCCOL nCol1, SCCOL nCol2, ScProgress* pProgress )
{
+assert(!pArray-IsUpdateRefs());
+
if (nCol2 nCol1)
return;
SCROW nRow1 = pArray-GetStart();
SCROW nRow2 = pArray-GetLast();
-ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
-assert(pRows); // In sort-by-row mode we must have data rows already
populated.
// Collect all listeners of cell broadcasters of sorted range.
std::vectorSvtListener* aCellListeners;
-if (!pArray-IsUpdateRefs())
+// When the update ref mode is disabled, we need to detach all formula
+// cells in the sorted range before reordering, and re-start them
+// afterward.
{
-// When the update ref mode is disabled, we need to detach all formula
-// cells in the sorted range before reordering, and re-start them
-// afterward.
sc::EndListeningContext aCxt(*pDocument);
DetachFormulaCells(aCxt, nCol1, nRow1, nCol2, nRow2);
+}
-// Collect listeners of cell broadcasters.
-for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
-aCol[nCol].CollectListeners(aCellListeners, nRow1, nRow2);
+// Collect listeners of cell broadcasters.
+for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
+aCol[nCol].CollectListeners(aCellListeners, nRow1, nRow2);
-// Remove any duplicate listener entries. We must ensure that we
notify
-// each unique listener only once.
-std::sort(aCellListeners.begin(), aCellListeners.end());
-aCellListeners.erase(std::unique(aCellListeners.begin(),
aCellListeners.end()), aCellListeners.end());
+// Remove any duplicate listener entries. We must ensure that we notify
+// each unique listener only once.
+std::sort(aCellListeners.begin(), aCellListeners.end());
+aCellListeners.erase(std::unique(aCellListeners.begin(),
aCellListeners.end()), aCellListeners.end());
-// Notify the cells' listeners to stop listening.
-/* TODO: for performance this could be enhanced to stop and later
- * restart only listening to within the reordered range and keep
- * listening to everything outside untouched. */
+// Notify the cells' listeners to stop listening.
+/* TODO: for performance this could be enhanced to stop and later
+ * restart only listening to within the reordered range and keep
+ * listening to everything outside untouched. */
+{
StopListeningNotifier aFunc;
std::for_each(aCellListeners.begin(), aCellListeners.end(), aFunc);
}
@@ -1037,18 +1037,6 @@ void ScTable::SortReorderByRow(
rSrc.transfer(nRow1, nRow2, rDest, nRow1);
}
-if (pArray-IsUpdateRefs())
-{
-sc::BroadcasterStoreType rSrc = aSortedCols[i].maBroadcasters;
-sc::BroadcasterStoreType rDest = aCol[nThisCol].maBroadcasters;
-
-// Release current broadcasters first, to prevent them from
getting deleted.
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/inc sc/source
sc/inc/table.hxx |2
sc/source/core/data/table3.cxx | 318 +++--
2 files changed, 213 insertions(+), 107 deletions(-)
New commits:
commit 3617d29dda61c5d5f76b45bdefd0342d5ae286dc
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Dec 5 11:11:01 2014 -0500
Create 2 variants of SortReorderByRow.
One for IsUpdateRefs() true, the other for IsUpdateRefs() false.
Change-Id: I2b18e2b8a9770fd9499dd9fc0d26397e67c1e8ae
(cherry picked from commit 13d64505214c33555dfbd61dbd9a177906df4981)
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c7898f1..10c703a 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1053,7 +1053,9 @@ private:
bool bKeepQuery, bool bUpdateRefs );
voidQuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi);
void SortReorderByColumn( ScSortInfoArray* pArray, SCROW nRow1, SCROW
nRow2, bool bPattern, ScProgress* pProgress );
+
void SortReorderByRow( ScSortInfoArray* pArray, SCCOL nCol1, SCCOL nCol2,
ScProgress* pProgress );
+void SortReorderByRowRefUpdate( ScSortInfoArray* pArray, SCCOL nCol1,
SCCOL nCol2, ScProgress* pProgress );
boolCreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScQueryParam rQueryParam);
boolCreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScQueryParam rQueryParam);
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index bff310e..588464f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -714,7 +714,6 @@ void fillSortedColumnArray(
ScSortInfoArray* pArray, SCTAB nTab, SCCOL nCol1, SCCOL nCol2, ScProgress*
pProgress )
{
SCROW nRow1 = pArray-GetStart();
-SCROW nRow2 = pArray-GetLast();
ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
size_t nColCount = nCol2 - nCol1 + 1;
@@ -970,38 +969,39 @@ void ScTable::SortReorderByColumn(
void ScTable::SortReorderByRow(
ScSortInfoArray* pArray, SCCOL nCol1, SCCOL nCol2, ScProgress* pProgress )
{
+assert(!pArray-IsUpdateRefs());
+
if (nCol2 nCol1)
return;
SCROW nRow1 = pArray-GetStart();
SCROW nRow2 = pArray-GetLast();
-ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
-assert(pRows); // In sort-by-row mode we must have data rows already
populated.
// Collect all listeners of cell broadcasters of sorted range.
std::vectorSvtListener* aCellListeners;
-if (!pArray-IsUpdateRefs())
+// When the update ref mode is disabled, we need to detach all formula
+// cells in the sorted range before reordering, and re-start them
+// afterward.
{
-// When the update ref mode is disabled, we need to detach all formula
-// cells in the sorted range before reordering, and re-start them
-// afterward.
sc::EndListeningContext aCxt(*pDocument);
DetachFormulaCells(aCxt, nCol1, nRow1, nCol2, nRow2);
+}
-// Collect listeners of cell broadcasters.
-for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
-aCol[nCol].CollectListeners(aCellListeners, nRow1, nRow2);
+// Collect listeners of cell broadcasters.
+for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
+aCol[nCol].CollectListeners(aCellListeners, nRow1, nRow2);
-// Remove any duplicate listener entries. We must ensure that we
notify
-// each unique listener only once.
-std::sort(aCellListeners.begin(), aCellListeners.end());
-aCellListeners.erase(std::unique(aCellListeners.begin(),
aCellListeners.end()), aCellListeners.end());
+// Remove any duplicate listener entries. We must ensure that we notify
+// each unique listener only once.
+std::sort(aCellListeners.begin(), aCellListeners.end());
+aCellListeners.erase(std::unique(aCellListeners.begin(),
aCellListeners.end()), aCellListeners.end());
-// Notify the cells' listeners to stop listening.
-/* TODO: for performance this could be enhanced to stop and later
- * restart only listening to within the reordered range and keep
- * listening to everything outside untouched. */
+// Notify the cells' listeners to stop listening.
+/* TODO: for performance this could be enhanced to stop and later
+ * restart only listening to within the reordered range and keep
+ * listening to everything outside untouched. */
+{
StopListeningNotifier aFunc;
std::for_each(aCellListeners.begin(), aCellListeners.end(), aFunc);
}
@@ -1036,18 +1036,6 @@ void ScTable::SortReorderByRow(
rSrc.transfer(nRow1, nRow2, rDest, nRow1);
}
-if (pArray-IsUpdateRefs())
-{
-sc::BroadcasterStoreType rSrc = aSortedCols[i].maBroadcasters;
-sc::BroadcasterStoreType rDest = aCol[nThisCol].maBroadcasters;
-
-// Release current
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table3.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 71bed3b736957d09a5379725ce5c97f5166ea30d Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 5 17:28:33 2014 +0100 loplugin:unusedvariablecheck Change-Id: I48c2421598152b64d40237eb0e917a680a27b643 diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index b9584e4..5ee2ada 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -1120,9 +1120,6 @@ void ScTable::SortReorderByRowRefUpdate( SCROW nRow1 = pArray-GetStart(); SCROW nRow2 = pArray-GetLast(); -// Collect all listeners of cell broadcasters of sorted range. -std::vectorSvtListener* aCellListeners; - // Split formula groups at the sort range boundaries (if applicable). std::vectorSCROW aRowBounds; aRowBounds.reserve(2); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table3.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit f05c37d3fdc8ef6839c6ebe43ae1a375f3073def
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 17:26:51 2014 +0100
-Werror,-Wshadow
Change-Id: Ia03dc71a3d4e4380258e7f8d2ebc3c9f32d83493
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 769b20d..b9584e4 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1153,14 +1153,16 @@ void ScTable::SortReorderByRowRefUpdate(
rSrc.transfer(nRow1, nRow2, rDest, nRow1);
}
-sc::BroadcasterStoreType rSrc = aSortedCols[i].maBroadcasters;
-sc::BroadcasterStoreType rDest = aCol[nThisCol].maBroadcasters;
+{
+sc::BroadcasterStoreType rSrc = aSortedCols[i].maBroadcasters;
+sc::BroadcasterStoreType rDest = aCol[nThisCol].maBroadcasters;
-// Release current broadcasters first, to prevent them from getting
deleted.
-rDest.release_range(nRow1, nRow2);
+// Release current broadcasters first, to prevent them from
getting deleted.
+rDest.release_range(nRow1, nRow2);
-// Transfer sorted broadcaster segment to the document.
-rSrc.transfer(nRow1, nRow2, rDest, nRow1);
+// Transfer sorted broadcaster segment to the document.
+rSrc.transfer(nRow1, nRow2, rDest, nRow1);
+}
{
sc::CellNoteStoreType rSrc = aSortedCols[i].maCellNotes;
___
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/frmfmt.hxx |2 +
sw/source/core/docnode/nodedump.cxx | 50
2 files changed, 30 insertions(+), 22 deletions(-)
New commits:
commit dd40936c9ccb76c17eac038eda4aa142ed13b129
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 5 17:14:18 2014 +0100
Factor out SwFrmFmt::dumpAsXml() from SwFrmFmts::dumpAsXml()
Change-Id: I494e6cd44087924d4b1f4fb9fcc599040d64390c
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index e73f6bd..e4c6e58 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -142,6 +142,8 @@ public:
// Access to DrawingLayer FillAttributes in a preprocessed form for
primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr
getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
// The FlyFrame-Format
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 705e34a..6007a3f 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -640,33 +640,39 @@ void SwFrmFmts::dumpAsXml(xmlTextWriterPtr w, const char*
pName) const
writer.startElement(pName);
for (size_t i = 0; i size(); ++i)
{
-const SwFrmFmt* pFmt = GetFmt(i);
-writer.startElement(swfrmfmt);
-OString aName = OUStringToOString(pFmt-GetName(),
RTL_TEXTENCODING_UTF8);
-writer.writeFormatAttribute(ptr, %p, pFmt);
-writer.writeFormatAttribute(name, %s,
BAD_CAST(aName.getStr()));
-
-writer.writeFormatAttribute(whichId, TMP_FORMAT, pFmt-Which());
-const char* pWhich = 0;
-switch (pFmt-Which())
-{
-case RES_FLYFRMFMT:
-pWhich = fly frame format;
-break;
-case RES_DRAWFRMFMT:
-pWhich = draw frame format;
-break;
-}
-if (pWhich)
-writer.writeFormatAttribute(which, %s, BAD_CAST(pWhich));
-
-lcl_dumpSfxItemSet(writer, pFmt-GetAttrSet());
-writer.endElement();
+if (const SwFrmFmt* pFmt = GetFmt(i))
+pFmt-dumpAsXml(writer);
}
writer.endElement();
}
}
+void SwFrmFmt::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST(swFrmFmt));
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST(ptr), %p, this);
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST(name),
BAD_CAST(GetName().toUtf8().getStr()));
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST(whichId), %d,
Which());
+
+const char* pWhich = 0;
+switch (Which())
+{
+case RES_FLYFRMFMT:
+pWhich = fly frame format;
+break;
+case RES_DRAWFRMFMT:
+pWhich = draw frame format;
+break;
+}
+if (pWhich)
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST(which),
BAD_CAST(pWhich));
+
+WriterHelper w(pWriter);
+lcl_dumpSfxItemSet(w, GetAttrSet());
+
+xmlTextWriterEndElement(pWriter);
+}
+
void SwCharFmts::dumpAsXml(xmlTextWriterPtr w) const
{
WriterHelper writer(w);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fudraw.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit cf6445c16a8fe7e8fb43a7ffdc4fbcdd753209bb Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 5 17:55:01 2014 +0100 loplugin:cstylecast, involving pointer to incomplete type Change-Id: I343572353b80eab8e6a2e4dacba0c4880048f380 diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index e5e327a..e375341 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -23,6 +23,7 @@ #include editeng/flditem.hxx #include svx/svdogrp.hxx +#include svx/svdoole2.hxx #include tools/urlobj.hxx #include vcl/help.hxx #include svx/bmpmask.hxx @@ -720,7 +721,7 @@ void FuDraw::DoubleClick(const MouseEvent rMEvt) /** * activate OLE-object **/ -mpViewShell-ActivateObject( (SdrOle2Obj*) pObj, 0); +mpViewShell-ActivateObject( static_castSdrOle2Obj*(pObj), 0); } } else if (nInv == SdrInventor nSdrObjKind == OBJ_GRAF pObj-IsEmptyPresObj() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table3.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c50d8bf596f527bb53b86dd04da652ed72f2c549
Author: Supreme Aryal supremear...@gmail.com
Date: Thu Dec 4 02:14:06 2014 -0500
Fix high memory usage when sorting cells in Calc. (fdo#81501)
Empty columns were being unnecessarily included in the sorting
range which caused extra allocation. This happens when you select
the entire sheet to sort. There was already code to skip empty
trailing cells in rows but not to skip empty columns.
Change-Id: Ieac22647bb13165cbf66cb1a93f567e5169fff6a
Reviewed-on: https://gerrit.libreoffice.org/13294
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5ee2ada..1a2a518 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1542,6 +1542,8 @@ void ScTable::Sort(
if (rSortParam.bByRow)
{
+while (aSortParam.nCol2 aSortParam.nCol1
aCol[aSortParam.nCol2].IsEmptyData())
+--aSortParam.nCol2;
SCROW nLastRow = 0;
for (SCCOL nCol = aSortParam.nCol1; nCol = aSortParam.nCol2; nCol++)
nLastRow = std::max(nLastRow, aCol[nCol].GetLastDataPos());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table3.cxx |5 +++--
sc/source/core/data/table6.cxx | 17 +
2 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 5f2e9679b1a676d54c9efc8fd0c2dae25015cfd9
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 18:05:10 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: Ib256ed35a9ecb59a07ed31edec9bd8abb31a4610
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 1a2a518..edeeaeb 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -59,6 +59,7 @@
#include fstalgorithm.hxx
#include listenercontext.hxx
#include sharedformula.hxx
+#include stlsheet.hxx
#include refhint.hxx
#include listenerquery.hxx
#include bcaslot.hxx
@@ -1812,8 +1813,8 @@ bool ScTable::DoSubTotals( ScSubTotalParam rParam )
//! sortieren?
-ScStyleSheet* pStyle = (ScStyleSheet*)
pDocument-GetStyleSheetPool()-Find(
-ScGlobal::GetRscString(STR_STYLENAME_RESULT),
SFX_STYLE_FAMILY_PARA );
+ScStyleSheet* pStyle =
static_castScStyleSheet*(pDocument-GetStyleSheetPool()-Find(
+ScGlobal::GetRscString(STR_STYLENAME_RESULT),
SFX_STYLE_FAMILY_PARA ));
bool bSpaceLeft = true; // Erfolg
beim Einfuegen?
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index c678680..697fa11 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -28,6 +28,7 @@
#include formulacell.hxx
#include document.hxx
#include stlpool.hxx
+#include stlsheet.hxx
#include markdata.hxx
#include editutil.hxx
#include detfunc.hxx
@@ -520,9 +521,9 @@ bool ScTable::ReplaceAll(
bool ScTable::SearchStyle(const SvxSearchItem rSearchItem, SCCOL rCol,
SCROW rRow,
const ScMarkData rMark)
{
-const ScStyleSheet* pSearchStyle = (const ScStyleSheet*)
+const ScStyleSheet* pSearchStyle = static_castconst ScStyleSheet*(
pDocument-GetStyleSheetPool()-Find(
-rSearchItem.GetSearchString(),
SFX_STYLE_FAMILY_PARA );
+rSearchItem.GetSearchString(),
SFX_STYLE_FAMILY_PARA ));
SCsCOL nCol = rCol;
SCsROW nRow = rRow;
@@ -612,9 +613,9 @@ bool ScTable::ReplaceStyle(const SvxSearchItem
rSearchItem, SCCOL rCol, SCROW
bRet = SearchStyle(rSearchItem, rCol, rRow, rMark);
if (bRet)
{
-const ScStyleSheet* pReplaceStyle = (const ScStyleSheet*)
+const ScStyleSheet* pReplaceStyle = static_castconst ScStyleSheet*(
pDocument-GetStyleSheetPool()-Find(
-rSearchItem.GetReplaceString(),
SFX_STYLE_FAMILY_PARA );
+rSearchItem.GetReplaceString(),
SFX_STYLE_FAMILY_PARA ));
if (pReplaceStyle)
ApplyStyle( rCol, rRow, *pReplaceStyle );
@@ -630,9 +631,9 @@ bool ScTable::ReplaceStyle(const SvxSearchItem
rSearchItem, SCCOL rCol, SCROW
bool ScTable::SearchAllStyle(
const SvxSearchItem rSearchItem, const ScMarkData rMark, ScRangeList
rMatchedRanges)
{
-const ScStyleSheet* pSearchStyle = (const ScStyleSheet*)
+const ScStyleSheet* pSearchStyle = static_castconst ScStyleSheet*(
pDocument-GetStyleSheetPool()-Find(
-rSearchItem.GetSearchString(),
SFX_STYLE_FAMILY_PARA );
+rSearchItem.GetSearchString(),
SFX_STYLE_FAMILY_PARA ));
bool bSelect = rSearchItem.GetSelection();
bool bBack = rSearchItem.GetBackward();
bool bEverFound = false;
@@ -670,9 +671,9 @@ bool ScTable::ReplaceAllStyle(
bool bRet = SearchAllStyle(rSearchItem, rMark, rMatchedRanges);
if (bRet)
{
-const ScStyleSheet* pReplaceStyle = (const ScStyleSheet*)
+const ScStyleSheet* pReplaceStyle = static_castconst ScStyleSheet*(
pDocument-GetStyleSheetPool()-Find(
-rSearchItem.GetReplaceString(),
SFX_STYLE_FAMILY_PARA );
+rSearchItem.GetReplaceString(),
SFX_STYLE_FAMILY_PARA ));
if (pReplaceStyle)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 83379, which changed state. Bug 83379 Summary: FILESAVE: Document containing draw:custom-shape corrupted on save (regression) https://bugs.freedesktop.org/show_bug.cgi?id=83379 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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: sd/inc sd/source
sd/inc/sdabstdlg.hxx |4 ++--
sd/source/ui/dlg/sddlgfact.cxx |4 ++--
sd/source/ui/dlg/sddlgfact.hxx |2 +-
sd/source/ui/view/drviews3.cxx |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e5992c481c01f6c85e43192ef83e384a035d9bf1
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 18:15:11 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: Ifec8ab79b0ecb4ec16cb9a0cf3b67757b56ab5ad
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 6120b20..2c7932c 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -34,6 +34,7 @@
namespace sd {
class View;
+class ViewShell;
class DrawDocShell;
class DrawView;
}
@@ -56,7 +57,6 @@ class SdResId;
namespace vcl { class Window; }
class SdPage;
class TabPage;
-class ViewShell;
class SdCustomShowList;
class AbstractCopyDlg : public VclAbstractDialog
@@ -200,7 +200,7 @@ public:
SdDrawDocument* pDoc,
SdPage* ) =
0;
-virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell*
pViewShell,
+virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog(
sd::ViewShell* pViewShell,
vcl::Window*
pParent,
SdDrawDocument* pDoc,
SdPage*
pCurrentPage ) = 0;
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index cd9e452..b6103aec 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -517,10 +517,10 @@ VclAbstractDialog*
SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( vcl::
return new SdVclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent,
pDoc, pCurrentPage ));
}
-AbstractHeaderFooterDialog*
SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell,
+AbstractHeaderFooterDialog*
SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( sd::ViewShell*
pViewShell,
vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage )
{
-return new AbstractHeaderFooterDialog_Impl( new ::sd::HeaderFooterDialog(
(::sd::ViewShell*)pViewShell, pParent, pDoc, pCurrentPage ));
+return new AbstractHeaderFooterDialog_Impl( new ::sd::HeaderFooterDialog(
pViewShell, pParent, pDoc, pCurrentPage ));
}
VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog(
vcl::Window* pWindow, SdDrawDocument* pDoc )
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index cc146f6..2c599a0 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -261,7 +261,7 @@ public:
SdDrawDocument* pDoc,
SdPage* )
SAL_OVERRIDE;
-virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell*
pViewShell,
+virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog(
sd::ViewShell* pViewShell,
vcl::Window*
pParent,
SdDrawDocument* pDoc,
SdPage*
pCurrentPage ) SAL_OVERRIDE;
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index acc191b..6152834 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -293,7 +293,7 @@ void DrawViewShell::ExecCtrl(SfxRequest rReq)
case SID_INSERT_DATE_TIME:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-boost::scoped_ptrAbstractHeaderFooterDialog pDlg(pFact ?
pFact-CreateHeaderFooterDialog( (::ViewShell*)this, GetActiveWindow(),
GetDoc(), mpActualPage ) : 0);
+boost::scoped_ptrAbstractHeaderFooterDialog pDlg(pFact ?
pFact-CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(),
mpActualPage ) : 0);
if( pDlg )
{
pDlg-Execute();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - xmloff/source
xmloff/source/text/XMLTextMarkImportContext.cxx | 51
1 file changed, 34 insertions(+), 17 deletions(-)
New commits:
commit 5831405c8cf55fae64e88d1fc139d449e011e003
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 5 18:17:02 2014 +0100
xmloff: remove pointless branch that does the same as the next one
Change-Id: Ib39ec9c045461590767a29ccdd28f39b2a623e88
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index b4e5e15..0c312d1 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -150,8 +150,6 @@ static OUString lcl_getFieldmarkName(OUString const name)
if (name.equalsAscii(msoffice.field.FORMTEXT) ||
name.equalsAscii(ecma.office-open-xml.field.FORMTEXT) )
return OUString::createFromAscii(sFormtext);
-else if (name.equalsAscii(ODF_FORMTEXT) )
-return OUString::createFromAscii(sFormtext);
else
return name;
}
commit 25fd11e78279aef5a6b7656347758e5c67a9c45a
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 5 18:04:39 2014 +0100
fdo#86795: xmloff: ODF import: do not import checkbox fieldmark ...
... if it has start/end, because Writer will become grumpy and crash.
Change-Id: I6024051249eeac6ed9e43856fa77db969287f888
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 63bb7e2..b4e5e15 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -144,7 +144,7 @@ static const char *lcl_getFormFieldmarkName(OUString name)
return NULL;
}
-static OUString lcl_getFieldmarkName(OUString name)
+static OUString lcl_getFieldmarkName(OUString const name)
{
static const char sFormtext[]=ODF_FORMTEXT;
if (name.equalsAscii(msoffice.field.FORMTEXT) ||
@@ -289,19 +289,40 @@ void XMLTextMarkImportContext::EndElement()
bool
bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd
m_rHelper.hasCurrentFieldCtx());
-// insert reference
-const ReferenceXInterface xContent(
-CreateAndInsertMark(GetImport(),
-(bImportAsField ?
OUString(sAPI_fieldmark) : OUString(sAPI_bookmark)),
-m_sBookmarkName,
-xInsertionCursor,
-m_sXmlId) );
-if (pRDFaAttributes)
+// fdo#86795 check if it's actually a checkbox
first
+bool isInvalid(false);
+OUString fieldmarkTypeName;
+if (bImportAsField
m_rHelper.hasCurrentFieldCtx())
{
-const Referencerdf::XMetadatable
-xMeta(xContent, UNO_QUERY);
-GetImport().GetRDFaImportHelper().AddRDFa(
-xMeta, pRDFaAttributes);
+
+OUString const
type(m_rHelper.getCurrentFieldType());
+fieldmarkTypeName = lcl_getFieldmarkName(type);
+if (fieldmarkTypeName == ODF_FORMCHECKBOX ||
+fieldmarkTypeName == ODF_FORMDROPDOWN)
+{ // sw can't handle checkbox with start+end
+SAL_INFO(xmloff.text, invalid
fieldmark-start/fieldmark-end ignored);
+isInvalid = true;
+}
+}
+
+ReferenceXInterface xContent;
+if (!isInvalid)
+{
+// insert reference
+xContent = CreateAndInsertMark(GetImport(),
+(bImportAsField
+? OUString(sAPI_fieldmark)
+: OUString(sAPI_bookmark)),
+m_sBookmarkName,
+xInsertionCursor,
+m_sXmlId);
+if (pRDFaAttributes)
+{
+const Referencerdf::XMetadatable
+xMeta(xContent, UNO_QUERY);
+GetImport().GetRDFaImportHelper().AddRDFa(
+xMeta, pRDFaAttributes);
+}
}
if
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - xmloff/source
xmloff/source/text/XMLTextMarkImportContext.cxx | 49
1 file changed, 34 insertions(+), 15 deletions(-)
New commits:
commit 7b350a0a6f93fcd61c1ece112bd9a62d55cdeee6
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 5 18:04:39 2014 +0100
fdo#86795: xmloff: ODF import: do not import checkbox fieldmark ...
... if it has start/end, because Writer will become grumpy and crash.
Change-Id: I6024051249eeac6ed9e43856fa77db969287f888
(cherry picked from commit 25fd11e78279aef5a6b7656347758e5c67a9c45a)
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 63bb7e2..b4e5e15 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -144,7 +144,7 @@ static const char *lcl_getFormFieldmarkName(OUString name)
return NULL;
}
-static OUString lcl_getFieldmarkName(OUString name)
+static OUString lcl_getFieldmarkName(OUString const name)
{
static const char sFormtext[]=ODF_FORMTEXT;
if (name.equalsAscii(msoffice.field.FORMTEXT) ||
@@ -289,19 +289,40 @@ void XMLTextMarkImportContext::EndElement()
bool
bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd
m_rHelper.hasCurrentFieldCtx());
-// insert reference
-const ReferenceXInterface xContent(
-CreateAndInsertMark(GetImport(),
-(bImportAsField ?
OUString(sAPI_fieldmark) : OUString(sAPI_bookmark)),
-m_sBookmarkName,
-xInsertionCursor,
-m_sXmlId) );
-if (pRDFaAttributes)
+// fdo#86795 check if it's actually a checkbox
first
+bool isInvalid(false);
+OUString fieldmarkTypeName;
+if (bImportAsField
m_rHelper.hasCurrentFieldCtx())
{
-const Referencerdf::XMetadatable
-xMeta(xContent, UNO_QUERY);
-GetImport().GetRDFaImportHelper().AddRDFa(
-xMeta, pRDFaAttributes);
+
+OUString const
type(m_rHelper.getCurrentFieldType());
+fieldmarkTypeName = lcl_getFieldmarkName(type);
+if (fieldmarkTypeName == ODF_FORMCHECKBOX ||
+fieldmarkTypeName == ODF_FORMDROPDOWN)
+{ // sw can't handle checkbox with start+end
+SAL_INFO(xmloff.text, invalid
fieldmark-start/fieldmark-end ignored);
+isInvalid = true;
+}
+}
+
+ReferenceXInterface xContent;
+if (!isInvalid)
+{
+// insert reference
+xContent = CreateAndInsertMark(GetImport(),
+(bImportAsField
+? OUString(sAPI_fieldmark)
+: OUString(sAPI_bookmark)),
+m_sBookmarkName,
+xInsertionCursor,
+m_sXmlId);
+if (pRDFaAttributes)
+{
+const Referencerdf::XMetadatable
+xMeta(xContent, UNO_QUERY);
+GetImport().GetRDFaImportHelper().AddRDFa(
+xMeta, pRDFaAttributes);
+}
}
if ((lcl_MarkType)nTmp==TypeFieldmarkEnd) {
@@ -309,8 +330,6 @@ void XMLTextMarkImportContext::EndElement()
// setup fieldmark...
Reference
::com::sun::star::text::XFormField xFormField(xContent, UNO_QUERY);
if (xFormField.is()
m_rHelper.hasCurrentFieldCtx()) {
-OUString
givenTypeName=m_rHelper.getCurrentFieldType();
-OUString
fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName);
xFormField-setFieldType(fieldmarkTypeName);
m_rHelper.setCurrentFieldParamsTo(xFormField);
___
Libreoffice-commits mailing list
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/tpaction.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ab42bf5656938bb231fa8f3a0f7d14f2f85315a2
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 18:35:10 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: I17d20cce0853a7981cf55f560915c57c8325c122
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index b07f8b3..f7c4937 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -37,6 +37,7 @@
#include osl/file.hxx
#include sfx2/app.hxx
#include unotools/pathoptions.hxx
+#include svx/svdograf.hxx
#include svx/svdpagv.hxx
#include unotools/localfilehelper.hxx
#include svl/aeitem.hxx
@@ -192,7 +193,7 @@ void SdTPAction::Construct()
}
else if (nInv == SdrInventor nSdrObjKind == OBJ_GRAF)
{
-pGrafObj = (SdrGrafObj*) pObj;
+pGrafObj = static_castSdrGrafObj*(pObj);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/slideshow.hxx |3 ++-
sd/source/ui/slideshow/slideshow.cxx |2 +-
sd/source/ui/view/drawview.cxx |2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit b42c5a7809b8ca9eaef757897215b3225bce8056
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 18:35:34 2014 +0100
loplugin:cstylecast, involving pointer to incomplete type
Change-Id: I4b892790a16892396252467b3f3c31240b2f64e8
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index fda3d8a..2a35f13 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -46,6 +46,7 @@ namespace com { namespace sun { namespace star {
class SdDrawDocument;
class KeyEvent;
+class OutputDevice;
class Size;
class Rectangle;
namespace vcl { class Window; }
@@ -158,7 +159,7 @@ public:
// settings
bool isFullScreen();// a.k.a.
FuSlideShow::IsFullScreen()
bool isAlwaysOnTop(); // a.k.a.
FuSlideShow::IsAlwaysOnTop();
-ShowWindow* getShowWindow();// a.k.a.
FuSlideShow::GetShowWindow()
+OutputDevice* getShowWindow(); // a.k.a.
FuSlideShow::GetShowWindow()
int getAnimationMode(); // a.k.a.
FuSlideShow::GetAnimationMode()
sal_Int32 getCurrentPageNumber(); // a.k.a.
FuSlideShow::GetCurrentPage()
sal_Int32 getFirstPageNumber();
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index 85ac816..dcb5dbc 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -925,7 +925,7 @@ bool SlideShow::startPreview( const Reference XDrawPage
xDrawPage, const Ref
return true;
}
-ShowWindow* SlideShow::getShowWindow()
+OutputDevice* SlideShow::getShowWindow()
{
return mxController.is() ? mxController-mpShowWindow : 0;
}
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 131db8b..b2b2d782 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -471,7 +471,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const
vcl::Region rReg, sd
rtl::Reference sd::SlideShow xSlideshow( SlideShow::GetSlideShow(
pDoc ) );
if(xSlideshow.is() xSlideshow-isRunning())
{
-OutputDevice* pShowWindow = ( OutputDevice*
)xSlideshow-getShowWindow();
+OutputDevice* pShowWindow = xSlideshow-getShowWindow();
if( (pShowWindow == pOutDev) || (xSlideshow-getAnimationMode() ==
ANIMATIONMODE_PREVIEW) )
{
if( pShowWindow == pOutDev )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slideshow/slideshowimpl.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 9d55835551621d6268656c553db53a877c91e7dc
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 18:37:23 2014 +0100
Remove unused function
Change-Id: Ibb418bc13e7635e8e4605f5ebc76a5f3f719cb4c
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx
b/sd/source/ui/slideshow/slideshowimpl.hxx
index 22eb6fc..cab6d84 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -252,8 +252,6 @@ private:
const css::uno::Reference css::animations::XAnimationNode
xAnimationNode,
vcl::Window* pParent );
-ShowWindow* getShowWindow() const { return mpShowWindow; }
-
/** forces an async call to update in the main thread */
void startUpdateTimer();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On Thursday 04 of December 2014, Michael Meeks wrote: * Large scale renames (Kendy) ... + if cleanup there; perhaps some improved naming too. http://qt-project.org/wiki/API-Design-Principles#d8bc4b5cb3e68ae6e38b29e371b7f734 would be a very worthwhile reading here. + would support better names for Writer (Bjorn) + can re-write classes with Clang ? (Michael) Clang should be able to rewrite pretty much whatever would matter. E.g. compilerplugins/clang/store/changefunctioncalls.cxx could be used to rename all calls of a specific function. -- Lubos Lunak l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/data/table3.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit c7b57c6c2b15a4b9f65dafb642e3f1da402e62ca
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 5 19:03:25 2014 +0100
trim also empty leading column ranges, fdo#81501 follow-up
Change-Id: Ieaeea85149e4b6d263b112205bb17c155e2d12be
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 3456148..9a7de8f8 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1541,7 +1541,10 @@ void ScTable::Sort(
pUndo-mbUpdateRefs = bUpdateRefs;
}
-while (aSortParam.nCol2 aSortParam.nCol1
aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
+// Trim empty leading and trailing column ranges.
+while (aSortParam.nCol1 aSortParam.nCol2
aCol[aSortParam.nCol1].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
+++aSortParam.nCol1;
+while (aSortParam.nCol1 aSortParam.nCol2
aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
--aSortParam.nCol2;
if (rSortParam.bByRow)
commit 1e4235f8b2dc693b0fb1edade9db25a631bdbf94
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 5 18:36:03 2014 +0100
actually use identical code for both byRow and byCol, fdo#81501 follow-up
Change-Id: I982e03a12dd80be0787f22dce4495065775e7de0
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index edeeaeb..3456148 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1541,10 +1541,11 @@ void ScTable::Sort(
pUndo-mbUpdateRefs = bUpdateRefs;
}
+while (aSortParam.nCol2 aSortParam.nCol1
aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
+--aSortParam.nCol2;
+
if (rSortParam.bByRow)
{
-while (aSortParam.nCol2 aSortParam.nCol1
aCol[aSortParam.nCol2].IsEmptyData())
---aSortParam.nCol2;
SCROW nLastRow = 0;
for (SCCOL nCol = aSortParam.nCol1; nCol = aSortParam.nCol2; nCol++)
nLastRow = std::max(nLastRow, aCol[nCol].GetLastDataPos());
@@ -1576,11 +1577,7 @@ void ScTable::Sort(
}
else
{
-SCCOL nLastCol;
-for (nLastCol = aSortParam.nCol2;
- (nLastCol aSortParam.nCol1)
aCol[nLastCol].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2); nLastCol--)
-{
-}
+SCCOL nLastCol = aSortParam.nCol2;
SCCOL nCol1 = (rSortParam.bHasHeader ?
aSortParam.nCol1 + 1 : aSortParam.nCol1);
if (!IsSorted(nCol1, nLastCol))
___
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' - 2 commits - sc/source
sc/source/core/data/table3.cxx | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 4469ac71fe0aadf498db542b4e5da6212316d809
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 17:28:33 2014 +0100
loplugin:unusedvariablecheck
Change-Id: I48c2421598152b64d40237eb0e917a680a27b643
(cherry picked from commit 71bed3b736957d09a5379725ce5c97f5166ea30d)
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 1e4a9c2..d4c0aa0 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1119,9 +1119,6 @@ void ScTable::SortReorderByRowRefUpdate(
SCROW nRow1 = pArray-GetStart();
SCROW nRow2 = pArray-GetLast();
-// Collect all listeners of cell broadcasters of sorted range.
-std::vectorSvtListener* aCellListeners;
-
// Split formula groups at the sort range boundaries (if applicable).
std::vectorSCROW aRowBounds;
aRowBounds.reserve(2);
commit c1a7fbdcb8c5895c279392ce408b0dccc242e135
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 5 17:26:51 2014 +0100
-Werror,-Wshadow
Change-Id: Ia03dc71a3d4e4380258e7f8d2ebc3c9f32d83493
(cherry picked from commit f05c37d3fdc8ef6839c6ebe43ae1a375f3073def)
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 588464f..1e4a9c2 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1152,14 +1152,16 @@ void ScTable::SortReorderByRowRefUpdate(
rSrc.transfer(nRow1, nRow2, rDest, nRow1);
}
-sc::BroadcasterStoreType rSrc = aSortedCols[i].maBroadcasters;
-sc::BroadcasterStoreType rDest = aCol[nThisCol].maBroadcasters;
+{
+sc::BroadcasterStoreType rSrc = aSortedCols[i].maBroadcasters;
+sc::BroadcasterStoreType rDest = aCol[nThisCol].maBroadcasters;
-// Release current broadcasters first, to prevent them from getting
deleted.
-rDest.release_range(nRow1, nRow2);
+// Release current broadcasters first, to prevent them from
getting deleted.
+rDest.release_range(nRow1, nRow2);
-// Transfer sorted broadcaster segment to the document.
-rSrc.transfer(nRow1, nRow2, rDest, nRow1);
+// Transfer sorted broadcaster segment to the document.
+rSrc.transfer(nRow1, nRow2, rDest, nRow1);
+}
{
sc::CellNoteStoreType rSrc = aSortedCols[i].maCellNotes;
___
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' - 3 commits - sc/source
sc/source/core/data/table3.cxx | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit ba410bdb74e2f1fcc011934380890fc7fa872777
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 5 19:03:25 2014 +0100
trim also empty leading column ranges, fdo#81501 follow-up
Change-Id: Ieaeea85149e4b6d263b112205bb17c155e2d12be
(cherry picked from commit c7b57c6c2b15a4b9f65dafb642e3f1da402e62ca)
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index fc59e00..c955920 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1539,7 +1539,10 @@ void ScTable::Sort(
pUndo-mbUpdateRefs = bUpdateRefs;
}
-while (aSortParam.nCol2 aSortParam.nCol1
aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
+// Trim empty leading and trailing column ranges.
+while (aSortParam.nCol1 aSortParam.nCol2
aCol[aSortParam.nCol1].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
+++aSortParam.nCol1;
+while (aSortParam.nCol1 aSortParam.nCol2
aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
--aSortParam.nCol2;
if (rSortParam.bByRow)
commit ded77b3983f1ccf7f7b611c59da9f2156ea7a0df
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 5 18:36:03 2014 +0100
actually use identical code for both byRow and byCol, fdo#81501 follow-up
Change-Id: I982e03a12dd80be0787f22dce4495065775e7de0
(cherry picked from commit 1e4235f8b2dc693b0fb1edade9db25a631bdbf94)
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 63b3df0..fc59e00 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1539,10 +1539,11 @@ void ScTable::Sort(
pUndo-mbUpdateRefs = bUpdateRefs;
}
+while (aSortParam.nCol2 aSortParam.nCol1
aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
+--aSortParam.nCol2;
+
if (rSortParam.bByRow)
{
-while (aSortParam.nCol2 aSortParam.nCol1
aCol[aSortParam.nCol2].IsEmptyData())
---aSortParam.nCol2;
SCROW nLastRow = 0;
for (SCCOL nCol = aSortParam.nCol1; nCol = aSortParam.nCol2; nCol++)
nLastRow = std::max(nLastRow, aCol[nCol].GetLastDataPos());
@@ -1574,11 +1575,7 @@ void ScTable::Sort(
}
else
{
-SCCOL nLastCol;
-for (nLastCol = aSortParam.nCol2;
- (nLastCol aSortParam.nCol1)
aCol[nLastCol].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2); nLastCol--)
-{
-}
+SCCOL nLastCol = aSortParam.nCol2;
SCCOL nCol1 = (rSortParam.bHasHeader ?
aSortParam.nCol1 + 1 : aSortParam.nCol1);
if (!IsSorted(nCol1, nLastCol))
commit bc3755e041a6cdb678fb8c8093beb6b3a8e3f0e0
Author: Supreme Aryal supremear...@gmail.com
Date: Thu Dec 4 02:14:06 2014 -0500
Fix high memory usage when sorting cells in Calc. (fdo#81501)
Empty columns were being unnecessarily included in the sorting
range which caused extra allocation. This happens when you select
the entire sheet to sort. There was already code to skip empty
trailing cells in rows but not to skip empty columns.
Change-Id: Ieac22647bb13165cbf66cb1a93f567e5169fff6a
Reviewed-on: https://gerrit.libreoffice.org/13294
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
(cherry picked from commit c50d8bf596f527bb53b86dd04da652ed72f2c549)
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index d4c0aa0..63b3df0 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1541,6 +1541,8 @@ void ScTable::Sort(
if (rSortParam.bByRow)
{
+while (aSortParam.nCol2 aSortParam.nCol1
aCol[aSortParam.nCol2].IsEmptyData())
+--aSortParam.nCol2;
SCROW nLastRow = 0;
for (SCCOL nCol = aSortParam.nCol1; nCol = aSortParam.nCol2; nCol++)
nLastRow = std::max(nLastRow, aCol[nCol].GetLastDataPos());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LO Bug 84873
I just noticed that this bug seems already solved in master. Sorry, Ulrich From: ulk...@hotmail.de To: libreoffice@lists.freedesktop.org Subject: LO Bug 84873 Date: Thu, 4 Dec 2014 21:39:25 +0100 Hi, regarding bug https://bugs.freedesktop.org/show_bug.cgi?id=84873, in case the assumption that LO isn't able to create the lock file is right, what would be the desired behaviour? just open the document readonly (disadvantage: Some users might be confused, why readonly)show a dialog box, with a text saying LO cant create a lock file because the directory is read-only.?Greetings, Ulrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sw/inc sw/source
sw/inc/calbck.hxx|8 ---
sw/inc/ring.hxx | 17 +++
sw/source/core/attr/calbck.cxx | 34 ++-
sw/source/core/unocore/unotextmarkup.cxx |4 ---
4 files changed, 34 insertions(+), 29 deletions(-)
New commits:
commit 526e746c3a95ee1dfbdf222e61d28ccc5be3cc98
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Dec 5 20:07:27 2014 +0100
ugly preliminary hack for keeping ggc 4.6 happy
Change-Id: I41d605b5acbb54969d6b2cb68f06583983ee0d4b
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 913d62a..b751733 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -27,6 +27,13 @@
#include boost/iterator/iterator_facade.hpp
#include boost/intrusive/circular_list_algorithms.hpp
+#if defined(__GNUC__) (__GNUC__ == 4) (__GNUC_MINOR__ 7)
+// gcc 4.6 backwards compat hack, remove ASAP when we drop support
+class SwPaM;
+class SwViewShell;
+class _SaveMergeRedlines;
+#endif
+
namespace sw
{
template typename value_type class RingContainer;
@@ -101,8 +108,18 @@ namespace sw
static node_ptr get_previous(const_node_ptr n) { return
const_castnode_ptr(static_castconst_node_ptr(n))-GetPrevInRing(); };
static void set_previous(node_ptr n, node_ptr previous) {
n-pPrev = previous; };
};
+#if defined(__GNUC__) (__GNUC__ == 4) (__GNUC_MINOR__ 7)
+// gcc 4.6 backwards compat hack, remove ASAP when we drop support
+friend class sw::RingContainerSwPaM;
+friend class sw::RingContainerconst SwPaM;
+friend class sw::RingContainerSwViewShell;
+friend class sw::RingContainerconst SwViewShell;
+friend class sw::RingContainer_SaveMergeRedlines;
+friend class sw::RingContainerconst _SaveMergeRedlines;
+#else
friend ring_container;
friend const_ring_container;
+#endif
friend typename ring_container::iterator;
friend typename ring_container::const_iterator;
friend typename const_ring_container::iterator;
commit 6cd053ebf2289fda4c5abd523db493d570ebb1c3
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Dec 5 17:51:56 2014 +0100
since touching this: sprinkle in some nullptr
Change-Id: I8a229e020acddfda2e7c69fc7faf24d1c338c879
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index a1193f7..a06bba2 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -23,12 +23,12 @@
#include swcache.hxx
#include swfntcch.hxx
-static SwClientIter* pClientIters = 0;
+static SwClientIter* pClientIters = nullptr;
TYPEINIT0( SwClient );
SwClient::SwClient( SwModify* pToRegisterIn )
-: pLeft( 0 ), pRight( 0 ), pRegisteredIn( 0 )
+: pLeft( nullptr ), pRight( nullptr ), pRegisteredIn( nullptr )
{
if(pToRegisterIn)
// connect to SwModify
@@ -81,7 +81,7 @@ bool SwClient::GetInfo( SfxPoolItem ) const
}
SwModify::SwModify()
-: SwClient(0), pRoot(0)
+: SwClient(nullptr), pRoot(nullptr)
{
bModifyLocked = false;
bLockClientList = false;
@@ -91,7 +91,7 @@ SwModify::SwModify()
}
SwModify::SwModify( SwModify* pToRegisterIn )
-: SwClient( pToRegisterIn ), pRoot( 0 )
+: SwClient( pToRegisterIn ), pRoot( nullptr )
{
bModifyLocked = false;
bLockClientList = false;
@@ -122,7 +122,7 @@ SwModify::~SwModify()
SwClient* p = aIter.GoStart();
while ( p )
{
-p-pRegisteredIn = 0;
+p-pRegisteredIn = nullptr;
p = ++aIter;
}
}
@@ -195,7 +195,7 @@ bool SwModify::GetInfo( SfxPoolItem rInfo ) const
if( pLast )
{
while( ( bRet = pLast-GetInfo( rInfo ) )
- 0 != ( pLast = ++aIter ) )
+ nullptr != ( pLast = ++aIter ) )
;
}
}
@@ -218,15 +218,15 @@ void SwModify::Add( SwClient* pDepend )
}
#endif
// deregister new client in case it is already registered elsewhere
-if( pDepend-pRegisteredIn != 0 )
+if( pDepend-pRegisteredIn != nullptr )
pDepend-pRegisteredIn-Remove( pDepend );
if( !pRoot )
{
// first client added
pRoot = pDepend;
-pRoot-pLeft = 0;
-pRoot-pRight = 0;
+pRoot-pLeft = nullptr;
+pRoot-pRight = nullptr;
}
else
{
@@ -246,7 +246,7 @@ void SwModify::Add( SwClient* pDepend )
SwClient* SwModify::Remove( SwClient* pDepend )
{
if ( bInDocDTOR )
-return 0;
+return nullptr;
if( pDepend-pRegisteredIn == this )
{
@@ -275,8 +275,8 @@ SwClient* SwModify::Remove( SwClient* pDepend )
pTmp = pTmp-pNxtIter;
}
-pDepend-pLeft = 0;
-pDepend-pRight =
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|76595 | -- 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
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||76595 -- 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: sw/inc
sw/inc/ring.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 80a1b88e0441463f7c9cb3541441e655210ee44f
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Dec 5 20:51:54 2014 +0100
also dont confuse clang on OSX
Change-Id: I4d80adbd284b7ed8193fa79e4d4abdec3ba60cb2
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index b751733..9c6efa9 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -27,7 +27,7 @@
#include boost/iterator/iterator_facade.hpp
#include boost/intrusive/circular_list_algorithms.hpp
-#if defined(__GNUC__) (__GNUC__ == 4) (__GNUC_MINOR__ 7)
+#if !defined(__clang__) defined(__GNUC__) (__GNUC__ == 4)
(__GNUC_MINOR__ 7)
// gcc 4.6 backwards compat hack, remove ASAP when we drop support
class SwPaM;
class SwViewShell;
@@ -108,7 +108,7 @@ namespace sw
static node_ptr get_previous(const_node_ptr n) { return
const_castnode_ptr(static_castconst_node_ptr(n))-GetPrevInRing(); };
static void set_previous(node_ptr n, node_ptr previous) {
n-pPrev = previous; };
};
-#if defined(__GNUC__) (__GNUC__ == 4) (__GNUC_MINOR__ 7)
+#if !defined(__clang__) defined(__GNUC__) (__GNUC__ == 4)
(__GNUC_MINOR__ 7)
// gcc 4.6 backwards compat hack, remove ASAP when we drop support
friend class sw::RingContainerSwPaM;
friend class sw::RingContainerconst SwPaM;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - xmloff/source
xmloff/source/text/XMLTextMarkImportContext.cxx | 49
1 file changed, 34 insertions(+), 15 deletions(-)
New commits:
commit ace0ec919fea773c847469dc01abf74393617d5f
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 5 18:04:39 2014 +0100
fdo#86795: xmloff: ODF import: do not import checkbox fieldmark ...
... if it has start/end, because Writer will become grumpy and crash.
(cherry picked from commit 25fd11e78279aef5a6b7656347758e5c67a9c45a)
Conflicts:
xmloff/source/text/XMLTextMarkImportContext.cxx
Change-Id: I6024051249eeac6ed9e43856fa77db969287f888
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 73ee88d..7720533 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -143,7 +143,7 @@ static const char *lcl_getFormFieldmarkName(OUString name)
return NULL;
}
-static OUString lcl_getFieldmarkName(OUString name)
+static OUString lcl_getFieldmarkName(OUString const name)
{
static const char sFormtext[]=ODF_FORMTEXT;
if (name.equalsAscii(msoffice.field.FORMTEXT) ||
@@ -288,19 +288,40 @@ void XMLTextMarkImportContext::EndElement()
bool
bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd
m_rHelper.hasCurrentFieldCtx());
-// insert reference
-const ReferenceXInterface xContent(
-CreateAndInsertMark(GetImport(),
-
(bImportAsField?sAPI_fieldmark:sAPI_bookmark),
-m_sBookmarkName,
-xInsertionCursor,
-m_sXmlId) );
-if (pRDFaAttributes)
+// fdo#86795 check if it's actually a checkbox
first
+bool isInvalid(false);
+OUString fieldmarkTypeName;
+if (bImportAsField
m_rHelper.hasCurrentFieldCtx())
{
-const Referencerdf::XMetadatable
-xMeta(xContent, UNO_QUERY);
-GetImport().GetRDFaImportHelper().AddRDFa(
-xMeta, pRDFaAttributes);
+
+OUString const
type(m_rHelper.getCurrentFieldType());
+fieldmarkTypeName = lcl_getFieldmarkName(type);
+if (fieldmarkTypeName == ODF_FORMCHECKBOX ||
+fieldmarkTypeName == ODF_FORMDROPDOWN)
+{ // sw can't handle checkbox with start+end
+SAL_INFO(xmloff.text, invalid
fieldmark-start/fieldmark-end ignored);
+isInvalid = true;
+}
+}
+
+ReferenceXInterface xContent;
+if (!isInvalid)
+{
+// insert reference
+xContent = CreateAndInsertMark(GetImport(),
+(bImportAsField
+? OUString(sAPI_fieldmark)
+: OUString(sAPI_bookmark)),
+m_sBookmarkName,
+xInsertionCursor,
+m_sXmlId);
+if (pRDFaAttributes)
+{
+const Referencerdf::XMetadatable
+xMeta(xContent, UNO_QUERY);
+GetImport().GetRDFaImportHelper().AddRDFa(
+xMeta, pRDFaAttributes);
+}
}
if ((lcl_MarkType)nTmp==TypeFieldmarkEnd) {
@@ -308,8 +329,6 @@ void XMLTextMarkImportContext::EndElement()
// setup fieldmark...
Reference
::com::sun::star::text::XFormField xFormField(xContent, UNO_QUERY);
if (xFormField.is()
m_rHelper.hasCurrentFieldCtx()) {
-OUString
givenTypeName=m_rHelper.getCurrentFieldType();
-OUString
fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName);
xFormField-setFieldType(fieldmarkTypeName);
m_rHelper.setCurrentFieldParamsTo(xFormField);
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/document.hxx|6 +-
sc/inc/table.hxx |6 +-
sc/source/core/data/documen3.cxx |2 +-
sc/source/core/data/table3.cxx | 23 ---
sc/source/ui/docshell/dbdocfun.cxx |1 +
5 files changed, 24 insertions(+), 14 deletions(-)
New commits:
commit 9a568c41ccd1ccf6073758973da5914a44f629d2
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 5 21:32:06 2014 +0100
Ctrl+A and Data Sort took ages to broadcast ALL cells
... now that also empty cells are to be broadcasted.
Set dirty and broadcast only the effective data range as determined by Sort.
This is more a workaround, a cleaner solution would be to refactor the
SetDirty() algorithm to iterate only through broadcasters and use
AreaBroadcast() to notify area listeners.
However, this can also be easily backported to 4-3.
Change-Id: I6d68ca0088cec6a8328a3e93364ac928ef69babe
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 41e1093..c135508 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1683,8 +1683,12 @@ public:
SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const;
+/** Sort a range of data.
+@param rSortParam may get adjusted to the actual range used if it did
+encompass leading or trailing empty blocks
+ */
void Sort(
-SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, bool
bUpdateRefs,
+SCTAB nTab, ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
ScProgress* pProgress, sc::ReorderParam* pUndo );
void Reorder( const sc::ReorderParam rParam, ScProgress* pProgress );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index ba5529d..73c453e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -834,8 +834,12 @@ public:
voidStripHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
voidExtendHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
+/** Sort a range of data.
+@param rSortParam may get adjusted to the actual range used if it did
+encompass leading or trailing empty blocks
+ */
void Sort(
-const ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
+ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
ScProgress* pProgress, sc::ReorderParam* pUndo );
void Reorder( const sc::ReorderParam rParam, ScProgress* pProgress );
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index b0b0d82..f35d941 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1342,7 +1342,7 @@ bool ScDocument::UpdateOutlineRow( SCROW nStartRow, SCROW
nEndRow, SCTAB nTab, b
}
void ScDocument::Sort(
-SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, bool
bUpdateRefs,
+SCTAB nTab, ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
ScProgress* pProgress, sc::ReorderParam* pUndo )
{
if ( ValidTab(nTab) nTab static_castSCTAB(maTabs.size())
maTabs[nTab] )
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 9a7de8f8..a715194 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1525,10 +1525,9 @@ void ScTable::DecoladeRow( ScSortInfoArray* pArray,
SCROW nRow1, SCROW nRow2 )
}
void ScTable::Sort(
-const ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
+ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
ScProgress* pProgress, sc::ReorderParam* pUndo )
{
-aSortParam = rSortParam;
InitSortCollator( rSortParam );
bGlobalKeepQuery = bKeepQuery;
@@ -1542,19 +1541,20 @@ void ScTable::Sort(
}
// Trim empty leading and trailing column ranges.
-while (aSortParam.nCol1 aSortParam.nCol2
aCol[aSortParam.nCol1].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
-++aSortParam.nCol1;
-while (aSortParam.nCol1 aSortParam.nCol2
aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
---aSortParam.nCol2;
+while (rSortParam.nCol1 rSortParam.nCol2
aCol[rSortParam.nCol1].IsEmptyBlock(rSortParam.nRow1, rSortParam.nRow2))
+++rSortParam.nCol1;
+while (rSortParam.nCol1 rSortParam.nCol2
aCol[rSortParam.nCol2].IsEmptyBlock(rSortParam.nRow1, rSortParam.nRow2))
+--rSortParam.nCol2;
if (rSortParam.bByRow)
{
SCROW nLastRow = 0;
-for (SCCOL nCol = aSortParam.nCol1; nCol = aSortParam.nCol2; nCol++)
+for (SCCOL nCol = rSortParam.nCol1; nCol = rSortParam.nCol2; nCol++)
nLastRow = std::max(nLastRow, aCol[nCol].GetLastDataPos());
-nLastRow = std::min(nLastRow, aSortParam.nRow2);
+rSortParam.nRow2 = nLastRow = std::min(nLastRow, rSortParam.nRow2);
SCROW nRow1 = (rSortParam.bHasHeader ?
-aSortParam.nRow1 +
[Libreoffice-commits] buildbot.git: loperf/loperf.sh
loperf/loperf.sh |1 + 1 file changed, 1 insertion(+) New commits: commit ece846650c9ac7da2167b7d1bf538d27757f4118 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Dec 5 21:53:17 2014 +0100 loperf: Remove lock files if there are any, before executing diff --git a/loperf/loperf.sh b/loperf/loperf.sh index b98b6a9..a09f335 100755 --- a/loperf/loperf.sh +++ b/loperf/loperf.sh @@ -44,6 +44,7 @@ export OOO_DISABLE_RECOVERY=1 OFFICEBIN=$1 DOCUMENTSDIR=$2 test -z $DOCUMENTSDIR echo missing second parameter: directory with documents to test exit 1 +rm -f $DOCUMENTSDIR/.~lock* TESTDATE=$(date --rfc-3339=second) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|79395 | -- 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
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||79395 -- 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: sw/inc
sw/inc/ring.hxx | 14 +-
1 file changed, 1 insertion(+), 13 deletions(-)
New commits:
commit 1d2ba2e7facbe074a4450dd7ead0612f36c10b47
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Dec 5 21:57:39 2014 +0100
this seems to be working too and is less ugly
Change-Id: I335572eee5e898b55423f6fbabd519e287933fa1
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 9c6efa9..9c49946 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -27,13 +27,6 @@
#include boost/iterator/iterator_facade.hpp
#include boost/intrusive/circular_list_algorithms.hpp
-#if !defined(__clang__) defined(__GNUC__) (__GNUC__ == 4)
(__GNUC_MINOR__ 7)
-// gcc 4.6 backwards compat hack, remove ASAP when we drop support
-class SwPaM;
-class SwViewShell;
-class _SaveMergeRedlines;
-#endif
-
namespace sw
{
template typename value_type class RingContainer;
@@ -110,12 +103,7 @@ namespace sw
};
#if !defined(__clang__) defined(__GNUC__) (__GNUC__ == 4)
(__GNUC_MINOR__ 7)
// gcc 4.6 backwards compat hack, remove ASAP when we drop support
-friend class sw::RingContainerSwPaM;
-friend class sw::RingContainerconst SwPaM;
-friend class sw::RingContainerSwViewShell;
-friend class sw::RingContainerconst SwViewShell;
-friend class sw::RingContainer_SaveMergeRedlines;
-friend class sw::RingContainerconst _SaveMergeRedlines;
+templatetypename gcc_hack_value friend class sw::RingContainer;
#else
friend ring_container;
friend const_ring_container;
___
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' - sc/inc sc/source
sc/inc/document.hxx|6 +-
sc/inc/table.hxx |6 +-
sc/source/core/data/documen3.cxx |2 +-
sc/source/core/data/table3.cxx | 23 ---
sc/source/ui/docshell/dbdocfun.cxx |1 +
5 files changed, 24 insertions(+), 14 deletions(-)
New commits:
commit 367ced60eb74264571f9d8918df115873634b2da
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 5 21:32:06 2014 +0100
Ctrl+A and Data Sort took ages to broadcast ALL cells
... now that also empty cells are to be broadcasted.
Set dirty and broadcast only the effective data range as determined by Sort.
This is more a workaround, a cleaner solution would be to refactor the
SetDirty() algorithm to iterate only through broadcasters and use
AreaBroadcast() to notify area listeners.
However, this can also be easily backported to 4-3.
Change-Id: I6d68ca0088cec6a8328a3e93364ac928ef69babe
(cherry picked from commit 9a568c41ccd1ccf6073758973da5914a44f629d2)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 41e1093..c135508 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1683,8 +1683,12 @@ public:
SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const;
+/** Sort a range of data.
+@param rSortParam may get adjusted to the actual range used if it did
+encompass leading or trailing empty blocks
+ */
void Sort(
-SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, bool
bUpdateRefs,
+SCTAB nTab, ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
ScProgress* pProgress, sc::ReorderParam* pUndo );
void Reorder( const sc::ReorderParam rParam, ScProgress* pProgress );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 10c703a..1053ea7 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -834,8 +834,12 @@ public:
voidStripHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
voidExtendHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
+/** Sort a range of data.
+@param rSortParam may get adjusted to the actual range used if it did
+encompass leading or trailing empty blocks
+ */
void Sort(
-const ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
+ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
ScProgress* pProgress, sc::ReorderParam* pUndo );
void Reorder( const sc::ReorderParam rParam, ScProgress* pProgress );
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index b0b0d82..f35d941 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1342,7 +1342,7 @@ bool ScDocument::UpdateOutlineRow( SCROW nStartRow, SCROW
nEndRow, SCTAB nTab, b
}
void ScDocument::Sort(
-SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, bool
bUpdateRefs,
+SCTAB nTab, ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
ScProgress* pProgress, sc::ReorderParam* pUndo )
{
if ( ValidTab(nTab) nTab static_castSCTAB(maTabs.size())
maTabs[nTab] )
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index c955920..c5b7d43 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1523,10 +1523,9 @@ void ScTable::DecoladeRow( ScSortInfoArray* pArray,
SCROW nRow1, SCROW nRow2 )
}
void ScTable::Sort(
-const ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
+ScSortParam rSortParam, bool bKeepQuery, bool bUpdateRefs,
ScProgress* pProgress, sc::ReorderParam* pUndo )
{
-aSortParam = rSortParam;
InitSortCollator( rSortParam );
bGlobalKeepQuery = bKeepQuery;
@@ -1540,19 +1539,20 @@ void ScTable::Sort(
}
// Trim empty leading and trailing column ranges.
-while (aSortParam.nCol1 aSortParam.nCol2
aCol[aSortParam.nCol1].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
-++aSortParam.nCol1;
-while (aSortParam.nCol1 aSortParam.nCol2
aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
---aSortParam.nCol2;
+while (rSortParam.nCol1 rSortParam.nCol2
aCol[rSortParam.nCol1].IsEmptyBlock(rSortParam.nRow1, rSortParam.nRow2))
+++rSortParam.nCol1;
+while (rSortParam.nCol1 rSortParam.nCol2
aCol[rSortParam.nCol2].IsEmptyBlock(rSortParam.nRow1, rSortParam.nRow2))
+--rSortParam.nCol2;
if (rSortParam.bByRow)
{
SCROW nLastRow = 0;
-for (SCCOL nCol = aSortParam.nCol1; nCol = aSortParam.nCol2; nCol++)
+for (SCCOL nCol = rSortParam.nCol1; nCol = rSortParam.nCol2; nCol++)
nLastRow = std::max(nLastRow, aCol[nCol].GetLastDataPos());
-nLastRow = std::min(nLastRow, aSortParam.nRow2);
+rSortParam.nRow2 = nLastRow = std::min(nLastRow, rSortParam.nRow2);
[Libreoffice-commits] core.git: 2 commits - desktop/source reportdesign/source
desktop/source/app/app.cxx |6 --
reportdesign/source/core/api/Section.cxx |2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit a2a9c84deff54321da0042212bae86ede25dd7e2
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 5 22:24:14 2014 +0100
fdo#85112: reportdesign: fix SolarMutex assertion
A bit tricky, but all of the UNO wrappers for SdrObjects etc. in svx use
the SolarMutex for locking, so it's reasonable to expect that
reportdesign code also has to lock SolarMutex when it manipulates these.
Change-Id: I3cade8f53d7655e249b82673c87238d5a17256cb
diff --git a/reportdesign/source/core/api/Section.cxx
b/reportdesign/source/core/api/Section.cxx
index e70bb3b..71993ad 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -34,6 +34,7 @@
#include ReportDefinition.hxx
#include Shape.hxx
#include svx/unoshape.hxx
+#include vcl/svapp.hxx
#include RptObject.hxx
#include ReportDrawPage.hxx
#include comphelper/property.hxx
@@ -197,6 +198,7 @@ sal_Bool SAL_CALL OSection::supportsService( const
OUString _rServiceName ) thr
void OSection::init()
{
+SolarMutexGuard g; // lock while manipulating SdrModel
uno::Reference report::XReportDefinition xReport = getReportDefinition();
::boost::shared_ptrrptui::OReportModel pModel =
OReportDefinition::getSdrModel(xReport);
assert(pModel No model set at the report definition!);
commit dce74be2bab7a6924578e8f6f6ce37aa593cc481
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 5 20:57:20 2014 +0100
desktop: avoid starting with new writer doc if OOO_DISABLE_RECOVERY set
Better to show the start center, same as when --norestore is given.
Change-Id: I726a8b7d227b646180fe16ee9c302a329a7fa36c
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index f5722e4..f71aa9b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2290,10 +2290,11 @@ void Desktop::OpenClients()
bool bCrashed= false;
bool bExistsRecoveryData = false;
bool bExistsSessionData = false;
+bool const bDisableRecovery = getenv(OOO_DISABLE_RECOVERY) !=
nullptr;
impl_checkRecoveryState(bCrashed, bExistsRecoveryData,
bExistsSessionData);
-if ( !getenv (OOO_DISABLE_RECOVERY)
+if ( !bDisableRecovery
(
( bExistsRecoveryData ) || // = crash with files=
recovery
( bCrashed)// = crash without files = error
report
@@ -2324,7 +2325,8 @@ void Desktop::OpenClients()
SAL_WARN( desktop.app, Registration of session listener failed
e.Message);
}
-if ( !bExistsRecoveryData xSessionListener.is() )
+// in bDisableRecovery case call doRestore() to prevent new Writer doc
+if ((!bExistsRecoveryData || bDisableRecovery)
xSessionListener.is())
{
// session management
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||78614 --- Comment #89 from tommy27 ba...@quipo.it --- adding Bug 78614 - PIVOTTABLE: pivot table not saved in xlsx -- 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
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 58691, which changed state. Bug 58691 Summary: PIVOTTABLE: export to Excel 2007/2010 breaks functionality https://bugs.freedesktop.org/show_bug.cgi?id=58691 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |MOVED -- 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
