[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/Executable_gengal.bin.mk
svx/Executable_gengal.bin.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4fa7bc79cac0b9a6282a32d40b31177cd13807b3 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Feb 19 19:49:57 2012 +0100 fix MinGW build Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 3143e5f..1f080fb 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -71,7 +71,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ kernel32 \ msvcrt \ -oldnames \ +$(gb_Library_win32_OLDNAMES) \ user32 \ uwinapi \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - np_sdk/mozsrc
np_sdk/mozsrc/npwin.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 19903d30def0a2bf63357031e56b18b5c4abea78
Author: Michael Meeks michael.me...@suse.com
Date: Sat Feb 18 08:07:55 2012 +
WaE: add horror cast to calm Windows tinderbox
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp
index f31b621..204f5d1 100644
--- a/np_sdk/mozsrc/npwin.cpp
+++ b/np_sdk/mozsrc/npwin.cpp
@@ -168,7 +168,7 @@ NP_Shutdown()
char * NP_GetMIMEDescription()
{
-return NPP_GetMIMEDescription();
+ return (char *)NPP_GetMIMEDescription();
}
// END - PLUGIN DLL entry points
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - svx/Executable_gengal.bin.mk svx/Package_gengal.mk
svx/Executable_gengal.bin.mk |2 ++ svx/Package_gengal.mk|1 + 2 files changed, 3 insertions(+) New commits: commit 0ae63492f5aab6dfd33c2991f740f51422bde7ae Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 20 10:49:39 2012 +0200 Add Emacs mode line diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 222c66c..dbd7818 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. diff --git a/svx/Package_gengal.mk b/svx/Package_gengal.mk index c47fc85..705ec91 100644 --- a/svx/Package_gengal.mk +++ b/svx/Package_gengal.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. commit f34b1dc9617e56fcb0d369d72793585d7ad9be2d Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 20 10:46:54 2012 +0200 Link with gb_STDLIBS here, too Would it perhaps have been better to always link with gb_STDLIBS without having to mention it in each Library_*.mk and Executable_*.mk? And then for those few exceptions come up with some No STDLIBS, thanks thing? diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 1f080fb..222c66c 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ vcl \ ucbhelper \ svxcore \ +$(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - pyuno/source
pyuno/source/module/makefile.mk | 43 ++--
pyuno/source/module/pyuno_dlopenwrapper.c | 79 ++
2 files changed, 86 insertions(+), 36 deletions(-)
New commits:
commit 51967dab002323b62f4f8f635052ab12ceb2b2ad
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 16 16:42:58 2012 +0100
Reintroduce pyuno.so wrapper around libpyuno.so
...it was cleaned away by a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe Port
PyUno
to support Python 3 but is still needed to make sure libpyuno.so is loaded
RTLD_GLOBAL (Python apparently loads its modules RTLD_LOCAL). At least with
pre 4.5 GCC this can cause problems with C++ exception handling, see the
mail
thread starting at
http://lists.freedesktop.org/archives/libreoffice/2012-February/025166.html
LibO 3.5RC2: terminate called after throwing an instance of
'com::sun::star::registry::InvalidRegistryException' for details.
(cherry picked from commit 0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290)
...plus...
Adapt pyuno.so wrapper to Python 3 support
(cherry picked from commit 1bb0d979b5ac5ed0cd831c6c8c0ab55dc2621eba)
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk
index f72e1c3..714a120 100644
--- a/pyuno/source/module/makefile.mk
+++ b/pyuno/source/module/makefile.mk
@@ -50,6 +50,9 @@ EXTRA_FRAMEWORK_FLAG=-framework Python
.ENDIF # .IF $(EXTRA_CFLAGS)!=
.IF $(GUI) == UNX
+# python expects modules without the lib prefix
+# pyuno.so even on Mac OS X, because it is a python module
+PYUNO_MODULE=$(DLLDEST)$/pyuno.so
PYUNORC=pyunorc
.ELSE
.IF $(CROSS_COMPILING) != YES
@@ -109,6 +112,7 @@ DEFLIB1NAME=$(TARGET)
ALLTAR : \
$(DLLDEST)/uno.py \
$(DLLDEST)/unohelper.py \
+$(PYUNO_MODULE) \
$(MISC)/$(PYUNORC) \
$(LB)/lib$(TARGET).a
@@ -116,17 +120,10 @@ $(LB)/lib$(TARGET).a: $(MISC)/$(TARGET).def
$(DLLTOOL) --dllname $(TARGET)$(DLLPOST)
--input-def=$(MISC)/$(TARGET).def --kill-at --output-lib=$(LB)/lib$(TARGET).a
.ELSE
-.IF $(GUI)!=WNT
-# For some reason the build breaks on Windows if this is listed in the
-# prerequisite list of ALLTAR, but pyuno.pyd still gets produced. Go
-# figure. But we need it on non-Windows.
-targetdll=$(LB)/$(TARGET)$(DLLPOST)
-.ENDIF
-
ALLTAR : \
$(DLLDEST)/uno.py \
$(DLLDEST)/unohelper.py \
-$(targetdll) \
+$(PYUNO_MODULE) \
$(MISC)/$(PYUNORC)
.ENDIF
.ENDIF
@@ -141,6 +138,29 @@ $(MISC)/framework_link :
$(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework
$(LB)/OOoPython.framework
@touch $@
+.IF $(GUI) == UNX
+$(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
+.IF $(OS) == LINUX
+@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl
-o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd
+.ELIF $(OS) == SOLARIS
+@echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd
+.ELIF $(OS) == FREEBSD
+@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd
+.ELIF $(OS) == NETBSD
+@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o
$(MISC)$/$(@:b).cmd
+.ELIF $(OS) == OPENBSD
+@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd
+.ELIF $(OS) == DRAGONFLY
+@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd
+.ELIF $(OS) == MACOSX
+@echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
$(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) $(MISC)$/$(@:b).cmd
+.ELSE
+@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o
$(MISC)$/$(@:b).cmd
+.ENDIF
+cat $(MISC)$/$(@:b).cmd
+@+source $(MISC)$/$(@:b).cmd
+.ENDIF
+
$(MISC)/$(PYUNORC) : pyuno
-rm -f $@
cat pyuno $@
@@ -149,11 +169,4 @@ $(MISC)/pyuno.flt : pyuno.flt
-rm -f $@
cat $? $@
-.IF $(DLLPRE)!=
-# python does not accept the lib prefix in the module library
-$(LB)/$(TARGET)$(DLLPOST) : $(LB)/$(DLLPRE)$(TARGET)$(DLLPOST)
- -rm -f $@
- ln -s $? $@
-.ENDIF
-
.ENDIF # L10N_framework
diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c
b/pyuno/source/module/pyuno_dlopenwrapper.c
index 1ace044..3bdc912 100644
--- a/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -26,38 +26,75 @@
*
/
-#include rtl/string.h
+/* make Python.h go first as a hack to work around _POSIX_C_SOURCE redefinition
+ warnings: */
+#include Python.h
+
+#include sal/config.h
#include stdlib.h
#include string.h
-#ifdef LINUX
-# ifndef __USE_GNU
-# define __USE_GNU
-# endif
+#if defined LINUX !defined __USE_GNU
+#define __USE_GNU
#endif
#include dlfcn.h
-void initpyuno ()
-{
-Dl_info dl_info;
-void (*func)(void);
+#include rtl/string.h
-if (dladdr((void*)initpyuno, dl_info)
[Libreoffice-commits] .: dictionaries/en dictionaries/hu_HU dictionaries/ru_RU
dictionaries/en/makefile.mk | 19 ++- dictionaries/hu_HU/makefile.mk | 21 - dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties | 15 --- dictionaries/ru_RU/makefile.mk | 20 ++-- 4 files changed, 56 insertions(+), 19 deletions(-) New commits: commit 312a744c1c8a4afce0fe06a4423d97ebb883fc6d Author: Andras Timar ati...@suse.com Date: Mon Feb 20 10:01:50 2012 +0100 enable localization of Lightproof extensions diff --git a/dictionaries/en/makefile.mk b/dictionaries/en/makefile.mk index fc51ec1..ac9f7f6 100644 --- a/dictionaries/en/makefile.mk +++ b/dictionaries/en/makefile.mk @@ -88,7 +88,6 @@ COMPONENT_FILES= \ $(EXTENSIONDIR)$/dialog/en_en_US.default \ $(EXTENSIONDIR)$/dialog/en_en_US.properties \ $(EXTENSIONDIR)$/dialog/en.xdl \ -$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu \ $(EXTENSIONDIR)$/dialog/OptionsDialog.xcs COMPONENT_CONFIGDEST=. @@ -103,6 +102,13 @@ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE) COMPONENT_UNZIP_FILES= \ $(EXTENSIONDIR)$/th_en_US_v2.idx +.IF $(WITH_LANG) != +PROPERTIES_LOCALIZED:=$(MISC)/$(EXTENSIONNAME)_in/properties_localized +COMPONENT_UNZIP_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu $(PROPERTIES_LOCALIZED) +.ELSE +COMPONENT_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu +.ENDIF + # add own targets to packing dependencies (need to be done before # packing the xtension # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE) @@ -123,4 +129,15 @@ $(EXTENSIONDIR)$/th_en_US_v2.idx : $(EXTENSIONDIR)$/th_en_US_v2.dat $(DESCRIPTION_SRC) : description.xml @@-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $ -o $@ -m $(LOCALIZESDF) -l all +$(EXTENSIONDIR)/dialog/OptionsDialog.xcu : dialog/OptionsDialog.xcu +$(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) \ +-i $ \ +-o $(EXTENSIONDIR)/dialog/OptionsDialog.xcu \ +-m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/en/dialog/localize.sdf \ +-l all +$(PROPERTIES_LOCALIZED) : $(EXTENSIONDIR)/dialog/en_en_US.properties +$(COMMAND_ECHO)$(PERL) $(OUTDIR)/bin/propmerge \ +-i $ \ +-m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/en/dialog/localize.sdf +@@-$(TOUCH) $(PROPERTIES_LOCALIZED) .ENDIF diff --git a/dictionaries/hu_HU/makefile.mk b/dictionaries/hu_HU/makefile.mk index 67916e4..998f692 100644 --- a/dictionaries/hu_HU/makefile.mk +++ b/dictionaries/hu_HU/makefile.mk @@ -72,7 +72,6 @@ COMPONENT_FILES= \ $(EXTENSIONDIR)$/dialog/hu_HU_en_US.properties \ $(EXTENSIONDIR)$/dialog/hu_HU_hu_HU.properties \ $(EXTENSIONDIR)$/dialog/hu_HU.xdl \ -$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu \ $(EXTENSIONDIR)$/dialog/OptionsDialog.xcs \ $(EXTENSIONDIR)$/README_lightproof_hu_HU.txt @@ -88,6 +87,14 @@ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE) COMPONENT_UNZIP_FILES= \ $(EXTENSIONDIR)$/th_hu_HU_v2.idx +.IF $(WITH_LANG) != +PROPERTIES_LOCALIZED:=$(MISC)/$(EXTENSIONNAME)_in/properties_localized +COMPONENT_UNZIP_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu $(PROPERTIES_LOCALIZED) +.ELSE +COMPONENT_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu +.ENDIF + + # add own targets to packing dependencies (need to be done before # packing the xtension # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE) @@ -108,4 +115,16 @@ $(EXTENSIONDIR)$/th_hu_HU_v2.idx : $(EXTENSIONDIR)$/th_hu_HU_v2.dat $(DESCRIPTION_SRC) : description.xml @@-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $ -o $@ -m $(LOCALIZESDF) -l all +$(EXTENSIONDIR)/dialog/OptionsDialog.xcu : dialog/OptionsDialog.xcu +$(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) \ +-i $ \ +-o $(EXTENSIONDIR)/dialog/OptionsDialog.xcu \ +-m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/hu_HU/dialog/localize.sdf \ +-l all +$(PROPERTIES_LOCALIZED) : $(EXTENSIONDIR)/dialog/hu_HU_en_US.properties +$(COMMAND_ECHO)$(PERL) $(OUTDIR)/bin/propmerge \ +-i $ \ +-m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/hu_HU/dialog/localize.sdf +@@-rm $(EXTENSIONDIR)/dialog/hu_HU_hu.properties +@@-$(TOUCH) $(PROPERTIES_LOCALIZED) .ENDIF diff --git a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties b/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties deleted file mode 100644 index d7df847..000 --- a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties +++ /dev/null @@ -1,15 +0,0 @@ -abbreviation=\u0410\u0431\u0431\u0440\u0435\u0432\u0438\u0430\u0442\u0443\u0440\u044b -grammar=\u0413\u0440\u0430\u043c\u043c\u0430\u0442\u0438\u043a\u0430
[Libreoffice-commits] .: libvisio/libvisio-0.0.14.patch libvisio/libvisio-0.0.15.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.14.patch | 20 libvisio/libvisio-0.0.15.patch | 20 libvisio/makefile.mk |4 ++-- ooo.lst.in |2 +- 4 files changed, 23 insertions(+), 23 deletions(-) New commits: commit 21366a4b95defb007ddccd409126536a6e8dc50d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 20 10:03:48 2012 +0100 Uploading new release of libvisio diff --git a/libvisio/libvisio-0.0.14.patch b/libvisio/libvisio-0.0.14.patch deleted file mode 100644 index 456f5ad..000 --- a/libvisio/libvisio-0.0.14.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.14/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.14/src/lib/libvisio_utils.h -@@ -42,17 +42,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.15.patch b/libvisio/libvisio-0.0.15.patch new file mode 100644 index 000..fbebce9 --- /dev/null +++ b/libvisio/libvisio-0.0.15.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.15/src/lib/libvisio_utils.h misc/build/libvisio-0.0.15/src/lib/libvisio_utils.h +@@ -42,17 +42,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index 9adf426..871f642 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,8 +54,8 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.14 -TARFILE_MD5=776ad69a63ac1e99abed176e54ce25d9 +TARFILE_NAME=libvisio-0.0.15 +TARFILE_MD5=d28864eb2b59bb57b034c0d4662a3cee PATCH_FILES=\ $(TARFILE_NAME).patch diff --git a/ooo.lst.in b/ooo.lst.in index 44828d0..e6b5f0c 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2 +d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz bb94fe29a21444369307f19015d48b82-libcdr-0.0.2.tar.bz2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryFixes.mk
RepositoryFixes.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 31826318dfd2f4c38d6bf34f957fe51edc0a2b14 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 20 11:15:02 2012 +0200 Shared libraries must in practice be called lib*.so on Android Otherwise the package creating code (part of the SDK) won't include them and/or the package installation code (on the OS itself) won't unpack them. (They just silently skip the file.) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 2493897..b1cb18f 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -40,7 +40,9 @@ gb_Library_FILENAMES := $(patsubst log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$ gb_Library_FILENAMES := $(patsubst purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) +ifneq ($(OS),ANDROID) gb_Library_FILENAMES := $(patsubst unoexceptionprotector:libuno%,unoexceptionprotector:uno%,$(gb_Library_FILENAMES)) +endif gb_Library_FILENAMES := $(patsubst unsafe_uno:libunsafe_uno%,unsafe_uno:libunsafe_uno_uno%,$(gb_Library_FILENAMES)) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/unocore/unotext.cxx | 27 +++
1 file changed, 27 insertions(+)
New commits:
commit 9592f56323de27f9e1d890ee6259a5f4f328cbd3
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Feb 20 10:12:01 2012 +0100
n#695479 fix anchor handling in SwXText::convertToTextFrame()
When two (or more) text frames was imported without a non-frame
paragraph in between, the first frame was anchored to the second one,
instead of a non-frame paragraph.
The fix is modelled after what the old RTF import already did in
SwRTFParser::Continue() in swparrtf.cxx:493 and
SwRTFParser::SetFlysInDoc() in rtffly.cxx:481.
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 00c7e09..2c25700 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1665,6 +1665,18 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
aStartPam.SetMark();
*aStartPam.End() = *pEndPam-End();
pEndPam.reset(0);
+
+// see if there are frames already anchored to this node
+std::vectorSwFrmFmt* aAnchoredFrames;
+for (int i = 0; i m_pImpl-m_pDoc-GetSpzFrmFmts()-Count(); ++i)
+{
+SwFrmFmt* pFrmFmt = (*m_pImpl-m_pDoc-GetSpzFrmFmts())[i];
+const SwFmtAnchor rAnchor = pFrmFmt-GetAnchor();
+if (FLY_AT_PARA == rAnchor.GetAnchorId()
+aStartPam.GetNode()-GetIndex() ==
rAnchor.GetCntntAnchor()-nNode.GetIndex())
+aAnchoredFrames.push_back(pFrmFmt);
+}
+
SwXTextFrame *const pNewFrame = new SwXTextFrame(m_pImpl-m_pDoc);
const uno::Reference text::XTextFrame xNewFrame = pNewFrame;
pNewFrame-SetSelection( aStartPam );
@@ -1700,6 +1712,21 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
aNewAnchor.SetAnchor( aMovePam.Start() );
m_pImpl-m_pDoc-SetAttr(
aNewAnchor, *pNewFrame-GetFrmFmt() );
+
+// also move frames anchored to us
+for (std::vectorSwFrmFmt*::iterator i =
aAnchoredFrames.begin(); i != aAnchoredFrames.end(); ++i)
+{
+// copy the anchor to the next paragraph
+SwFmtAnchor aAnchor((*i)-GetAnchor());
+aAnchor.SetAnchor(aMovePam.Start());
+m_pImpl-m_pDoc-SetAttr(aAnchor, *(*i));
+
+// delete the old anchor
+SwSpzFrmFmts* pFrmFmts =
m_pImpl-m_pDoc-GetSpzFrmFmts();
+// here we rely on that fact that this is a sorted
list, where the last element is the newly created frame
+SwFrmFmt *pFrmFmt = (*pFrmFmts)[pFrmFmts-Count()-1];
+m_pImpl-m_pDoc-DelLayoutFmt(pFrmFmt);
+}
}
}
m_pImpl-m_pDoc-DelFullPara(aStartPam);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libvisio/libvisio-0.0.15-makefile_mk.patch libvisio/makefile.mk libvisio/prj
libvisio/libvisio-0.0.15-makefile_mk.patch | 10 ++ libvisio/makefile.mk |3 ++- libvisio/prj/d.lst |1 + 3 files changed, 13 insertions(+), 1 deletion(-) New commits: commit f241f91e03c25d337598092b21f1c1360c7731eb Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 20 10:40:07 2012 +0100 Fix libvisio's makefile.mk diff --git a/libvisio/libvisio-0.0.15-makefile_mk.patch b/libvisio/libvisio-0.0.15-makefile_mk.patch new file mode 100644 index 000..a22f128 --- /dev/null +++ b/libvisio/libvisio-0.0.15-makefile_mk.patch @@ -0,0 +1,10 @@ +--- misc/libvisio-0.0.15/src/lib/makefile.mk 2012-01-17 19:19:29.0 +0100 misc/build/libvisio-0.0.15/src/lib/makefile.mk 2012-02-20 10:36:43.448244813 +0100 +@@ -45,6 +45,7 @@ + $(SLO)$/VSDXParser.obj \ + $(SLO)$/VSDXShapeList.obj \ + $(SLO)$/VSDXStencils.obj \ ++ $(SLO)$/VSDStringVector.obj \ + $(SLO)$/VSDXStylesCollector.obj \ + $(SLO)$/VSDXStyles.obj + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index 871f642..c2064ce 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -58,7 +58,8 @@ TARFILE_NAME=libvisio-0.0.15 TARFILE_MD5=d28864eb2b59bb57b034c0d4662a3cee PATCH_FILES=\ -$(TARFILE_NAME).patch +$(TARFILE_NAME).patch \ +$(TARFILE_NAME)-makefile_mk.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst index f03b25b..5680abe 100644 --- a/libvisio/prj/d.lst +++ b/libvisio/prj/d.lst @@ -1,5 +1,6 @@ mkdir: %_DEST%\inc\libvisio ..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio ..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\ +..\%__SRC%\misc\build\libvisio*\src\lib\VSDStringVector.h %_DEST%\inc\libvisio\ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/ooinstall |4
1 file changed, 4 deletions(-)
New commits:
commit 73da209a2775583ece3218893fd5659c1290cd70
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 20 11:11:49 2012 +0100
Do not remove the destdir prefix in any case
708def7d94bb76ef137572a364d2643402dc590b made that code conditional on
!$do_link
so that it worked right for the case where making dev-install calls
ooinstall
-l. However, that code now starts to fail also in the --disable-linkoo case
(where building dev-install calls ooinstall w/o -l). I have no idea whether
that code serves any real purpose in any actual use case, so remove it
completely for now.
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 794e81b..b7a5d94 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -48,10 +48,6 @@ for $arg (@ARGV) {
# Cwd::realpath does not work if the path does not exist
mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
$path = Cwd::realpath( $ENV{DESTDIR} . $arg );
- if (!$do_link) {
- my $destdir = Cwd::realpath( $ENV{DESTDIR} );
- $path =~ s|$destdir||;
- }
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - libvisio/libvisio-0.0.14.patch libvisio/libvisio-0.0.15-makefile_mk.patch libvisio/libvisio-0.0.15.patch libvisio/makefile.mk libvisio/prj ooo.lst.i
libvisio/libvisio-0.0.14.patch | 20 libvisio/libvisio-0.0.15-makefile_mk.patch | 10 ++ libvisio/libvisio-0.0.15.patch | 20 libvisio/makefile.mk |7 --- libvisio/prj/d.lst |1 + ooo.lst.in |2 +- 6 files changed, 36 insertions(+), 24 deletions(-) New commits: commit bb65fed6eea196e766c0ac21898b426795ec1a2d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 20 10:03:48 2012 +0100 Uploading new release of libvisio (cherry picked from commit 21366a4b95defb007ddccd409126536a6e8dc50d) ...plus... Fix libvisio's makefile.mk (cherry picked from commit f241f91e03c25d337598092b21f1c1360c7731eb) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/libvisio/libvisio-0.0.14.patch b/libvisio/libvisio-0.0.14.patch deleted file mode 100644 index 456f5ad..000 --- a/libvisio/libvisio-0.0.14.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.14/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.14/src/lib/libvisio_utils.h -@@ -42,17 +42,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.15-makefile_mk.patch b/libvisio/libvisio-0.0.15-makefile_mk.patch new file mode 100644 index 000..a22f128 --- /dev/null +++ b/libvisio/libvisio-0.0.15-makefile_mk.patch @@ -0,0 +1,10 @@ +--- misc/libvisio-0.0.15/src/lib/makefile.mk 2012-01-17 19:19:29.0 +0100 misc/build/libvisio-0.0.15/src/lib/makefile.mk 2012-02-20 10:36:43.448244813 +0100 +@@ -45,6 +45,7 @@ + $(SLO)$/VSDXParser.obj \ + $(SLO)$/VSDXShapeList.obj \ + $(SLO)$/VSDXStencils.obj \ ++ $(SLO)$/VSDStringVector.obj \ + $(SLO)$/VSDXStylesCollector.obj \ + $(SLO)$/VSDXStyles.obj + diff --git a/libvisio/libvisio-0.0.15.patch b/libvisio/libvisio-0.0.15.patch new file mode 100644 index 000..fbebce9 --- /dev/null +++ b/libvisio/libvisio-0.0.15.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.15/src/lib/libvisio_utils.h misc/build/libvisio-0.0.15/src/lib/libvisio_utils.h +@@ -42,17 +42,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index 9adf426..c2064ce 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,11 +54,12 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.14 -TARFILE_MD5=776ad69a63ac1e99abed176e54ce25d9 +TARFILE_NAME=libvisio-0.0.15 +TARFILE_MD5=d28864eb2b59bb57b034c0d4662a3cee PATCH_FILES=\ -$(TARFILE_NAME).patch +$(TARFILE_NAME).patch \ +$(TARFILE_NAME)-makefile_mk.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst index f03b25b..5680abe 100644 --- a/libvisio/prj/d.lst +++ b/libvisio/prj/d.lst @@ -1,5 +1,6 @@ mkdir: %_DEST%\inc\libvisio ..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio ..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\ +..\%__SRC%\misc\build\libvisio*\src\lib\VSDStringVector.h %_DEST%\inc\libvisio\ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/ooo.lst.in b/ooo.lst.in index a71ed38..9ad3c24 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2 +d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - np_sdk/mozsrc
np_sdk/mozsrc/npunix.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a53ac5138029f6960d4b1610fcc34f34d4eec1c8
Author: Michael Meeks michael.me...@suse.com
Date: Fri Feb 17 20:45:42 2012 +
WaE: add horror cast to calm Stephan's tinderbox
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c
index 19ae47a..b99a545 100644
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/mozsrc/npunix.c
@@ -368,7 +368,7 @@ Private_GetJavaClass(void)
char *
NP_GetMIMEDescription(void)
{
-return NPP_GetMIMEDescription();
+return (char *)NPP_GetMIMEDescription();
}
/*
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ridljar/JunitTest_typedesc.mk ridljar/JunitTest_uno.mk ridljar/JunitTest_util.mk ridljar/test
ridljar/JunitTest_typedesc.mk|5
ridljar/JunitTest_uno.mk |7
ridljar/JunitTest_util.mk|4
ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java | 114
+++
ridljar/test/com/sun/star/lib/util/WeakMap_Test.java | 51 +--
ridljar/test/com/sun/star/uno/Any_Test.java | 29 -
ridljar/test/com/sun/star/uno/Type_Test.java | 153
+-
ridljar/test/com/sun/star/uno/UnoRuntime_Test.java | 103
++
8 files changed, 233 insertions(+), 233 deletions(-)
New commits:
commit 5e0c6ab6254b129b664a32e5b94046085316e372
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 20 12:10:39 2012 +0100
Make ridljar JunitTests work
diff --git a/ridljar/JunitTest_typedesc.mk b/ridljar/JunitTest_typedesc.mk
index 2242e9d..8b2afd0 100644
--- a/ridljar/JunitTest_typedesc.mk
+++ b/ridljar/JunitTest_typedesc.mk
@@ -28,7 +28,6 @@
$(eval $(call gb_JunitTest_JunitTest,ridljar_typedesc))
$(eval $(call gb_JunitTest_add_jars,ridljar_typedesc,\
-$(OUTDIR)/bin/OOoRunnerLight.jar \
$(OUTDIR)/bin/ridl.jar \
))
@@ -36,4 +35,8 @@ $(eval $(call gb_JunitTest_add_sourcefiles,ridljar_typedesc,\
ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test \
))
+$(eval $(call gb_JunitTest_add_classes,ridljar_typedesc,\
+com.sun.star.lib.uno.typedesc.TypeDescription_Test \
+))
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk
index 62ca80c..692b344 100644
--- a/ridljar/JunitTest_uno.mk
+++ b/ridljar/JunitTest_uno.mk
@@ -28,7 +28,6 @@
$(eval $(call gb_JunitTest_JunitTest,ridljar_uno))
$(eval $(call gb_JunitTest_add_jars,ridljar_uno,\
-$(OUTDIR)/bin/OOoRunnerLight.jar \
$(OUTDIR)/bin/ridl.jar \
))
@@ -38,4 +37,10 @@ $(eval $(call gb_JunitTest_add_sourcefiles,ridljar_uno,\
ridljar/test/com/sun/star/uno/UnoRuntime_Test \
))
+$(eval $(call gb_JunitTest_add_classes,ridljar_uno,\
+com.sun.star.uno.Any_Test \
+com.sun.star.uno.Type_Test \
+com.sun.star.uno.UnoRuntime_Test \
+))
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk
index 976554e..6c23ae2 100644
--- a/ridljar/JunitTest_util.mk
+++ b/ridljar/JunitTest_util.mk
@@ -36,4 +36,8 @@ $(eval $(call gb_JunitTest_add_sourcefiles,ridljar_util,\
ridljar/test/com/sun/star/lib/util/WeakMap_Test \
))
+$(eval $(call gb_JunitTest_add_classes,ridljar_util,\
+com.sun.star.lib.util.WeakMap_Test \
+))
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git
a/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java
b/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java
index 2032d53..6292992 100644
--- a/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java
+++ b/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java
@@ -37,19 +37,11 @@ import com.sun.star.uno.Type;
import com.sun.star.uno.TypeClass;
import com.sun.star.uno.XInterface;
import com.sun.star.uno.XNamingService;
-import complexlib.ComplexTestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
-public final class TypeDescription_Test extends ComplexTestCase {
-public String getTestObjectName() {
-return getClass().getName();
-}
-
-public String[] getTestMethodNames() {
-return new String[] { test, testUnsigned,
- testGetMethodDescription, testSequence };
-}
-
-public void test() throws Exception {
+public final class TypeDescription_Test {
+@Test public void test() throws Exception {
ITypeDescription voidTD = TypeDescription.getTypeDescription(
void.class);
ITypeDescription stringTD = TypeDescription.getTypeDescription(
@@ -141,21 +133,23 @@ public final class TypeDescription_Test extends
ComplexTestCase {
com.sun.star.uno.XNamingService));
}
-public void testUnsigned() throws ClassNotFoundException {
-assure(TypeDescription for UNSIGNED LONG,
- TypeDescription.getTypeDescription(Type.UNSIGNED_LONG).
- getTypeName().equals(unsigned long));
+@Test public void testUnsigned() throws ClassNotFoundException {
+assertEquals(
+TypeDescription for UNSIGNED LONG, unsigned long,
+(TypeDescription.getTypeDescription(Type.UNSIGNED_LONG).
+ getTypeName()));
}
-public void testGetMethodDescription() {
+@Test public void testGetMethodDescription() {
TypeDescription td =
TypeDescription.getTypeDescription(XDerived.class);
td.getMethodDescription(fn);
}
-public void testSequence() throws ClassNotFoundException {
-assure(
-
[Libreoffice-commits] .: Makefile
Makefile |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit a2ba4dcbd232c071bd69011a735bf9cd3001a15d Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Feb 20 12:17:22 2012 +0100 It's safer to run one job at a time in instsetoo_native on Windows diff --git a/Makefile b/Makefile index 8ebbe46..346e91c 100644 --- a/Makefile +++ b/Makefile @@ -378,8 +378,14 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # Build # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) + cd packimages unset MAKEFLAGS \ +$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) +ifeq ($(OS_FOR_BUILD),WNT) + cd instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl +else cd instsetoo_native unset MAKEFLAGS \ - $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) +$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) +endif cross-toolset: bootstrap fetch cd cross_toolset $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - solenv/bin
solenv/bin/modules/installer/parameter.pm | 62 ++
solenv/bin/modules/installer/ziplist.pm |9 ++--
solenv/bin/modules/pre2par/parameter.pm | 29 --
3 files changed, 11 insertions(+), 89 deletions(-)
New commits:
commit 8b65b2a3842a90ba565285f0cb796c5d76eef4ce
Author: Tim Retout t...@retout.co.uk
Date: Sun Feb 19 13:14:22 2012 +
Replace installer::parameter::make_absolute_path.
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 3ea13f8..7335c01 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -28,6 +28,8 @@
package installer::parameter;
use Cwd;
+use File::Spec::Functions qw(rel2abs);
+
use installer::exiter;
use installer::files;
use installer::globals;
@@ -195,58 +197,6 @@ sub control_fundamental_parameter
}
}
-##
-# The path parameters can be relative or absolute.
-# This function creates absolute paths.
-##
-
-sub make_path_absolute
-{
-my ($pathref) = @_;
-
-if ( $installer::globals::isunix )
-{
-if (!($$pathref =~ /^\s*\//)) # this is a relative unix path
-{
-$$pathref = cwd() . $installer::globals::separator . $$pathref;
-}
-}
-
-if ( $installer::globals::iswin )
-{
-if ( $^O =~ /cygwin/i )
-{
-if ( $$pathref !~ /^\s*\// $$pathref !~ /^\s*\w\:/ ) # not an
absolute POSIX or DOS path
-{
-$$pathref = cwd() . $installer::globals::separator . $$pathref;
-}
-my $p = $$pathref;
-chomp( $p );
-my $q = '';
-# Avoid the $(LANG) problem.
-if ($p =~ /(\A.*)(\$\(.*\Z)/) {
-$p = $1;
-$q = $2;
-}
-$p =~ s/\\//g;
-chomp( $p = qx{cygpath -w $p} );
-$$pathref = $p.$q;
-# Use windows paths, but with '/'s.
-$$pathref =~ s/\\/\//g;
-}
-else
-{
-if (!($$pathref =~ /^\s*\w\:/)) # this is a relative windows path
(no dos drive)
-{
-$$pathref = cwd() . $installer::globals::separator . $$pathref;
-
-$$pathref =~ s/\//\\/g;
-}
-}
-}
-$$pathref =~ s/[\/\\]\s*$//;# removing ending slashes
-}
-
##
# Setting some global parameters
# This has to be expanded with furher platforms
@@ -388,7 +338,7 @@ sub setglobalvariables
if (!($installer::globals::unpackpath eq ))
{
-make_path_absolute(\$installer::globals::unpackpath);
+$installer::globals::unpackpath =
rel2abs($installer::globals::unpackpath);
}
$installer::globals::unpackpath =~
s/\Q$installer::globals::separator\E\s*$//;
@@ -478,7 +428,7 @@ sub control_required_parameter
if (!($installer::globals::idttemplatepath eq )) # idttemplatepath
set, relative or absolute?
{
-make_path_absolute(\$installer::globals::idttemplatepath);
+$installer::globals::idttemplatepath =
rel2abs($installer::globals::idttemplatepath);
}
installer::remover::remove_ending_pathseparator(\$installer::globals::idttemplatepath);
@@ -487,7 +437,7 @@ sub control_required_parameter
if (!($installer::globals::idtlanguagepath eq )) # idtlanguagepath
set, relative or absolute?
{
-make_path_absolute(\$installer::globals::idtlanguagepath);
+$installer::globals::idtlanguagepath =
rel2abs($installer::globals::idtlanguagepath);
}
installer::remover::remove_ending_pathseparator(\$installer::globals::idtlanguagepath);
@@ -527,7 +477,7 @@ sub control_required_parameter
if (( $installer::globals::patch ) (
$installer::globals::issolarispkgbuild ) (
$installer::globals::patchincludepath ))
{
-make_path_absolute(\$installer::globals::patchincludepath);
+$installer::globals::patchincludepath =
rel2abs($installer::globals::patchincludepath);
$installer::globals::patchincludepath =
installer::converter::make_path_conform($installer::globals::patchincludepath);
}
commit 621896fb558d25d3146201f3d54fca103bcf222c
Author: Tim Retout t...@retout.co.uk
Date: Sun Feb 19 14:04:09 2012 +
Avoid using installer::parameter in installer::ziplist
diff --git a/solenv/bin/modules/installer/ziplist.pm
b/solenv/bin/modules/installer/ziplist.pm
index 5ee0bb6..6435445 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -27,10 +27,11 @@
package installer::ziplist;
+use File::Spec::Functions qw(rel2abs);
+
use installer::exiter;
use installer::globals;
use installer::logger;
-use installer::parameter;
[Libreoffice-commits] .: writerperfect/README
writerperfect/README |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 5febee41a795cdaa66aac0240e8f65b0b4018ed3 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 20 13:16:22 2012 +0200 Improve (?) explanation diff --git a/writerperfect/README b/writerperfect/README index 388fd7c..9edcb40 100644 --- a/writerperfect/README +++ b/writerperfect/README @@ -1 +1,6 @@ -Word Perfect filter, wrapper for [[libwpd]]. +WordPerfect and other filters, wrappers for a set of similar libraries + +This collection of filters is here in this folder in addition to the +WordPerfect filter that gave the module its (humorous) name writerperfect +because the libraries they use all have the same style of API and are +developed, at least partially, by the same person or group of persons. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source sc/inc sc/source svtools/source unusedcode.easy
basic/source/comp/symtbl.cxx |5 ---
basic/source/inc/runtime.hxx |1
basic/source/inc/symtbl.hxx|2 -
basic/source/runtime/runtime.cxx |5 ---
basic/source/sbx/sbxdec.cxx|7
basic/source/sbx/sbxdec.hxx|1
sc/inc/cell.hxx|1
sc/source/core/data/cell.cxx | 26 -
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 14 -
sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx |3 -
svtools/source/edit/svmedit.cxx|6 ---
unusedcode.easy|5 ---
12 files changed, 76 deletions(-)
New commits:
commit aafcf8c84c42f6b5dd079eb38f588dd8a21ec05d
Author: Petr Vorel petr.vo...@gmail.com
Date: Mon Feb 20 00:25:26 2012 +0100
Remove unused code
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 8f00f4a..8144e76 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -110,11 +110,6 @@ SbiSymPool::~SbiSymPool()
{}
-void SbiSymPool::Clear()
-{
-aData.DeleteAndDestroy( 0, aData.Count() );
-}
-
SbiSymDef* SbiSymPool::First()
{
nCur = (sal_uInt16) -1;
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 8c9064d..1c70828 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -433,7 +433,6 @@ public:
sal_uInt16 GetDebugFlags() { return nFlags; }
void SetDebugFlags( sal_uInt16 nFl ) { nFlags = nFl; }
SbMethod* GetCaller();
-SbxArray* GetParams();
SbxVariable* GetExternalCaller(){ return mpExtCaller; }
SbiForStack* FindForStackItemForCollection( class BasicCollection*
pCollection );
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index b484c82..a0263f9 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -74,8 +74,6 @@ public:
SbiSymPool( SbiStringPool, SbiSymScope );
~SbiSymPool();
-void Clear();
-
void SetParent( SbiSymPool* p ) { pParent = p; }
void SetProcId( short n ) { nProcId = n; }
sal_uInt16 GetSize() const { return aData.Count(); }
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 39c48c3..7fe3b17 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -902,11 +902,6 @@ SbMethod* SbiRuntime::GetCaller()
return pMeth;
}
-SbxArray* SbiRuntime::GetParams()
-{
-return refParams;
-}
-
// Stacks
// The expression-stack is available for the continous evaluation
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index bf36d88..3f95fa6 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -254,12 +254,6 @@ bool SbxDecimal::getChar( sal_Unicode rVal )
return bRet;
}
-bool SbxDecimal::getByte( sal_uInt8 rVal )
-{
-bool bRet = ( VarUI1FromDec( maDec, rVal ) == S_OK );
-return bRet;
-}
-
bool SbxDecimal::getShort( sal_Int16 rVal )
{
bool bRet = ( VarI2FromDec( maDec, rVal ) == S_OK );
@@ -369,7 +363,6 @@ void SbxDecimal::setUInt( unsigned int val ){
(void)val; }
bool SbxDecimal::setString( ::rtl::OUString* pOUString ){ (void)pOUString;
return false; }
bool SbxDecimal::getChar( sal_Unicode rVal ) { (void)rVal; return false; }
-bool SbxDecimal::getByte( sal_uInt8 rVal ) { (void)rVal; return
false; }
bool SbxDecimal::getShort( sal_Int16 rVal ){ (void)rVal; return
false; }
bool SbxDecimal::getLong( sal_Int32 rVal ) { (void)rVal; return
false; }
bool SbxDecimal::getUShort( sal_uInt16 rVal ) { (void)rVal; return
false; }
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index 533ffb9..3e86468 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -96,7 +96,6 @@ public:
}
bool getChar( sal_Unicode rVal );
-bool getByte( sal_uInt8 rVal );
bool getShort( sal_Int16 rVal );
bool getLong( sal_Int32 rVal );
bool getUShort( sal_uInt16 rVal );
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 52244f6..387ff69 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -375,7 +375,6 @@ public:
ScAddress aPos;
~ScFormulaCell();
-ScFormulaCell();
/** Empty formula cell, or with a preconstructed token array. */
ScFormulaCell( ScDocument*, const ScAddress, const ScTokenArray* = NULL,
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 74e9330..48d6391 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -723,32 +723,6 @@ ScStringCell::~ScStringCell()
// ScFormulaCell
//
-ScFormulaCell::ScFormulaCell() :
-ScBaseCell(
[Libreoffice-commits] .: unusedcode.easy xmloff/inc xmloff/source
unusedcode.easy |1 -
xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx |1 -
xmloff/source/text/XMLTextListAutoStylePool.cxx |5 -
3 files changed, 7 deletions(-)
New commits:
commit 9846e25d94d6029f3a0726ae35e96db342506c80
Author: Santiago Martinez smvar...@gmail.com
Date: Sun Feb 19 19:01:09 2012 +0100
Remove unused code in XMLTextListAutoStylePool.
diff --git a/unusedcode.easy b/unusedcode.easy
index 8a32c46..5b2416e 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -535,7 +535,6 @@ XMLPropertyBackpatchershort::XMLPropertyBackpatcher(char
const*)
XMLPropertyBackpatchershort::XMLPropertyBackpatcher(char const*, char
const*, unsigned char, short)
XMLPropertyBackpatchershort::XMLPropertyBackpatcher(rtl::OUString const,
rtl::OUString const, unsigned char, short)
XMLTextFieldExport::ProcessDate(xmloff::token::XMLTokenEnum,
com::sun::star::util::Date const, unsigned short)
-XMLTextListAutoStylePool::HasName(rtl::OUString const) const
XMLTextListAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl
const*) const
diff --git a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
index b1dbb67..8c39819 100644
--- a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
@@ -67,7 +67,6 @@ public:
~XMLTextListAutoStylePool();
void RegisterName( const ::rtl::OUString rName );
-sal_Bool HasName( const ::rtl::OUString rName ) const;
::rtl::OUString Add(
const ::com::sun::star::uno::Reference
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx
b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index f7bc70f..8becfb7 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -203,11 +203,6 @@ void XMLTextListAutoStylePool::RegisterName( const
OUString rName )
delete pName;
}
-sal_Bool XMLTextListAutoStylePool::HasName( const OUString rName ) const
-{
-return pNames-Seek_Entry( rName, 0 );
-}
-
sal_uInt32 XMLTextListAutoStylePool::Find( XMLTextListAutoStylePoolEntry_Impl*
pEntry ) const
{
sal_uLong nPos;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basegfx/inc basegfx/source unusedcode.easy
basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx|2 basegfx/inc/basegfx/polygon/b2dpolygontools.hxx | 58 --- basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx |4 basegfx/inc/basegfx/polygon/b3dpolygontools.hxx |5 basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx |1 basegfx/inc/basegfx/tools/tools.hxx | 24 - basegfx/source/matrix/b2dhommatrixtools.cxx | 24 - basegfx/source/polygon/b2dpolygontools.cxx | 302 basegfx/source/polygon/b2dpolypolygontools.cxx | 22 - basegfx/source/polygon/b3dpolygontools.cxx | 99 -- basegfx/source/polygon/b3dpolypolygontools.cxx |7 basegfx/source/tools/liangbarsky.cxx| 57 --- unusedcode.easy | 14 13 files changed, 619 deletions(-) New commits: commit dbff99a60ec5268c92f1404cb01754de9186c2e8 Author: Elton Chung el...@layerjet.com Date: Mon Feb 20 00:30:16 2012 +0800 Remove unused code diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx index e53a598..cf49df0 100644 --- a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx +++ b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx @@ -56,8 +56,6 @@ namespace basegfx multiplications */ BASEGFX_DLLPUBLIC B2DHomMatrix createScaleB2DHomMatrix(double fScaleX, double fScaleY); -BASEGFX_DLLPUBLIC B2DHomMatrix createShearXB2DHomMatrix(double fShearX); -BASEGFX_DLLPUBLIC B2DHomMatrix createShearYB2DHomMatrix(double fShearY); BASEGFX_DLLPUBLIC B2DHomMatrix createRotateB2DHomMatrix(double fRadiant); BASEGFX_DLLPUBLIC B2DHomMatrix createTranslateB2DHomMatrix(double fTranslateX, double fTranslateY); diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx index 1bee9b3..86c31f3 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx @@ -154,23 +154,6 @@ namespace basegfx #define CUTFLAG_ALL (CUTFLAG_LINE|CUTFLAG_START1|CUTFLAG_START2|CUTFLAG_END1|CUTFLAG_END2) #define CUTFLAG_DEFAULT (CUTFLAG_LINE|CUTFLAG_START2|CUTFLAG_END2) -// Calculate cut between the points given by the two indices. pCut1 -// and pCut2 will contain the cut coordinate on each edge in ]0.0, 1.0] -// (if given) and the return value will contain a cut description. -BASEGFX_DLLPUBLIC CutFlagValue findCut( -const B2DPolygon rCandidate, -sal_uInt32 nIndex1, sal_uInt32 nIndex2, -CutFlagValue aCutFlags = CUTFLAG_DEFAULT, -double* pCut1 = 0L, double* pCut2 = 0L); - -// This version is working with two indexed edges from different -// polygons. -BASEGFX_DLLPUBLIC CutFlagValue findCut( -const B2DPolygon rCandidate1, sal_uInt32 nIndex1, -const B2DPolygon rCandidate2, sal_uInt32 nIndex2, -CutFlagValue aCutFlags = CUTFLAG_DEFAULT, -double* pCut1 = 0L, double* pCut2 = 0L); - // This version works with two points and vectors to define the // edges for the cut test. BASEGFX_DLLPUBLIC CutFlagValue findCut( @@ -245,17 +228,6 @@ namespace basegfx @param rRect The rectangle which describes the polygon size -@param fRadius -Radius of the edge rounding, relative to the rectangle size. 0.0 means no -rounding, 1.0 will lead to an ellipse - */ -BASEGFX_DLLPUBLIC B2DPolygon createPolygonFromRect( const B2DRectangle rRect, double fRadius ); - -/** Create a polygon from a rectangle. - -@param rRect -The rectangle which describes the polygon size - @param fRadiusX @param fRadiusY Radius of the edge rounding, relative to the rectangle size. 0.0 means no @@ -340,11 +312,6 @@ namespace basegfx // matrix and the resulting x,y is used to form the new polygon. BASEGFX_DLLPUBLIC B2DPolygon createB2DPolygonFromB3DPolygon(const B3DPolygon rCandidate, const B3DHomMatrix rMat); -// create simplified version of the original polygon by -// replacing segments with spikes/loops and self intersections -// by several trivial sub-segments -BASEGFX_DLLPUBLIC B2DPolygon createSimplifiedPolygon(const B2DPolygon); - // calculate the smallest distance to given edge and return. The relative position on the edge is returned in Cut. // That position is in the range [0.0 .. 1.0] and the returned distance is adapted accordingly to the start or end // point of the edge @@ -422,8 +389,6 @@ namespace basegfx // organisation, e.g. same amount of points BASEGFX_DLLPUBLIC B2DPolygon interpolate(const B2DPolygon rOld1, const B2DPolygon
[Libreoffice-commits] .: 5 commits - accessibility/bridge cui/source framework/source sw/source vcl/generic
accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx |4
cui/source/inc/cuitabline.hxx |2
framework/source/services/autorecovery.cxx | 165
+-
framework/source/services/modulemanager.cxx | 13
sw/source/core/doc/doccomp.cxx |1
vcl/generic/fontmanager/fontconfig.cxx | 21 +
6 files changed, 125 insertions(+), 81 deletions(-)
New commits:
commit 65a3ec97b5032d1748c8f84eeb0b8656e1c25918
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 20 12:06:52 2012 +
Resoves fdo#42901 duplicated .pfb without duplicated .afm drops font
If we have a duplicate font entry the duplicate is dropped, but
if the first font was invalid, e.g. .pfb without .afm this results
in dropping *both* fonts, the valid and invalid one
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index 4fd5d9e..db53846 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -466,6 +466,19 @@ namespace
}
}
+//FontConfig doesn't come with a way to remove an element from a FontSet as far
+//as I can see
+static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i)
+{
+FcPatternDestroy(pFSet-fonts[i]);
+
+int nTail = pFSet-nfont - (i + 1);
+--pFSet-nfont;
+if (!nTail)
+return;
+memmove(pFSet-fonts + i, pFSet-fonts + i + 1, nTail*sizeof(FcPattern*));
+}
+
int PrintFontManager::countFontconfigFonts( boost::unordered_maprtl::OString,
int, rtl::OStringHash o_rVisitedPaths )
{
int nFonts = 0;
@@ -557,7 +570,13 @@ int PrintFontManager::countFontconfigFonts(
boost::unordered_maprtl::OString, i
}
if( aFonts.empty() )
{
-// TODO: remove fonts unusable to psprint from fontset
+//remove font, reuse index
+//we want to remove unusable fonts here, in case there is a
usable font
+//which duplicates the properties of the unusable one
+//
+//not removing the unusable font will risk the usable font
being rejected
+//as a duplicate by isPreviouslyDuplicateOrObsoleted
+lcl_FcFontSetRemove(pFSet, i--);
continue;
}
commit 1be196c7fbf59fd811f19505f4691b979b6d4bdb
Author: Caolán McNamara caol...@redhat.com
Date: Sun Feb 19 19:51:40 2012 +
WaE: unused variables
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 6bbfc29..3436710 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -692,7 +692,9 @@ void AutoRecovery::implts_dispatch(const DispatchParams
aParams)
throw;
}
catch(const css::uno::Exception)
-{} // TODO better error handling
+{
+// TODO better error handling
+}
aListenerInformer.stop();
@@ -972,12 +974,12 @@ css::uno::Reference css::container::XNameAccess
AutoRecovery::implts_openConf
::comphelper::ConfigurationHelper::E_STANDARD) = nMinSpaceConfigSave;
}
catch(const css::uno::Exception)
-{
-// These config keys are not so important, that
-// we are interested on errors here realy .-)
-nMinSpaceDocSave= MIN_DISCSPACE_DOCSAVE;
-nMinSpaceConfigSave = MIN_DISCSPACE_CONFIGSAVE;
-}
+{
+// These config keys are not so important, that
+// we are interested on errors here realy .-)
+nMinSpaceDocSave= MIN_DISCSPACE_DOCSAVE;
+nMinSpaceConfigSave = MIN_DISCSPACE_CONFIGSAVE;
+}
// SAFE - --
aWriteLock.lock();
@@ -1291,7 +1293,9 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo rIn
xModify-removeByName(sID);
}
catch(const css::container::NoSuchElementException)
-{ return; }
+{
+return;
+}
}
else
{
@@ -1317,9 +1321,13 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo rIn
}
}
catch(const css::uno::RuntimeException)
-{ throw; }
+{
+throw;
+}
catch(const css::uno::Exception)
-{} // ??? can it happen that a full disc let these set of operations
fail too ???
+{
+// ??? can it happen that a full disc let these set of operations fail
too ???
+}
sal_Int32 nRetry = RETRY_STORE_ON_FULL_DISC_FOREVER;
do
@@ -1336,28 +1344,28 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo rIn
nRetry = 0;
}
catch(const css::uno::Exception)
-
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/registry/help/dp_help.cxx | 35 +---
1 file changed, 30 insertions(+), 5 deletions(-)
New commits:
commit 55892c6bd740fa0c667656cbb246327f2bb76007
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 20 13:35:57 2012 +0100
Clean up work around spurious warning about missing JRE
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index adc2875..b5250cc 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -37,8 +37,9 @@
#include ucbhelper/content.hxx
#include comphelper/servicedecl.hxx
#include svl/inettype.hxx
-#include unotools/pathoptions.hxx
+#include svtools/javainteractionhandler.hxx
#include uno/current_context.hxx
+#include unotools/pathoptions.hxx
#if !defined(ANDROID) !defined(IOS)
#include l10ntools/compilehelp.hxx
@@ -61,6 +62,29 @@ namespace backend {
namespace help {
namespace {
+// A current context that filters out java-vm.interaction-handler:
+class NonJavaCurrentContext: public cppu::WeakImplHelper1 XCurrentContext {
+public:
+NonJavaCurrentContext(Reference XCurrentContext const parent):
+parent_(parent) {}
+
+virtual Any SAL_CALL getValueByName(rtl::OUString const Name)
+throw (RuntimeException);
+
+private:
+Reference XCurrentContext parent_;
+};
+
+Any NonJavaCurrentContext::getValueByName(rtl::OUString const Name)
+throw (RuntimeException)
+{
+return
+(Name.equalsAsciiL(
+RTL_CONSTASCII_STRINGPARAM(JAVA_INTERACTION_HANDLER_NAME))
+ || !parent_.is())
+? Any() : parent_-getValueByName(Name);
+}
+
//==
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
{
@@ -421,10 +445,11 @@ void BackendImpl::implProcessHelp(
Reference script::XInvocation xInvocation;
if( xContext.is() )
{
-// Ignore the missing JRE scenario on upgrade/first-start
without
-// horrible end-user warnings that are ignorable,and cause
grief.
-Reference XCurrentContext xNoContext;
-com::sun::star::uno::ContextLayer dummyLayer( xNoContext );
+// Ignore the missing JRE scenario on upgrade/first-start
+// without horrible end-user warnings that are ignorable,
+// and cause grief:
+ContextLayer l(
+new NonJavaCurrentContext(getCurrentContext()));
try
{
xInvocation = Reference script::XInvocation (
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - xmlsecurity/source
xmlsecurity/source/helper/xsecverify.cxx | 86 ++-
1 file changed, 74 insertions(+), 12 deletions(-)
New commits:
commit e57f68d7e7811584a006ecb8e71f8f96045c48e7
Author: Michael Stahl mst...@redhat.com
Date: Sat Feb 18 00:03:39 2012 +0100
fdo#39657: fix crash when parsing XML signatures
(cherry picked from commit 67c396fb66a9c21c9eafaf4bcc3654706f643df0)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/xmlsecurity/source/helper/xsecverify.cxx
b/xmlsecurity/source/helper/xsecverify.cxx
index a61eb6e..0f22599 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -121,7 +121,12 @@ void XSecController::addSignature()
void XSecController::addReference( const rtl::OUString ouUri)
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::addReference: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.addReference(TYPE_SAMEDOCUMENT_REFERENCE,ouUri, -1 );
}
@@ -131,7 +136,12 @@ void XSecController::addStreamReference(
{
sal_Int32 type =
(isBinary?TYPE_BINARYSTREAM_REFERENCE:TYPE_XMLSTREAM_REFERENCE);
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::addStreamReference: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
if ( isi.xReferenceResolvedListener.is() )
{
@@ -154,7 +164,13 @@ void XSecController::addStreamReference(
void XSecController::setReferenceCount() const
{
-const InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setReferenceCount: no signature);
+return;
+}
+const InternalSignatureInformation isi =
+m_vInternalSignatureInformations.back();
if ( isi.xReferenceResolvedListener.is() )
{
@@ -182,51 +198,97 @@ void XSecController::setReferenceCount() const
void XSecController::setX509IssuerName( rtl::OUString ouX509IssuerName )
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setX509IssuerName: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.signatureInfor.ouX509IssuerName = ouX509IssuerName;
}
void XSecController::setX509SerialNumber( rtl::OUString ouX509SerialNumber )
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setX509SerialNumber: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.signatureInfor.ouX509SerialNumber = ouX509SerialNumber;
}
void XSecController::setX509Certificate( rtl::OUString ouX509Certificate )
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setX509Certificate: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.signatureInfor.ouX509Certificate = ouX509Certificate;
}
void XSecController::setSignatureValue( rtl::OUString ouSignatureValue )
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setSignatureValue: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.signatureInfor.ouSignatureValue = ouSignatureValue;
}
void XSecController::setDigestValue( rtl::OUString ouDigestValue )
{
-SignatureInformation si =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1].signatureInfor;
-SignatureReferenceInformation reference =
si.vSignatureReferenceInfors[si.vSignatureReferenceInfors.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setDigestValue: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
+if
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - xmlsecurity/source
xmlsecurity/source/helper/xsecverify.cxx | 86 ++-
1 file changed, 74 insertions(+), 12 deletions(-)
New commits:
commit 3c70c38272e6a5d042f558b69044d21adc9fe7d0
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 20 12:47:14 2012 +
fdo#39657: fix crash when parsing XML signatures
diff --git a/xmlsecurity/source/helper/xsecverify.cxx
b/xmlsecurity/source/helper/xsecverify.cxx
index 39c93cd..2debeab 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -123,7 +123,12 @@ void XSecController::addSignature()
void XSecController::addReference( const rtl::OUString ouUri)
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::addReference: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.addReference(TYPE_SAMEDOCUMENT_REFERENCE,ouUri, -1 );
}
@@ -133,7 +138,12 @@ void XSecController::addStreamReference(
{
sal_Int32 type =
(isBinary?TYPE_BINARYSTREAM_REFERENCE:TYPE_XMLSTREAM_REFERENCE);
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::addStreamReference: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
if ( isi.xReferenceResolvedListener.is() )
{
@@ -156,7 +166,13 @@ void XSecController::addStreamReference(
void XSecController::setReferenceCount() const
{
-const InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setReferenceCount: no signature);
+return;
+}
+const InternalSignatureInformation isi =
+m_vInternalSignatureInformations.back();
if ( isi.xReferenceResolvedListener.is() )
{
@@ -184,51 +200,97 @@ void XSecController::setReferenceCount() const
void XSecController::setX509IssuerName( rtl::OUString ouX509IssuerName )
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setX509IssuerName: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.signatureInfor.ouX509IssuerName = ouX509IssuerName;
}
void XSecController::setX509SerialNumber( rtl::OUString ouX509SerialNumber )
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setX509SerialNumber: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.signatureInfor.ouX509SerialNumber = ouX509SerialNumber;
}
void XSecController::setX509Certificate( rtl::OUString ouX509Certificate )
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setX509Certificate: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.signatureInfor.ouX509Certificate = ouX509Certificate;
}
void XSecController::setSignatureValue( rtl::OUString ouSignatureValue )
{
-InternalSignatureInformation isi =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setSignatureValue: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
isi.signatureInfor.ouSignatureValue = ouSignatureValue;
}
void XSecController::setDigestValue( rtl::OUString ouDigestValue )
{
-SignatureInformation si =
m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1].signatureInfor;
-SignatureReferenceInformation reference =
si.vSignatureReferenceInfors[si.vSignatureReferenceInfors.size()-1];
+if (m_vInternalSignatureInformations.empty())
+{
+OSL_TRACE(XSecController::setDigestValue: no signature);
+return;
+}
+InternalSignatureInformation isi =
m_vInternalSignatureInformations.back();
+if (isi.signatureInfor.vSignatureReferenceInfors.empty())
+{
+OSL_TRACE(XSecController::setDigestValue: no signature reference);
+return;
+}
+
[Libreoffice-commits] .: 2 commits - m4/mingw.m4 mythes/makefile.mk
m4/mingw.m4|7 +++ mythes/makefile.mk | 17 +++-- 2 files changed, 10 insertions(+), 14 deletions(-) New commits: commit bcf1edba4eeecba9b47d3ef983e0973b4c737871 Author: David Tardon dtar...@redhat.com Date: Mon Feb 20 14:25:34 2012 +0100 expect sed has already been detected Reportedly AC_PROG_SED does not exist on XCode 2.5 . diff --git a/m4/mingw.m4 b/m4/mingw.m4 index cd0f38f..952b2ed 100644 --- a/m4/mingw.m4 +++ b/m4/mingw.m4 @@ -1,9 +1,8 @@ # libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude]) -# uses: CC, WITH_MINGW +# uses: CC, SED, WITH_MINGW # AC_DEFUN([libo_FIND_MINGW_EXTERNAL_DLLS], -[AC_REQUIRE([AC_PROG_SED])dnl -if test $WITH_MINGW = yes -a -n $CC; then +[if test $WITH_MINGW = yes -a -n $CC; then _libo_mingw_libdir=`$CC -print-sysroot`/mingw/lib for _libo_mingw_lib in $1; do _libo_mingw_lib=$_libo_mingw_libdir/$_libo_mingw_lib.la @@ -28,7 +27,7 @@ fi[]dnl ]) # libo_FIND_MINGW_EXTERNAL_DLLS # libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable]) -# uses: CC, WITH_MINGW +# uses: CC, SED, WITH_MINGW # AC_DEFUN([libo_ADD_MINGW_EXTERNAL_DLLS], [libo_FIND_MINGW_EXTERNAL_DLLS([$1],[_libo_mingw_found_dlls],[$$2]) commit ad3b8a779db8f5ba908c59155328a4912ee0941d Author: David Tardon dtar...@redhat.com Date: Sat Feb 18 14:07:27 2012 +0100 fix mingw build of mythes with system hunspell diff --git a/mythes/makefile.mk b/mythes/makefile.mk index 46520fc..44f8ba9 100644 --- a/mythes/makefile.mk +++ b/mythes/makefile.mk @@ -46,15 +46,15 @@ PATCH_FILES=\ mythes-1.2.0-makefile-mk.diff \ mythes-1.2.0-android.patch -.IF $(GUI)==UNX -CONFIGURE_DIR=$(BUILD_DIR) - -.IF $(SYSTEM_MYTHES) != YES - +.IF $(COM)==GCC .IF $(SYSTEM_HUNSPELL) != YES HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.3 .ENDIF +.ENDIF + +.IF $(GUI)==UNX +CONFIGURE_DIR=$(BUILD_DIR) #relative to CONFIGURE_DIR # still needed also in system-mythes case as it creates the makefile @@ -86,17 +86,15 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff BUILD_ACTION=make OUT2INC += mythes.hxx -.ENDIF .ENDIF # $(GUI)==UNX .IF $(GUI)==WNT .IF $(COM)==GCC -.IF $(SYSTEM_MYTHES) != YES CONFIGURE_ACTION=configure CONFIGURE_FLAGS= --disable-shared --with-pic \ -HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \ -HUNSPELL_LIBS=-L$(SOLARLIBDIR) -lhunspell-1.3 +HUNSPELL_CFLAGS=$(HUNSPELL_CFLAGS) \ +HUNSPELL_LIBS=$(HUNSPELL_LIBS) .IF $(CROSS_COMPILING)==YES CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no @@ -104,7 +102,6 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff BUILD_ACTION=make -.ENDIF .ELSE BUILD_ACTION=dmake .ENDIF # $(COM)==GCC ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit f78cb7da33a9f69e865b28b55a212bf1d11b1d7d
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 20 14:30:13 2012 +0100
Improve check for broken -fthreadsafe-statics
diff --git a/configure.in b/configure.in
index 50a9b97..39fe207 100644
--- a/configure.in
+++ b/configure.in
@@ -4282,8 +4282,14 @@ if test $GCC = yes; then
dnl return n;
dnl }
dnl
-dnl Mac OS X up to at least 10.7.1 is known to have this problem:
-if test $_os = Darwin; then
+dnl Mac OS X up to at least 10.7.1 is known to have this problem, as is
+dnl at least one instance of GCC 4.2.4 (used on a Linux
+dnl ooobuild1.osuosl.org 2.6.9-101.plus.c4smp #1 SMP Thu Jul 21
19:08:15
+dnl EDT 2011 i686 i686 i386 GNU/Linux machine); see the definition of
+dnl __cxa_guard_acquire in GCC's libstdc++-v3/libsupc++/guard.cc for
+dnl what #ifdefs actually make a difference there. Conservative advice
+dnl from Jakub Jelinek is to assume it working in GCC = 4.3:
+if test $_os = Darwin -o ${GCCVER?} -lt 040300; then
unset HAVE_THREADSAFE_STATICS
AC_MSG_RESULT([broken (i.e., no)])
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in
configure.in | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit bb0f6b0c7c745264da38b91e0eca39a6f5ad934d
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 20 14:30:13 2012 +0100
Improve check for broken -fthreadsafe-statics
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/configure.in b/configure.in
index 4667f0b..26a500a 100644
--- a/configure.in
+++ b/configure.in
@@ -3626,8 +3626,14 @@ if test $GCC = yes; then
dnl return n;
dnl }
dnl
-dnl Mac OS X up to at least 10.7.1 is known to have this problem:
-if test $_os = Darwin; then
+dnl Mac OS X up to at least 10.7.1 is known to have this problem, as is
+dnl at least one instance of GCC 4.2.4 (used on a Linux
+dnl ooobuild1.osuosl.org 2.6.9-101.plus.c4smp #1 SMP Thu Jul 21
19:08:15
+dnl EDT 2011 i686 i686 i386 GNU/Linux machine); see the definition of
+dnl __cxa_guard_acquire in GCC's libstdc++-v3/libsupc++/guard.cc for
+dnl what #ifdefs actually make a difference there. Conservative advice
+dnl from Jakub Jelinek is to assume it working in GCC = 4.3:
+if test $_os = Darwin -o ${GCCVER?} -lt 040300; then
unset HAVE_THREADSAFE_STATICS
AC_MSG_RESULT([broken (i.e., no)])
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - desktop/source stoc/source
desktop/source/deployment/registry/help/dp_help.cxx | 30
stoc/source/javavm/javavm.cxx | 10 +-
2 files changed, 38 insertions(+), 2 deletions(-)
New commits:
commit c97a01d009f8b5f686998f3638cff25e228a1305
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 20 13:35:57 2012 +0100
Clean up work around spurious warning about missing JRE
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index ba1009c..43762f2 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -37,8 +37,9 @@
#include ucbhelper/content.hxx
#include comphelper/servicedecl.hxx
#include svl/inettype.hxx
-#include unotools/pathoptions.hxx
+#include svtools/javainteractionhandler.hxx
#include uno/current_context.hxx
+#include unotools/pathoptions.hxx
#include l10ntools/compilehelp.hxx
#include com/sun/star/ucb/XSimpleFileAccess.hpp
@@ -59,6 +60,29 @@ namespace backend {
namespace help {
namespace {
+// A current context that filters out java-vm.interaction-handler:
+class NonJavaCurrentContext: public cppu::WeakImplHelper1 XCurrentContext {
+public:
+NonJavaCurrentContext(Reference XCurrentContext const parent):
+parent_(parent) {}
+
+virtual Any SAL_CALL getValueByName(rtl::OUString const Name)
+throw (RuntimeException);
+
+private:
+Reference XCurrentContext parent_;
+};
+
+Any NonJavaCurrentContext::getValueByName(rtl::OUString const Name)
+throw (RuntimeException)
+{
+return
+(Name.equalsAsciiL(
+RTL_CONSTASCII_STRINGPARAM(JAVA_INTERACTION_HANDLER_NAME))
+ || !parent_.is())
+? Any() : parent_-getValueByName(Name);
+}
+
//==
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
{
@@ -418,10 +442,11 @@ void BackendImpl::implProcessHelp(
Reference script::XInvocation xInvocation;
if( xContext.is() )
{
-// Ignore the missing JRE scenario on upgrade/first-start
without
-// horrible end-user warnings that are ignorable,and cause
grief.
-Reference XCurrentContext xNoContext;
-com::sun::star::uno::ContextLayer dummyLayer( xNoContext );
+// Ignore the missing JRE scenario on upgrade/first-start
+// without horrible end-user warnings that are ignorable,
+// and cause grief:
+ContextLayer l(
+new NonJavaCurrentContext(getCurrentContext()));
try
{
xInvocation = Reference script::XInvocation (
commit 5004de693a95ba3678ec41f25bb55beef4a32ed1
Author: Michael Meeks michael.me...@suse.com
Date: Thu Feb 16 12:44:56 2012 +
disable JRE warnings during help compilation on first start
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index 9d96328..ba1009c 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -38,6 +38,7 @@
#include comphelper/servicedecl.hxx
#include svl/inettype.hxx
#include unotools/pathoptions.hxx
+#include uno/current_context.hxx
#include l10ntools/compilehelp.hxx
#include com/sun/star/ucb/XSimpleFileAccess.hpp
@@ -417,6 +418,10 @@ void BackendImpl::implProcessHelp(
Reference script::XInvocation xInvocation;
if( xContext.is() )
{
+// Ignore the missing JRE scenario on upgrade/first-start
without
+// horrible end-user warnings that are ignorable,and cause
grief.
+Reference XCurrentContext xNoContext;
+com::sun::star::uno::ContextLayer dummyLayer( xNoContext );
try
{
xInvocation = Reference script::XInvocation (
commit 92b7c7db8356beef47df682b993e1aaeeb9a734c
Author: Michael Meeks michael.me...@suse.com
Date: Thu Feb 16 12:38:24 2012 +
java: add STOC_FORCE_NO_JRE env. var to enable easy testing of no-JRE case.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 33d8280..2640f1d 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -782,8 +782,12 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence sal_Int8
const rProcessId)
JNIEnv * pMainThreadEnv = 0;
javaFrameworkError errcode = JFW_E_NONE;
-errcode = jfw_startVM(arOptions, index,
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - i18npool/source
i18npool/source/localedata/data/bn_IN.xml |9 ++ i18npool/source/localedata/data/en_IN.xml |9 ++ i18npool/source/localedata/data/gu_IN.xml | 103 +++-- i18npool/source/localedata/data/hi_IN.xml | 16 i18npool/source/localedata/data/kn_IN.xml | 16 i18npool/source/localedata/data/mai_IN.xml |9 ++ i18npool/source/localedata/data/ml_IN.xml |9 ++ i18npool/source/localedata/data/mr_IN.xml |2 i18npool/source/localedata/data/or_IN.xml |9 ++ i18npool/source/localedata/data/pa_IN.xml |9 ++ i18npool/source/localedata/data/ta_IN.xml | 16 i18npool/source/localedata/data/te_IN.xml | 16 12 files changed, 164 insertions(+), 59 deletions(-) New commits: commit a59d3769e333ca85de1bb307251a95249827236c Author: Eike Rathke er...@redhat.com Date: Mon Feb 20 15:03:52 2012 +0100 resolved rhbz#794679 use proper Indian Rupee currency symbol U+20B9 Additionally fixes in gu-IN localization of day and month names contributed by Ankitkumar Rameshchandra Patel an...@redhat.com Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/i18npool/source/localedata/data/bn_IN.xml b/i18npool/source/localedata/data/bn_IN.xml index 1dc7992..cf845ea 100644 --- a/i18npool/source/localedata/data/bn_IN.xml +++ b/i18npool/source/localedata/data/bn_IN.xml @@ -34,7 +34,7 @@ TimePMঠপরাহà§à¦£/TimePM MeasurementSystemmetric/MeasurementSystem /LC_CTYPE - LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$৳-445] + LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$â¹-445] FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement @@ -308,6 +308,13 @@ LC_CURRENCY Currency default=true usedInCompatibleFormatCodes=true CurrencyIDINR/CurrencyID + CurrencySymbolâ¹/CurrencySymbol + BankSymbolINR/BankSymbol + CurrencyNameRupee/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency +Currency default=false usedInCompatibleFormatCodes=false legacyOnly=true + CurrencyIDINR/CurrencyID CurrencySymbol৳/CurrencySymbol BankSymbolINR/BankSymbol CurrencyNameRupee/CurrencyName diff --git a/i18npool/source/localedata/data/en_IN.xml b/i18npool/source/localedata/data/en_IN.xml index 9c404f5..c802f64 100644 --- a/i18npool/source/localedata/data/en_IN.xml +++ b/i18npool/source/localedata/data/en_IN.xml @@ -12,7 +12,7 @@ /Country /LC_INFO LC_CTYPE ref=en_GB/ - LC_FORMAT ref=en_GB replaceTo=[$Rs.-4009]/ + LC_FORMAT ref=en_GB replaceTo=[$â¹-4009]/ LC_COLLATION ref=en_US/ LC_SEARCH ref=en_US/ LC_INDEX ref=en_US/ @@ -30,6 +30,13 @@ LC_CURRENCY Currency default=true usedInCompatibleFormatCodes=true CurrencyIDINR/CurrencyID + CurrencySymbolâ¹/CurrencySymbol + BankSymbolINR/BankSymbol + CurrencyNameRupee/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency +Currency default=false usedInCompatibleFormatCodes=false legacyOnly=true + CurrencyIDINR/CurrencyID CurrencySymbolRs./CurrencySymbol BankSymbolINR/BankSymbol CurrencyNameIndian Rupee/CurrencyName diff --git a/i18npool/source/localedata/data/gu_IN.xml b/i18npool/source/localedata/data/gu_IN.xml index f5923a7..6097289 100644 --- a/i18npool/source/localedata/data/gu_IN.xml +++ b/i18npool/source/localedata/data/gu_IN.xml @@ -12,7 +12,7 @@ /Country /LC_INFO LC_CTYPE ref=hi_IN/ -LC_FORMAT ref=hi_IN replaceTo=[$àªà«.-447]/ +LC_FORMAT ref=hi_IN replaceTo=[$â¹-447]/ LC_COLLATION ref=hi_IN/ LC_SEARCH ref=hi_IN/ LC_INDEX ref=en_US/ @@ -21,112 +21,112 @@ DaysOfWeek Day DayIDsun/DayID -DefaultAbbrvNameàªàªµàª¿./DefaultAbbrvName -DefaultFullNameàªàªµàª¿àªµàª¾àª/DefaultFullName +DefaultAbbrvNameરવિ/DefaultAbbrvName +DefaultFullNameરવિવાર/DefaultFullName /Day Day DayIDmon/DayID -DefaultAbbrvNameસà«àª®./DefaultAbbrvName -DefaultFullNameસà«àª®àªµàª¾àªà«/DefaultFullName +DefaultAbbrvNameસà«àª®àªµàª¾àª°/DefaultAbbrvName +DefaultFullNameસà«àª®àªµàª¾àª°/DefaultFullName /Day Day DayIDtue/DayID -DefaultAbbrvNameમàªàªàª²./DefaultAbbrvName -DefaultFullNameમàªàªàª²àªµàª¾àª/DefaultFullName +DefaultAbbrvNameમàªàªàª³/DefaultAbbrvName +DefaultFullNameમàªàªàª³àªµàª¾àª°/DefaultFullName /Day Day DayIDwed/DayID -DefaultAbbrvNameબà«àª§./DefaultAbbrvName -DefaultFullNameબà«àª§àªµàª¾àª/DefaultFullName +DefaultAbbrvNameબà«àª§/DefaultAbbrvName +DefaultFullNameબà«àª§àªµàª¾àª°/DefaultFullName /Day Day DayIDthu/DayID -DefaultAbbrvNameàªà«àªà«./DefaultAbbrvName -DefaultFullNameàªà«àªà«àªµàª¾àª/DefaultFullName +DefaultAbbrvNameàªà«àª°à«/DefaultAbbrvName +DefaultFullNameàªà«àª°à«àªµàª¾àª°/DefaultFullName /Day Day DayIDfri/DayID -DefaultAbbrvNameશà«àªà«àª./DefaultAbbrvName -DefaultFullNameશà«àªà«àªàªµàª¾àª/DefaultFullName
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - i18npool/source
i18npool/source/localedata/data/bn_IN.xml |9 ++ i18npool/source/localedata/data/en_IN.xml |9 ++ i18npool/source/localedata/data/gu_IN.xml | 103 +++-- i18npool/source/localedata/data/hi_IN.xml | 16 i18npool/source/localedata/data/kn_IN.xml | 16 i18npool/source/localedata/data/mai_IN.xml |9 ++ i18npool/source/localedata/data/ml_IN.xml |9 ++ i18npool/source/localedata/data/mr_IN.xml |2 i18npool/source/localedata/data/or_IN.xml |9 ++ i18npool/source/localedata/data/pa_IN.xml |9 ++ i18npool/source/localedata/data/ta_IN.xml | 16 i18npool/source/localedata/data/te_IN.xml | 16 12 files changed, 164 insertions(+), 59 deletions(-) New commits: commit beefd1d27a8292a2fc12c5956400dedc0430e410 Author: Eike Rathke er...@redhat.com Date: Mon Feb 20 15:12:40 2012 +0100 resolved rhbz#794679 use proper Indian Rupee currency symbol U+20B9 Additionally fixes in gu-IN localization of day and month names contributed by Ankitkumar Rameshchandra Patel an...@redhat.com Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/i18npool/source/localedata/data/bn_IN.xml b/i18npool/source/localedata/data/bn_IN.xml index 1dc7992..cf845ea 100644 --- a/i18npool/source/localedata/data/bn_IN.xml +++ b/i18npool/source/localedata/data/bn_IN.xml @@ -34,7 +34,7 @@ TimePMঠপরাহà§à¦£/TimePM MeasurementSystemmetric/MeasurementSystem /LC_CTYPE - LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$৳-445] + LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$â¹-445] FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement @@ -308,6 +308,13 @@ LC_CURRENCY Currency default=true usedInCompatibleFormatCodes=true CurrencyIDINR/CurrencyID + CurrencySymbolâ¹/CurrencySymbol + BankSymbolINR/BankSymbol + CurrencyNameRupee/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency +Currency default=false usedInCompatibleFormatCodes=false legacyOnly=true + CurrencyIDINR/CurrencyID CurrencySymbol৳/CurrencySymbol BankSymbolINR/BankSymbol CurrencyNameRupee/CurrencyName diff --git a/i18npool/source/localedata/data/en_IN.xml b/i18npool/source/localedata/data/en_IN.xml index 9c404f5..c802f64 100644 --- a/i18npool/source/localedata/data/en_IN.xml +++ b/i18npool/source/localedata/data/en_IN.xml @@ -12,7 +12,7 @@ /Country /LC_INFO LC_CTYPE ref=en_GB/ - LC_FORMAT ref=en_GB replaceTo=[$Rs.-4009]/ + LC_FORMAT ref=en_GB replaceTo=[$â¹-4009]/ LC_COLLATION ref=en_US/ LC_SEARCH ref=en_US/ LC_INDEX ref=en_US/ @@ -30,6 +30,13 @@ LC_CURRENCY Currency default=true usedInCompatibleFormatCodes=true CurrencyIDINR/CurrencyID + CurrencySymbolâ¹/CurrencySymbol + BankSymbolINR/BankSymbol + CurrencyNameRupee/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency +Currency default=false usedInCompatibleFormatCodes=false legacyOnly=true + CurrencyIDINR/CurrencyID CurrencySymbolRs./CurrencySymbol BankSymbolINR/BankSymbol CurrencyNameIndian Rupee/CurrencyName diff --git a/i18npool/source/localedata/data/gu_IN.xml b/i18npool/source/localedata/data/gu_IN.xml index f5923a7..6097289 100644 --- a/i18npool/source/localedata/data/gu_IN.xml +++ b/i18npool/source/localedata/data/gu_IN.xml @@ -12,7 +12,7 @@ /Country /LC_INFO LC_CTYPE ref=hi_IN/ -LC_FORMAT ref=hi_IN replaceTo=[$àªà«.-447]/ +LC_FORMAT ref=hi_IN replaceTo=[$â¹-447]/ LC_COLLATION ref=hi_IN/ LC_SEARCH ref=hi_IN/ LC_INDEX ref=en_US/ @@ -21,112 +21,112 @@ DaysOfWeek Day DayIDsun/DayID -DefaultAbbrvNameàªàªµàª¿./DefaultAbbrvName -DefaultFullNameàªàªµàª¿àªµàª¾àª/DefaultFullName +DefaultAbbrvNameરવિ/DefaultAbbrvName +DefaultFullNameરવિવાર/DefaultFullName /Day Day DayIDmon/DayID -DefaultAbbrvNameસà«àª®./DefaultAbbrvName -DefaultFullNameસà«àª®àªµàª¾àªà«/DefaultFullName +DefaultAbbrvNameસà«àª®àªµàª¾àª°/DefaultAbbrvName +DefaultFullNameસà«àª®àªµàª¾àª°/DefaultFullName /Day Day DayIDtue/DayID -DefaultAbbrvNameમàªàªàª²./DefaultAbbrvName -DefaultFullNameમàªàªàª²àªµàª¾àª/DefaultFullName +DefaultAbbrvNameમàªàªàª³/DefaultAbbrvName +DefaultFullNameમàªàªàª³àªµàª¾àª°/DefaultFullName /Day Day DayIDwed/DayID -DefaultAbbrvNameબà«àª§./DefaultAbbrvName -DefaultFullNameબà«àª§àªµàª¾àª/DefaultFullName +DefaultAbbrvNameબà«àª§/DefaultAbbrvName +DefaultFullNameબà«àª§àªµàª¾àª°/DefaultFullName /Day Day DayIDthu/DayID -DefaultAbbrvNameàªà«àªà«./DefaultAbbrvName -DefaultFullNameàªà«àªà«àªµàª¾àª/DefaultFullName +DefaultAbbrvNameàªà«àª°à«/DefaultAbbrvName +DefaultFullNameàªà«àª°à«àªµàª¾àª°/DefaultFullName /Day Day DayIDfri/DayID -DefaultAbbrvNameશà«àªà«àª./DefaultAbbrvName -DefaultFullNameશà«àªà«àªàªµàª¾àª/DefaultFullName
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dictionaries/en dictionaries/hu_HU dictionaries/ru_RU
dictionaries/en/makefile.mk | 19 ++- dictionaries/hu_HU/makefile.mk | 21 - dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties | 15 --- dictionaries/ru_RU/makefile.mk | 20 ++-- 4 files changed, 56 insertions(+), 19 deletions(-) New commits: commit 73cb0b803db1ccd841b4d43e2dcd1cc3ba8dd69a Author: Andras Timar ati...@suse.com Date: Mon Feb 20 10:01:50 2012 +0100 enable localization of Lightproof extensions (cherry picked from commit 312a744c1c8a4afce0fe06a4423d97ebb883fc6d) Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/dictionaries/en/makefile.mk b/dictionaries/en/makefile.mk index fc51ec1..ac9f7f6 100644 --- a/dictionaries/en/makefile.mk +++ b/dictionaries/en/makefile.mk @@ -88,7 +88,6 @@ COMPONENT_FILES= \ $(EXTENSIONDIR)$/dialog/en_en_US.default \ $(EXTENSIONDIR)$/dialog/en_en_US.properties \ $(EXTENSIONDIR)$/dialog/en.xdl \ -$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu \ $(EXTENSIONDIR)$/dialog/OptionsDialog.xcs COMPONENT_CONFIGDEST=. @@ -103,6 +102,13 @@ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE) COMPONENT_UNZIP_FILES= \ $(EXTENSIONDIR)$/th_en_US_v2.idx +.IF $(WITH_LANG) != +PROPERTIES_LOCALIZED:=$(MISC)/$(EXTENSIONNAME)_in/properties_localized +COMPONENT_UNZIP_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu $(PROPERTIES_LOCALIZED) +.ELSE +COMPONENT_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu +.ENDIF + # add own targets to packing dependencies (need to be done before # packing the xtension # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE) @@ -123,4 +129,15 @@ $(EXTENSIONDIR)$/th_en_US_v2.idx : $(EXTENSIONDIR)$/th_en_US_v2.dat $(DESCRIPTION_SRC) : description.xml @@-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $ -o $@ -m $(LOCALIZESDF) -l all +$(EXTENSIONDIR)/dialog/OptionsDialog.xcu : dialog/OptionsDialog.xcu +$(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) \ +-i $ \ +-o $(EXTENSIONDIR)/dialog/OptionsDialog.xcu \ +-m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/en/dialog/localize.sdf \ +-l all +$(PROPERTIES_LOCALIZED) : $(EXTENSIONDIR)/dialog/en_en_US.properties +$(COMMAND_ECHO)$(PERL) $(OUTDIR)/bin/propmerge \ +-i $ \ +-m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/en/dialog/localize.sdf +@@-$(TOUCH) $(PROPERTIES_LOCALIZED) .ENDIF diff --git a/dictionaries/hu_HU/makefile.mk b/dictionaries/hu_HU/makefile.mk index 67916e4..998f692 100644 --- a/dictionaries/hu_HU/makefile.mk +++ b/dictionaries/hu_HU/makefile.mk @@ -72,7 +72,6 @@ COMPONENT_FILES= \ $(EXTENSIONDIR)$/dialog/hu_HU_en_US.properties \ $(EXTENSIONDIR)$/dialog/hu_HU_hu_HU.properties \ $(EXTENSIONDIR)$/dialog/hu_HU.xdl \ -$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu \ $(EXTENSIONDIR)$/dialog/OptionsDialog.xcs \ $(EXTENSIONDIR)$/README_lightproof_hu_HU.txt @@ -88,6 +87,14 @@ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE) COMPONENT_UNZIP_FILES= \ $(EXTENSIONDIR)$/th_hu_HU_v2.idx +.IF $(WITH_LANG) != +PROPERTIES_LOCALIZED:=$(MISC)/$(EXTENSIONNAME)_in/properties_localized +COMPONENT_UNZIP_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu $(PROPERTIES_LOCALIZED) +.ELSE +COMPONENT_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu +.ENDIF + + # add own targets to packing dependencies (need to be done before # packing the xtension # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE) @@ -108,4 +115,16 @@ $(EXTENSIONDIR)$/th_hu_HU_v2.idx : $(EXTENSIONDIR)$/th_hu_HU_v2.dat $(DESCRIPTION_SRC) : description.xml @@-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $ -o $@ -m $(LOCALIZESDF) -l all +$(EXTENSIONDIR)/dialog/OptionsDialog.xcu : dialog/OptionsDialog.xcu +$(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) \ +-i $ \ +-o $(EXTENSIONDIR)/dialog/OptionsDialog.xcu \ +-m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/hu_HU/dialog/localize.sdf \ +-l all +$(PROPERTIES_LOCALIZED) : $(EXTENSIONDIR)/dialog/hu_HU_en_US.properties +$(COMMAND_ECHO)$(PERL) $(OUTDIR)/bin/propmerge \ +-i $ \ +-m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/hu_HU/dialog/localize.sdf +@@-rm $(EXTENSIONDIR)/dialog/hu_HU_hu.properties +@@-$(TOUCH) $(PROPERTIES_LOCALIZED) .ENDIF diff --git a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties b/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties deleted file mode 100644 index d7df847..000 --- a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties +++ /dev/null @@ -1,15 +0,0 @@
[Libreoffice-commits] .: sw/source
sw/source/core/layout/paintfrm.cxx | 36 +---
1 file changed, 33 insertions(+), 3 deletions(-)
New commits:
commit 7794baf89e74fc8308c8e1505f47d60b6547465f
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Feb 20 15:36:29 2012 +0100
fdo#46073: Implemented soft boundaries only w/o non-printing chars
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 206bdc9..ba89741 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6307,6 +6307,27 @@ drawinglayer::primitive2d::Primitive2DSequence
lcl_CreatePageAreaDelimiterPrimit
return aSeq;
}
+drawinglayer::primitive2d::Primitive2DSequence
lcl_CreateRectangleDelimiterPrimitives (
+const SwRect rRect )
+{
+drawinglayer::primitive2d::Primitive2DSequence aSeq( 1 );
+basegfx::BColor aLineColor =
SwViewOption::GetDocBoundariesColor().getBColor();
+
+basegfx::B2DPolygon aPolygon;
+aPolygon.append( basegfx::B2DPoint( rRect.Left(), rRect.Top() ) );
+aPolygon.append( basegfx::B2DPoint( rRect.Right(), rRect.Top() ) );
+aPolygon.append( basegfx::B2DPoint( rRect.Right(), rRect.Bottom() ) );
+aPolygon.append( basegfx::B2DPoint( rRect.Left(), rRect.Bottom() ) );
+aPolygon.setClosed( true );
+
+drawinglayer::primitive2d::PolygonHairlinePrimitive2D* pLine =
+new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
+aPolygon, aLineColor );
+aSeq[0] = drawinglayer::primitive2d::Primitive2DReference( pLine );
+
+return aSeq;
+}
+
drawinglayer::primitive2d::Primitive2DSequence
lcl_CreateColumnAreaDelimiterPrimitives(
const SwRect rRect )
{
@@ -6362,7 +6383,10 @@ void SwPageFrm::PaintSubsidiaryLines( const SwPageFrm *,
if ( pFtnCont )
aArea.AddBottom( pFtnCont-Frm().Bottom() - aArea.Bottom() );
-ProcessPrimitives( lcl_CreatePageAreaDelimiterPrimitives( aArea ) );
+if ( !pGlobalShell-GetViewOptions()-IsViewMetaChars( ) )
+ProcessPrimitives( lcl_CreatePageAreaDelimiterPrimitives( aArea )
);
+else
+ProcessPrimitives( lcl_CreateRectangleDelimiterPrimitives( aArea )
);
}
}
@@ -6399,7 +6423,10 @@ void SwColumnFrm::PaintSubsidiaryLines( const SwPageFrm
*,
::SwAlignRect( aArea, pGlobalShell );
-ProcessPrimitives( lcl_CreateColumnAreaDelimiterPrimitives( aArea ) );
+if ( !pGlobalShell-GetViewOptions()-IsViewMetaChars( ) )
+ProcessPrimitives( lcl_CreateColumnAreaDelimiterPrimitives( aArea ) );
+else
+ProcessPrimitives( lcl_CreateRectangleDelimiterPrimitives( aArea ) );
}
void SwSectionFrm::PaintSubsidiaryLines( const SwPageFrm * pPage,
@@ -6426,7 +6453,10 @@ void SwHeadFootFrm::PaintSubsidiaryLines( const
SwPageFrm *, const SwRect ) co
{
SwRect aArea( Prt() );
aArea.Pos() += Frm().Pos();
-ProcessPrimitives( lcl_CreatePageAreaDelimiterPrimitives( aArea ) );
+if ( !pGlobalShell-GetViewOptions()-IsViewMetaChars( ) )
+ProcessPrimitives( lcl_CreatePageAreaDelimiterPrimitives( aArea )
);
+else
+ProcessPrimitives( lcl_CreateRectangleDelimiterPrimitives( aArea )
);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 ++-
writerfilter/source/dmapper/PropertyIds.cxx |1 +
writerfilter/source/dmapper/PropertyIds.hxx |1 +
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 4ac48167662c592c21025b89fe8f6925c680c6e0
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Feb 20 15:46:08 2012 +0100
n#695479 fix rtf/docx import of transparent frames
Previously all frames were opaque by default, which is the Writer but
not the docx/rtf default. Change the default, while keeping the
possibility to set an opaque color background for the frame.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7fa1342..b4f52ee 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -703,7 +703,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
StyleSheetEntryPtr pParaStyle =
GetStyleSheetTable()-FindStyleSheetByConvertedStyleName(rAppendContext.pLastParagraphProperties-GetParaStyleName());
-uno::Sequence beans::PropertyValue aFrameProperties(pParaStyle
? 15: 9);
+uno::Sequence beans::PropertyValue aFrameProperties(pParaStyle
? 16: 9);
if ( pParaStyle.get( ) )
{
@@ -723,6 +723,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
pFrameProperties[12].Name =
rPropNameSupplier.GetName(PROP_RIGHT_MARGIN);
pFrameProperties[13].Name =
rPropNameSupplier.GetName(PROP_TOP_MARGIN);
pFrameProperties[14].Name =
rPropNameSupplier.GetName(PROP_BOTTOM_MARGIN);
+pFrameProperties[15].Name =
rPropNameSupplier.GetName(PROP_BACK_COLOR_TRANSPARENCY);
const ParagraphProperties* pStyleProperties =
dynamic_castconst ParagraphProperties*( pParaStyle-pProperties.get() );
sal_Int32 nWidth =
@@ -795,6 +796,10 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
pStyleProperties-GetvSpace() = 0 ?
pStyleProperties-GetvSpace() : 0;
pFrameProperties[13].Value = nHoriOrient ==
text::HoriOrientation::LEFT ? 0 : nLeftDist;
pFrameProperties[14].Value = nHoriOrient ==
text::HoriOrientation::RIGHT ? 0 : nRightDist;
+// If there is no fill, the Word default is 100% transparency.
+// Otherwise CellColorHandler has priority, and this setting
+// will be ignored.
+pFrameProperties[15].Value = 100;
lcl_MoveBorderPropertiesToFrame(aFrameProperties,
rAppendContext.pLastParagraphProperties-GetStartingRange(),
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 173be40..c8f8a55 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -196,6 +196,7 @@ const rtl::OUString PropertyNameSupplier::GetName(
PropertyIds eId ) const
case PROP_CONTOUR_POLY_POLYGON :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ContourPolyPolygon)); break;
case PROP_PAGE_TOGGLE :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PageToggle)); break;
case PROP_BACK_COLOR :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BackColor)); break;
+case PROP_BACK_COLOR_TRANSPARENCY: sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BackColorTransparency)); break;
case PROP_ALTERNATIVE_TEXT :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(AlternativeText)); break;
case PROP_HEADER_TEXT_LEFT :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(HeaderTextLeft)); break;
case PROP_HEADER_TEXT :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(HeaderText)); break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index dd20f06..b109cd6 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -51,6 +51,7 @@ enum PropertyIds
,PROP_ANCHOR_TYPE
,PROP_AUTOMATIC_DISTANCE
,PROP_BACK_COLOR
+,PROP_BACK_COLOR_TRANSPARENCY
,PROP_BITMAP
,PROP_BOTTOM_BORDER
,PROP_BOTTOM_BORDER_DISTANCE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dictionaries/ar dictionaries/bg_BG dictionaries/ca dictionaries/cs_CZ dictionaries/da_DK dictionaries/de dictionaries/en dictionaries/fr_FR dictionaries/hu_HU dictionaries/it_
dictionaries/ar/makefile.mk|2 +- dictionaries/bg_BG/makefile.mk |2 +- dictionaries/ca/makefile.mk|2 +- dictionaries/cs_CZ/makefile.mk |2 +- dictionaries/da_DK/makefile.mk |2 +- dictionaries/de/makefile.mk|4 ++-- dictionaries/en/makefile.mk|2 +- dictionaries/fr_FR/makefile.mk |2 +- dictionaries/hu_HU/makefile.mk |2 +- dictionaries/it_IT/makefile.mk |2 +- dictionaries/lv_LV/makefile.mk |2 +- dictionaries/ne_NP/makefile.mk |2 +- dictionaries/no/makefile.mk|4 ++-- dictionaries/pl_PL/makefile.mk |2 +- dictionaries/pt_PT/makefile.mk |2 +- dictionaries/ro/makefile.mk|2 +- dictionaries/ru_RU/makefile.mk |2 +- dictionaries/sk_SK/makefile.mk |2 +- dictionaries/sl_SI/makefile.mk |2 +- dictionaries/sv_SE/makefile.mk |2 +- dictionaries/uk_UA/makefile.mk |2 +- 21 files changed, 23 insertions(+), 23 deletions(-) New commits: commit cc501356222739f54b8e332b0760bc726850def7 Author: Andras Timar ati...@suse.com Date: Mon Feb 20 15:57:50 2012 +0100 add $(COMMAND_ECHO) before idxdict line diff --git a/dictionaries/ar/makefile.mk b/dictionaries/ar/makefile.mk index dac74a8..2608e3f 100644 --- a/dictionaries/ar/makefile.mk +++ b/dictionaries/ar/makefile.mk @@ -91,4 +91,4 @@ $(DESCRIPTION_SRC) : description.xml .ENDIF $(EXTENSIONDIR)$/th_ar.idx : $(EXTENSIONDIR)$/th_ar.dat - $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ar.idx $(EXTENSIONDIR)$/th_ar.dat + $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ar.idx $(EXTENSIONDIR)$/th_ar.dat diff --git a/dictionaries/bg_BG/makefile.mk b/dictionaries/bg_BG/makefile.mk index 2e818cb..4730011 100644 --- a/dictionaries/bg_BG/makefile.mk +++ b/dictionaries/bg_BG/makefile.mk @@ -87,7 +87,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES) .INCLUDE : $(PRJ)$/prj$/tests.mk $(EXTENSIONDIR)$/th_bg_BG_v2.idx : $(EXTENSIONDIR)$/th_bg_BG_v2.dat - $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_bg_BG_v2.idx $(EXTENSIONDIR)$/th_bg_BG_v2.dat + $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_bg_BG_v2.idx $(EXTENSIONDIR)$/th_bg_BG_v2.dat .IF $(WITH_LANG) != $(DESCRIPTION_SRC) : description.xml diff --git a/dictionaries/ca/makefile.mk b/dictionaries/ca/makefile.mk index b61be4e..eeac8a1 100644 --- a/dictionaries/ca/makefile.mk +++ b/dictionaries/ca/makefile.mk @@ -97,7 +97,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES) #.INCLUDE : $(PRJ)$/prj$/tests.mk $(EXTENSIONDIR)$/th_ca_ES_v3.idx : $(EXTENSIONDIR)$/th_ca_ES_v3.dat - $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx $(EXTENSIONDIR)$/th_ca_ES_v3.dat + $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx $(EXTENSIONDIR)$/th_ca_ES_v3.dat .IF $(WITH_LANG) != $(DESCRIPTION_SRC) : description.xml diff --git a/dictionaries/cs_CZ/makefile.mk b/dictionaries/cs_CZ/makefile.mk index 818b53b..5fa6170 100644 --- a/dictionaries/cs_CZ/makefile.mk +++ b/dictionaries/cs_CZ/makefile.mk @@ -87,7 +87,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES) .INCLUDE : $(PRJ)$/prj$/tests.mk $(EXTENSIONDIR)$/th_cs_CZ_v2.idx : $(EXTENSIONDIR)$/th_cs_CZ_v2.dat - $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v2.idx $(EXTENSIONDIR)$/th_cs_CZ_v2.dat + $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v2.idx $(EXTENSIONDIR)$/th_cs_CZ_v2.dat .IF $(WITH_LANG) != $(DESCRIPTION_SRC) : description.xml diff --git a/dictionaries/da_DK/makefile.mk b/dictionaries/da_DK/makefile.mk index 839ad39..8dc64c0 100644 --- a/dictionaries/da_DK/makefile.mk +++ b/dictionaries/da_DK/makefile.mk @@ -91,7 +91,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES) .INCLUDE : $(PRJ)$/prj$/tests.mk $(EXTENSIONDIR)$/th_da_DK.idx : $(EXTENSIONDIR)$/th_da_DK.dat - $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx $(EXTENSIONDIR)$/th_da_DK.dat + $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx $(EXTENSIONDIR)$/th_da_DK.dat .IF $(WITH_LANG) != $(DESCRIPTION_SRC) : description.xml diff --git a/dictionaries/de/makefile.mk b/dictionaries/de/makefile.mk index 547b7e4..ee8a954 100644 --- a/dictionaries/de/makefile.mk +++ b/dictionaries/de/makefile.mk @@ -98,9 +98,9 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES) #.INCLUDE : $(PRJ)$/prj$/tests.mk $(EXTENSIONDIR)$/th_de_DE_v2.idx : $(EXTENSIONDIR)$/th_de_DE_v2.dat - $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict
[Libreoffice-commits] .: bean/JunitTest_bean_complex.mk chart2/JunitTest_chart2_unoapi.mk comphelper/JunitTest_comphelper_complex.mk configmgr/JunitTest_configmgr_unoapi.mk dbaccess/JunitTest_dbaccess
bean/JunitTest_bean_complex.mk |2 +- chart2/JunitTest_chart2_unoapi.mk |2 +- comphelper/JunitTest_comphelper_complex.mk |2 +- configmgr/JunitTest_configmgr_unoapi.mk|2 +- dbaccess/JunitTest_dbaccess_complex.mk |2 +- dbaccess/JunitTest_dbaccess_unoapi.mk |2 +- filter/JunitTest_filter_complex.mk |2 +- forms/JunitTest_forms_complex.mk |2 +- forms/JunitTest_forms_unoapi.mk|2 +- framework/JunitTest_framework_complex.mk |2 +- framework/JunitTest_framework_unoapi.mk|2 +- linguistic/JunitTest_linguistic_complex.mk |2 +- linguistic/JunitTest_linguistic_unoapi.mk |2 +- qadevOOo/JunitTest_qadevOOo_unoapi.mk |2 +- reportdesign/JunitTest_reportdesign_complex.mk |2 +- sc/JunitTest_sc_complex.mk |2 +- sc/JunitTest_sc_unoapi.mk |2 +- sd/JunitTest_sd_unoapi.mk |2 +- sfx2/JunitTest_sfx2_complex.mk |2 +- sfx2/JunitTest_sfx2_unoapi.mk |2 +- sot/JunitTest_sot_complex.mk |2 +- starmath/JunitTest_sm_unoapi.mk|2 +- svl/JunitTest_svl_complex.mk |2 +- svtools/JunitTest_svtools_unoapi.mk|2 +- svx/JunitTest_svx_unoapi.mk|2 +- sw/JunitTest_sw_complex.mk |2 +- sw/JunitTest_sw_unoapi.mk |2 +- toolkit/JunitTest_toolkit_unoapi.mk|2 +- ucb/JunitTest_ucb_complex.mk |2 +- ucb/JunitTest_ucb_unoapi.mk|2 +- unotools/JunitTest_unotools_complex.mk |2 +- unoxml/JunitTest_unordf_complex.mk |2 +- unoxml/JunitTest_unoxml_complex.mk |2 +- writerfilter/JunitTest_writerfilter_complex.mk |2 +- xmloff/JunitTest_xmloff_unoapi.mk |2 +- 35 files changed, 35 insertions(+), 35 deletions(-) New commits: commit fe981519f57a621c94e339a5453d7714af081acb Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 20 16:39:59 2012 +0100 gb_JunitTest_JunitTest takes only one argument diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk index 837b999..f443d39 100644 --- a/bean/JunitTest_bean_complex.mk +++ b/bean/JunitTest_bean_complex.mk @@ -27,7 +27,7 @@ # instead of those above. # -$(eval $(call gb_JunitTest_JunitTest,bean_complex,SRCDIR)) +$(eval $(call gb_JunitTest_JunitTest,bean_complex)) $(eval $(call gb_JunitTest_add_jars,bean_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk index 9895024..ad0315a 100644 --- a/chart2/JunitTest_chart2_unoapi.mk +++ b/chart2/JunitTest_chart2_unoapi.mk @@ -26,7 +26,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi,SRCDIR)) +$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi)) $(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\ $$(DEFS) \ diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk index adf616b..090ed60 100644 --- a/comphelper/JunitTest_comphelper_complex.mk +++ b/comphelper/JunitTest_comphelper_complex.mk @@ -26,7 +26,7 @@ # #* -$(eval $(call gb_JunitTest_JunitTest,comphelper_complex,SRCDIR)) +$(eval $(call gb_JunitTest_JunitTest,comphelper_complex)) $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\ comphelper/qa/complex/comphelper/Map \ diff --git a/configmgr/JunitTest_configmgr_unoapi.mk b/configmgr/JunitTest_configmgr_unoapi.mk index 3f1537f..e1abbb3 100644 --- a/configmgr/JunitTest_configmgr_unoapi.mk +++ b/configmgr/JunitTest_configmgr_unoapi.mk @@ -26,7 +26,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi,SRCDIR)) +$(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi)) $(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\ $$(DEFS) \ diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk index 0479955..8606bfe 100644 --- a/dbaccess/JunitTest_dbaccess_complex.mk +++ b/dbaccess/JunitTest_dbaccess_complex.mk @@ -26,7 +26,7 @@ # #* -$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex,SRCDIR)) +$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex)) $(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\ $$(DEFS) \ diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk index 9b93313..d999518 100644 --- a/dbaccess/JunitTest_dbaccess_unoapi.mk
[Libreoffice-commits] .: dbaccess/source oox/inc oox/source unusedcode.easy
dbaccess/source/core/api/OptimisticSet.cxx | 10 --
dbaccess/source/core/api/OptimisticSet.hxx | 12 ---
oox/inc/oox/xls/externallinkbuffer.hxx |2 -
oox/inc/oox/xls/formulabase.hxx|8 -
oox/inc/oox/xls/stylesbuffer.hxx |4 --
oox/inc/oox/xls/workbookhelper.hxx |8 -
oox/inc/oox/xls/worksheethelper.hxx| 26
oox/source/xls/externallinkbuffer.cxx |6 ---
oox/source/xls/formulabase.cxx |9 -
oox/source/xls/formulaparser.cxx | 14
oox/source/xls/stylesbuffer.cxx| 12 ---
oox/source/xls/workbookhelper.cxx | 25 ---
oox/source/xls/worksheethelper.cxx | 46 -
unusedcode.easy| 16 --
14 files changed, 198 deletions(-)
New commits:
commit eab072e468506f9759a9aeddd631fbd97908e6f8
Author: Elton Chung el...@layerjet.com
Date: Mon Feb 20 21:21:13 2012 +0800
Remove unused code
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx
b/dbaccess/source/core/api/OptimisticSet.cxx
index 801daeb..99cfcd4 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -452,16 +452,6 @@ void OptimisticSet::executeDelete(const ORowSetRow
_rDeleteRow,const ::rtl::OUS
}
}
-::rtl::OUString OptimisticSet::getComposedTableName(const ::rtl::OUString
/*_sCatalog*/,
- const ::rtl::OUString
/*_sSchema*/,
- const ::rtl::OUString
/*_sTable*/)
-{
-RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com,
OptimisticSet::getComposedTableName );
-::rtl::OUString aComposedName;
-
-return aComposedName;
-}
-
void OptimisticSet::fillJoinedColumns_throw(const ::std::vector TNodePair
i_aJoinColumns)
{
::std::vector TNodePair ::const_iterator aIter = i_aJoinColumns.begin();
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx
b/dbaccess/source/core/api/OptimisticSet.hxx
index 4e44de6..dac366f 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -53,18 +53,6 @@ namespace dbaccess
mutable bool m_bResultSetChanged;
-/**
-getComposedTableName return the composed table name for the query
-@param _sCatalogthe catalogname may be empty
-@param _sSchema the schemaname may be empty
-@param _sTable the tablename
-
-@return the composed name
-*/
-::rtl::OUString getComposedTableName( const ::rtl::OUString _sCatalog,
- const ::rtl::OUString _sSchema,
- const ::rtl::OUString _sTable);
-
void impl_convertValue_throw(const ORowSetRow _rInsertRow,const
SelectColumnDescription i_aMetaData);
void executeDelete(const ORowSetRow _rDeleteRow,const
::rtl::OUString i_sSQL,const ::rtl::OUString i_sTableName);
diff --git a/oox/inc/oox/xls/externallinkbuffer.hxx
b/oox/inc/oox/xls/externallinkbuffer.hxx
index 8e1e42f..071b251 100644
--- a/oox/inc/oox/xls/externallinkbuffer.hxx
+++ b/oox/inc/oox/xls/externallinkbuffer.hxx
@@ -362,8 +362,6 @@ public:
ExternalLinkRef importExternSheet( BiffInputStream rStrm );
/** Imports the EXTERNALBOOK record from the passed stream. */
ExternalLinkRef importExternalBook( BiffInputStream rStrm );
-/** Imports the EXTERNALNAME record from the passed stream. */
-voidimportExternalName( BiffInputStream rStrm );
/** Imports the BIFF8 EXTERNSHEET record from the passed stream. */
voidimportExternSheet8( BiffInputStream rStrm );
diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx
index 610b227..1d34343 100644
--- a/oox/inc/oox/xls/formulabase.hxx
+++ b/oox/inc/oox/xls/formulabase.hxx
@@ -701,14 +701,6 @@ public:
//
-/** Generates a cell range string in Calc's absolute $Sheet.$A$1:$A$
-notation from the passed cell range address.
-
-@param rRange The cell range address to be converted to a string.
- */
-::rtl::OUString generateApiRangeString(
-const ::com::sun::star::table::CellRangeAddress
rRange ) const;
-
/** Generates a string in Calc formula notation from the passed string.
@param rString The string value.
diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/oox/inc/oox/xls/stylesbuffer.hxx
index 365474a..68d7431 100644
--- a/oox/inc/oox/xls/stylesbuffer.hxx
+++ b/oox/inc/oox/xls/stylesbuffer.hxx
@@ -830,10 +830,6 @@ public:
/** Inserts a new number format code. */
voidimportNumFmt( const AttributeList rAttribs );
-/** Sets all attributes
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c306532e0bed1df36abf5d7ad6f0363056e69739 Author: Miklos Vajna vmik...@suse.cz Date: Mon Feb 20 17:06:07 2012 +0100 writerfilter: try to silence MacOSX-Intel tinderbox diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b4f52ee..ebd00d2 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -799,7 +799,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) // If there is no fill, the Word default is 100% transparency. // Otherwise CellColorHandler has priority, and this setting // will be ignored. -pFrameProperties[15].Value = 100; +pFrameProperties[15].Value = sal_Int32(100); lcl_MoveBorderPropertiesToFrame(aFrameProperties, rAppendContext.pLastParagraphProperties-GetStartingRange(), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: reportdesign/source sal/osl scripting/source sc/source sd/source slideshow/source svtools/source svx/source sw/source unotools/source vcl/generic vcl/headless vcl/source xmlof
reportdesign/source/filter/xml/dbloader2.cxx |2 +-
sal/osl/w32/procimpl.cxx |6 +++---
sc/source/filter/excel/xlescher.cxx|2 +-
sc/source/ui/vba/vbaapplication.cxx|2 +-
sc/source/ui/vba/vbaeventshelper.cxx |4 ++--
sc/source/ui/vba/vbafont.cxx |4 ++--
scripting/source/basprov/basprov.cxx |4 ++--
sd/source/filter/eppt/pptx-text.cxx|4 ++--
sd/source/ui/unoidl/sddetect.cxx |2 +-
slideshow/source/engine/slide/slideimpl.cxx|2 +-
slideshow/source/engine/tools.cxx |8
svtools/source/filter/FilterConfigCache.cxx|4 ++--
svtools/source/misc/langhelp.cxx |4 ++--
svx/source/gallery2/gallery1.cxx |2 +-
sw/source/ui/vba/vbacheckbox.cxx |2 +-
sw/source/ui/vba/vbaformfield.cxx |2 +-
sw/source/ui/vba/vbaformfields.cxx |2 +-
unotools/source/i18n/localedatawrapper.cxx |4 ++--
vcl/generic/app/gensys.cxx |2 +-
vcl/generic/print/genprnpsp.cxx|6 +++---
vcl/headless/svpprn.cxx|2 +-
vcl/source/app/settings.cxx| 12 ++--
vcl/source/window/menu.cxx |2 +-
vcl/source/window/printdlg.cxx |6 +++---
xmloff/source/draw/eventimp.cxx|4 ++--
xmloff/source/draw/shapeexport2.cxx|4 ++--
xmloff/source/forms/elementimport.cxx |2 +-
xmloff/source/transform/EventOASISTContext.cxx |4 ++--
28 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 30063974396f43ef30bc6b81f0260d3fb09d17cd
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Feb 21 01:06:12 2012 +0900
Prefer equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(...))
to equalsIgnoreAsciiCaseAscii(...)
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx
b/reportdesign/source/filter/xml/dbloader2.cxx
index b8bdba5..ff7ebac 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -63,7 +63,7 @@ ORptTypeDetection::ORptTypeDetection(Reference
XComponentContext const xCon
if ( !sTemp.isEmpty() )
{
INetURLObject aURL(sTemp);
-if ( aURL.GetExtension().equalsIgnoreAsciiCaseAscii(orp) )
+if (
aURL.GetExtension().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(orp))
)
return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(StarBaseReport));
else
{
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 23e74d1..2efb2b8 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -380,9 +380,9 @@ namespace /* private */
bool is_batch_file(const rtl::OUString file_name)
{
rtl::OUString ext = get_file_extension(file_name);
-return (ext.equalsIgnoreAsciiCaseAscii(bat) ||
-ext.equalsIgnoreAsciiCaseAscii(cmd) ||
-ext.equalsIgnoreAsciiCaseAscii(btm));
+return
(ext.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(bat)) ||
+
ext.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(cmd)) ||
+
ext.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(btm)));
}
//##
diff --git a/sc/source/filter/excel/xlescher.cxx
b/sc/source/filter/excel/xlescher.cxx
index 4c894bf..ba76e58 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -345,7 +345,7 @@ String XclControlHelper::ExtractFromMacroDescriptor(
const ScriptEventDescriptor rDescriptor, XclTbxEventType eEventType,
SfxObjectShell* /*pShell*/ )
{
if( (!rDescriptor.ScriptCode.isEmpty())
-rDescriptor.ScriptType.equalsIgnoreAsciiCaseAscii( Script )
+
rDescriptor.ScriptType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(Script))
rDescriptor.ListenerType.equalsAscii( spTbxListenerData[
eEventType ].mpcListenerType )
rDescriptor.EventMethod.equalsAscii( spTbxListenerData[ eEventType
].mpcEventMethod ) )
return XclTools::GetXclMacroName( rDescriptor.ScriptCode );
diff --git a/sc/source/ui/vba/vbaapplication.cxx
b/sc/source/ui/vba/vbaapplication.cxx
index fe74c56..9f5085f 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -342,7 +342,7 @@ ScVbaApplication::getSelection() throw
(uno::RuntimeException)
uno::Reference lang::XServiceInfo xServiceInfo( aSelection,
uno::UNO_QUERY_THROW );
rtl::OUString sImplementationName = xServiceInfo-getImplementationName();
-if(
sImplementationName.equalsIgnoreAsciiCaseAscii(com.sun.star.drawing.SvxShapeCollection)
)
+if(
[Libreoffice-commits] .: svx/Module_svx.mk
svx/Module_svx.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit c450d9645d1a06cf00c65272471bc7d03f28f353 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 20 18:03:54 2012 +0200 No gengal.bin for iOS Like any of our executables using sal/main.h, it doesn't even build for iOS anyway using the current sal/main.h anyway, as there is no main() ;) Executables for iOS (i.e. unit testers, and some eventual end.userish apps) will be handled semi-manually in some yet to be worked out fashion. Makes no sense for Android either, but I'm lazy. diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index fad..acfb788 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -39,9 +39,14 @@ $(eval $(call gb_Module_add_targets,svx,\ Package_globlmn_hrc \ Package_inc \ Package_sdi \ -Package_gengal \ +)) + +ifneq ($(OS),IOS) +$(eval $(call gb_Module_add_targets,svx,\ Executable_gengal.bin \ +Package_gengal \ )) +endif $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ JunitTest_svx_unoapi \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - moz/makefile.mk moz/patches nss/makefile.mk nss/nss-clang_os_Linux_x86_s_comments.patch stlport/makefile.mk stlport/STLport-4.5-clang_locale_h.patch
moz/makefile.mk
|3
moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch
| 10
moz/patches/clang_missing_this_pointers.patch
| 71 +++
nss/makefile.mk
|2
nss/nss-clang_os_Linux_x86_s_comments.patch
| 178 ++
stlport/STLport-4.5-clang_locale_h.patch
| 11
stlport/makefile.mk
|3
7 files changed, 275 insertions(+), 3 deletions(-)
New commits:
commit e12b26ef24815f1dec7787bd153b14763a0bb855
Author: Wei Ming Khoo wei...@gmail.com
Date: Sun Feb 19 16:05:29 2012 +
moz missing this pointers, default constructor
diff --git a/moz/makefile.mk b/moz/makefile.mk
index eedae25..7f926e5 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -86,7 +86,8 @@ PATCH_FILES = \
patches/libpr0n_build_fix.patch \
patches/macosx_build_fix.patch \
patches/nss-linux3.patch \
-
+
patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
+patches/clang_missing_this_pointers.patch \
# This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git
a/moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch
b/moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch
new file mode 100644
index 000..c2ff5d2
--- /dev/null
+++
b/moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch
@@ -0,0 +1,10 @@
+--- misc/mozilla/intl/unicharutil/util/nsUnicharUtils.h2008-08-30
00:14:52.0 +0100
misc/build/mozilla/intl/unicharutil/util/nsUnicharUtils.h 2012-02-18
20:12:51.590109117 +
+@@ -64,6 +64,7 @@
+ : public nsStringComparator
+ {
+ public:
++ nsCaseInsensitiveStringComparator(){};
+ virtual int operator()( const PRUnichar*, const PRUnichar*, PRUint32
aLength ) const;
+ virtual int operator()( PRUnichar, PRUnichar ) const;
+ };
diff --git a/moz/patches/clang_missing_this_pointers.patch
b/moz/patches/clang_missing_this_pointers.patch
new file mode 100644
index 000..d92434f
--- /dev/null
+++ b/moz/patches/clang_missing_this_pointers.patch
@@ -0,0 +1,71 @@
+--- misc/mozilla/xpcom/glue/nsBaseHashtable.h 2005-09-27 16:44:20.0
+0100
misc/build/mozilla/xpcom/glue/nsBaseHashtable.h2012-02-18
18:43:55.386109066 +
+@@ -123,7 +123,7 @@
+*/
+ PRBool Get(KeyType aKey, UserDataType* pData) const
+ {
+-EntryType* ent = GetEntry(aKey);
++EntryType* ent = this-GetEntry(aKey);
+
+ if (!ent)
+ return PR_FALSE;
+@@ -142,7 +142,7 @@
+*/
+ PRBool Put(KeyType aKey, UserDataType aData)
+ {
+-EntryType* ent = PutEntry(aKey);
++EntryType* ent = this-PutEntry(aKey);
+
+ if (!ent)
+ return PR_FALSE;
+@@ -156,7 +156,7 @@
+* remove the data for the associated key
+* @param aKey the key to remove from the hashtable
+*/
+- void Remove(KeyType aKey) { RemoveEntry(aKey); }
++ void Remove(KeyType aKey) { this-RemoveEntry(aKey); }
+
+ /**
+* function type provided by the application for enumeration.
+--- misc/mozilla/xpcom/glue/nsClassHashtable.h 2005-08-11 20:42:37.0
+0100
misc/build/mozilla/xpcom/glue/nsClassHashtable.h 2012-02-18
18:40:32.810109050 +
+@@ -98,7 +98,7 @@
+ nsClassHashtableKeyClass,T::Get(KeyType aKey, T** retVal) const
+ {
+ typename nsBaseHashtableKeyClass,nsAutoPtrT,T*::EntryType* ent =
+-GetEntry(aKey);
++this-GetEntry(aKey);
+
+ if (ent)
+ {
+--- misc/mozilla/xpcom/glue/nsInterfaceHashtable.h 2005-08-11
20:42:48.0 +0100
misc/build/mozilla/xpcom/glue/nsInterfaceHashtable.h 2012-02-18
18:43:01.794109091 +
+@@ -111,7 +111,7 @@
+ (KeyType aKey, UserDataType* pInterface) const
+ {
+ typename nsBaseHashtableKeyClass, nsCOMPtrInterface,
Interface*::EntryType* ent =
+-GetEntry(aKey);
++this-GetEntry(aKey);
+
+ if (ent)
+ {
+@@ -139,7 +139,7 @@
+ (KeyType aKey, PRBool* aFound) const
+ {
+ typename nsBaseHashtableKeyClass, nsCOMPtrInterface,
Interface*::EntryType* ent =
+-GetEntry(aKey);
++this-GetEntry(aKey);
+
+ if (ent)
+ {
+--- misc/mozilla/xpcom/glue/nsRefPtrHashtable.h2005-08-11
20:42:51.0 +0100
misc/build/mozilla/xpcom/glue/nsRefPtrHashtable.h 2012-02-18
19:02:20.634109082 +
+@@ -140,7 +140,7 @@
+ (KeyType aKey, PRBool* aFound) const
+ {
+ typename nsBaseHashtableKeyClass, nsRefPtrRefPtr, RefPtr*::EntryType*
ent =
+-GetEntry(aKey);
++this-GetEntry(aKey);
+
+ if (ent)
+ {
commit f528b3e237e0cb8032c0b786c0c25df052c85fac
Author: Wei Ming Khoo wei...@gmail.com
Date: Sun Feb
[Libreoffice-commits] .: solenv/inc
solenv/inc/_tg_zip.mk | 100 --
solenv/inc/tg_zip.mk | 10 ++---
2 files changed, 44 insertions(+), 66 deletions(-)
New commits:
commit 3aece33a9b46e8b3d5e620e76af26e817f68332f
Author: Andras Timar ati...@suse.com
Date: Mon Feb 20 17:47:26 2012 +0100
remove avoid_cvs_dir macro
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index deb2aa0..da3560b 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -3,10 +3,8 @@
.IF $(GUI)==WNT
command_seperator=
#command_seperator=^
-avoid_cvs_dir=-x *CVS* -x *.svn*
.ELSE
command_seperator=;
-avoid_cvs_dir=-x *CVS* -x *.svn*
.ENDIF
@@ -52,9 +50,9 @@ $(ZIP1DEPFILE) :
@echo # $(MISC)/$(@:f)
.IF $(ZIP1DIR) !=
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
-$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))
$(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,.
$(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))
$(foreach,j,$(ZIP1LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_,
$(subst,/misc/,/bin/ $(@:db)))} $j )}) $(avoid_cvs_dir)
$(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
+$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))
$(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,.
$(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))
$(foreach,j,$(ZIP1LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_,
$(subst,/misc/,/bin/ $(@:db)))} $j )}) $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # $(ZIP1DIR) !=
-$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/
$(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST)
{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/
$(@:db)))} $j )}) $(avoid_cvs_dir) $(MISC)/$(@:f)
+$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/
$(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST)
{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/
$(@:db)))} $j )}) $(MISC)/$(@:f)
.ENDIF # $(ZIP1DIR) !=
@echo $(@:n:s#\#/#) : makefile.mk $(MISC)/$(@:f)
@@ -66,14 +64,14 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
@echo -- $(eq,$?,$(?:s/delzip/zzz/)
$(NULLDEV) )
.IF $(ZIP1DIR) !=
@@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_
$(@:db))}$(ZIP1EXT)
-$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))}
$(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS)
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
$(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip
$(avoid_cvs_dir) $(CHECKZIPRESULT)
+$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))}
$(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS)
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
$(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip
$(CHECKZIPRESULT)
$(COMMAND_ECHO)$(IFEXIST)
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
$(FI)
$(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_
$(@:db))}$(ZIP1EXT) $@
$(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_
$(@:db))}$(ZIP1EXT)
.ELSE # $(ZIP1DIR) !=
-$(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@
$(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_,
$(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
+$(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@
$(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_,
$(@:db))} $j )) -x delzip $(CHECKZIPRESULT)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
@@ -90,10 +88,8 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
.IF $(GUI)==WNT
command_seperator=
#command_seperator=^
-avoid_cvs_dir=-x *CVS* -x *.svn*
.ELSE
command_seperator=;
-avoid_cvs_dir=-x *CVS* -x *.svn*
.ENDIF
@@ -139,9 +135,9 @@ $(ZIP2DEPFILE) :
@echo # $(MISC)/$(@:f)
.IF $(ZIP2DIR) !=
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
-$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))
$(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,.
$(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))
$(foreach,j,$(ZIP2LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_,
$(subst,/misc/,/bin/ $(@:db)))} $j )}) $(avoid_cvs_dir)
$(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
+$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))
$(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,.
$(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - binfilter/bf_forms
binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 720bbebb28d467e9785eafde9086a450e6a05fdf
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 23:36:16 2012 +0100
binfilter::frm::OInterfaceContainer::disposing: fix boost assertion
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
index 53811e1..7a65da5 100644
--- a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
+++ b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
@@ -486,13 +486,17 @@ void SAL_CALL OInterfaceContainer::disposing(const
EventObject _rSource) throw(
OInterfaceContainer::disposing: map element not normalized!
);
if ( i-second.get() == _rSource.Source.get() )
+{
// found it
+m_aMap.erase(i);
break;
+}
++i;
+
+DBG_ASSERT( i != m_aMap.end(), OInterfaceContainer::disposing:
inconsistency: the element was in m_aItems, but not in m_aMap! );
}
-m_aMap.erase(i);
m_aItems.erase(j);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gdb
solenv/gdb/libreoffice/sw.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0e81a404922c9b760638c230eea9cebf40a1694e Author: Michael Stahl mst...@redhat.com Date: Mon Feb 6 19:46:19 2012 +0100 gdb: don't barf on non-ASCII text in SwTxtNode Because the default text encoding in Python 2 is ascii these would throw a UnicodeEncodeError: 'ascii' codec can't encode character... Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 8f25522..8325bfa 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -100,7 +100,7 @@ class BigPtrArrayPrinter(object): # accessing this is completely non-obvious... # also, node.dynamic_cast(node.dynamic_type) is null? value = TextNode + \ -str(node.cast(node.dynamic_type).dereference()['m_Text']) + unicode(node.cast(node.dynamic_type).dereference()['m_Text']) elif str(node.dynamic_type.target()) == SwOLENode: value = OLENode elif str(node.dynamic_type.target()) == SwGrfNode: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/extension_post.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit aad0b5d6a6ad8a3a895c6ffba3390af6861017d7 Author: Andras Timar ati...@suse.com Date: Mon Feb 20 18:04:38 2012 +0100 add $(COMMAND-ECHO) diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index 20b8682..8a1a328 100644 --- a/solenv/inc/extension_post.mk +++ b/solenv/inc/extension_post.mk @@ -39,15 +39,15 @@ fixme4=$(fixme:n) $(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu # ugly hacking to workaround prepended first source path @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d)) -$(GNUCOPY) $ $(subst,$(fixme2),$(MISC) $@) +$(COMMAND_ECHO)$(GNUCOPY) $ $(subst,$(fixme2),$(MISC) $@) $(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d)) -$(GNUCOPY) $ $(subst,$(fixme4),$(MISC) $@) +$(COMMAND_ECHO)$(GNUCOPY) $ $(subst,$(fixme4),$(MISC) $@) $(EXTENSIONDIR)/%.jar : $(SOLARBINDIR)/%.jar @@-$(MKDIRHIER) $(@:d) -$(GNUCOPY) $ $@ +$(COMMAND_ECHO)$(GNUCOPY) $ $@ .IF $(COMPONENT_FILES)!= COMPONENT_FILES_SRC*=./ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dictionaries/hu_HU
dictionaries/hu_HU/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3079747297b9295de2b1c4a4629c392120d2334d Author: Andras Timar ati...@suse.com Date: Mon Feb 20 18:09:10 2012 +0100 enable thesaurus check for hu_HU diff --git a/dictionaries/hu_HU/makefile.mk b/dictionaries/hu_HU/makefile.mk index 7c9d790..40c54cd 100644 --- a/dictionaries/hu_HU/makefile.mk +++ b/dictionaries/hu_HU/makefile.mk @@ -106,7 +106,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES) # global targets for extension packing .INCLUDE : extension_post.mk -#.INCLUDE : $(PRJ)$/prj$/tests.mk +.INCLUDE : $(PRJ)$/prj$/tests.mk $(EXTENSIONDIR)$/th_hu_HU_v2.idx : $(EXTENSIONDIR)$/th_hu_HU_v2.dat $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_hu_HU_v2.idx $(EXTENSIONDIR)$/th_hu_HU_v2.dat ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - pyuno/source sw/source
pyuno/source/module/pyuno_gc.cxx |5 -
sw/source/filter/ww8/ww8par.cxx |6 ++
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit ca6d45fff41bb4765bfc6b3c72e8fad224273ff1
Author: Michael Stahl mst...@redhat.com
Date: Sat Feb 18 00:06:41 2012 +0100
pyuno: decreaseRefCount: valgrind warning:
Apparently the thread spawned in decreaseRefCount runs and deletes
itself before the m_hThread != 0 from osl::Thread::create is executed;
try a lame workaround for that.
==1877== Invalid read of size 8
==1877==at 0x2A70E546: osl::Thread::create() (in
pyuno/unxlngx6/lib/libpyuno.so)
==1877==by 0x2A70E351: pyuno::decreaseRefCount(_is*, _object*) (in
pyuno/unxlngx6/lib/libpyuno.so)
==1877==by 0x2A7092B4: pyuno::Adapter::~Adapter() (in
pyuno/unxlngx6/lib/libpyuno.so)
==1877==by 0x2A709393: pyuno::Adapter::~Adapter() (in
pyuno/unxlngx6/lib/libpyuno.so)
==1877==by 0x5EF2F64: cppu::OWeakObject::release() (weak.cxx:213)
==1877==by 0x2A70DE69:
==1877== Address 0x1ee30818 is 8 bytes inside a block of size 32 free'd
==1877==at 0x4A0662E: free (vg_replace_malloc.c:366)
==1877==by 0x4C44B62: rtl_freeMemory_SYSTEM(void*)
(alloc_global.cxx:285)
==1877==by 0x4C44DC7: rtl_freeMemory (alloc_global.cxx:355)
==1877==by 0x2A70E41E: osl::Thread::operator delete(void*) (in
pyuno/unxlngx6/lib/libpyuno.so)
==1877==by 0x2A70E6EF: pyuno::GCThread::~GCThread() (in
pyuno/unxlngx6/lib/libpyuno.so)
==1877==by 0x2A70E303: pyuno::GCThread::onTerminated() (in
pyuno/unxlngx6/lib/libpyuno.so)
==1877==by 0x2A70E671: threadFunc (in pyuno/unxlngx6/lib/libpyuno.so)
==1877==by 0x4C2E242: osl_thread_start_Impl (thread.c:292)
==1877==by 0x3C26607D8F: start_thread (pthread_create.c:309)
==1877==by 0x3C262EF48C: clone (clone.S:115)
Signed-off-by: a very sceptical Michael Meeks michael.me...@suse.com
diff --git a/pyuno/source/module/pyuno_gc.cxx b/pyuno/source/module/pyuno_gc.cxx
index 77eb688..13e6013 100644
--- a/pyuno/source/module/pyuno_gc.cxx
+++ b/pyuno/source/module/pyuno_gc.cxx
@@ -112,7 +112,10 @@ void decreaseRefCount( PyInterpreterState *interpreter,
PyObject *object )
// interpreter lock is held or not
// TODO: Look for a more efficient solution
osl::Thread *t = new GCThread( interpreter, object );
-t-create();
+// don't call create() because Valgrind complains about invalid read in
+// the rather bizarre GCThread::onTerminated; try a lame workaround:
+t-createSuspended();
+t-resume();
}
}
commit 7bec16ea0e67d81a1fdf2022cb0985acc51dc691
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 8 23:30:21 2012 +0100
sw: ww8: ~SwIndexReg assertion:
Remove pointless SwPosition that triggers the assertion when loading
bugdoc from fdo#39006 from wwExtraneousParas::delete_all_from_doc.
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 35def17..1070fdc 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4135,8 +4135,7 @@ void wwExtraneousParas::delete_all_from_doc()
{
SwTxtNode *pTxtNode = *aI;
SwNodeIndex aIdx(*pTxtNode);
-SwPosition aPos(aIdx);
-SwPaM aTest(aPos);
+SwPaM aTest(aIdx);
m_rDoc.DelFullPara(aTest);
}
m_aTxtNodes.clear();
commit dcfd811a57e8ffa5bf1a3f17448d6777ba6ce15b
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 17:47:28 2012 +0100
sw: ww8: ~SwIndexReg assertion:
Remove pointless SwPosition that triggers the assertion when
loading bugdoc from i#87910 from wwSectionManager::InsertSegments.
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9923768..35def17 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4120,8 +4120,7 @@ void wwSectionManager::InsertSegments()
if (pTxtNd)
{
SwNodeIndex aIdx(*pTxtNd);
-SwPosition aPos(aIdx);
-SwPaM aTest(aPos);
+SwPaM aTest(aIdx);
mrReader.rDoc.DelFullPara(aTest);
pTxtNd = 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sd/source
sd/source/ui/accessibility/AccessibleTreeNode.cxx |6 ++
sd/source/ui/toolpanel/ScrollPanel.cxx|2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 1d70aa26a5da2fd5857b017f66df97625537ebf0
Author: Michael Stahl mst...@redhat.com
Date: Sat Feb 18 00:06:41 2012 +0100
sd::toolpanel::ScrollPanel::~ScrollPanel: bogus static_cast
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx
b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 0a84e75..7c43aa4 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -97,7 +97,7 @@ ScrollPanel::~ScrollPanel (void)
TreeNode* pControl = pNode;
// When the node has been created as TitledControl then use its
// control instead of pNode directly.
-TitledControl* pTitledControl = static_castTitledControl*(pNode);
+TitledControl* pTitledControl = dynamic_castTitledControl*(pNode);
if (pTitledControl != NULL)
pControl = pTitledControl-GetControl();
commit 336b75a4070bbc69673cca81946c36bed1b97892
Author: Michael Stahl mst...@redhat.com
Date: Sat Feb 18 00:06:42 2012 +0100
AccessibleTreeNode: fix headless crash
On closing a document in headless mode, the
accessibility::AccessibleTreeNode::WindowEventListener will access a deleted
mrTreeNode member and crash; don't do anything in the listener if the
AccessibleTreeNode has been disposed.
#0 0x in ?? ()
#1 0x7f99842d6887 in accessibility::AccessibleTreeNode::UpdateStateSet
(this=0x27a99f80) at sd/source/ui/accessibility/AccessibleTreeNode.cxx:285
#2 0x7f99842d803e in
accessibility::AccessibleTreeNode::WindowEventListener (this=0x27a99f80,
pEvent=0x7f997fd64f40) at sd/source/ui/accessibility/AccessibleTreeNode.cxx:694
#3 0x7f99842d7f3d in
accessibility::AccessibleTreeNode::LinkStubWindowEventListener
(pThis=0x27a99f80, pCaller=0x7f997fd64f40) at
sd/source/ui/accessibility/AccessibleTreeNode.cxx:670
#4 0x7f99b88a1442 in Link::Call (this=0x279f94e0,
pCaller=0x7f997fd64f40) at solver/unxlngx6/inc/tools/link.hxx:140
#5 0x7f99b88cdecf in VclEventListeners::Call (this=0x27a946f0,
pEvent=0x7f997fd64f40) at vcl/source/app/vclevent.cxx:72
#6 0x7f99b8d2e76e in Window::CallEventListeners (this=0x27a98280,
nEvent=1009, pData=0x0) at vcl/source/window/window.cxx:5188
#7 0x7f99b8d2e6cf in Window::ImplCallEventListeners (this=0x27a98280,
nEvent=1009, pData=0x0) at vcl/source/window/window.cxx:5171
#8 0x7f99b8d2df63 in Window::PreNotify (this=0x27a98280, rNEvt=...) at
vcl/source/window/window.cxx:5037
#9 0x7f99b8d4aa0c in ImplCallPreNotify (rEvt=...) at
vcl/source/window/winproc.cxx:86
#10 0x7f99b8d2910e in Window::ImplGrabFocus (this=0x2703d230, nFlags=0)
at vcl/source/window/window.cxx:4033
#11 0x7f99b8d3749f in Window::GrabFocus (this=0x2703d230) at
vcl/source/window/window.cxx:7493
#12 0x7f99b8d2b624 in Window::~Window (this=0x27a98280,
__in_chrg=optimized out) at vcl/source/window/window.cxx:4493
#13 0x7f99b88fa514 in Control::~Control (this=0x27a98280,
__in_chrg=optimized out) at vcl/source/control/ctrl.cxx:88
#14 0x7f99845521e4 in sd::toolpanel::ScrollPanel::~ScrollPanel
(this=0x27a98280, __in_chrg=optimized out) at
sd/source/ui/toolpanel/ScrollPanel.cxx:91
#15 0x7f99845522e8 in sd::toolpanel::ScrollPanel::~ScrollPanel
(this=0x27a98280, __in_chrg=optimized out) at
sd/source/ui/toolpanel/ScrollPanel.cxx:112
#16 0x7f9984565d76 in std::auto_ptrsd::toolpanel::TreeNode::reset
(this=0x27a94970, __p=0x0)
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 554c73d..2831895 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -637,6 +637,9 @@ sal_Bool AccessibleTreeNode::IsDisposed (void)
IMPL_LINK(AccessibleTreeNode, StateChangeListener, TreeNodeStateChangeEvent*,
pEvent)
{
+if (rBHelper.bDisposed || rBHelper.bInDispose)
+return 1; // mrTreeNode is probably dead
+
OSL_ASSERT(pEvent!=NULL);
OSL_ASSERT(pEvent-mrSource==mrTreeNode);
@@ -669,6 +672,9 @@ IMPL_LINK(AccessibleTreeNode, StateChangeListener,
TreeNodeStateChangeEvent*, pE
IMPL_LINK(AccessibleTreeNode, WindowEventListener, VclWindowEvent*, pEvent)
{
+if (rBHelper.bDisposed || rBHelper.bInDispose)
+return 1; // mrTreeNode is probably dead
+
switch (pEvent-GetId())
{
case VCLEVENT_WINDOW_HIDE:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dictionaries/source
dictionaries/source/idxdict.cpp |2 -- 1 file changed, 2 deletions(-) New commits: commit 8a74106d1ecc3d146f514a2414a4785bc8dd0f01 Author: Andras Timar ati...@suse.com Date: Mon Feb 20 18:13:33 2012 +0100 silence idxdict tool diff --git a/dictionaries/source/idxdict.cpp b/dictionaries/source/idxdict.cpp index 6844afd..9b0cbc2 100644 --- a/dictionaries/source/idxdict.cpp +++ b/dictionaries/source/idxdict.cpp @@ -90,8 +90,6 @@ int main(int argc, char *argv[]) ::exit(99); } -cout outputFile endl; - outputStream encoding '\n' entries.size() '\n'; for (multimapstring, size_t::const_iterator ii(entries.begin()); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/app/applab.cxx | 23 +--
1 file changed, 9 insertions(+), 14 deletions(-)
New commits:
commit a99083d233d0d5c5a09941ec2ee7164bc63c61db
Author: Winfried Donkers o...@dci-electronics.nl
Date: Fri Feb 17 18:02:55 2012 +0100
fdo#44516 final fix for labels with gaps larger than page margin
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 3ccbf13..4159f18 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -164,7 +164,6 @@ const SwFrmFmt *lcl_InsertLabText( SwWrtShell rSh, const
SwLabItem rItem,
return pFmt;
}
-
void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
{
static sal_uInt16 nLabelTitleNo = 0;
@@ -294,34 +293,31 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool
bLabel)
// Prepare border template
SwFrmFmt* pFmt = pSh-GetFrmFmtFromPool( RES_POOLFRM_LABEL );
-SwFrmFmt* pFmtEORow = pSh-GetFrmFmtFromPool( RES_POOLFRM_LABEL );
//new SwFrmFmt (*pFmt);
-SwFrmFmt* pFmtEOCol = pSh-GetFrmFmtFromPool( RES_POOLFRM_LABEL );
//new SwFrmFmt (*pFmt);
-SwFrmFmt* pFmtEOColEORow = pSh-GetFrmFmtFromPool(
RES_POOLFRM_LABEL ); //new SwFrmFmt (*pFmt);
-
sal_Int32 iResultWidth = rItem.lLeft + (rItem.nCols - 1) *
rItem.lHDist + rItem.lWidth - rItem.lPWidth;
sal_Int32 iResultHeight = rItem.lUpper + (rItem.nRows - 1) *
rItem.lVDist + rItem.lHeight - rItem.lPHeight;
sal_Int32 iWidth = (iResultWidth 0 ? rItem.lWidth -
(iResultWidth / rItem.nCols) - 1 : rItem.lWidth);
sal_Int32 iHeight = (iResultHeight 0 ? rItem.lHeight -
(iResultHeight / rItem.nRows) - 1 : rItem.lHeight);
SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, iWidth, iHeight );
+pFmt-SetFmtAttr( aFrmSize );
+
+SwFrmFmt* pFmtEORow = new SwFrmFmt (*pFmt);
+SwFrmFmt* pFmtEOCol = new SwFrmFmt (*pFmt);
+SwFrmFmt* pFmtEOColEORow = new SwFrmFmt (*pFmt);
SvxULSpaceItem aFrmULSpace( 0, (sal_uInt16)(rItem.lVDist -
rItem.lHeight),
-RES_UL_SPACE);
-SvxULSpaceItem aFrmNoULSpace( 0, 0, RES_UL_SPACE);
+RES_UL_SPACE );
+SvxULSpaceItem aFrmNoULSpace( 0, 0, RES_UL_SPACE );
SvxLRSpaceItem aFrmLRSpace( 0, (sal_uInt16)(rItem.lHDist -
rItem.lWidth),
-0, 0, RES_LR_SPACE);
-SvxLRSpaceItem aFrmNoLRSpace( 0, 0, 0, 0, RES_LR_SPACE);
+0, 0, RES_LR_SPACE );
+SvxLRSpaceItem aFrmNoLRSpace( 0, 0, 0, 0, RES_LR_SPACE );
-pFmt-SetFmtAttr( aFrmSize );
pFmt-SetFmtAttr(aFrmULSpace);
pFmt-SetFmtAttr(aFrmLRSpace);
-pFmtEORow-SetFmtAttr( aFrmSize );
pFmtEORow-SetFmtAttr(aFrmULSpace);
pFmtEORow-SetFmtAttr(aFrmNoLRSpace);
-pFmtEOCol-SetFmtAttr( aFrmSize );
pFmtEOCol-SetFmtAttr(aFrmNoULSpace);
pFmtEOCol-SetFmtAttr(aFrmLRSpace);
-pFmtEOColEORow-SetFmtAttr( aFrmSize );
pFmtEOColEORow-SetFmtAttr(aFrmNoULSpace);
pFmtEOColEORow-SetFmtAttr(aFrmNoLRSpace);
@@ -351,7 +347,6 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
lcl_InsertLabText( *pSh, rItem, *pFrmFmt,
*pFldMgr, j, i,
i == rItem.nRows - 1 j == rItem.nCols -
1, sal_True ) :
lcl_InsertBCText(*pSh, rItem, *pFrmFmt, j, i,
sal_True);
-
if (!(i|j))
{
pFirstFlyFmt = pTmp;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/android
sal/android/lo-bootstrap.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit e14fea9f37033c918380df7ad4d4237052208eae
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Feb 20 20:02:25 2012 +0200
Work around the fact that empty directories are not present in an .apk
The SDK tooling that constructs .apk packages doesn't put empty
directories in them. Which makes sense I guess. Hidden files (like
.gitignore) are also skipped. So a directory like
sc/qa/unit/qpro/indeterminate does not show up at all.
So, we must pretend that any opendir() of a directory under /assets
succeeds. If the .apk doesn't contain any files in such a directory,
treat it as existing but empty. We can't know if the corresponding
directory from which /assets was constructed actually does exist but
is empty or if it doesn't exist.
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 1140515..96d6058 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1030,9 +1030,19 @@ lo_apk_opendir(const char *dirname)
HASH_FIND(hh, dir, p, (unsigned)(q - p), entry);
-if (entry == NULL) {
+if (entry == NULL *q == '/') {
errno = ENOENT;
return NULL;
+} else if (entry == NULL) {
+/* Empty directories, or directories containing only hidden
+ * files (like the .gitignore in sc/qa/unit/qpro/indeterminate)
+ * are not present in the .apk. So we need to pretend that any
+ * directory that doesn't exist as a parent of an entry in the
+ * .apk *does* exist but is empty.
+ */
+lo_apk_dir *result = malloc(sizeof(*result));
+result-cur = NULL;
+return result;
}
if (entry-kind != DIRECTORY) {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/Library_sd.mk sd/source unusedcode.easy
sd/Library_sd.mk |1
sd/source/ui/framework/configuration/ConfigurationController.cxx |3
sd/source/ui/framework/factories/BasicPaneFactory.cxx| 34
sd/source/ui/framework/factories/BasicPaneFactory.hxx|4
sd/source/ui/inc/UpdateLockManager.hxx | 94 --
sd/source/ui/inc/ViewShellBase.hxx |4
sd/source/ui/view/PresentationViewShellBase.cxx |4
sd/source/ui/view/UpdateLockManager.cxx | 430
--
sd/source/ui/view/ViewShellBase.cxx | 24
unusedcode.easy |3
10 files changed, 3 insertions(+), 598 deletions(-)
New commits:
commit 8597f9874f23a1ecd6b8b556c147d156a398077f
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 20 17:15:23 2012 +0100
unusedcode.easy: remove UpdateLockManager
Seems UpdateLockManager is dead. So cut it out.
Also mbFirstUpdateSeen had no effect.
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 849d0c6..2515633 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -449,7 +449,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/view/PresentationViewShellBase \
sd/source/ui/view/SlideSorterViewShellBase \
sd/source/ui/view/ToolBarManager \
-sd/source/ui/view/UpdateLockManager \
sd/source/ui/view/ViewClipboard \
sd/source/ui/view/ViewShellBase \
sd/source/ui/view/ViewShellHint \
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx
b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index f11c5bb..617de84 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -26,9 +26,7 @@
*
/
-
#include framework/ConfigurationController.hxx
-
#include framework/Configuration.hxx
#include framework/FrameworkHelper.hxx
#include ConfigurationUpdater.hxx
@@ -40,7 +38,6 @@
#include ChangeRequestQueueProcessor.hxx
#include ConfigurationClassifier.hxx
#include ViewShellBase.hxx
-#include UpdateLockManager.hxx
#include DrawController.hxx
#include com/sun/star/drawing/framework/XControllerManager.hpp
#include com/sun/star/util/XURLTransformer.hpp
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index a854237..2b6b9d6 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -133,9 +133,7 @@ BasicPaneFactory::BasicPaneFactory (
mxComponentContext(rxContext),
mxConfigurationControllerWeak(),
mpViewShellBase(NULL),
- mpPaneContainer(new PaneContainer),
- mbFirstUpdateSeen(false),
- mpUpdateLockManager()
+ mpPaneContainer(new PaneContainer)
{
}
@@ -199,7 +197,6 @@ void SAL_CALL BasicPaneFactory::initialize (const
SequenceAny aArguments)
(sal::static_int_castsal_uIntPtr(
xTunnel-getSomething(DrawController::getUnoTunnelId();
mpViewShellBase = pController-GetViewShellBase();
-mpUpdateLockManager = mpViewShellBase-GetUpdateLockManager();
}
catch(RuntimeException)
{}
@@ -400,35 +397,10 @@ void SAL_CALL BasicPaneFactory::releaseResource (
//= XConfigurationChangeListener ==
void SAL_CALL BasicPaneFactory::notifyConfigurationChange (
-const ConfigurationChangeEvent rEvent)
+const ConfigurationChangeEvent /* rEvent */ )
throw (RuntimeException)
{
-sal_Int32 nEventType = 0;
-rEvent.UserData = nEventType;
-switch (nEventType)
-{
-case gnConfigurationUpdateStartEvent:
-// Lock UI updates while we are switching the views except for
-// the first time after creation. Outherwise this leads to
-// problems after reload (missing resizes for the side panes).
-if (mbFirstUpdateSeen)
-{
-}
-else
-mbFirstUpdateSeen = true;
-break;
-
-case gnConfigurationUpdateEndEvent:
-// Unlock the update lock here when only the visibility of
-// windows but not the view shells displayed in them have
-// changed. Otherwise the UpdateLockManager takes care of
-// unlocking at the right time.
-if (mpUpdateLockManager.get() != NULL)
-{
-::osl::Guard ::osl::Mutex aGuard
(::osl::Mutex::getGlobalMutex());
-}
-break;
-}
+ // FIXME: nothing to do
}
diff --git
[Libreoffice-commits] .: 2 commits - odk/util solenv/bin solenv/inc
odk/util/makefile.mk|1
solenv/bin/cleanzip.pl | 59 -
solenv/inc/_tg_zip.mk | 100
solenv/inc/extension_pre.mk |2
solenv/inc/tg_zip.mk| 10
5 files changed, 12 insertions(+), 160 deletions(-)
New commits:
commit 24f63831af82e71133fae0fc8309d1f752a402bf
Author: Andras Timar ati...@suse.com
Date: Mon Feb 20 20:24:54 2012 +0100
remove cleanzip.pl
The issue it solves does not exist in our build environment.
https://issues.apache.org/ooo/show_bug.cgi?id=98365
The script removed g+s attributes from directories in zip files.
diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk
index 7f6517e..28f6c8e 100644
--- a/odk/util/makefile.mk
+++ b/odk/util/makefile.mk
@@ -24,7 +24,6 @@ ALLTAR:\
$(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS)
cd $(BIN)$/$(PRODUCT_NAME) zip -urq ..$/$(PRODUCTZIPFILE) .
$(CHECKZIPRESULT)
-$(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@
# cd $(BIN)$/$(PRODUCT_NAME) zip -urq ..$/$(PRODUCTZIPFILE) . -x
idl/* $(CHECKZIPRESULT)
# cd $(BIN)$/$(PRODUCT_NAME) zip -urq ..$/odkidl.zip idl/*
$(CHECKZIPRESULT)
diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl
deleted file mode 100755
index 5e1502b..000
--- a/solenv/bin/cleanzip.pl
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/perl -w
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# http://www.openoffice.org/license.html
-# for a copy of the LGPLv3 License.
-#
-#*
-
-sub usage
-{
-print Cleanup unwanted unix attributes in zip archives\n\n;
-print Usage:\n;
-print $0 archive\n\n;
-exit(1);
-}
-
-usage() if ! defined $ARGV[0];
-
-my $filename = $ARGV[0];
-use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
-my $zip = Archive::Zip-new();
-
-unless ( $zip-read( $filename ) == AZ_OK ) {
-die $0: ERROR reading $filename\n;
-}
-my @members = $zip -members();
-
-foreach my $member ( @members ) {
-my $attribs = $member-unixFileAttributes();
-if ( $member-isDirectory ) {
-$attribs = $attribs 0b1011;
-$member-unixFileAttributes($attribs)
-}
-}
-unless ( $zip-writeToFileNamed( ${filename}._new ) == AZ_OK ) {
-die $0: ERROR reading ${filename}_new\n;
-}
-rename($filename._new, $filename);
-
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index da3560b..2dfe467 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -58,23 +58,15 @@ $(ZIP1DEPFILE) :
$(ZIP1TARGETN) : delzip $(ZIP1DEPS)
-@echo Making:$(@:f)
+@echo [ZIP] $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@
$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-@echo -- $(eq,$?,$(?:s/delzip/zzz/)
$(NULLDEV) )
.IF $(ZIP1DIR) !=
@@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_
$(@:db))}$(ZIP1EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))}
$(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS)
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
$(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip
$(CHECKZIPRESULT)
-$(COMMAND_ECHO)$(IFEXIST)
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
-$(PERL) -w $(SOLARENV)/bin/cleanzip.pl
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
-$(FI)
$(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_
$(@:db))}$(ZIP1EXT) $@
$(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_
$(@:db))}$(ZIP1EXT)
.ELSE # $(ZIP1DIR) !=
$(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@
$(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_,
$(@:db))} $j )) -x delzip $(CHECKZIPRESULT)
-$(COMMAND_ECHO)$(IFEXIST) $@
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source
sw/source/core/layout/ftnfrm.cxx |2 +-
sw/source/core/layout/newfrm.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a6d98bb23f5ced5cf4f03666099f4bcb1f7ab185
Author: Michael Stahl mst...@redhat.com
Date: Sat Feb 18 00:06:33 2012 +0100
fdo#39510: fix yet more layout crashes in ~SwRootFrm:
Call SwRootFrm::RemoveFtns with the proper boolean to also eliminate
EndNotes, and fix a faulty while loop in RemoveFtns that's been preventing
removal of footnotes in certain sections since the dawn of CVS history.
(regression from CWS swlayoutrefactoring, crashes on bugdoc from i#101776)
(cherry picked from commit 962d0500c4debaef43e5f146e47e08c66d851562)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index a8e1b46..8f0d1aa 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -1004,7 +1004,7 @@ void lcl_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool
bPageOnly, sal_Bool bEndNotes
if( pBody pBody-Lower() )
{
SwFrm* pLow = pBody-Lower();
-while( pLow-GetNext() )
+while (pLow)
{
if( pLow-IsSctFrm() ( !pLow-GetNext() ||
((SwSectionFrm*)pLow)-IsAnyNoteAtEnd() )
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 3943336..f51aa6b 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -616,7 +616,7 @@ SwRootFrm::~SwRootFrm()
// also searches backwards to find the master of footnotes, they must be
// considered to be owned by the SwRootFrm and also be destroyed here,
// before tearing down the (now footnote free) rest of the layout.
-AllRemoveFtns();
+RemoveFtns(0, false, true);
if(pBlink)
pBlink-FrmDelete( this );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - binfilter/bf_sw binfilter/inc
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx |5 --
binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx | 22 -
binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx |5 --
binfilter/bf_sw/source/ui/app/sw_docsh2.cxx|1
binfilter/inc/bf_sw/swunodef.hxx | 41 -
binfilter/inc/bf_sw/toxwrap.hxx| 17 +++
6 files changed, 23 insertions(+), 68 deletions(-)
New commits:
commit b42b9adeeda6e859943c7167dbc30f285e14d73e
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 20 20:51:40 2012 +0100
remove now unused swunodef.hxx
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index d586a99..4890880 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -64,7 +64,6 @@
#include usrfld.hxx
#include dbmgr.hxx
#include docfld.hxx
-#include swunodef.hxx
#include legacysmgr/legacy_binfilters_smgr.hxx
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx
b/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx
index 13abcd7..267195f 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx
@@ -55,7 +55,6 @@
#include bf_svtools/svstdarr.hxx
#include swunohelper.hxx
-#include swunodef.hxx
#include osl/diagnose.h
#include legacysmgr/legacy_binfilters_smgr.hxx
namespace binfilter {
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
index 4758125..9f8179a 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
@@ -58,7 +58,6 @@
#include bf_so3/svstor.hxx
#include comphelper/classids.hxx
-#include swunodef.hxx
#include osl/diagnose.h
diff --git a/binfilter/inc/bf_sw/swunodef.hxx b/binfilter/inc/bf_sw/swunodef.hxx
deleted file mode 100644
index b3097f2..000
--- a/binfilter/inc/bf_sw/swunodef.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef _SWUNODEF_HXX
-#define _SWUNODEF_HXX
-namespace binfilter {
-
-#define STAR_REFERENCE(aType) ::com::sun::star::uno::Reference
::com::sun::star::aType
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/toxwrap.hxx b/binfilter/inc/bf_sw/toxwrap.hxx
index 3f5a219..19899c1 100644
--- a/binfilter/inc/bf_sw/toxwrap.hxx
+++ b/binfilter/inc/bf_sw/toxwrap.hxx
@@ -33,7 +33,6 @@
#include com/sun/star/lang/Locale.hpp
#include com/sun/star/uno/Reference.hxx
-#include swunodef.hxx
namespace com { namespace sun { namespace star {
namespace i18n {
class XExtendedIndexEntrySupplier;
commit 823b60e8435a1d9237c2bf9591e47f179060cce2
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 20 20:47:08 2012 +0100
expand and remove macro STAR_REFERENCE
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index c55379b..d586a99 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -265,7 +265,7 @@ static int
/*N*/ eLang != SvxLocaleToLanguage( pCharClass-getLocale() ) )
/*N*/ {
/*N*/ ::com::sun::star::lang::Locale aLocale( SvxCreateLocale( eLang ));
-/*N*/ STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF(
+/*N*/ ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xMSF(
/*N*/
::legacy_binfilters::getLegacyProcessServiceFactory() );
/*N*/ pCharClass = new CharClass( xMSF, aLocale );
/*N*/ pLclData = new
[Libreoffice-commits] .: chart2/source
chart2/source/view/main/VLegendSymbolFactory.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit fd33b0d28e9f73b4911b43bedf334296b8025485
Author: Katarina Machalkova bu...@bubli.org
Date: Mon Feb 20 22:20:12 2012 +0100
fdo#31551: Show actual line width in the legend
however, limit the line width from above by legend entry height
(which +- matches the font height)
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx
b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 31b2cbc..79db3c1 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -44,7 +44,8 @@ namespace
void lcl_setPropetiesToShape(
const Reference beans::XPropertySet xProp,
const Reference drawing::XShape xShape,
-::chart::VLegendSymbolFactory::tPropertyType ePropertyType )
+::chart::VLegendSymbolFactory::tPropertyType ePropertyType,
+const awt::Size aMaxSymbolExtent = awt::Size(0,0))
{
const ::chart::tPropertyNameMap aFilledSeriesNameMap(
::chart::PropertyMapper::getPropertyNameMapForFilledSeriesProperties());
const ::chart::tPropertyNameMap aLineSeriesNameMap(
::chart::PropertyMapper::getPropertyNameMapForLineSeriesProperties());
@@ -83,7 +84,8 @@ void lcl_setPropetiesToShape(
sal_Int32 nLineWidth = 0;
if( pLineWidthAny (*pLineWidthAny=nLineWidth) )
{
-const sal_Int32 nMaxLineWidthForLegend = 50;/*1/100 mm*///todo:
make this dependent from legend entry height
+// use legend entry height as upper limit for line width
+sal_Int32 nMaxLineWidthForLegend = aMaxSymbolExtent.Height;
if( nLineWidthnMaxLineWidthForLegend )
*pLineWidthAny = uno::makeAny( nMaxLineWidthForLegend );
}
@@ -134,7 +136,7 @@ Reference drawing::XShape
VLegendSymbolFactory::createSymbol(
xLine-setSize( awt::Size( rEntryKeyAspectRatio.Width, 0 ));
xLine-setPosition( awt::Point( 0,
rEntryKeyAspectRatio.Height/2 ));
-lcl_setPropetiesToShape( xLegendEntryProperties, xLine,
ePropertyType );
+lcl_setPropetiesToShape( xLegendEntryProperties, xLine,
ePropertyType, rEntryKeyAspectRatio );
}
Reference drawing::XShape xSymbol;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: readlicense_oo/odt
readlicense_oo/odt/CREDITS.odt |binary 1 file changed New commits: commit 0699556c303d724c89b3e9873587c4e9e0d6fe99 Author: Andras Timar ati...@suse.com Date: Mon Feb 20 22:36:29 2012 +0100 updated LibreOffice contributors' credits (2012-02-02) diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt index b9246dc..f051e60 100644 Binary files a/readlicense_oo/odt/CREDITS.odt and b/readlicense_oo/odt/CREDITS.odt differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in desktop/Library_sofficeapp.mk solenv/gbuild vcl/Library_vcl.mk
config_host.mk.in |1 + configure.in |2 -- desktop/Library_sofficeapp.mk |4 solenv/gbuild/gbuild.mk |4 vcl/Library_vcl.mk|1 - 5 files changed, 5 insertions(+), 7 deletions(-) New commits: commit f8a120b0e4843139b3d739725ce54269cfd96bd1 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Mon Feb 20 18:39:14 2012 +0100 headless: cleanup HEADLESS definition Define HEADLESS globally as it is meant to be. diff --git a/config_host.mk.in b/config_host.mk.in index 1abf218..0385fa4 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -102,6 +102,7 @@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ export ENABLE_GTK3=@ENABLE_GTK3@ export ENABLE_GTK=@ENABLE_GTK@ export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@ +export ENABLE_HEADLESS=@ENABLE_HEADLESS@ export ENABLE_KAB=@ENABLE_KAB@ export ENABLE_KDE4=@ENABLE_KDE4@ export ENABLE_KDE=@ENABLE_KDE@ diff --git a/configure.in b/configure.in index 39fe207..0d320e7 100644 --- a/configure.in +++ b/configure.in @@ -8108,8 +8108,6 @@ if test x$enable_headless = xyes; then ENABLE_HEADLESS=TRUE SCPDEFS=$SCPDEFS -DHEADLESS R=headless -# this does not work see hack in Library_vcl.mk -AC_DEFINE(HEADLESS) fi AC_SUBST(ENABLE_HEADLESS) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b544f74..26eecbc 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -237,6 +237,10 @@ ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE) gb_GLOBALDEFS += -DENABLE_GRAPHITE endif +ifeq ($(strip $(ENABLE_HEADLESS)),TRUE) +gb_GLOBALDEFS += -DHEADLESS +endif + ifeq ($(HAVE_THREADSAFE_STATICS),TRUE) gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 3420f7d..843dceb 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -456,7 +456,6 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\ $$(FREETYPE_CFLAGS) \ )) $(eval $(call gb_Library_add_defs,vcl,\ --DHEADLESS \ -DSAL_DLLPREFIX=\$(gb_Library_SYSPRE)\ \ -DSAL_DLLPOSTFIX=\$(gb_Library_OOOEXT)\ \ -D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \ commit 3c177b96b80b9f506a6a93542cea870b3f8e1f51 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Mon Feb 20 11:38:15 2012 +0100 desktop: remove duplicated gb_Library_set_include call diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index ae078a7..6880eec 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -46,10 +46,6 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\ $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \ )) -$(eval $(call gb_Library_set_include,sofficeapp,\ -$$(INCLUDE) \ -)) - $(eval $(call gb_Library_add_linked_libs,sofficeapp,\ comphelper \ cppu \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - readlicense_oo/odt
readlicense_oo/odt/CREDITS.odt |binary 1 file changed New commits: commit 12978b6ed7b7dc0287b79925db2db6ae3befdcd4 Author: Andras Timar ati...@suse.com Date: Mon Feb 20 22:36:29 2012 +0100 updated LibreOffice contributors' credits (2012-02-02) (cherry picked from commit 0699556c303d724c89b3e9873587c4e9e0d6fe99) Signed-off-by: Miklos Vajna vmik...@suse.cz diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt index b9246dc..f051e60 100644 Binary files a/readlicense_oo/odt/CREDITS.odt and b/readlicense_oo/odt/CREDITS.odt differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/outdev2.cxx | 24 +++-
1 file changed, 11 insertions(+), 13 deletions(-)
New commits:
commit 30869cdcf761fea01b80ff09d99fd25b9fd7ce39
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 20 23:49:48 2012 +0100
vcl: TwoRect - SalTwoRect
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 1781655..6d8987e 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -78,8 +78,6 @@ DBG_NAMEEX( OutputDevice )
return; \
}
-#define TwoRect SalTwoRect
-
// -
// - externals -
// -
@@ -92,7 +90,7 @@ extern sal_uLong nVCLLut[ 256 ];
// ===
-sal_uLong ImplAdjustTwoRect( TwoRect rTwoRect, const Size rSizePix )
+sal_uLong ImplAdjustTwoRect( SalTwoRect rTwoRect, const Size rSizePix )
{
sal_uLong nMirrFlags = 0;
@@ -151,7 +149,7 @@ sal_uLong ImplAdjustTwoRect( TwoRect rTwoRect, const Size
rSizePix )
// ===
-void ImplAdjustTwoRect( TwoRect rTwoRect, const Rectangle rValidSrcRect )
+void ImplAdjustTwoRect( SalTwoRect rTwoRect, const Rectangle rValidSrcRect )
{
if( ( rTwoRect.mnSrcX rValidSrcRect.Left() ) || ( rTwoRect.mnSrcX =
rValidSrcRect.Right() ) ||
( rTwoRect.mnSrcY rValidSrcRect.Top() ) || ( rTwoRect.mnSrcY =
rValidSrcRect.Bottom() ) ||
@@ -192,7 +190,7 @@ void ImplAdjustTwoRect( TwoRect rTwoRect, const Rectangle
rValidSrcRect )
void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void*
pVoidPosAry )
{
-TwoRect*pPosAry = (TwoRect*)pVoidPosAry;
+SalTwoRect*pPosAry = (SalTwoRect*)pVoidPosAry;
SalGraphics*pGraphics2;
if ( this == pSrcDev )
@@ -285,7 +283,7 @@ void OutputDevice::DrawOutDev( const Point rDestPt, const
Size rDestSize,
OUTDEV_INIT();
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcWidth = ImplLogicWidthToDevicePixel( rSrcSize.Width() );
aPosAry.mnSrcHeight = ImplLogicHeightToDevicePixel( rSrcSize.Height() );
aPosAry.mnDestWidth = ImplLogicWidthToDevicePixel( rDestSize.Width() );
@@ -340,7 +338,7 @@ void OutputDevice::DrawOutDev( const Point rDestPt, const
Size rDestSize,
OUTDEV_INIT();
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rOutDev.ImplLogicXToDevicePixel( rSrcPt.X() );
aPosAry.mnSrcY = rOutDev.ImplLogicYToDevicePixel( rSrcPt.Y() );
aPosAry.mnSrcWidth = rOutDev.ImplLogicWidthToDevicePixel(
rSrcSize.Width() );
@@ -402,7 +400,7 @@ void OutputDevice::CopyArea( const Point rDestPt,
OUTDEV_INIT();
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcWidth = ImplLogicWidthToDevicePixel( rSrcSize.Width() );
aPosAry.mnSrcHeight = ImplLogicHeightToDevicePixel( rSrcSize.Height() );
@@ -478,7 +476,7 @@ void OutputDevice::ImplDrawFrameDev( const Point rPt,
const Point rDevPt, cons
else
ImplSelectClipRegion( rRegion );
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rDevPt.X();
aPosAry.mnSrcY = rDevPt.Y();
aPosAry.mnSrcWidth = rDevSize.Width();
@@ -637,7 +635,7 @@ void OutputDevice::ImplDrawBitmap( const Point rDestPt,
const Size rDestSize,
if( !aBmp.IsEmpty() )
{
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rSrcPtPixel.X();
aPosAry.mnSrcY = rSrcPtPixel.Y();
@@ -884,7 +882,7 @@ void OutputDevice::ImplDrawBitmapEx( const Point rDestPt,
const Size rDestSize
if( !( !aBmpEx ) )
{
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rSrcPtPixel.X();
aPosAry.mnSrcY = rSrcPtPixel.Y();
@@ -1131,7 +1129,7 @@ void OutputDevice::ImplDrawMask( const Point rDestPt,
const Size rDestSize,
const ImpBitmap* pImpBmp = rBitmap.ImplGetImpBitmap();
if ( pImpBmp )
{
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rSrcPtPixel.X();
aPosAry.mnSrcY = rSrcPtPixel.Y();
@@ -1298,7 +1296,7 @@ Bitmap OutputDevice::GetBitmap( const Point rSrcPt,
const Size rSize ) const
{
if ( ((OutputDevice*)aVDev)-mpGraphics ||
((OutputDevice*)aVDev)-ImplGetGraphics() )
{
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = nX;
aPosAry.mnSrcY = nY;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdotextpathdecomposition.cxx | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 1248e2af6a70c44651b74d2950aeabb64c1c70e7
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Tue Feb 21 09:27:38 2012 +1030
Fixed a possible NULL-dereference found by cppcheck in svx
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx
b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 6488124..0276f05 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -361,15 +361,16 @@ namespace
{
const impPathTextPortion* pCandidate = rTextPortions[a];
basegfx::B2DVector aFontScaling;
-const drawinglayer::attribute::FontAttribute
aCandidateFontAttribute(
-drawinglayer::primitive2d::getFontAttributeFromVclFont(
-aFontScaling,
-pCandidate-getFont(),
-pCandidate-isRTL(),
-false));
if(pCandidate pCandidate-getTextLength())
{
+const drawinglayer::attribute::FontAttribute
aCandidateFontAttribute(
+drawinglayer::primitive2d::getFontAttributeFromVclFont(
+aFontScaling,
+pCandidate-getFont(),
+pCandidate-isRTL(),
+false));
+
drawinglayer::primitive2d::TextLayouterDevice
aTextLayouter;
aTextLayouter.setFont(pCandidate-getFont());
xub_StrLen nUsedTextLength(0);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx |6 ++
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit e13dc26e394ede799a60691638971cf1d9689f74
Author: Jani Monoses j...@ubuntu.com
Date: Tue Feb 21 01:15:02 2012 +0200
ARM bridge: fixes for passing double arguments on the stack
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 07bdea1..9750b6a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -70,6 +70,7 @@ namespace
char * pCppStack = pTopStack;
#ifdef __ARM_PCS_VFP
+int dc = 0;
char * pFloatArgs = (char *)(pCppStack - 64);
#endif
// return
@@ -152,6 +153,11 @@ namespace
if ((pFloatArgs - pTopStack) % 8)
pFloatArgs+=sizeof(float); //align to 8
pCppArgs[nPos] = pUnoArgs[nPos] = pFloatArgs;
pFloatArgs += sizeof(double);
+if (++dc == arm::MAX_FPR_REGS) {
+if (pCppStack - pTopStack 16)
+pCppStack = pTopStack + 16;
+pFloatArgs = pCppStack;
+}
} else
#endif
pCppArgs[nPos] = pUnoArgs[nPos] = pCppStack;
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 8e69ebe..98b29ba 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -362,7 +362,8 @@ void callVirtualMethod(
{ \
++pDS; \
} \
-*pDS++ = *reinterpret_castdouble *( pSV );\
+*(double *)pDS = *reinterpret_castdouble *( pSV );\
+pDS += 2;\
}
#else
#define INSERT_FLOAT( pSV, nr, pFPR, pDS ) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 41ad8739cba290a309bffe85aaf2088289054933 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Feb 21 00:59:19 2012 +0100 make debugrun run debugrun and not subsequentcheck diff --git a/Makefile b/Makefile index 346e91c..4899664 100644 --- a/Makefile +++ b/Makefile @@ -448,10 +448,10 @@ findunusedcode: check: subsequentcheck subsequentcheck: dev-install - $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile $@ debugrun: - $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile debugrun + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile $@ endif # not clean or distclean ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - chart2/source sc/source
chart2/source/tools/ExplicitCategoriesProvider.cxx | 10 +-
sc/source/ui/unoobj/chart2uno.cxx |2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e4f14d089d81459ac2bf3c40e75e6cfd348b58c5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Feb 21 03:06:27 2012 +0100
don't add empty categories, fdo#46332
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 0317f94..7e42f8d 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1560,7 +1560,7 @@ ScChart2DataProvider::createDataSource(
}
Reference chart2::data::XLabeledDataSequence xChartSeries =
lcl_createLabeledDataSequenceFromTokens(
pValueTokens, pLabelTokens, m_pDocument, this,
m_bIncludeHiddenCells ); //ownership of pointers is transfered!
-if ( xChartSeries.is() )
+if ( xChartSeries.is()
xChartSeries-getValues()-getData().getLength() )
{
aSeqs.push_back( xChartSeries );
}
commit fc8a69bd337a8523eebe5f47a4fe49519cfc3fbc
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Feb 21 02:44:50 2012 +0100
fix typo
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index b174912..73f5801 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -86,19 +86,19 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider(
const Reference chart2:
{
uno::Reference data::XDataProvider xDataProvider(
xChartDoc-getDataProvider() );
-OUString aCatgoriesRange(
DataSourceHelper::getRangeFromValues( m_xOriginalCategories ) );
-if( xDataProvider.is() !aCatgoriesRange.isEmpty() )
+OUString aCategoriesRange(
DataSourceHelper::getRangeFromValues( m_xOriginalCategories ) );
+if( xDataProvider.is() !aCategoriesRange.isEmpty() )
{
const bool bFirstCellAsLabel = false;
const bool bHasCategories = false;
const uno::Sequence sal_Int32 aSequenceMapping;
uno::Reference data::XDataSource
xColumnCategoriesSource( xDataProvider-createDataSource(
- DataSourceHelper::createArguments( aCatgoriesRange,
aSequenceMapping, true /*bUseColumns*/
+ DataSourceHelper::createArguments( aCategoriesRange,
aSequenceMapping, true /*bUseColumns*/
, bFirstCellAsLabel, bHasCategories ) ) );
uno::Reference data::XDataSource xRowCategoriesSource(
xDataProvider-createDataSource(
- DataSourceHelper::createArguments( aCatgoriesRange,
aSequenceMapping, false /*bUseColumns*/
+ DataSourceHelper::createArguments( aCategoriesRange,
aSequenceMapping, false /*bUseColumns*/
, bFirstCellAsLabel, bHasCategories ) ) );
if( xColumnCategoriesSource.is()
xRowCategoriesSource.is() )
commit b57137d1ca3902e4c191fa0e3a87219380a0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Feb 20 16:05:42 2012 +0100
use const_iterator for begin and end
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 80f2808..b174912 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -321,7 +321,7 @@ std::vector ComplexCategory
lcl_DataSequenceToComplexCategoryVector(
sal_Int32 lcl_getCategoryCount( std::vector ComplexCategory
rComplexCategories )
{
sal_Int32 nCount = 0;
-std::vector ComplexCategory ::iterator aIt( rComplexCategories.begin() );
+std::vector ComplexCategory ::const_iterator aIt(
rComplexCategories.begin() );
std::vector ComplexCategory ::const_iterator aEnd(
rComplexCategories.end() );
for( ; aIt != aEnd; ++aIt )
nCount+=aIt-Count;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/engine3d/scene3d.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 967c82e9ce359ecb96982ece6d9e83f0771d8011
Author: David Tardon dtar...@redhat.com
Date: Tue Feb 21 06:21:15 2012 +0100
add missing semicolon
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 5081b50..805829f 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -224,7 +224,7 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes
/*rDefault*/)
{
// For WIN95/NT turn off the FP-Exceptions
#if defined(WNT)
-_control87( _MCW_EM, _MCW_EM )
+_control87( _MCW_EM, _MCW_EM );
#endif
// Set defaults
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] x11 / cairo-less build try #3
On 02/17/2012 05:52 PM, Michael Meeks wrote: On Wed, 2012-02-15 at 17:55 +0100, Riccardo Magliocchetti wrote: $ ./soffice.bin terminate called after throwing an instance of 'com::sun::star::loader::CannotActivateFactoryException' Aborted (core dumped) ... Nice - IMHO this is all a bit silly - the 'main' has no wrapper 'catch' around it, so if we get an un-caught exception we bomb out in a very unpleasant way for no particularly good reason. If you poke at desktop/source/app/sofficemain.cxx you'll see some #ifdef ANDROID-ness that adds a try / catch around 'main'. In theory there is an unoexceptionwrapper that can be put around this stuff with some magic, but ... Stephan - is there a reason why we would not catch and print something helpful (a native dialog?) on unhandled exceptions around master ? In my experience, such exceptions typically indicate a programming error (either in actual program code, or in the way the bits of the program are combined into an installation set). And for programmers, it is often more helpful to see the direct consequences of such error than some helpful mediation on LO's part (like the infamous The user language cannot be determined message, typically caused by some problem that has zero to do with any locale data, only leading devs to start searching in the wrong direction). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-5][PUSHED] Reintroduce pyuno.so wrapper around libpyuno.so
On 02/17/2012 03:51 PM, Michael Meeks wrote: Any chance you can merge it to -3-5 yourself ? done Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translated german comments in sw/source/core/layout/
Hi Philipp Thanks for your response and your hints on how to contribute - I'll keep that in mind for future contributions :) And also thanks for the review! -- Dave On 17/02/12 18:02, Philipp Weissenbacher wrote: Hello you two! Thanks for the big amount of work. I know how tiresome it is to translate this oververbose German to something that makes sense in English. That and the technical jargon make translating it quite time intensive. So kudos for that much work! I think that it'd be much easier to review your patches and get them integrated quicker if you post fewer of them and at an earlier stage. Every little step counts and is appreciated :). I usually try to keep under 50 K per patch - which makes for quite a few small files or one large one with some smaller ones. I saw that you also added TODO comments about the translation. That's not very handy, as I cannot communicate with you about it :-). It'd be nicer to either include the comment in the patch email or ask on IRC. I noticed a lot of trailing whitespace errors. I had the same problem in the beginning too, just find a plugin for your editor that removes them for you or (if you use vim) you can add autocmd BufWritePre * :%s/\s\+$//e to your ~/.vimrc file (see http://vim.wikia.com/wiki/Remove_unwanted_spaces). I would greatly appreciate it if you could do that for any future work. Then I don't have to fix them when reviewing. :-). BTW: I'm reviewing the first five patches. Cheers, Philipp 2012/2/16 David Vogt david.v...@adfinis-sygroup.ch: Hi everybody As Nicolas Christener and I promised to Cedric at FOSDEM, we set sail to translate the german comments in the sw/source/core/layout/ directory. We're still not quite done, but here's what we have so far. This, and any future contributions to LibreOffice are available under the MPL / LGPLv3+ unless stated otherwise. As far as I know, Nicolas has already sent his license statement, Stefan will follow soon. Since we're not very familiar with the code, it may well be that there are conceptual mistakes in our translation, so read with care ;) -- Dave -- Adfinis SyGroup AG David Vogt, Software Engineer / Project Manager Keltenstrasse 98 | CH-3018 Bern Tel. 031 381 70 47 | Direct 031 550 31 12 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Adfinis SyGroup AG David Vogt, Software Engineer / Project Manager Keltenstrasse 98 | CH-3018 Bern Tel. 031 381 70 47 | Direct 031 550 31 12 signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-5] Localization of Lightproof extensions
Hi, Lightprrof grammar checker options UI was enabled for localization in 3.5.0, and many teams have translations. I did not have time to tweak the makefiles in order to have translations built into the extensions. Now it's done. http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=312a744c1c8a4afce0fe06a4423d97ebb883fc6d Please cherry-pick to 3-5. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-5] New libvisio release
Hello, good people, In view of 3.5.1 freeze, I released new version of libvisio, incorporating Bruno Girin's work on line-markers, Eilidh's work on embedded OLE objects that are part of the shape stencil, as well as some random fixes and modifications to cope with the new behaviour of Draw concerning the closing/filling of paths. It is very safe and the regression tests are negative. Therefore, I implore the distinguished developers to cherry-pick it for our 3-5 branch ASAP. Thanks a lot Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-5] New libvisio release
And the URL is naturally here: http://cgit.freedesktop.org/libreoffice/core/commit/?id=21366a4b95defb007ddccd409126536a6e8dc50d F. On 20/02/12 10:20, Fridrich Strba wrote: Hello, good people, In view of 3.5.1 freeze, I released new version of libvisio, incorporating Bruno Girin's work on line-markers, Eilidh's work on embedded OLE objects that are part of the shape stencil, as well as some random fixes and modifications to cope with the new behaviour of Draw concerning the closing/filling of paths. It is very safe and the regression tests are negative. Therefore, I implore the distinguished developers to cherry-pick it for our 3-5 branch ASAP. Thanks a lot Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [core/vcl/source/window/splitwin.cxx:2047] -[core/vcl/source/window/splitwin.cxx:2045]:(style) Found duplicate branches for if and else.
On 02/18/2012 03:21 PM, julien2412 wrote: This subject, switch/if else, reminded me what I read recently on the Stroustrup book. 1) The fact that switch allows a better quality machine code. I wouldn't bet anything on that one. Compilers should be able to automatically identify if-else-chains that can be turned into switch-like code. 2) an enumeration used with a switch allows a compiler to detect a case which has be forgotten. That's indeed a reason it might be appropriate to go with a switch statement in certain cases. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: qa-build errros on clean code
Jonathan Aquilina wrote (19 februari 2012 17:31) What version of make does your system have? It seems like the 3.81 version has a bug with multithreaded builds. I know there is a patch that was compiled by one of the devs, just not sure where you can get it the patch for it. 3.82-140.1 Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: R: cygwin 1.7.10 - LO-3-5-0 - build fails - my git problem ?
On 02/19/2012 02:28 AM, walter wrote: The build fails in module 125. After re-run inside the module: = (1/1) Building module translations = Entering /cygdrive/c/LO350/translations dmake: Error: -- `/cygdrive/c/LO350/solver/wntmsci12.pro/bin/localize' not found, and can't be made Hm, localize (localize.exe) should be delivered there from module l10ntools. Can you check whether there is any localize* in that directory? Also, module translations should only be built if you configure --with-lang=... If you do not need anything but the default en-US localization, you can try whether a build without that switch works better. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-5] New libvisio release
On 20/02/12 10:21, Fridrich Strba wrote: And the URL is naturally here: http://cgit.freedesktop.org/libreoffice/core/commit/?id=21366a4b95defb007ddccd409126536a6e8dc50d And the issues immediately reported are fixed here: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f241f91e03c25d337598092b21f1c1360c7731eb ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LibreOffice on Windows
On Mon, 2012-02-20 at 18:22 +1030, Josh Heidenreich wrote: Okay so it might be nuts, but has anyone tried creating a native VS solution/projects, which ruins inside the ide? Could one be created cmake style perhaps? Ruins ? :-) I suspect that, unless this can be compiled from the gnumake information - and (I guess) this is not utterly impractical, given the high-level gnumake descriptions I suspect; that this would be a ton of work to maintain - particularly since MS change their VS project format fairly regularly IIRC. But if you want to work on that; go for it. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-5] fix anchor handling in SwXText::convertToTextFrame()
Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=9592f56323de27f9e1d890ee6259a5f4f328cbd3 It's an issue in the Writer UNO API, so it affects at least docx and RTF import, an RTF reproducer is attached. If some importer already worked around this issue by inserting empty paragraphs between textframes, then the added code will become a NOP. Thanks, Miklos table-frames.rtf Description: RTF file ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Unused solenv tools - can I remove these?
On 02/19/2012 01:31 AM, Norbert Thiebaud wrote: On Sat, Feb 18, 2012 at 3:54 PM, Tim Retoutt...@retout.co.uk wrote: cleandiff.pl # used in 'create_patch' target of solenv/inc/tg_ext.mk, but I can't find 'create_patch' in any makefiles. Is this likely to be called manually? yes, I believe that is a helper to generate patch for external libs. I never used it myself, but taht should prolly be kept around. Yes, dmake create_patch is intended to be run manually, and still actively used. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: cygwin 1.7.10 - LO-3-5 - the compiler error in npwin.cpp reappears
On Mon, 2012-02-20 at 08:52 +0100, walter wrote: have removed my local directory and I have re-cloned the project. Wow - that's expensive. I'd really not do that - if you want to clean your tree: 'make clean' and git reset --hard can do that for you. The error remains the same. Ah - perhaps this is on the -3-5 branch, and the build fix didn't make it there yet ? [ I hope you're building from libreoffice-3-5 it should make life easier ]. I don’t understand why my local copy of npwin.cpp is not updated !! I guess the fix on master didn't make it to the branch yet, hopefully Petr will cherry-pick that in a sec. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LibreOffice on Windows
Okay so it might be nuts, but has anyone tried creating a native VS solution/projects, which ruins inside the ide? In theory it should be fairly trivial to create a native (whatever that means) VS solution that just runs the same Cygwin make that you would start manually otherwise. But I guess that is not what you meant... So could you please explain what you actually want to be able to do? Is it really just pressing F5 instead of typing make? If you want to use VS for debugging, that is certainly already possible; and in fact is the way one usually debugs LO on Windows. Works fine. If you want to use VS as an editor, to write code, well, that should be possible, too. Although it might be that this would introduce TAB characters in the source files, which we don't want. But my guess would be that you would want VS to *understand* the LO codebase, so that you could use the programming by tooltips paradigm? Given the size of the LO codebase (and perhaps the way it uses C++), I guess that would be quite hard. But you can try... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LibreOffice on Windows
Okay so it might be nuts, but has anyone tried creating a native VS solution/projects, which ruins inside the ide? Could one be created cmake style perhaps? 5 years ago I did that for a non trivial Open Source project (it included gtk, python, gstreamer, etc.). I would say it was more or less 35% of the work it would require to do it for LibreOffice, and it took me around 6 months (8 hours a day) to have it perfectly right. On the other side, LibreOffice is easier as the code already compiles well on Windows. It can be done, yes. But it requires several months of work from someone who knows what is doing and the result would probably be a nightmare to maintain. -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEWED] Working through cppcheck errors
On Mon, 2012-02-20 at 15:38 +1030, Josh Heidenreich wrote: I decided to begin some work looking through the cppcheck [1] errors. I found a nullPointer in svx/source/svdraw/svdotextpathdecomposition.cxx. Your patch looks very sensible ! :-) please do push it. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Hosting LibreOffice online
On Fri, 2012-02-17 at 17:54 +0100, Sophie Gautier wrote: Hi Drew, On 16/02/2012 06:50, drew wrote: [...] Just to wrap this thread up, I suppose. Well, after adding --enable-gtk3 it works. Had some issues related to the firewall, but got around that - turned it off (not likely a good long term solution :-) WebSocket support was (is) an issue. - Win7 and Vista with ie9: Fail - HP Mini 110, Mi (Linux) w/ FireFox [latest updates applied]: Fail All the other browsers I tried (FF under Natty, Chromium, Opera): Pass @Andor - if you just want to play with this, I could point you to a VM with everything pre-installed - I'd need a day or 2 to put it together I suppose, just let me know. I'm also interested in trying to play with it. But no hurry - I just have some DVD labels to localize ;-) so when yLiger__LOoL3.i686-0.0.9.vmx.tar.gz ou'll be ready, could you ping me too, please? Thanks in advance. Kind regards Hi Sophie Well - the foundation is, A Foundation..good news yes! And here is the link to a VM pre-enstalled (mostly :-? ) The sustudio profile page is: http://susestudio.com/a/NfE1GU/lippity-lopity-loly_lazing-liger-lool-3 You know if I could maybe see to change the port number in the next build one could actually demo this using the testdrive feature at susestudio. So, the VM there is just the installation files are the 3.6 (master) build out from my machine (I'm sure they could be smaller) with the JeOS (Just enough Operating System) template, and not much (not enough it seems) more. I put a copy of the download file here also (fo anyone not wanting to register an account at suseStudio): http://lo-portal.us/SBS/download/Liger__LOoL3.i686-0.0.9.vmx.tar.gz MD5: 78de314bc29101f1e70674b27c39cf11 So it is pretty straight forward Download the compressed file un-pack to a directory of your choice it will create a dir with that silly name lippity-lopity-loly_lazying-liger-lool-3 by default create your entry in your vm manager of choice (VBox, KVM, Quem) Start the vm and get to a command prompt (logon as tux, password linux) you can start LibO in listening mode with the shell script ~/liber.sh Best wishes, //drew ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-5] Localization of Lightproof extensions
On llu 20 feb 2012 10:07:08 CET, Andras Timar wrote: Hi, Lightprrof grammar checker options UI was enabled for localization in 3.5.0, and many teams have translations. I did not have time to tweak the makefiles in order to have translations built into the extensions. Now it's done. http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=312a744c1c8a4afce0fe06a4423d97ebb883fc6d Please cherry-pick to 3-5. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice Hi Andras, all I was about to start working in Asturian Lightproof checker when I was told our Asturian spellchecker people were working in languagetool. Please, can you tell us which is/will be the default grammar checker (if any)? It shouldn't be that hard to convert rules, but it's better to do it now if needed. Best regards, -- Xuacu Saturio Sent while testing Thunderbird Unviáu dende Thunderbird en pruebes ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-5][PUSHED] New libvisio release
On 02/20/2012 10:43 AM, Fridrich Strba wrote: On 20/02/12 10:21, Fridrich Strba wrote: And the URL is naturally here: http://cgit.freedesktop.org/libreoffice/core/commit/?id=21366a4b95defb007ddccd409126536a6e8dc50d And the issues immediately reported are fixed here: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f241f91e03c25d337598092b21f1c1360c7731eb pushed, combining both master commits into one libreoffice-3-5 commit Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
R: R: cygwin 1.7.10 - LO-3-5-0 - build fails - my git problem ?
Now, after a full re-clone, I have a build error in 'reportbuilder'. Please see logs http://pastebin.com/u/walterLO Best Regards walter -Messaggio originale- Da: Stephan Bergmann [mailto:sberg...@redhat.com] Inviato: lunedì 20 febbraio 2012 10:41 A: w.guerri...@ranocchilab.com Cc: 'Andras Timar'; libreoffice@lists.freedesktop.org Oggetto: Re: R: cygwin 1.7.10 - LO-3-5-0 - build fails - my git problem ? On 02/19/2012 02:28 AM, walter wrote: The build fails in module 125. After re-run inside the module: = (1/1) Building module translations = Entering /cygdrive/c/LO350/translations dmake: Error: -- `/cygdrive/c/LO350/solver/wntmsci12.pro/bin/localize' not found, and can't be made Hm, localize (localize.exe) should be delivered there from module l10ntools. Can you check whether there is any localize* in that directory? Also, module translations should only be built if you configure --with-lang=... If you do not need anything but the default en-US localization, you can try whether a build without that switch works better. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: R: R: cygwin 1.7.10 - LO-3-5-0 - build fails - my git problem ?
I normally specify the autogen parameter --without-java when building on Windows. It just seems to be very fragile there. On 2012-02-20 12:28, walter wrote: Now, after a full re-clone, I have a build error in 'reportbuilder'. Please see logs http://pastebin.com/u/walterLO Best Regards walter -Messaggio originale- Da: Stephan Bergmann [mailto:sberg...@redhat.com] Inviato: lunedì 20 febbraio 2012 10:41 A: w.guerri...@ranocchilab.com Cc: 'Andras Timar'; libreoffice@lists.freedesktop.org Oggetto: Re: R: cygwin 1.7.10 - LO-3-5-0 - build fails - my git problem ? On 02/19/2012 02:28 AM, walter wrote: The build fails in module 125. After re-run inside the module: = (1/1) Building module translations = Entering /cygdrive/c/LO350/translations dmake: Error: -- `/cygdrive/c/LO350/solver/wntmsci12.pro/bin/localize' not found, and can't be made Hm, localize (localize.exe) should be delivered there from module l10ntools. Can you check whether there is any localize* in that directory? Also, module translations should only be built if you configure --with-lang=... If you do not need anything but the default en-US localization, you can try whether a build without that switch works better. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About fdo#46180 LO Base fails to connect to *.DBF files but connects OK to *.dbf
On Sun, 2012-02-19 at 05:49 -0800, julien2412 wrote: I let a comment about this bug https://bugs.freedesktop.org/show_bug.cgi?id=46180#c3. I'm stucked because I don't know what's the use of the boolean variables quoted in the comment. Does Lionel's feedback help ? :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: cygwin 1.7.10 - LO-3-5 - the compiler error in npwin.cpp reappears
Michael Meeks píše v Po 20. 02. 2012 v 09:56 +: On Mon, 2012-02-20 at 08:52 +0100, walter wrote: have removed my local directory and I have re-cloned the project. Wow - that's expensive. I'd really not do that - if you want to clean your tree: 'make clean' and git reset --hard can do that for you. The error remains the same. Ah - perhaps this is on the -3-5 branch, and the build fix didn't make it there yet ? [ I hope you're building from libreoffice-3-5 it should make life easier ]. I don’t understand why my local copy of npwin.cpp is not updated !! I guess the fix on master didn't make it to the branch yet, hopefully Petr will cherry-pick that in a sec. The fixes should be in 3-5 branch now: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=e46472ae2e4eea0e201565fb8dd7bdcb59ef9c28 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=19903d30def0a2bf63357031e56b18b5c4abea78 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=a53ac5138029f6960d4b1610fcc34f34d4eec1c8 Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: R: R: R: cygwin 1.7.10 - LO-3-5-0 - build fails - my git problem ?
It means that certain extensions cannot be used. For example, reportbuilder and help-indexing. On 2012-02-20 12:38, walter wrote: If I specify --without-java what does change in using LO under windows ? Best regards Walter -Messaggio originale- Da: libreoffice-bounces+w.guerrieri=ranocchilab@lists.freedesktop.org [mailto:libreoffice-bounces+w.guerrieri=ranocchilab@lists.freedesktop.or g] Per conto di Noel Grandin Inviato: lunedì 20 febbraio 2012 11:33 A: w.guerri...@ranocchilab.com Cc: 'Andras Timar'; libreoffice@lists.freedesktop.org; 'Stephan Bergmann' Oggetto: Re: R: R: cygwin 1.7.10 - LO-3-5-0 - build fails - my git problem ? I normally specify the autogen parameter --without-java when building on Windows. It just seems to be very fragile there. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice 3.6.0alpha built on clang
Hi Julien, I began to run static analyzer and posted some output on the easyhack here : https://bugs.freedesktop.org/show_bug.cgi?id=39596 I'm getting the message scan-build: Removing directory '/tmp/scan-build-2012-02-20-1' because it contains no reports. How did you get scan-build to generate reports? Regards, --wm ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Remove unused methods from PDFI
On Sat, 2012-02-18 at 21:18 +, Kate Goss wrote: Quick question - Can anyone point me to list of supported browsers for the bug submission assistant? I don't believe we have one :-) but I would say - whatever makes most sense, ie. forget IE6, and anything else old that causes significant grief complexity ;-) There is little point in doing lots of heavy lifting for ancient browsers with small market share I think. Does that help ? Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
REMINDER: Release 3.5.1-rc1 from libreoffice-3-5 branch
Hi, please note that the commit deadline for 3.5.1-rc1 is today, February 20, 2012. The branch libreoffice-3-5-1 is going to be created the day after. Only commits with 3 reviewers will be allowed for that branch. See also http://wiki.documentfoundation.org/ReleasePlan#3.5_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Re: R: R: cygwin 1.7.10 - LO-3-5-0 - build fails - my git problem ?
On 20/02/12 11:28, walter wrote: Now, after a full re-clone, I have a build error in 'reportbuilder'. Please see logs http://pastebin.com/u/walterLO looking at the log it seems like you have a --with-lang setting and for none of the languages you have enabled there is a translation of the description for the reportbuilder extension. please try if the (untested) attachment fixes it. also, you could contribute a translation of the extension description :) regards, michael From 521ca8def4020015dbfc01c06d72f29ab0733e99 Mon Sep 17 00:00:00 2001 From: Michael Stahl mst...@redhat.com Date: Mon, 20 Feb 2012 11:59:03 +0100 Subject: [PATCH] reportbuilder: untested fix for WITH_LANG build --- reportbuilder/util/makefile.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index 78672bb..d3cc505 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -152,7 +152,7 @@ $(DESCRIPTION_SRC): description.xml $(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all $(SED) s/#VERSION#/$(EXTENSION_VERSION)/ $@ $@.new mv $@.new $@ -@$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR) +@@-$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR) .ELSE $(SED) s/#VERSION#/$(EXTENSION_VERSION)/ $ $@ .ENDIF -- 1.7.7.6 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: cygwin 1.7.10 - LO-3-5-0 - build fails in 'reportbuilder'
On Sat, 2012-02-18 at 14:23 +0100, walter wrote: Please see logs AT http://pastebin.com/u/walterLO Could it be that your translation/ repository is still on 'master' but your core/ repository is on libreoffice-3-5 ? If so you'd want to do: ./g checkout libreoffice-3-5 [ which will synchronise all of your checked out git repositories ], ie. './g' -not- 'git' HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LibreOffice on Windows
On Mon, Feb 20, 2012 at 09:44:50AM +, Michael Meeks wrote: On Mon, 2012-02-20 at 18:22 +1030, Josh Heidenreich wrote: Okay so it might be nuts, but has anyone tried creating a native VS solution/projects, which ruins inside the ide? Could one be created cmake style perhaps? Ruins ? :-) I suspect that, unless this can be compiled from the gnumake information - and (I guess) this is not utterly impractical, given the high-level gnumake descriptions I suspect; that this would be a ton of work to maintain - particularly since MS change their VS project format fairly regularly IIRC. Well, just like we have backends for Linux, OS X and Windows/Cygwin in solenv/gbuild/platform, we could have another one that instead of building in a cygwin shell creates the MSBuild files and kicks off a build with those. That file could also be used in MSVC to build from the IDE. However: - You cant edit it from the IDE as it is generated (or you would have to duplicate your changes in gbuild later) - Building C++ libraries might be reasonably easy to implement, but all our custom tooling will be a pain (l10n, SDFs etc.) IMHO it would be an unreasonably high effort to get this done for a complete build and because the generated MSBuild files are readonly (i.e. if you add a C++ file you would need to edit gbuild files again) and one would need to be careful to regenerate them after changes the gain is minimal. I wouldnt oppose someone doing it (actually I think it would be a cute hack), but rationally I think it is rarely worth it. The only scenario where it would be useful, is some native windowshacker just working on one lib. Then he could generate a MSBuild description for it, work on it and only in the end would need to translate his build changes (added source files etc.) back to gbuild, while being able to using his trusted and known MSVC IDE for the rest. Best, Bjoern P.S.: Note that even then MSVC would be pushed to its limits: code complete for a library like libsw would suffer hard from the things that needed to be parsed from all the includes. IIRC from the tests once made on a very powerful machine it still works, but it would be too slow to most being used to faster editing with vim and opengrok. And yeah: Netbeans is even slower -- once it did a gc every second it knocked itself out quite effectively. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-5] Localization of Lightproof extensions
On Mon, 2012-02-20 at 11:25 +0100, Xuacu Saturio wrote: I was about to start working in Asturian Lightproof checker when I was told our Asturian spellchecker people were working in languagetool. :-) Please, can you tell us which is/will be the default grammar checker (if any)? It shouldn't be that hard to convert rules, but it's better to do it now if needed. The default checker that is bundled will be lightproof this is primarily due to the choice of Java for LanguageTool - which gives a -very- substantial performance hit of the order of a handful of seconds of non-responsive-ness, as you start typing / interacting with a new libreoffice process the first time after load. Lightproof is written in python which we bundle, and is reasonably fast to bootstrap. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
R: Building LibreOffice on Windows
But .. isn't there a project that involves the complete replacement of the MS compiler? Best Regards walter ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #191 from sasha.libreoff...@gmail.com 2012-02-20 03:28:27 PST --- mentioned above bug 46144 is regression since version 3.4 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
[PUSHED] Replace make_absolute_path with rel2abs in solenv
Hi Tim, On Sun, 2012-02-19 at 14:39 +, Tim Retout wrote: These three patches remove some home-grown path manipulation from solenv, and replace it with functions shipped with the Perl core. Great :-) thanks for that, it's always nice to use standard methods instead of custom / hand-coded ones. Clearly we want to introduce new perl dependencies on shared modules only with some care - it's nice having solenv/ be reasonably self-contained. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LibreOffice on Windows
But .. isn't there a project that involves the complete replacement of the MS compiler? Yes. But that is not used *on* Windows. The subject of this thread is Building LibreOffice *on* Windows. MinGW (the commonly used name for the GNU compiler and tool-chain when targeting Windows) is supported only for cross-compiling LibreOffice. The main reason to use MinGW is to be able to cross-compile. (Cross-compile from Linux or some other Unix, that is.) We don't see any point in using MinGW to build LibreOffice on Windows itself. If one wants to build on Windows itself, why not then use Microsoft's compiler, and be able to use the much more usable VS debugger? So far not all of the code is even compilable using MinGW due to gaps in the APIs supported by the MinGW tool-chain. OpenOffice.org, at least back when Sun/Oracle still was behind it, had a few (?) people working on using MinGW on Windows. We are not interested in that. Correspondingly they had not worked on cross-compilation (to any platform) at all as far as I know. When I say we above, I mean those of us who have worked on this stuff so far in LibreOffice. Of course, you are free to think differently and work on using MinGW on Windows, if you for some reason think it would be a good idea. As long as your patches don't make stuff incredibly ugly and complex, they will be accepted. But you get to maintain that aspect yourself, of course. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LibreOffice on Windows
On Mon, Feb 20, 2012 at 01:36:46PM +0200, Tor Lillqvist wrote: OpenOffice.org, at least back when Sun/Oracle still was behind it, had a few (?) people working on using MinGW on Windows. We are not interested in that. Correspondingly they had not worked on cross-compilation (to any platform) at all as far as I know. AFAIK that was a pure community effort and not backed by Sun/Oracle. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
