[Libreoffice-commits] core.git: svx/source
svx/source/gengal/gengal.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 427d20e72e914082af5cddc9527fb3df0dd270a2 Author: Tor Lillqvist t...@iki.fi Date: Thu Apr 25 08:37:40 2013 +0300 Fix warning: unused variable 'assignment' [loplugin] Change-Id: I0bf331044d8971cc39ee22b909649aecff1611c3 diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index cbb2fc2..b4ace29 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -163,7 +163,6 @@ void GalApp::Init() #endif OUString baseBinDir = fileName.copy( 0, lastSlash ); OUString installPrefix = baseBinDir + OUString::createFromAscii( /../.. ); -OUString assignment = OUString( OOO_INSTALL_PREFIX= ) + installPrefix; OUString envVar( OOO_INSTALL_PREFIX); osl_setEnvironment(envVar.pData, installPrefix.pData); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objstor.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 06b918053fb9cf455cf431ca001a63030092d018
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Apr 25 11:47:56 2013 +0530
Broken security/password when saving to older odf (sx?) formats.
nDefVersion is the default doc version, whereas, we need
to check the current document version in question.
While this changes just one of the places - a review is
probably required for other places as well, where
nDefVersion is used.
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index a6fef76..b92a10a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -383,7 +383,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference
embed::XStorage xSto
aEncryptionAlgs[1].Value =
xml::crypto::CipherID::BLOWFISH_CFB_8;
aEncryptionAlgs[2].Value = xml::crypto::DigestID::SHA1_1K;
-if ( nDefVersion = SvtSaveOptions::ODFVER_012 )
+if ( nVersion = SOFFICE_FILEFORMAT_8 )
{
try
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4bc3ead0649bf2885050ec4cfb47a5ed13bfa41e
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Apr 25 11:57:59 2013 +0530
n#812793: (Workaround) Transparent background import in EMF+.
EMF+ seems to have alpha of 0xff for transparent background!
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 17ec217..bcc24f2 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -887,10 +887,14 @@ namespace cppcanvas
ActionSharedPtr pPolyAction;
if (isColor) {
-EMFP_DEBUG (printf (EMF+\t\tcolor fill\n));
-
+EMFP_DEBUG (printf (EMF+\t\tcolor fill:0x%X\n,
brushIndexOrColor));
rState.isFillColorSet = true;
rState.isLineColorSet = false;
+// n#812793: EMF+ Seems to specify transparent background with
Alpha=0xFF !
+// Workaround for the problem.
+if(brushIndexOrColor == 0x)
+brushIndexOrColor = 0xFF;
+
SET_FILL_COLOR(brushIndexOrColor);
pPolyAction = ActionSharedPtr (
internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon,
rParms.mrCanvas, rState ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit abd0ed222788077b66d92b84f0918309aa58d865
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Apr 25 11:57:59 2013 +0530
n#812793: (Workaround) Transparent background import in EMF+.
EMF+ seems to have alpha of 0xff for transparent background!
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 81f7eb7..1ef38a6 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -890,10 +890,14 @@ namespace cppcanvas
ActionSharedPtr pPolyAction;
if (isColor) {
-EMFP_DEBUG (printf (EMF+\t\tcolor fill\n));
-
+EMFP_DEBUG (printf (EMF+\t\tcolor fill:0x%X\n,
brushIndexOrColor));
rState.isFillColorSet = true;
rState.isLineColorSet = false;
+// n#812793: EMF+ Seems to specify transparent background with
Alpha=0xFF !
+// Workaround for the problem.
+if(brushIndexOrColor == 0x)
+brushIndexOrColor = 0xFF;
+
SET_FILL_COLOR(brushIndexOrColor);
pPolyAction = ActionSharedPtr (
internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon,
rParms.mrCanvas, rState ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
hints asked for fdo#59727
Hi, Bug fdo59727 is about addin function MONTHS() that is not interpreted correctly when read from an xlsx file. That is, an xlsx file with the function MONTHS(...) opened with calc shows com.sun.star.sheet.addin.datefunctions.getdiffmonths(...) and understandably results to #NAME? . The problem also occurs with function WEEKS, but not with OCT2HEX, so not with all addin functions. I have not tested with other addin functions. Hints where to look for the cause are welcome. I found maAddInMap in /core/sc/source/core/tool/odffmap.cxx, but don't know where and how this map is used to convert to and from xlsx. This area may be way out my comfort zone, so I'm not sure at all yet whether I want to be the assignee for this bug :-) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - animations/source dbaccess/source extensions/source offapi/com offapi/UnoApi_offapi.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_regression_test.m
animations/source/animcore/animcore.cxx | 18 --
dbaccess/source/ui/browser/sbagrid.cxx| 20 +-
extensions/source/propctrlr/controlfontdialog.cxx | 16 +
extensions/source/propctrlr/controlfontdialog.hxx |5 +
offapi/UnoApi_offapi.mk |3 +
offapi/com/sun/star/animations/ParallelTimeContainer.idl | 37
offapi/com/sun/star/animations/XParallelTimeContainer.idl | 42 ++
offapi/com/sun/star/form/ControlFontDialog.idl| 42 ++
sd/CppunitTest_sd_filters_test.mk |1
sd/CppunitTest_sd_regression_test.mk |1
sd/source/core/CustomAnimationEffect.cxx | 14 +++-
sd/source/core/sdpage_animations.cxx | 16 ++---
sd/source/ui/animations/CustomAnimationPane.cxx | 22 +++
sd/source/ui/unoidl/randomnode.cxx| 10 +--
sd/source/ui/view/ViewShellBase.cxx |1
15 files changed, 191 insertions(+), 57 deletions(-)
New commits:
commit 378c038918ca6c7adecf73f49e627c75ebd0e43a
Author: Noel Grandin n...@peralex.com
Date: Tue Apr 23 16:04:30 2013 +0200
fdo#46808 Convert animations::ParallelTimeContainer to new style
Change-Id: Iac6337828c807a132e561b5e9017a708be2e9729
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index a503097..5b83bc0 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -25,6 +25,7 @@
#include com/sun/star/animations/XAnimateSet.hpp
#include com/sun/star/animations/XAnimateMotion.hpp
#include com/sun/star/animations/XAnimateTransform.hpp
+#include com/sun/star/animations/XParallelTimeContainer.hpp
#include com/sun/star/animations/XTransitionFilter.hpp
#include com/sun/star/animations/XTimeContainer.hpp
#include com/sun/star/animations/XIterateContainer.hpp
@@ -108,8 +109,8 @@ class AnimationNodeBase : public XAnimateMotion,
public XTransitionFilter,
public XAnimateSet,
public XAnimateTransform,
+public XParallelTimeContainer,
public XIterateContainer,
-public XEnumerationAccess,
public XServiceInfo,
public XTypeProvider,
public XAudio,
@@ -547,9 +548,9 @@ Any SAL_CALL AnimationNode::queryInterface( const Type
aType ) throw (RuntimeEx
aType,
static_cast XServiceInfo * ( this ),
static_cast XTypeProvider * ( this ),
-static_cast XChild * ( static_cast XTimeContainer * (this) ),
+static_cast XChild * ( static_cast XTimeContainer * ( static_cast
XIterateContainer * (this) ) ),
static_cast XCloneable* ( this ),
-static_cast XAnimationNode* ( static_cast XTimeContainer * (this)
),
+static_cast XAnimationNode* ( static_cast XTimeContainer * (
static_cast XIterateContainer * (this) ) ),
static_cast XInterface* (static_cast OWeakObject * (this)),
static_cast XWeak* (static_cast OWeakObject * (this)),
static_cast XChangesNotifier* ( this ),
@@ -560,17 +561,24 @@ Any SAL_CALL AnimationNode::queryInterface( const Type
aType ) throw (RuntimeEx
switch( mnNodeType )
{
case AnimationNodeType::PAR:
+aRet = ::cppu::queryInterface(
+aType,
+static_cast XParallelTimeContainer * ( this ),
+static_cast XTimeContainer * ( static_cast
XIterateContainer * (this) ),
+static_cast XEnumerationAccess * ( this ),
+static_cast XElementAccess * ( this ) );
+break;
case AnimationNodeType::SEQ:
aRet = ::cppu::queryInterface(
aType,
-static_cast XTimeContainer * ( this ),
+static_cast XTimeContainer * ( static_cast
XIterateContainer * (this) ),
static_cast XEnumerationAccess * ( this ),
static_cast XElementAccess * ( this ) );
break;
case AnimationNodeType::ITERATE:
aRet = ::cppu::queryInterface(
aType,
-static_cast XTimeContainer * ( this ),
+static_cast XTimeContainer * ( static_cast
XIterateContainer * (this) ),
static_cast XIterateContainer * ( this ),
static_cast XEnumerationAccess * ( this ),
static_cast XElementAccess * ( this ) );
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 2099eba..ed72206 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -36,6 +36,7 @@ $(eval $(call
Compilation fails with --enable-pch after global header move
Hello, after global header move compilation of LibreOffice master fails with an error. I ran ./bin/update_pch.sh but it does not help. I build with these options: ./configure --enable-hardlink-deliver --enable-pch --disable-odk --without-help --without-java --with-lang=lt In file included from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:428:0: ~/libreoffice-git/include/vcl/controllayout.hxx:58:5: error: reference to ‘Pair’ is ambiguous In file included from ~/libreoffice-git/include/vcl/mapmod.hxx:23:0, from ~/libreoffice-git/include/vcl/bitmap.hxx:26, from ~/libreoffice-git/include/vcl/graph.hxx:26, from ~/libreoffice-git/include/svtools/DocumentToGraphicRenderer.hxx:29, from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:17: ~/libreoffice-git/include/tools/gen.hxx:33:23: error: candidates are: class Pair In file included from ~/libreoffice-git/workdir/unxlngx6.pro/UnoApiHeadersTarget/offapi/normal/com/sun/star/awt/grid/XSortableGridData.hdl:6:0, from ~/libreoffice-git/workdir/unxlngx6.pro/UnoApiHeadersTarget/offapi/normal/com/sun/star/awt/grid/XSortableGridData.hpp:6, from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:98: ~/libreoffice-git/workdir/unxlngx6.pro/UnoApiHeadersTarget/udkapi/normal/com/sun/star/beans/Pair.hdl:16:63: error: templateclass typeparam_T, class typeparam_U struct com::sun::star::beans::Pair In file included from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:428:0: ~/libreoffice-git/include/vcl/controllayout.hxx:58:5: error: ‘Pair’ does not name a type make[1]: *** [~/libreoffice-git/workdir/unxlngx6.pro/PrecompiledHeader/nodebug/precompiled_svt.hxx.gch] Error 1 make[1]: *** Waiting for unfinished jobs... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] core.git: 14 commits - svx/inc svx/sdi sw/sdi sw/source vcl/inc vcl/Library_vcl.mk vcl/Package_inc.mk vcl/source
Hi, On Sun, Apr 21, 2013 at 12:58:45PM -0700, Tomaž Vajngerl wrote: diff --git a/vcl/source/filter/jpeg/jinclude.h b/vcl/source/filter/jpeg/jinclude.h new file mode 100644 index 000..121fbec --- /dev/null +++ b/vcl/source/filter/jpeg/jinclude.h @@ -0,0 +1,91 @@ +/* + * jinclude.h + * + * Copyright (C) 1991-1994, Thomas G. Lane. + * This file is part of the Independent JPEG Group's software. + * For conditions of distribution and use, see the accompanying README file. ... diff --git a/vcl/source/filter/jpeg/jpegcomp.h b/vcl/source/filter/jpeg/jpegcomp.h new file mode 100644 index 000..ed9eeab --- /dev/null +++ b/vcl/source/filter/jpeg/jpegcomp.h @@ -0,0 +1,30 @@ +/* + * jpegcomp.h + * + * Copyright (C) 2010, D. R. Commander + * For conditions of distribution and use, see the accompanying README file. ... diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c new file mode 100644 index 000..24b7667 --- /dev/null +++ b/vcl/source/filter/jpeg/transupp.c @@ -0,0 +1,1628 @@ +/* + * transupp.c + * + * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1997-2011, Thomas G. Lane, Guido Vollbeding. + * Modifications: + * Copyright (C) 2010, D. R. Commander. + * For conditions of distribution and use, see the accompanying README file. ... Is it all right, license-wise, to put source files from the jpeg library directly into our source tree? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0-3] Uploading new fresh wonderful libvisio-0.0.26
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3601
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/3601/1
Uploading new fresh wonderful libvisio-0.0.26
The release fixes several instances of data loss during conversion:
* Fix missing WMFs in some Visio files
* Don't truncate end of the text
and some problems with text encoding and display:
* Use ICU for text encoding conversions
* Honour the HideText property
(cherry picked from commit 105bb26e53049a317a43c13ebd9f706df760f27f)
Conflicts:
download.lst
libvisio/ExternalProject_libvisio.mk
Reviewed-on: https://gerrit.libreoffice.org/3552
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
(cherry picked from commit 0deb04fb8613c8aaf1ca9154b5ac53c0e0889d40)
Change-Id: I00f18e64f60358f826720cc8d6af36c77a98a062
---
M download.lst
M libvisio/ExternalProject_libvisio.mk
M libvisio/UnpackedTarball_visio.mk
D libvisio/libvisio-0.0.25.patch
M libvisio/prj/build.lst
5 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/download.lst b/download.lst
index e0026dd..36c4fe9 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@
export CDR_TARBALL := libcdr-0.0.12.tar.bz2
MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
-VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
-export VISIO_TARBALL := libvisio-0.0.25.tar.bz2
+VISIO_MD5SUM := 2f638cf6f92cec59c9205ac3cbf1702e
+export VISIO_TARBALL := libvisio-0.0.26.tar.bz2
export AFMS_TARBALL :=
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
export APACHE_COMMONS_CODEC_TARBALL :=
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
diff --git a/libvisio/ExternalProject_libvisio.mk
b/libvisio/ExternalProject_libvisio.mk
index 3862799..940d3cd 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -31,6 +31,7 @@
export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \
export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
$(COMPATH)/vcpackages/vcbuild.exe libvisio.vcproj Release|Win32 \
touch $@
else ifeq ($(VCVER),100)
@@ -41,6 +42,7 @@
export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/extrenal \
export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
msbuild.exe libvisio.vcxproj /p:Configuration=Release \
touch $@
else
@@ -51,6 +53,7 @@
export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \
export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
msbuild.exe libvisio.vcxproj /p:PlatformToolset=v110
/p:Configuration=Release \
touch $@
endif
@@ -59,8 +62,11 @@
$(call gb_ExternalProject_get_state_target,libvisio,build) :
cd $(EXTERNAL_WORKDIR) \
-PKG_CONFIG= \
- ./configure \
+export PKG_CONFIG= \
+export ICU_LIBS= \
+ $(if $(filter NO,$(SYSTEM_ICU)), export
ICU_CFLAGS=-I$(OUTDIR)/inc/external) \
+ $(if $(filter YES,$(SYSTEM_ICU)), export ICU_CFLAGS= ) \
+./configure \
--with-pic \
--enable-static \
--disable-shared \
diff --git a/libvisio/UnpackedTarball_visio.mk
b/libvisio/UnpackedTarball_visio.mk
index 98313c1..59c29ac 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,10 +11,5 @@
$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,visio,\
- libvisio/libvisio-0.0.25.patch \
-))
# vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.25.patch b/libvisio/libvisio-0.0.25.patch
deleted file mode 100644
index 6294548..000
--- a/libvisio/libvisio-0.0.25.patch
+++ /dev/null
@@ -1,14 +0,0 @@
a/src/lib/VSDContentCollector.cpp
-+++ b/src/lib/VSDContentCollector.cpp
-@@ -2920,10 +2920,8 @@ void
libvisio::VSDContentCollector::appendCharacters(WPXString text, const std:
- while (true)
- {
- if (iter == characters.end())
-- {
--fail = true;
- break;
-- }
-+
- uint16_t character = *iter++;
- character |= (uint16_t)(*iter++) 8;
- if (character == 0xfffc)
diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst
index 5fdc953..3bb2b3e 100644
--- a/libvisio/prj/build.lst
+++ b/libvisio/prj/build.lst
@@ -1,2 +1,2 @@
-vsdlibvisio: LIBWPD:libwpd LIBWPD:libwpg BOOST:boost
LIBXML2:libxml2 ZLIB:zlib soltools NULL
+vsdlibvisio: LIBWPD:libwpd
Re: Compilation fails with --enable-pch after global header move
On 04/25/2013 09:00 AM, Aurimas Fišeras wrote: I build with these options: ./configure --enable-hardlink-deliver --enable-pch --disable-odk --without-help --without-java --with-lang=lt In file included from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:428:0: ~/libreoffice-git/include/vcl/controllayout.hxx:58:5: error: reference to ‘Pair’ is ambiguous In file included from ~/libreoffice-git/include/vcl/mapmod.hxx:23:0, from ~/libreoffice-git/include/vcl/bitmap.hxx:26, from ~/libreoffice-git/include/vcl/graph.hxx:26, from ~/libreoffice-git/include/svtools/DocumentToGraphicRenderer.hxx:29, from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:17: ~/libreoffice-git/include/tools/gen.hxx:33:23: error: candidates are: class Pair In file included from ~/libreoffice-git/workdir/unxlngx6.pro/UnoApiHeadersTarget/offapi/normal/com/sun/star/awt/grid/XSortableGridData.hdl:6:0, from ~/libreoffice-git/workdir/unxlngx6.pro/UnoApiHeadersTarget/offapi/normal/com/sun/star/awt/grid/XSortableGridData.hpp:6, from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:98: ~/libreoffice-git/workdir/unxlngx6.pro/UnoApiHeadersTarget/udkapi/normal/com/sun/star/beans/Pair.hdl:16:63: error: templateclass typeparam_T, class typeparam_U struct com::sun::star::beans::Pair In file included from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:428:0: ~/libreoffice-git/include/vcl/controllayout.hxx:58:5: error: ‘Pair’ does not name a type make[1]: *** [~/libreoffice-git/workdir/unxlngx6.pro/PrecompiledHeader/nodebug/precompiled_svt.hxx.gch] Error 1 make[1]: *** Waiting for unfinished jobs... git grep -Fw using include/ | grep -Fw beans reveals that some headers dare pollute the global namespace with inappropriate using directives. /All/ those using directives (not just the ones injecting com::sun::star::uno::beans) apparently need to be cleaned up. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-3' - sw/source
sw/source/core/doc/notxtfrm.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 63397e1e699845e92e3046fd50bbbdcba6512a32
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 23 22:27:57 2013 +0200
fdo#60280: sw: restore anti-aliasing for all OLE objects
The OLE case in SwNoTxtFrm::PaintPicture() was mis-merged to modify the
anti-aliasing always but reset it only for Charts.
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)
Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e
(cherry picked from commit 954d695827431a5badd1a993d8f364c669ca9c9c)
Reviewed-on: https://gerrit.libreoffice.org/3589
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit f3e8a9649ac653eafaf8c5fa57e20d3dbe90d82c)
Reviewed-on: https://gerrit.libreoffice.org/3594
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 914e189..a839420 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1143,8 +1143,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect rGrfArea ) cons
}
// see #i99665#
-if ( pOLENd-IsChart()
-pShell-Imp()-GetDrawView()-IsAntiAliasing() )
+if (pShell-Imp()-GetDrawView()-IsAntiAliasing())
{
pOut-SetAntialiasing( nFormerAntialiasingAtOutput );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - connectivity/Library_file.mk connectivity/Library_jdbc.mk connectivity/Library_mork.mk connectivity/Library_odbcbase.mk dbaccess/Library_dba.mk odk/CustomTa
connectivity/Library_file.mk |4 connectivity/Library_jdbc.mk |4 connectivity/Library_mork.mk |4 connectivity/Library_odbcbase.mk |4 dbaccess/Library_dba.mk |3 ++- odk/CustomTarget_check.mk|2 +- solenv/gbuild/LinkTarget.mk |2 +- tubes/Executable_liboapprover.mk |5 - tubes/Library_tubes.mk |5 - 9 files changed, 20 insertions(+), 13 deletions(-) New commits: commit 11e2981c4c635bd6e8a1d3d32889e6cd2ea7cdd1 Author: David Tardon dtar...@redhat.com Date: Thu Apr 25 10:17:54 2013 +0200 change warning to error It seems that the nonexistent include paths introduced by the headers move have been cleaned up. We do not want to introduce new ones. Change-Id: Ife53bbf0c63e12a41f6b447357472ad41eed5cbe diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b2fb19c..66c8719 100755 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -722,7 +722,7 @@ endef define gb_LinkTarget__check_srcdir_paths $(if $(filter-out $(wildcard $(2)),$(2)),\ -$(call gb_Output_warn,gb_LinkTarget_set_include: include paths $(filter-out $(wildcard $(2)),$(2)) do not exist) \ +$(call gb_Output_error,gb_LinkTarget_set_include: include paths $(filter-out $(wildcard $(2)),$(2)) do not exist) \ ) endef commit ee16e337474edac43f16425747431cefcbbab59c Author: David Tardon dtar...@redhat.com Date: Thu Apr 25 10:17:14 2013 +0200 drop nonexistent include paths Change-Id: I3b2686cb04b7945a12f43b344ed56b39a321b51b diff --git a/tubes/Executable_liboapprover.mk b/tubes/Executable_liboapprover.mk index feb9bca..5d5994a 100644 --- a/tubes/Executable_liboapprover.mk +++ b/tubes/Executable_liboapprover.mk @@ -26,11 +26,6 @@ $(eval $(call gb_Executable_Executable,liboapprover)) -$(eval $(call gb_Executable_set_include,liboapprover,\ --I$(SRCDIR)/tubes/inc \ -$$(INCLUDE) \ -)) - $(eval $(call gb_Executable_use_externals,liboapprover,\ gtk \ telepathy \ diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index f294e1a..96e9356 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -10,11 +10,6 @@ $(eval $(call gb_Library_Library,tubes)) -$(eval $(call gb_Library_set_include,tubes,\ - -I$(SRCDIR)/tubes/inc \ - $$(INCLUDE) \ -)) - $(eval $(call gb_Library_use_sdk_api,tubes)) $(eval $(call gb_Library_add_defs,tubes,\ commit 162ef53d441c4eb56a51f48b29b54c3915ba9da5 Author: David Tardon dtar...@redhat.com Date: Thu Apr 25 09:42:40 2013 +0200 fix dep on doxygen CustomTarget Change-Id: Id53ab5de54ff8e86a39685b370b1114666755cfe diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index ab515c9..50a124d 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -29,7 +29,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ - $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \ + $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)) \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(call gb_Package_get_target,odk_config) \ commit 79c20b265479232871bcd4aea37400243e09bb99 Author: David Tardon dtar...@redhat.com Date: Thu Apr 25 09:38:49 2013 +0200 add missing deps on sqlbison.hxx Change-Id: I098a4514b9b32b1ecf96b1f2275f77bac540d557 diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 47a3f07..6ced91c 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Library_Library,file)) +$(eval $(call gb_Library_use_packages,file,\ + connectivity_generated \ +)) + $(eval $(call gb_Library_add_defs,file,\ -DOOO_DLLIMPLEMENTATION_FILE \ )) diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 2484704..dd1472f 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -29,6 +29,10 @@ $(eval $(call gb_Library_Library,jdbc)) $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc)) +$(eval $(call gb_Library_use_packages,jdbc,\ + connectivity_generated \ +)) + $(eval $(call gb_Library_use_external,jdbc,boost_headers)) $(eval $(call gb_Library_use_sdk_api,jdbc)) diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index be18dec..c7c80cf 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -11,6 +11,10 @@ $(eval $(call gb_Library_Library,mork)) $(eval $(call gb_Library_set_componentfile,mork,connectivity/source/drivers/mork/mork)) +$(eval $(call
[PUSHED libreoffice-4-0-3] fdo#60280: sw: restore anti-aliasing for all OLE objects
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3594 Approvals: Caolán McNamara: Verified; Looks good to me, approved Eike Rathke: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3594 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-3 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
conversion operators for UNO
Hi
I would like to discuss the addition of conversion operators for UNO.
Let me start with an example.
If we have IDL that looks like:
interface A {}
interface B : A {}
Then we typically have C++ code that looks like
void foo(ReferenceA a)
void bar() {
ReferenceB b =
methodThatTakesA( ReferenceA(b, UNO_QUERY_THROW) );
}
I want to change things so that I can write:
void bar() {
ReferenceB b =
methodThatTakesA( b );
}
and have the code automagically perform the B to A conversion
Is there some reason this would not be desirable?
(I'll leave the question as to whether or not is implementable for later :-)
Regards, Noel Grandin
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Drop down menus going blank
Hello all,
I made some changes in the code related to bug 61060
(https://bugs.freedesktop.org/show_bug.cgi?id=61060), and the drop
down menus in Calc (file, view, edit etc.) have gone blank.
Can someone tell me the reason for this? I havnt touched any of the
code that deals with the interface or anything of that sort.
Moreover, when I reverted the changes, the problem still persisted!
It was working fine before making the change.
I have pasted the diff below:
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 76dcd12..b009a66 100644
@@ -2028,15 +2028,13 @@ void ScTabView::FreezeSplitters( bool bFreeze )
if ( eOldV != SC_SPLIT_NONE )
ePos = SC_SPLIT_TOPLEFT;
Window* pWin = pGridWin[ePos];
+ScDocShell* pDocSh = NULL;
bool bLayoutRTL = aViewData.GetDocument()-IsLayoutRTL( aViewData.GetTabNo(
if ( bFreeze )
{
Point aWinStart = pWin-GetPosPixel();
+ pDocSh-SetDocumentModified();
Point aSplit;
SCsCOL nPosX;
SCsROW nPosY;
Regards,
Sameer Deshmukh
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: testtools/CustomTarget_bridgetest_climaker.mk
testtools/CustomTarget_bridgetest_climaker.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit e42eed90b5c8151f8b5520ca2728061b1ac8e41e Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 25 10:34:52 2013 +0200 Fix generation of cli_types_bridgetest.dll after gbuild'ification ...the double use of udkapi.rdb in climaker call in testtools/CustomTarget_bridgetest_climaker.mk looked fishy indeed. Everything built in module testtools that is not used by the native inprocess test case (testtools/CustomTarget_uno_test.mk) is more-or-less faithfully copied over from pre-gbuild times, but the code to actually (manually) execute it is effectively lost: bridgetest_client against bridgetest_server and bridgetest_javaserver; bridgetest_inprocess_java; cli_bridgetest_inprocess.exe. So this cli_types_bridgetest.dll is effectively dead code today, but at least it is a more faithful copy of the pre-gbuild version again. Change-Id: If01a9d837dc6bf3837a17878d8a4bfaf87ab6d4d diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index 469e698..370a73c 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -32,6 +32,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \ $(testtools_CLIDIR)/cli_types_bridgetest.dll $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ + $(call gb_UnoApiTarget_get_target,bridgetest) \ $(call gb_UnoApiTarget_get_target,udkapi) \ $(OUTDIR)/bin/cli_uretypes.dll \ $(call gb_Executable_get_runtime_dependencies,climaker) \ @@ -41,6 +42,7 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ $(call gb_Helper_execute,climaker) \ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ --out $@ -r $(OUTDIR)/bin/cli_uretypes.dll \ - $(call gb_UnoApiTarget_get_target,udkapi).oldformat /dev/null) + -X $(call gb_UnoApiTarget_get_target,udkapi).oldformat \ + $(call gb_UnoApiTarget_get_target,bridgetest).oldformat /dev/null) # vim:set shiftwidth=4 tabstop=4 noexpandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff sw/inc sw/source xmloff/source
include/xmloff/txtimp.hxx| 49 ++---
include/xmloff/xmlictxt.hxx | 36 +++---
sw/inc/doc.hxx |8 -
sw/inc/redline.hxx | 11 +-
sw/source/core/doc/docfmt.cxx| 103 +--
xmloff/source/text/XMLChangeElementImportContext.cxx |7 -
xmloff/source/text/XMLChangeElementImportContext.hxx | 14 ++
xmloff/source/text/XMLChangedRegionImportContext.cxx |8 +
xmloff/source/text/XMLChangedRegionImportContext.hxx | 11 +-
xmloff/source/text/txtimp.cxx|3
10 files changed, 146 insertions(+), 104 deletions(-)
New commits:
commit f215e634de4926def396d8442b8b15a912cb69e8
Author: Maxime de Roucy mdero...@linagora.com
Date: Thu Apr 4 18:05:24 2013 +0200
comments and code reformat
Change-Id: Ib4e45cb85c9e5e5ffa6476c939300c6795412b1a
Reviewed-on: https://gerrit.libreoffice.org/3582
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 2ac668d..0fc68b5 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -674,36 +674,53 @@ public:
// (to be implemented in sw/filter/xml/txtparai.hxx)
virtual void RedlineAdd(
-const OUString rType, /// redline type (insert, del,... )
-const OUString rId, /// use to identify this redline
-const OUString rAuthor, /// name of the author
-const OUString rComment,/// redline comment
-const ::com::sun::star::util::DateTime rDateTime, /// date+time
-sal_Bool bMergeLastParagraph); /// merge last paras
+/// redline type (insert, del,... )
+const OUString rType,
+/// use to identify this redline
+const OUString rId,
+/// name of the author
+const OUString rAuthor,
+/// redline comment
+const OUString rComment,
+/// date+time
+const ::com::sun::star::util::DateTime rDateTime,
+/// merge last paras
+sal_Bool bMergeLastParagraph);
+
virtual ::com::sun::star::uno::Reference
::com::sun::star::text::XTextCursor RedlineCreateText(
-::com::sun::star::uno::Reference /// needed to get the document
-::com::sun::star::text::XTextCursor rOldCursor,
-const OUString rId);/// ID used to RedlineAdd() call
+/// needed to get the document
+::com::sun::star::uno::Reference
::com::sun::star::text::XTextCursor rOldCursor,
+/// ID used to RedlineAdd() call
+const OUString rId);
+
virtual void RedlineSetCursor(
-const OUString rId, /// ID used to RedlineAdd() call
-sal_Bool bStart,/// start or end Cursor
-sal_Bool bIsOutsideOfParagraph);/// range is not within text:p
-virtual void RedlineAdjustStartNodeCursor(
-sal_Bool bStart);
+/// ID used to RedlineAdd() call
+const OUString rId,
+/// start or end Cursor
+sal_Bool bStart,
+/// range is not within text:p
+sal_Bool bIsOutsideOfParagraph);
+
+virtual void RedlineAdjustStartNodeCursor( sal_Bool bStart );
virtual void SetShowChanges( sal_Bool bShowChanges );
virtual void SetRecordChanges( sal_Bool bRecordChanges );
virtual void SetChangesProtectionKey(
const ::com::sun::star::uno::Sequencesal_Int8 rProtectionKey );
-// access to the last open redline ID:
+/// get the last open redline ID
OUString GetOpenRedlineId();
+/// modify the last open redline ID
void SetOpenRedlineId( OUString rId);
+/// reset the last open redline ID
void ResetOpenRedlineId();
// #107848#
-// Access methods to the inside_deleted_section flag (redlining)
+/** redlining : Setter to remember the fact we are inside/outside
+ * a text:deletion element (deleted redline section) */
void SetInsideDeleteContext(bool const bNew);
+/** redlining : Getter to know if we are inside
+ * a text:deletion element (deleted redline section) */
bool IsInsideDeleteContext() const;
SvXMLImport GetXMLImport();
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 37903e4..2ed80c1 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -58,37 +58,37 @@ public:
sal_uInt16 GetPrefix() const { return mnPrefix; }
const OUString GetLocalName() const { return maLocalName; }
-// A contexts constructor does anything that is required if an element
-// starts. Namespace processing has been done already.
-// Note that virtual methods cannot be used inside constructors. Use
-// StartElement instead if this is required.
+/** A
Re: Drop down menus going blank
Am 25.04.2013 10:39, schrieb Sameer Deshmukh: Hello all, I made some changes in the code related to bug 61060 (https://bugs.freedesktop.org/show_bug.cgi?id=61060), and the drop down menus in Calc (file, view, edit etc.) have gone blank. Can someone tell me the reason for this? I havnt touched any of the code that deals with the interface or anything of that sort. Moreover, when I reverted the changes, the problem still persisted! Hi, I have the same problem, reported a bug here: https://bugs.freedesktop.org/show_bug.cgi?id=63840 I didn't modify anything in the source. Samuel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] comments and code reformat
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3582 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3582 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4e45cb85c9e5e5ffa6476c939300c6795412b1a Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Maxime de Roucy mdero...@linagora.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: conversion operators for UNO
On Thu, Apr 25, 2013 at 10:35:29AM +0200, Noel Grandin n...@peralex.com wrote:
Then we typically have C++ code that looks like
void foo(ReferenceA a)
void bar() {
ReferenceB b =
methodThatTakesA( ReferenceA(b, UNO_QUERY_THROW) );
}
I want to change things so that I can write:
void bar() {
ReferenceB b =
methodThatTakesA( b );
Hmm, and then how would you decide if UNO_QUERY or UNO_QUERY_THROW is
desired?
signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: forms/source offapi/com offapi/UnoApi_offapi.mk sdext/source sd/source
forms/source/inc/services.hxx |1
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/awt/Pointer.idl | 38 ++
sd/source/ui/slideshow/slideshowviewimpl.cxx |5 --
sdext/source/presenter/PresenterPaneBorderManager.cxx |6 --
sdext/source/presenter/PresenterSlideShowView.cxx |8 ---
6 files changed, 44 insertions(+), 15 deletions(-)
New commits:
commit 746784e16f31133e4dc4e062fa5b7f1620e8cda6
Author: Noel Grandin n...@peralex.com
Date: Thu Apr 25 11:02:24 2013 +0200
fdo#46808 Convert awt::Pointer to new style
Change-Id: Ic2ff491e656ab7bcf0bd5994b601818a26478243
diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx
index dc5d4c3..446ae24 100644
--- a/forms/source/inc/services.hxx
+++ b/forms/source/inc/services.hxx
@@ -206,7 +206,6 @@ namespace frm
// ---
// misc
// ---
-#define SRV_AWT_POINTER com.sun.star.awt.Pointer
#define SRV_AWT_IMAGEPRODUCER com.sun.star.awt.ImageProducer
#define SRV_SDB_ROWSET com.sun.star.sdb.RowSet
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index ed72206..4b6492d 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -50,6 +50,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
DialogProvider \
DialogProvider2 \
MenuBar \
+ Pointer \
PopupMenu \
TabController \
Toolkit \
diff --git a/offapi/com/sun/star/awt/Pointer.idl
b/offapi/com/sun/star/awt/Pointer.idl
new file mode 100644
index 000..04e96ddb
--- /dev/null
+++ b/offapi/com/sun/star/awt/Pointer.idl
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_awt_Pointer_idl__
+#define __com_sun_star_awt_Pointer_idl__
+
+#include com/sun/star/awt/XPointer.idl
+
+
+module com { module sun { module star { module awt {
+
+
+/**
+@since LibreOffice 4.1
+ */
+service Pointer : XPointer;
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx
b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 032345b..5a1cffb 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -21,6 +21,7 @@
#include slideshowimpl.hxx
#include osl/mutex.hxx
+#include com/sun/star/awt/Pointer.hpp
#include com/sun/star/beans/XPropertySet.hpp
#include basegfx/polygon/b2dpolygon.hxx
@@ -657,9 +658,7 @@ void SlideShowView::init()
Reference lang::XMultiServiceFactory xFactory(
::comphelper::getProcessServiceFactory(),
uno::UNO_QUERY_THROW );
-if( xFactory.is() )
-mxPointer.set( xFactory-createInstance( com.sun.star.awt.Pointer ),
-uno::UNO_QUERY );
+mxPointer = awt::Pointer::create(
::comphelper::getProcessComponentContext() );
getTransformation();
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx
b/sdext/source/presenter/PresenterPaneBorderManager.cxx
index 5cb992a..0e63720 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
@@ -83,11 +83,7 @@ PresenterPaneBorderManager::PresenterPaneBorderManager (
Referencelang::XMultiComponentFactory xFactory
(rxContext-getServiceManager());
if (xFactory.is())
{
-mxPointer = Referenceawt::XPointer(
-xFactory-createInstanceWithContext(
-OUString(com.sun.star.awt.Pointer),
-rxContext),
-UNO_QUERY_THROW);
+mxPointer = awt::Pointer::create(rxContext);
mxPresenterHelper = Referencedrawing::XPresenterHelper(
xFactory-createInstanceWithContext(
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx
b/sdext/source/presenter/PresenterSlideShowView.cxx
index 34457f1..1a663fc 100644
---
Re: Drop down menus going blank
Oh yes I am also using Ubuntu 12.04 32 bit. Regards, Sameer Deshmukh On Thu, Apr 25, 2013 at 2:27 PM, Samuel Mehrbrodt s.mehrbr...@gmail.com wrote: Am 25.04.2013 10:39, schrieb Sameer Deshmukh: Hello all, I made some changes in the code related to bug 61060 (https://bugs.freedesktop.org/show_bug.cgi?id=61060), and the drop down menus in Calc (file, view, edit etc.) have gone blank. Can someone tell me the reason for this? I havnt touched any of the code that deals with the interface or anything of that sort. Moreover, when I reverted the changes, the problem still persisted! Hi, I have the same problem, reported a bug here: https://bugs.freedesktop.org/show_bug.cgi?id=63840 I didn't modify anything in the source. Samuel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Hang/crash in templates
Hi, On Wed, Apr 24, 2013 at 10:44:13PM +0200, Fridrich Strba fridrich.st...@graduateinstitute.ch wrote: We have a crash (on systems with low memory) or hang (with more memory) in templates. It is a problem with all templates but one can see it in impress directly, because the template previews are part of the standard side-bar and we regenerate the template cache there. I think I noticed the same problem yesterday. If you save the bugdoc from https://bugs.freedesktop.org/show_bug.cgi?id=58949 as ODT and try to load it, soffice eats 13G of memory here on master. I don't see this with a build from 17th, so this is something new. I'll bisect it later today. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst |8
solenv/inc/minor.mk |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 138156f285ca2c08ef22b68c1e797bf5c5b7a61c
Author: Andras Timar ati...@suse.com
Date: Thu Apr 25 11:32:39 2013 +0200
Bump for 3.6-19
Change-Id: Ifd302243ff232ce354ea305a17556c51b3c52a83
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 55b33165..3c5b2ca 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 18
+WINDOWSPATCHLEVEL 19
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-518
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-519
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-518
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-519
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-518
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-519
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index afc9e1c..f47e8be 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=360
-RSCREVISION=360m1(Build:518)
-BUILD=518
+RSCREVISION=360m1(Build:519)
+BUILD=519
LAST_MINOR=m1
SOURCEVERSION=OOO360
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Compilation fails with --enable-pch after global header move
On 25.04.2013 09:35, Stephan Bergmann wrote: git grep -Fw using include/ | grep -Fw beans reveals that some headers dare pollute the global namespace with inappropriate using directives. /All/ those using directives (not just the ones injecting com::sun::star::uno::beans) apparently need to be cleaned up. I'll fix it. Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Drop down menus going blank
I just tried with Gnome 2 and the menus worked fine. So this is a problem concerning Unity only. Am 25.04.2013 11:07, schrieb Sameer Deshmukh: Oh yes I am also using Ubuntu 12.04 32 bit. Regards, Sameer Deshmukh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cli_ure/source
cli_ure/source/native/native_share.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a77c4fa06e02a3758222b39e6359a9f504d42b2 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Apr 25 12:35:49 2013 +0300 Fix compilation error after fe4ffd81045144ffb8d69ae9e5df7ef191005128 Whether it works, no idea. But on the other hand, from the dicsussion in fdo#61503 it doesn't seem as if that commit was deeply insightful either. (And how it compiled on the commit author's machine, no idea.) Change-Id: If6355b33c406e8da5bdb2bf77aaf8b2ac0c39343 diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h index 700577f..7c97153 100644 --- a/cli_ure/source/native/native_share.h +++ b/cli_ure/source/native/native_share.h @@ -62,7 +62,7 @@ inline ::System::Object ^ to_cli( intptr_t intptr = reinterpret_cast intptr_t ( mapping.mapInterface( x.get(), ::getCppuType( x ) ) ); -::System::Runtime::InteropServices::GCHandle ^ handle = ::System::Runtime::InteropServices::GCHandle::FromIntPtr(gcnew ::System::IntPtr(intptr)); +::System::Runtime::InteropServices::GCHandle ^ handle = ::System::Runtime::InteropServices::GCHandle::FromIntPtr(::System::IntPtr(intptr)); ::System::Object ^ ret = handle-Target; handle-Free(); return ret; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: conversion operators for UNO
On 2013-04-25 11:00, Miklos Vajna wrote:
On Thu, Apr 25, 2013 at 10:35:29AM +0200, Noel Grandin n...@peralex.com wrote:
Then we typically have C++ code that looks like
void foo(ReferenceA a)
void bar() {
ReferenceB b =
methodThatTakesA( ReferenceA(b, UNO_QUERY_THROW) );
}
I want to change things so that I can write:
void bar() {
ReferenceB b =
methodThatTakesA( b );
Hmm, and then how would you decide if UNO_QUERY or UNO_QUERY_THROW is
desired?
I'm only talking about the specific case of casting to a known
super-interface, in which case throwing should not be possible.
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: conversion operators for UNO
On Thu, Apr 25, 2013 at 11:52:57AM +0200, Noel Grandin n...@peralex.com wrote: Hmm, and then how would you decide if UNO_QUERY or UNO_QUERY_THROW is desired? I'm only talking about the specific case of casting to a known super-interface, in which case throwing should not be possible. Ah, makes sense. I would worried about general casting, as I see valid use cases for both in the general case. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: conversion operators for UNO
On 25/04/13 10:35, Noel Grandin wrote:
Hi
I would like to discuss the addition of conversion operators for UNO.
Let me start with an example.
If we have IDL that looks like:
interface A {}
interface B : A {}
Then we typically have C++ code that looks like
void foo(ReferenceA a)
void bar() {
ReferenceB b =
methodThatTakesA( ReferenceA(b, UNO_QUERY_THROW) );
}
I want to change things so that I can write:
void bar() {
ReferenceB b =
methodThatTakesA( b );
}
and have the code automagically perform the B to A conversion
Is there some reason this would not be desirable?
one reason may be that queryInterface calls are relatively expensive, so
it is better to have them explicit so you are aware that they happen.
e.g. this problem here caused a 3 % or so slowdown in ODF file load
and/or save (i forgot which), mainly due to 2 additional queryInterface
calls in a critical place:
https://issues.apache.org/ooo/show_bug.cgi?id=108161
with your proposal it would be possible to write code like:
ReferenceB b = ...
methodFooThatTakesA( b );
methodBarThatTakesA( b );
methodBazThatTakesA( b );
... and get 3 queryInterface calls instead of 1.
or let me reformulate that: is it possible to implement your
hypothetical operator such that it does not call queryInterface (i don't
know).
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: conversion operators for UNO
On 2013-04-25 11:59, Michael Stahl wrote: e.g. this problem here caused a 3 % or so slowdown in ODF file load and/or save (i forgot which), mainly due to 2 additional queryInterface calls in a critical place: https://issues.apache.org/ooo/show_bug.cgi?id=108161 with your proposal it would be possible to write code like: ReferenceB b = ... methodFooThatTakesA( b ); methodBarThatTakesA( b ); methodBazThatTakesA( b ); ... and get 3 queryInterface calls instead of 1. or let me reformulate that: is it possible to implement your hypothetical operator such that it does not call queryInterface (i don't know). Yes, I agree, it does hide the cost somewhat. I would expect that the compilers CSE pass (common subexpression elimination) would reduce that to one call. My desire is to make the UNO code less noisy. And it matches the natural semantics of C++, which is that it's possible to pass a subtype of the expected parameter's type. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/inc oox/inc sal/inc sc/inc sd/inc starmath/inc svtools/inc svx/inc sw/inc vcl/inc xmloff/inc
dbaccess/inc/pch/precompiled_dbu.hxx |1 oox/inc/pch/precompiled_oox.hxx |2 + sal/inc/pch/precompiled_sal.hxx | 70 +++ sc/inc/pch/precompiled_sc.hxx|3 - sd/inc/pch/precompiled_sd.hxx|4 +- starmath/inc/pch/precompiled_sm.hxx |2 - svtools/inc/pch/precompiled_svt.hxx |8 +++- svx/inc/pch/precompiled_svx.hxx |4 +- svx/inc/pch/precompiled_svxcore.hxx |3 + sw/inc/pch/precompiled_sw.hxx|8 ++-- vcl/inc/pch/precompiled_vcl.hxx |1 xmloff/inc/pch/precompiled_xo.hxx|2 - 12 files changed, 96 insertions(+), 12 deletions(-) New commits: commit 360d6bf4fd1241af47f55648b7597fda3120390a Author: Thomas Arnhold tho...@arnhold.org Date: Thu Apr 25 12:11:25 2013 +0200 update pch Change-Id: I67e73438312f2a672e71762ee6707ec5d425bb47 diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index 3573e6b..aacd180 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.hxx @@ -89,6 +89,7 @@ #include com/sun/star/document/XEmbeddedScripts.hpp #include com/sun/star/document/XEventListener.hpp #include com/sun/star/embed/XComponentSupplier.hpp +#include com/sun/star/form/ControlFontDialog.hpp #include com/sun/star/form/DataSelectionType.hpp #include com/sun/star/form/FormButtonType.hpp #include com/sun/star/form/FormComponentType.hpp diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 5818c074..f9ea8b6 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -353,6 +353,7 @@ #include sax/tools/converter.hxx #include set #include sfx2/app.hxx +#include sfx2/docfile.hxx #include stdio.h #include string.h #include svl/languageoptions.hxx @@ -367,6 +368,7 @@ #include tools/solar.h #include tools/stream.hxx #include tools/string.hxx +#include tools/time.hxx #include unotools/fontcvt.hxx #include unotools/fontdefs.hxx #include unotools/streamwrap.hxx diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx index 5e89b28..bcb314d 100644 --- a/sal/inc/pch/precompiled_sal.hxx +++ b/sal/inc/pch/precompiled_sal.hxx @@ -16,6 +16,40 @@ #include boost/bind.hpp #include boost/noncopyable.hpp +#include osl/diagnose.h +#include osl/diagnose.hxx +#include osl/module.h +#include osl/module.hxx +#include osl/process.h +#include osl/thread.h +#include osl/thread.hxx +#include osl/time.h +#include rtl/alloc.h +#include rtl/allocator.hxx +#include rtl/bootstrap.h +#include rtl/bootstrap.hxx +#include rtl/character.hxx +#include rtl/instance.hxx +#include rtl/locale.h +#include rtl/malformeduriexception.hxx +#include rtl/math.h +#include rtl/math.hxx +#include rtl/process.h +#include rtl/strbuf.h +#include rtl/strbuf.hxx +#include rtl/string.h +#include rtl/string.hxx +#include rtl/tencinfo.h +#include rtl/textcvt.h +#include rtl/textenc.h +#include rtl/unload.h +#include rtl/uri.h +#include rtl/uri.hxx +#include rtl/ustrbuf.h +#include rtl/ustrbuf.hxx +#include rtl/ustring.h +#include rtl/ustring.hxx +#include rtl/uuid.h #include algorithm #include boost/unordered_map.hpp #include cassert @@ -27,10 +61,46 @@ #include float.h #include limits.h #include list +#include math.h +#include osl/diagnose.h +#include osl/doublecheckedlocking.h +#include osl/endian.h +#include osl/file.hxx +#include osl/interlck.h +#include osl/module.h +#include osl/mutex.h +#include osl/mutex.hxx +#include osl/process.h +#include osl/profile.hxx +#include osl/security.hxx +#include osl/thread.h +#include osl/time.h +#include rtl/alloc.h +#include rtl/bootstrap.h +#include rtl/byteseq.h +#include rtl/byteseq.hxx +#include rtl/cipher.h +#include rtl/crc.h +#include rtl/digest.h +#include rtl/instance.hxx +#include rtl/logfile.h +#include rtl/malformeduriexception.hxx +#include rtl/process.h +#include rtl/random.h +#include rtl/strbuf.hxx +#include rtl/string.h +#include rtl/string.hxx +#include rtl/tencinfo.h +#include rtl/uri.hxx +#include rtl/ustrbuf.hxx +#include rtl/ustring.h +#include rtl/ustring.hxx +#include rtl/uuid.h #include sstream #include stdarg.h #include stdio.h #include stdlib.h +#include string.h #include vector /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 58b304d..bb42081 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -469,6 +469,7 @@ #include com/sun/star/xml/sax/XErrorHandler.hpp #include com/sun/star/xml/sax/XLocator.hpp #include comphelper/accessibleeventnotifier.hxx +#include comphelper/classids.hxx #include comphelper/componentcontext.hxx #include comphelper/docpasswordhelper.hxx #include comphelper/documentconstants.hxx @@ -643,7 +644,6 @@ #include sfx2/viewsh.hxx #include sfx2/zoomitem.hxx #include signal.h -#include comphelper/classids.hxx #include sot/exchange.hxx #include
Re: conversion operators for UNO
On 25/04/13 12:08, Noel Grandin wrote: On 2013-04-25 11:59, Michael Stahl wrote: e.g. this problem here caused a 3 % or so slowdown in ODF file load and/or save (i forgot which), mainly due to 2 additional queryInterface calls in a critical place: https://issues.apache.org/ooo/show_bug.cgi?id=108161 with your proposal it would be possible to write code like: ReferenceB b = ... methodFooThatTakesA( b ); methodBarThatTakesA( b ); methodBazThatTakesA( b ); ... and get 3 queryInterface calls instead of 1. or let me reformulate that: is it possible to implement your hypothetical operator such that it does not call queryInterface (i don't know). Yes, I agree, it does hide the cost somewhat. I would expect that the compilers CSE pass (common subexpression elimination) would reduce that to one call. i don't believe CSE can do anything here: when the temporary Reference is created it will call the virtual acquire() and release() methods which are not inline so the compiler has to assume they have arbitrary side effects which prevents it from applying CSE. (btw this would not necessarily be the case for a JIT compiler) My desire is to make the UNO code less noisy. And it matches the natural semantics of C++, which is that it's possible to pass a subtype of the expected parameter's type. hmmm... looking at the amount of boilerplate involved one gets the impression that UNO somehow appears more natural in languages that aren't C++ :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unotext.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d34a159010fc24e13613058d25a9d6b56f7855bd
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Apr 25 12:17:17 2013 +0200
Belts and braces for crash in null pointer dereference
Change-Id: I17fa205f16929b913084c8eee320a73416b1eda0
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index a93a34f..00c6e85 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1625,7 +1625,8 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
SwTableNode * pStartTableNode(pStartStartNode-FindTableNode());
// Is it the same table start node than the end?
SwTableNode *const
pEndStartTableNode(pEndStartNode-FindTableNode());
-while (pEndStartTableNode-GetIndex()
pStartTableNode-GetIndex())
+while (pEndStartTableNode pStartTableNode
+ pEndStartTableNode-GetIndex()
pStartTableNode-GetIndex())
{
SwStartNode* pStartStartTableNode =
pStartTableNode-StartOfSectionNode();
pStartTableNode = pStartStartTableNode-FindTableNode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Hang/crash in templates
Hi, On Thu, Apr 25, 2013 at 11:26:35AM +0200, Miklos Vajna vmik...@suse.cz wrote: I'll bisect it later today. git bisect says: 9830fd36dbdb72c79703b0c61efc027fba793c5a is the first bad commit commit 9830fd36dbdb72c79703b0c61efc027fba793c5a Author: Lionel Elie Mamane lio...@mamane.lu Date: Sun Mar 17 08:36:26 2013 +0100 date/time IDL datatypes incompatible change - nanosecond precision - signed (allowed negative) year Also: assorted improvements / bugfixes in date/time handling code. Some factorisation of copy/pasted code. Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6 Lionel, any idea? Saving https://bugs.freedesktop.org/attachment.cgi?id=72390 as ODT and trying to load it triggers the issue here (soffice eats around 13G of memory). Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - svx/source sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
svx/source/dialog/txenctab.src |2 sw/AllLangResTarget_sw.mk |1 sw/UIConfig_swriter.mk |1 sw/inc/dialog.hrc |1 sw/inc/helpid.h |1 sw/inc/swabstdlg.hxx|2 sw/source/ui/dialog/ascfldlg.cxx| 129 sw/source/ui/dialog/ascfldlg.hrc| 36 --- sw/source/ui/dialog/ascfldlg.src| 140 - sw/source/ui/dialog/swdlgfact.cxx | 19 - sw/source/ui/dialog/swdlgfact.hxx |2 sw/source/ui/inc/ascfldlg.hxx | 23 -- sw/source/ui/uno/SwXFilterOptions.cxx |3 sw/uiconfig/swriter/ui/asciifilterdialog.ui | 293 14 files changed, 362 insertions(+), 291 deletions(-) New commits: commit dc900869e5f53a3036827328bc6fecebddd9 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 25 10:50:40 2013 +0100 convert ascii filter dialog to .ui Change-Id: I0e4f45d9e74fd2ae04defa75fce225d61295cdbc diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 69a6aaa..6d63cea 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -94,7 +94,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/dbui/mmpreparemergepage.src \ sw/source/ui/dbui/selectdbtabledialog.src \ sw/source/ui/dialog/abstract.src \ -sw/source/ui/dialog/ascfldlg.src \ sw/source/ui/dialog/dialog.src \ sw/source/ui/dialog/regionsw.src \ sw/source/ui/dochdl/dochdl.src \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 5b889c7..a4349e5 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -59,6 +59,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swriter,\ )) $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ + sw/uiconfig/swriter/ui/asciifilterdialog \ sw/uiconfig/swriter/ui/autoformattable \ sw/uiconfig/swriter/ui/autotext \ sw/uiconfig/swriter/ui/bibliographyentry \ diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc index 806f1c7..802a66f 100644 --- a/sw/inc/dialog.hrc +++ b/sw/inc/dialog.hrc @@ -27,7 +27,6 @@ #define DLG_PASSWD (RC_DIALOG_BEGIN + 3) #define DLG_INSERT_ABSTRACT (RC_DIALOG_BEGIN + 8) -#define DLG_ASCII_FILTER(RC_DIALOG_BEGIN + 9) #define RID_QB_SPELL_CONTINUE (RC_DIALOG_BEGIN + 11) #define STR_SPELLING_COMPLETED (RC_DIALOG_BEGIN + 12) diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index ad22fb0..5b114f8 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -139,7 +139,6 @@ #define HID_FILEDLG_WIZDOKU SW_HID_FILEDLG_WIZDOKU #define HID_MULTI_TOX_DLG SW_HID_MULTI_TOX_DLG -#define HID_ASCII_FILTER SW_HID_ASCII_FILTER #define HID_GLBLTREE_EDIT_LINK SW_HID_GLBLTREE_EDIT_LINK #define HID_FORMAT_NAME_OBJECT_NAME SW_HID_FORMAT_NAME_OBJECT_NAME #define HID_REFSELECTION_TOOLTIP SW_HID_REFSELECTION_TOOLTIP// #i83479# diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 8992dce..c0ff6ed 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -334,7 +334,7 @@ public: virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) = 0; // add for SwInsertAbstractDlg virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell rDocSh, -SvStream* pStream, int nResId ) = 0;// add for SwAsciiFilterDlg +SvStream* pStream ) = 0;// add for SwAsciiFilterDlg virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell rSh, SfxRequest rReq, int nResId ) = 0;// add for SwInsertBookmarkDlg virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell rSh) = 0; // add for SwBreakDlg diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 4dd1c66..b808142 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -38,7 +38,6 @@ #include doc.hxx #include dialog.hrc -#include ascfldlg.hrc #include vcl/metric.hxx @@ -52,25 +51,20 @@ const sal_uInt16 nDialogExtraDataLen = 11; // 12345678901 SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell rDocSh, SvStream* pStream ) -: SfxModalDialog( pParent, SW_RES( DLG_ASCII_FILTER )), -aFL( this, SW_RES( FL_1 )), -aCharSetFT( this, SW_RES( FT_CHARSET )), -aCharSetLB( this, SW_RES( LB_CHARSET )), -aFontFT( this, SW_RES( FT_FONT )), -aFontLB( this, SW_RES( LB_FONT )), -aLanguageFT( this, SW_RES( FT_LANGUAGE )), -
Re: Hang/crash in templates
Miklos Vajna wrote: I'll bisect it later today. I wonder if 9830fd36dbdb72c79703b0c61efc027fba793c5a is related - it modifies the binary format of the templatefoldercache ... Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82798d640347753e5b6dca0e3221b6b1b8e44fee Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 25 11:38:08 2013 +0100 Updated core Project: help 9b03a7110683c9e05b5a6a193d71dcfad58b8122 diff --git a/helpcontent2 b/helpcontent2 index 887ad70..9b03a71 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 887ad70ec215ad0420b4cee830fd72b22e4f9127 +Subproject commit 9b03a7110683c9e05b5a6a193d71dcfad58b8122 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |7 --- source/text/shared/00/0215.xhp | 25 + 2 files changed, 13 insertions(+), 19 deletions(-) New commits: commit 9b03a7110683c9e05b5a6a193d71dcfad58b8122 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 25 11:38:08 2013 +0100 update help ids for ascii filter dialog .ui Change-Id: Ie6f9081a1711e6df3699a67ec3524163b924507c diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 1fea194..a6247d7 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -745,7 +745,6 @@ HID_AREA_GRADIENT,33801, HID_AREA_HATCH,33799, HID_AREA_SHADOW,33805, HID_AREA_TRANSPARENCE,33806, -HID_ASCII_FILTER,53074, HID_AUTH_FIELD_ADDRESS,54882, HID_AUTH_FIELD_ANNOTE,54883, HID_AUTH_FIELD_AUTHOR,54884, @@ -8481,9 +8480,6 @@ sw_ListBox_DLG_AP_INSERT_DB_SEL_LB_DB_PARA_COLL,1435045395, sw_ListBox_DLG_AP_INSERT_DB_SEL_LB_TABLE_COL,1435045402, sw_ListBox_DLG_AP_INSERT_DB_SEL_LB_TBL_DB_COLUMN,1435045396, sw_ListBox_DLG_AP_INSERT_DB_SEL_LB_TXT_DB_COLUMN,1435045391, -sw_ListBox_DLG_ASCII_FILTER_LB_CHARSET,1404849667, -sw_ListBox_DLG_ASCII_FILTER_LB_FONT,1404849669, -sw_ListBox_DLG_ASCII_FILTER_LB_LANGUAGE,1404849671, sw_ListBox_DLG_BIB_BASE_LB_PATH,1428721160, sw_ListBox_DLG_COLUMN_LB_APPLY_TO,1417874998, sw_ListBox_DLG_FLD_DROPDOWN_LB_LISTITEMS,1419644418, @@ -8809,9 +8805,6 @@ sw_RadioButton_DLG_AP_INSERT_DB_SEL_RB_DBFMT_FROM_DB,1435042316, sw_RadioButton_DLG_AP_INSERT_DB_SEL_RB_DBFMT_FROM_USR,1435042317, sw_RadioButton_DLG_AP_INSERT_DB_SEL_RB_HEADL_COLNMS,1435042333, sw_RadioButton_DLG_AP_INSERT_DB_SEL_RB_HEADL_EMPTY,1435042334, -sw_RadioButton_DLG_ASCII_FILTER_RB_CR,1404846602, -sw_RadioButton_DLG_ASCII_FILTER_RB_CRLF,1404846601, -sw_RadioButton_DLG_ASCII_FILTER_RB_LF,1404846603, sw_RadioButton_DLG_MAILMERGE_RB_ALL,1446609410, sw_RadioButton_DLG_MAILMERGE_RB_FILE,1446609431, sw_RadioButton_DLG_MAILMERGE_RB_FROM,1446609412, diff --git a/source/text/shared/00/0215.xhp b/source/text/shared/00/0215.xhp index fcb2824..6f0c687 100644 --- a/source/text/shared/00/0215.xhp +++ b/source/text/shared/00/0215.xhp @@ -31,6 +31,7 @@ /history /meta body +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/asciifilterdialog/AsciiFilterDialog id=bm_id3159240 localize=false/ paragraph role=heading id=hd_id3146856 xml-lang=en-US level=1 l10n=U oldref=1ASCII Filter Options/paragraph paragraph role=paragraph id=par_id3153070 xml-lang=en-US l10n=U oldref=2You can specify which options, such as basic font, language, character set, or break, are imported or exported with a text document. The dialog appears when you load an ASCII file with the filter Text Encoded or when you save the document the first time, or when you save as with another name./paragraph section id=howtoget @@ -38,25 +39,25 @@ /section paragraph role=heading id=hd_id3159217 xml-lang=en-US level=2 l10n=U oldref=3Properties/paragraph paragraph role=paragraph id=par_id3155577 xml-lang=en-US l10n=U oldref=4Defines the settings for importing or exporting your file. When exporting, only the character set and paragraph break can be defined./paragraph -bookmark xml-lang=en-US branch=hid/sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET id=bm_id3159242 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/asciifilterdialog/charset id=bm_id3159242 localize=false/ paragraph role=heading id=hd_id3146959 xml-lang=en-US level=3 l10n=U oldref=5Character set/paragraph -paragraph role=paragraph id=par_id3143206 xml-lang=en-US l10n=U oldref=6ahelp hid=SW:LISTBOX:DLG_ASCII_FILTER:LB_CHARSETSpecifies the character set of the file for export or import./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:ListBox:DLG_ASCII_FILTER:LB_FONT id=bm_id3150008 localize=false/ +paragraph role=paragraph id=par_id3143206 xml-lang=en-US l10n=U oldref=6ahelp hid=modules/swriter/ui/asciifilterdialog/charsetSpecifies the character set of the file for export or import./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/asciifilterdialog/font id=bm_id3150008 localize=false/ paragraph role=heading id=hd_id3154926 xml-lang=en-US level=3 l10n=U oldref=7Default fonts/paragraph -paragraph role=paragraph id=par_id3151262 xml-lang=en-US l10n=CHG oldref=8ahelp hid=SW:LISTBOX:DLG_ASCII_FILTER:LB_FONTBy setting a default font, you specify that the text should be displayed in a specific font. The default fonts can only be selected when importing./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:ListBox:DLG_ASCII_FILTER:LB_LANGUAGE id=bm_id3153124 localize=false/ +paragraph role=paragraph id=par_id3151262 xml-lang=en-US l10n=CHG oldref=8ahelp hid=modules/swriter/ui/asciifilterdialog/fontBy setting a default font, you specify that the text should be displayed in a specific font. The default fonts can only be selected when importing./ahelp/paragraph +bookmark xml-lang=en-US
bisect related question
Hi, some questions arise during git bisect: 1. Will each build get an unique build id? Is this id related to the most recent commit? 2. Does make tail_build.clean; make tail_build require make dev-install afterwards? 3. Do get a faster build: How can I get rid of slowcheck? Christina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/recovery/dbdocrecovery.cxx | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 5907bb462de34e9cc59c178350bf9153c42d038a
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 25 13:53:54 2013 +0300
Fix compilation error when OSL_DEBUG_LEVEL 0
Just use SAL_WARN, building up the message using chained operators
instead
of constructing it into a OStringBuffer (or OUStringBuffer) and then passing
that to OSL_FAIL.
Or should we have a real assert() here?
Change-Id: I2c3f64ff2b29a3d81ba444d98c2a38ef49e6d7af
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx
b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index d5b605f..45a09f7 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -373,15 +373,12 @@ namespace dbaccess
const OUString sComponentName( stor-second.sName );
if ( !xComponentsStor-hasByName( stor-first ) )
{
-#if OSL_DEBUG_LEVEL 0
-OStringBuffer message;
-message.append(
DatabaseDocumentRecovery::recoverSubDocuments: inconsistent recovery storage:
storage ' );
-message.append( OUStringToOString( stor-first,
RTL_TEXTENCODING_ASCII_US ) );
-message.append( ' not found in ' );
-message.append( OUStringToOString(
SubComponentRecovery::getComponentsStorageName( eComponentType ),
RTL_TEXTENCODING_ASCII_US ) );
-message.append( ', but required per map file! );
-OSL_FAIL( message.getStr() );
-#endif
+SAL_WARN( dbaccess,
+ DatabaseDocumentRecovery::recoverSubDocuments:
inconsistent recovery storage: storage '
+ stor-first
+ ' not found in '
+ SubComponentRecovery::getComponentsStorageName(
eComponentType )
+ ', but required per map file! );
continue;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: bisect related question
Hi Christina, On Thu, Apr 25, 2013 at 12:52:11PM +0200, Christina Roßmanith chrrossman...@gmx.de wrote: 1. Will each build get an unique build id? Is this id related to the most recent commit? Yes, as long as you do a make dev-install. (The about dialog is not updated after a simple make.) (No idea about the two other questions, let the build experts answer them. :-) ) Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: bisect related question
3. Do get a faster build: How can I get rid of slowcheck? Normally make build should skip all tests but I'm not sure if it still works. Otherwise something like make -f Makefile all -o slowcheck might work too. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d8f1159cb3019bc7814f44029fe6f603a279117d Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 25 12:04:32 2013 +0100 Updated core Project: help 01a9fff87678572226b099c7102f5f1b03bec4b4 diff --git a/helpcontent2 b/helpcontent2 index 9b03a71..01a9fff 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9b03a7110683c9e05b5a6a193d71dcfad58b8122 +Subproject commit 01a9fff87678572226b099c7102f5f1b03bec4b4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|3 --- source/text/swriter/01/0520.xhp |3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) New commits: commit 01a9fff87678572226b099c7102f5f1b03bec4b4 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 25 12:04:32 2013 +0100 update help ids for merge table dialog .ui Change-Id: If8f5f47222b3d57c10f7ae2ae90bbea2df713a45 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index a6247d7..b51ca1a 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -442,7 +442,6 @@ FN_TABLE_INSERT_COL_DLG,20542,.uno:InsertColumnDialog FN_TABLE_INSERT_ROW,20501,.uno:InsertRows FN_TABLE_INSERT_ROW_DLG,20543,.uno:InsertRowDialog FN_TABLE_MERGE_CELLS,20506,.uno:MergeCells -FN_TABLE_MERGE_TABLE,21752,.uno:MergeTable FN_TABLE_MODE_FIX,20589,.uno:TableModeFix FN_TABLE_MODE_FIX_PROP,20590,.uno:TableModeFixProp FN_TABLE_MODE_VARIABLE,20591,.uno:TableModeVariable @@ -8817,8 +8816,6 @@ sw_RadioButton_DLG_MERGE_CREATE_RB_TEMPLATE,1447494147, sw_RadioButton_DLG_MERGE_CREATE_RB_THISDOC,1447494146, sw_RadioButton_DLG_MERGE_FIELD_CONNECTIONS_RB_CREATENEW,1447510537, sw_RadioButton_DLG_MERGE_FIELD_CONNECTIONS_RB_USEEXISTING,1447510536, -sw_RadioButton_DLG_MERGE_TABLE_RB_MERGE_NEXT,1425424902, -sw_RadioButton_DLG_MERGE_TABLE_RB_MERGE_PREV,1425424901, sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_CURRENTDOC,898204162, sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADDOC,898204164, sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADTEMPLATE,898204166, diff --git a/source/text/swriter/01/0520.xhp b/source/text/swriter/01/0520.xhp index d73449b..67271d1 100644 --- a/source/text/swriter/01/0520.xhp +++ b/source/text/swriter/01/0520.xhp @@ -36,8 +36,7 @@ bookmark_valuemerging; tables/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/.uno:MergeTable id=bm_id6690819 localize=false/!-- HID added by script -- -bookmark xml-lang=en-US branch=hid/.uno:MergeTable id=bm_id3149048 localize=false/ -!-- removed HID 20652 -- +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mergetabledialog/MergeTableDialog id=bm_id3149048 localize=false/ paragraph role=heading id=hd_id3154652 xml-lang=en-US level=1 l10n=CHG oldref=1link href=text/swriter/01/0520.xhp name=Merge TableMerge Table/link/paragraph paragraph role=paragraph id=par_id3147401 xml-lang=en-US l10n=U oldref=2ahelp hid=.uno:MergeTableCombines two consecutive tables into a single table. The tables must be directly next to each other and not separated by an empty paragraph./ahelp/paragraph /section ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Hang/crash in templates
On Thu, Apr 25, 2013 at 12:24:37PM +0200, Miklos Vajna wrote: On Thu, Apr 25, 2013 at 11:26:35AM +0200, Miklos Vajna vmik...@suse.cz wrote: I'll bisect it later today. git bisect says: 9830fd36dbdb72c79703b0c61efc027fba793c5a is the first bad commit commit 9830fd36dbdb72c79703b0c61efc027fba793c5a Author: Lionel Elie Mamane lio...@mamane.lu Date: Sun Mar 17 08:36:26 2013 +0100 date/time IDL datatypes incompatible change Lionel, any idea? Saving https://bugs.freedesktop.org/attachment.cgi?id=72390 as ODT and trying to load it triggers the issue here (soffice eats around 13G of memory). So I gather that the issue is that saving this document makes LibreOffice eat unreasonable amounts of memory. That does not give me enough data to make a guess (does this document have anything specific regarding times?). I'll try to run it under gdb/valgrind, but I've pulled on my master checkout and done only a partial rebuild, and the binary does not start for me. I've started a full rebuild, but that typically takes hours. If you can point valgrind/gdb it yourself and point me towards the place / stacktrace that allocates a lot, I can look at that place and see if I get inspiration (before my build finishes). -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/AutoInstallLibs.mk |5 +++-- solenv/gbuild/InstallModuleTarget.mk | 10 +- 2 files changed, 8 insertions(+), 7 deletions(-) New commits: commit 71356b046bfc17ab54c5a784522035538edda6c8 Author: David Tardon dtar...@redhat.com Date: Thu Apr 25 13:06:12 2013 +0200 rebuild scp if autoinstalled libs change Change-Id: I76cca4646bd0258cdf64a079edb017e6243839af diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk index 52dff9c..53e85de 100644 --- a/solenv/gbuild/AutoInstallLibs.mk +++ b/solenv/gbuild/AutoInstallLibs.mk @@ -13,7 +13,7 @@ $(dir $(call gb_AutoInstallLibs_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) -$(call gb_AutoInstallLibs_get_target,%) : +$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk $(call gb_Output_announce,$*,$(true),AIL,3) echo /* autogenerated library installs for group $(INSTALLMODULE) */ $@ $(call gb_Output_info,install module: $(INSTALLMODULE) contents: $(gb_Library_MODULE_$(INSTALLMODULE))) @@ -30,7 +30,8 @@ $(call gb_AutoInstallLibs_get_clean_target,%) : rm -f $(call gb_AutoInstallLibs_get_target,$*) define gb_AutoInstallLibs_AutoInstallLibs -$(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Helper_PHONY) | $(dir $(call gb_AutoInstallLibs_get_target,$(1))).dir +$(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) +$(call gb_AutoInstallLibs_get_target,$(1)) :| $(dir $(call gb_AutoInstallLibs_get_target,$(1))).dir $(call gb_AutoInstallLibs_get_target,$(1)) : INSTALLMODULE = $(2) $(call gb_AutoInstallLibs_get_target,$(1)) : SCP2TEMPLATE = $(3) $(call gb_AutoInstallLibs_get_target,$(1)) : SCP2ID = $(4) diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index d995247..0ef0780 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -169,9 +169,9 @@ define gb_ScpTarget_ScpTarget $(call gb_ScpPreprocessTarget_ScpPreprocessTarget,$(1)) $(call gb_ScpTarget_get_target,$(1)) : $(call gb_ScpPreprocessTarget_get_target,$(1)) -$(call gb_ScpTarget_get_target,$(1)) :| $(call gb_ScpTarget_get_external_target,$(1)) +$(call gb_ScpTarget_get_target,$(1)) : $(call gb_ScpTarget_get_external_target,$(1)) $(call gb_ScpTarget_get_external_target,$(1)) :| $(dir $(call gb_ScpTarget_get_target,$(1))).dir -$(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(call gb_ScpTarget_get_external_target,$(1)) +$(call gb_ScpPreprocessTarget_get_target,$(1)) : $(call gb_ScpTarget_get_external_target,$(1)) $(call gb_ScpTarget_get_clean_target,$(1)) : $(call gb_ScpPreprocessTarget_get_clean_target,$(1)) $(call gb_ScpTarget_get_target,$(1)) : SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_target,$(1)) $(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(gb_Helper_PHONY) @@ -221,7 +221,7 @@ $(call gb_InstallModuleTarget_get_clean_target,%) : $(call gb_InstallModuleTarget_get_external_target,$*) define gb_InstallModuleTarget_InstallModuleTarget -$(call gb_InstallModuleTarget_get_target,$(1)) :| \ +$(call gb_InstallModuleTarget_get_target,$(1)) : \ $(call gb_InstallModuleTarget_get_external_target,$(1)) $(call gb_InstallModuleTarget_get_external_target,$(1)) :| \ $(dir $(call gb_InstallModuleTarget_get_target,$(1))).dir @@ -261,7 +261,7 @@ $(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_AutoInstallL endef define gb_InstallModuleTarget_use_custom_header -$(call gb_InstallModuleTarget_get_external_target,$(1)) :| $(call gb_CustomTarget_get_target,$(2)) +$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_CustomTarget_get_target,$(2)) $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) \ endef @@ -276,7 +276,7 @@ $(call gb_ScpTarget_ScpTarget,$(2)) $(call gb_InstallModuleTarget_get_target,$(1)) : $(call gb_ScpTarget_get_target,$(2)) $(call gb_InstallModuleTarget_get_clean_target,$(1)) : $(call gb_ScpTarget_get_clean_target,$(2)) $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_FILES += $(call gb_ScpTarget_get_target,$(2)) -$(call gb_ScpTarget_get_external_target,$(2)) :| $(call gb_InstallModuleTarget_get_external_target,$(1)) +$(call gb_ScpTarget_get_external_target,$(2)) : $(call gb_InstallModuleTarget_get_external_target,$(1)) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Hang/crash in templates
On Thu, Apr 25, 2013 at 01:08:47PM +0200, Lionel Elie Mamane lio...@mamane.lu wrote: So I gather that the issue is that saving this document makes LibreOffice eat unreasonable amounts of memory. No, saving the docx attachment as odf is (more or less) fine. But then reading back the odf results in eating too much memory, yes. That does not give me enough data to make a guess (does this document have anything specific regarding times?). I'll try to run it under gdb/valgrind, but I've pulled on my master checkout and done only a partial rebuild, and the binary does not start for me. I've started a full rebuild, but that typically takes hours. If you can point valgrind/gdb it yourself and point me towards the place / stacktrace that allocates a lot, I can look at that place and see if I get inspiration (before my build finishes). TemplateContent::TemplateContent gets an INetURLObject, and the next assert fails, as GetProtocol() is INET_PROT_NOT_VALID. If you step up the backtrace in gdb, you see that the URL was ~memory garbage. On the other hand, for now I would just change back the cache format. Does that make sense? I mean if you are OK with pushing http://cgit.freedesktop.org/~vmiklos/lo-core/commit/?id=83544b27f3dcfb132b3eb46d387f62ebc9c3e160 to master. And then this can be still discussed (if it's OK to change this format or not, if hundred/nano seconds matter for templates or not, etc) without being in a hurry. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-19'
Tag 'suse-3.6-19' created by Andras Timar ati...@suse.com at 2013-04-25 12:29 -0700 suse-3.6-19 Changes since suse-3.6-18-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-19'
Tag 'suse-3.6-19' created by Andras Timar ati...@suse.com at 2013-04-25 12:29 -0700 suse-3.6-19 Changes since suse-3.6-12: Fridrich Å trba (2): Branch libreoffice-3-6-5 Version 3.6.5.2, tag libreoffice-3.6.5.2 Petr Mladek (1): Merge tag 'libreoffice-3.6.5.2' into suse-3.6 --- 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/suse-3.6-19'
Tag 'suse-3.6-19' created by Andras Timar ati...@suse.com at 2013-04-25 12:29 -0700 suse-3.6-19 Changes since suse-3.6-12: Andras Timar (3): updated pt-PT spelling dictionary fdo#56130 update Galician dictionary pack Update pt-PT dictionary Fridrich Å trba (2): Branch libreoffice-3-6-5 Version 3.6.5.2, tag libreoffice-3.6.5.2 Lior Kaplan (1): Update Hebrew dictionary to one created with Hspell 1.2 (taken from Fedora 17 64bit) Olivier Hallot (1): Fix for fdo#53520, Portuguese spelling files Petr Mladek (1): Merge tag 'libreoffice-3.6.5.2' into suse-3.6 --- dictionaries/pt_PT/description.xml |2 dictionaries/pt_PT/pt_PT.dic | 257 - 2 files changed, 144 insertions(+), 115 deletions(-) --- ___ 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/suse-3.6-19'
Tag 'suse-3.6-19' created by Andras Timar ati...@suse.com at 2013-04-25 12:29 -0700 suse-3.6-19 Changes since suse-3.6-12: Fridrich Å trba (2): Branch libreoffice-3-6-5 Version 3.6.5.2, tag libreoffice-3.6.5.2 Petr Mladek (1): Merge tag 'libreoffice-3.6.5.2' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-19'
Tag 'suse-3.6-19' created by Andras Timar ati...@suse.com at 2013-04-25 12:29 -0700 suse-3.6-19 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h |1
sw/source/ui/uiview/pview.cxx | 40 ++
sw/source/ui/uiview/pview.hrc | 51
sw/source/ui/uiview/pview.src | 103
sw/source/ui/uiview/view.hrc|1
sw/source/ui/uiview/view.src|4
sw/uiconfig/swriter/ui/previewzoomdialog.ui | 171
9 files changed, 189 insertions(+), 184 deletions(-)
New commits:
commit 5ab7d719795d5c74af856df98d23117ab62ffd78
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 25 12:27:59 2013 +0100
convert page preview zoom dialog to .ui
Change-Id: I4c4511787247bdcabd88af1c3b0894361336b71f
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index f52adae..921d608 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -143,7 +143,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/table/chartins.src \
sw/source/ui/table/table.src \
sw/source/ui/table/tabledlg.src \
-sw/source/ui/uiview/pview.src \
sw/source/ui/uiview/view.src \
sw/source/ui/utlui/attrdesc.src \
sw/source/ui/utlui/gloslst.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index a014523..0343d21 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
sw/uiconfig/swriter/ui/outlinepositionpage \
+ sw/uiconfig/swriter/ui/previewzoomdialog \
sw/uiconfig/swriter/ui/printoptionspage \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/rowheight \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 5b114f8..f5095ba 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -83,7 +83,6 @@
#define HID_NAVI_TBX15
SW_HID_NAVI_TBX15
#define HID_NAVI_VS
SW_HID_NAVI_VS
#define HID_NUM_FORMAT_BTN
SW_HID_NUM_FORMAT_BTN
-#define HID_PPREV_ZOOM
SW_HID_PPREV_ZOOM
#define HID_NAVI_TBX16
SW_HID_NAVI_TBX16
#define HID_LTEMPL_TEXT
SW_HID_LTEMPL_TEXT
#define HID_LTEMPL_FRAME
SW_HID_LTEMPL_FRAME
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 8ce5a32..c7c5e41 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -66,7 +66,7 @@
#include cmdid.h
#include globals.hrc
#include popup.hrc
-#include pview.hrc
+#include view.hrc
#define SwPagePreView
#include sfx2/msg.hxx
@@ -137,47 +137,33 @@ static void lcl_InvalidateZoomSlots(SfxBindings
rBindings)
// erstmal der Zoom-Dialog
class SwPreViewZoomDlg : public SvxStandardDialog
{
-FixedText aRowLbl;
-NumericFieldaRowEdit;
-FixedText aColLbl;
-NumericFieldaColEdit;
+NumericField* m_pRowEdit;
+NumericField* m_pColEdit;
-OKButtonaOkBtn;
-CancelButtonaCancelBtn;
-HelpButton aHelpBtn;
-
-virtual voidApply();
+virtual void Apply();
public:
SwPreViewZoomDlg( SwPagePreViewWin rParent );
-~SwPreViewZoomDlg();
};
-SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin rParent ) :
-SvxStandardDialog( rParent, SW_RES(DLG_PAGEPREVIEW_ZOOM) ),
-aRowLbl(this,SW_RES(FT_ROW)),
-aRowEdit(this,SW_RES(ED_ROW)),
-aColLbl(this,SW_RES(FT_COL)),
-aColEdit(this,SW_RES(ED_COL)),
-aOkBtn(this,SW_RES(BT_OK)),
-aCancelBtn(this,SW_RES(BT_CANCEL)),
-aHelpBtn(this,SW_RES(BT_HELP))
+SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin rParent )
+: SvxStandardDialog(rParent, PreviewZoomDialog,
modules/swriter/ui/previewzoomdialog.ui)
{
-FreeResource();
+get(m_pRowEdit, rows);
+get(m_pColEdit, cols);
-aRowEdit.SetValue( rParent.GetRow() );
-aColEdit.SetValue( rParent.GetCol() );
+m_pRowEdit-SetValue( rParent.GetRow() );
+m_pColEdit-SetValue( rParent.GetCol() );
}
-SwPreViewZoomDlg::~SwPreViewZoomDlg() {}
void SwPreViewZoomDlg::Apply()
{
((SwPagePreViewWin*)GetParent())-CalcWish(
-sal_uInt8(aRowEdit.GetValue()),
-sal_uInt8(aColEdit.GetValue()) );
+sal_uInt8(m_pRowEdit-GetValue()),
+sal_uInt8(m_pColEdit-GetValue()) );
}
-// alles fuers SwPagePreViewWin
+// all for SwPagePreViewWin
SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView rPView )
: Window( pParent, WinBits( WB_CLIPCHILDREN) ),
mpViewShell( 0 ),
diff --git a/sw/source/ui/uiview/pview.hrc
Conflict between system and internal cairo
Hello, Clang tindebox currently fails because of a race and mixup of system and internal cairo/pixman libraries. Specifically, Executable_pluginapp.bin.mk links also against gtk, which links against cairo, which links against pixman. And there is a race that results in solver containing pixman but not cairo by the time Executable_pluginapp.bin.mk is being linked. The linker command has -L for the solver lib directory, so it picks up system cairo and internal pixman, and these are apparently incompatible. Changing StaticLibrary_plugcon.mk to $(eval $(call gb_StaticLibrary_use_externals,plugcon,gtk cairo)) helps with the problem, but I assume this cannot be just hardcoded and I don't know how to do it properly? Gbuild experts? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0820414d0c53ac6f67742b1ff5cd27dd011f013b Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 25 12:40:45 2013 +0100 Updated core Project: help 0f337351043a65843b4b7687d33ca5afdc8289b8 diff --git a/helpcontent2 b/helpcontent2 index 01a9fff..0f33735 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 01a9fff87678572226b099c7102f5f1b03bec4b4 +Subproject commit 0f337351043a65843b4b7687d33ca5afdc8289b8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|3 --- source/text/swriter/02/1007.xhp | 12 +--- 2 files changed, 5 insertions(+), 10 deletions(-) New commits: commit 0f337351043a65843b4b7687d33ca5afdc8289b8 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 25 12:40:45 2013 +0100 update help ids for preview zoom dialog .ui Change-Id: I992ada56b4a9aa1b428b73df26831d830a0c68af diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index b51ca1a..e1407ff 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2759,7 +2759,6 @@ HID_POPUP_FRAME,33840, HID_POPUP_LINE,33841, HID_POPUP_LINEEND,34072, HID_POPUP_LINEEND_CTRL,34073, -HID_PPREV_ZOOM,53004, HID_PREVIEW_FRAME,33125, HID_PRINTDIALOG_TOFILE,33021, HID_PRINTMONITOR,33072, @@ -8673,8 +8672,6 @@ sw_NumericField_DLG_MM_PREPAREMERGE_PAGE_ED_RECORD,898275333, sw_NumericField_DLG_MM_SERVERAUTHENTICATION_NF_PORT,1427150861, sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141, sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139, -sw_NumericField_DLG_PAGEPREVIEW_ZOOM_ED_COL,1411274756, -sw_NumericField_DLG_PAGEPREVIEW_ZOOM_ED_ROW,1411274757, sw_NumericField_TP_DROPCAPS_FLD_DROPCAPS,877828098, sw_NumericField_TP_DROPCAPS_FLD_LINES,877828100, sw_NumericField_TP_FLD_DOK_ED_DOKDATEOFF,878762041, diff --git a/source/text/swriter/02/1007.xhp b/source/text/swriter/02/1007.xhp index 7f9e0a6..2303ffc 100644 --- a/source/text/swriter/02/1007.xhp +++ b/source/text/swriter/02/1007.xhp @@ -30,11 +30,9 @@ /meta body section id=massstab -!-- removed HID FN_SHOW_FOUR_PAGES -- bookmark xml-lang=en-US branch=hid/.uno:PreviewZoom id=bm_id2536826 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:PreviewZoom id=bm_id3145243 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/previewzoomdialog/PreviewZoomDialog id=bm_id3145243 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:ShowMultiplePages id=bm_id2980921 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:ShowMultiplePages id=bm_id1781670 localize=false/paragraph role=heading id=hd_id3147171 xml-lang=en-US level=1 l10n=U oldref=1link href=text/swriter/02/1007.xhp name=Page Preview: Multiple PagesPage Preview: Multiple Pages/link/paragraph paragraph role=paragraph id=par_id3148771 xml-lang=en-US l10n=U oldref=2ahelp hid=.uno:PreviewZoomDefines the number of pages displayed on screen. Click the arrow next to the icon to open a grid to select the number of pages to be displayed as rows and columns in the preview./ahelp/paragraph /section section id=symassstab @@ -52,10 +50,10 @@ /table /section paragraph role=paragraph id=par_id3154573 xml-lang=en-US l10n=CHG oldref=5After clicking the emphPage Preview: Multiple Pages/emph icon, theemph Multiple pages/emph dialog opens. Use the two spin buttons to set the number of pages to be displayed. /paragraph -bookmark xml-lang=en-US branch=hid/sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_ROW id=bm_id3155183 localize=false/paragraph role=heading id=hd_id3149695 xml-lang=en-US level=3 l10n=U oldref=6Rows/paragraph -paragraph role=paragraph id=par_id3149483 xml-lang=en-US l10n=U oldref=7ahelp hid=SW:NUMERICFIELD:DLG_PAGEPREVIEW_ZOOM:ED_ROWDefines the number of rows of pages./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_COL id=bm_id3149095 localize=false/paragraph role=heading id=hd_id3143274 xml-lang=en-US level=3 l10n=U oldref=8Columns/paragraph -paragraph role=paragraph id=par_id3149102 xml-lang=en-US l10n=U oldref=9ahelp hid=SW:NUMERICFIELD:DLG_PAGEPREVIEW_ZOOM:ED_COLDefines the number of pages shown in columns./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/previewzoomdialog/rows id=bm_id3155183 localize=false/paragraph role=heading id=hd_id3149695 xml-lang=en-US level=3 l10n=U oldref=6Rows/paragraph +paragraph role=paragraph id=par_id3149483 xml-lang=en-US l10n=U oldref=7ahelp hid=modules/swriter/ui/previewzoomdialog/rowsDefines the number of rows of pages./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/previewzoomdialog/cols id=bm_id3149095 localize=false/paragraph role=heading id=hd_id3143274 xml-lang=en-US level=3 l10n=U oldref=8Columns/paragraph +paragraph role=paragraph id=par_id3149102 xml-lang=en-US l10n=U oldref=9ahelp hid=modules/swriter/ui/previewzoomdialog/colsDefines the number of pages shown in columns./ahelp/paragraph paragraph role=paragraph id=par_id3149822 xml-lang=en-US l10n=CHG oldref=10The settings you choose in the dialog can also be set using the mouse: Click the arrow next to the emphPage Preview: Multiple Pages/emph icon. Now move the mouse over the desired number of rows and columns./paragraph /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/window/keynames.cxx | 203 ++---
1 file changed, 103 insertions(+), 100 deletions(-)
New commits:
commit 792181299b78c9232ec161eb60962ebe289b
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 25 14:40:10 2013 +0300
Fix KEY_SHIFT clash
Since 360d6bf4fd1241af47f55648b7597fda3120390a the precompiled header for
vcl
includes rsc/rsc-vcl-shared-types.hxx , so the KEY_SHIFT from there
interfered with the KEY_SHIFT here.
These magic values apparently are the known return values from
MapVirtualKey() called to translate (fixed) virtual key codes to scan codes,
suitably shifted and ORed with some flag bit(s). Whether such scan code
values
really are constant in all Windows installations I have no idea, it does
sound
a bit scary to me to assume they are. (If they are, why does windows.h
then
not provide symbolic names for them?)
Change-Id: Ic18a8e1a8b7a95bb6b018382662944f6912e4734
diff --git a/vcl/win/source/window/keynames.cxx
b/vcl/win/source/window/keynames.cxx
index ad16a64..fcac7d6 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -23,23 +23,26 @@
#include windows.h
-#define KEY_ESC 0x1
-#define KEY_BACK0xE
-#define KEY_ENTER 0x1C
-#define KEY_SPACEBAR0x39
-#define KEY_HOME0x147
-#define KEY_UP 0x148
-#define KEY_PAGEUP 0x149
-#define KEY_LEFT0x14B
-#define KEY_RIGHT 0x14D
-#define KEY_END 0x14F
-#define KEY_DOWN0x150
-#define KEY_PAGEDOWN0x151
-#define KEY_INSERT 0x152
-#define KEY_DELETE 0x153
-#define KEY_CONTROL 0x21D
-#define KEY_SHIFT 0x22A
-#define KEY_ALT 0x238
+// Use unique ;) names to avoid clashes with the KEY_* (especially
+// KEY_SHIFT) from rsc/rsc-vcl-shared-types.hxx
+
+#define PAPUGA_KEY_ESC 0x1
+#define PAPUGA_KEY_BACK0xE
+#define PAPUGA_KEY_ENTER 0x1C
+#define PAPUGA_KEY_SPACEBAR0x39
+#define PAPUGA_KEY_HOME0x147
+#define PAPUGA_KEY_UP 0x148
+#define PAPUGA_KEY_PAGEUP 0x149
+#define PAPUGA_KEY_LEFT0x14B
+#define PAPUGA_KEY_RIGHT 0x14D
+#define PAPUGA_KEY_END 0x14F
+#define PAPUGA_KEY_DOWN0x150
+#define PAPUGA_KEY_PAGEDOWN0x151
+#define PAPUGA_KEY_INSERT 0x152
+#define PAPUGA_KEY_DELETE 0x153
+#define PAPUGA_KEY_CONTROL 0x21D
+#define PAPUGA_KEY_SHIFT 0x22A
+#define PAPUGA_KEY_ALT 0x238
namespace vcl_sal {
@@ -67,109 +70,109 @@ namespace vcl_sal {
static const struct KeysNameReplacement aImplReplacements_Asturian[] =
{
-{ KEY_BACK, Retrocesu },
-{ KEY_ENTER, Intro },
-{ KEY_SPACEBAR, Espaciu },
-{ KEY_HOME, Aniciu },
-{ KEY_UP, Arriba },
-{ KEY_PAGEUP, Re Páx },
-{ KEY_LEFT, Izquierda },
-{ KEY_RIGHT, Drecha },
-{ KEY_END, Fin },
-{ KEY_DOWN, Abaxo },
-{ KEY_PAGEDOWN, Av Páx },
-{ KEY_INSERT, Ins },
-{ KEY_DELETE, Supr },
-{ KEY_SHIFT, Mayús },
+{ PAPUGA_KEY_BACK, Retrocesu },
+{ PAPUGA_KEY_ENTER, Intro },
+{ PAPUGA_KEY_SPACEBAR, Espaciu },
+{ PAPUGA_KEY_HOME, Aniciu },
+{ PAPUGA_KEY_UP, Arriba },
+{ PAPUGA_KEY_PAGEUP, Re Páx },
+{ PAPUGA_KEY_LEFT, Izquierda },
+{ PAPUGA_KEY_RIGHT, Drecha },
+{ PAPUGA_KEY_END, Fin },
+{ PAPUGA_KEY_DOWN, Abaxo },
+{ PAPUGA_KEY_PAGEDOWN, Av Páx },
+{ PAPUGA_KEY_INSERT, Ins },
+{ PAPUGA_KEY_DELETE, Supr },
+{ PAPUGA_KEY_SHIFT, Mayús },
};
static const struct KeysNameReplacement aImplReplacements_Catalan[] =
{
-{ KEY_BACK, Retrocés },
-{ KEY_ENTER, Retorn },
-{ KEY_SPACEBAR, Espai },
-{ KEY_HOME, Inici },
-{ KEY_UP, Amunt },
-{ KEY_PAGEUP, Re PÃ g },
-{ KEY_LEFT, Esquerra },
-{ KEY_RIGHT, Dreta },
-{ KEY_END, Fi },
-{ KEY_DOWN, Avall },
-{ KEY_PAGEDOWN, Av PÃ g },
-{ KEY_INSERT, Ins },
-{ KEY_DELETE, Supr },
-{ KEY_SHIFT, Maj },
+{ PAPUGA_KEY_BACK, Retrocés },
+{ PAPUGA_KEY_ENTER, Retorn },
+{ PAPUGA_KEY_SPACEBAR, Espai },
+{ PAPUGA_KEY_HOME, Inici },
+{ PAPUGA_KEY_UP, Amunt },
+{ PAPUGA_KEY_PAGEUP, Re PÃ g },
+{ PAPUGA_KEY_LEFT, Esquerra },
+{ PAPUGA_KEY_RIGHT, Dreta },
+{ PAPUGA_KEY_END, Fi },
+{ PAPUGA_KEY_DOWN, Avall },
+{ PAPUGA_KEY_PAGEDOWN, Av PÃ g },
+{ PAPUGA_KEY_INSERT, Ins },
+{ PAPUGA_KEY_DELETE, Supr },
+{ PAPUGA_KEY_SHIFT, Maj },
};
static const struct KeysNameReplacement aImplReplacements_Estonian[] =
{
-{ KEY_RIGHT, Nool paremale
Re: conversion operators for UNO
On Thursday 25 of April 2013, Michael Stahl wrote: On 25/04/13 12:08, Noel Grandin wrote: On 2013-04-25 11:59, Michael Stahl wrote: e.g. this problem here caused a 3 % or so slowdown in ODF file load and/or save (i forgot which), mainly due to 2 additional queryInterface calls in a critical place: https://issues.apache.org/ooo/show_bug.cgi?id=108161 with your proposal it would be possible to write code like: ReferenceB b = ... methodFooThatTakesA( b ); methodBarThatTakesA( b ); methodBazThatTakesA( b ); ... and get 3 queryInterface calls instead of 1. or let me reformulate that: is it possible to implement your hypothetical operator such that it does not call queryInterface (i don't know). A and B are normal C++ classes with the right inheritance, aren't they? I'd expect a template uno::Reference ctor with the right check for allowing only inheriting types should do. My desire is to make the UNO code less noisy. And it matches the natural semantics of C++, which is that it's possible to pass a subtype of the expected parameter's type. hmmm... looking at the amount of boilerplate involved one gets the impression that UNO somehow appears more natural in languages that aren't C++ :) Probably nobody has spent enough time to design that boilerplate for those other languages :). -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk i18nlangtag/Library_i18nlangtagicu.mk i18nlangtag/Library_i18nlangtag.mk i18nlangtag/Module_i18nlangtag.mk i18np
Library_merged.mk |1 Repository.mk |1 i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk |3 - i18nlangtag/Library_i18nlangtag.mk |6 +++ i18nlangtag/Library_i18nlangtagicu.mk | 32 i18nlangtag/Module_i18nlangtag.mk |1 i18npool/Library_i18npool.mk|1 include/i18nlangtag/languagetagicu.hxx |7 +-- lotuswordpro/Library_lwpft.mk |1 9 files changed, 10 insertions(+), 43 deletions(-) New commits: commit f5752e9846453e6727b521994fd061f3fec884ff Author: Eike Rathke er...@redhat.com Date: Thu Apr 25 13:36:42 2013 +0200 ditch libi18nlangtagicu again Thanks to Fridrich for finding the real cause for why I thought this was necessary.. Change-Id: I77934b17c2b994a03cae5440253b165704de2fa4 diff --git a/Library_merged.mk b/Library_merged.mk index 4603bda..2d5ef60 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nlangtag \ - i18nlangtagicu \ $(if $(filter TRUE,$(SOLAR_JAVA)), \ jvmaccess \ jvmfwk) \ diff --git a/Repository.mk b/Repository.mk index c4858b7..054d9a3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -469,7 +469,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \ deployment \ fileacc \ i18nlangtag \ - i18nlangtagicu \ i18nutil \ mcnttype \ package2 \ diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk index a1f2943..f001717 100644 --- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -14,9 +14,8 @@ $(eval $(call gb_CppunitTest_use_api,i18nlangtag_test_languagetag,\ offapi \ )) -$(eval $(call gb_CppunitTest_use_library_objects,i18nlangtag_test_languagetag,i18nlangtag)) - $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\ + i18nlangtag \ cppu \ cppuhelper \ sal \ diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk index 3faacc4..c88b852 100644 --- a/i18nlangtag/Library_i18nlangtag.mk +++ b/i18nlangtag/Library_i18nlangtag.mk @@ -39,11 +39,17 @@ $(eval $(call gb_Library_use_libraries,i18nlangtag,\ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_externals,i18nlangtag,\ + icu_headers \ + icuuc \ +)) + $(eval $(call gb_Library_add_exception_objects,i18nlangtag,\ i18nlangtag/source/isolang/insys \ i18nlangtag/source/isolang/isolang \ i18nlangtag/source/isolang/mslangid \ i18nlangtag/source/languagetag/languagetag \ + i18nlangtag/source/languagetag/languagetagicu \ )) diff --git a/i18nlangtag/Library_i18nlangtagicu.mk b/i18nlangtag/Library_i18nlangtagicu.mk deleted file mode 100644 index d1def1b..000 --- a/i18nlangtag/Library_i18nlangtagicu.mk +++ /dev/null @@ -1,32 +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_Library_Library,i18nlangtagicu)) - -$(eval $(call gb_Library_use_sdk_api,i18nlangtagicu)) - -$(eval $(call gb_Library_add_defs,i18nlangtagicu,\ - -DI18NLANGTAG_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_use_libraries,i18nlangtagicu,\ - sal \ - i18nlangtag \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_use_externals,i18nlangtagicu,\ - icu_headers \ - icuuc \ -)) - -$(eval $(call gb_Library_add_exception_objects,i18nlangtagicu,\ - i18nlangtag/source/languagetag/languagetagicu \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/i18nlangtag/Module_i18nlangtag.mk b/i18nlangtag/Module_i18nlangtag.mk index 22b8a7f..edd2e1d 100644 --- a/i18nlangtag/Module_i18nlangtag.mk +++ b/i18nlangtag/Module_i18nlangtag.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,i18nlangtag)) $(eval $(call gb_Module_add_targets,i18nlangtag,\ Library_i18nlangtag \ - Library_i18nlangtagicu \ )) $(eval $(call gb_Module_add_check_targets,i18nlangtag,\ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 5fe9e2c..955579f 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ cppu \ cppuhelper \ i18nlangtag \ - i18nlangtagicu \ i18nutil \ sal \
Re: conversion operators for UNO
On 04/25/2013 10:35 AM, Noel Grandin wrote:
I would like to discuss the addition of conversion operators for UNO.
Let me start with an example.
If we have IDL that looks like:
interface A {}
interface B : A {}
Then we typically have C++ code that looks like
void foo(ReferenceA a)
void bar() {
ReferenceB b =
methodThatTakesA( ReferenceA(b, UNO_QUERY_THROW) );
}
I want to change things so that I can write:
void bar() {
ReferenceB b =
methodThatTakesA( b );
}
and have the code automagically perform the B to A conversion
Is there some reason this would not be desirable?
(I'll leave the question as to whether or not is implementable for later
:-)
This has been discussed before more than once, but I tend to forget
whether it has never gone past discussion stage because the
implementation would be slightly tricky (using SFNIAE to restrict
implicit conversions from ReferenceB to ReferenceA to cases where B
is derived from A) or because there was some fundamental flaw with it.
Implementing it via a direct upcast (rather than queryInterface) would
fail for ambiguities resulting from MI (like C deriving from B1 and B2,
each deriving from A, and trying to convert ReferenceC to
ReferenceA), and then there's the special case of requiring explicit
queryInterface(XInterface) for UNO object equality testing, but apart
from that I cannot think of any problems off the top of my head.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svtools/source
svtools/source/misc/templatefoldercache.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 4fa553e4071a0ba4981a690429903c4e68607864
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Apr 25 13:56:00 2013 +0200
fdo#62088: Fix regression introduced by the DateTime incompatible change.
It is not good to mess with the stream operators, more so when the size of
the
data changes ;-)
Change-Id: Id02b83224496a28575f4e12196892de198793983
diff --git a/svtools/source/misc/templatefoldercache.cxx
b/svtools/source/misc/templatefoldercache.cxx
index aa2bade..c023720 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -29,6 +29,7 @@
#include ucbhelper/content.hxx
#include rtl/ref.hxx
#include salhelper/simplereferenceobject.hxx
+#include tools/time.hxx
#include tools/urlobj.hxx
#include tools/debug.hxx
#include unotools/pathoptions.hxx
@@ -57,7 +58,9 @@ namespace svt
//-
SvStream operator ( SvStream _rStorage, const util::DateTime _rDate )
{
-_rStorage _rDate.NanoSeconds;
+sal_uInt16 hundredthSeconds = static_cast sal_uInt16 (
_rDate.NanoSeconds / Time::nanoPerCenti );
+_rStorage hundredthSeconds;
+
_rStorage _rDate.Seconds;
_rStorage _rDate.Minutes;
_rStorage _rDate.Hours;
@@ -71,7 +74,10 @@ namespace svt
//-
SvStream operator ( SvStream _rStorage, util::DateTime _rDate )
{
-_rStorage _rDate.NanoSeconds;
+sal_uInt16 hundredthSeconds;
+_rStorage hundredthSeconds;
+_rDate.NanoSeconds = static_cast sal_uInt32 ( hundredthSeconds ) *
Time::nanoPerCenti;
+
_rStorage _rDate.Seconds;
_rStorage _rDate.Minutes;
_rStorage _rDate.Hours;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com jurt/com
javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 25 -
jurt/com/sun/star/comp/servicemanager/ServiceManager.java | 272 --
2 files changed, 8 insertions(+), 289 deletions(-)
New commits:
commit 57a14ea0bed679c4b120c0371ab5316faf7c883f
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 25 13:58:29 2013 +0200
Clean up Java ServiceManager bootstrapping
...and remove the unused feature of initializing it with an obsolete
XSimpleRegistry.
Change-Id: I333dae51f67c16da3e6822ba81e4b8ca125188a5
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 2087aec..989e283 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -23,11 +23,11 @@ package com.sun.star.comp.helper;
import com.sun.star.bridge.UnoUrlResolver;
import com.sun.star.bridge.XUnoUrlResolver;
import com.sun.star.comp.loader.JavaLoader;
+import com.sun.star.comp.servicemanager.ServiceManager;
import com.sun.star.container.XSet;
import com.sun.star.lang.XInitialization;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.lang.XSingleComponentFactory;
import com.sun.star.lib.util.NativeLibraryLoader;
import com.sun.star.loader.XImplementationLoader;
import com.sun.star.uno.UnoRuntime;
@@ -98,19 +98,10 @@ public class Bootstrap {
static public XComponentContext createInitialComponentContext(
HashtableString, Object context_entries )
throws Exception
{
+ServiceManager xSMgr = new ServiceManager();
+
XImplementationLoader xImpLoader = UnoRuntime.queryInterface(
XImplementationLoader.class, new JavaLoader() );
-
-// Get the factory of the ServiceManager
-XSingleComponentFactory smgr_fac = UnoRuntime.queryInterface(
-XSingleComponentFactory.class, xImpLoader.activate(
-com.sun.star.comp.servicemanager.ServiceManager, null, null,
null ) );
-
-// Create an instance of the ServiceManager
-XMultiComponentFactory xSMgr = UnoRuntime.queryInterface(
-XMultiComponentFactory.class, smgr_fac.createInstanceWithContext(
null ) );
-
-// post init loader
XInitialization xInit = UnoRuntime.queryInterface(
XInitialization.class, xImpLoader );
Object[] args = new Object [] { xSMgr };
@@ -126,16 +117,10 @@ public class Bootstrap {
// ... xxx todo: add standard entries
XComponentContext xContext = new ComponentContext( context_entries,
null );
-// post init smgr
-xInit = UnoRuntime.queryInterface(
-XInitialization.class, xSMgr );
-args = new Object [] { null, xContext }; // no registry, default
context
-xInit.initialize( args );
+xSMgr.setDefaultContext(xContext);
XSet xSet = UnoRuntime.queryInterface( XSet.class, xSMgr );
-// insert the service manager
-xSet.insert( smgr_fac );
-// and basic jurt factories
+// insert basic jurt factories
insertBasicFactories( xSet, xImpLoader );
return xContext;
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index a76120a..dd595e7 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -18,7 +18,6 @@
package com.sun.star.comp.servicemanager;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collections;
@@ -27,15 +26,11 @@ import com.sun.star.container.XEnumeration;
import com.sun.star.container.XSet;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XEventListener;
-import com.sun.star.lang.XInitialization;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XServiceInfo;
import com.sun.star.lang.XSingleComponentFactory;
import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.loader.XImplementationLoader;
-import com.sun.star.registry.XRegistryKey;
-import com.sun.star.registry.XSimpleRegistry;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
@@ -52,7 +47,6 @@ import com.sun.star.uno.XComponentContext;
* @see com.sun.star.container.XContentEnumerationAccess
* @see com.sun.star.lang.XComponent
* @see com.sun.star.lang.XServiceInfo
- * @see com.sun.star.lang.XInitialization
* @since UDK1.0
*/
public class ServiceManager implements XMultiServiceFactory,
@@ -60,8 +54,7 @@ public class ServiceManager implements XMultiServiceFactory,
XSet,
XContentEnumerationAccess,
Re: Conflict between system and internal cairo
On 25/04/13 13:39, Lubos Lunak wrote: Hello, Clang tindebox currently fails because of a race and mixup of system and internal cairo/pixman libraries. Specifically, Executable_pluginapp.bin.mk links also against gtk, which links against cairo, which links against pixman. And there is a race that results in solver containing pixman but not cairo by the time Executable_pluginapp.bin.mk is being linked. The linker command has -L for the solver lib directory, so it picks up system cairo and internal pixman, and these are apparently incompatible. ouch... Changing StaticLibrary_plugcon.mk to $(eval $(call gb_StaticLibrary_use_externals,plugcon,gtk cairo)) helps with the problem, but I assume this cannot be just hardcoded and I don't know how to do it properly? Gbuild experts? hmm... that would be an acceptable workaround (it should delay the plugcon build until cairo is fully built), clearly it needs a comment to explain it otherwise somebody will think cairo isn't used here and remove it again :) another alternative would be to not deliver the cairo libraries to the solver and link against the libs in UnpackedTarball which won't be on plugcon linker path... but that would only actually work for static libraries, dynamic ones need to be copied somewhere obviously... so this won't solve this particular problem. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 62088, which changed state. Bug 62088 Summary: Impress crashes on setting master pages https://bugs.freedesktop.org/show_bug.cgi?id=62088 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
[PATCH] Better text for Insert as Link Checkbox
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3602
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/3602/1
Better text for Insert as Link Checkbox
This Checkbox is shown in the File picker dialog and does not embed the file in
the document, if checked.
Change-Id: I84fbc182cc9b432cd38ccb044c0479ced119d97f
---
M vcl/source/src/fpicker.src
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vcl/source/src/fpicker.src b/vcl/source/src/fpicker.src
index be40726..324cffb 100644
--- a/vcl/source/src/fpicker.src
+++ b/vcl/source/src/fpicker.src
@@ -41,7 +41,7 @@
String STR_FPICKER_INSERT_AS_LINK
{
-Text [ en-US ] = ~Link ;
+Text [ en-US ] = Insert as ~Link ;
};
String STR_FPICKER_SHOW_PREVIEW
--
To view, visit https://gerrit.libreoffice.org/3602
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84fbc182cc9b432cd38ccb044c0479ced119d97f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix inconsistent names: Image instead of Picture or Graphic
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3603 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/3603/1 Fix inconsistent names: Image instead of Picture or Graphic Graphical objects were sometimes named Picture and sometimes Graphic. Image is more generic and implies both other words. Change-Id: I30ccca5dba5d65c8ee47f92fd3dfd1dcd46219b4 --- M officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu M officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu M officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu M officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu M officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu M officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu M officecfg/registry/schema/org/openoffice/Office/Writer.xcs M officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs M officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs M svx/inc/globlmn_tmpl.hrc M svx/source/core/graphichelper.src M sw/source/core/undo/undo.src M sw/source/ui/app/mn.src M sw/source/ui/config/optload.src M sw/source/ui/frmdlg/frmpage.src M sw/source/ui/shells/shells.src M sw/source/ui/utlui/poolfmt.src 17 files changed, 62 insertions(+), 62 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 925d513..394ecfb 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1840,7 +1840,7 @@ /node node oor:name=.uno:GrafAttrCrop oor:op=replace prop oor:name=Label oor:type=xs:string -value xml:lang=en-USCrop Picture.../value +value xml:lang=en-USCrop Image.../value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -1848,7 +1848,7 @@ /node node oor:name=.uno:Crop oor:op=replace prop oor:name=Label oor:type=xs:string -value xml:lang=en-USCrop Picture/value +value xml:lang=en-USCrop Image/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -5292,7 +5292,7 @@ /node node oor:name=.uno:GraphicMenu oor:op=replace prop oor:name=Label oor:type=xs:string -value xml:lang=en-USPict~ure/value +value xml:lang=en-US~Image/value /prop /node node oor:name=.uno:WindowList oor:op=replace diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 2fc7502..33099ad 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -875,10 +875,10 @@ /node node oor:name=.uno:GraphicDialog oor:op=replace prop oor:name=Label oor:type=xs:string -value xml:lang=en-USPicture.../value +value xml:lang=en-USImage.../value /prop prop oor:name=ContextLabel oor:type=xs:string -value xml:lang=en-USPict~ure.../value +value xml:lang=en-US~Image.../value /prop /node node oor:name=.uno:TableDialog oor:op=replace @@ -1838,7 +1838,7 @@ /node node oor:name=.uno:MirrorGraphicOnEvenPages oor:op=replace prop oor:name=Label oor:type=xs:string -value xml:lang=en-USFlip Graphics on Even Pages/value +value xml:lang=en-USFlip Images on Even Pages/value /prop /node node oor:name=.uno:SplitTable oor:op=replace @@ -2055,7 +2055,7 @@ /node node oor:name=.uno:Graphic oor:op=replace prop oor:name=Label oor:type=xs:string -value xml:lang=en-USGraphics On/Off/value +value xml:lang=en-USImages On/Off/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -2294,7 +2294,7 @@ /node node oor:name=.uno:SaveGraphic oor:op=replace prop oor:name=Label oor:type=xs:string -value xml:lang=en-USSave Graphics.../value +value xml:lang=en-USSave Image.../value /prop /node node oor:name=.uno:ContinueNumbering oor:op=replace diff --git
[PATCH] Better wording for Impress Start from first/current Slide
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3604 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/3604/1 Better wording for Impress Start from first/current Slide The menu is now: Slide Show Start from first Slide Start from current Slide ... instead of: Slide Show Slide Show Slide Show From This Slide ... I also changed the recently introduced function name/uno command for Start from current Slide. This should make no trouble, since this function has not seen a release so far. Change-Id: I248c9d63ec28071b2887f89912aa90fa1e4afcb5 --- M officecfg/registry/data/org/openoffice/Office/Accelerators.xcu M officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu M sd/inc/sdcommands.h M sd/sdi/SlideSorterController.sdi M sd/sdi/sdraw.sdi M sd/source/ui/slidesorter/controller/SlsSlotManager.cxx M sd/source/ui/view/drviewse.cxx M sd/source/ui/view/outlnvs2.cxx M sd/uiconfig/simpress/menubar/menubar.xml M svx/inc/svx/svxids.hrc 10 files changed, 12 insertions(+), 18 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 6cf3ae3..afb17b0 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -2234,7 +2234,7 @@ /node node oor:name=F5_SHIFT oor:op=replace prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value - value xml:lang=en-US.uno:PresentationThisSlide/value + value xml:lang=en-US.uno:PresentationCurrentSlide/value /prop /node node oor:name=F5_SHIFT_MOD2 oor:op=replace diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 9efa408..d31e6a4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -31,15 +31,15 @@ /node node oor:name=.uno:Presentation oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-US~Slide Show/value + value xml:lang=en-USStart from ~first Slide/value /prop prop oor:name=Properties oor:type=xs:int value1/value /prop /node - node oor:name=.uno:PresentationThisSlide oor:op=replace + node oor:name=.uno:PresentationCurrentSlide oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USSl~ide Show From This Slide/value + value xml:lang=en-USStart from c~urrent Slide/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -1534,11 +1534,6 @@ value xml:lang=en-US~Slide Show/value /prop /node - !--node oor:name=.uno:ReviewMenu oor:op=replace -prop oor:name=Label oor:type=xs:string - value xml:lang=en-US~Review/value -/prop - /node-- node oor:name=.uno:GroupMenu oor:op=replace prop oor:name=Label oor:type=xs:string value xml:lang=en-US~Group/value diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h index f64e686..abd03ce 100644 --- a/sd/inc/sdcommands.h +++ b/sd/inc/sdcommands.h @@ -94,7 +94,7 @@ #define CMD_SID_OUTLINE_TEXT_AUTOFIT.uno.OutlineTextAutofit #define CMD_SID_PAGESETUP .uno:PageSetup #define CMD_SID_PRESENTATION.uno:Presentation -#define CMD_SID_PRESENTATION_THIS_SLIDE .uno:PresentationThisSlide +#define CMD_SID_PRESENTATION_CURRENT_SLIDE .uno:PresentationCurrentSlide #define CMD_SID_REMOTE_DLG .uno:Remote #define CMD_SID_PRESENTATION_LAYOUT .uno:PresentationLayout #define CMD_SID_RENAMELAYER .uno:RenameLayer diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi index 5b717d1..36ddbd8 100644 --- a/sd/sdi/SlideSorterController.sdi +++ b/sd/sdi/SlideSorterController.sdi @@ -136,7 +136,7 @@ ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] -SID_PRESENTATION_THIS_SLIDE // ole : no, status : ? +SID_PRESENTATION_CURRENT_SLIDE // ole : no, status : ? [ ExecMethod = FuTemporary ; StateMethod = GetMenuState ; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 5e913a2..60c22ff 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -5196,7 +5196,7 @@ ] //-- -SfxVoidItem PresentationThisSlide SID_PRESENTATION_THIS_SLIDE +SfxVoidItem PresentationCurrentSlide SID_PRESENTATION_CURRENT_SLIDE () [ /* flags: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/drawingml/chart/axisconverter.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 976a85dc20b0f274d0f51e9eb83e08b4763bdd2a
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Apr 25 17:37:32 2013 +0530
n#813291: [PPTX] Axis Labels with percentage.
Added the check only in the Axis Labels import.
Maybe this check can be moved to convertNumberFormat()
diff --git a/oox/source/drawingml/chart/axisconverter.cxx
b/oox/source/drawingml/chart/axisconverter.cxx
index bf4b4f8..bade987 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -305,9 +305,13 @@ void AxisConverter::convertFromModel( const Reference
XCoordinateSystem rxCo
if( (aScaleData.AxisType == cssc2::AxisType::REALNUMBER) ||
(aScaleData.AxisType == cssc2::AxisType::PERCENT) )
{
+bool bPercent = false;
if( mrModel.maNumberFormat.maFormatCode.indexOf('%') = 0)
+{
mrModel.maNumberFormat.mbSourceLinked = false;
-getFormatter().convertNumberFormat( aAxisProp,
mrModel.maNumberFormat );
+bPercent = true;
+}
+getFormatter().convertNumberFormat( aAxisProp,
mrModel.maNumberFormat, bPercent );
}
// position of crossing axis --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Hang/crash in templates
On Thu, Apr 25, 2013 at 01:29:00PM +0200, Miklos Vajna wrote:
On Thu, Apr 25, 2013 at 01:08:47PM +0200, Lionel Elie Mamane
lio...@mamane.lu wrote:
If you can point valgrind/gdb it yourself and point me towards the
place / stacktrace that allocates a lot, I can look at that place
and see if I get inspiration (before my build finishes).
On the other hand, for now I would just change back the cache format.
Does that make sense?
I don't know what cache you are talking about. If some binary (as
opposed to XML) format got changed incompatibly, then yes, this is
bad.
I mean if you are OK with pushing
http://cgit.freedesktop.org/~vmiklos/lo-core/commit/?id=83544b27f3dcfb132b3eb46d387f62ebc9c3e160
to master.
To stay backwards-compatible in *values* (and not only in length of
fields in binary format), you will need:
#include tools/time.hxx
SvStream operator ( SvStream _rStorage, const util::DateTime_rDate )
{
_rStorage sal_uInt16(_rDate.NanoSeconds / ::Time::nanoPerCenti); //
sal_uInt32 - sal_uInt16
and
SvStream operator ( SvStream _rStorage, util::DateTime _rDate )
{
(...)
_rDate.NanoSeconds = nTmp * ::Time::nanoPerCenti
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Samuel M. s.mehrbr...@gmail.com changed: What|Removed |Added CC||s.mehrbr...@gmail.com Depends on||63840 --- Comment #14 from Samuel M. s.mehrbr...@gmail.com --- I add Bug 63840 because it makes LibreOffice unusable for Unity users. -- 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
Re: Hang/crash in templates
On 25/04/13 13:29, Miklos Vajna wrote: TemplateContent::TemplateContent gets an INetURLObject, and the next assert fails, as GetProtocol() is INET_PROT_NOT_VALID. If you step up the backtrace in gdb, you see that the URL was ~memory garbage. On the other hand, for now I would just change back the cache format. Does that make sense? I mean if you are OK with pushing http://cgit.freedesktop.org/~vmiklos/lo-core/commit/?id=83544b27f3dcfb132b3eb46d387f62ebc9c3e160 to master. And then this can be still discussed (if it's OK to change this format or not, if hundred/nano seconds matter for templates or not, etc) without being in a hurry. argh... there is a binary format template cache in the user profile? what would happen if the incompatibly changed format loading code were deployed to users with a pre-existing cache in the old format? ceterum censeo formatos binarios delendam sunt. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impimagetree.cxx | 23 ++-
1 file changed, 6 insertions(+), 17 deletions(-)
New commits:
commit 53b8d25caa1e000eeca27f3ca4f92d9cda83c652
Author: Eike Rathke er...@redhat.com
Date: Thu Apr 25 14:22:45 2013 +0200
use LanguageTag fallback
Change-Id: I34c532dc7d1c71724a5c0e29c113f2d6510cc2d7
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 29f3e7a..d7c50d9 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -235,23 +235,12 @@ bool ImplImageTree::doLoadImage(
if (localized) {
sal_Int32 pos = name.lastIndexOf('/');
if (pos != -1) {
-/* FIXME-BCP47: this needs to be changed for language tags! */
-css::lang::Locale const loc =
-Application::GetSettings().GetUILanguageTag().getLocale();
-paths.push_back(createPath(name, pos, loc.Language));
-if (!loc.Country.isEmpty()) {
-OUStringBuffer b(loc.Language);
-b.append(sal_Unicode('-'));
-b.append(loc.Country);
-OUString p(createPath(name, pos, b.makeStringAndClear()));
-paths.push_back(p);
-if (!loc.Variant.isEmpty()) {
-b.append(p);
-b.append(sal_Unicode('-'));
-b.append(loc.Variant);
-paths.push_back(
-createPath(name, pos, b.makeStringAndClear()));
-}
+// find() uses a reverse iterator, so push in reverse order.
+std::vector OUString aFallbacks(
Application::GetSettings().GetUILanguageTag().getFallbackStrings());
+for (std::vector OUString ::const_reverse_iterator it(
aFallbacks.rbegin());
+it != aFallbacks.rend(); ++it)
+{
+paths.push_back(createPath(name, pos, *it));
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Hang/crash in templates
On Thu, Apr 25, 2013 at 02:14:18PM +0200, Lionel Elie Mamane lio...@mamane.lu wrote: I don't know what cache you are talking about. If some binary (as opposed to XML) format got changed incompatibly, then yes, this is bad. Judging from the strings in the memory garbage I saw in gdb, this is used in ~/.config/libreoffice/4/user/store/.templdir.cache. And yes, sadly it's a binary format. I did not check if some the containing structure has any versioning -- if yes, then bumping the version and adapting the reading side to handle the new format can be possible. To stay backwards-compatible in *values* (and not only in length of fields in binary format), you will need: Oh, indeed. Kendy in the meantime fixed this with http://cgit.freedesktop.org/libreoffice/core/commit/?id=4fa553e4071a0ba4981a690429903c4e68607864 signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Belts and braces for crash in null pointer dereference
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3605
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/3605/1
Belts and braces for crash in null pointer dereference
Change-Id: I17fa205f16929b913084c8eee320a73416b1eda0
(cherry picked from commit d34a159010fc24e13613058d25a9d6b56f7855bd)
---
M sw/source/core/unocore/unotext.cxx
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 004e7af..77b44f4 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1626,7 +1626,8 @@
SwTableNode * pStartTableNode(pStartStartNode-FindTableNode());
// Is it the same table start node than the end?
SwTableNode *const
pEndStartTableNode(pEndStartNode-FindTableNode());
-while (pEndStartTableNode-GetIndex()
pStartTableNode-GetIndex())
+while (pEndStartTableNode pStartTableNode
+ pEndStartTableNode-GetIndex()
pStartTableNode-GetIndex())
{
SwStartNode* pStartStartTableNode =
pStartTableNode-StartOfSectionNode();
pStartTableNode = pStartStartTableNode-FindTableNode();
--
To view, visit https://gerrit.libreoffice.org/3605
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17fa205f16929b913084c8eee320a73416b1eda0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/DocumentToGraphicRenderer.hxx| 17 ++---
include/svtools/GraphicExportOptionsDialog.hxx | 10 ++
svtools/source/filter/GraphicExportOptionsDialog.cxx |4
3 files changed, 12 insertions(+), 19 deletions(-)
New commits:
commit 19a1d2383d343375b3c4b4ab1845df6435679bd6
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 25 14:32:28 2013 +0200
PCH quickfix
Change-Id: I457288d881ba74db2127e8543b0de70b6498002d
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx
b/include/svtools/DocumentToGraphicRenderer.hxx
index 3033e64..2120ea4 100644
--- a/include/svtools/DocumentToGraphicRenderer.hxx
+++ b/include/svtools/DocumentToGraphicRenderer.hxx
@@ -30,22 +30,17 @@
#include svtools/svtdllapi.h
-using namespace css;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::beans;
-
class SVT_DLLPUBLIC DocumentToGraphicRenderer
{
-const ReferenceXComponent mxDocument;
+const css::uno::Referencecss::lang::XComponent mxDocument;
-Referenceframe::XModelmxModel;
-Referenceframe::XController mxController;
-Referenceview::XRenderablemxRenderable;
-Referenceawt::XToolkitmxToolkit;
+css::uno::Referencecss::frame::XModelmxModel;
+css::uno::Referencecss::frame::XController mxController;
+css::uno::Referencecss::view::XRenderablemxRenderable;
+css::uno::Referencecss::awt::XToolkitmxToolkit;
public:
-DocumentToGraphicRenderer(const ReferenceXComponent xDocument);
+DocumentToGraphicRenderer(const
css::uno::Referencecss::lang::XComponent xDocument);
~DocumentToGraphicRenderer();
sal_Int32 getCurrentPageWriter( );
diff --git a/include/svtools/GraphicExportOptionsDialog.hxx
b/include/svtools/GraphicExportOptionsDialog.hxx
index b346f8c..9f3784f 100644
--- a/include/svtools/GraphicExportOptionsDialog.hxx
+++ b/include/svtools/GraphicExportOptionsDialog.hxx
@@ -34,12 +34,6 @@
#include svtools/svtdllapi.h
-using namespace css;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::frame;
-using namespace css::beans;
-
class SVT_DLLPUBLIC GraphicExportOptionsDialog : public ModalDialog
{
private:
@@ -67,10 +61,10 @@ private:
DECL_LINK( resolutionModifiedHandle,void* );
public:
-GraphicExportOptionsDialog( Window* pWindow, const ReferenceXComponent
rxSourceDocument );
+GraphicExportOptionsDialog( Window* pWindow, const
css::uno::Referencecss::lang::XComponent rxSourceDocument );
~GraphicExportOptionsDialog();
-SequencePropertyValue getFilterData();
+css::uno::Sequencecss::beans::PropertyValue getFilterData();
};
#endif
diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx
b/svtools/source/filter/GraphicExportOptionsDialog.cxx
index 0c542d9..ac9358f 100644
--- a/svtools/source/filter/GraphicExportOptionsDialog.cxx
+++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx
@@ -19,6 +19,10 @@
#include GraphicExportOptionsDialog.hxx
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::uno;
+
GraphicExportOptionsDialog::GraphicExportOptionsDialog(Window* pWindow, const
ReferenceXComponent rxSourceDocument) :
ModalDialog(pWindow, GraphicExporter,
svt/ui/GraphicExportOptionsDialog.ui),
mResolution(96.0),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Compilation fails with --enable-pch after global header move
On 04/25/2013 11:36 AM, Thomas Arnhold wrote: On 25.04.2013 09:35, Stephan Bergmann wrote: git grep -Fw using include/ | grep -Fw beans reveals that some headers dare pollute the global namespace with inappropriate using directives. /All/ those using directives (not just the ones injecting com::sun::star::uno::beans) apparently need to be cleaned up. I'll fix it. Had to push 19a1d2383d343375b3c4b4ab1845df6435679bd6 as a quick fix for the immediate problem, now that I ran into it myself. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 6 commits - offapi/com offapi/UnoApi_offapi.mk sd/inc sd/source
offapi/UnoApi_offapi.mk |6 +
offapi/com/sun/star/animations/AnimateColor.idl | 38 +++
offapi/com/sun/star/animations/AnimateMotion.idl| 38 +++
offapi/com/sun/star/animations/AnimateSet.idl | 38 +++
offapi/com/sun/star/animations/Audio.idl| 38 +++
offapi/com/sun/star/animations/Command.idl | 38 +++
offapi/com/sun/star/animations/IterateContainer.idl | 38 +++
sd/inc/CustomAnimationEffect.hxx|2
sd/source/core/CustomAnimationEffect.cxx| 107
sd/source/filter/ppt/pptinanimations.cxx| 21 +--
sd/source/filter/xml/sdxmlwrp.cxx | 37 ++
sd/source/ui/framework/module/ModuleController.cxx | 57 +-
sd/source/ui/slideshow/slideshowviewimpl.cxx|3
13 files changed, 328 insertions(+), 133 deletions(-)
New commits:
commit 3286827b38ce6f6aff2da123e9f246ad923932cd
Author: Noel Grandin n...@peralex.com
Date: Thu Apr 25 14:43:24 2013 +0200
fdo#46808, Convert some XMultiServiceFactory to XComponentContext
Change-Id: I1dcfee9fa0fdc4457754396ffb52cc8462f3906a
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index da337cd..8b64065 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -350,8 +350,6 @@ protected:
void notify_listeners();
-::com::sun::star::uno::Reference
::com::sun::star::animations::XTimeContainer createParallelTimeContainer()
const;
-
void updateTextGroups();
protected:
diff --git a/sd/source/core/CustomAnimationEffect.cxx
b/sd/source/core/CustomAnimationEffect.cxx
index 8d2a7bd..21a098f 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -1886,7 +1886,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append(
const SdrPathObj rPathOb
try
{
-Reference XTimeContainer xEffectContainer(
createParallelTimeContainer() );
+Reference XTimeContainer xEffectContainer(
ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ),
UNO_QUERY_THROW );
Reference XAnimationNode xAnimateMotion( AnimateMotion::create(
::comphelper::getProcessComponentContext() ) );
xAnimateMotion-setDuration( Any( fDuration ) );
@@ -2013,7 +2013,7 @@ void EffectSequenceHelper::implRebuild()
do
{
// create a par container for the next click node and all
following with and after effects
-Reference XTimeContainer xOnClickContainer(
createParallelTimeContainer() );
+Reference XTimeContainer xOnClickContainer(
ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ),
UNO_QUERY_THROW );
Event aEvent;
if( mxEventSource.is() )
@@ -2047,7 +2047,7 @@ void EffectSequenceHelper::implRebuild()
do
{
// create a par container for the current click or after
effect node and all following with effects
-Reference XTimeContainer xWithContainer(
createParallelTimeContainer() );
+Reference XTimeContainer xWithContainer(
ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ),
UNO_QUERY_THROW );
Reference XAnimationNode xWithContainerNode(
xWithContainer, UNO_QUERY_THROW );
xWithContainer-setBegin( makeAny( fBegin ) );
xOnClickContainer-appendChild( xWithContainerNode );
@@ -2105,14 +2105,6 @@ void EffectSequenceHelper::implRebuild()
//
-Reference XTimeContainer
EffectSequenceHelper::createParallelTimeContainer() const
-{
-const OUString aServiceName(
com.sun.star.animations.ParallelTimeContainer );
-return Reference XTimeContainer (
::comphelper::getProcessServiceFactory()-createInstance(aServiceName),
UNO_QUERY );
-}
-
-//
-
stl_CustomAnimationEffect_search_node_predict::stl_CustomAnimationEffect_search_node_predict(
const ::com::sun::star::uno::Reference
::com::sun::star::animations::XAnimationNode xSearchNode )
: mxSearchNode( xSearchNode )
{
@@ -2174,7 +2166,7 @@ void stl_process_after_effect_node_func(AfterEffectNode
rNode)
}
else // nextClick
{
-Reference XMultiServiceFactory xMsf(
::comphelper::getProcessServiceFactory() );
+Reference XComponentContext xContext(
::comphelper::getProcessComponentContext() );
// insert the aftereffect in the next group
Reference XTimeContainer xClickContainer(
xContainer-getParent(), UNO_QUERY_THROW );
@@ -2199,15 +2191,11 @@ void
stl_process_after_effect_node_func(AfterEffectNode
[Libreoffice-commits] core.git: include/vcl
include/vcl/controllayout.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5ad80806d6c53a16868d80ae167d9f91f0cda629 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Apr 25 15:45:26 2013 +0300 De-ambiguify 'Pair' Change-Id: I84c73b07d8a4a6950cde98898754168720952934 diff --git a/include/vcl/controllayout.hxx b/include/vcl/controllayout.hxx index 5d1d133..b337ec7 100644 --- a/include/vcl/controllayout.hxx +++ b/include/vcl/controllayout.hxx @@ -55,7 +55,7 @@ struct VCL_DLLPUBLIC ControlLayoutData long GetLineCount() const; // returns the interval [start,end] of line nLine // returns [-1,-1] for an invalid line -Pair GetLineStartEnd( long nLine ) const; +::Pair GetLineStartEnd( long nLine ) const; /** ToRelativeLineIndex changes a layout data index to a count relative to its line. pThis is equivalent to getting the line start/end pairs with ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fdo#42939 - write svg line widths for META_POLYLINE_ACTION.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3606
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/3606/1
fdo#42939 - write svg line widths for META_POLYLINE_ACTION.
Change-Id: Ib282a3db6ecb5c7d1d4117e1bb48920ee7b2f562
---
M filter/source/svg/svgwriter.cxx
M filter/source/svg/svgwriter.hxx
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 2f269ba..ae2372c 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2186,7 +2186,16 @@
}
}
-//
-
+void SVGActionWriter::ImplAddLineAttr( const LineInfo rAttrs,
+ sal_Bool bApplyMapping )
+{
+if ( !rAttrs.IsDefault() )
+{
+sal_Int32 nStrokeWidth = bApplyMapping ? ImplMap( rAttrs.GetWidth() )
: rAttrs.GetWidth();
+mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
+ OUString::valueOf( nStrokeWidth ) );
+}
+}
void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon rPolyPoly,
sal_Bool bLineOnly,
sal_Bool bApplyMapping )
@@ -3172,6 +3181,7 @@
if( rPoly.GetSize() )
{
mpContext-AddPaintAttr( mpVDev-GetLineColor(),
Color( COL_TRANSPARENT ) );
+ImplAddLineAttr( pA-GetLineInfo() );
ImplWritePolyPolygon( rPoly, sal_True );
}
}
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index ebffda9..0e2d7a5 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -364,6 +364,8 @@
voidImplWriteEllipse( const Point rCenter, long
nRadX, long nRadY,
sal_Bool bApplyMapping =
sal_True );
voidImplWritePattern( const PolyPolygon rPolyPoly,
const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags );
+voidImplAddLineAttr( const LineInfo rAttrs,
+ sal_Bool bApplyMapping = sal_True
);
voidImplWritePolyPolygon( const PolyPolygon
rPolyPoly, sal_Bool bLineOnly,
sal_Bool bApplyMapping =
sal_True );
voidImplWriteShape( const SVGShapeDescriptor rShape,
sal_Bool bApplyMapping = sal_True );
--
To view, visit https://gerrit.libreoffice.org/3606
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib282a3db6ecb5c7d1d4117e1bb48920ee7b2f562
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Meeks michael.me...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#62834 - svg export: close stray trailing tspans if we ha...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3607 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/3607/1 fdo#62834 - svg export: close stray trailing tspans if we have them. Change-Id: Ifc539e3229edd14b7291ee66bf3523cbdbedf2ef --- M filter/source/svg/svgwriter.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index ae2372c..b8fc596 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -3904,6 +3904,7 @@ mapCurShape.reset(); ImplWriteActions( rMtf, nWriteFlags, pElementId, pXShape, pTextEmbeddedBitmapMtf ); +maTextWriter.endTextParagraph(); // draw open shape that doesn't have a border if( mapCurShape.get() ) -- To view, visit https://gerrit.libreoffice.org/3607 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc539e3229edd14b7291ee66bf3523cbdbedf2ef Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - filter/source
filter/source/svg/svgwriter.cxx | 12 +++-
filter/source/svg/svgwriter.hxx |2 ++
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit b2d1cd9873995b93577273ad8b3fb7fd4230ced9
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 25 20:44:59 2013 +
fdo#42939 - write svg line widths for META_POLYLINE_ACTION.
Change-Id: Ib282a3db6ecb5c7d1d4117e1bb48920ee7b2f562
Reviewed-on: https://gerrit.libreoffice.org/3606
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 2f269ba..ae2372c 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2186,7 +2186,16 @@ void SVGActionWriter::ImplWriteEllipse( const Point
rCenter, long nRadX, long n
}
}
-//
-
+void SVGActionWriter::ImplAddLineAttr( const LineInfo rAttrs,
+ sal_Bool bApplyMapping )
+{
+if ( !rAttrs.IsDefault() )
+{
+sal_Int32 nStrokeWidth = bApplyMapping ? ImplMap( rAttrs.GetWidth() )
: rAttrs.GetWidth();
+mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
+ OUString::valueOf( nStrokeWidth ) );
+}
+}
void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon rPolyPoly,
sal_Bool bLineOnly,
sal_Bool bApplyMapping )
@@ -3172,6 +3181,7 @@ void SVGActionWriter::ImplWriteActions( const
GDIMetaFile rMtf,
if( rPoly.GetSize() )
{
mpContext-AddPaintAttr( mpVDev-GetLineColor(),
Color( COL_TRANSPARENT ) );
+ImplAddLineAttr( pA-GetLineInfo() );
ImplWritePolyPolygon( rPoly, sal_True );
}
}
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index ebffda9..0e2d7a5 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -364,6 +364,8 @@ private:
voidImplWriteEllipse( const Point rCenter, long
nRadX, long nRadY,
sal_Bool bApplyMapping =
sal_True );
voidImplWritePattern( const PolyPolygon rPolyPoly,
const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags );
+voidImplAddLineAttr( const LineInfo rAttrs,
+ sal_Bool bApplyMapping = sal_True
);
voidImplWritePolyPolygon( const PolyPolygon
rPolyPoly, sal_Bool bLineOnly,
sal_Bool bApplyMapping =
sal_True );
voidImplWriteShape( const SVGShapeDescriptor rShape,
sal_Bool bApplyMapping = sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - filter/source
filter/source/svg/svgwriter.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f98d8baa449d922e4cc5bcee97c9ee1733b0f65d Author: Michael Meeks michael.me...@suse.com Date: Wed Mar 27 19:33:56 2013 + fdo#62834 - svg export: close stray trailing tspans if we have them. Change-Id: Ifc539e3229edd14b7291ee66bf3523cbdbedf2ef Reviewed-on: https://gerrit.libreoffice.org/3607 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index ae2372c..b8fc596 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -3904,6 +3904,7 @@ void SVGActionWriter::WriteMetaFile( const Point rPos100thmm, mapCurShape.reset(); ImplWriteActions( rMtf, nWriteFlags, pElementId, pXShape, pTextEmbeddedBitmapMtf ); +maTextWriter.endTextParagraph(); // draw open shape that doesn't have a border if( mapCurShape.get() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - filter/source
filter/source/svg/svgwriter.cxx | 13 -
filter/source/svg/svgwriter.hxx |2 ++
2 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 90469529681c3217dab900c8983f717fb557fc5e
Author: Michael Meeks michael.me...@suse.com
Date: Wed Mar 27 19:33:56 2013 +
fdo#62834 - svg export: close stray trailing tspans if we have them.
Change-Id: Ifc539e3229edd14b7291ee66bf3523cbdbedf2ef
Reviewed-on: https://gerrit.libreoffice.org/3607
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ae2372c..b8fc596 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -3904,6 +3904,7 @@ void SVGActionWriter::WriteMetaFile( const Point
rPos100thmm,
mapCurShape.reset();
ImplWriteActions( rMtf, nWriteFlags, pElementId, pXShape,
pTextEmbeddedBitmapMtf );
+maTextWriter.endTextParagraph();
// draw open shape that doesn't have a border
if( mapCurShape.get() )
commit d90e03478ab6cbdf2073dd6a646dfacfc76b3c14
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 25 20:44:59 2013 +
fdo#42939 - write svg line widths for META_POLYLINE_ACTION.
Change-Id: Ib282a3db6ecb5c7d1d4117e1bb48920ee7b2f562
Reviewed-on: https://gerrit.libreoffice.org/3606
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 2f269ba..ae2372c 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2186,7 +2186,16 @@ void SVGActionWriter::ImplWriteEllipse( const Point
rCenter, long nRadX, long n
}
}
-//
-
+void SVGActionWriter::ImplAddLineAttr( const LineInfo rAttrs,
+ sal_Bool bApplyMapping )
+{
+if ( !rAttrs.IsDefault() )
+{
+sal_Int32 nStrokeWidth = bApplyMapping ? ImplMap( rAttrs.GetWidth() )
: rAttrs.GetWidth();
+mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
+ OUString::valueOf( nStrokeWidth ) );
+}
+}
void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon rPolyPoly,
sal_Bool bLineOnly,
sal_Bool bApplyMapping )
@@ -3172,6 +3181,7 @@ void SVGActionWriter::ImplWriteActions( const
GDIMetaFile rMtf,
if( rPoly.GetSize() )
{
mpContext-AddPaintAttr( mpVDev-GetLineColor(),
Color( COL_TRANSPARENT ) );
+ImplAddLineAttr( pA-GetLineInfo() );
ImplWritePolyPolygon( rPoly, sal_True );
}
}
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index ebffda9..0e2d7a5 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -364,6 +364,8 @@ private:
voidImplWriteEllipse( const Point rCenter, long
nRadX, long nRadY,
sal_Bool bApplyMapping =
sal_True );
voidImplWritePattern( const PolyPolygon rPolyPoly,
const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags );
+voidImplAddLineAttr( const LineInfo rAttrs,
+ sal_Bool bApplyMapping = sal_True
);
voidImplWritePolyPolygon( const PolyPolygon
rPolyPoly, sal_Bool bLineOnly,
sal_Bool bApplyMapping =
sal_True );
voidImplWriteShape( const SVGShapeDescriptor rShape,
sal_Bool bApplyMapping = sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/unocore/unotext.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7bd7e75d6914573289656ea544f8928097614b14
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Apr 25 12:17:17 2013 +0200
Belts and braces for crash in null pointer dereference
Change-Id: I17fa205f16929b913084c8eee320a73416b1eda0
(cherry picked from commit d34a159010fc24e13613058d25a9d6b56f7855bd)
Reviewed-on: https://gerrit.libreoffice.org/3605
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 004e7af..77b44f4 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1626,7 +1626,8 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
SwTableNode * pStartTableNode(pStartStartNode-FindTableNode());
// Is it the same table start node than the end?
SwTableNode *const
pEndStartTableNode(pEndStartNode-FindTableNode());
-while (pEndStartTableNode-GetIndex()
pStartTableNode-GetIndex())
+while (pEndStartTableNode pStartTableNode
+ pEndStartTableNode-GetIndex()
pStartTableNode-GetIndex())
{
SwStartNode* pStartStartTableNode =
pStartTableNode-StartOfSectionNode();
pStartTableNode = pStartStartTableNode-FindTableNode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#42939 - write svg line widths for META_POLYLINE_ACTION.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3606 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3606 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib282a3db6ecb5c7d1d4117e1bb48920ee7b2f562 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#62834 - svg export: close stray trailing tspans if we ha...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3607 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3607 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc539e3229edd14b7291ee66bf3523cbdbedf2ef Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Belts and braces for crash in null pointer dereference
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3605 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3605 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17fa205f16929b913084c8eee320a73416b1eda0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 42939, which changed state. Bug 42939 Summary: SVG Export ignores line width https://bugs.freedesktop.org/show_bug.cgi?id=42939 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: vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit b1fc17ea25a6c6b0e451d6a1fd420a32ec0369e6
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 25 14:04:56 2013 +0100
Resolves: fdo#63802 return true if we have known empty context
i.e. false for we can't provide context, and true for
we can provide context, even if there isn't any
Still looks to me that there's a bug in the si-phonetic-dynamic
im (or something in the stack) that assumes that returning
false once means it will always return false and give up
for ever
fix indent while I'm at it
Change-Id: I6df7f2689101250c33318db1fac5ec1b3e340566
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index c659939..3202e5e 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -4177,13 +4177,11 @@ gboolean
GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
{
sal_uInt32 nPosition = xText-getCaretPosition();
OUString sAllText = xText-getText();
-if (sAllText.isEmpty())
-return sal_False;
-OString sUTF = OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
-OUString sCursorText(sAllText.copy(0, nPosition));
-gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(),
-OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
-return sal_True;
+OString sUTF = OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
+OUString sCursorText(sAllText.copy(0, nPosition));
+gtk_im_context_set_surrounding(pContext, sUTF.getStr(),
sUTF.getLength(),
+OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
+return sal_True;
}
return sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 4 commits - sal/osl svx/source xmloff/source
sal/osl/w32/dllentry.c | 19 ---
sal/osl/w32/interlck.c | 101
svx/source/svdraw/svdobj.cxx|1
xmloff/source/core/xmltoken.cxx | 26 ++
4 files changed, 16 insertions(+), 131 deletions(-)
New commits:
commit 31fb9b273bd9255dc5ff78d856e717751e4d3e92
Author: Michael Stahl mst...@redhat.com
Date: Mon Apr 22 15:17:59 2013 +0200
xmloff::token::GetXMLToken: only execute the check once
Tor says this check eats many CPU cycles, and the checked array is
static, so checking it just once is sufficient.
Change-Id: Ic8f85ebe940e4cf2c258cc778a8fd14512bdef94
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 4256732..9ada1b7 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3175,17 +3175,23 @@ namespace xmloff { namespace token {
const OUString GetXMLToken( enum XMLTokenEnum eToken )
{
#if OSL_DEBUG_LEVEL 0
-// check the consistency of the token list. Below, we use the ordinal
value of
-// the token as index into the token list, so we should make sure that
every
-// entry is at the proper position
-const XMLTokenEntry* pEntry = aTokenList;
-const XMLTokenEntry* pEntryEnd = pEntry + sizeof ( aTokenList ) /
sizeof ( XMLTokenEntry );
-sal_uInt16 nPos = 0;
-while ( pEntry pEntryEnd )
+static bool s_bChecked = false;
+if (!s_bChecked)
{
-assert(nPos == static_castsal_uInt16(pEntry-eToken));
-// xmloff::GetXMLToken: inconsistency in the token list!
-++pEntry, ++nPos;
+// check the consistency of the token list. Below, we use the
+// ordinal value of the token as index into the token list, so we
+// should make sure that every entry is at the proper position
+const XMLTokenEntry* pEntry = aTokenList;
+const XMLTokenEntry* pEntryEnd =
+pEntry + SAL_N_ELEMENTS(aTokenList);
+sal_uInt16 nPos = 0;
+while (pEntry pEntryEnd)
+{
+assert(nPos == static_castsal_uInt16(pEntry-eToken));
+// xmloff::GetXMLToken: inconsistency in the token list!
+++pEntry, ++nPos;
+}
+s_bChecked = true; // it's all static, checking once is enough
}
#endif
DBG_ASSERT( eToken XML_TOKEN_INVALID, token value too low! );
commit 3acaa6748d569acfd69b8f2ac22d35d168861c11
Author: Michael Stahl mst...@redhat.com
Date: Mon Apr 22 15:13:40 2013 +0200
xmloff::token::GetXMLToken: deploy assert in consistency check
There will be serious problems if that is inconsistent.
Change-Id: I41b8de66132224fb5cd2a6dcb7ff3128eb704016
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 5c80146..4256732 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3183,8 +3183,8 @@ namespace xmloff { namespace token {
sal_uInt16 nPos = 0;
while ( pEntry pEntryEnd )
{
-OSL_ENSURE( nPos == (sal_uInt16)(pEntry-eToken),
-xmloff::GetXMLToken: inconsistency in the token list! );
+assert(nPos == static_castsal_uInt16(pEntry-eToken));
+// xmloff::GetXMLToken: inconsistency in the token list!
++pEntry, ++nPos;
}
#endif
commit 39f549573f4de90b0005c2a59b45ff198afe3d62
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Apr 23 10:39:27 2013 +0300
Use InterlockedIncrement() and InterlockedDecrement() unconditionally
Much simpler.
Cherry-picked from commit 0a21cce0c90a639918d8e58ac5daa4b8f674666f and
modified slightly to apply.
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index 90b7eb2..5890ed7 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -77,11 +77,6 @@ extern BOOL (WINAPI *_pRawDllMain)(HANDLE, DWORD, LPVOID) =
_RawDllMain;
#endif
-//--
-// DllMain
-//--
-int osl_isSingleCPU = 0;
-
#ifdef __MINGW32__
void
@@ -158,20 +153,6 @@ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD
fdwReason, LPVOID lpvR
{
#endif
-SYSTEM_INFO SystemInfo;
-
-GetSystemInfo(SystemInfo);
-
-/* Determine if we are on a multiprocessor/multicore/HT
x86/x64 system
- *
- * The lock prefix for atomic operations in
osl_[inc|de]crementInterlockedCount()
- * comes with a cost and is especially expensive on pre HT x86
single processor
- * systems, where it isn't needed at all.
- */
-if ( SystemInfo.dwNumberOfProcessors == 1 ) {
[Libreoffice-commits] core.git: extensions/StaticLibrary_plugcon.mk
extensions/StaticLibrary_plugcon.mk |8 1 file changed, 8 insertions(+) New commits: commit dabe10eb94fda61ec39932548c4279611b057658 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Apr 25 15:35:38 2013 +0200 workaround race condition with mixing internal/system cairo libs http://lists.freedesktop.org/archives/libreoffice/2013-April/051026.html Change-Id: I81031d8290efcc4f343af7bdffb4762411f4f107 diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 3cc8ba1..deb62a8 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -52,6 +52,14 @@ $(eval $(call gb_StaticLibrary_add_defs,plugcon,\ )) $(eval $(call gb_StaticLibrary_use_external,plugcon,gtk)) + +# Gtk uses cairo, and if we build internal cairo, the linker could +# pick up our cairo libs before they're fully ready, causing problems +# (e.g. using our libpixman and system libcairo). Depend on cairo +# to delay build until cairo is done. +ifeq ($(SYSTEM_CAIRO),NO) +$(eval $(call gb_StaticLibrary_use_external,plugcon,cairo)) +endif endif # ENABLE_GTK=TRUE $(eval $(call gb_StaticLibrary_add_exception_objects,plugcon,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - oox/source
oox/source/drawingml/chart/axisconverter.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit af6299687ef968a3731cbfa24c3820f5006b2823
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Apr 25 17:37:32 2013 +0530
n#813291: [PPTX] Axis Labels with percentage.
Added the check only in the Axis Labels import.
Maybe this check can be moved to convertNumberFormat()
Conflicts:
oox/source/drawingml/chart/axisconverter.cxx
Change-Id: I40adfa5e79292b45e97f617dbe2b9880af71be07
diff --git a/oox/source/drawingml/chart/axisconverter.cxx
b/oox/source/drawingml/chart/axisconverter.cxx
index d07d28c..887df65 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -316,9 +316,13 @@ void AxisConverter::convertFromModel( const Reference
XCoordinateSystem rxCo
if( (aScaleData.AxisType == cssc2::AxisType::REALNUMBER) ||
(aScaleData.AxisType == cssc2::AxisType::PERCENT) )
{
+bool bPercent = false;
if( mrModel.maNumberFormat.maFormatCode.indexOfAsciiL(%,1) = 0)
+{
mrModel.maNumberFormat.mbSourceLinked = false;
-getFormatter().convertNumberFormat( aAxisProp,
mrModel.maNumberFormat );
+bPercent = true;
+}
+getFormatter().convertNumberFormat( aAxisProp,
mrModel.maNumberFormat, bPercent );
}
// position of crossing axis --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/textparagraphproperties.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 78a20557601d9ca7b446df0cffa72398576741ed Author: Felix Zhang fezh...@suse.com Date: Thu Apr 25 19:22:29 2013 +0530 bnc#793414: Bullet points are not indented correctly. diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 4598c62..585695d 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -378,6 +378,8 @@ void TextParagraphProperties::apply( const TextParagraphProperties rSourceProps moParaLeftMargin = rSourceProps.moParaLeftMargin; if ( rSourceProps.moFirstLineIndentation ) moFirstLineIndentation = rSourceProps.moFirstLineIndentation; +if( rSourceProps.mnLevel ) +mnLevel = rSourceProps.mnLevel; } void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/drawingml/textparagraphproperties.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit e01435a0c1910caf86712ab71f7b714f6ed9c782 Author: Felix Zhang fezh...@suse.com Date: Thu Apr 25 19:22:29 2013 +0530 bnc#793414: Bullet points are not indented correctly. diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 7889da2..94ad04f 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -380,6 +380,8 @@ void TextParagraphProperties::apply( const TextParagraphProperties rSourceProps moParaLeftMargin = rSourceProps.moParaLeftMargin; if ( rSourceProps.moFirstLineIndentation ) moFirstLineIndentation = rSourceProps.moFirstLineIndentation; +if( rSourceProps.mnLevel ) +mnLevel = rSourceProps.mnLevel; } void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst |8
solenv/inc/minor.mk |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 467748ef3d900ef42ca95df1715879335673341d
Author: Andras Timar ati...@suse.com
Date: Thu Apr 25 15:55:53 2013 +0200
Bump for 3.6-20
Change-Id: Id1f02caaae95a43de6638a7c58197da25a57cac2
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 3c5b2ca..c0475c3 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 19
+WINDOWSPATCHLEVEL 20
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-519
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-520
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-519
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-520
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-519
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-520
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index f47e8be..1905e1a 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=360
-RSCREVISION=360m1(Build:519)
-BUILD=519
+RSCREVISION=360m1(Build:520)
+BUILD=520
LAST_MINOR=m1
SOURCEVERSION=OOO360
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRContentCollector.cpp |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7b6657f598ef5993c454d7bf3a9cf660e4f25db5
Author: David Tardon dtar...@redhat.com
Date: Thu Apr 25 16:00:27 2013 +0200
fdo#63734 angle is represented internally in radians
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index a4fbbcd..b6ed4a8 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -661,7 +661,7 @@ void
libcdr::CDRContentCollector::_fillProperties(WPXPropertyList propList, WPX
}
else if (m_currentFillStyle.gradient.m_stops.size() == 2)
{
- double angle = m_currentFillStyle.gradient.m_angle;
+ double angle = m_currentFillStyle.gradient.m_angle * 180 / M_PI;
while (angle 0.0)
angle += 360.0;
while (angle 360.0)
@@ -719,7 +719,7 @@ void
libcdr::CDRContentCollector::_fillProperties(WPXPropertyList propList, WPX
{
propList.insert(draw:fill, gradient);
propList.insert(draw:style, linear);
- double angle = m_currentFillStyle.gradient.m_angle;
+ double angle = m_currentFillStyle.gradient.m_angle * 180 / M_PI;
angle += 90.0;
while (angle 0.0)
angle += 360.0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 21fb092398fb21256b0e546e7f38c5e6de4654f2
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 25 15:11:42 2013 +0100
Related: fdo#63802
let si-phonetic-dynamic survive libreoffice losing focus and regain it cycle
and still use surrounding text. It should be safe to report that we can
provide
surrounding text but there isn't any during the time window when there is no
focus window, because the focus in event was received but it hasn't arrived
yet
because that happens on a postuserevent.
Change-Id: I0481c42208953f2a0618aaed7b0d9e9f3e7bda07
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 3202e5e..d20e3c6 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -4149,13 +4149,9 @@ uno::Referenceaccessibility::XAccessibleEditableText
return uno::Reference accessibility::XAccessibleEditableText ();
}
-static uno::Referenceaccessibility::XAccessibleEditableText lcl_GetxText()
+static uno::Referenceaccessibility::XAccessibleEditableText
lcl_GetxText(Window *pFocusWin)
{
uno::Referenceaccessibility::XAccessibleEditableText xText;
-Window* pFocusWin = ImplGetSVData()-maWinData.mpFocusWin;
-if (!pFocusWin)
-return xText;
-
try
{
uno::Reference accessibility::XAccessible xAccessible(
pFocusWin-GetAccessible( true ) );
@@ -4165,14 +4161,18 @@ static
uno::Referenceaccessibility::XAccessibleEditableText lcl_GetxText()
catch(const uno::Exception e)
{
g_warning( Exception in getting input method surrounding text );
+SAL_WARN( vcl.gtk, Exception in getting input method surrounding
text: e.Message);
}
return xText;
}
gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext*
pContext, gpointer /*im_handler*/ )
{
-uno::Referenceaccessibility::XAccessibleEditableText xText =
lcl_GetxText();
+Window *pFocusWin = Application::GetFocusWindow();
+if (!pFocusWin)
+return true;
+uno::Referenceaccessibility::XAccessibleEditableText xText =
lcl_GetxText(pFocusWin);
if (xText.is())
{
sal_uInt32 nPosition = xText-getCaretPosition();
@@ -4181,17 +4181,20 @@ gboolean
GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
OUString sCursorText(sAllText.copy(0, nPosition));
gtk_im_context_set_surrounding(pContext, sUTF.getStr(),
sUTF.getLength(),
OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
-return sal_True;
+return true;
}
-return sal_False;
+return false;
}
gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*,
gint offset, gint nchars,
gpointer /*im_handler*/ )
{
-uno::Referenceaccessibility::XAccessibleEditableText xText =
lcl_GetxText();
+Window *pFocusWin = Application::GetFocusWindow();
+if (!pFocusWin)
+return true;
+uno::Referenceaccessibility::XAccessibleEditableText xText =
lcl_GetxText(pFocusWin);
if (xText.is())
{
sal_uInt32 nPosition = xText-getCaretPosition();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED] fdo#63154: Removed all usages of SVLIBRARY
Michael Meeks has abandoned this change. Change subject: fdo#63154: Removed all usages of SVLIBRARY .. Patch Set 1: Abandoned Terribly sorry, this was my bad - this part of the Easy hack is not so useful. The 'lo' helps to disambiguate things on some platforms, and the ESC consensus was to keep this as it is. So sorry for that- and thanks for your change ! there were a few other bits in that easy-hack that may be less controversial. -- To view, visit https://gerrit.libreoffice.org/3574 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ib1b6ba1220657343a264525d1cb55138e481f4fd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - config_host.mk.in configure.ac g sw/source
config_host.mk.in |1 +
configure.ac| 20
g | 16 +++-
sw/source/core/doc/notxtfrm.cxx |3 +--
4 files changed, 37 insertions(+), 3 deletions(-)
New commits:
commit a9ff36b533bc822a82253b888e488b2391da7a8d
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 23 22:27:57 2013 +0200
fdo#60280: sw: restore anti-aliasing for all OLE objects
The OLE case in SwNoTxtFrm::PaintPicture() was mis-merged to modify the
anti-aliasing always but reset it only for Charts.
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)
Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e
(cherry picked from commit 954d695827431a5badd1a993d8f364c669ca9c9c)
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 914e189..a839420 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1143,8 +1143,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect rGrfArea ) cons
}
// see #i99665#
-if ( pOLENd-IsChart()
-pShell-Imp()-GetDrawView()-IsAntiAliasing() )
+if (pShell-Imp()-GetDrawView()-IsAntiAliasing())
{
pOut-SetAntialiasing( nFormerAntialiasingAtOutput );
}
commit 071b9690f7b0b1eb774d92a07c77f45db12f647d
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Feb 9 19:09:32 2013 +0100
configure: add --with-referenced-git option
This is similar to --with-linked-git, but:
1) It uses git submodule update --reference, so it works with submodules.
2) The created repo is a true git repo, except that its object database
reuses the referenced repo's objects, so it's a real speedup when e.g.
translations are enabled.
I intentionally didn't just fixed --with-linked-git, to make it clear
this is more like git clone --reference, not git-new-workdir.
Change-Id: I7c9584bce3670fd1e175b90aded2435cfe78056d
(cherry picked from commit 803137f4715ee7ab127a9718ca213db252193398)
Conflicts:
configure.ac
diff --git a/config_host.mk.in b/config_host.mk.in
index 17ab6a6..668d6d7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -183,6 +183,7 @@ export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
export GIT_LINK_SRC=@GIT_LINK_SRC@
+export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export PARALLELISM?=@PARALLELISM@
export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index c561981..f23be2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1153,6 +1153,14 @@ AC_ARG_WITH(linked-git,
GIT_LINK_SRC=$withval ,
)
+AC_ARG_WITH(referenced-git,
+AS_HELP_STRING([--with-referenced-git=OTHER_CHECKOUT_DIR],
+[Specify another checkout directory to reference. This makes use of
+ git submodule update --reference, and saves a lot of diskspace
+ when having multiple trees side-by-side.]),
+GIT_REFERENCE_SRC=$withval ,
+)
+
AC_ARG_WITH(vba-package-format,
AS_HELP_STRING([--with-vba-package-format],
[Specify package format for vba compatibility api. Specifying
builtin
@@ -11668,6 +11676,18 @@ else
fi
AC_SUBST(PROGRESSTEXTBASELINE)
+dnl git submodule update --reference
+dnl ===
+if test -n ${GIT_REFERENCE_SRC}; then
+for repo in ${GIT_NEEDED_SUBMODULES}; do
+if ! test -d ${GIT_REFERENCE_SRC}/${repo}; then
+AC_MSG_ERROR([referenced git: required repository does not exist:
${GIT_REFERENCE_SRC}/${repo}])
+fi
+done
+fi
+AC_SUBST(GIT_REFERENCE_SRC)
+
+
AC_MSG_CHECKING([for alternative branding images directory])
INTRO_BITMAP=
ABOUT_BACKGROUND_SVG=
diff --git a/g b/g
index 288489c..c99519b 100755
--- a/g
+++ b/g
@@ -122,6 +122,14 @@ get_configured_submodules()
fi
}
+get_git_reference()
+{
+REFERENCED_GIT=
+if [ -f config_host.mk ]; then
+ REFERENCED_GIT=$(cat config_host.mk | grep GIT_REFERENCE_SRC | sed -e
s/.*=//)
+fi
+}
+
do_shortcut_update()
{
local module
@@ -222,6 +230,11 @@ local configured
git submodule init $module || return $?
fi
done
+if [ -n $REFERENCED_GIT ] ; then
+for module in $SUBMODULES_CONFIGURED ; do
+git submodule update --reference
$REFERENCED_GIT/.git/modules/$module $module || return $?
+done
+fi
return 0
}
@@ -239,6 +252,7 @@ fi
get_active_submodules
get_configured_submodules
+get_git_reference
@@ -295,7 +309,7 @@ case $COMMAND in
do_checkout $@
;;
clone)
- do_init_modules git submodule update refresh_all_hooks
+ do_init_modules refresh_all_hooks
;;
fetch)
(git
