[Libreoffice-commits] .: src/pptstream.py
src/pptstream.py |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 26802820dda81ffdd07fba03e259a271be7149d6
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu May 3 14:35:47 2012 +0300
Print record type and instance in decimal, too
Makes cross-referencing with the Microsoft PPT format specification
easier, as that uses decimal for these.
diff --git a/src/pptstream.py b/src/pptstream.py
index 8e32501..4468e81 100644
--- a/src/pptstream.py
+++ b/src/pptstream.py
@@ -125,8 +125,8 @@ class PPTDirStream(object):
self.__print([%s]%recData[recordType][0])
else:
self.__print([anon record])
-self.__print((type: %4.4Xh inst: %4.4Xh, vers: %4.4Xh, start: %d,
size: %d)%
- (recordType, recordInstance, recordVersion, startPos, size))
+self.__print((type: %4.4Xh (%d) inst: %4.4Xh (%d), vers: %4.4Xh,
start: %d, size: %d)%
+ (recordType, recordType, recordInstance, recordInstance,
recordVersion, startPos, size))
self.__printSep('=')
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - src/pptrecord.py src/pptstream.py
src/pptrecord.py | 48
src/pptstream.py |7 ---
2 files changed, 52 insertions(+), 3 deletions(-)
New commits:
commit a19153ea5e828e4465e9e9896a5ab050945ec28e
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu May 3 15:36:11 2012 +0300
Add ViewInfoAtom handler
diff --git a/src/pptrecord.py b/src/pptrecord.py
index 6e37c93..bdfbbd3 100644
--- a/src/pptrecord.py
+++ b/src/pptrecord.py
@@ -101,6 +101,15 @@ append a line to be displayed.
bytes = self.readBytes(8)
return globals.getDouble(bytes)
+def readRatio (self):
+numer = self.readSignedInt(4)
+denom = self.readSignedInt(4)
+return %d/%d%(numer, denom)
+
+def readScaling (self):
+xratio = self.readRatio()
+yratio = self.readRatio()
+return (%s,%s)%(xratio, yratio)
class String(BaseRecordHandler):
Textual content.
@@ -433,6 +442,18 @@ class SlideViewInfoAtom(BaseRecordHandler):
self.appendLine(snap to shape: %s%(self.readUnsignedInt(1)!=0))
# ---
+# special record handler: view info atom
+
+class ViewInfoAtom(BaseRecordHandler):
+View Info atom.
+
+def parseBytes (self):
+self.appendLine(current scale: %s%self.readScaling())
+self.readBytes(24)
+self.appendLine(origin: (%d,%d)%(self.readSignedInt(4),
self.readSignedInt(4)))
+self.appendLine(zoom to fit: %s%(self.readUnsignedInt(1)!=0))
+
+# ---
# special record handlers: ppt97 animation info
class AnimationInfo(BaseRecordHandler):
diff --git a/src/pptstream.py b/src/pptstream.py
index 06244a8..13f9ecb 100644
--- a/src/pptstream.py
+++ b/src/pptstream.py
@@ -228,7 +228,7 @@ recData = {
1018: [DFF_PST_SlideViewInfo],
1019: [DFF_PST_GuideAtom],
1020: [DFF_PST_ViewInfo],
- 1021: [DFF_PST_ViewInfoAtom],
+ 1021: [DFF_PST_ViewInfoAtom, pptrecord.ViewInfoAtom],
1022: [DFF_PST_SlideViewInfoAtom, pptrecord.SlideViewInfoAtom],
1023: [DFF_PST_VBAInfo],
1024: [DFF_PST_VBAInfoAtom],
commit a859c34443aade31a7e68cb8ce132cf793645f0f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu May 3 15:15:10 2012 +0300
Add SlideViewInfoAtom handler
diff --git a/src/pptrecord.py b/src/pptrecord.py
index a8fe231..6e37c93 100644
--- a/src/pptrecord.py
+++ b/src/pptrecord.py
@@ -422,6 +422,17 @@ class SlidePersistAtom(BaseRecordHandler):
self.appendLine(unique slide id: %d%self.readUnsignedInt(4))
# ---
+# special record handler: slide view info atom
+
+class SlideViewInfoAtom(BaseRecordHandler):
+Slide View Info atom.
+
+def parseBytes (self):
+self.appendLine(guides visible: %s%(self.readUnsignedInt(1)!=0))
+self.appendLine(snap to grid: %s%(self.readUnsignedInt(1)!=0))
+self.appendLine(snap to shape: %s%(self.readUnsignedInt(1)!=0))
+
+# ---
# special record handlers: ppt97 animation info
class AnimationInfo(BaseRecordHandler):
diff --git a/src/pptstream.py b/src/pptstream.py
index c45ac7a..06244a8 100644
--- a/src/pptstream.py
+++ b/src/pptstream.py
@@ -229,7 +229,7 @@ recData = {
1019: [DFF_PST_GuideAtom],
1020: [DFF_PST_ViewInfo],
1021: [DFF_PST_ViewInfoAtom],
- 1022: [DFF_PST_SlideViewInfoAtom],
+ 1022: [DFF_PST_SlideViewInfoAtom, pptrecord.SlideViewInfoAtom],
1023: [DFF_PST_VBAInfo],
1024: [DFF_PST_VBAInfoAtom],
1025: [DFF_PST_SSDocInfoAtom],
commit bebeb28afb2502043f6e00eaa4d7d9f7d804bed2
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu May 3 15:11:37 2012 +0300
Add SlidePersistAtom handler
diff --git a/src/pptrecord.py b/src/pptrecord.py
index d13df90..a8fe231 100644
--- a/src/pptrecord.py
+++ b/src/pptrecord.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil -*-
#
#OpenOffice.org - a multi-platform office productivity suite
@@ -406,6 +407,21 @@ class SlideInfo(BaseRecordHandler):
self.appendLine(speed: %d%self.readUnsignedInt(1))
# ---
+# special record handler: slide persist atom
+
+class SlidePersistAtom(BaseRecordHandler):
+Slide Persist atom.
+
+def parseBytes (self):
+slideref=self.readUnsignedInt(4)
+self.appendLine(logical slide reference: %4.4Xh (%d)%(slideref,
slideref))
+flags=self.readUnsignedInt(4)
+self.appendLine(outline view is collapsed: %s%((flags 0x02)!=0))
+self.appendLine(slide contains shapes other than placeholders:
%s%((flags 0x04)!=0))
+self.appendLine(number of placeholder texts:
%d%self.readUnsignedInt(4))
+self.appendLine(unique slide id: %d%self.readUnsignedInt(4
[Libreoffice-commits] .: configure.in
configure.in | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit d6b2189fee1df979dfee53ac3824f101278facdf Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Apr 25 10:25:29 2012 +0300 Fix test syntax error: integer expression expected diff --git a/configure.in b/configure.in index 9fcc1f8..0b0ceda 100644 --- a/configure.in +++ b/configure.in @@ -2574,7 +2574,7 @@ HAVE_GCC_FINLINE_LIMIT= HAVE_GCC_FNO_INLINE= if test $GCC = yes; then AC_MSG_CHECKING([whether $CC supports -ggdb2]) -if test -n $CLANGVER -a $CLANGVER -le 30100; then +if test -n $CLANGVER -a 0$CLANGVER -le 30100; then # Option just ignored and silly warning that isn't a real # warning printed : @@ -2591,7 +2591,7 @@ if test $GCC = yes; then fi AC_MSG_CHECKING([whether $CC supports -finline-limit=0]) -if test -n $CLANGVER -a $CLANGVER -le 30100; then +if test -n $CLANGVER -a 0$CLANGVER -le 30100; then # As above : else @@ -2607,7 +2607,7 @@ if test $GCC = yes; then fi AC_MSG_CHECKING([whether $CC supports -fno-inline]) -if test -n $CLANGVER -a $CLANGVER -le 30100; then +if test -n $CLANGVER -a 0$CLANGVER -le 30100; then # Ditto : else @@ -4784,7 +4784,7 @@ HAVE_GCC_FNO_DEFAULT_INLINE= HAVE_GCC_FNO_ENFORCE_EH_SPECS= if test $GCC = yes; then AC_MSG_CHECKING([whether $CXX supports -fno-default-inline]) -if test -n $CLANGVER -a $CLANGVER -le 30100; then +if test -n $CLANGVER -a 0$CLANGVER -le 30100; then # Option just ignored and silly warning that isn't a real # warning printed : @@ -4803,7 +4803,7 @@ if test $GCC = yes; then fi AC_MSG_CHECKING([whether $CXX supports -fno-enforce-eh-specs]) -if test -n $CLANGVER -a $CLANGVER -le 30100; then +if test -n $CLANGVER -a 0$CLANGVER -le 30100; then # As above : else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 26 commits - avmedia/source basctl/source basic/source configure.in connectivity/source cppu/inc dbaccess/source distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOffi
avmedia/source/quicktime/player.mm|1 basctl/source/dlged/dlged.cxx |2 basic/source/basmgr/basmgr.cxx|2 configure.in | 15 ++- connectivity/source/commontools/makefile.mk |3 connectivity/source/cpool/makefile.mk |3 connectivity/source/drivers/ado/makefile.mk |4 connectivity/source/drivers/calc/makefile.mk |4 connectivity/source/drivers/dbase/makefile.mk |3 connectivity/source/drivers/file/makefile.mk |3 connectivity/source/drivers/flat/makefile.mk |3 connectivity/source/drivers/jdbc/makefile.mk |3 connectivity/source/drivers/mysql/makefile.mk |3 connectivity/source/drivers/odbc/makefile.mk |4 connectivity/source/manager/makefile.mk |3 connectivity/source/resource/makefile.mk |3 connectivity/source/sdbcx/makefile.mk |3 cppu/inc/com/sun/star/uno/Any.hxx | 12 +- dbaccess/source/ui/browser/unodatbr.cxx |7 + dbaccess/source/ui/misc/UITools.cxx | 22 ++--- dbaccess/source/ui/querydesign/JoinTableView.cxx |2 distro-configs/LibreOfficeMacOSX.conf |1 distro-configs/LibreOfficeWin32.conf |1 distro-configs/LibreOfficeWin64.conf |1 extensions/source/macosx/spotlight/OOoContentDataParser.m |1 extensions/source/macosx/spotlight/OOoMetaDataParser.m|1 fpicker/source/aqua/CFStringUtilities.hxx |2 pyuno/zipcore/makefile.mk |4 shell/source/unix/sysshell/makefile.mk|2 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx |2 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 44 -- slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.h |9 ++ slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m |4 vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 22 - vcl/aqua/source/dtrans/DropTarget.cxx |5 - vcl/aqua/source/gdi/aquaprintaccessoryview.mm |6 - vcl/aqua/source/gdi/aquaprintview.mm |1 vcl/aqua/source/gdi/salatslayout.cxx |4 vcl/aqua/source/gdi/salbmp.cxx|1 vcl/aqua/source/gdi/salgdiutils.cxx |2 vcl/aqua/source/window/salframeview.mm|2 vcl/inc/aqua/aquavcltypes.h |2 42 files changed, 71 insertions(+), 151 deletions(-) New commits: commit feb4ce887f37fa9208ea68f83eca68cb090c2ff6 Author: Tor Lillqvist t...@iki.fi Date: Tue Apr 24 10:52:32 2012 +0300 Use blank as the false value for ENABLE_CAIRO_CANVAS, too diff --git a/configure.in b/configure.in index c9f270b..8a726ee 100644 --- a/configure.in +++ b/configure.in @@ -8680,7 +8680,7 @@ elif test -z $enable_cairo_canvas; then enable_cairo_canvas=yes fi -ENABLE_CAIRO_CANVAS=FALSE +ENABLE_CAIRO_CANVAS= if test $enable_cairo_canvas = yes; then ENABLE_CAIRO_CANVAS=TRUE fi commit 7e1516124bb05f9f40e1d724688b7b1a80327dfe Author: Tor Lillqvist t...@iki.fi Date: Tue Apr 24 10:41:59 2012 +0300 Hardcode cairo canvas off for Mac OS X and Windows Do not depend on a distro-configs file to disable it. It is supposed to be optional to pass a --with-distro option. Running a bare ./autogen.sh is supposed to produce a working configuration. diff --git a/configure.in b/configure.in index a1568ec..c9f270b 100644 --- a/configure.in +++ b/configure.in @@ -702,7 +702,7 @@ AC_ARG_ENABLE(split-opt-features, AC_ARG_ENABLE(cairo-canvas, [ --disable-cairo-canvas Determines whether to build the Cairo canvas on platforms where Cairo is available. -],,enable_cairo_canvas=yes) +]) AC_ARG_ENABLE(librsvg, AS_HELP_STRING([--enable-librsvg=no/auto/system/internal/fully-internal], @@ -8671,9 +8671,18 @@ if test $enable_split_opt_features = yes; then fi AC_SUBST(SPLIT_OPT_FEATURES) +if test $_os = Darwin -o $_os = WINNT; then +if test $enable_cairo_canvas = yes; then +AC_MSG_WARN([Overriding with -disable-cairo-canvas for this platform]) +fi +enable_cairo_canvas=no +elif test -z $enable_cairo_canvas
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 49907807572a23c30db3ae02b6f3254dc44e393c Author: Tor Lillqvist t...@iki.fi Date: Tue Apr 24 12:43:41 2012 +0300 AC_MSG_ERROR is better than WARN here diff --git a/configure.in b/configure.in index 8a726ee..de31aec 100644 --- a/configure.in +++ b/configure.in @@ -8673,7 +8673,7 @@ AC_SUBST(SPLIT_OPT_FEATURES) if test $_os = Darwin -o $_os = WINNT; then if test $enable_cairo_canvas = yes; then -AC_MSG_WARN([Overriding with -disable-cairo-canvas for this platform]) +AC_MSG_ERROR([The cairo canvas should not be used for this platform]) fi enable_cairo_canvas=no elif test -z $enable_cairo_canvas; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - configure.in connectivity/source cppuhelper/inc
configure.in | 114 +++
connectivity/source/drivers/macab/MacabPreparedStatement.hxx |4
cppuhelper/inc/cppuhelper/interfacecontainer.h |2
3 files changed, 86 insertions(+), 34 deletions(-)
New commits:
commit e5143062887093037cab8f936288af8408576ea8
Author: Tor Lillqvist t...@iki.fi
Date: Tue Apr 24 22:30:03 2012 +0300
Visibility doesn't seem to work as we want in Apple's Clang
Or maybe it's the Mach-O object file format that lacks the
functionality? Anyway, let's try to manage without visibility then.
diff --git a/configure.in b/configure.in
index 5618f1e..9fcc1f8 100644
--- a/configure.in
+++ b/configure.in
@@ -4540,6 +4540,15 @@ if test $GCC = yes; then
CFLAGS=$CFLAGS -Werror -fvisibility=hidden
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[
HAVE_GCC_VISIBILITY_FEATURE=TRUE ],[])
CFLAGS=$save_CFLAGS
+
+if test $COM_GCC_IS_CLANG = TRUE -a $_os = Darwin; then
+# It seems that with Apple's Clang, visibility doesn't work as
+# we would want at least in the connectivity and dbaccess
+# modules. This might be because of something peculiar in
+# those modules? Whatever.
+HAVE_GCC_VISIBILITY_FEATURE=
+fi
+
if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE; then
AC_MSG_RESULT([yes])
else
commit f024b6804d216c4eee2ebd09074eff2ca1984997
Author: Tor Lillqvist t...@iki.fi
Date: Tue Apr 24 22:25:20 2012 +0300
Work around Clang 3.1's argument unused during compilation non-warning
For unrecognized options, Clang 3.1 (and ealier?) prints out a
warning, but it isn't a real warning as it doesn't cause a compilation
error with -Werror, so it is impossible to find out reliably if an
option is supported or not. So hardcode the information we know.
diff --git a/configure.in b/configure.in
index de31aec..5618f1e 100644
--- a/configure.in
+++ b/configure.in
@@ -2512,7 +2512,7 @@ dnl
===
dnl Test the gcc version
dnl ===
if test $GCC = yes; then
-AC_MSG_CHECKING([the GNU C compiler version])
+AC_MSG_CHECKING([the GCC version])
_gcc_version=`$CC -dumpversion`
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*1+\$2*100+\$3 }'`
@@ -2537,13 +2537,10 @@ if test $GCC = yes; then
fi
dnl ===
-dnl Is it actually Clang?
+dnl Is GCC actually Clang?
dnl ===
COM_GCC_IS_CLANG=
-HAVE_GCC_GGDB2=
-HAVE_GCC_FINLINE_LIMIT=
-HAVE_GCC_FNO_INLINE=
if test $GCC = yes; then
AC_MSG_CHECKING([whether GCC is actually Clang])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
@@ -2556,15 +2553,37 @@ if test $GCC = yes; then
COM_GCC_IS_CLANG=TRUE],
[AC_MSG_RESULT([no])])
-# check various GCC options that Clang does not support now but maybe
-# will somewhen in the future, check them even for GCC, so that the flags
-# are set
+if test $COM_GCC_IS_CLANG = TRUE; then
+AC_MSG_CHECKING([the Clang version])
+clang_version=`echo
__clang_major__.__clang_minor__.__clang_patchlevel__ | $CC -E -P -`
+CLANG_FULL_VERSION=`echo __clang_version__ | $CC -E -P -`
+CLANGVER=`echo $clang_version | $AWK -F. '{ print
\$1*1+\$2*100+\$3 }'`
+AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
+fi
+fi
+AC_SUBST(COM_GCC_IS_CLANG)
+
+# ===
+# check various GCC options that Clang does not support now but maybe
+# will somewhen in the future, check them even for GCC, so that the
+# flags are set
+# ===
+HAVE_GCC_GGDB2=
+HAVE_GCC_FINLINE_LIMIT=
+HAVE_GCC_FNO_INLINE=
+if test $GCC = yes; then
AC_MSG_CHECKING([whether $CC supports -ggdb2])
-save_CFLAGS=$CFLAGS
-CFLAGS=$CFLAGS -Werror -ggdb2
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[
HAVE_GCC_GGDB2=TRUE ],[])
-CFLAGS=$save_CFLAGS
+if test -n $CLANGVER -a $CLANGVER -le 30100; then
+# Option just ignored and silly warning that isn't a real
+# warning printed
+:
+else
+save_CFLAGS=$CFLAGS
+CFLAGS=$CFLAGS -Werror -ggdb2
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[
HAVE_GCC_GGDB2=TRUE ],[])
+CFLAGS=$save_CFLAGS
+fi
if test $HAVE_GCC_GGDB2 = TRUE; then
AC_MSG_RESULT([yes])
else
@@ -2572,10 +2591,15 @@ if test $GCC = yes; then
fi
AC_MSG_CHECKING([whether $CC supports -finline-limit=0])
-save_CFLAGS=$CFLAGS
-CFLAGS=$CFLAGS -Werror -finline-limit=0
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0
[Libreoffice-commits] .: solenv/gbuild solenv/inc
solenv/gbuild/platform/macosx.mk |2 +- solenv/inc/unxmacx.mk| 12 +--- 2 files changed, 10 insertions(+), 4 deletions(-) New commits: commit c29b6b2a065bbf7ade2d6b62dfd1c0245318f355 Author: Tor Lillqvist t...@iki.fi Date: Sun Apr 22 22:44:08 2012 +0300 No -malign-natural in Clang, not Apple's at least diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index d4d113d..819fbef 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -75,7 +75,7 @@ gb_CXXFLAGS := \ -Wno-non-virtual-dtor \ -fno-strict-aliasing \ -fsigned-char \ - -malign-natural \ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,-malign-natural) \ #-Wshadow \ break in compiler headers already #-fsigned-char \ might be removed? #-malign-natural \ might be removed? diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 1ca6a82..1a7c891 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -88,7 +88,7 @@ CC*=gcc objc*=$(CC) objcpp*=$(CXX) -CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS) +CFLAGS=-fsigned-char -fmessage-length=0 -c $(EXTRA_CFLAGS) .IF $(DISABLE_DEPRECATION_WARNING) == TRUE CFLAGS+=-Wno-deprecated-declarations @@ -97,7 +97,10 @@ CFLAGS+=-Wno-deprecated-declarations # Compilation flags # - # Normal C compilation flags -CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS) +CFLAGSCC=-pipe -fsigned-char $(ARCH_FLAGS) +.IF $(COM_GCC_IS_CLANG) != TRUE +CFLAGSCC+=-malign-natural +.ENDIF # Normal Objective C compilation flags #OBJCFLAGS=-no-precomp @@ -117,7 +120,10 @@ CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs CFLAGS_NO_EXCEPTIONS=-fno-exceptions # Normal C++ compilation flags -CFLAGSCXX=-pipe -malign-natural -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy +CFLAGSCXX=-pipe -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy +.IF $(COM_GCC_IS_CLANG) != TRUE +CFLAGSCXX+=-malign-natural +.ENDIF .IF $(HAVE_GCC_NO_LONG-DOUBLE) == TRUE CFLAGSCXX+= -Wno-long-double .ENDIF ___ 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_macosx_intel/uno2cpp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e0be9a035a82131628ad07ae05be8bf322730f66 Author: Tor Lillqvist t...@iki.fi Date: Sun Apr 22 20:11:30 2012 +0300 WaE: variable 'stackptr' is uninitialized when used diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx index c9fd510..8f397d9 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx @@ -80,7 +80,7 @@ void callVirtualMethod( if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything(xxx); // address something volatile long edx = 0, eax = 0; // for register returns -void * stackptr; +void * stackptr = 0; asm volatile ( mov %%esp, %6\n\t mov %0, %%eax\n\t ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/source
shell/source/backends/macbe/macbackend.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7bec04312dcef51c8f7b248231e139178fdeada1 Author: Tor Lillqvist t...@iki.fi Date: Sun Apr 22 21:44:29 2012 +0300 WaE: initialization of pointer to null from a constant boolean expression diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx index 055628f..aaf7ebf 100644 --- a/shell/source/backends/macbe/macbackend.cxx +++ b/shell/source/backends/macbe/macbackend.cxx @@ -406,7 +406,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( CFDictionaryRef rProxyDict = SCDynamicStoreCopyProxies(NULL); if (!rProxyDict) -rExceptionsList = false; +rExceptionsList = 0; else rExceptionsList = (CFArrayRef) CFDictionaryGetValue(rProxyDict, kSCPropNetProxiesExceptionsList); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - idlc/source l10ntools/source solenv/gbuild solenv/inc
idlc/source/wrap_scanner.cxx |6 ++ l10ntools/source/cfg_yy_wrapper.c |3 +++ l10ntools/source/src_yy_wrapper.c |3 +++ l10ntools/source/xrm_yy_wrapper.c |3 +++ solenv/gbuild/platform/macosx.mk |2 +- solenv/inc/unxmacx.mk |4 6 files changed, 20 insertions(+), 1 deletion(-) New commits: commit 8c1e9c7dfdc17b156931bbbe42851c08c7281be5 Author: Tor Lillqvist t...@iki.fi Date: Sun Apr 22 01:29:07 2012 +0300 WaE: comparison of integers of different signs and unused functions diff --git a/idlc/source/wrap_scanner.cxx b/idlc/source/wrap_scanner.cxx index f058db1..94a068a 100644 --- a/idlc/source/wrap_scanner.cxx +++ b/idlc/source/wrap_scanner.cxx @@ -26,7 +26,13 @@ * / +#ifdef __clang__ +#pragma clang diagnostic ignored -Wsign-compare +#endif #include scanner.cxx +void (*avoid_unused_yyunput_in_scanner_cxx)(int, char*) = yyunput; +int (*avoid_unused_yyinput_in_scanner_cxx)() = yyinput; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 1ac9f91198889cc5cee40ba9ef2b0255183ee195 Author: Tor Lillqvist t...@iki.fi Date: Sun Apr 22 00:59:45 2012 +0300 WaE: unused functions diff --git a/l10ntools/source/cfg_yy_wrapper.c b/l10ntools/source/cfg_yy_wrapper.c index ecfb35b..b22d2a7 100644 --- a/l10ntools/source/cfg_yy_wrapper.c +++ b/l10ntools/source/cfg_yy_wrapper.c @@ -2,4 +2,7 @@ // Helper to suppress warnings in lex generated c code, see #i57362# #include cfg_yy.c +void (*avoid_unused_yyunput_in_cfg_yy_c)() = yyunput; +int (*avoid_unused_yy_flex_strlen_in_cfg_yy_c)() = yy_flex_strlen; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/src_yy_wrapper.c b/l10ntools/source/src_yy_wrapper.c index 974068d..da9c17f 100644 --- a/l10ntools/source/src_yy_wrapper.c +++ b/l10ntools/source/src_yy_wrapper.c @@ -2,4 +2,7 @@ // Helper to suppress warnings in lex generated c code, see #i57362# #include src_yy.c +void (*avoid_unused_yyunput_in_src_yy_c)() = yyunput; +int (*avoid_unused_yy_flex_strlen_in_src_yy_c)() = yy_flex_strlen; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/xrm_yy_wrapper.c b/l10ntools/source/xrm_yy_wrapper.c index 2724ad0..191d16f 100644 --- a/l10ntools/source/xrm_yy_wrapper.c +++ b/l10ntools/source/xrm_yy_wrapper.c @@ -2,4 +2,7 @@ // Helper to suppress warnings in lex generated c code, see #i57362# #include xrm_yy.c +void (*avoid_unused_yyunput_in_xrm_yy_c)() = yyunput; +int (*avoid_unused_yy_flex_strlen_in_xrm_yy_c)() = yy_flex_strlen; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 1bf04b934a8f51ac50be4cb9b6eacbb092871383 Author: Tor Lillqvist t...@iki.fi Date: Sun Apr 22 00:09:44 2012 +0300 Don't use -Wl,-syslibroot when building against more current SDKs diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index ab955cf..d4d113d 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -95,7 +95,7 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions gb_OBJCFLAGS := -x objective-c -fobjc-exceptions gb_LinkTarget_LDFLAGS := \ - -Wl,-syslibroot,$(gb_SDKDIR) \ + $(if $(filter 1040 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),-Wl$(COMMA)-syslibroot$(COMMA)$(gb_SDKDIR)) \ $(subst -L../lib , ,$(SOLARLIB)) \ #man ld says: obsolete -Wl,-multiply_defined,suppress \ diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index e402783..1ca6a82 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -178,8 +178,12 @@ LINK*=$(CXX) LINKC*=$(CC) LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress + +.IF $(MAC_OS_X_VERSION_MIN_REQUIRED) = 1050 # assure backwards-compatibility EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH) +.ENDIF + # Very long install_names are needed so that install_name_tool -change later on # does not complain that larger updated load commands do not fit: LINKFLAGSRUNPATH_URELIB=-install_name '@__URELIB/$(@:f)' ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: codemaker/Module_codemaker.mk rdbmaker/Module_rdbmaker.mk unodevtools/Module_unodevtools.mk
codemaker/Module_codemaker.mk |4 rdbmaker/Module_rdbmaker.mk |4 unodevtools/Module_unodevtools.mk |4 3 files changed, 12 insertions(+) New commits: commit cf0186de2df4ad2ffeb39088638aefafc5d4a823 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Apr 20 10:15:04 2012 +0300 Don't build these command-line tools for non-desktop OSes diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk index d2b6060..9a67e39 100644 --- a/codemaker/Module_codemaker.mk +++ b/codemaker/Module_codemaker.mk @@ -26,6 +26,8 @@ $(eval $(call gb_Module_Module,codemaker)) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,codemaker,\ Package_inc \ StaticLibrary_codemaker \ @@ -35,4 +37,6 @@ $(eval $(call gb_Module_add_targets,codemaker,\ Executable_cppumaker \ )) +endif + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/rdbmaker/Module_rdbmaker.mk b/rdbmaker/Module_rdbmaker.mk index 0145b23..c5683e0 100644 --- a/rdbmaker/Module_rdbmaker.mk +++ b/rdbmaker/Module_rdbmaker.mk @@ -26,8 +26,12 @@ $(eval $(call gb_Module_Module,rdbmaker)) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,rdbmaker,\ Executable_rdbmaker \ )) +endif + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/unodevtools/Module_unodevtools.mk b/unodevtools/Module_unodevtools.mk index 9819bfd..09ca03a 100644 --- a/unodevtools/Module_unodevtools.mk +++ b/unodevtools/Module_unodevtools.mk @@ -26,8 +26,12 @@ $(eval $(call gb_Module_Module,unodevtools)) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,unodevtools,\ Executable_skeletonmaker \ )) +endif + # vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - unotools/source
unotools/source/config/historyoptions.cxx | 38 ++
1 file changed, 28 insertions(+), 10 deletions(-)
New commits:
commit 488b766836ef41c51670175fc2eeff7c9640e86c
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Apr 20 09:21:42 2012 +0200
fdo#46074 Ignore corrupted items in Recent Documents
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/unotools/source/config/historyoptions.cxx
b/unotools/source/config/historyoptions.cxx
index 73161be..5ba2045 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -35,6 +35,7 @@
#include com/sun/star/uno/Any.hxx
#include com/sun/star/uno/Sequence.hxx
+#include cassert
#include deque
#include algorithm
@@ -440,20 +441,37 @@ Sequence Sequence PropertyValue
SvtHistoryOptions_Impl::GetList( EHistoryT
const sal_Int32 nLength =
xOrderList-getElementNames().getLength();
Sequence Sequence PropertyValue aRet(nLength);
+sal_Int32 nCount = 0;
for(sal_Int32 nItem=0; nItemnLength; ++nItem)
{
-::rtl::OUString sUrl;
-xOrderList-getByName(::rtl::OUString::valueOf(nItem)) =
xSet;
-xSet-getPropertyValue(s_sHistoryItemRef) = sUrl;
-
-xItemList-getByName(sUrl) = xSet;
-seqProperties[s_nOffsetURL ].Value = sUrl;
-xSet-getPropertyValue(s_sFilter) =
seqProperties[s_nOffsetFilter ].Value;
-xSet-getPropertyValue(s_sTitle)=
seqProperties[s_nOffsetTitle].Value;
-xSet-getPropertyValue(s_sPassword) =
seqProperties[s_nOffsetPassword ].Value;
-aRet[nItem] = seqProperties;
+try
+{
+::rtl::OUString sUrl;
+xOrderList-getByName(::rtl::OUString::valueOf(nItem)) =
xSet;
+xSet-getPropertyValue(s_sHistoryItemRef) = sUrl;
+
+xItemList-getByName(sUrl) = xSet;
+seqProperties[s_nOffsetURL ].Value = sUrl;
+xSet-getPropertyValue(s_sFilter) =
seqProperties[s_nOffsetFilter ].Value;
+xSet-getPropertyValue(s_sTitle)=
seqProperties[s_nOffsetTitle].Value;
+xSet-getPropertyValue(s_sPassword) =
seqProperties[s_nOffsetPassword ].Value;
+aRet[nCount++] = seqProperties;
+}
+catch(const css::uno::Exception ex)
+{
+// https://bugs.freedesktop.org/show_bug.cgi?id=46074
+// FILEOPEN: No Recent Documents... discusses a problem
+// with corrupted
/org.openoffice.Office/Histories/Histories
+// configuration items; to work around that problem, simply
+// ignore such corrupted individual items here, so that at
+// least newly added items are successfully reported back
+// from this function:
+LogHelper::logIt(ex);
+}
}
+assert(nCount = nLength);
+aRet.realloc(nCount);
seqReturn = aRet;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - android/experimental configure.in
android/experimental/eagles051387/.classpath.in | 15 +++ android/experimental/eagles051387/.project | 33 +++ android/experimental/eagles051387/AndroidManifest.xml | 23 + android/experimental/eagles051387/lint.xml |3 android/experimental/eagles051387/proguard-project.txt | 20 android/experimental/eagles051387/project.properties | 14 +++ android/experimental/eagles051387/res/drawable-hdpi/ic_launcher.png |binary android/experimental/eagles051387/res/drawable-ldpi/ic_launcher.png |binary android/experimental/eagles051387/res/drawable-mdpi/ic_launcher.png |binary android/experimental/eagles051387/res/drawable-xhdpi/ic_launcher.png |binary android/experimental/eagles051387/res/layout/main.xml |8 + android/experimental/eagles051387/res/layout/star_center_menu_list.xml |6 + android/experimental/eagles051387/res/values/strings.xml |9 ++ android/experimental/eagles051387/src/org/libreoffice/experimental/eagles051387/Main_Menu.java | 17 android/experimental/eagles051387/src/org/libreoffice/experimental/eagles051387/StartCenterMenu.java | 42 ++ configure.in |2 16 files changed, 192 insertions(+) New commits: commit 8f80a0af7e48193d0c035c220537d7f40b915f56 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Apr 18 09:53:47 2012 +0300 Expand android/experimental/eagles051387/.classpath.in (for ANDROID_SDK_HOME) diff --git a/configure.in b/configure.in index fc6fdb1..1ecadf5 100644 --- a/configure.in +++ b/configure.in @@ -3285,6 +3285,7 @@ if test $cross_compiling = yes; then bin/repo-list.in \ android/Bootstrap/local.properties.in \ android/experiments/DocumentLoader/local.properties.in \ +android/experimental/eagles051387/.classpath.in \ android/qa/sc/local.properties.in \ android/qa/desktop/local.properties.in \ config.guess \ @@ -11367,6 +11368,7 @@ fi AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list \ android/Bootstrap/local.properties \ android/experiments/DocumentLoader/local.properties \ +android/experimental/eagles051387/.classpath \ android/qa/sc/local.properties \ android/qa/desktop/local.properties]) AC_OUTPUT commit 67fd00163fa223ac5205cde364975fc0fb1da422 Author: Jonathan Aquilina eagles051...@gmail.com Date: Sat Apr 7 19:46:52 2012 +0200 Initial start of an Android UI (experimental) Started creating the menu list for the start center Beginning of code for Start Center menu list finished creating menu, issue getting it to display when program run refractored package name to org.libreoffice.experimental added the java files with renamed package added new experimental dir and updated packages with appropriate name diff --git a/android/experimental/eagles051387/.classpath.in b/android/experimental/eagles051387/.classpath.in new file mode 100644 index 000..10e58d3 --- /dev/null +++ b/android/experimental/eagles051387/.classpath.in @@ -0,0 +1,15 @@ +?xml version=1.0 encoding=UTF-8? +classpath + classpathentry kind=src path=src/ + classpathentry kind=src path=gen/ + classpathentry kind=con path=com.android.ide.eclipse.adt.LIBRARIES/ + classpathentry kind=lib path=@ANDROID_SDK_HOME@/platforms/android-10/android.jar + attributes + attribute name=javadoc_location value=file:@ANDROID_SDK_HOME@/docs/reference/ + /attributes + accessrules + accessrule kind=nonaccessible pattern=com/android/internal/**/ + /accessrules + /classpathentry + classpathentry kind=output path=bin/classes/ +/classpath diff --git a/android/experimental/eagles051387/.project b/android/experimental/eagles051387/.project new file mode 100644 index 000..b3a56bf --- /dev/null +++ b/android/experimental/eagles051387/.project @@ -0,0 +1,33 @@ +?xml version=1.0 encoding=UTF-8? +projectDescription + nameExperimental_Android_UI/name + comment/comment + projects + /projects + buildSpec + buildCommand + namecom.android.ide.eclipse.adt.ResourceManagerBuilder/name + arguments + /arguments + /buildCommand
[Libreoffice-commits] .: comphelper/inc filter/source
comphelper/inc/comphelper/documentconstants.hxx | 29 filter/source/config/cache/constant.hxx |4 +++ 2 files changed, 33 insertions(+) New commits: commit 1ab7d31a6842ad680351e804990f7a0493f93b46 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Apr 18 23:36:33 2012 +0300 Add comment describing the meanings of the filter flag bits diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx index 06653b0..d65ced0 100644 --- a/comphelper/inc/comphelper/documentconstants.hxx +++ b/comphelper/inc/comphelper/documentconstants.hxx @@ -114,6 +114,35 @@ // filter flags // TODO/LATER: The flags should be part of the UNO specification + +// Note that these flag bits have parallel names in +// filter/source/config/cache/constant.hxx. Some of the bits are +// missing from there, and some have different names. But the meaning +// is presumably the same, and the values are the same. + +// http://www.mail-archive.com/dev@openoffice.org/msg05047.html says: + +// I can just sum up what comes into my mind, hope I don't miss one: + +// Import - should be self explaining +// Export - should be self explaining +// Template- deprecated +// TemplatePath- filter for a documenttemplate +// Own - one of the OOo file formats +// Alien - no zip container based format +// Preferred - preferred filter for a particular type +// Asynchron - deprecated, only HTML-filter isn't synchron +// 3rdPartyFilter - implemented as a UNO component +// Default - default filter for this document type +// NotInFileDialog - should be self explaining +// NotInChooser- as above + +// (The 3rdPartyFilter flag is here called StarONE) + +// At some point (4.0?) we should drop the duplicate set of names over +// in filter, and rename the obscure ones to describe their meaning +// using terms that are understandable. + #define SFX_FILTER_IMPORT0x0001L #define SFX_FILTER_EXPORT0x0002L #define SFX_FILTER_TEMPLATE 0x0004L diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 7632068..9161803 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -115,6 +115,10 @@ extern rtl::OUString pFilterStrings[]; #define CFGDIRECTKEY_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_(/org.openoffice.Setup/Product/ooXMLFileFormatVersion ) #define CFGDIRECTKEY_PRODUCTNAME _FILTER_CONFIG_FROM_ASCII_(/org.openoffice.Setup/Product/ooName ) +// Note that these flag bits have parallel names in +// comphelper/inc/comphelper/documentconstants.hxx . See that file for +// documentation on their meaning. + /** @short names of filter flags, sorted in alphabetical order */ #define FLAGNAME_3RDPARTYFILTER _FILTER_CONFIG_FROM_ASCII_(3RDPARTYFILTER ) #define FLAGNAME_ALIEN _FILTER_CONFIG_FROM_ASCII_(ALIEN ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/addressconverter.cxx | 11 ---
sc/source/filter/oox/drawingbase.cxx | 11 ---
2 files changed, 22 deletions(-)
New commits:
commit 7c3c0c557e8b293551fb6b1b7a1f39b45a394777
Author: Tor Lillqvist t...@iki.fi
Date: Tue Apr 17 10:04:17 2012 +0300
WaE: unused functions
diff --git a/sc/source/filter/oox/addressconverter.cxx
b/sc/source/filter/oox/addressconverter.cxx
index 90c916c..ef7c0fa 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -97,17 +97,6 @@ const sal_Unicode BIFF_URL_UNC = '@'; /// UNC
path root.
const sal_Unicode BIFF_DCON_ENCODED = '\x01'; /// First character of an
encoded path from DCON* records.
const sal_Unicode BIFF_DCON_INTERN = '\x02'; /// First character of an
encoded sheet name from DCON* records.
-
-inline sal_uInt8 lclGetBiffAddressSize( bool bCol16Bit, bool bRow32Bit )
-{
-return (bCol16Bit ? 2 : 1) + (bRow32Bit ? 4 : 2);
-}
-
-inline sal_uInt8 lclGetBiffRangeSize( bool bCol16Bit, bool bRow32Bit )
-{
-return 2 * lclGetBiffAddressSize( bCol16Bit, bRow32Bit );
-}
-
} // namespace
//
diff --git a/sc/source/filter/oox/drawingbase.cxx
b/sc/source/filter/oox/drawingbase.cxx
index 330cada..3e3cb64 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -61,17 +61,6 @@ inline sal_Int32 lclEmuToHmm( sal_Int64 nValue )
return (nValue 0) ? -1 : convertEmuToHmm( nValue );
}
-/** Reads the cell anchor model from a BIFF or DFF stream. */
-BinaryInputStream operator( BinaryInputStream rStrm, CellAnchorModel
rModel )
-{
-// all members are given as 16-bit unsigned values
-rModel.mnCol = rStrm.readuInt16();
-rModel.mnColOffset = rStrm.readuInt16();
-rModel.mnRow = rStrm.readuInt16();
-rModel.mnRowOffset = rStrm.readuInt16();
-return rStrm;
-}
-
} // namespace
//
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/genstaticheader.pl | 83 ++
1 file changed, 83 insertions(+)
New commits:
commit 815cee8bd2d96b40b018f96cf3a9096c7691ed7b
Author: Tor Lillqvist t...@iki.fi
Date: Wed Apr 18 08:18:35 2012 +0300
Add the genstaticheader.pl script
diff --git a/i18npool/source/localedata/genstaticheader.pl
b/i18npool/source/localedata/genstaticheader.pl
new file mode 100644
index 000..adba340
--- /dev/null
+++ b/i18npool/source/localedata/genstaticheader.pl
@@ -0,0 +1,83 @@
+#!/usr/bin/perl -w # -*- tab-width: 4; indent-tabs-mode: nil;
+
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Tor Lillqvist t...@iki.fi (initial developer)
+# Copyright (C) 2012 SUSE Linux http://suse.com (initial developer's employer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+
+my @FUNCS = qw(
+getAllCalendars
+getAllCurrencies
+getAllFormats0
+getBreakIteratorRules
+getCollationOptions
+getCollatorImplementation
+getContinuousNumberingLevels
+getDateAcceptancePatterns
+getFollowPageWords
+getForbiddenCharacters
+getIndexAlgorithm
+getLCInfo
+getLocaleItem
+getOutlineNumberingLevels
+getReservedWords
+getSearchOptions
+getTransliterations
+getUnicodeScripts
+);
+
+print 'extern C {
+
+';
+
+foreach my $lang (@ARGV) {
+foreach my $func (@FUNCS) {
+ printf(void %s_%s();\n, $func, $lang);
+}
+}
+
+print '
+static const struct {
+const char *pLocale;
+';
+foreach my $func (@FUNCS) {
+printf(void (*%s)();\n, $func);
+}
+print '} aLibTable[] = {
+';
+
+foreach my $lang (@ARGV) {
+printf({\n);
+printf(\%s\,\n, $lang);
+foreach my $func (@FUNCS) {
+ printf(%s_%s,\n, $func, $lang);
+}
+printf(}%s\n, ($lang ne $ARGV[$#ARGV]) ? ',' : '');
+}
+
+print '};
+
+}
+';
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - cppuhelper/source ios/qa sal/osl scaddins/source stoc/source
cppuhelper/source/shlib.cxx |8
ios/qa/sc/Makefile |2 +-
ios/qa/sc/filters-test.m|8
sal/osl/unx/module.cxx |2 +-
scaddins/source/analysis/analysishelper.hxx | 17 +
stoc/source/corereflection/crefl.cxx|4
stoc/source/inspect/introspection.cxx |4
7 files changed, 43 insertions(+), 2 deletions(-)
New commits:
commit 049d3f19736e912e711496fde54ea2b3d3c06e74
Author: Tor Lillqvist t...@iki.fi
Date: Mon Apr 16 23:57:57 2012 +0300
More static UNO component linkage
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 3747e38..bc9d5f5 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -39,7 +39,7 @@ SRCS = filters-test.m
CFLAGS = $(SOLARINC)
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno
lib/i18npool.uno lib/stocservices.uno lib/unobootstrapprotector
lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo
-lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit
-ldrawinglayerlo -leditenglo -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo
-lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata
-licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lpackage2 -lreg -lsal_textenc
-lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo
-lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1
-luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo
-lvcllo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework ,
$(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno
lib/expwrap.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno
lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector,
-Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo
-lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldatelo
-ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo
-lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3
-li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -ljpeg -ljvmfwk
-llnglo -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo
-lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo
-ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo
-luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo
-lvcllo -lxml2 -lxmlreader -l
xolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv
-lobjc
all: $(APPDIR)/$(APP) stuff
diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m
index be32924..65db932 100644
--- a/ios/qa/sc/filters-test.m
+++ b/ios/qa/sc/filters-test.m
@@ -44,13 +44,21 @@ extern C {
extern CppUnitTestPlugIn *cppunitTestPlugIn(void);
extern int lo_main(int argc, const char **argv);
+extern void * analysis_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * date_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * sc_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * scfilt_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * unoxml_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
const lib_to_component_mapping *
lo_get_libmap(void)
{
static lib_to_component_mapping map[] = {
+{ libanalysislo.a, analysis_component_getFactory },
+{ libdatelo.a, date_component_getFactory },
+{ libscfiltlo.a, scfilt_component_getFactory },
{ libsclo.a, sc_component_getFactory },
+{ libunoxmllo.a, unoxml_component_getFactory },
{ NULL, NULL }
};
commit c92e66c38a75353f2cf88270f7ff673c3f9232b2
Author: Tor Lillqvist t...@iki.fi
Date: Mon Apr 16 23:57:45 2012 +0300
More static UNO component linkage
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index ba8ea8d..04e9bf2 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -466,10 +466,14 @@ extern C
extern void * bootstrap_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * configmgr_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * comphelp_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
+extern void * expwrap_component_getFactory( const sal_Char * pImplName
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/defnamesbuffer.cxx |8
sc/source/filter/oox/drawingmanager.cxx |6 --
sc/source/filter/oox/pivottablebuffer.cxx |9 -
3 files changed, 23 deletions(-)
New commits:
commit bc3f0bd3e28b2be1175db685cbb6d60de495777c
Author: Tor Lillqvist t...@iki.fi
Date: Sun Apr 15 15:08:50 2012 +0200
WaE: unused functions
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx
b/sc/source/filter/oox/defnamesbuffer.cxx
index 9f63afc..ea767da 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -160,14 +160,6 @@ sal_Unicode lclGetBuiltinIdFromBaseName( const OUString
rModelName )
return BIFF_DEFNAME_UNKNOWN;
}
-bool lclIsFilterDatabaseName( const OUString rModelName )
-{
-for( const sal_Char* const* ppcName = sppcFilterDbNames; ppcName
STATIC_ARRAY_END( sppcFilterDbNames ); ++ppcName )
-if( rModelName.equalsIgnoreAsciiCaseAscii( *ppcName ) )
-return true;
-return false;
-}
-
OUString lclGetUpcaseModelName( const OUString rModelName )
{
// TODO: i18n?
diff --git a/sc/source/filter/oox/drawingmanager.cxx
b/sc/source/filter/oox/drawingmanager.cxx
index 8c46db1..a667e88 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -171,12 +171,6 @@ const sal_uInt16 BIFF_OBJCMO_AUTOFILL = 0x4000;
/// Automatic fill forma
//
-inline BiffInputStream operator( BiffInputStream rStrm, ShapeAnchor
rAnchor )
-{
-rAnchor.importBiffAnchor( rStrm );
-return rStrm;
-}
-
} // namespace
//
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx
b/sc/source/filter/oox/pivottablebuffer.cxx
index c203cbf..21659b1 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -210,15 +210,6 @@ const sal_Int16 BIFF_PTPAGEFIELDS_ALLITEMS =
0x7FFD;
const sal_Int16 BIFF_PTDATAFIELD_PREVIOUS = 0x7FFB;
const sal_Int16 BIFF_PTDATAFIELD_NEXT = 0x7FFC;
-//
-
-OUString lclReadPivotString( const WorkbookHelper rHelper, BiffInputStream
rStrm, sal_uInt16 nLen )
-{
-if( nLen == BIFF_PT_NOSTRING )
-return OUString();
-return (rHelper.getBiff() == BIFF8) ? rStrm.readUniStringBody( nLen ) :
rStrm.readCharArrayUC( nLen, rHelper.getTextEncoding() );
-}
-
} // namespace
//
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - cppuhelper/source ios/qa sal/cppunittester sal/inc
cppuhelper/source/shlib.cxx|2 ++
ios/qa/sc/Makefile |2 +-
ios/qa/sc/filters-test.m | 13 +
sal/cppunittester/cppunittester.cxx| 17 +++--
sal/inc/cppunittester/protectorfactory.hxx |1 +
5 files changed, 24 insertions(+), 11 deletions(-)
New commits:
commit 8dd4fa9a102c705496aef7aca97de0818fea47db
Author: Tor Lillqvist t...@iki.fi
Date: Mon Apr 16 01:40:26 2012 +0200
Link with libpackage2
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index ea3440f..3747e38 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -39,7 +39,7 @@ SRCS = filters-test.m
CFLAGS = $(SOLARINC)
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno
lib/i18npool.uno lib/stocservices.uno lib/unobootstrapprotector
lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo
-lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit
-ldrawinglayerlo -leditenglo -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo
-lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata
-licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt
-lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo
-ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -luno_cppuhelpergcc3
-luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2
-lxmlreader -lxolo -lxstor -lz $(addprefix -framework ,
$(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno
lib/i18npool.uno lib/stocservices.uno lib/unobootstrapprotector
lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo
-lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit
-ldrawinglayerlo -leditenglo -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo
-lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata
-licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lpackage2 -lreg -lsal_textenc
-lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo
-lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1
-luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo
-lvcllo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework ,
$(gb_Library__FRAMEWORKS)) -liconv -lobjc
all: $(APPDIR)/$(APP) stuff
commit 2aadb6f9f4197f247373e4b54cab1461bc673981
Author: Tor Lillqvist t...@iki.fi
Date: Mon Apr 16 01:40:02 2012 +0200
Add the package2 component
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index b336100..ba8ea8d 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -468,6 +468,7 @@ extern C
extern void * comphelp_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * filterconfig1_component_getFactory( const sal_Char *
pImplName, void * pServiceManager, void * pRegistryKey );
extern void * fwk_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * package2_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * sfx_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * stocservices_component_getFactory( const sal_Char *
pImplName, void * pServiceManager, void * pRegistryKey );
extern void * i18npool_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
@@ -540,6 +541,7 @@ Reference XInterface SAL_CALL
loadSharedLibComponentFactory(
{ libcomphelp CPPU_STRINGIFY(CPPU_ENV) .a,
comphelp_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
+{ libpackage2.a, package2_component_getFactory },
{ libsfxlo.a, sfx_component_getFactory },
{ libucb1.a, ucb_component_getFactory },
{ libucpfile1.a, ucpfile_component_getFactory },
commit b20a10d5f845d0e4a4f21f360afd126c2cdacc4c
Author: Tor Lillqvist t...@iki.fi
Date: Mon Apr 16 01:35:30 2012 +0200
We need also unobootstrapprotector now
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index d674098..ea3440f 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -39,7 +39,7 @@ SRCS = filters-test.m
CFLAGS = $(SOLARINC)
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno
lib/i18npool.uno lib/stocservices.uno lib/unoexceptionprotector,
-Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo
[Libreoffice-commits] .: sal/inc
sal/inc/osl/diagnose.hxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit dc4aec872426d95033610c9e6b6579387e5e6423 Author: Tor Lillqvist t...@iki.fi Date: Fri Apr 13 09:25:03 2012 +0300 WaE: unknown warning group '-Wreturn-type-c-linkage' diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx index 95f5093..6463d8d 100644 --- a/sal/inc/osl/diagnose.hxx +++ b/sal/inc/osl/diagnose.hxx @@ -75,6 +75,9 @@ SAL_DLLPUBLIC void SAL_CALL osl_detail_ObjectRegistry_revokeObject( #if SUPD 400 #ifdef __clang__ #pragma clang diagnostic push +// Guard against slightly older clang versions that don't have +// -Wreturn-type-c-linkage... +#pragma clang diagnostic ignored -Wunknown-pragmas #pragma clang diagnostic ignored -Wreturn-type-c-linkage #endif #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/README
toolkit/README |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit d81a26fe6885b55e250d9fb83774e3973224fde6 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Apr 13 10:22:36 2012 +0300 Little bit more explanation, feel free to improve diff --git a/toolkit/README b/toolkit/README index 960e22a..59f2e2f 100644 --- a/toolkit/README +++ b/toolkit/README @@ -1 +1,7 @@ -Abstract windowing thing, UNO implementations of windows stuff so that it can be used from Basic. +Abstract windowing thing, UNO implementations of windowing stuff so that it +can be used from Basic or Java. But also stuff that has no connection to Basic +or Java. + +Note that the awt here has no relation to the Java awt, as far as I know. It +might be inspired by it API-wise, perhaps. (If you know differently, feel free +to improve this REDAME file.) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/inc framework/source
framework/inc/uielement/toolbarmanager.hxx|7 +-
framework/source/uielement/toolbarmanager.cxx | 28 +-
2 files changed, 12 insertions(+), 23 deletions(-)
New commits:
commit 6ae314ece2ecd6743a2d0f8a5eaca9b8b5dbeeaa
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Apr 11 20:30:26 2012 +0300
Bin pointless added by shizhoubo style comments
diff --git a/framework/inc/uielement/toolbarmanager.hxx
b/framework/inc/uielement/toolbarmanager.hxx
index 98430b9..98e351d 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -61,9 +61,8 @@
#include com/sun/star/util/XURLTransformer.hpp
#include com/sun/star/ui/XAcceleratorConfiguration.hpp
-//shizhoubo
#include com/sun/star/frame/XToolbarController.hpp
-//end
+
//_
// other includes
//_
@@ -161,10 +160,8 @@ class ToolBarManager : public
::com::sun::star::frame::XFrameActionListener
typedef std::vector ControllerParams ControllerParamsVector;
protected:
-//added for 33668 by shizhoubo : 2008:04
DECL_LINK( Command, CommandEvent * );
PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar);
-//end
DECL_LINK(Click, void *);
DECL_LINK(DropdownClick, void *);
DECL_LINK(DoubleClick, void *);
@@ -188,7 +185,7 @@ class ToolBarManager : public
::com::sun::star::frame::XFrameActionListener
::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue GetPropsForCommand( const
::rtl::OUString rCmdURL );
void CreateControllers();
void UpdateControllers();
-//for update controller via Support Visiable by shizhoubo
+//for update controller via Support Visiable
void UpdateController( ::com::sun::star::uno::Reference
::com::sun::star::frame::XToolbarController xController);
//end
void AddFrameActionListener();
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index cc874b6..4fe4712 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -283,9 +283,8 @@ ToolBarManager::ToolBarManager( const Reference
XMultiServiceFactory rServic
sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CreateDialog
nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE;
-//added for issue33668 by shizhoubo
+
m_pToolBar-SetCommandHdl( LINK( this, ToolBarManager, Command ) );
-//end
m_pToolBar-SetMenuType( nMenuType );
m_pToolBar-SetMenuButtonHdl( LINK( this, ToolBarManager, MenuButton ) );
m_pToolBar-GetMenu()-SetSelectHdl( LINK( this, ToolBarManager,
MenuSelect ) );
@@ -507,7 +506,8 @@ void ToolBarManager::UpdateControllers()
}
m_bUpdateControllers = sal_False;
}
-//for update toolbar controller via Support Visible by shizhoubo
+
+//for update toolbar controller via Support Visible
void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference
::com::sun::star::frame::XToolbarController xController)
{
RTL_LOGFILE_CONTEXT( aLog, framework (cd13)
::ToolBarManager::UpdateControllers );
@@ -531,7 +531,7 @@ void ToolBarManager::UpdateController(
::com::sun::star::uno::Reference ::com::
}
m_bUpdateControllers = sal_False;
}
-//end
+
void ToolBarManager::frameAction( const FrameActionEvent Action )
throw ( RuntimeException )
{
@@ -1086,7 +1086,7 @@ void ToolBarManager::CreateControllers()
Sequence Any aArgs( comphelper::containerToSequence(
aPropertyVector ));
xInit-initialize( aArgs );
-//for Support Visiblitly by shizhoubo
+
if (pController)
{
if(aCommandURL == rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( .uno:SwitchXFormsDesignMode )) ||
@@ -1096,8 +1096,6 @@ void ToolBarManager::CreateControllers()
)
pController-setFastPropertyValue_NoBroadcast(1,makeAny(sal_True));
}
-
-//end
}
// Request a item window from the toolbar controller and set it at
the VCL toolbar
@@ -1118,7 +1116,8 @@ void ToolBarManager::CreateControllers()
}
}
}
-//for update Controller via support visiable state by shizhoubo
+
+//for update Controller via support visiable state
Reference XPropertySet xPropSet( xController, UNO_QUERY );
if ( xPropSet.is() )
{
@@ -1141,8 +1140,6 @@ void ToolBarManager::CreateControllers
[Libreoffice-commits] .: 2 commits - android/experiments redland/raptor redland/rasqal redland/redland
android/experiments/DocumentLoader/Makefile | 10 ++
redland/raptor/makefile.mk|4
redland/raptor/raptor-1.4.18.patch.no-soname | 11 +++
redland/rasqal/makefile.mk|3 +++
redland/rasqal/rasqal-0.9.16.patch.no-soname | 11 +++
redland/redland/makefile.mk |3 +++
redland/redland/redland-1.0.8.patch.no-soname | 11 +++
7 files changed, 53 insertions(+)
New commits:
commit 34592de6135e88ccf0172229b55c864584ac9fa9
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Apr 10 12:52:55 2012 +0300
More libraries
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index 0c1e666..5dea15a 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -52,6 +52,8 @@ copy-stuff:
comphelpgcc3 \
datelo \
dbaxmllo \
+ dbtoolslo \
+ evtattlo \
expwrap.uno \
fastsax.uno \
fileacc \
@@ -60,6 +62,7 @@ copy-stuff:
foruilo \
freetype \
frmlo \
+ fsstorage.uno \
gcc3_uno \
hwplo \
i18nisolang1gcc3 \
@@ -77,6 +80,7 @@ copy-stuff:
jvmaccessgcc3 \
jvmfwk \
lo-bootstrap \
+ localebe1.uno \
localedata_en \
localedata_others \
lwpftlo \
@@ -84,6 +88,9 @@ copy-stuff:
msfilterlo \
msworkslo \
ooxlo \
+ raptor \
+ rasqal \
+ rdf \
reflection.uno \
reg \
saxlo \
@@ -108,6 +115,7 @@ copy-stuff:
uno_sal \
uno_salhelpergcc3 \
uno_cppuhelpergcc3 \
+ unordflo \
unoxmllo \
utllo \
vbahelperlo \
@@ -118,6 +126,8 @@ copy-stuff:
xml2 \
xmlfdlo \
xmlreader \
+ xmlsecurity \
+ xslt \
xstor \
); do \
$(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
commit ed1db9186336e11de293b9c74c08e0284e8a1702
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Apr 10 12:33:59 2012 +0300
No sonames on Android
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index a2a3bd3..54a46ab 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -75,6 +75,10 @@ PATCH_FILES+=raptor-1.4.18.libxml.patch
PATCH_FILES+=raptor-1.4.18.libxslt.patch
.ENDIF
+.IF $(OS)==ANDROID
+PATCH_FILES+=$(TARFILE_NAME).patch.no-soname
+.ENDIF
+
.IF $(OS)==WNT
.IF $(COM)==GCC
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
diff --git a/redland/raptor/raptor-1.4.18.patch.no-soname
b/redland/raptor/raptor-1.4.18.patch.no-soname
new file mode 100644
index 000..66d1eff
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.no-soname
@@ -0,0 +1,11 @@
+--- misc/raptor-1.4.18/configure
misc/build/raptor-1.4.18/configure
+@@ -7848,7 +7848,7 @@
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+- archive_cmds='$CC '$tmp_sharedflag$tmp_addflag' $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_cmds='$CC '$tmp_sharedflag$tmp_addflag' $libobjs $deplibs
$compiler_flags -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds='$echo { global: $output_objdir/$libname.ver~
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 6f356db..dabaf78 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -61,6 +61,9 @@ OOO_PATCH_FILES= \
PATCH_FILES=$(OOO_PATCH_FILES)
+.IF $(OS)==ANDROID
+PATCH_FILES+=$(TARFILE_NAME).patch.no-soname
+.ENDIF
.IF $(OS)==WNT
.IF $(COM)==GCC
diff --git a/redland/rasqal/rasqal-0.9.16.patch.no-soname
b/redland/rasqal/rasqal-0.9.16.patch.no-soname
new file mode 100644
index 000..08c54ac
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.no-soname
@@ -0,0 +1,11 @@
+--- misc/rasqal-0.9.16/configure
misc/build/rasqal-0.9.16/configure
+@@ -7848,7 +7848,7 @@
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+- archive_cmds='$CC '$tmp_sharedflag$tmp_addflag' $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_cmds='$CC '$tmp_sharedflag$tmp_addflag' $libobjs $deplibs
$compiler_flags -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds='$echo { global: $output_objdir/$libname.ver~
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
[Libreoffice-commits] .: 3 commits - filter/source framework/inc framework/source svtools/source sw/source unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source
filter/source/config/cache/cacheupdatelistener.cxx |2
filter/source/config/cache/filtercache.cxx |2
framework/inc/jobs/jobdispatch.hxx |2
framework/source/accelerators/acceleratorconfiguration.cxx |2
framework/source/fwi/classes/protocolhandlercache.cxx |8
framework/source/fwi/jobs/configaccess.cxx |2
framework/source/jobs/jobdata.cxx |2
framework/source/jobs/jobexecutor.cxx |2
framework/source/services/pathsettings.cxx |2
svtools/source/config/colorcfg.cxx |2
svtools/source/config/extcolorcfg.cxx |2
sw/source/ui/envelp/labelcfg.cxx |2
unotools/Library_utl.mk|2
unotools/Package_inc.mk|2
unotools/inc/unotools/configpathes.hxx | 183 ---
unotools/inc/unotools/configpaths.hxx | 183 +++
unotools/inc/unotools/pathoptions.hxx |4
unotools/source/config/configitem.cxx |2
unotools/source/config/confignode.cxx |2
unotools/source/config/configpathes.cxx| 309 -
unotools/source/config/configpaths.cxx | 309 +
unotools/source/config/defaultoptions.cxx |2
unotools/source/config/fontcfg.cxx |2
unotools/source/config/pathoptions.cxx | 16
unotools/source/config/viewoptions.cxx |2
25 files changed, 524 insertions(+), 524 deletions(-)
New commits:
commit 238ad07d7aa56231ff1a6f812656f89f1c193d73
Author: Tor Lillqvist t...@iki.fi
Date: Mon Apr 9 13:53:34 2012 +0300
s/pathes/paths/
diff --git a/unotools/inc/unotools/pathoptions.hxx
b/unotools/inc/unotools/pathoptions.hxx
index 2ed1178..d74e4ae 100644
--- a/unotools/inc/unotools/pathoptions.hxx
+++ b/unotools/inc/unotools/pathoptions.hxx
@@ -44,7 +44,7 @@ private:
SvtPathOptions_Impl*pImp;
public:
-enum Pathes
+enum Paths
{
PATH_ADDIN,
PATH_AUTOCORRECT,
@@ -129,7 +129,7 @@ public:
String SubstituteVariable( const String rVar ) const;
String ExpandMacros( const String rPath ) const;
String UseVariable( const String rVar ) const;
-sal_BoolSearchFile( String rIniFile, Pathes ePath =
PATH_USERCONFIG );
+sal_BoolSearchFile( String rIniFile, Paths ePath =
PATH_USERCONFIG );
::com::sun::star::lang::Locale GetLocale() const;
sal_BoolIsReadonly() const;
};
diff --git a/unotools/source/config/defaultoptions.cxx
b/unotools/source/config/defaultoptions.cxx
index cb68c88..90261df 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -118,7 +118,7 @@ typedef String SvtDefaultOptions_Impl:: *PathStrPtr;
struct PathToDefaultMapping_Impl
{
-SvtPathOptions::Pathes _ePath;
+SvtPathOptions::Paths _ePath;
PathStrPtr _pDefaultPath;
};
diff --git a/unotools/source/config/pathoptions.cxx
b/unotools/source/config/pathoptions.cxx
index f743bf7..4435830 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -130,7 +130,7 @@ class SvtPathOptions_Impl
SvtPathOptions_Impl();
// get the paths, not const because of using a mutex
-const String GetPath( SvtPathOptions::Pathes );
+const String GetPath( SvtPathOptions::Paths );
const String GetAddinPath() { return GetPath(
SvtPathOptions::PATH_ADDIN ); }
const String GetAutoCorrectPath() { return GetPath(
SvtPathOptions::PATH_AUTOCORRECT ); }
const String GetAutoTextPath() { return GetPath(
SvtPathOptions::PATH_AUTOTEXT ); }
@@ -157,7 +157,7 @@ class SvtPathOptions_Impl
const String GetFingerprintPath() { return GetPath(
SvtPathOptions::PATH_FINGERPRINT ); }
// set the paths
-voidSetPath( SvtPathOptions::Pathes, const String
rNewPath );
+voidSetPath( SvtPathOptions::Paths, const String rNewPath
);
voidSetAddinPath( const String rPath ) { SetPath(
SvtPathOptions::PATH_ADDIN, rPath ); }
voidSetAutoCorrectPath( const String rPath ) { SetPath(
SvtPathOptions::PATH_AUTOCORRECT, rPath ); }
voidSetAutoTextPath( const String rPath ) { SetPath(
SvtPathOptions::PATH_AUTOTEXT, rPath ); }
@@ -197,7 +197,7 @@ static sal_Int32 nRefCount = 0;
struct PropertyStruct
{
const char* pPropName; // The ascii name of the Office path
-SvtPathOptions::Pathes ePath; // The enum value used by
SvtPathOptions
[Libreoffice-commits] .: 5 commits - cppuhelper/source ios/qa Module_tail_build.mk sal/inc sal/Package_inc.mk sc/source
Module_tail_build.mk |3 -
cppuhelper/source/shlib.cxx| 46
ios/qa/sc/Makefile | 11
ios/qa/sc/filters-test.m | 26 ++-
sal/Package_inc.mk |1
sal/inc/osl/detail/ios-bootstrap.h | 60 ++
sc/source/filter/oox/biffcodec.cxx | 85 -
7 files changed, 125 insertions(+), 107 deletions(-)
New commits:
commit d25ef83c1293f1596d2d2d4d4643e3278959823a
Author: Tor Lillqvist t...@iki.fi
Date: Mon Apr 9 22:40:58 2012 +0300
Add the lo_get_libmap() for this test app
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 5d3bcf5..d46e14e 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -15,6 +15,15 @@ APPDIR=build/Debug-$(PLATFORM)/$(APP).app
# Stuff lifted from solenv/gbuild/platform/IOS_ARM_GCC.mk
+gb_OSDEFS := \
+ -D$(OS) \
+ -D_PTHREADS \
+ -DUNIX \
+ -DUNX \
+ -D_REENTRANT \
+ -DNO_PTHREAD_PRIORITY \
+ $(EXTRA_CDEFS) \
+
gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 -g
gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
@@ -36,7 +45,7 @@ all: $(APPDIR)/$(APP) stuff
$(APPDIR)/$(APP): $(SRCS)
mkdir -p $(APPDIR)
- $(CXX) -Wl,-map,$(APP).map.mangled -o $@ $(CFLAGS) $(gb_OBJCXXFLAGS)
$(SRCS) $(LIBS)
+ $(CXX) -Wl,-map,$(APP).map.mangled -o $@ $(gb_OSDEFS) $(CFLAGS)
$(gb_OBJCXXFLAGS) $(SRCS) $(LIBS)
c++filt $(APP).map.mangled $(APP).map rm $(APP).map.mangled
stuff:
diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m
index c6650ea..42b0816 100644
--- a/ios/qa/sc/filters-test.m
+++ b/ios/qa/sc/filters-test.m
@@ -35,11 +35,32 @@
#include cppunit/plugin/TestPlugIn.h
//#include cppunit/plugin/PlugInManager.h
+#include osl/detail/ios-bootstrap.h
+
+#ifdef __cplusplus
extern C {
-extern CppUnitTestPlugIn *cppunitTestPlugIn(void);
-extern int lo_main(int argc, const char **argv);
+#endif
+
+extern CppUnitTestPlugIn *cppunitTestPlugIn(void);
+extern int lo_main(int argc, const char **argv);
+
+extern void * sc_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+
+const lib_to_component_mapping *
+lo_get_libmap(void)
+{
+static lib_to_component_mapping map[] = {
+{ libsclo.a, sc_component_getFactory },
+{ NULL, NULL }
+};
+
+return map;
}
+#ifdef __cplusplus
+}
+#endif
+
int
main(int argc, char ** argv)
{
@@ -160,4 +181,3 @@ didFinishLaunchingWithOptions: (NSDictionary *)
launchOptions
@end
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
commit 0b67dd10f858caf46a1d55aff1de319d161f44cf
Author: Tor Lillqvist t...@iki.fi
Date: Mon Apr 9 22:40:17 2012 +0300
Use lo_get_libmap()
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 8c12784..0627e30 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -46,6 +46,10 @@
#endif
#include vector
+#ifdef IOS
+#include osl/detail/ios-bootstrap.h
+#endif
+
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
@@ -463,7 +467,6 @@ extern C
extern void * configmgr_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * fwk_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * i18npool_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
-extern void * sc_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * ucb_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * ucpfile_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
}
@@ -523,24 +526,33 @@ Reference XInterface SAL_CALL
loadSharedLibComponentFactory(
oslGenericFunction pSym = NULL;
#ifdef DISABLE_DYNLOADING
-if ( rLibName.equals( OUSTR(bootstrap.uno SAL_DLLEXTENSION)) )
-pSym = (oslGenericFunction) bootstrap_component_getFactory;
-else if ( rLibName.equals( OUSTR(libucb1.a)) )
-pSym = (oslGenericFunction) ucb_component_getFactory;
-else if ( rLibName.equals( OUSTR(configmgr.uno.a)) )
-pSym = (oslGenericFunction) configmgr_component_getFactory;
-else if ( rLibName.equals( OUSTR(libucpfile1.a)) )
-pSym = (oslGenericFunction) ucpfile_component_getFactory;
-else if ( rLibName.equals( OUSTR(libsclo.a)) )
-pSym = (oslGenericFunction) sc_component_getFactory;
-else if ( rLibName.equals( OUSTR(libfwklo.a)) )
-pSym = (oslGenericFunction) fwk_component_getFactory;
-else if ( rLibName.equals( OUSTR
[Libreoffice-commits] .: 2 commits - Module_tail_build.mk sw/CppunitTest_sw_filters_test.mk
Module_tail_build.mk |2 +- sw/CppunitTest_sw_filters_test.mk |3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 0f0063e31d211157e3252ca850236eb45dcf31d1 Author: Tor Lillqvist t...@iki.fi Date: Mon Apr 9 23:37:06 2012 +0300 xmlhelp not built for non-desktop OSes diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 86e144f..a858d3e 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -89,7 +89,8 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ -xmlhelp/util/ucpchelp1 \ + $(if $(filter DESKTOP,$(BUILD_TYPE)), \ + xmlhelp/util/ucpchelp1) \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test)) commit ff9cca69744b54ca84d98476a9a969d1aa0ff2d3 Author: Tor Lillqvist t...@iki.fi Date: Mon Apr 9 23:35:59 2012 +0300 I meant DESKTOP, not XMLHELP diff --git a/Module_tail_build.mk b/Module_tail_build.mk index cd69300..a19f71c 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -92,7 +92,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ writerfilter \ writerperfect \ xmerge \ - $(if $(filter XMLHELP,$(BUILD_TYPE)), \ + $(if $(filter DESKTOP,$(BUILD_TYPE)), \ xmlhelp) \ xmloff \ xmlscript \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/experiments
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
|6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 45d1ebeca54c22d35777c57cdbb6b3a9dad55632
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Apr 5 12:13:20 2012 +0300
Open the document read-only
diff --git
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 93ed87e..1be2395 100644
---
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -102,16 +102,20 @@ public class DocumentLoader
// Loading the wanted document
com.sun.star.beans.PropertyValue propertyValues[] =
-new com.sun.star.beans.PropertyValue[1];
+new com.sun.star.beans.PropertyValue[2];
propertyValues[0] = new com.sun.star.beans.PropertyValue();
propertyValues[0].Name = Hidden;
propertyValues[0].Value = new Boolean(true);
+propertyValues[1] = new com.sun.star.beans.PropertyValue();
+propertyValues[1].Name = ReadOnly;
+propertyValues[1].Value = new Boolean(true);
String sUrl = file:// + input;
Object oDoc =
xCompLoader.loadComponentFromURL
(sUrl, _blank, 0, propertyValues);
+Log.i(TAG, oDoc is + (oDoc!=null ? oDoc.toString() : null));
}
catch (Exception e) {
e.printStackTrace(System.err);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - android/Bootstrap android/experiments cppu/source sal/osl
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
|6
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
|2
cppu/source/uno/lbmap.cxx
|4
sal/osl/unx/file.cxx
| 78 --
4 files changed, 70 insertions(+), 20 deletions(-)
New commits:
commit 0d5f437bf7ee3ea8cf9787ccf8bf22d67eee92b8
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Apr 5 20:36:08 2012 +0300
Catch attempts to open /assets files read-write. Improve debugging output
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 5e59f7c..dbf256d 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -856,11 +856,11 @@ static int osl_file_queryLocking (sal_uInt32 uFlags)
#ifdef UNX
-oslFileError
-SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle
*pHandle )
+static oslFileError
+osl_openMemoryAsFile( void *address, size_t size, oslFileHandle *pHandle,
const char *path )
{
oslFileError eRet;
-FileHandle_Impl * pImpl = new FileHandle_Impl (-1,
FileHandle_Impl::KIND_MEM);
+FileHandle_Impl * pImpl = new FileHandle_Impl (-1,
FileHandle_Impl::KIND_MEM, path);
if (!pImpl)
{
eRet = oslTranslateFileError (OSL_FET_ERROR, ENOMEM);
@@ -879,6 +879,12 @@ SAL_CALL osl_openMemoryAsFile( void *address, size_t size,
oslFileHandle *pHandl
return osl_File_E_None;
}
+oslFileError
+SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle
*pHandle )
+{
+return osl_openMemoryAsFile( address, size, pHandle, anon );
+}
+
#endif
/
@@ -901,20 +907,27 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
oslFileHandle* pHandle, sal_u
/* Opening a file from /assets read-only means
* we should mmap it from the .apk file
*/
-if (!(uFlags osl_File_OpenFlag_Write)
-strncmp (cpFilePath, /assets/, sizeof (/assets/) - 1) == 0)
+if (strncmp (cpFilePath, /assets/, sizeof (/assets/) - 1) == 0)
{
+if (uFlags osl_File_OpenFlag_Write)
+{
+// Or should we just silently open it read-only and let write
+// attempts, if any, fail then later?
+OSL_TRACE(osl_openFile(%s, writeable), not possible!,
cpFilePath);
+errno = EPERM;
+return osl_File_E_PERM;
+}
void *address;
size_t size;
address = lo_apkentry(cpFilePath, size);
-OSL_TRACE(osl_openFile(%s): %p,
+OSL_TRACE(osl_openFile(%s) = %p,
cpFilePath, address);
if (address == NULL)
{
errno = ENOENT;
return osl_File_E_NOENT;
}
-return osl_openMemoryAsFile(address, size, pHandle);
+return osl_openMemoryAsFile(address, size, pHandle, cpFilePath);
}
#endif
@@ -952,7 +965,14 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
oslFileHandle* pHandle, sal_u
/* open the file */
int fd = open( cpFilePath, flags, mode );
if (-1 == fd)
-return oslTranslateFileError (OSL_FET_ERROR, errno);
+{
+int saved_errno = errno;
+OSL_TRACE(osl_openFile(%s, %s) failed: %s,
+ cpFilePath,
+ flags O_RDWR ? writeable:readonly,
+ strerror(saved_errno));
+return oslTranslateFileError (OSL_FET_ERROR, saved_errno);
+}
/* reset O_NONBLOCK flag */
if (flags O_NONBLOCK)
@@ -960,13 +980,25 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
oslFileHandle* pHandle, sal_u
int f = fcntl (fd, F_GETFL, 0);
if (-1 == f)
{
-eRet = oslTranslateFileError (OSL_FET_ERROR, errno);
+int saved_errno = errno;
+OSL_TRACE(osl_openFile(%s, %s): fcntl(%d, F_GETFL) failed: %s,
+ cpFilePath,
+ flags O_RDWR ? writeable:readonly,
+ fd,
+ strerror(saved_errno));
+eRet = oslTranslateFileError (OSL_FET_ERROR, saved_errno);
(void) close(fd);
return eRet;
}
if (-1 == fcntl (fd, F_SETFL, (f ~O_NONBLOCK)))
{
-eRet = oslTranslateFileError (OSL_FET_ERROR, errno);
+int saved_errno = errno;
+OSL_TRACE(osl_openFile(%s, %s): fcntl(%d, F_SETFL) failed: %s,
+ cpFilePath,
+ flags O_RDWR ? writeable:readonly,
+ fd,
+ strerror(saved_errno));
+eRet = oslTranslateFileError (OSL_FET_ERROR, saved_errno);
(void) close(fd);
return eRet;
}
@@ -976,13 +1008,21 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
oslFileHandle
[Libreoffice-commits] .: 7 commits - android/experiments distro-configs/LibreOfficeAndroid.conf fontconfig/makefile.mk sysui/README vcl/android vcl/source
android/experiments/DocumentLoader/Makefile | 23 ---
android/experiments/DocumentLoader/fonts.conf | 13 ++---
distro-configs/LibreOfficeAndroid.conf|1 -
fontconfig/makefile.mk|4
sysui/README |2 +-
vcl/android/androidinst.cxx | 13 +
vcl/source/window/dialog.cxx | 12 +++-
7 files changed, 51 insertions(+), 17 deletions(-)
New commits:
commit bc21df051670cc78094779d9b4cd1d6cc78e9509
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Apr 4 22:21:07 2012 +0300
No dialogs to be shown from vcl in a non-NativeActivity Android app
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 6e10da6..1353c6c 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -46,7 +46,9 @@
#include vcl/msgbox.hxx
#include vcl/unowrap.hxx
-
+#ifdef ANDROID
+#include osl/detail/android-bootstrap.h
+#endif
// ===
@@ -592,6 +594,14 @@ sal_Bool Dialog::Close()
sal_Bool Dialog::ImplStartExecuteModal()
{
+#ifdef ANDROID
+// If a non-NativeActivity app, we shouldn't be showing any dialogs
+if (lo_get_app() == NULL) {
+fprintf(stderr, %s: Should not do anything, returning false\n,
__FUNCTION__);
+return sal_False;
+}
+#endif
+
if ( mbInExecute )
{
#ifdef DBG_UTIL
commit a5aa747d59dd67731d46c7f023bf15f2b431cdb3
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Apr 4 22:20:29 2012 +0300
Use -g in CFLAGS when debugging requested
diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk
index 55c561a..a866c4c 100644
--- a/fontconfig/makefile.mk
+++ b/fontconfig/makefile.mk
@@ -43,6 +43,10 @@ PATCH_FILES=$(TARFILE_NAME).patch
CONFIGURE_ACTION=./configure
+.IF $(debug) !=
+CONFIGURE_ACTION!:=CFLAGS=-g $(CONFIGURE_ACTION)
+.ENDIF
+
CONFIGURE_FLAGS=\
--disable-static \
--with-arch=arm \
commit cdc92518c53a15945f6fc4aaad4fbc40172d257c
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Apr 4 22:18:53 2012 +0300
Do unpack fonts and include them in the experimental Android app
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index f818d73..0c1e666 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -176,17 +176,19 @@ copy-stuff:
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'
assets/program/fundamentalrc
echo 'URE_MORE_TYPES=file:///assets/bin/ure/types.rdb
file:///assets/bin/types.rdb' assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/xml/services.rdb $$BRAND_BASE_DIR/program/services*'
assets/program/fundamentalrc
+#
# Set up unorc
echo '[Bootstrap]' assets/program/unorc
echo URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/unorc
echo 'UNO_TYPES=file:///assets/bin/ure/types.rdb
file:///assets/bin/types.rdb $${URE_MORE_TYPES}' assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/xml/services.rdb $${URE_MORE_SERVICES}' assets/program/unorc
+#
# Set up bootstraprc
echo '[Bootstrap]' assets/program/bootstraprc
echo 'InstallMode=installmode' assets/program/bootstraprc
echo 'ProductKey=LibreOffice 3.6' assets/program/bootstraprc
- echo UserInstallation=file://$(APP_DATA_PATH)/cache/.libreoffice
assets/program/bootstraprc
-
+ echo UserInstallation=file://$(APP_DATA_PATH)
assets/program/bootstraprc
+#
# Set up versionrc
echo '[Version]' assets/program/versionrc
echo 'AllLanguages=en-US' assets/program/versionrc
@@ -197,12 +199,23 @@ copy-stuff:
echo 'ProductMinor=1' assets/program/versionrc
echo 'ProductSource=OOO350' assets/program/versionrc
echo 'ReferenceOOoMajorMinor=3.6' assets/program/versionrc
+#
# .res files
mkdir -p assets/program/resource
cp $(OUTDIR)/bin/*en-US.res assets/program/resource
-# Assets that are unpacked at run-time into the app's data directory.
+#
+# Assets that are unpacked at run-time into the app's data directory. These
+# are files read by non-LO code, fontconfig and freetype for now, that doesn't
+# understand /assets paths.
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
+ mkdir -p assets/unpack/user/fonts
+# $UserInstallation/user/fonts is added to the fontconfig path in
+# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
+# set to the app's data dir above.
+ cp $(OUTDIR)/pck/Liberation*.ttf assets/unpack/user/fonts
+ cp $(OUTDIR)/pck/Gen*.ttf assets/unpack/user/fonts
+ cp $(OUTDIR)/pck/opens___.ttf assets/unpack/user/fonts
[Libreoffice-commits] .: 3 commits - android/experiments solenv/bin
android/experiments/DocumentLoader/Makefile |8
solenv/bin/make_installer.pl | 14 +++
solenv/bin/modules/installer/download.pm |4 +-
solenv/bin/modules/installer/globals.pm |4 +-
solenv/bin/modules/installer/helppack.pm |2 -
solenv/bin/modules/installer/languagepack.pm |2 -
solenv/bin/modules/installer/packagelist.pm |8 ++--
solenv/bin/modules/installer/scriptitems.pm |8 ++--
solenv/bin/modules/installer/windows/file.pm |2 -
solenv/bin/modules/installer/windows/msiglobal.pm |2 -
solenv/bin/modules/installer/windows/strip.pm |2 -
solenv/bin/modules/installer/worker.pm| 42 +++---
solenv/bin/modules/installer/ziplist.pm | 18 -
solenv/bin/modules/par2script/work.pm |2 -
solenv/bin/par2script.pl |2 -
15 files changed, 64 insertions(+), 56 deletions(-)
New commits:
commit 94166f3c95651da395a262112d666ab841e5cb86
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Apr 3 14:35:38 2012 +0300
Need libswlo.so
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index b4b5a61..bbebd56 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -98,6 +98,7 @@ copy-stuff:
svgfilterlo \
svllo \
swdlo \
+ swlo \
t602filterlo \
textinstream.uno \
tllo \
commit f82b40c2531c54fb1dbbdc4ca60cfec49d66fb63
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Apr 3 14:35:17 2012 +0300
Add *en-US.res and images_*.zip
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index 76210a0..b4b5a61 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -196,6 +196,13 @@ copy-stuff:
echo 'ProductMinor=1' assets/program/versionrc
echo 'ProductSource=OOO350' assets/program/versionrc
echo 'ReferenceOOoMajorMinor=3.6' assets/program/versionrc
+# .res files
+ mkdir -p assets/program/resource
+ cp $(OUTDIR)/bin/*en-US.res assets/program/resource
+# Image Zip archives
+ for I in default tango; do \
+ cp $(OUTDIR)/bin/images_$$I.zip assets/share/config; \
+ done
# Assets that are unpacked at run-time into the app's data directory.
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
commit 4e8bc5911164971a9af5377633803ec620f593cc
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Apr 3 08:55:28 2012 +0300
s/pathes/paths/
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 7d0f56a..21f2077 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -276,13 +276,13 @@ if ( $$includepathref eq )
my $includepatharrayref =
installer::converter::convert_stringlist_into_array($includepathref, ,);
-installer::ziplist::replace_all_variables_in_pathes($includepatharrayref,
$pathvariableshashref);
+installer::ziplist::replace_all_variables_in_paths($includepatharrayref,
$pathvariableshashref);
-installer::ziplist::replace_minor_in_pathes($includepatharrayref);
+installer::ziplist::replace_minor_in_paths($includepatharrayref);
-installer::ziplist::replace_packagetype_in_pathes($includepatharrayref);
+installer::ziplist::replace_packagetype_in_paths($includepatharrayref);
-installer::ziplist::resolve_relative_pathes($includepatharrayref);
+installer::ziplist::resolve_relative_paths($includepatharrayref);
installer::ziplist::remove_ending_separator($includepatharrayref);
@@ -291,7 +291,7 @@
installer::ziplist::remove_ending_separator($includepatharrayref);
# paths in global hashes.
##
-installer::worker::collect_all_files_from_includepathes($includepatharrayref);
+installer::worker::collect_all_files_from_includepaths($includepatharrayref);
##
# Analyzing languages in zip.lst if required
@@ -636,9 +636,9 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
# Resolving include paths (language dependent)
-$includepatharrayref_lang =
installer::ziplist::replace_languages_in_pathes($includepatharrayref,
$languagesarrayref);
+$includepatharrayref_lang =
installer::ziplist::replace_languages_in_paths($includepatharrayref,
$languagesarrayref);
-if ( $installer::globals::refresh_includepathes ) {
installer::worker::collect_all_files_from_includepathes($includepatharrayref_lang);
}
+if ( $installer::globals::refresh_includepaths ) {
installer::worker::collect_all_files_from_includepaths($includepatharrayref_lang
[Libreoffice-commits] .: sal/inc
sal/inc/sal/types.h | 14 ++ 1 file changed, 2 insertions(+), 12 deletions(-) New commits: commit 61c5883f4cb35cbb1016b9abcf0718ca4d967f3d Author: Tor Lillqvist t...@iki.fi Date: Tue Apr 3 18:22:42 2012 +0300 Simplify SAL_CONST_CAST and SAL_STATIC_CAST defns, mention they are obsolete diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 52b008f..8d0bb7e 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -351,22 +351,12 @@ typedef struct _sal_Sequence #endif -/** Wrap C++ const_cast, reinterpret_cast and static_cast expressions in -macros to keep code portable to old compilers (since most compilers still -lack RTTI support, dynamic_cast is not included here). +/* Historical macros, no need to use, old use cases should be replaced + * by their expansions. */ #ifdef __cplusplus -#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || \ -defined FREEBSD || defined NETBSD || defined AIX || \ -defined OPENBSD || defined DRAGONFLY #define SAL_CONST_CAST(type, expr) (const_cast type (expr)) -#define SAL_REINTERPRET_CAST(type, expr) (reinterpret_cast type (expr)) #define SAL_STATIC_CAST(type, expr) (static_cast type (expr)) -#else /* SAL_W32, SOLARIS, LINUX */ -#define SAL_CONST_CAST(type, expr) ((type) (expr)) -#define SAL_REINTERPRET_CAST(type, expr) ((type) (expr)) -#define SAL_STATIC_CAST(type, expr) ((type) (expr)) -#endif /* SAL_W32, SOLARIS, LINUX */ #endif /* __cplusplus */ /** Definition of function throw clause macros. These have been introduced ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc
sal/inc/sal/types.h |1 + 1 file changed, 1 insertion(+) New commits: commit 9b9f70737e5133c8aa5a95fd2e49a0f9a5e091e6 Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Apr 3 20:37:03 2012 +0300 SAL_REINTERPRET_CAST returns, for API stability (for 3rd-party extensions) diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 8d0bb7e..288c2e7 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -356,6 +356,7 @@ typedef struct _sal_Sequence */ #ifdef __cplusplus #define SAL_CONST_CAST(type, expr) (const_cast type (expr)) +#define SAL_REINTERPRET_CAST(type, expr) (reinterpret_cast type (expr)) #define SAL_STATIC_CAST(type, expr) (static_cast type (expr)) #endif /* __cplusplus */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 9 commits - boost/boost_1_44_0-logical-op-parentheses.patch boost/boost_1_44_0-unused-parameters.patch boost/makefile.mk cppcanvas/source framework/source sc/qa sc/source vcl/
boost/boost_1_44_0-logical-op-parentheses.patch | 12 +
boost/boost_1_44_0-unused-parameters.patch | 77
boost/makefile.mk|1
cppcanvas/source/mtfrenderer/bitmapaction.cxx|2
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx |2
cppcanvas/source/mtfrenderer/polypolyaction.cxx |6
cppcanvas/source/mtfrenderer/rendergraphicaction.cxx |2
framework/source/classes/menumanager.cxx |8
sc/qa/unit/helper/debughelper.hxx|3
sc/source/core/data/dpgroup.cxx |9
sc/source/filter/oox/worksheetfragment.cxx | 20 --
vcl/inc/ios/salframeview.h |5
vcl/ios/source/gdi/salcoretextfontutils.cxx | 177 ---
vcl/ios/source/gdi/salcoretextlayout.cxx | 26 ++
vcl/ios/source/gdi/salnativewidgets.cxx | 18 +
vcl/ios/source/window/salframeview.mm| 16 +
16 files changed, 168 insertions(+), 216 deletions(-)
New commits:
commit 86b99ab408c7235604a1a02d7bc531fe5d5f97f6
Author: Tor Lillqvist t...@iki.fi
Date: Wed Apr 4 00:57:00 2012 +0300
Clang WaE: -Woverloaded-virtual weirdness, this seems to help
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 2129ca5..39f240a 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -60,6 +60,8 @@ namespace cppcanvas
class BitmapAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
BitmapAction( const ::BitmapEx,
const ::basegfx::B2DPoint rDstPoint,
const CanvasSharedPtr,
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 8cef77f..4e72cae 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -79,11 +79,11 @@ namespace cppcanvas
protected:
using Action::render;
-private:
virtual bool render( ::com::sun::star::uno::Reference
::com::sun::star::rendering::XCachedPrimitive rCachedPrimitive,
const ::basegfx::B2DHomMatrix
rTransformation ) const = 0;
+private:
CanvasSharedPtr
mpCanvas;
mutable ::com::sun::star::uno::Reference
::com::sun::star::rendering::XCachedPrimitive
mxCachedPrimitive;
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index dcfe33c..2ff5316 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -61,6 +61,8 @@ namespace cppcanvas
class PolyPolyAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
PolyPolyAction( const ::basegfx::B2DPolyPolygon,
const CanvasSharedPtr,
const OutDevState,
@@ -245,6 +247,8 @@ namespace cppcanvas
class TexturedPolyPolyAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
TexturedPolyPolyAction( const ::basegfx::B2DPolyPolygon rPoly,
const CanvasSharedPtr
rCanvas,
const OutDevState
rState,
@@ -359,6 +363,8 @@ namespace cppcanvas
class StrokedPolyPolyAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
StrokedPolyPolyAction( const ::basegfx::B2DPolyPolygon
rPoly,
const CanvasSharedPtr
rCanvas,
const OutDevState
rState,
diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
index f5ce0ee..237f781 100644
--- a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
+++ b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
@@ -60,6 +60,8 @@ namespace cppcanvas
class RenderGraphicAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
RenderGraphicAction( const ::vcl::RenderGraphic
rRenderGraphic,
const ::basegfx::B2DPoint rDstPoint,
const ::basegfx::B2DVector
[Libreoffice-commits] .: cppcanvas/source
cppcanvas/source/inc/action.hxx |4 -
cppcanvas/source/mtfrenderer/bitmapaction.cxx| 20 ++---
cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx |4 -
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx |4 -
cppcanvas/source/mtfrenderer/implrenderer.cxx|4 -
cppcanvas/source/mtfrenderer/lineaction.cxx |8 +-
cppcanvas/source/mtfrenderer/pointaction.cxx |8 +-
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 60 ++-
cppcanvas/source/mtfrenderer/rendergraphicaction.cxx | 20 ++---
cppcanvas/source/mtfrenderer/textaction.cxx | 50 ++--
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 14 +--
11 files changed, 93 insertions(+), 103 deletions(-)
New commits:
commit 66aed6f470c795f172fa85b89ae9d25c76eb38bd
Author: Tor Lillqvist t...@iki.fi
Date: Wed Apr 4 06:55:01 2012 +0300
New try to sort out the overloaded virtual method weirdness
Revert Clang WaE: -Woverloaded-virtual weirdness, this seems to help
as that broke tinderboxes. Try another way instead, renaming two
versions of the overloaded render() method, so that there is no longer
any overloading.
Compiles -Werror-clean with Clang, hopefully no problem with other
compilers either.
This reverts commit 86b99ab408c7235604a1a02d7bc531fe5d5f97f6.
diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index 971cfcb..c961f82 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -114,8 +114,8 @@ namespace cppcanvas
specified subset is invalid for this action, or if
rendering failed for other reasons, false is returned.
*/
-virtual bool render( const ::basegfx::B2DHomMatrix
rTransformation,
- const Subset rSubset )
const = 0;
+virtual bool renderSubset( const ::basegfx::B2DHomMatrix
rTransformation,
+ const Subset rSubset
) const = 0;
/** Query bounds of this action on the associated canvas
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 39f240a..83e7a0a 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -60,8 +60,6 @@ namespace cppcanvas
class BitmapAction : public CachedPrimitiveBase
{
public:
-using CachedPrimitiveBase::render;
-
BitmapAction( const ::BitmapEx,
const ::basegfx::B2DPoint rDstPoint,
const CanvasSharedPtr,
@@ -72,8 +70,8 @@ namespace cppcanvas
const CanvasSharedPtr,
const OutDevState );
-virtual bool render( const ::basegfx::B2DHomMatrix
rTransformation,
- const Subset rSubset )
const;
+virtual bool renderSubset( const ::basegfx::B2DHomMatrix
rTransformation,
+ const Subset
rSubset ) const;
virtual ::basegfx::B2DRange getBounds( const
::basegfx::B2DHomMatrix rTransformation ) const;
virtual ::basegfx::B2DRange getBounds( const
::basegfx::B2DHomMatrix rTransformation,
@@ -83,8 +81,8 @@ namespace cppcanvas
private:
using Action::render;
-virtual bool render( uno::Reference
rendering::XCachedPrimitive rCachedPrimitive,
- const ::basegfx::B2DHomMatrix
rTransformation ) const;
+virtual bool renderPrimitive( uno::Reference
rendering::XCachedPrimitive rCachedPrimitive,
+ const ::basegfx::B2DHomMatrix
rTransformation ) const;
uno::Reference rendering::XBitmap
mxBitmap;
CanvasSharedPtr
mpCanvas;
@@ -152,10 +150,10 @@ namespace cppcanvas
NULL );
}
-bool BitmapAction::render( uno::Reference
rendering::XCachedPrimitive rCachedPrimitive,
- const ::basegfx::B2DHomMatrix
rTransformation ) const
+bool BitmapAction::renderPrimitive( uno::Reference
rendering::XCachedPrimitive rCachedPrimitive,
+const ::basegfx::B2DHomMatrix
rTransformation ) const
{
-RTL_LOGFILE_CONTEXT( aLog,
::cppcanvas::internal::BitmapAction::render() );
+RTL_LOGFILE_CONTEXT( aLog,
::cppcanvas
[Libreoffice-commits] .: 5 commits - android/Bootstrap android/experiments sal/android
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
| 27 +
android/experiments/DocumentLoader/Makefile
| 18 +++
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
|3
sal/android/lo-bootstrap.c
| 49 +++---
4 files changed, 83 insertions(+), 14 deletions(-)
New commits:
commit 6b6ca3d1168323651e87c51268b5c0c37532999b
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Apr 2 12:39:31 2012 +0300
Automate setting of FONTCONFIG_FILE
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 443b770..98df770 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -127,6 +127,18 @@ public class Bootstrap extends NativeActivity
// Extract files from the .apk that can't be used mmapped directly
from it
extract_files();
+
+// If we notice that a fonts.conf file was extracted, automatically
+// set the FONTCONFIG_FILE env var.
+InputStream i;
+try {
+i = activity.getAssets().open(unpack/etc/fonts/fonts.conf);
+}
+catch (java.io.IOException e) {
+i = null;
+}
+if (i != null)
+putenv(FONTCONFIG_FILE= + dataDir + /etc/fonts/fonts.conf);
}
@Override
commit 366cba7d6f3a100d51b576927dde446ab36e9483
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Apr 2 12:38:48 2012 +0300
Add fonts.conf to this app, too
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index 2bacbbb..76210a0 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -196,6 +196,9 @@ copy-stuff:
echo 'ProductMinor=1' assets/program/versionrc
echo 'ProductSource=OOO350' assets/program/versionrc
echo 'ReferenceOOoMajorMinor=3.6' assets/program/versionrc
+# Assets that are unpacked at run-time into the app's data directory.
+ mkdir -p assets/unpack/etc/fonts
+ cp fonts.conf assets/unpack/etc/fonts
#
# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
#
commit a9a50cd9ffcd53c631fd13d20aa7e0609d92fc4d
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Apr 2 12:38:23 2012 +0300
Refactor where patch_libgnustl_shared() and extract_files() are called
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index c60c9e9..443b770 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -38,6 +38,7 @@ import android.util.Log;
import fi.iki.tml.CommandLine;
import java.io.File;
+import java.io.InputStream;
import java.util.Arrays;
import java.util.Scanner;
@@ -73,7 +74,10 @@ public class Bootstrap extends NativeActivity
// To be called after you are sure libgnustl_shared.so
// has been loaded
-public static native void patch_libgnustl_shared();
+static native void patch_libgnustl_shared();
+
+// Extracts files in the .apk that need to be extraced into the app's tree
+static native void extract_files();
// Wrapper for getpid()
public static native int getpid();
@@ -97,6 +101,8 @@ public class Bootstrap extends NativeActivity
// (contentbroker.cxx), also this called indirectly through the
lo-bootstrap library
public static native void initUCBHelper();
+// This setup() method is called 1) in apps that use *this* class as their
activity from onCreate(),
+// and 2) should be called from other kinds of LO code using apps.
public static void setup(Activity activity)
{
String dataDir = null;
@@ -114,6 +120,13 @@ public class Bootstrap extends NativeActivity
if (!setup(dataDir,
activity.getApplication().getPackageResourcePath(), llpa))
return;
+// We build LO code against the shared GNU C++ library
+dlopen(libgnustl_shared.so);
+// and need to patch it.
+patch_libgnustl_shared();
+
+// Extract files from the .apk that can't be used mmapped directly
from it
+extract_files();
}
@Override
diff --git
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index d47a6ef..93ed87e 100644
---
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -52,9 +52,6 @@ public
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d3208f2342f57863654562d0f3cffb6ce7b57daa Author: Tor Lillqvist t...@iki.fi Date: Mon Apr 2 20:36:06 2012 +0300 Fix copy/paste error diff --git a/configure.in b/configure.in index e150c89..0100f97 100644 --- a/configure.in +++ b/configure.in @@ -2325,7 +2325,7 @@ if test $_os = Darwin; then MACOSX_SDK_PATH=/Developer-old/SDKs/MacOSX10.5.sdk fi if test ! -d $MACOSX_SDK_PATH; then - MACOSX_SDK_PATH=/Xcode3/SDKs/MacOSX10.4u.sdk + MACOSX_SDK_PATH=/Xcode3/SDKs/MacOSX10.5.sdk fi macosx_sdk_value=1050 AC_MSG_WARN([Building with a SDK 10.4 is experimental]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/coretext' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit da7e47c25767ad86484249385daa58b2726a0895 Author: Tor Lillqvist t...@iki.fi Date: Mon Apr 2 20:36:06 2012 +0300 Fix copy/paste error diff --git a/configure.in b/configure.in index b66521c..1636e42 100644 --- a/configure.in +++ b/configure.in @@ -2285,7 +2285,7 @@ if test $_os = Darwin ; then MACOSX_SDK_PATH=/Developer-old/SDKs/MacOSX10.5.sdk fi if test ! -d $MACOSX_SDK_PATH; then - MACOSX_SDK_PATH=/Xcode3/SDKs/MacOSX10.4u.sdk + MACOSX_SDK_PATH=/Xcode3/SDKs/MacOSX10.5.sdk fi macosx_sdk_value=1050 AC_MSG_WARN([Building with a SDK 10.4 is experimental]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - android/experiments vcl/android
android/experiments/DocumentLoader/fonts.conf | 155 ++ vcl/android/androidinst.cxx |9 - 2 files changed, 159 insertions(+), 5 deletions(-) New commits: commit f834d986d5a1e7e66f4029476d058fbf5f63d8d1 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Apr 2 21:57:41 2012 +0300 Add fonts.conf diff --git a/android/experiments/DocumentLoader/fonts.conf b/android/experiments/DocumentLoader/fonts.conf new file mode 100644 index 000..64d714c --- /dev/null +++ b/android/experiments/DocumentLoader/fonts.conf @@ -0,0 +1,155 @@ +?xml version=1.0? +!DOCTYPE fontconfig SYSTEM fonts.dtd +!-- /etc/fonts/fonts.conf file to configure system font access -- +fontconfig + +!-- Font directory list -- + + dir/system/fonts/dir + + alias + familyserif/family + prefer + familyDroidSerif/family + familyRoboto/family + /prefer + /alias + alias + familysans-serif/family + prefer + familyRoboto/family + familyDroidSerif/family + /prefer + /alias + alias + familymonospace/family + prefer + familyDroidSansMono/family + /prefer + /alias + +!-- + Accept deprecated 'mono' alias, replacing it with 'monospace' +-- + match target=pattern + test qual=any name=family + stringmono/string + /test + edit name=family mode=assign + stringmonospace/string + /edit + /match + +!-- + Accept alternate 'sans serif' spelling, replacing it with 'sans-serif' +-- + match target=pattern + test qual=any name=family + stringsans serif/string + /test + edit name=family mode=assign + stringsans-serif/string + /edit + /match + +!-- + Accept deprecated 'sans' alias, replacing it with 'sans-serif' +-- + match target=pattern + test qual=any name=family + stringsans/string + /test + edit name=family mode=assign + stringsans-serif/string + /edit + /match + +!-- + Load local system customization file +-- + include ignore_missing=yesconf.d/include + +!-- Font cache directory list -- + + !-- Yeah this hardcoding is wrong of course, will have to fix +later to patch in proper code in fontonfig on Android to +find out a good place. + -- + cachedir/data/data/org.libreoffice.android.libo/fontconfig/cachedir + + config +!-- + These are the default Unicode chars that are expected to be blank + in fonts. All other blank chars are assumed to be broken and + won't appear in the resulting charsets + -- + blank + int0x0020/int !-- SPACE -- + int0x00A0/int !-- NO-BREAK SPACE -- + int0x00AD/int !-- SOFT HYPHEN -- + int0x034F/int !-- COMBINING GRAPHEME JOINER -- + int0x0600/int !-- ARABIC NUMBER SIGN -- + int0x0601/int !-- ARABIC SIGN SANAH -- + int0x0602/int !-- ARABIC FOOTNOTE MARKER -- + int0x0603/int !-- ARABIC SIGN SAFHA -- + int0x06DD/int !-- ARABIC END OF AYAH -- + int0x070F/int !-- SYRIAC ABBREVIATION MARK -- + int0x115F/int !-- HANGUL CHOSEONG FILLER -- + int0x1160/int !-- HANGUL JUNGSEONG FILLER -- + int0x1680/int !-- OGHAM SPACE MARK -- + int0x17B4/int !-- KHMER VOWEL INHERENT AQ -- + int0x17B5/int !-- KHMER VOWEL INHERENT AA -- + int0x180E/int !-- MONGOLIAN VOWEL SEPARATOR -- + int0x2000/int !-- EN QUAD -- + int0x2001/int !-- EM QUAD -- + int0x2002/int !-- EN SPACE -- + int0x2003/int !-- EM SPACE -- + int0x2004/int !-- THREE-PER-EM SPACE -- + int0x2005/int !-- FOUR-PER-EM SPACE -- + int0x2006/int !-- SIX-PER-EM SPACE -- + int0x2007/int !-- FIGURE SPACE -- + int0x2008/int !-- PUNCTUATION SPACE -- + int0x2009/int !-- THIN SPACE -- + int0x200A/int !-- HAIR SPACE -- + int0x200B/int !-- ZERO WIDTH SPACE -- + int0x200C/int !-- ZERO WIDTH NON
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit febdb8aeb7dbb07b7380808ce0cecfa7bb2b6101 Author: Tor Lillqvist t...@iki.fi Date: Fri Mar 30 09:39:07 2012 +0300 Use mktemp(1) more portably diff --git a/configure.in b/configure.in index dcfb3ec..face6c2 100644 --- a/configure.in +++ b/configure.in @@ -3654,7 +3654,7 @@ if test $_make_longver -ge 038200; then elif test $_make_longver -ge 038100; then AC_MSG_RESULT([$GNUMAKE $_make_version]) AC_MSG_CHECKING([for GNU make bug 20033]) -TESTGMAKEBUG20033=`mktemp -d` +TESTGMAKEBUG20033=`mktemp -d tmp.XX` cat $TESTGMAKEBUG20033/Makefile EOF A := \$(wildcard *.a) commit adf0076b56869d804fbdac774318e65ec0b28554 Author: Tor Lillqvist t...@iki.fi Date: Fri Mar 30 09:35:09 2012 +0300 Look for shasum (as on Mac OS X) too Hmm, /usr/bin/shasum is a Perl implementation (!), should we use openssl sha1 instead? diff --git a/configure.in b/configure.in index bed0180..dcfb3ec 100644 --- a/configure.in +++ b/configure.in @@ -3616,9 +3616,9 @@ AC_MSG_RESULT([no, obsolete]) dnl === dnl Search all the common names for sha1sum dnl === -AC_PATH_PROGS(SHA1SUM, sha1sum sha1) +AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum) if test -z $SHA1SUM; then -AC_MSG_ERROR([install sha1sum to run this script]) +AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this OS]) fi dnl === ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/main/ChartView.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0f1e33c54d02a20c476413ceebc99460a9cfef1f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Mar 30 11:52:33 2012 +0300
WaE: format '%i' expects type 'int', but argument has type 'long int'
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 77fe6ab..fbc507d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3044,12 +3044,12 @@ int closeCallback(void* )
void dumpPositionAsAttribute(const awt::Point rPoint, xmlTextWriterPtr
xmlWriter)
{
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(position),
%i,%i, rPoint.X, rPoint.Y);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(position),
%li,%li, rPoint.X, rPoint.Y);
}
void dumpSizeAsAttribute(const awt::Size rSize, xmlTextWriterPtr xmlWriter)
{
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(size), %ix%i,
rSize.Width, rSize.Height);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(size), %lix%li,
rSize.Width, rSize.Height);
}
void dumpShapeDescriptorAsAttribute( uno::Reference drawing::XShapeDescriptor
xDescr, xmlTextWriterPtr xmlWriter )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 9 commits - cppuhelper/source ios/qa sal/Module_sal.mk solenv/gbuild solenv/inc stoc/source ucbhelper/inc ucbhelper/source ucb/source
cppuhelper/source/shlib.cxx | 18 +- ios/qa/sc/Makefile |2 - sal/Module_sal.mk|3 + solenv/gbuild/ComponentTarget.mk |7 +++- solenv/gbuild/Library.mk |5 ++ solenv/inc/settings.mk | 10 - stoc/source/simpleregistry/textualservices.cxx |2 + ucb/source/cacher/cachedcontentresultset.cxx |6 ++- ucb/source/cacher/cachedcontentresultsetstub.cxx |6 ++- ucb/source/cacher/cacheddynamicresultset.cxx |6 ++- ucb/source/cacher/cacheddynamicresultsetstub.cxx |6 ++- ucb/source/core/provprox.cxx |6 ++- ucb/source/core/ucb.cxx |6 ++- ucb/source/core/ucbprops.cxx |6 ++- ucb/source/core/ucbstore.cxx |6 ++- ucb/source/sorter/sortdynres.cxx |6 ++- ucb/source/ucp/cmis/cmis_provider.cxx|6 ++- ucb/source/ucp/ftp/ftpcontent.cxx|9 ++--- ucb/source/ucp/ftp/ftpcontentprovider.cxx|4 +- ucb/source/ucp/gio/gio_provider.cxx |6 ++- ucb/source/ucp/gvfs/gvfs_provider.cxx|6 ++- ucb/source/ucp/hierarchy/hierarchyprovider.cxx |6 ++- ucb/source/ucp/odma/odma_provider.cxx|5 +- ucb/source/ucp/package/pkgprovider.cxx |6 ++- ucb/source/ucp/tdoc/tdoc_provider.cxx|6 ++- ucb/source/ucp/webdav/webdavprovider.cxx |6 ++- ucbhelper/inc/ucbhelper/macros.hxx | 39 +-- ucbhelper/source/client/contentbroker.cxx| 34 28 files changed, 129 insertions(+), 105 deletions(-) New commits: commit 0884201aa51b12e5f363d2e2c3f81da2426411ee Author: Tor Lillqvist t...@iki.fi Date: Thu Mar 29 08:20:17 2012 +0300 Only basename in component uris in DISABLE_DYNLOADING case here, too diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 31b0174..9988f7c 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1305,12 +1305,18 @@ XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar CPPUNIT_CFLAGS = .END +.IF $(DISABLE_DYNLOADING) == TRUE +COMPONENTPREFIX_URE_NATIVE = +COMPONENTPREFIX_BASIS_NATIVE = +COMPONENTPREFIX_INBUILD_NATIVE = +.ELSE COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/ -COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/ +COMPONENTPREFIX_INBUILD_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/ +.ENDIF +COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/ COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: -COMPONENTPREFIX_INBUILD_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/ COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/ COMPONENTPREFIX_EXTENSION = ./ commit 6a14f51af652d36eed60f3b8a6b8fe995e3a7b6d Author: Tor Lillqvist t...@iki.fi Date: Thu Mar 29 07:58:09 2012 +0300 Follow-up to revert of Initial experiments with static linking of (some) ... Revert this requires string literals now and fix after recent XSERVICEINFO_IMPL_1 change. This reverts commits f7d571d2eefea079be3d89f3253ed90cbd9fa07f and 186ab8e77bd7c7a42ffcca6fa7f8e1819ad04b7d. diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 14bdbd0..62e8d98 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -94,8 +94,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1( ContentProvider, - com.sun.star.comp.GIOContentProvider, - com.sun.star.ucb.GIOContentProvider ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + com.sun.star.comp.GIOContentProvider )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + com.sun.star.ucb.GIOContentProvider )) ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index c34cbe7..7552a20 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -84,8 +84,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //= XSERVICEINFO_IMPL_1( ContentProvider, -com.sun.star.comp.GnomeVFSContentProvider, -com.sun.star.ucb.GnomeVFSContentProvider ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( +com.sun.star.comp.GnomeVFSContentProvider )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
[Libreoffice-commits] .: 5 commits - bridges/source cppuhelper/source io/source ios/qa ure/Rdb_ure.mk vcl/ios
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx | 16 ++---
cppuhelper/source/shlib.cxx | 29 ++--
io/source/acceptor/makefile.mk | 15 +++-
io/source/connector/makefile.mk | 11 +
ios/qa/sc/Makefile | 11 -
ure/Rdb_ure.mk |5 ++--
vcl/ios/source/app/salinst.cxx | 17 --
7 files changed, 65 insertions(+), 39 deletions(-)
New commits:
commit 313a47faacd469a94dac456161e1c09ff496cfd9
Author: Tor Lillqvist t...@iki.fi
Date: Fri Mar 30 08:35:29 2012 +0300
iOS simulator fix and some cosmetics
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
index 8b9e130..12e9d97 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
@@ -77,7 +77,7 @@ void cpp2uno_call(
#else
CPPU_CURRENT_NAMESPACE::isSimpleReturnType( pReturnTypeDescr )
#endif
- )
+)
{
pUnoReturn = pReturnValue; // direct way for simple types
}
@@ -365,7 +365,6 @@ extern C void cpp_vtable_call(
}
//==
-
extern C {
extern int nFunIndexes, nVtableOffsets;
#ifdef __arm
@@ -446,7 +445,6 @@ unsigned char * codeSnippet(
return codeSnippets[functionIndex*nVtableOffsets*6*2 + vtableOffset*6*2 +
exec*2 + flag];
#endif
-
}
}
@@ -462,7 +460,11 @@
bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
-return 0;
+#ifdef __arm
+???
+#else
+return (slotCount + 2) * sizeof (Slot);
+#endif
}
bridges::cpp_uno::shared::VtableFactory::Slot *
@@ -487,7 +489,7 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
TYPELIB_DANGER_GET(member, type-ppMembers[i]);
OSL_ASSERT(member != 0);
switch (member-eTypeClass) {
-case typelib_TypeClass_INTERFACE_ATTRIBUTE: {
+case typelib_TypeClass_INTERFACE_ATTRIBUTE:
#ifdef __arm
typelib_InterfaceAttributeTypeDescription *pAttrTD =
reinterpret_casttypelib_InterfaceAttributeTypeDescription *(
member );
@@ -516,10 +518,9 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
#endif
);
}
-}
break;
-case typelib_TypeClass_INTERFACE_METHOD: {
+case typelib_TypeClass_INTERFACE_METHOD:
#ifdef __arm
typelib_InterfaceMethodTypeDescription *pMethodTD =
reinterpret_cast
@@ -534,7 +535,6 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
member)-pReturnTypeRef
#endif
);
-}
break;
default:
commit 2f6ff1df4da6da4c101392dba5d6438904927374
Author: Tor Lillqvist t...@iki.fi
Date: Thu Mar 29 20:51:00 2012 +0300
Link with more libs, include more configuration files
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index f652079..5d3bcf5 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -30,7 +30,7 @@ SRCS = filters-test.m
CFLAGS = $(SOLARINC)
-LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a
-Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
-Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/configmgr.uno.a
-Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo
-lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo
-leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno
-li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo
-lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo
-lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3
-lucpfile1 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3
-lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework
, $(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a
-Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
-Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/configmgr.uno.a
-Wl,$(OUTDIR)/lib/i18npool.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a
$(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3
-lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo
-lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3
-licudata -licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc
-lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo
[Libreoffice-commits] .: 5 commits - android/Bootstrap android/experiments codemaker/source sal/android ucbhelper/source
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
|4 +
android/experiments/DocumentLoader/Makefile
| 13 ---
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
|2
codemaker/source/javamaker/javatype.cxx
|5 +
sal/android/lo-bootstrap.c
| 21 +
ucbhelper/source/client/contentbroker.cxx
| 38 ++
6 files changed, 71 insertions(+), 12 deletions(-)
New commits:
commit 61d1533961d002ff0630a0505686dc37b5c393ca
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 28 16:45:24 2012 +0300
Include unoil.jar
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index 872618f..ddf5146 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -196,21 +196,12 @@ build-ant: copy-stuff
juh \
jurt \
ridl \
+ unoil \
unoloader \
); do \
$(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
done
#
-# com.sun.star.frame.XComponentLoader is not in any jar
-#
- cd libs \
- LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib \
- DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib \
- $(OUTDIR_FOR_BUILD)/bin/javamaker -BUCR -nD \
- $(OUTDIR)/bin/udkapi.rdb $(OUTDIR)/bin/offapi.rdb \
- -Tcom.sun.star.frame.XComponentLoader \
- jar cvf more.jar com
-#
unset JAVA_HOME $(ANT) debug
install: build-ant
commit de290c0ffc7a4969fb1cdc33696d241f47804592
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 28 16:44:53 2012 +0300
Leave out reference to the the user registrymodifications.xcu for now
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index 7aa3264..872618f 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -156,7 +156,7 @@ copy-stuff:
echo LO_LIB_DIR=file:$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc
echo URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc # checkme - is this used to find configs ?
echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry
user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu'
assets/program/fundamentalrc
+ echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'
assets/program/fundamentalrc
echo 'URE_MORE_TYPES=file:///assets/bin/ure/types.rdb
file:///assets/bin/types.rdb' assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/xml/services.rdb $$BRAND_BASE_DIR/program/services*'
assets/program/fundamentalrc
commit 6db50818c1f6685adc4551c6927c9420f0872775
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 28 16:42:34 2012 +0300
Add JNI wrapper for InitUCBHelper() and call it
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index e5f2f1e..c60c9e9 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -93,6 +93,10 @@ public class Bootstrap extends NativeActivity
// where the lo-bootstrap library is.
public static native void setCommandArgs(String[] argv);
+// A wrapper for InitUCBHelper() in he ucbhelper library
+// (contentbroker.cxx), also this called indirectly through the
lo-bootstrap library
+public static native void initUCBHelper();
+
public static void setup(Activity activity)
{
String dataDir = null;
diff --git
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 882c73c..93ed87e 100644
---
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -91,6 +91,8 @@ public class DocumentLoader
Log.i(TAG, oDesktop is + (oDesktop!=null ? not : ) +
null
[Libreoffice-commits] .: sc/CppunitTest_sc_subsequent_filters_test.mk
sc/CppunitTest_sc_subsequent_filters_test.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 31d0dcfa76cc89afb214304dae556226f490421f Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Mar 27 09:42:41 2012 +0300 qahelper.hxx's loadFile() needs liblo-bootstrap on Android diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 7cf779f..bc79f90 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -63,6 +63,9 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_subsequent_filters_test, \ utl \ vcl \ xo \ + $(if $(filter $(OS),ANDROID), \ + lo-bootstrap \ + ) \ $(gb_STDLIBS) \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/util
officecfg/util/schema_val.xsl |1 - 1 file changed, 1 deletion(-) New commits: commit b0ba1438439873b1da3a9d580e9828ebae11bad4 Author: Tor Lillqvist t...@iki.fi Date: Tue Mar 27 12:51:47 2012 +0300 Bin annoying CHECKING CONSISTENCY message diff --git a/officecfg/util/schema_val.xsl b/officecfg/util/schema_val.xsl index f8147d8..04342e7 100755 --- a/officecfg/util/schema_val.xsl +++ b/officecfg/util/schema_val.xsl @@ -41,7 +41,6 @@ xsl:param name=componentName/ xsl:template match = / - xsl:message terminate=noCHECKING CONSISTENCY .../xsl:message xsl:apply-templates/ /xsl:template ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/CppunitTest_sal_rtl_strings.mk
sal/CppunitTest_sal_rtl_strings.mk |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 0a08973de9e3431edb90633fcefdbaa1af7837fd Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 26 19:10:36 2012 +0300 No separate sal_textenc library built for Android (As a low-hanging fruit to drop the shared library count by one... Each library less counts.) diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index 0a00e8b..fc384d6 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -42,9 +42,11 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_strings,\ $(gb_STDLIBS) \ )) -# the test uses O(U)String capabilities that dlopen this lib +# The test uses O(U)String capabilities that dlopen this lib +ifneq ($(OS),ANDROID) +# Except that on Android we don't build it separately $(call gb_CppunitTest_get_target,sal_rtl_strings) : \ $(call gb_Library_get_target,sal_textenc) - +endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - android/Bootstrap android/experiments configure.in sal/android sal/osl vcl/source
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
| 20 -
android/experiments/DocumentLoader/AndroidManifest.xml
|2
android/experiments/DocumentLoader/Makefile
| 180 +++---
android/experiments/DocumentLoader/jni/Android.mk
|8
android/experiments/DocumentLoader/jni/Application.mk
|3
android/experiments/DocumentLoader/local.properties.in
|2
android/experiments/DocumentLoader/project.properties
|3
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 45 +-
configure.in
|7
sal/android/lo-bootstrap.c
| 130 +--
sal/osl/unx/process_impl.cxx
|3
vcl/source/app/svmain.cxx
| 22 +
12 files changed, 331 insertions(+), 94 deletions(-)
New commits:
commit 3e425dfa4b9c2a0198a13b2fb18364a32603080f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Mar 22 22:49:16 2012 +0200
More Android hacking
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index 5612fbf..0c31954 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -3,6 +3,19 @@ include ../../../config_host.mk
# The package of this app
APP_PACKAGE=org.libreoffice.android.examples
+# We can't keep assuming APP_DATA_PATH like this, surely this can vary with
+# Android versions and whatnot, this is temporary and works at least with the
+# SDK 16 emulator...
+
+# Probably would be best to just stop fooling around with the possibilities to
+# set various stuff with the -env command line parameters (and environment
+# variables?) and in a plethora of rc files, and hardcode construction of
+# *all* required pathnames based on the app installation location for Android
+# (and iOS), etc. We don't really win anything by having so many layers of
+# configurability on platforms like Android and iOS where apps based on LO
+# code are very much self-contained pre-packaged thingies.
+APP_DATA_PATH=/data/data/$(APP_PACKAGE)
+
SODEST=libs/armeabi-v7a
OBJLOCAL=obj/local/armeabi-v7a
@@ -31,32 +44,65 @@ copy-stuff:
# them.
#
for F in $(strip \
+ analysislo \
+ basebmplo \
+ basegfxlo \
+ bootstrap.uno \
comphelpgcc3 \
+ datelo \
+ expwrap.uno \
+ fastsax.uno \
+ fileacc \
+ fontconfig \
+ forlo \
+ foruilo \
+ freetype \
+ frmlo \
gcc3_uno \
i18nisolang1gcc3 \
+ i18npaperlo \
+ i18npool.uno \
i18nutilgcc3 \
icudatalo \
icui18nlo \
+ iculelo \
icuuclo \
+ introspection.uno \
java_uno \
juh \
juhx \
jvmaccessgcc3 \
+ jvmfwk \
lo-bootstrap \
localedata_en \
localedata_others \
mergedlo \
+ msfilterlo \
+ ooxlo \
+ reflection.uno \
reg \
+ saxlo \
+ sclo \
+ scfiltlo \
+ sotlo \
+ stocservices.uno \
store \
+ svllo \
+ textinstream.uno \
+ tllo \
ucbhelper4gcc3 \
uno_cppu \
+ uno_cppuhelpergcc3 \
uno_sal \
uno_salhelpergcc3 \
uno_cppuhelpergcc3 \
+ unoxmllo \
+ utllo \
+ vbahelperlo \
+ vcllo \
xml2 \
xmlreader \
- bootstrap.uno \
- i18npool.uno \
+ xstor \
); do \
$(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
done
@@ -66,14 +112,58 @@ copy-stuff:
#
# Then other assets. Let the directory structure under assets mimic
# that under solver for now.
- mkdir -p assets/bin assets/lib assets/xml/ure
assets/ComponentTarget/i18npool/util
+ mkdir -p assets/bin/ure assets/lib assets/program
[Libreoffice-commits] .: 2 commits - solenv/bin
solenv/bin/build.pl |9 +
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 4c40593e3e936e6a966410ab807df4b775fc2464
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 21 12:40:42 2012 +0200
$retry_counter and the RETRY label are now unused
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index f59d675..e5e009f 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1814,7 +1814,6 @@ sub run_job {
my ($job, $path, $registered_name) = @_;
my $job_to_do = $job;
my $error_code = 0;
-my $retry_counter = 10;
print $registered_name\n;
return 0 if ( $show );
@@ -1838,7 +1837,7 @@ sub run_job {
system($perl $mkout);
};
}
-RETRY:
+
open (MAKE, $job_to_do 21 |) or return 8;
open (LOGFILE, $log_file) or return 8;
while (MAKE) { print LOGFILE $_; print $_ }
commit 5e553b1ee5d8266b14c1f553d310dd634ae3fb84
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 21 12:27:08 2012 +0200
GUI=WIN used to mean 16-bit Windows, I think, so kill that crack
Also the running of grep inside the test for GUI = WIN was a bit weird,
what was it supposed to grep? Standard input?
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 1b8ed64..f59d675 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1076,7 +1076,6 @@ sub pick_prj_to_build {
sub check_platform {
my $platform = shift;
return 1 if ($platform eq 'all');
-return 1 if (($ENV{GUI} eq 'WIN') ($platform eq 'w'));
return 1 if (($ENV{GUI} eq 'UNX') ($platform eq 'u'));
return 1 if (($ENV{GUI} eq 'WNT')
(($platform eq 'w') || ($platform eq 'n')));
@@ -1848,11 +1847,6 @@ RETRY:
close LOGFILE;
if ( $error_code != 0)
{
-if ($ENV{GUI} eq 'WIN' $retry_counter 0)
-{
-$retry_counter -= 1;
-system('grep Error 126\$') goto RETRY;
-}
system(echo \log for $path\ $build_error_log);
system(cat $log_file $build_error_log);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - animations/prj chart2/prj clucene/prj configmgr/qa connectivity/inc connectivity/qa connectivity/source connectivity/util connectivity/workben cppuhelper/test cppu
fpicker/test/makefile.mk| 23 --- solenv/inc/extension_pre.mk |2 +- xmlscript/test/makefile.mk | 20 3 files changed, 1 insertion(+), 44 deletions(-) New commits: commit 2a1171929e221ec689d2b8b6ac473d91b53b6286 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Mar 21 12:56:16 2012 +0200 chmod -x diff --git a/animations/prj/makefile.mk b/animations/prj/makefile.mk old mode 100755 new mode 100644 diff --git a/chart2/prj/makefile.mk b/chart2/prj/makefile.mk old mode 100755 new mode 100644 diff --git a/clucene/prj/makefile.mk b/clucene/prj/makefile.mk old mode 100755 new mode 100644 diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/inc/makefile.mk b/connectivity/inc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/parse/makefile.mk b/connectivity/source/parse/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/resource/makefile.mk b/connectivity/source/resource/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/simpledbt/makefile.mk b/connectivity/source/simpledbt/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/workben/little/makefile.mk b/connectivity/workben/little/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk old mode 100755 new mode 100644 diff --git a/cppuhelper/test/testlib/makefile.mk b/cppuhelper/test/testlib/makefile.mk
[Libreoffice-commits] .: sw/source
sw/source/core/text/xmldump.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 8da05bd82457ad4bd90a61f806e4f0632a9c0273
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Mar 20 09:33:55 2012 +0200
WaE: '%u' expects 'unsigned int', but argument is 'sal_uInt32'
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index e443f6d..18b92e7 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -346,15 +346,15 @@ void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer )
void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( ptr ), %p, this );
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( id ), %u,
GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( id ),
%SAL_PRIuUINT32, GetFrmId() );
if ( GetNext( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( next ), %u,
GetNext()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( next ),
%SAL_PRIuUINT32, GetNext()-GetFrmId() );
if ( GetPrev( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( prev ), %u,
GetPrev()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( prev ),
%SAL_PRIuUINT32, GetPrev()-GetFrmId() );
if ( GetUpper( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( upper ), %u,
GetUpper()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( upper ),
%SAL_PRIuUINT32, GetUpper()-GetFrmId() );
if ( GetLower( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( lower ), %u,
GetLower()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( lower ),
%SAL_PRIuUINT32, GetLower()-GetFrmId() );
if ( IsTxtFrm( ) )
{
SwTxtFrm *pTxtFrm = ( SwTxtFrm * ) this;
@@ -390,30 +390,30 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr
writer )
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ), %u,
GetFollow()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ),
%SAL_PRIuUINT32, GetFollow()-GetFrmId() );
if (m_pPrecede != NULL)
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%u, static_castSwTxtFrm*(m_pPrecede)-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%SAL_PRIuUINT32, static_castSwTxtFrm*(m_pPrecede)-GetFrmId() );
}
void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ), %u,
GetFollow()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ),
%SAL_PRIuUINT32, GetFollow()-GetFrmId() );
if (m_pPrecede != NULL)
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%u, static_castSwSectionFrm*( m_pPrecede )-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%SAL_PRIuUINT32, static_castSwSectionFrm*( m_pPrecede )-GetFrmId() );
}
void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ), %u,
GetFollow()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ),
%SAL_PRIuUINT32, GetFollow()-GetFrmId() );
if (m_pPrecede != NULL)
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%u, static_castSwTabFrm*( m_pPrecede )-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%SAL_PRIuUINT32, static_castSwTabFrm*( m_pPrecede )-GetFrmId() );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
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 - canvas/source
canvas/source/cairo/cairo_canvashelper.cxx |8
canvas/source/vcl/canvashelper.cxx | 28 +++-
2 files changed, 15 insertions(+), 21 deletions(-)
New commits:
commit bed182f5f3059e30c3e53a163a031de1f0c2bc46
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Mar 6 23:07:00 2012 +0100
Another partial fix for fdo#45219
Make sure transparent polygons really only cover the polygonal area,
not the whole bounding box for sprites.
(cherry picked from commit 50309b9574c43de93a05576904813881eb7bc898)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index 055edff..c5c5943 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -500,27 +500,21 @@ namespace vclcanvas
if( mp2ndOutDev )
{
-if( !nTransparency || bSourceAlpha )
+// HACK. Normally, CanvasHelper does not care
+// about actually what mp2ndOutDev is...
+// well, here we do assume a 1bpp target.
+if( nTransparency 127 )
{
-// HACK. Normally, CanvasHelper does not care
-// about actually what mp2ndOutDev is...
-if( bSourceAlpha nTransparency == 255 )
-{
-mp2ndOutDev-getOutDev().SetDrawMode(
DRAWMODE_WHITELINE | DRAWMODE_WHITEFILL | DRAWMODE_WHITETEXT |
-
DRAWMODE_WHITEGRADIENT | DRAWMODE_WHITEBITMAP );
-mp2ndOutDev-getOutDev().SetFillColor( COL_WHITE );
-mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
-mp2ndOutDev-getOutDev().SetDrawMode(
DRAWMODE_BLACKLINE | DRAWMODE_BLACKFILL | DRAWMODE_BLACKTEXT |
-
DRAWMODE_BLACKGRADIENT | DRAWMODE_BLACKBITMAP );
-}
-else
-{
-mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
-}
+mp2ndOutDev-getOutDev().SetDrawMode( DRAWMODE_WHITELINE |
DRAWMODE_WHITEFILL | DRAWMODE_WHITETEXT |
+
DRAWMODE_WHITEGRADIENT | DRAWMODE_WHITEBITMAP );
+mp2ndOutDev-getOutDev().SetFillColor( COL_WHITE );
+mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
+mp2ndOutDev-getOutDev().SetDrawMode( DRAWMODE_BLACKLINE |
DRAWMODE_BLACKFILL | DRAWMODE_BLACKTEXT |
+
DRAWMODE_BLACKGRADIENT | DRAWMODE_BLACKBITMAP );
}
else
{
-mp2ndOutDev-getOutDev().DrawTransparent( aPolyPoly,
(sal_uInt16)nTransPercent );
+mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
}
}
}
commit a1a4b8cdd14843457e520fa9494892e9704557d4
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Mar 6 20:36:06 2012 +0100
Consistent use of alpha in cairocanvas
Use GetIndex() instead of GetBlue() (does the same, but more
self-documenting); use opaque when no alpha channel consistently.
(cherry picked from commit 83114b27fac8ef723cbbaa734237210d9ad56a15)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index 6accc39..c5876a7 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -368,7 +368,7 @@ namespace cairocanvas
case BMP_FORMAT_8BIT_PAL:
pReadScan = pAlphaReadAcc-GetScanline( nY );
for( nX = 0; nX nWidth; nX++ ) {
-nAlpha = data[ nOff ] = 255 - ( pAlphaReadAcc-GetPaletteColor(
*pReadScan++ ).GetBlue() );
+nAlpha = data[ nOff ] = 255 - ( pAlphaReadAcc-GetPaletteColor(
*pReadScan++ ).GetIndex() );
if( nAlpha != 255 )
bIsAlpha = true;
nOff += 4;
@@ -377,7 +377,7 @@ namespace cairocanvas
default:
OSL_TRACE( fallback to GetColor for alpha - slow, format: %d,
pAlphaReadAcc-GetScanlineFormat() );
for( nX = 0; nX nWidth; nX++ ) {
-nAlpha = data[ nOff ] = 255 - pAlphaReadAcc-GetColor( nY, nX
).GetBlue();
+nAlpha = data[ nOff ] = 255 - pAlphaReadAcc-GetColor( nY, nX
).GetIndex();
if( nAlpha != 255 )
bIsAlpha = true;
nOff += 4;
@@ -541,7 +541,7 @@ namespace cairocanvas
if( pAlphaReadAcc )
nAlpha = data[ nOff++ ];
else
-nAlpha = data[ nOff++ ] = pReadScan[ 3
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - canvas/source
canvas/source/vcl/canvashelper.cxx | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 0ad246127fe8f9d788793ceb8dc327e25ef4a699
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Mar 7 00:31:56 2012 +0100
Return proper transparency value even for ignore_color.
Rather unexpectedly, calling setupOutDevState() with IGNORE_COLOR
does not return a proper transparency, but null. Fixed now.
(cherry picked from commit 4b475f31eb9b290b477bb6992ff28e52248cee5d)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index c5c5943..5d4c40a 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -1269,21 +1269,21 @@ namespace vclcanvas
p2ndOutDev-SetClipRegion( aClipRegion );
}
-if( eColorType != IGNORE_COLOR )
-{
-Color aColor( COL_WHITE );
+Color aColor( COL_WHITE );
-if( renderState.DeviceColor.getLength() 2 )
-{
-aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(
-renderState.DeviceColor );
-}
+if( renderState.DeviceColor.getLength() 2 )
+{
+aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(
+renderState.DeviceColor );
+}
-// extract alpha, and make color opaque
-// afterwards. Otherwise, OutputDevice won't draw anything
-nTransparency = aColor.GetTransparency();
-aColor.SetTransparency(0);
+// extract alpha, and make color opaque
+// afterwards. Otherwise, OutputDevice won't draw anything
+nTransparency = aColor.GetTransparency();
+aColor.SetTransparency(0);
+if( eColorType != IGNORE_COLOR )
+{
switch( eColorType )
{
case LINE_COLOR:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - canvas/source
canvas/source/vcl/canvashelper.cxx | 45 +++--
canvas/source/vcl/canvashelper_texturefill.cxx | 38 +++--
2 files changed, 42 insertions(+), 41 deletions(-)
New commits:
commit e5cf9610961b0f6978e15b2a81b0f9aa769e0298
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Mar 7 00:34:52 2012 +0100
Use transparency for gradients fdo#45219
vclcanvas has 1bpp alpha - so cut-off transparency at 98%
This looks for all practical cases close enough to full alpha.
(cherry picked from commit 3f5efa1e76e187070d412d102e4c057679065bcc)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index 5d4c40a..3649ccf 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -155,8 +155,9 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
rOutDev.EnableMapMode( sal_False );
-rOutDev.SetLineColor( COL_TRANSPARENT );
-rOutDev.SetFillColor( COL_TRANSPARENT );
+rOutDev.SetLineColor( COL_WHITE );
+rOutDev.SetFillColor( COL_WHITE );
+rOutDev.SetClipRegion();
rOutDev.DrawRect( Rectangle( Point(),
rOutDev.GetOutputSizePixel()) );
@@ -166,8 +167,9 @@ namespace vclcanvas
rOutDev2.SetDrawMode( DRAWMODE_DEFAULT );
rOutDev2.EnableMapMode( sal_False );
-rOutDev2.SetLineColor( COL_TRANSPARENT );
-rOutDev2.SetFillColor( COL_TRANSPARENT );
+rOutDev2.SetLineColor( COL_WHITE );
+rOutDev2.SetFillColor( COL_WHITE );
+rOutDev2.SetClipRegion();
rOutDev2.DrawRect( Rectangle( Point(),
rOutDev2.GetOutputSizePixel()) );
rOutDev2.SetDrawMode( DRAWMODE_BLACKLINE | DRAWMODE_BLACKFILL
| DRAWMODE_BLACKTEXT |
@@ -500,19 +502,11 @@ namespace vclcanvas
if( mp2ndOutDev )
{
-// HACK. Normally, CanvasHelper does not care
-// about actually what mp2ndOutDev is...
-// well, here we do assume a 1bpp target.
-if( nTransparency 127 )
-{
-mp2ndOutDev-getOutDev().SetDrawMode( DRAWMODE_WHITELINE |
DRAWMODE_WHITEFILL | DRAWMODE_WHITETEXT |
-
DRAWMODE_WHITEGRADIENT | DRAWMODE_WHITEBITMAP );
-mp2ndOutDev-getOutDev().SetFillColor( COL_WHITE );
-mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
-mp2ndOutDev-getOutDev().SetDrawMode( DRAWMODE_BLACKLINE |
DRAWMODE_BLACKFILL | DRAWMODE_BLACKTEXT |
-
DRAWMODE_BLACKGRADIENT | DRAWMODE_BLACKBITMAP );
-}
-else
+// HACK. Normally, CanvasHelper does not care about
+// actually what mp2ndOutDev is... well, here we do
+// assume a 1bpp target - everything beyond 97%
+// transparency is fully transparent
+if( nTransparency 253 )
{
mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
}
@@ -715,8 +709,25 @@ namespace vclcanvas
aBmpEx );
if( mp2ndOutDev )
+{
+// HACK. Normally, CanvasHelper does not care about
+// actually what mp2ndOutDev is... well, here we do
+// assume a 1bpp target - everything beyond 97%
+// transparency is fully transparent
+if( aBmpEx.IsAlpha() )
+{
+Bitmap aMask( aBmpEx.GetAlpha().GetBitmap() );
+aMask.MakeMono( 253 );
+aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMask );
+}
+else if( aBmpEx.IsTransparent() )
+{
+aBmpEx = BitmapEx( aBmpEx.GetBitmap(),
aBmpEx.GetMask() );
+}
+
mp2ndOutDev-getOutDev().DrawBitmapEx(
::vcl::unotools::pointFromB2DPoint( aOutputPos ),
aBmpEx );
+}
// Returning a cache object is not useful, the XBitmap
// itself serves this purpose
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 325d2b6..3811ebd 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -555,8 +555,6 @@ namespace vclcanvas
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - slideshow/source
slideshow/source/engine/slide/layer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 047f6738d045ef94112ed45ed2eabb73e5e07111 Author: Thorsten Behrens tbehr...@suse.com Date: Fri Mar 16 00:11:53 2012 +0100 Clear full sprite area for fdo#45219 Use clearAll() here, to really clear the whole sprite area (clear() does respect potential clip polygons) (cherry picked from commit e86bcf11340f35afe899d02aa5facdbecdd309ab) Signed-off-by: Tor Lillqvist tlillqv...@suse.com diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index c9e064b..05260c9 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -222,7 +222,7 @@ namespace slideshow std::for_each( maViewEntries.begin(), maViewEntries.end(), boost::bind( - ViewLayer::clear, + ViewLayer::clearAll, boost::bind( ViewEntry::getViewLayer, _1))); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - slideshow/source
slideshow/source/engine/slideview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6f7a003ef738e3b11ff8d577c2b350b50d416235
Author: Thorsten Behrens tbehr...@suse.com
Date: Fri Mar 16 10:02:18 2012 +0100
Clear sprites to white fdo#45219.
Another fix for a rendering glitch mentioned in fdo#45219 -
vclcanvas sadly does not properly implement compositing, so all-
black background yields dark shadows on semi-transparent objects.
Ultimately though, we should retire vclcanvas instead.
(cherry picked from commit b9266113514657be1cf9352e1457a5c62876784c)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/slideshow/source/engine/slideview.cxx
b/slideshow/source/engine/slideview.cxx
index 001f533..0d55528 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -206,7 +206,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const pCanvas,
if( pPolyPoly )
{
pPolyPoly-setCompositeOp( cppcanvas::CanvasGraphic::SOURCE );
-pPolyPoly-setRGBAFillColor( 0xU );
+pPolyPoly-setRGBAFillColor( 0xFF00U );
pPolyPoly-draw();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - slideshow/source
slideshow/source/engine/slideview.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit e3f835eee16ac7d9dfa76eed8c043e7874995058
Author: Thorsten Behrens tbehr...@suse.com
Date: Fri Mar 16 10:06:08 2012 +0100
Clear whole layer in slideshow sprites fdo#45219
The clear() previously offsetted the topleft rect corner for sprites
by _the sprite topleft_ position, which is rather unhelpful but for
sprites located at (0,0).
(cherry picked from commit d32cf8d820be839c7303e3c5962c17f64cac2812)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/slideshow/source/engine/slideview.cxx
b/slideshow/source/engine/slideview.cxx
index 0d55528..2309c4c 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -557,20 +557,27 @@ private:
virtual void clear() const
{
-// keep layer clip
-clearRect(getCanvas()-clone(),
- maLayerBoundsPixel);
+// grab canvas - that also lazy-initializes maLayerBoundsPixel
+cppcanvas::CanvasSharedPtr pCanvas=getCanvas()-clone();
+
+// clear whole canvas
+const basegfx::B2I64Tuple rSpriteSize(maLayerBoundsPixel.getRange());
+clearRect(pCanvas,
+
basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY()));
}
virtual void clearAll() const
{
+// grab canvas - that also lazy-initializes maLayerBoundsPixel
::cppcanvas::CanvasSharedPtr pCanvas( getCanvas()-clone() );
// clear layer clip, to clear whole area
pCanvas-setClip();
+// clear whole canvas
+const basegfx::B2I64Tuple rSpriteSize(maLayerBoundsPixel.getRange());
clearRect(pCanvas,
- maLayerBoundsPixel);
+
basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY()));
}
virtual bool isOnView(boost::shared_ptrView const rView) const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - canvas/source
canvas/source/vcl/canvashelper_texturefill.cxx | 52 -
1 file changed, 52 deletions(-)
New commits:
commit a95769b378b9d4d77d4409cd72dcdccf32e32744
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Mar 6 23:09:58 2012 +0100
Remove nasty xor hack for non-Mac vclcanvas
This nowadays really is a pessimization.
(cherry picked from commit 315d82d741c37d1b77f5687b1bdc48a37fb9f29f)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 3811ebd..1021d33 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -615,7 +615,6 @@ namespace vclcanvas
}
}
else
-#if defined(QUARTZ) // TODO: other ports should avoid the XOR-trick too
(implementation vs. interface!)
{
const Region aPolyClipRegion( rPoly );
@@ -641,57 +640,6 @@ namespace vclcanvas
p2ndOutDev-DrawPolyPolygon( rPoly );
}
}
-#else // TODO: remove once doing the XOR-trick in the canvas-layer becomes
redundant
-{
-// output gradient the hard way: XORing out the polygon
-rOutDev.Push( PUSH_RASTEROP );
-rOutDev.SetRasterOp( ROP_XOR );
-doGradientFill( rOutDev,
-rValues,
-rColors,
-aTotalTransform,
-aPolygonDeviceRectOrig,
-nStepCount,
-true );
-rOutDev.SetFillColor( COL_BLACK );
-rOutDev.SetRasterOp( ROP_0 );
-rOutDev.DrawPolyPolygon( rPoly );
-rOutDev.SetRasterOp( ROP_XOR );
-doGradientFill( rOutDev,
-rValues,
-rColors,
-aTotalTransform,
-aPolygonDeviceRectOrig,
-nStepCount,
-true );
-rOutDev.Pop();
-
-if( p2ndOutDev )
-{
-p2ndOutDev-Push( PUSH_RASTEROP );
-p2ndOutDev-SetRasterOp( ROP_XOR );
-doGradientFill( *p2ndOutDev,
-rValues,
-rColors,
-aTotalTransform,
-aPolygonDeviceRectOrig,
-nStepCount,
-true );
-p2ndOutDev-SetFillColor( COL_BLACK );
-p2ndOutDev-SetRasterOp( ROP_0 );
-p2ndOutDev-DrawPolyPolygon( rPoly );
-p2ndOutDev-SetRasterOp( ROP_XOR );
-doGradientFill( *p2ndOutDev,
-rValues,
-rColors,
-aTotalTransform,
-aPolygonDeviceRectOrig,
-nStepCount,
-true );
-p2ndOutDev-Pop();
-}
-}
-#endif // complex-clipping vs. XOR-trick
#if OSL_DEBUG_LEVEL 3
// extra-verbosity
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/inc
svx/inc/svx/sdrpaintwindow.hxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4d3eaff534a7c97dc4d296f6b3cea4578db24182 Author: Luboš Luňák l.lu...@suse.cz Date: Sat Mar 17 08:39:26 2012 +0100 workaround broken msvc template instantiation (cherry picked from commit 9865a0d430da8948210a2cd9d4bae08e6023f4c8) Signed-off-by: Tor Lillqvist tlillqv...@suse.com diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx index 9ecfbed..c6faaa2 100644 --- a/svx/inc/svx/sdrpaintwindow.hxx +++ b/svx/inc/svx/sdrpaintwindow.hxx @@ -45,6 +45,9 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr +#ifdef _MSC_VER // broken msvc template instantiation +#include svx/sdr/overlay/overlaymanager.hxx +#endif class SdrPreRenderDevice ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source
sfx2/source/dialog/alienwarn.cxx | 41 +++
1 file changed, 12 insertions(+), 29 deletions(-)
New commits:
commit 0449662bb3f493730ea977a1864afbc82ee16d12
Author: Andras Timar ati...@suse.com
Date: Fri Mar 9 22:34:08 2012 +0100
fix semantic error in layout calculation
(cherry picked from commit cc32ce47cef1a72a820a9475a9a2753490a019f2)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 8ed0b71..1dfecd0 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -96,49 +96,32 @@ SfxAlienWarningDialog::~SfxAlienWarningDialog()
void SfxAlienWarningDialog::InitSize()
{
-// if the button text is too wide, then broaden the button
-long nTxtW = m_aMoreInfoBtn.GetCtrlTextWidth( m_aMoreInfoBtn.GetText() );
-long nCtrlW = m_aMoreInfoBtn.GetSizePixel().Width();
-if ( nTxtW = nCtrlW )
-{
-long nDelta = nTxtW - nCtrlW;
-nDelta += IMPL_EXTRA_BUTTON_WIDTH;
-Point aNextPoint = m_aKeepCurrentBtn.GetPosPixel();
-aNextPoint.X() += m_aKeepCurrentBtn.GetSizePixel().Width();
-Point aNewPoint = m_aMoreInfoBtn.GetPosPixel();
-aNewPoint.X() -= nDelta;
-if ( aNextPoint.X() = aNewPoint.X() )
-{
-long nSpace = aNextPoint.X() - aNewPoint.X();
-nSpace += 2;
-nDelta -= nSpace;
-aNewPoint.X() += nSpace;
-}
-Size aNewSize = m_aMoreInfoBtn.GetSizePixel();
-aNewSize.Width() += nDelta;
-m_aMoreInfoBtn.SetPosSizePixel( aNewPoint, aNewSize );
-}
+const long nExtraButtonWidth = LogicToPixel(
Size(IMPL_EXTRA_BUTTON_WIDTH,1), MapMode(MAP_APPFONT) ).getWidth();
+const long nAwCol2 = LogicToPixel( Size(AW_COL_2,1), MapMode(MAP_APPFONT)
).getWidth();
+long nTxtW, nCtrlW;
-// recalculate the size and position of the buttons
+// layout calculations should be re-done, when More Info button is enabled
m_aMoreInfoBtn.Hide();
+
+// recalculate the size and position of the buttons
nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() );
-nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
+nTxtW += nExtraButtonWidth;
Size aNewSize = m_aKeepCurrentBtn.GetSizePixel();
aNewSize.Width() = nTxtW;
m_aKeepCurrentBtn.SetSizePixel( aNewSize );
Point aPos = m_aSaveODFBtn.GetPosPixel();
-aPos.X() = AW_COL_3 + nTxtW;
+aPos.X() = nAwCol2 + nTxtW + nExtraButtonWidth;
m_aSaveODFBtn.SetPosPixel( aPos );
nTxtW = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() );
-nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
+nTxtW += nExtraButtonWidth;
aNewSize = m_aSaveODFBtn.GetSizePixel();
aNewSize.Width() = nTxtW;
m_aSaveODFBtn.SetSizePixel( aNewSize );
-long nBtnsWidthSize = m_aKeepCurrentBtn.GetSizePixel().Width() +
m_aSaveODFBtn.GetSizePixel().Width() + AW_COL_3 + IMPL_EXTRA_BUTTON_WIDTH;
+long nBtnsWidthSize = m_aKeepCurrentBtn.GetSizePixel().Width() +
m_aSaveODFBtn.GetSizePixel().Width() + nAwCol2 + 2*nExtraButtonWidth;
// resize + text of checkbox too wide - add new line
aNewSize = m_aWarningOnBox.GetSizePixel();
-aNewSize.Width() = nBtnsWidthSize - 4*IMPL_EXTRA_BUTTON_WIDTH;
+aNewSize.Width() = nBtnsWidthSize - 2*nExtraButtonWidth;
m_aWarningOnBox.SetSizePixel( aNewSize );
nTxtW = m_aWarningOnBox.GetCtrlTextWidth( m_aWarningOnBox.GetText() );
nCtrlW = m_aWarningOnBox.GetSizePixel().Width();
@@ -154,7 +137,7 @@ void SfxAlienWarningDialog::InitSize()
// resize + align the size of the information text control (FixedText) to
its content
aNewSize = m_aInfoText.GetSizePixel();
-aNewSize.Width() = nBtnsWidthSize - 4*IMPL_EXTRA_BUTTON_WIDTH;
+aNewSize.Width() = nBtnsWidthSize - 2*nExtraButtonWidth;
m_aInfoText.SetSizePixel( aNewSize );
Size aMinSize = m_aInfoText.CalcMinimumSize(
m_aInfoText.GetSizePixel().Width() );
long nTxtH = aMinSize.Height();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/app/transobj.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 39228c6d2419636be04ee4a320a7c0ca08276f37
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 18 18:34:51 2012 +0100
also shrink used area for HTML in some cases, fdo#46230, n#677811
Hopefully this will allow pasting to external applications with whole
column/row selected while not affecting calc itself.
(cherry picked from commit 0ee518863337fba9bce019e05e24f527617a4321)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index a61e5d3..ae73542 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -313,7 +313,20 @@ sal_Bool ScTransferObj::GetData( const
datatransfer::DataFlavor rFlavor )
sal_Bool bIncludeFiltered = pDoc-IsCutMode() || bUsedForLink;
-ScImportExport aObj( pDoc, aBlock );
+ScRange aReducedBlock = aBlock;
+if ( nFormat == SOT_FORMATSTR_ID_HTML (aBlock.aEnd.Col() ==
MAXCOL || aBlock.aEnd.Row() == MAXROW) aBlock.aStart.Tab() ==
aBlock.aEnd.Tab() )
+{
+bool bShrunk = false;
+//shrink the area to allow pasting to external applications
+SCCOL aStartCol = aReducedBlock.aStart.Col();
+SCROW aStartRow = aReducedBlock.aStart.Row();
+SCCOL aEndCol = aReducedBlock.aEnd.Col();
+SCROW aEndRow = aReducedBlock.aEnd.Row();
+pDoc-ShrinkToUsedDataArea( bShrunk,
aReducedBlock.aStart.Tab(), aStartCol, aStartRow, aEndCol, aEndRow, false);
+aReducedBlock = ScRange(aStartCol, aStartRow,
aReducedBlock.aStart.Tab(), aEndCol, aEndRow, aReducedBlock.aEnd.Tab());
+}
+
+ScImportExport aObj( pDoc, aReducedBlock );
ScExportTextOptions aTextOptions(ScExportTextOptions::None, 0,
true);
if ( bUsedForLink )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/filter/xml/xmldrani.cxx | 10 +++---
sc/source/filter/xml/xmldrani.hxx |2 ++
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit a0d2fd2096e267a29c5b8a07b0349e699e13ded5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 18 17:44:00 2012 +0100
add all imported properties to ScDBData, fdo#40426
(cherry picked from commit ed88b144ce24b9a733d4a9ab6614307c96537baa)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sc/source/filter/xml/xmldrani.cxx
b/sc/source/filter/xml/xmldrani.cxx
index 653af63..a0ca754 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -148,6 +148,8 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext(
ScXMLImport rImport,
bSubTotalsEnabledUserList(false),
bSubTotalsAscending(true),
bFilterConditionSourceRange(false),
+bHasHeader(true),
+bByRow(false),
meRangeType(ScDBCollection::GlobalNamed)
{
nSourceType = sheet::DataImportMode_NONE;
@@ -190,12 +192,14 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext(
ScXMLImport rImport,
break;
case XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION :
{
-mpQueryParam-bByRow = !IsXMLToken(sValue, XML_COLUMN);
+bByRow = !IsXMLToken(sValue, XML_COLUMN);
+mpQueryParam-bByRow = bByRow;
}
break;
case XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER :
{
-mpQueryParam-bHasHeader = IsXMLToken(sValue, XML_TRUE);
+bHasHeader = IsXMLToken(sValue, XML_TRUE);
+mpQueryParam-bHasHeader = bHasHeader;
}
break;
case XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS :
@@ -303,7 +307,7 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const
OUString rName)
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptrScDBData pData(
-new ScDBData(rName, maRange.aStart.Tab(), maRange.aStart.Col(),
maRange.aStart.Row(), maRange.aEnd.Col(), maRange.aEnd.Row()));
+new ScDBData(rName, maRange.aStart.Tab(), maRange.aStart.Col(),
maRange.aStart.Row(), maRange.aEnd.Col(), maRange.aEnd.Row(), bByRow,
bHasHeader));
SAL_WNODEPRECATED_DECLARATIONS_POP
pData-SetAutoFilter(bAutoFilter);
diff --git a/sc/source/filter/xml/xmldrani.hxx
b/sc/source/filter/xml/xmldrani.hxx
index 9fe1408..ff659f8 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -106,6 +106,8 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
boolbSubTotalsEnabledUserList;
boolbSubTotalsAscending;
boolbFilterConditionSourceRange;
+boolbHasHeader;
+boolbByRow;
ScDBCollection::RangeType meRangeType;
const ScXMLImport GetScImport() const { return (const
ScXMLImport)GetImport(); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/libcdr-0.0.5.patch
libcdr/libcdr-0.0.5.patch | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 85f074554788e2d8da73e77855ca06bc0fdfbaa4 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 19 09:40:19 2012 +0200 lcms2 uses stdcall for some reason diff --git a/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch index b622bd6..279c365 100644 --- a/libcdr/libcdr-0.0.5.patch +++ b/libcdr/libcdr-0.0.5.patch @@ -18,3 +18,18 @@ #endif +--- misc/libcdr-0.0.5/src/lib/makefile.mk misc/build/libcdr-0.0.5/src/lib/makefile.mk +@@ -32,6 +32,12 @@ + INCPRE+=$(LCMS2_CFLAGS) + .ELSE + INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 ++.IF $(COM) == MSC ++# lcms2 gets built to use the stdcall calling convention, for some reason. ++# The lcms2 headers need this in order to decorate functions with stdcall, ++# so that they will be found when linking. ++CDEFS+=-DCMS_DLL ++.ENDIF + .ENDIF + + .IF $(SYSTEM_ZLIB) != YES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - lcms2/lcms2-windows-export.patch lcms2/makefile.mk libcdr/libcdr-0.0.5.patch
lcms2/lcms2-windows-export.patch | 18 ++ lcms2/makefile.mk|2 +- libcdr/libcdr-0.0.5.patch| 15 --- 3 files changed, 19 insertions(+), 16 deletions(-) New commits: commit 6ea1578264b4aaf6384c654098915f6e952dd1b0 Author: Lubos Lunak l.lu...@suse.cz Date: Mon Mar 19 09:45:15 2012 +0200 Define CMS_DLL in the header as that is how we build it Otherwise code using the lcms2 we build won't get the stdcall decorations and linking will fail. diff --git a/lcms2/lcms2-windows-export.patch b/lcms2/lcms2-windows-export.patch new file mode 100644 index 000..9d6d26a --- /dev/null +++ b/lcms2/lcms2-windows-export.patch @@ -0,0 +1,18 @@ +--- misc/build/lcms2-2.3/include/lcms2.h.sav 2011-12-15 16:45:47.0 +0100 misc/build/lcms2-2.3/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 +@@ -192,6 +192,15 @@ typedef int cmsBool; + # endif + #endif + ++// LibreOffice always builds this as DLL and with the stdcall calling ++// convention, so make this usable from outside without having to ++// specify CMS_DLL manually whenever the library is used. ++#ifndef CMS_DLL_BUILD ++#ifndef CMS_DLL ++#define CMS_DLL ++#endif ++#endif ++ + // Calling convention -- this is hardly platform and compiler dependent + #ifdef CMS_IS_WINDOWS_ + # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 0c7f5d5..2be34b5 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -39,7 +39,7 @@ TARGET=so_lcms2 TARFILE_NAME=lcms2-2.3 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 -PATCH_FILES = lcms2.patch +PATCH_FILES = lcms2.patch lcms2-windows-export.patch .IF $(SYSTEM_LCMS2) == YES @all: commit f257c29b6cfba0110bafe33bc02003cc757b5999 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 19 09:42:19 2012 +0200 Revert lcms2 uses stdcall for some reason Nah, will use the patch by Lubos instead. This reverts commit 85f074554788e2d8da73e77855ca06bc0fdfbaa4. diff --git a/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch index 279c365..b622bd6 100644 --- a/libcdr/libcdr-0.0.5.patch +++ b/libcdr/libcdr-0.0.5.patch @@ -18,18 +18,3 @@ #endif misc/libcdr-0.0.5/src/lib/makefile.mk -+++ misc/build/libcdr-0.0.5/src/lib/makefile.mk -@@ -32,6 +32,12 @@ - INCPRE+=$(LCMS2_CFLAGS) - .ELSE - INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 -+.IF $(COM) == MSC -+# lcms2 gets built to use the stdcall calling convention, for some reason. -+# The lcms2 headers need this in order to decorate functions with stdcall, -+# so that they will be found when linking. -+CDEFS+=-DCMS_DLL -+.ENDIF - .ENDIF - - .IF $(SYSTEM_ZLIB) != YES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc
sc/inc/dpnumgroupinfo.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f21960f3b34480ac1d81432ec599b7a6820adf01 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 19 10:40:48 2012 +0200 Mark also the copy constructor as SC_DLLPUBLIC, needed by the scfilt library diff --git a/sc/inc/dpnumgroupinfo.hxx b/sc/inc/dpnumgroupinfo.hxx index 2e0196d..9d6f254 100644 --- a/sc/inc/dpnumgroupinfo.hxx +++ b/sc/inc/dpnumgroupinfo.hxx @@ -43,7 +43,7 @@ struct ScDPNumGroupInfo double mfStep; SC_DLLPUBLIC ScDPNumGroupInfo(); -ScDPNumGroupInfo(const ScDPNumGroupInfo r); +SC_DLLPUBLIC ScDPNumGroupInfo(const ScDPNumGroupInfo r); }; #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4fa48a11902791a7dbcae947b172ca3bb3e82b33
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Mar 19 10:50:27 2012 +0200
Do AC_PROG_EGREP before using $GREP
diff --git a/configure.in b/configure.in
index 055e061..694b32e 100644
--- a/configure.in
+++ b/configure.in
@@ -61,6 +61,8 @@ else
fi
AC_SUBST(CROSS_COMPILING)
+AC_PROG_EGREP
+
if test $build_os = cygwin; then
EXEEXT_FOR_BUILD=.exe
SRC_ROOT=`pwd`
@@ -1976,7 +1978,6 @@ AC_ARG_WITH(system-libxml-for-build,
dnl ===
dnl check for required programs (grep, awk, sed, bash)
dnl ===
-AC_PROG_EGREP
pathmunge ()
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/util
instsetoo_native/util/makefile.mk | 24 1 file changed, 16 insertions(+), 8 deletions(-) New commits: commit 5a6e8707c2753d8f654e7b04c04f4609ffab52fc Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 19 12:29:44 2012 +0200 Don't build helppack installers if --without-help Or should it be --without-helppack-integration that affects it? Or both? Why do we need both these switches? And what does that irritating integration thing mean again? Does --without-helppack-integration mean yes, do build helppacks, but don't integrate them? diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 04acba4..71e9184 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -74,6 +74,14 @@ LOCALPYFILES= \ $(BIN)$/pythonloader.py .ENDIF +.IF $(BUILD_TYPE)==$(BUILD_TYPE:s/HELP//) +OOOHELPPACK= +OOODEVHELPPACK= +.ELSE +OOOHELPPACK=ooohelppack +OOODEVHELPPACK=ooodevhelppack +.ENDIF + help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name helpcontent2 2/dev/null | sed -e s|/helpcontent2|| -e s|^.*/|| ) en-US qtz # do not build key is pseudolanguage for release builds @@ -93,29 +101,29 @@ ALLTAR : $(LOCALPYFILES) .IF $(ENABLE_RELEASE_BUILD)==TRUE .IF $(BUILD_TYPE)==$(BUILD_TYPE:s/ODK//) .IF $(GUI)==WNT -ALLTAR : openofficeall ooohelppack +ALLTAR : openofficeall $(OOOHELPPACK) .ELSE -ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) +ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) .ENDIF .ELSE .IF $(GUI)==WNT -ALLTAR : openofficeall ooohelppack sdkooall +ALLTAR : openofficeall $(OOOHELPPACK) sdkooall .ELSE -ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US +ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US .ENDIF .ENDIF .ELSE # $(ENABLE_RELEASE_BUILD)==TRUE .IF $(BUILD_TYPE)==$(BUILD_TYPE:s/ODK//) .IF $(GUI)==WNT -ALLTAR : openofficedevall ooodevhelppack +ALLTAR : openofficedevall $(OOODEVHELPPACK) .ELSE -ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) +ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) .ENDIF .ELSE .IF $(GUI)==WNT -ALLTAR : openofficedevall ooodevhelppack sdkoodevall +ALLTAR : openofficedevall $(OOODEVHELPPACK) sdkoodevall .ELSE -ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) sdkoodev_en-US +ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) sdkoodev_en-US .ENDIF .ENDIF .ENDIF # $(ENABLE_RELEASE_BUILD)==TRUE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lcms2/lcms2.patch lcms2/makefile.mk
lcms2/lcms2.patch | 20 lcms2/makefile.mk |2 ++ 2 files changed, 22 insertions(+) New commits: commit 2f465a8863ada2b620440e239fb5e48df581253f Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 12 10:51:48 2012 +0200 Add patch to recognize Android diff --git a/lcms2/lcms2.patch b/lcms2/lcms2.patch new file mode 100644 index 000..851a4b6 --- /dev/null +++ b/lcms2/lcms2.patch @@ -0,0 +1,20 @@ +--- misc/build/lcms2-2.3/config.sub misc/build/lcms2-2.3/config.sub +@@ -123,7 +123,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) +@@ -1294,7 +1294,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 9369c75..7d834ac 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -39,6 +39,8 @@ TARGET=so_lcms2 TARFILE_NAME=lcms2-2.3 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 +PATCH_FILES = lcms2.patch + .IF $(SYSTEM_LCMS2) == YES @all: @echo Using system littlecms2... ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
New commits:
commit b68f06287d34833a59841b8000641a02d0994eb8
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Mar 12 15:19:14 2012 +0200
Fix crash with document from bnc#693238
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 505f5c3..b0a0c5d 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -424,10 +424,15 @@ OOXMLPropertySetImpl::~OOXMLPropertySetImpl()
void OOXMLPropertySetImpl::resolve(Properties rHandler)
{
-OOXMLProperties_t::iterator aIt = begin();
-while (aIt != end())
+size_t nIt = 0;
+
+// The pProp-resolve(rHandler) call below can cause elements to
+// be appended to mProperties. I don't think it can cause elements
+// to be deleted. But let's check with here just to be safe that
+// the indexing below works.
+while (nIt mProperties.size())
{
-OOXMLProperty::Pointer_t pProp = *aIt;
+OOXMLProperty::Pointer_t pProp = mProperties[nIt];
if (pProp.get() != NULL)
pProp-resolve(rHandler);
@@ -440,7 +445,7 @@ void OOXMLPropertySetImpl::resolve(Properties rHandler)
}
#endif
-++aIt;
+++nIt;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/unx/module.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9895690965e79cc57502001f95a2cb09971fe7d5
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Mar 12 15:57:31 2012 +0200
Fix Android compilation error
diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
index e5e91e6..419bfc5 100644
--- a/sal/osl/unx/module.cxx
+++ b/sal/osl/unx/module.cxx
@@ -160,19 +160,19 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char
*pModuleName, sal_Int32 nR
{
#ifndef NO_DL_FUNCTIONS
#ifdef ANDROID
-void *pLib = lo_dlopen(pModuleName);
(void) nRtldMode;
+void *pLib = lo_dlopen(pModuleName);
#else
int rtld_mode =
((nRtldMode SAL_LOADMODULE_NOW) ? RTLD_NOW : RTLD_LAZY) |
((nRtldMode SAL_LOADMODULE_GLOBAL) ? RTLD_GLOBAL : RTLD_LOCAL);
void* pLib = dlopen(pModuleName, rtld_mode);
-#endif
+
SAL_INFO_IF(
pLib == 0, sal.osl,
dlopen( pModuleName , rtld_mode ):
dlerror());
-
+#endif
return ((oslModule)(pLib));
#else /* NO_DL_FUNCTIONS */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - configure.in io/prj io/source ios/qa sal/osl solenv/lldb
configure.in|4 +-
io/prj/d.lst|1
io/source/acceptor/makefile.mk |4 ++
io/source/connector/makefile.mk |4 ++
ios/qa/sc/filters-test.m|2 +
sal/osl/unx/process_impl.cxx|6 ---
solenv/lldb/libreoffice/LO.py | 71
7 files changed, 85 insertions(+), 7 deletions(-)
New commits:
commit d37b4908efae30432df98bd25f4870c7e8758033
Author: Tor Lillqvist t...@iki.fi
Date: Tue Mar 13 02:39:43 2012 +0200
Setenv SAL_LOG to yes for maximum logging for now
diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m
index 19be41e..8805ed3 100644
--- a/ios/qa/sc/filters-test.m
+++ b/ios/qa/sc/filters-test.m
@@ -74,6 +74,8 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
setenv(SRC_ROOT, app_root, 1);
setenv(OUTDIR_FOR_BUILD, app_root, 1);
+ setenv(SAL_LOG, yes, 1);
+
CppUnitTestPlugIn *iface = cppunitTestPlugIn();
iface-initialize(CppUnit::TestFactoryRegistry::getRegistry(),
CppUnit::PlugInParameters());
commit 9a188e78b24edbca4315fc81fa1d345c14e6a57c
Author: Tor Lillqvist t...@iki.fi
Date: Tue Mar 13 02:37:31 2012 +0200
Don't usse -D_FILE_OFFSET_BITS=no
diff --git a/configure.in b/configure.in
index 33109ca..e4ca6a4 100644
--- a/configure.in
+++ b/configure.in
@@ -4052,10 +4052,10 @@ if test $_os != WINNT -o $WITH_MINGW = yes; then
dnl Check for large file support
AC_SYS_LARGEFILE
-if test -n $ac_cv_sys_file_offset_bits; then
+if test -n $ac_cv_sys_file_offset_bits -a $ac_cv_sys_file_offset_bits
!= no; then
LFS_CFLAGS=-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits
fi
-if test -n $ac_cv_sys_large_files test $ac_cv_sys_large_files !=
no; then
+if test -n $ac_cv_sys_large_files -a $ac_cv_sys_large_files != no;
then
LFS_CFLAGS=$LFS_CFLAGS -D_LARGE_FILES
fi
else
commit 2b2804b9560a436c764143dbc6b2fe451d16a131
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 12 11:03:02 2012 +0200
Use _NSGetExecutablePath also on iOS
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 168b9be..94128a2 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -77,7 +77,7 @@ extern C oslProcessError SAL_CALL
osl_bootstrap_getExecutableFile_Impl (
) SAL_THROW_EXTERN_C();
-#if defined(MACOSX)
+#if defined(MACOSX) || defined(IOS)
#include mach-o/dyld.h
oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
@@ -89,11 +89,7 @@ oslProcessError SAL_CALL
osl_bootstrap_getExecutableFile_Impl (
char buffer[PATH_MAX];
size_t buflen = sizeof(buffer);
-#if defined(__GNUC__) defined(MACOSX)
if (_NSGetExecutablePath (buffer, (uint32_t*)buflen) == 0)
-#else
-if (_NSGetExecutablePath (buffer, buflen) == 0)
-#endif
{
/* Determine absolute path. */
char abspath[PATH_MAX];
commit bbe99e9c7b28b9e68e0fda5f853542cd9b07f659
Author: Tor Lillqvist t...@iki.fi
Date: Sat Mar 10 16:21:45 2012 +0200
No inter-process UNO on iOS
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index 2473aad..40d6c02 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -39,6 +39,8 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
DLLPRE =
# --
+.IF $(OS) != IOS
+
UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
UNOUCROUT=$(OUT)$/inc$/acceptor
@@ -69,6 +71,8 @@ DEF1NAME= $(SHL1TARGET)
# --- Targets --
.ENDIF # L10N_framework
+.ENDIF
+
.INCLUDE : target.mk
ALLTAR : $(MISC)/acceptor.component
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index c254e36..a484430 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -39,6 +39,8 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
DLLPRE =
# --
+.IF $(OS) != IOS
+
UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
UNOUCROUT=$(OUT)$/inc$/connector
@@ -69,6 +71,8 @@ DEF1NAME= $(SHL1TARGET)
# --- Targets --
.ENDIF # L10N_framework
+.ENDIF
+
.INCLUDE : target.mk
ALLTAR : $(MISC)/connector.component
commit 53baab726138aa221103cc5924a6c0316ae04c26
Author: Tor Lillqvist t...@iki.fi
Date: Sat Mar 10 16:12:33 2012 +0200
Deliver the static libraries built for iOS
diff --git a/io/prj/d.lst b/io/prj/d.lst
index 40eb9ab..963dfa2 100644
--- a/io/prj/d.lst
+++ b/io/prj/d.lst
@@ -5,6 +5,7 @@
..\source\stm\stm.xml %_DEST%\xml\streams.uno.xml
..\%__SRC%\lib\*.so %_DEST%\lib\*
..\%__SRC%\lib\*.dylib %_DEST%\lib\*
+..\%__SRC%\lib\*.a %_DEST%\lib\*
..\%__SRC%\misc\acceptor.component %_DEST%\xml\acceptor.component
..\%__SRC%\misc
[Libreoffice-commits] .: 4 commits - oowintool
oowintool | 145 ++
1 file changed, 72 insertions(+), 73 deletions(-)
New commits:
commit dcc9096b857fa2b22eee1f4e025e82c0f4320f16
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Mar 9 10:35:20 2012 +0200
Add mode lines, untabify, clean up indentation
diff --git a/oowintool b/oowintool
index 3515ccd..ce55e88 100755
--- a/oowintool
+++ b/oowintool
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w # -*- tab-width: 4; cperl-indent-level: 4;
indent-tabs-mode: nil -*-
use File::Copy;
@@ -20,7 +20,7 @@ sub reg_get_value($)
if ( defined $value ) {
chomp ($value);
$value =~ s|\r\n||;
-#print Value '$value' at '$key'\n;
+# print Value '$value' at '$key'\n;
}
return $value;
@@ -64,20 +64,20 @@ sub cygpath($$$)
return $path if ( ! defined $path );
# Strip trailing path separators
if ($input_format eq 'u') {
- $path =~ s|/*\s*$||;
+$path =~ s|/*\s*$||;
} else {
- $path =~ s|\\*\s*$||;
+$path =~ s|\\*\s*$||;
}
# 'Unterminated quoted string errors' from 'ash' when
# forking cygpath so - reimplement cygpath in perl [ gack ]
if ($format eq 'u' $input_format eq 'w') {
- $path =~ s|\\|/|g;
- $path =~ s|([a-zA-Z]):/|/cygdrive/$1/|g;
+$path =~ s|\\|/|g;
+$path =~ s|([a-zA-Z]):/|/cygdrive/$1/|g;
}
elsif ($format eq 'w' $input_format eq 'u') {
- $path =~ s|/cygdrive/([a-zA-Z])/|/$1/|g;
- $path =~ s|/|\\|g;
+$path =~ s|/cygdrive/([a-zA-Z])/|/$1/|g;
+$path =~ s|/|\\|g;
}
return $path;
@@ -88,33 +88,34 @@ sub print_path($$)
my ($path, $unix) = @_;
$path = cygpath ($path, $unix, $output_format);
-
+
print $path;
}
sub print_windows_sdk_home()
{
my ($value, $key);
+
$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v6.1/InstallationFolder');
-if (!defined $value)
-{
+
+if (!defined $value) {
$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v7.1/InstallationFolder');
- }
-if (!defined $value)
-{
+}
+
+if (!defined $value) {
$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/CurrentInstallFolder');
- }
-if (!defined $value)
-{
- $value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
- }
-if (!defined $value)
-{
- $key = reg_find_key
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install
Dir');
- $value = reg_get_value ($key);
- }
-
-defined $value || die Windows Sdk not found;
+}
+
+if (!defined $value) {
+$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
+}
+
+if (!defined $value) {
+$key = reg_find_key
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install
Dir');
+$value = reg_get_value ($key);
+}
+
+defined $value || die Windows SDK not found;
print cygpath ($value, 'w', $output_format);
}
@@ -160,13 +161,12 @@ sub find_msvs()
{
my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2010 );
-for $ver (@ms_versions)
-{
- my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ .
$ver-{'key'});
- if (defined $install $install ne '') {
- $ver-{'product_dir'} = $install;
- return $ver;
- }
+for $ver (@ms_versions) {
+my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ .
$ver-{'key'});
+if (defined $install $install ne '') {
+$ver-{'product_dir'} = $install;
+return $ver;
+}
}
die Can't find MS Visual Studio / VC++;
}
@@ -175,13 +175,12 @@ sub find_msvc()
{
my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2010 );
-for $ver (@ms_versions)
-{
- my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ .
$ver-{'key'});
- if (defined $install $install ne '') {
- $ver-{'product_dir'} = $install;
- return $ver;
- }
+for $ver (@ms_versions) {
+my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ .
$ver-{'key'});
+if (defined $install $install ne '') {
+$ver-{'product_dir'} = $install;
+return $ver;
+}
}
die Can't find MS Visual Studio / VC++;
}
@@ -219,7 +218,7 @@ sub print_dotnetsdk_dir()
reg_get_value
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1) ||
reg_get_value
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0);
if ($dir) {
- print cygpath ($dir, 'w', $output_format);
+print cygpath ($dir, 'w', $output_format);
}
}
@@ -228,9
[Libreoffice-commits] .: 2 commits - lcms2/makefile.mk
lcms2/makefile.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit f3f6c9be9864088b94f874c6ef2ce8ab1dd45f2a Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Mar 9 12:36:15 2012 +0200 Pass /useenv to vcbuild so that rc and link find SDK headers and libs diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 028a3f6..10ba736 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -54,7 +54,7 @@ BUILD_DIR=Projects/VC2010/lcms2_DLL BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 .ELSE BUILD_DIR=Projects/VC2008/lcms2_DLL -BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj Release|Win32 +BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe /useenv lcms2_DLL.vcproj Release|Win32 .ENDIF .ELSE #$(GUI)$(COM)!=WNTMSC commit 4839f974925a6da50be9cd0dc7ab907182abbb93 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Mar 9 12:07:35 2012 +0200 VC2008 and 2010 were swapped diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 68b939f..028a3f6 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -46,14 +46,14 @@ TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 .IF $(GUI)$(COM)==WNTMSC CONFIGURE_DIR=. -BUILD_DIR=Projects/VC2010/lcms2_DLL CONFIGURE_ACTION = .IF $(CCNUMVER) = 0016 -BUILD_DIR=Projects/VC2008/lcms2_DLL +BUILD_DIR=Projects/VC2010/lcms2_DLL BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 .ELSE +BUILD_DIR=Projects/VC2008/lcms2_DLL BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj Release|Win32 .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gdb
solenv/gdb/libreoffice/sal.py | 65 ++
1 file changed, 65 insertions(+)
New commits:
commit 7c9dbfd3e857ee2694505eab5846141923aa4381
Author: Catalin Iacob iacobcata...@gmail.com
Date: Wed Feb 29 22:25:13 2012 +0100
fdo #46446: add python gdb helpers for osl::FileBase
diff --git a/solenv/gdb/libreoffice/sal.py b/solenv/gdb/libreoffice/sal.py
index 75d1cb1..e26c008 100644
--- a/solenv/gdb/libreoffice/sal.py
+++ b/solenv/gdb/libreoffice/sal.py
@@ -26,6 +26,7 @@
# instead of those above.
import gdb
+import gdb.types
from libreoffice.util import printing
from libreoffice.util.string import StringPrinterHelper
@@ -90,6 +91,69 @@ class RtlReferencePrinter(object):
else:
return empty %s % self.typename
+class OslFileStatusPrinter(object):
+'''Prints oslFileStatus'''
+
+def __init__(self, typename, val):
+self.val = val
+
+def to_string(self):
+osl_file_type = gdb.lookup_type('oslFileType').strip_typedefs()
+fields_to_enum_val = gdb.types.make_enum_dict(osl_file_type)
+
+etype = self.field_val_if_valid('eType')
+if etype is not None:
+pretty_etype = 'unknown type' # in case it's not one of the
fields
+
+for field_name, field_val in fields_to_enum_val.iteritems():
+if etype == field_val:
+pretty_etype = self.pretty_file_type(field_name)
+else:
+pretty_etype = 'invalid type'
+
+file_url = self.field_val_if_valid('ustrFileURL')
+if file_url is not None:
+pretty_file_url = str(file_url.dereference())
+else:
+pretty_file_url = 'invalid file url'
+
+pretty_file_status = pretty_etype + ': ' + pretty_file_url
+
+# for links append the link target if valid
+if etype == fields_to_enum_val['osl_File_Type_Link']:
+link_target = self.field_val_if_valid('ustrLinkTargetURL')
+if link_target is None:
+pretty_link_target = 'invalid link target'
+else:
+pretty_link_target = str(link_target.dereference())
+
+pretty_file_status += ' - ' + pretty_link_target
+
+return pretty_file_status
+
+def pretty_file_type(self, file_type_name):
+if file_type_name != 'osl_File_Type_Regular':
+return file_type_name.replace('osl_File_Type_', '').lower()
+else:
+return 'file' # regular is not very descriptive, file is better
+
+def field_val_if_valid(self, field):
+mask_for_field = {'eType': 0x0001,
+ 'uAttributes': 0x0002,
+ 'aCreationTime': 0x0010,
+ 'aAccessTime': 0x0020,
+ 'aModifyTime': 0x0040,
+ 'uFileSize': 0x0080,
+ 'ustrFileName': 0x0100,
+ 'ustrFileURL': 0x0200,
+ 'ustrLinkTargetURL': 0x0400}
+
+valid_fields = self.val['uValidFields']
+if valid_fields mask_for_field[field]:
+return self.val[field]
+else:
+return None
+
printer = None
def build_pretty_printers():
@@ -109,6 +173,7 @@ def build_pretty_printers():
# other stuff
printer.add('rtl::Reference', RtlReferencePrinter)
+printer.add('_oslFileStatus', OslFileStatusPrinter)
return printer
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/writer/writer.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 14ca52086ba3cdba0f767f69f9de9fa5fb9e5668
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 8 11:44:02 2012 +0200
Fix bug in commit ad9960ffeb25f31ce4b1f819f909f1eb9ad6d7dd
My previous patch converting SvPtrarr usage to std::vector had a bug,
(spotted by Ivan timofeev@gmail.com) where it called multimap.find
instead of multimap.equal_range.
diff --git a/sw/source/filter/writer/writer.cxx
b/sw/source/filter/writer/writer.cxx
index 751743c..c0f780e 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -464,17 +464,18 @@ sal_uInt16 Writer::GetBookmarks(const SwCntntNode rNd,
xub_StrLen nStt,
OSL_ENSURE( rArr.empty(), es sind noch Eintraege vorhanden );
sal_uLong nNd = rNd.GetIndex();
-SwBookmarkNodeTable::const_iterator it = m_pImpl-aBkmkNodePos.find( nNd );
-if( it != m_pImpl-aBkmkNodePos.end() )
+std::pairSwBookmarkNodeTable::const_iterator,
SwBookmarkNodeTable::const_iterator aIterPair
+= m_pImpl-aBkmkNodePos.equal_range( nNd );
+if( aIterPair.first != aIterPair.second )
{
// there exist some bookmarks, search now all which is in the range
if( !nStt nEnd == rNd.Len() )
// all
-for( ; it != m_pImpl-aBkmkNodePos.end(); ++it )
+for( SwBookmarkNodeTable::const_iterator it = aIterPair.first; it
!= aIterPair.second; ++it )
rArr.push_back( it-second );
else
{
-for( ; it != m_pImpl-aBkmkNodePos.end(); ++it )
+for( SwBookmarkNodeTable::const_iterator it = aIterPair.first; it
!= aIterPair.second; ++it )
{
const ::sw::mark::IMark rBkmk = *(it-second);
xub_StrLen nCntnt;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/doc/doccomp.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 706cac767c90281b74fbc27a134b022d27e2ce21
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu Mar 8 14:52:14 2012 +0100
fdo#43424: Comparing empty document with attached one crashes LO
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 80c77c4..11c43f3 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1536,14 +1536,17 @@ void SwCompareData::ShowDelete( const CompareData
rData, sal_uLong nStt,
((SwCompareLine*)rData.GetLine( nEnd-1 ))-GetEndNode(), 1 );
sal_uInt16 nOffset = 0;
-const CompareLine* pLine;
-if( GetLineCount() == nInsPos )
+const CompareLine* pLine = 0;
+if( nInsPos = 1 )
{
-pLine = GetLine( nInsPos-1 );
-nOffset = 1;
+if( GetLineCount() == nInsPos )
+{
+pLine = GetLine( nInsPos-1 );
+nOffset = 1;
+}
+else
+pLine = GetLine( nInsPos );
}
-else
-pLine = GetLine( nInsPos );
const SwNode* pLineNd;
if( pLine )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source sc/source sfx2/source svl/inc svl/source svtools/inc svtools/source svx/source sw/source
cui/source/inc/macroass.hxx|2
cui/source/tabpages/macroass.cxx |7 --
sc/source/ui/drawfunc/drawsh.cxx |4 -
sfx2/source/bastyp/sfxhtml.cxx |9 +-
svl/inc/svl/macitem.hxx| 44
svl/source/items/macitem.cxx | 126 -
svtools/inc/svtools/imapobj.hxx|4 -
svtools/source/svhtml/htmlout.cxx |2
svtools/source/uno/unoevent.cxx|5 -
svx/source/items/hlnkitem.cxx | 63 ++
sw/source/core/txtnode/fmtatr2.cxx | 29 +---
sw/source/filter/html/htmlatr.cxx |2
sw/source/filter/html/htmlbas.cxx |7 +-
sw/source/filter/html/htmlfly.cxx |6 -
sw/source/filter/html/htmlform.cxx | 24 ++-
sw/source/filter/html/htmlgrin.cxx |7 --
sw/source/ui/chrdlg/chardlg.cxx|2
sw/source/ui/dochdl/gloshdl.cxx|4 -
sw/source/ui/shells/textfld.cxx|2
sw/source/ui/uno/unoatxt.cxx |3
20 files changed, 166 insertions(+), 186 deletions(-)
New commits:
commit 4b4fb33c606fd068e024669efcbd7ad2aefdaacd
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 8 15:53:57 2012 +0200
Convert from tools/table.hxx to std::map in SvxMacroTableDtor
In this case, we also convert from storing pointers to storing
the items directly because SvxMacroTableDtor completely controls
the lifecycle of the SvxMacro objects it contains.
Also add an operator== to SvxMacroTableDtor and remove the out-of-line
implementations of equals from two other places.
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 849ac45..bca7bf4 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -100,7 +100,7 @@ inline void _SfxMacroTabPage::SetMacroTbl( const
SvxMacroTableDtor rTbl )
inline void _SfxMacroTabPage::ClearMacroTbl()
{
-aTbl.DelDtor();
+aTbl.clear();
}
class SfxMacroTabPage : public _SfxMacroTabPage
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 3128df1..62f38c2 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -329,8 +329,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl,
PushButton*, pBtn )
// aus der Tabelle entfernen
sal_uInt16 nEvent = (sal_uInt16)(sal_uLong)pE-GetUserData();
-SvxMacro *pRemoveMacro = pThis-aTbl.Remove( nEvent );
-delete pRemoveMacro;
+pThis-aTbl.Erase( nEvent );
String sScriptURI;
if( bAssEnabled )
@@ -339,13 +338,13 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl,
PushButton*, pBtn )
if( sScriptURI.CompareToAscii( vnd.sun.star.script:, 20 ) ==
COMPARE_EQUAL )
{
pThis-aTbl.Insert(
-nEvent, new SvxMacro( sScriptURI, String::CreateFromAscii(
SVX_MACRO_LANGUAGE_SF ) ) );
+nEvent, SvxMacro( sScriptURI, String::CreateFromAscii(
SVX_MACRO_LANGUAGE_SF ) ) );
}
else
{
OSL_ENSURE( false, _SfxMacroTabPage::AssignDeleteHdl_Impl: this
branch is *not* dead? (out of interest: tell fs, please!) );
pThis-aTbl.Insert(
-nEvent, new SvxMacro( sScriptURI, String::CreateFromAscii(
SVX_MACRO_LANGUAGE_STARBASIC ) ) );
+nEvent, SvxMacro( sScriptURI, String::CreateFromAscii(
SVX_MACRO_LANGUAGE_STARBASIC ) ) );
}
}
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 61d20f1..1ab7def 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -309,7 +309,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj,
Window* pWin )
{
SvxMacroTableDtor aTab;
rtl::OUString sMacro = pInfo-GetMacro();
-aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, new SvxMacro(sMacro,
rtl::OUString()));
+aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, SvxMacro(sMacro,
rtl::OUString()));
aItem.SetMacroTable( aTab );
}
@@ -334,7 +334,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj,
Window* pWin )
if( SFX_ITEM_SET == pOutSet-GetItemState( SID_ATTR_MACROITEM, false,
pItem ))
{
rtl::OUString sMacro;
-SvxMacro* pMacro = ((SvxMacroItem*)pItem)-GetMacroTable().Get(
SFX_EVENT_MOUSECLICK_OBJECT );
+const SvxMacro* pMacro =
((SvxMacroItem*)pItem)-GetMacroTable().Get( SFX_EVENT_MOUSECLICK_OBJECT );
if ( pMacro )
sMacro = pMacro-GetMacName();
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 2f3a7ad..6a3fee6 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -177,8 +177,7 @@ IMAPOBJ_SETEVENT:
if( sTmp.Len() )
{
sTmp = convertLineEnd(sTmp, GetSystemLineEnd());
-aMacroTbl.Insert( nEvent,
-new SvxMacro( sTmp, sEmpty, eScrpType ));
+
[Libreoffice-commits] .: sdext/source
sdext/source/pdfimport/test/tests.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit bcdb2f161ec9b76ce65d608756c9aecddfe15ac2
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Mar 8 17:02:31 2012 +0200
Fix Windows compilation errors caused by int/sal_Int32 borkage
Unfortunately the unit test in question still fails on Windows,
though.
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index c4d7fc5..a98600c 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -121,7 +121,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Width, m_aPageSize.Width, 79400, 0.0001);
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Height , m_aPageSize.Height, 59500, 0.001 );
CPPUNIT_ASSERT_MESSAGE( endPage() called, m_bPageEnded );
-CPPUNIT_ASSERT_EQUAL_MESSAGE( Num pages equal one, m_nNumPages,
1 );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( Num pages equal one, m_nNumPages,
(sal_Int32) 1 );
CPPUNIT_ASSERT_MESSAGE( Correct hyperlink bounding box,
rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 )
rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0)
@@ -306,7 +306,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Flatness is 0,
rContext.Flatness, 1, 0.0001 );
CPPUNIT_ASSERT_EQUAL_MESSAGE( Font id is 0,
-rContext.FontId, 0 );
+rContext.FontId, (sal_Int32) 0 );
}
virtual void fillPath( const
uno::Referencerendering::XPolyPolygon2D rPath )
@@ -325,7 +325,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Flatness is 10,
rContext.Flatness, 10, 0.0001 );
CPPUNIT_ASSERT_EQUAL_MESSAGE( Font id is 0,
-rContext.FontId, 0 );
+rContext.FontId, (sal_Int32) 0 );
}
virtual void eoFillPath( const
uno::Referencerendering::XPolyPolygon2D rPath )
@@ -344,7 +344,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Flatness is 0,
rContext.Flatness, 1, 0.0001 );
CPPUNIT_ASSERT_EQUAL_MESSAGE( Font id is 0,
-rContext.FontId, 0 );
+rContext.FontId, (sal_Int32) 0 );
const char* sExportString = m12050 49610c-4310
0-7800-3490-7800-7800 0-4300
3490-7790 7800-7790 4300 0 7790 3490 7790 7790 0 4310-3490
7800-7790 7800z;
@@ -392,7 +392,7 @@ namespace
bool
/*bInvert*/ )
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( drawMask received two properties,
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
CPPUNIT_ASSERT_MESSAGE( drawMask got URL param,
xBitmap[0].Name.compareToAscii( URL ) ==
0 );
CPPUNIT_ASSERT_MESSAGE( drawMask got InputStream param,
@@ -402,7 +402,7 @@ namespace
virtual void drawImage(const uno::Sequencebeans::PropertyValue
xBitmap )
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( drawImage received two properties,
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
CPPUNIT_ASSERT_MESSAGE( drawImage got URL param,
xBitmap[0].Name.compareToAscii( URL ) ==
0 );
CPPUNIT_ASSERT_MESSAGE( drawImage got InputStream param,
@@ -413,7 +413,7 @@ namespace
const uno::Sequenceuno::Any
/*xMaskColors*/ )
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( drawColorMaskedImage received two
properties,
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
CPPUNIT_ASSERT_MESSAGE( drawColorMaskedImage got URL param,
xBitmap[0].Name.compareToAscii( URL ) ==
0 );
CPPUNIT_ASSERT_MESSAGE( drawColorMaskedImage got InputStream
param,
@@ -425,14 +425,14 @@ namespace
bool
/*bInvertMask*/)
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( drawMaskedImage received two
properties #1,
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3
[Libreoffice-commits] .: 6 commits - configure.in Makefile scp2/source sw/CppunitTest_sw_macros_test.mk
Makefile |6 -- configure.in |3 +++ scp2/source/ooo/file_library_ooo.scp | 11 +++ scp2/source/ooo/shortcut_ooo.scp |4 sw/CppunitTest_sw_macros_test.mk |2 +- 5 files changed, 23 insertions(+), 3 deletions(-) New commits: commit 03c6bfff92b10fc9f8ab82dcea1303dfe763f94c Author: Tor Lillqvist t...@iki.fi Date: Thu Mar 8 11:52:10 2012 +0200 The instsetoo_native part is unnecessary when doing dev-install diff --git a/Makefile b/Makefile index 905829b..84d8c46 100644 --- a/Makefile +++ b/Makefile @@ -389,7 +389,7 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # # Build # -build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) +build-packimages: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) ifeq ($(DISABLE_SCRIPTING),TRUE) # We must get the headers from vbahelper delivered because # as we don't link to any libs from there they won't otherwise be, or @@ -404,6 +404,8 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) endif cd packimages unset MAKEFLAGS \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + +build: build-packimages ifeq ($(OS_FOR_BUILD),WNT) cd instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl else @@ -426,7 +428,7 @@ install: echo Installation finished, you can now execute: \ echo $(INSTALLDIR)/program/soffice -dev-install: build +dev-install: build-packimages @rm -rf $(OUTDIR)/installation @mkdir $(OUTDIR)/installation ifeq ($(DISABLE_LINKOO),TRUE) commit 67381d234f4ce73db5b4f5cdaadb06c2b602788e Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 14:32:29 2012 +0200 Look for SCRIPTING in BUILD_TYPE diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 00d092a..a9a0060 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -136,6 +136,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\ $(call gb_CppunitTest_get_target,sw_macros_test) : \ $(call gb_Library_get_target,localedata_en) \ $(call gb_Library_get_target,msword) \ -$(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \ +$(if $(filter SCRIPTING,$(BUILD_TYPE)),$(call gb_Library_get_target,vbaswobj)) \ # vim: set noet sw=4 ts=4: commit 37a6cf755a45c5c624f4b4747d9c5a550d370924 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 13:58:37 2012 +0200 Check SOLAR_JAVA for gid_Shortcut_Lib_Hsqldb_2 diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 9f400af..a70c225 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -80,6 +80,8 @@ End #ifdef MACOSX +#ifdef SOLAR_JAVA + Shortcut gid_Shortcut_Lib_Hsqldb_2 FileID = gid_File_Lib_Hsqldb_2; Dir = SCP2_OOO_BIN_DIR; @@ -87,6 +89,8 @@ Shortcut gid_Shortcut_Lib_Hsqldb_2 Styles = (NETWORK, RELATIVE); End +#endif + Shortcut gid_Shortcut_Lib_Libcroco FileID = gid_File_Lib_Libcroco; Dir = SCP2_OOO_BIN_DIR; commit c3fe8e2fd53ea37ce3e1d8fa583c80795991f550 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 13:57:46 2012 +0200 Obey DISABLE_SCRIPTING diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index fe08906..716f590 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -39,6 +39,8 @@ End STD_LIB_FILE( gid_File_Lib_Ado, ado) #endif +#ifndef DISABLE_SCRIPTING + STD_LIB_FILE( gid_File_Lib_Basctl, basctl) File gid_File_Lib_Basprov @@ -63,6 +65,8 @@ File gid_File_Lib_Vbaevent #endif End +#endif + STD_LIB_FILE( gid_File_Lib_Bib , bib) File gid_File_Lib_Cached1 @@ -309,6 +313,8 @@ File gid_File_Lib_Textconv_Dict Styles = (PACKED); End +#ifndef DISABLE_SCRIPTING + File gid_File_Lib_Dlgprov LIB_FILE_BODY; Styles = (PACKED); @@ -320,6 +326,8 @@ File gid_File_Lib_Dlgprov #endif End +#endif + File gid_File_Lib_Stringresource LIB_FILE_BODY; Styles = (PACKED); @@ -331,6 +339,8 @@ File gid_File_Lib_Stringresource #endif End +#ifndef DISABLE_SCRIPTING + File gid_File_Lib_Vbaobj LIB_FILE_BODY; Styles = (PACKED); @@ -375,6 +385,7 @@ File gid_File_Lib_Vbahelper #endif End +#endif #ifdef WNT commit 8db978d3fa7916462fc7e6232532336e3a602e40 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 13:57:06 2012 +0200 Add DISABLE_DBCONNECTIVITY and DISABLE_SCRIPTING to SCPDEFS when needed diff --git a/configure.in b/configure.in index 973a978..d9f8741 100644 --- a/configure.in +++ b/configure.in @@ -2056,6 +2056,7 @@ if test $enable_database_connectivity = yes; then BUILD_TYPE=$BUILD_TYPE DBCONNECTIVITY else DISABLE_DBCONNECTIVITY='TRUE' +SCPDEFS=$SCPDEFS -DDISABLE_DBCONNECTIVITY fi AC_SUBST(DISABLE_DBCONNECTIVITY) @@ -2088,6 +2089,7 @@ if test $enable_scripting = yes
[Libreoffice-commits] .: 2 commits - ios/qa
ios/qa/sc/Makefile |2 +- ios/qa/sc/filters-test.m |7 +++ 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 1f36132b1995dc1e89d2b0b372f5805a9d3c5a95 Author: Tor Lillqvist t...@iki.fi Date: Thu Mar 8 23:30:03 2012 +0200 Set SRC_ROOT and OUTDIR_FOR_BUILD (!) to get it get a bit further along diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m index 88de28a..19be41e 100644 --- a/ios/qa/sc/filters-test.m +++ b/ios/qa/sc/filters-test.m @@ -27,6 +27,8 @@ * instead of those above. */ +#include stdlib.h + #import UIKit/UIKit.h #include cppunit/extensions/TestFactoryRegistry.h @@ -67,6 +69,11 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions self.window = uiw; [uiw release]; + // See unotest/source/cpp/bootstrapfixturebase.cxx + const char *app_root = [[[NSBundle mainBundle] bundlePath] UTF8String]; + setenv(SRC_ROOT, app_root, 1); + setenv(OUTDIR_FOR_BUILD, app_root, 1); + CppUnitTestPlugIn *iface = cppunitTestPlugIn(); iface-initialize(CppUnit::TestFactoryRegistry::getRegistry(), CppUnit::PlugInParameters()); commit 82a8c4cf35abdd7d8db323068bd0a840b4901ee3 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 17:15:08 2012 +0200 Add more libs diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index 1300785..1cbbb01 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -30,7 +30,7 @@ SRCS = filters-test.m CFLAGS = $(SOLARINC) -LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a -Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo -lcomphelpgcc3 -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucbhelper4gcc3 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc +LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a -Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucbhelper4gcc3 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc all: $(APPDIR)/$(APP) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/ww8par3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7fd4640469ce0cc3211a38393c7f25bd2deecd87
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 7 11:02:59 2012 +0200
Fix MSVC compilation error: can't assign a const char* to String
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index f6bed3c..a2c7290 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2183,7 +2183,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType
nWhich,
{
if ( iRes != 25 )
nChecked = iRes;
-sDefault = ( wDef == 0 ) ? 0 : 1;
+sDefault = ( wDef == 0 ) ? rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(0) ) : rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(1) );
}
}
// xstzTextFormat
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/Library_oox.mk
oox/Library_oox.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 3e8e896c03f88d9855fdcccab9ce6f3cae4ba603 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Mar 7 11:41:12 2012 +0200 Need the sfx library for sfx2::isValidNCName() diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 47fdf90..aaf7aa7 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_add_linked_libs,oox,\ msfilter \ sal \ sax \ +sfx \ svl \ svt \ svxcore \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/config/optpage.cxx | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 793b87411646a4a008a6ed82315d8b5c82738641
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Sat Mar 3 22:02:23 2012 +0100
Fix fdo#38207 and also hide another option in Writer/Web
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 014f04d..89cb4eb 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1287,15 +1287,27 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet
rSet)
// hide certain controls for html
if(bHTMLMode)
{
-
+aRepeatHeaderCB.Hide();
aDontSplitCB.Hide();
+
+long nMoveUpBy =
+aRepeatHeaderCB.LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
+
+Point aPos = aRepeatHeaderCB.GetPosPixel();
+aRepeatHeaderCB.SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy ) );
+
+nMoveUpBy +=
+aDontSplitCB.LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
+
+aPos = aBorderCB.GetPosPixel();
+aBorderCB.SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy ) );
}
SwInsertTableOptions aInsOpts = pModOpt-GetInsTblFlags(bHTMLMode);
sal_uInt16 nInsTblFlags = aInsOpts.mnInsMode;
aHeaderCB.Check(0 != (nInsTblFlags tabopts::HEADLINE));
-aRepeatHeaderCB.Check(aInsOpts.mnRowsToRepeat 0);
+aRepeatHeaderCB.Check((!bHTMLMode) (aInsOpts.mnRowsToRepeat 0));
aDontSplitCB.Check(!(nInsTblFlags tabopts::SPLIT_LAYOUT));
aBorderCB.Check(0 != (nInsTblFlags tabopts::DEFAULT_BORDER));
___
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_ios_arm/uno2cpp.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 37b6a37a2634cbb7bbe6602c3cc45b9ffccc05a7
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 7 01:53:43 2012 +0200
Fix compilation for simulator
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
index dc58f33..b5a5943 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
@@ -112,8 +112,6 @@ namespace arm
}
}
-#endif
-
void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference
* pReturnType, sal_uInt32* pRegisterReturn)
{
switch( pReturnType-eTypeClass )
@@ -160,6 +158,8 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1,
typelib_TypeDescriptionReference *
}
}
+#endif
+
namespace
{
@@ -200,7 +200,7 @@ void callVirtualMethod(
#else
volatile long edx = 0, eax = 0; // for register returns
-void * stackptr;
+void * stackptr = 0;
asm volatile (
mov %%esp, %6\n\t
mov %0, %%eax\n\t
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - configure.in ios/qa solenv/bin
configure.in |3
ios/qa/sc/Makefile| 18 -
ios/qa/sc/filters-test.m | 15
ios/qa/sc/lo-qa-sc-filters-test-Info.plist| 45 ++
ios/qa/sc/lo-qa-sc-filters-test.xcodeproj/project.pbxproj | 216 ++
solenv/bin/image-sort.pl | 116 ---
6 files changed, 351 insertions(+), 62 deletions(-)
New commits:
commit 5afda5fcdf191e1144a2cad614c8307bf5850ce0
Author: Tor Lillqvist t...@iki.fi
Date: Tue Mar 6 19:02:16 2012 +0200
Pass parameters to cppunittester's lo_main()
diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m
index 5621f34..88de28a 100644
--- a/ios/qa/sc/filters-test.m
+++ b/ios/qa/sc/filters-test.m
@@ -35,7 +35,7 @@
extern C {
extern CppUnitTestPlugIn *cppunitTestPlugIn(void);
-extern int lo_main(int argc, char **argv);
+extern int lo_main(int argc, const char **argv);
}
int
@@ -70,9 +70,16 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
CppUnitTestPlugIn *iface = cppunitTestPlugIn();
iface-initialize(CppUnit::TestFactoryRegistry::getRegistry(),
CppUnit::PlugInParameters());
- // Temporarily until we actualy get this to link, then
- // add actual args needed by cppunittester
- lo_main(0, NULL);
+ const char *argv[] = {
+ lo-qa-sc-filters-test,
+ dummy-testlib,
+ --headless,
+ --protector,
+ dummy-libunoexceptionprotector,
+ dummy-unoexceptionprotector
+ };
+
+ lo_main(sizeof(argv)/sizeof(*argv), argv);
[self.window makeKeyAndVisible];
return YES;
commit d4cd853edd3744a4569bd5a23fd461394837e5c7
Author: Tor Lillqvist t...@iki.fi
Date: Tue Mar 6 16:17:30 2012 +0200
Add Xcode project
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 2081346..1300785 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -1,8 +1,21 @@
include ../../../config_host.mk
+APP=lo-qa-sc-filters-test
+
+# If run from Xcode, check the CURRENT_ARCH env var for which platform we are
+# building, device or simulator
+
+ifeq ($(CURRENT_ARCH),i386)
+PLATFORM=iphonesimulator
+else
+PLATFORM=iphoneos
+endif
+
+APPDIR=build/Debug-$(PLATFORM)/$(APP).app
+
# Stuff lifted from solenv/gbuild/platform/IOS_ARM_GCC.mk
-gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
+gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 -g
gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
@@ -13,9 +26,6 @@ gb_Library__FRAMEWORKS := \
CoreText \
UIKit \
-APP=lo-qa-sc-filters-test
-APPDIR=$(APP).app
-
SRCS = filters-test.m
CFLAGS = $(SOLARINC)
diff --git a/ios/qa/sc/lo-qa-sc-filters-test-Info.plist
b/ios/qa/sc/lo-qa-sc-filters-test-Info.plist
new file mode 100644
index 000..61b7fd1
--- /dev/null
+++ b/ios/qa/sc/lo-qa-sc-filters-test-Info.plist
@@ -0,0 +1,45 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE plist PUBLIC -//Apple//DTD PLIST 1.0//EN
http://www.apple.com/DTDs/PropertyList-1.0.dtd;
+plist version=1.0
+dict
+ keyCFBundleDevelopmentRegion/key
+ stringen/string
+ keyCFBundleDisplayName/key
+ string${PRODUCT_NAME}/string
+ keyCFBundleExecutable/key
+ string${EXECUTABLE_NAME}/string
+ keyCFBundleIdentifier/key
+ stringorg.libreoffice.${PRODUCT_NAME:rfc1034identifier}/string
+ keyCFBundleInfoDictionaryVersion/key
+ string6.0/string
+ keyCFBundleName/key
+ string${PRODUCT_NAME}/string
+ keyCFBundlePackageType/key
+ stringAPPL/string
+ keyCFBundleShortVersionString/key
+ string1.0/string
+ keyCFBundleSignature/key
+ string/string
+ keyCFBundleVersion/key
+ string1.0/string
+ keyLSRequiresIPhoneOS/key
+ true/
+ keyUIRequiredDeviceCapabilities/key
+ array
+ stringarmv7/string
+ /array
+ keyUISupportedInterfaceOrientations/key
+ array
+ stringUIInterfaceOrientationPortrait/string
+ stringUIInterfaceOrientationLandscapeLeft/string
+ stringUIInterfaceOrientationLandscapeRight/string
+ /array
+ keyUISupportedInterfaceOrientations~ipad/key
+ array
+ stringUIInterfaceOrientationPortrait/string
+ stringUIInterfaceOrientationPortraitUpsideDown/string
+ stringUIInterfaceOrientationLandscapeLeft/string
+ stringUIInterfaceOrientationLandscapeRight/string
+ /array
+/dict
+/plist
diff --git a/ios/qa/sc/lo-qa-sc-filters-test.xcodeproj/project.pbxproj
b/ios/qa/sc/lo-qa-sc-filters-test.xcodeproj/project.pbxproj
new file mode 100644
index 000..ccada1f
--- /dev/null
+++ b/ios/qa/sc/lo-qa-sc-filters-test.xcodeproj
[Libreoffice-commits] .: extensions/Library_npsoplugin.mk
extensions/Library_npsoplugin.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 9dacc3c6b626c4a2efd65bded0998b55f8b7aa28 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Mar 7 09:36:11 2012 +0200 Use just one resource file for npsoplugin diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 3c68546..2c5ad4f 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -86,7 +86,11 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\ -DENGLISH \ )) -$(eval $(call gb_Library_add_nativeres,npsoplugin,npsoplugin_res)) +# Trick to get rid of the default.res to avoid duplicate VERSION +# resource: Set NATIVERES for npsoplugin to be *only* npsoplugin_res + +$(eval $(call gb_LinkTarget_get_target,npsoplugin) : $(call gb_WinResTarget_get_target,npsoplugin_res)) +$(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinResTarget_get_target,npsoplugin_res)) endif # GUI=WNT ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |9 - 1 file changed, 9 deletions(-) New commits: commit 345693a06b853a11d9b8bdb64016ddb894cc8371 Author: Tor Lillqvist t...@iki.fi Date: Mon Mar 5 10:08:15 2012 +0200 Don't bother mentioning irrelevant autogen options diff --git a/README.cross b/README.cross index c610eda..818c335 100644 --- a/README.cross +++ b/README.cross @@ -155,9 +155,6 @@ CXX_FOR_BUILD=ccache g++ --disable-nss-module --disable-zenity --enable-python=system ---with-external-tar=/mnt/hemulen/ooo/git/master/src ---with-num-cpus=1 ---with-max-jobs=1 --with-system-altlinuxhyph --with-system-boost --with-system-cairo @@ -277,7 +274,6 @@ CC=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xct CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-distro=LibreOfficeiOS ---with-external-tar=/Volumes/ooo/git/master/src --with-system-nss --without-help --without-helppack-integration @@ -289,7 +285,6 @@ CC=ccache /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.p CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-distro=LibreOfficeiOS ---with-external-tar=/Volumes/ooo/git/master/src --with-system-nss --enable-debug --without-help @@ -310,7 +305,6 @@ CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --enable-werror --with-distro=LibreOfficeiOS ---with-external-tar=/Users/tml/lo/10.4/src --with-system-nss --without-help --without-helppack-integration @@ -347,7 +341,6 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --disable-zenity --enable-werror --with-distro=LibreOfficeAndroid ---with-external-tar=/Volumes/ooo/git/master/src --disable-python --without-helppack-integration --without-myspell-dicts @@ -363,7 +356,6 @@ CXX_FOR_BUILD=ccache g++ --build=x86_64-unknown-linux-gnu --disable-zenity --with-distro=LibreOfficeAndroid ---with-external-tar=/mnt/hemulen/ooo/git/master/src --disable-python --with-num-cpus=1 --with-max-jobs=1 @@ -427,4 +419,3 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 --host=powerpc-apple-darwin10 --disable-mozilla --disable-build-mozilla ---with-external-tar=/Volumes/ooo/git/master/src ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source sd/source unusedcode.easy
oox/inc/oox/helper/binaryinputstream.hxx |4
oox/inc/oox/helper/modelobjecthelper.hxx |3 ---
oox/inc/oox/helper/propertymap.hxx |1 -
oox/inc/oox/helper/propertyset.hxx | 14 +++---
oox/source/drawingml/customshapeproperties.cxx |1 -
oox/source/helper/binaryinputstream.cxx|8
oox/source/helper/modelobjecthelper.cxx| 13 -
oox/source/helper/propertymap.cxx |5 -
oox/source/helper/propertyset.cxx | 24
sd/source/filter/eppt/epptooxml.hxx|2 --
sd/source/filter/eppt/pptx-epptooxml.cxx | 16
unusedcode.easy|6 --
12 files changed, 3 insertions(+), 94 deletions(-)
New commits:
commit 2bdac353ce7e28611b546bcc8a5ea236c891f944
Author: Petr Vorel petr.vo...@gmail.com
Date: Sat Mar 3 02:16:31 2012 +0100
remove unused code
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx
b/oox/inc/oox/helper/binaryinputstream.hxx
index 5add5f4..6e952a2 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -164,10 +164,6 @@ public:
template typename Type
voidskipArray( sal_Int32 nElemCount );
-/** Reads a NUL-terminated byte character array and returns the string.
- */
-::rtl::OString readNulCharArray();
-
/** Reads a NUL-terminated Unicode character array and returns the string.
*/
::rtl::OUString readNulUnicodeArray();
diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx
b/oox/inc/oox/helper/modelobjecthelper.hxx
index 86459ec..10131de 100644
--- a/oox/inc/oox/helper/modelobjecthelper.hxx
+++ b/oox/inc/oox/helper/modelobjecthelper.hxx
@@ -56,9 +56,6 @@ public:
/** Returns true, if the object with the passed name exists in the
container. */
boolhasObject( const ::rtl::OUString rObjName ) const;
-/** Returns the object with the passed name from the container. */
-::com::sun::star::uno::Any getObject( const ::rtl::OUString rObjName )
const;
-
/** Inserts the passed object into the container, returns its final name.
*/
::rtl::OUString insertObject(
const ::rtl::OUString rObjName,
diff --git a/oox/inc/oox/helper/propertymap.hxx
b/oox/inc/oox/helper/propertymap.hxx
index 2696d49..dabd2e4 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -102,7 +102,6 @@ public:
#if OSL_DEBUG_LEVEL 0
#ifdef DBG_UTIL
static void dump( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
- void dump();
#endif
static void dumpCode( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
void dumpCode();
diff --git a/oox/inc/oox/helper/propertyset.hxx
b/oox/inc/oox/helper/propertyset.hxx
index fd0c1a7..14ca79b 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -50,9 +50,9 @@ class PropertyMap;
com.sun.star.beans.XPropertySet interface then). The reference to the
property set will be kept as long as the instance of this class is alive.
-The functions getProperties() and setProperties() try to handle all passed
-values at once, using the com.sun.star.beans.XMultiPropertySet interface.
-If the implementation does not support the XMultiPropertySet interface, all
+The functions setProperties() tries to handle all passed values at once,
+using the com.sun.star.beans.XMultiPropertySet interface. If the
+implementation does not support the XMultiPropertySet interface, all
properties are handled separately in a loop.
*/
class PropertySet
@@ -103,14 +103,6 @@ public:
@return true = property contains true; false = property contains
false or error occurred. */
inline bool getBoolProperty( sal_Int32 nPropId ) const
{ bool bValue = false; return getProperty( bValue,
nPropId ) bValue; }
-
-/** Gets the specified properties from the property set. Tries to use the
XMultiPropertySet interface.
-@param orValues (out-parameter) The related property values.
-@param rPropNames The property names. MUST be ordered alphabetically.
*/
-voidgetProperties(
-::com::sun::star::uno::Sequence
::com::sun::star::uno::Any orValues,
-const ::com::sun::star::uno::Sequence
::rtl::OUString rPropNames ) const;
-
// Set properties -
/** Puts the passed any into the property set. */
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index ab99e82..29844b8 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 45
+++---
1 file changed, 32 insertions(+), 13 deletions(-)
New commits:
commit ab6273ecece70432f3da35807b5484d9bfe91fdd
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Sun Mar 4 00:57:53 2012 +0100
Dropdown list in Letter Wizard are now ordered alphabetically
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index 736233c..55a1a0e 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -27,6 +27,8 @@
/
package com.sun.star.wizards.letter;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Vector;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.WrappedTargetException;
@@ -65,6 +67,20 @@ import com.sun.star.wizards.common.Helper;
public class LetterWizardDialogImpl extends LetterWizardDialog
{
+private class Strings
+{
+ public String Norm;
+ public String NormPath;
+ public String LanguageLabel;
+
+ public Strings(String norm, String normPath, String languageLabel)
+ {
+ Norm = norm;
+ NormPath = normPath;
+ LanguageLabel = languageLabel;
+ }
+}
+
protected void enterStep(int OldStep, int NewStep)
{
}
@@ -1163,9 +1179,8 @@ public class LetterWizardDialogImpl extends
LetterWizardDialog
e.printStackTrace();
}
-Vector NormsVector = new Vector();
-Vector NormsPathVector = new Vector();
-Vector LanguageLabelsVector = new Vector();
+ Vector StringsVector = new Vector();
+
String[] LanguageLabels;
boolean found = false;
@@ -1202,21 +1217,25 @@ public class LetterWizardDialogImpl extends
LetterWizardDialog
if (found)
{
-NormsVector.add(cIsoCode);
-NormsPathVector.add(nameList[i]);
-LanguageLabelsVector.add(lc.getLanguageString(MSID));
+ StringsVector.add(new Strings(cIsoCode, (String)nameList[i],
lc.getLanguageString(MSID)));
}
}
+ Collections.sort(StringsVector, new Comparator() {
+ public int compare(Object a, Object b) {
+ return
((Strings)a).LanguageLabel.compareTo(((Strings)b).LanguageLabel);
+ }
+ });
-Norms = new String[NormsVector.size()];
-NormsVector.toArray(Norms);
-
-NormPaths = new String[NormsPathVector.size()];
-NormsPathVector.toArray(NormPaths);
+Norms = new String[StringsVector.size()];
+NormPaths = new String[StringsVector.size()];
+LanguageLabels = new String[StringsVector.size()];
-LanguageLabels = new String[LanguageLabelsVector.size()];
-LanguageLabelsVector.toArray(LanguageLabels);
+ for(int i = 0; iStringsVector.size(); i++) {
+ Norms[i] = ((Strings)StringsVector.elementAt(i)).Norm;
+ NormPaths[i] = ((Strings)StringsVector.elementAt(i)).NormPath;
+ LanguageLabels[i] =
((Strings)StringsVector.elementAt(i)).LanguageLabel;
+ }
setControlProperty(lstLetterNorm, PropertyNames.STRING_ITEM_LIST,
LanguageLabels);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: autogen.sh
autogen.sh | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 0847fd63d773732ff3e441ef868957c55760d69a
Author: Thomas Collerton tom.col...@gmail.com
Date: Fri Mar 2 20:21:59 2012 +0100
Improvement to fdo#46565
diff --git a/autogen.sh b/autogen.sh
index 2133d07..2935619 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -146,7 +146,12 @@ if (defined $ENV{NOCONFIGURE}) {
if (scalar(@cmdline_args) 0) {
# if there's already an autogen.lastrun, make a backup first
if (-e autogen.lastrun) {
-system(cp autogen.lastrun autogen.lastrun.bak);
+open (my $fh, autogen.lastrun) || warn can't open
autogen.lastrun. \n;
+open (BAK, autogen.lastrun.bak) || warn can't create
backup file. \n;
+while ($fh) {
+print BAK;
+}
+close (BAK) close ($fh);
}
# print writing args to autogen.lastrun\n;
my $fh;
@@ -159,7 +164,8 @@ if (defined $ENV{NOCONFIGURE}) {
}
elsif ( ! -e autogen.lastrun)
{
-system(touch autogen.lastrun);
+open (my $fh, autogen.lastrun) || die can't create
autogen.lastrun;
+close ($fh);
}
print running ./configure with ' . join (' ', @args), '\n;
system (./configure, @args) die Error running configure;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: hwpfilter/source
hwpfilter/source/drawing.h |7 +
hwpfilter/source/formula.cxx |8 +
hwpfilter/source/grammar.cxx | 152 +
hwpfilter/source/hbox.cxx | 38
hwpfilter/source/hbox.h| 22 ++--
hwpfilter/source/hiodev.cxx|2
hwpfilter/source/hpara.cxx |2
hwpfilter/source/hwpfile.cxx | 184 +++--
hwpfilter/source/hwpfile.h | 50 +--
hwpfilter/source/hwpread.cxx |6 -
hwpfilter/source/hwpreader.cxx | 58
11 files changed, 310 insertions(+), 219 deletions(-)
New commits:
commit db74590950afc8def36a42abae786be5ebad85d9
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Fri Mar 2 17:01:52 2012 +0100
Kill LinkedList in hwpfilter
diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index b3835d2..2da39fb 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -31,8 +31,11 @@
#include precompile.h
+#include list
#include math.h
+#include osl/diagnose.h
+
#include hwplib.h
#include hwpfile.h
#include hiodev.h
@@ -600,12 +603,12 @@ static HWPPara *LoadParaList()
HWPFile *hwpf = GetCurrentDoc();
HIODev *hio = hwpf-SetIODevice(hmem);
-LinkedList HWPPara plist;
+std::list HWPPara* plist;
hwpf-ReadParaList(plist);
hwpf-SetIODevice(hio);
-return plist.count()? plist.first() : 0;
+return plist.size()? plist.front() : 0;
}
diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index d2a73ac..ec44f7d 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -33,8 +33,9 @@
#include mapping.h
#include hwpeq.h
#include iostream
+#include list
-extern LinkedListNode nodelist;
+extern std::listNode* nodelist;
#ifndef DEBUG
@@ -645,9 +646,10 @@ int Formula::parse()
makeMathML( res );
}
Node *tmpNode;
- int count = nodelist.count();
+ int count = nodelist.size();
for( int i = 0 ; i count ; i++ ){
- tmpNode = nodelist.remove(0);
+ tmpNode = nodelist.front();
+ nodelist.pop_front();
delete tmpNode;
}
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index 2285aab..99c2f3c 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -71,12 +71,13 @@
#line 1 grammar.y
+#include list
#include stdlib.h
#include string.h
#include nodes.h
-LinkedListNode nodelist;
+std::listNode* nodelist;
Node *mainParse(const char *_code);
void yyerror(const char *);
@@ -909,291 +910,291 @@ yyreduce:
case 1:
#line 60 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 2:
#line 61 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 3:
#line 62 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 4:
#line 63 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 5:
#line 64 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 6:
#line 65 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 7:
#line 66 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER);
[Libreoffice-commits] .: starmath/source
starmath/source/mathtype.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 39d63cc9b9d307a77f9fe3986f92a6fa52bc552b Author: Olivier Hallot olivier.hal...@alta.org.br Date: Thu Mar 1 22:17:18 2012 -0300 Replace String by OUString Replace String by OUString diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 58d37d7..3995390 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -666,11 +666,11 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, sal_uInt8 nTag,nRecord; sal_uInt8 nTabType,nTabStops; sal_uInt16 nTabOffset; -String sFontName; +rtl::OUString sFontName; int i,nRet=1,newline=0; bool bSilent=false; int nPart=0; -String sPush,sMainTerm; +rtl::OUString sPush,sMainTerm; int nSetSize=0,nSetAlign=0; int nCurRow=0,nCurCol=0; bool bOpenString=false; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: starmath/source
starmath/source/mathtype.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit e0b0fe240e8110790e6f00a41e0482481027ff1c Author: Tor Lillqvist t...@iki.fi Date: Mon Mar 5 11:07:52 2012 +0200 Drop an unused variable diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 3995390..76ecaf4 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -666,7 +666,6 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, sal_uInt8 nTag,nRecord; sal_uInt8 nTabType,nTabStops; sal_uInt16 nTabOffset; -rtl::OUString sFontName; int i,nRet=1,newline=0; bool bSilent=false; int nPart=0; @@ -1762,8 +1761,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, break; aSeq.push_back(nChar8); } -sFontName = rtl::OUString(aSeq[0], aSeq.size(), -RTL_TEXTENCODING_MS_1252); +// Do nothing to the font name now in aSeq!? } break; case SIZE: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basic/inc basic/source sfx2/source
basic/inc/basic/sbxbase.hxx|3 ++-
basic/source/sbx/sbxbase.cxx | 25 +++--
basic/source/sbx/sbxscan.cxx |1 +
sfx2/source/appl/appbaslib.cxx |4 +++-
sfx2/source/appl/appdde.cxx|4 +++-
5 files changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 8d4fe3ed1fcd826200e2611e7743b755eff923a6
Author: Noel Grandin n...@peralex.com
Date: Mon Feb 27 16:26:41 2012 +0200
Convert SbxFactory from SV_DECL_PTRARR_DEL to boost::ptr_vector
diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index 55341fa..e760c4f 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@@ -33,12 +33,13 @@
#include svl/svarray.hxx
#include basic/sbxdef.hxx
#include basicdllapi.h
+#include boost/ptr_container/ptr_vector.hpp
class SbxFactory;
class SbxVariable;
class SbxBasicFormater;
-SV_DECL_PTRARR_DEL(SbxFacs,SbxFactory*,5)
+typedef boost::ptr_vectorSbxFactory SbxFacs;
// AppData structure for SBX:
struct SbxAppData
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index e2987d0..048ea3c 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -36,11 +36,10 @@
#include rtl/instance.hxx
#include rtl/oustringostreaminserter.hxx
#include sal/log.hxx
+#include boost/foreach.hpp
// AppData-Structure for SBX:
-SV_IMPL_PTRARR(SbxFacs,SbxFactory*);
-
TYPEINIT0(SbxBase)
namespace
@@ -147,28 +146,27 @@ void SbxBase::ResetError()
void SbxBase::AddFactory( SbxFactory* pFac )
{
SbxAppData r = GetSbxData_Impl();
-const SbxFactory* pTemp = pFac;
// From 1996-03-06: take the HandleLast-Flag into account
-sal_uInt16 nPos = r.aFacs.Count(); // Insert position
+sal_uInt16 nPos = r.aFacs.size(); // Insert position
if( !pFac-IsHandleLast() ) // Only if not self HandleLast
{
// Rank new factory in front of factories with HandleLast
while( nPos 0
-(static_castSbxFactory*(r.aFacs.GetObject( nPos-1
)))-IsHandleLast() )
+r.aFacs[ nPos-1 ].IsHandleLast() )
nPos--;
}
-r.aFacs.Insert( pTemp, nPos );
+r.aFacs.insert( r.aFacs.begin() + nPos, pFac );
}
void SbxBase::RemoveFactory( SbxFactory* pFac )
{
SbxAppData r = GetSbxData_Impl();
-for( sal_uInt16 i = 0; i r.aFacs.Count(); i++ )
+for(SbxFacs::iterator it = r.aFacs.begin(); it != r.aFacs.end(); ++it)
{
-if( r.aFacs.GetObject( i ) == pFac )
+if( (*it) == pFac )
{
-r.aFacs.Remove( i, 1 ); break;
+r.aFacs.release( it ).release(); break;
}
}
}
@@ -200,10 +198,9 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32
nCreator )
// Unknown type: go over the factories!
SbxAppData r = GetSbxData_Impl();
SbxBase* pNew = NULL;
-for( sal_uInt16 i = 0; i r.aFacs.Count(); i++ )
+BOOST_FOREACH(SbxFactory rFac, r.aFacs)
{
-SbxFactory* pFac = r.aFacs.GetObject( i );
-pNew = pFac-Create( nSbxId, nCreator );
+pNew = rFac.Create( nSbxId, nCreator );
if( pNew )
break;
}
@@ -215,9 +212,9 @@ SbxObject* SbxBase::CreateObject( const rtl::OUString
rClass )
{
SbxAppData r = GetSbxData_Impl();
SbxObject* pNew = NULL;
-for( sal_uInt16 i = 0; i r.aFacs.Count(); i++ )
+BOOST_FOREACH(SbxFactory rFac, r.aFacs)
{
-pNew = r.aFacs.GetObject( i )-CreateObject( rClass );
+pNew = rFac.CreateObject( rClass );
if( pNew )
break;
}
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 18bb46d..a253377 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -43,6 +43,7 @@
#include sbxres.hxx
#include basic/sbxbase.hxx
+#include basic/sbxfac.hxx
#include basic/sbxform.hxx
#include svtools/svtools.hrc
commit 695f0be4d184f4845cb2fedb1d64bb0597f52be4
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 12:20:37 2012 +0200
WaE: unused parameters in the DISABLE_SCRIPTING case
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index a8fb71e..fcb3728 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -55,7 +55,9 @@ void SfxBasicManagerHolder::reset( BasicManager*
_pBasicManager )
{
impl_releaseContainers();
-#ifndef DISABLE_SCRIPTING
+#ifdef DISABLE_SCRIPTING
+(void) _pBasicManager;
+#else
// Note: we do not delete the old BasicManager. BasicManager instances are
// nowadays obtained from the BasicManagerRepository, and the ownership is
with
// the repository.
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index d46a016..5f2420a 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -350,7 +350,9 @@ long SfxObjectShell::DdeExecute
*/
{
-#ifndef DISABLE_SCRIPTING
+#ifdef DISABLE_SCRIPTING
+(void) rCmd;
+#else
StarBASIC* pBasic
[Libreoffice-commits] .: chart2/source
chart2/source/view/axes/VCartesianAxis.cxx | 36 +++--
1 file changed, 9 insertions(+), 27 deletions(-)
New commits:
commit a1be31fd8bf830a4f5961e690bcffd050782e210
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 4 20:45:45 2012 +0100
fdo#44832: Follow-up fix for axis labels for complex categories
Don't add special handling for second and following
categories.
[From Markus's patch email to the list, edited by tml]
This patch is not obvious and I'm not sure that it will not introduce
another regression. I don't fully understand why we need to add
special handling for labels of second and following categories.
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index a6547ef..8291efb 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1333,20 +1333,15 @@ void VCartesianAxis::doStaggeringOfLabels( const
AxisLabelProperties rAxisLabel
for( sal_Int32 nTextLevel=0; nTextLevelnTextLevelCount; nTextLevel++ )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr TickIter apTickIter = createLabelTickIterator(
nTextLevel );
+::std::auto_ptr TickIter apTickIter =
createLabelTickIterator( nTextLevel );
SAL_WNODEPRECATED_DECLARATIONS_POP
-if(apTickIter.get())
-{
-double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-if( nTextLevel0 )
+if(apTickIter.get())
{
-lcl_shiftLables( *apTickIter.get(),
aCummulatedLabelsDistance );
-fRotationAngleDegree = 0.0;
+double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
+aCummulatedLabelsDistance += lcl_getLabelsDistance(
*apTickIter.get()
+, pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties )
+, fRotationAngleDegree );
}
-aCummulatedLabelsDistance += lcl_getLabelsDistance(
*apTickIter.get()
-, pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties )
-, fRotationAngleDegree );
-}
}
}
else if( rAxisLabelProperties.getIsStaggered() )
@@ -1408,18 +1403,9 @@ void VCartesianAxis::createLabels()
AxisLabelProperties aComplexProps(m_aAxisLabelProperties);
if( m_aAxisProperties.m_bComplexCategories )
{
-if( nTextLevel==0 )
-{
-aComplexProps.bLineBreakAllowed = true;
-aComplexProps.bOverlapAllowed =
!::rtl::math::approxEqual( aComplexProps.fRotationAngleDegree, 0.0 );
-}
-else
-{
-aComplexProps.bOverlapAllowed = true;
-aComplexProps.bRhythmIsFix = true;
-aComplexProps.nRhythm = 1;
-aComplexProps.fRotationAngleDegree = 0.0;
-}
+aComplexProps.bLineBreakAllowed = true;
+aComplexProps.bOverlapAllowed = !::rtl::math::approxEqual(
aComplexProps.fRotationAngleDegree, 0.0 );
+
}
AxisLabelProperties rAxisLabelProperties =
m_aAxisProperties.m_bComplexCategories ? aComplexProps : m_aAxisLabelProperties;
while( !createTextShapes( m_xTextTarget, *apTickIter.get(),
rAxisLabelProperties, pTickFactory2D, nScreenDistanceBetweenTicks ) )
@@ -1515,8 +1501,6 @@ void VCartesianAxis::updatePositions()
,static_castsal_Int32(aTickScreenPos2D.getY()));
double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-if( nDepth0 )
-fRotationAngleDegree = 0.0;
// #i78696# use mathematically correct rotation now
const double fRotationAnglePi(fRotationAngleDegree * (F_PI
/ -180.0));
@@ -1615,8 +1599,6 @@ void VCartesianAxis::createShapes()
if( apTickIter.get() )
{
double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-if( nTextLevel0 )
-fRotationAngleDegree = 0.0;
B2DVector aLabelsDistance( lcl_getLabelsDistance(
*apTickIter.get(), pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties, false ), fRotationAngleDegree ) );
sal_Int32 nCurrentLength =
static_castsal_Int32(aLabelsDistance.getLength());
aTickmarkPropertiesList.push_back(
m_aAxisProperties.makeTickmarkPropertiesForComplexCategories( nOffset +
nCurrentLength, 0,
[Libreoffice-commits] .: comphelper/inc comphelper/source
comphelper/inc/comphelper/oslfile2streamwrap.hxx|4
comphelper/source/container/container.cxx | 31 ++
comphelper/source/container/enumhelper.cxx |4
comphelper/source/eventattachermgr/eventattachermgr.cxx | 81 +++-
comphelper/source/property/propagg.cxx | 13 +-
5 files changed, 64 insertions(+), 69 deletions(-)
New commits:
commit 8907a41bf8370446a1cc46c72b2841e5e3588806
Author: Tom Thorogood t...@tomthorogood.com
Date: Tue Feb 28 00:38:23 2012 -0500
Translate german comments in core/comphelper
diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
index 754be72..64ebca6 100644
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
@@ -42,7 +42,7 @@ namespace comphelper
//==
// FmUnoIOStream,
-// stream zum schreiben un lesen von Daten, basieren auf File
+// Stream to read and write from data read from a file
//==
class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public
::cppu::WeakImplHelper1stario::XInputStream
{
@@ -63,7 +63,7 @@ public:
//==
// FmUnoOutStream,
-// Datensenke fuer Files
+// sync data for the files
//==
class OSLOutputStreamWrapper : public
::cppu::WeakImplHelper1stario::XOutputStream
{
diff --git a/comphelper/source/container/container.cxx
b/comphelper/source/container/container.cxx
index 7bf2f8f..d3012c2 100644
--- a/comphelper/source/container/container.cxx
+++ b/comphelper/source/container/container.cxx
@@ -51,9 +51,9 @@ IndexAccessIterator::~IndexAccessIterator() {}
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
IndexAccessIterator::Next()
{
sal_Bool bCheckingStartingPoint = !m_xCurrentObject.is();
-// ist die aktuelle Node der Anfangspunkt ?
+// Is the current node the starting point?
sal_Bool bAlreadyCheckedCurrent = m_xCurrentObject.is();
-// habe ich die aktuelle Node schon mal mittels ShouldHandleElement
testen ?
+// Have I already tested the current node through ShouldHandleElement?
if (!m_xCurrentObject.is())
m_xCurrentObject = m_xStartingPoint;
@@ -62,7 +62,7 @@ IndexAccessIterator::~IndexAccessIterator() {}
sal_Bool bFoundSomething = sal_False;
while (!bFoundSomething bHasMoreToSearch)
{
-// pre-order-traversierung
+// Priming loop
if (!bAlreadyCheckedCurrent ShouldHandleElement(xSearchLoop))
{
m_xCurrentObject = xSearchLoop;
@@ -70,10 +70,10 @@ IndexAccessIterator::~IndexAccessIterator() {}
}
else
{
-// zuerst absteigen, wenn moeglich
+// First, check to see if there's a match below
::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess xContainerAccess(xSearchLoop,
::com::sun::star::uno::UNO_QUERY);
if (xContainerAccess.is() xContainerAccess-getCount()
ShouldStepInto(xContainerAccess))
-{ // zum ersten Child
+{
::com::sun::star::uno::Any
aElement(xContainerAccess-getByIndex(0));
xSearchLoop = *(::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface*)aElement.getValue();
bCheckingStartingPoint = sal_False;
@@ -81,10 +81,9 @@ IndexAccessIterator::~IndexAccessIterator() {}
m_arrChildIndizies.push_back((sal_Int32)0);
}
else
-{
-// dann nach oben und nach rechts, wenn moeglich
+{ // otherwise, look above and to the right, if possible
while (m_arrChildIndizies.size() 0)
-{ // (mein Stack ist nich leer, also kann ich noch nach oben
gehen)
+{ // If the list isn't empty and there's nothing above
::com::sun::star::uno::Reference
::com::sun::star::container::XChild xChild(xSearchLoop,
::com::sun::star::uno::UNO_QUERY);
OSL_ENSURE(xChild.is(), IndexAccessIterator::Next : a
content has no approriate interface !);
@@ -92,36 +91,35 @@ IndexAccessIterator::~IndexAccessIterator() {}
xContainerAccess = ::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess(xParent,
::com::sun::star::uno::UNO_QUERY);
OSL_ENSURE(xContainerAccess.is(),
IndexAccessIterator::Next : a content has an invalid parent !);
-// den Index, den SearchLoop in diesem Parent hatte, von
meinem 'Stack'
+// Update the search loop index
sal_Int32 nOldSearchChildIndex =
[Libreoffice-commits] .: basic/inc basic/source unusedcode.easy
basic/inc/basic/vbahelper.hxx | 16 -
basic/source/basmgr/vbahelper.cxx | 19 ---
basic/source/inc/namecont.hxx |5 --
basic/source/uno/namecont.cxx | 64 --
unusedcode.easy |2 -
5 files changed, 106 deletions(-)
New commits:
commit 99ff0ab0b2f4f6b8718b4dfa1bfc2c598ac25c4c
Author: Elton Chung el...@layerjet.com
Date: Mon Mar 5 23:30:31 2012 +0800
Remove unused code from basic
diff --git a/basic/inc/basic/vbahelper.hxx b/basic/inc/basic/vbahelper.hxx
index 4655897..8530c95 100644
--- a/basic/inc/basic/vbahelper.hxx
+++ b/basic/inc/basic/vbahelper.hxx
@@ -100,22 +100,6 @@ BASIC_DLLPUBLIC void registerCurrentDirectory(
//
-/** Returns the working directory of the application the passed document
-belongs to.
-
-@param rxModel
-A document model determining the type of the application whose working
-directory is querried.
-
-@return
-The working directory of the specified application, or an empty string
-on error (e.g. if the passed document reference is empty).
- */
-BASIC_DLLPUBLIC ::rtl::OUString getCurrentDirectory(
-const ::com::sun::star::uno::Reference ::com::sun::star::frame::XModel
rxModel );
-
-//
-
} // namespace vba
} // namespace basic
diff --git a/basic/source/basmgr/vbahelper.cxx
b/basic/source/basmgr/vbahelper.cxx
index 16e7222..b711a96 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -235,25 +235,6 @@ void registerCurrentDirectory( const uno::Reference
frame::XModel rxModel, c
//
-::rtl::OUString getCurrentDirectory( const uno::Reference frame::XModel
rxModel )
-{
-::rtl::OUString aPath;
-CurrDirPool rPool = StaticCurrDirPool::get();
-::osl::MutexGuard aGuard( rPool.maMutex );
-try
-{
-uno::Reference frame::XModuleManager xModuleManager(
lclCreateModuleManager(), uno::UNO_SET_THROW );
-::rtl::OUString aIdentifier = xModuleManager-identify( rxModel );
-aPath = rPool.maCurrDirs[ aIdentifier ];
-}
-catch(const uno::Exception )
-{
-}
-return aPath;
-}
-
-//
-
} // namespace vba
} // namespace basic
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 8f585b5..833fc81 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -757,11 +757,6 @@ public:
ScriptExtensionIterator( void );
rtl::OUString nextBasicOrDialogLibrary( bool rbPureDialogLib );
-private:
-com::sun::star::uno::Reference com::sun::star::deployment::XPackage
implGetScriptPackageFromPackage
-( const com::sun::star::uno::Reference
com::sun::star::deployment::XPackage xPackage,
- bool rbPureDialogLib );
-
protected:
com::sun::star::uno::Reference com::sun::star::deployment::XPackage
implGetNextUserScriptPackage( bool rbPureDialogLib );
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index fbc52ea..f6544b5 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -3358,70 +3358,6 @@ Reference deployment::XPackage
ScriptSubPackageIterator::implDetectScriptPack
return xScriptPackage;
}
-Reference deployment::XPackage
ScriptExtensionIterator::implGetScriptPackageFromPackage
-( const Reference deployment::XPackage xPackage, bool rbPureDialogLib )
-{
-rbPureDialogLib = false;
-
-Reference deployment::XPackage xScriptPackage;
-if( !xPackage.is() )
-return xScriptPackage;
-
-// Check if parent package is registered
-beans::Optional beans::Ambiguoussal_Bool option(
xPackage-isRegistered
-( Referencetask::XAbortChannel(),
Referenceucb::XCommandEnvironment() ) );
-bool bRegistered = false;
-if( option.IsPresent )
-{
-beans::Ambiguoussal_Bool const reg = option.Value;
-if( !reg.IsAmbiguous reg.Value )
-bRegistered = true;
-}
-if( bRegistered )
-{
-if( xPackage-isBundle() )
-{
-Sequence Reference deployment::XPackage aPkgSeq =
xPackage-getBundle
-( Referencetask::XAbortChannel(),
Referenceucb::XCommandEnvironment() );
-sal_Int32 nPkgCount = aPkgSeq.getLength();
-const Reference deployment::XPackage * pSeq =
aPkgSeq.getConstArray();
-for( sal_Int32 iPkg = 0 ; iPkg nPkgCount ; ++iPkg )
-{
-const Reference deployment::XPackage xSubPkg = pSeq[ iPkg ];
-const Reference deployment::XPackageTypeInfo
xPackageTypeInfo = xSubPkg-getPackageType();
-rtl::OUString
[Libreoffice-commits] .: 3 commits - bootstrap solenv/bin solenv/gbuild
bootstrap |6 --
solenv/bin/concat-deps.c|2 ++
solenv/gbuild/platform/com_GCC_class.mk |5 ++---
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit be5567d9e36ad40deb3e5c6ed219265cddc944c0
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 20:50:56 2012 +0200
Revert Workaround for weird gbuild looping problem with Clang for iOS
The root cause for the problem was in solenv/bin/concat-deps.c, has
been fixed now.
This reverts commit af9618b29f186c3991d9225cc50b55dc78612f27.
diff --git a/solenv/gbuild/platform/com_GCC_class.mk
b/solenv/gbuild/platform/com_GCC_class.mk
index 78c1a7e..b8de73e 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -55,11 +55,10 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
-c $(3) \
-o $(1) \
- $(if $(filter IOS,$(OS)),,-MMD -MT $(1) \
- -MP -MF $(4)) \
+ -MMD -MT $(1) \
+ -MP -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
- $(if $(filter IOS,$(OS)),@echo $(1) : $(3) $(4))
endef
define gb_SrsPartTarget__command_dep
commit 921902ead77b7111a84678898e92fbdaf9e6f496
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 20:40:22 2012 +0200
Handle consecutive slashes before ..
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index a667e0a..28ac2ed 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -692,6 +692,8 @@ static void _cancel_relative(char* base, char** ref_cursor,
char** ref_cursor_ou
do
{
cursor += 3;
+while(cursor_out base cursor_out[-1] == '/')
+cursor_out--;
while(cursor_out base *--cursor_out != '/');
}
while(cursor + 3 end !memcmp(cursor, /../, 4));
commit 94d553b2fbff217861f150ba0583ea1dca35b30e
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 20:38:29 2012 +0200
Must properly quote also the vars in config_build.mk when sourcing it
diff --git a/bootstrap b/bootstrap
index 313c2a9..3d1bc88 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,10 +2,12 @@
if test -z ${SRC_ROOT}; then
if test -f ./config_build.mk ; then
-. ./config_build.mk
+sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_build.mk
config_build.mk.sh
+. ./config_build.mk.sh
+rm config_build.mk.sh
else
if test -f ./config_host.mk ; then
-sed -e 's/^\(export .*=\)\(.*\)$/\1\2/' config_host.mk
config_host.mk.sh
+sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_host.mk
config_host.mk.sh
. ./config_host.mk.sh
rm config_host.mk.sh
fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - basic/Library_sb.mk basic/Module_basic.mk basic/source dbaccess/source filter/source Makefile RepositoryFixes.mk sd/source sfx2/source sw/source
Makefile|6
RepositoryFixes.mk |1
basic/Library_sb.mk | 15 +
basic/Module_basic.mk |2
basic/source/runtime/methods.cxx| 196 +++-
basic/source/runtime/methods1.cxx | 80
basic/source/sbx/sbxarray.cxx |2
basic/source/sbx/sbxdbl.cxx |4
basic/source/sbx/sbxscan.cxx|2
basic/source/sbx/sbxstr.cxx |4
basic/source/sbx/sbxvalue.cxx | 13 +
basic/source/sbx/sbxvar.cxx |8
dbaccess/source/core/dataaccess/databasecontext.cxx | 11 +
filter/source/msfilter/msvbahelper.cxx | 32 +++
filter/source/msfilter/svxmsbas2.cxx|3
sd/source/ui/slideshow/slideshowimpl.cxx|4
sd/source/ui/view/ViewShellImplementation.cxx |4
sd/source/ui/view/drviews2.cxx | 12 -
sd/source/ui/view/drviews3.cxx |6
sd/source/ui/view/drviews9.cxx | 54 +++--
sd/source/ui/view/drviewsb.cxx |4
sd/source/ui/view/viewshe3.cxx |6
sfx2/source/doc/objstor.cxx |4
sw/source/core/doc/doc.cxx |2
sw/source/core/unocore/unocoll.cxx | 13 +
sw/source/filter/html/htmlbas.cxx |2
sw/source/filter/ww8/ww8par.cxx |4
sw/source/ui/app/docsh.cxx |2
sw/source/ui/app/docsh2.cxx |2
sw/source/ui/shells/frmsh.cxx |2
30 files changed, 339 insertions(+), 161 deletions(-)
New commits:
commit b344c30ab49b6faf8a24be42bdfcf4e946a861cd
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 21:41:31 2012 +0200
Sprinkle more DISABLE_SCRIPTING ifdefs
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index efcf67f..28ce80f 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -120,6 +120,8 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
#undef GradientSyle_RECT
#endif
+#ifndef DISABLE_SCRIPTING
+
// from source/classes/sbxmod.cxx
Reference XModel getDocumentModel( StarBASIC* );
@@ -143,20 +145,7 @@ static void FilterWhiteSpace( String rStr )
rStr = aRet.makeStringAndClear();
}
-static long GetDayDiff( const Date rDate )
-{
-Date aRefDate( 1,1,1900 );
-long nDiffDays;
-if ( aRefDate rDate )
-{
-nDiffDays = (long)(aRefDate - rDate);
-nDiffDays *= -1;
-}
-else
-nDiffDays = (long)(rDate - aRefDate);
-nDiffDays += 2; // adjustment VisualBasic: 1.Jan.1900 == 2
-return nDiffDays;
-}
+static long GetDayDiff( const Date rDate );
static const CharClass GetCharClass( void )
{
@@ -1761,68 +1750,7 @@ sal_Int16 implGetDateMonth( double aDate )
return nRet;
}
-sal_Int16 implGetDateYear( double aDate )
-{
-Date aRefDate( 1,1,1900 );
-long nDays = (long) aDate;
-nDays -= 2; // standardize: 1.1.1900 = 0.0
-aRefDate += nDays;
-sal_Int16 nRet = (sal_Int16)( aRefDate.GetYear() );
-return nRet;
-}
-
-sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
double rdRet )
-{
-if ( nYear 30 SbiRuntime::isVBAEnabled() )
-nYear += 2000;
-else if ( nYear 100 )
-nYear += 1900;
-Date aCurDate( nDay, nMonth, nYear );
-if ((nYear 100 || nYear ) )
-{
-StarBASIC::Error( SbERR_BAD_ARGUMENT );
-return sal_False;
-}
-if ( !SbiRuntime::isVBAEnabled() )
-{
-if ( (nMonth 1 || nMonth 12 )||
-(nDay 1 || nDay 31 ) )
-{
-StarBASIC::Error( SbERR_BAD_ARGUMENT );
-return sal_False;
-}
-}
-else
-{
-// grab the year month
-aCurDate = Date( 1, (( nMonth % 12 ) 0 ) ? ( nMonth % 12 ) : 12 + (
nMonth % 12 ), nYear );
-
-// adjust year based on month value
-// e.g. 2000, 0, xx = 1999, 12, xx ( or December of the previous year )
-// 2000, 13, xx = 2001, 1, xx ( or January of the following year )
-if( ( nMonth 1 ) || ( nMonth 12 ) )
-{
-// inacurrate around leap year, don't use days to calculate,
-// just modify the months directory
-sal_Int16 nYearAdj = ( nMonth /12 ); // default to positive months
inputed
-if ( nMonth =0 )
-nYearAdj = ( ( nMonth -12 ) / 12 );
-aCurDate.SetYear( aCurDate.GetYear() + nYearAdj );
-}
-
-// adjust day value,
-// e.g. 2000, 2, 0 = 2000, 1, 31 or the last day of the previous month
-// 2000, 1, 32
[Libreoffice-commits] .: basic/inc basic/Library_sb.mk basic/source
basic/Library_sb.mk |1
basic/inc/basic/sbxmstrm.hxx | 53 --
basic/source/sbx/sbxmstrm.cxx | 40 ---
3 files changed, 94 deletions(-)
New commits:
commit c5bf9b10b9060b750d3651e9c0022ad0261612f8
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 22:58:20 2012 +0200
Remove unused SbxMemoryStream
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 4ba93cb..7ea3d59 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -112,7 +112,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/step0 \
basic/source/runtime/step1 \
basic/source/runtime/step2 \
- basic/source/sbx/sbxmstrm \
))
endif
diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx
deleted file mode 100644
index 12e1795..000
--- a/basic/inc/basic/sbxmstrm.hxx
+++ /dev/null
@@ -1,53 +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 _SBXMSTRM_HXX
-#define _SBXMSTRM_HXX 1
-
-#include tools/stream.hxx
-#include basic/sbxdef.hxx
-#include basic/sbxcore.hxx
-#include basicdllapi.h
-
-SV_DECL_REF(SbxMemoryStream)
-
-class BASIC_DLLPUBLIC SbxMemoryStream : public SbxBase, public SvMemoryStream
-{
- public:
-SbxMemoryStream(sal_uIntPtr nInitSize_=512, sal_uIntPtr nResize_=64) :
-SvMemoryStream(nInitSize_,nResize_) {}
-~SbxMemoryStream();
-
-virtual SbxDataType GetType() const;
-};
-
-SV_IMPL_REF(SbxMemoryStream)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxmstrm.cxx b/basic/source/sbx/sbxmstrm.cxx
deleted file mode 100644
index 9b62a04..000
--- a/basic/source/sbx/sbxmstrm.cxx
+++ /dev/null
@@ -1,40 +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.
- *
- /
-
-#include basic/sbxmstrm.hxx
-
-SbxDataType SbxMemoryStream::GetType() const
-{
-return SbxMEMORYSTREAM;
-}
-
-SbxMemoryStream::~SbxMemoryStream()
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source svx/inc svx/source
sc/source/ui/app/scdll.cxx |2 +-
sc/source/ui/view/formatsh.cxx |2 +-
svx/inc/svx/tbcontrl.hxx |3 +++
svx/source/tbxctrls/tbcontrl.cxx | 15 +--
svx/source/tbxctrls/tbxcolorupdate.cxx |1 +
5 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 4236f5e19c5d3f3a5007c7a596868d09a7e39bee
Author: Winfried Donkers o...@dci-electronics.nl
Date: Mon Mar 5 17:24:40 2012 +0100
fdo#45688: Split button for Calc cell font color
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index cb98122..ece5a1f 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -203,7 +203,7 @@ void ScDLL::Init()
SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY,
pMod);
SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT,
pMod);
// SvxFontHeightToolBoxControl
::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
-SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR,
pMod);
+SvxColorExtToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR,
pMod);
SvxColorExtToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR,
pMod);
SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER,
pMod);
SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE,
pMod);
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index bc72117..61522d6 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1425,11 +1425,11 @@ void ScFormatShell::ExecuteAttr( SfxRequest rReq )
sal_uInt16 nSlot = rReq.GetSlot();
pTabViewShell-HideListBox(); //
Autofilter-DropDown-Listbox
-
if ( !pNewAttrs )
{
switch ( nSlot )
{
+case SID_ATTR_CHAR_COLOR:
case SID_ATTR_CHAR_FONT:
case SID_ATTR_CHAR_FONTHEIGHT:
pTabViewShell-ExecuteCellFormatDlg( rReq, TP_FONT ); //
wenn ToolBar vertikal
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 3f2bd39..8fb558e 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -74,6 +74,9 @@
Execute-Id SID_ATTR_CHAR_COLOR2
and SID_ATTR_CHAR_COLOR_EXT
+for cell color (calc)
+Execute-Id SID_ATTR_CHAR_COLOR
+
for character background color (writer)
Execute-Id SID_ATTR_CHAR_COLOR_BACKGROUND
and SID_ATTR_CHAR_COLOR_BACKGROUND_EXT
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e366952..2a20d4a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2325,6 +2325,7 @@ void SvxColorExtToolBoxControl::StateChanged(
bChoiceFromPalette = sal_False;
switch( nSID )
{
+case SID_ATTR_CHAR_COLOR :
case SID_ATTR_CHAR_COLOR2 :
case SID_ATTR_CHAR_COLOR_BACKGROUND :
case SID_BACKGROUND_COLOR :
@@ -2347,21 +2348,28 @@ void SvxColorExtToolBoxControl::Select( sal_Bool )
{
OUString aCommand;
OUString aParamName;
+sal_Bool bNoArgs = sal_False;
switch( GetSlotId() )
{
case SID_ATTR_CHAR_COLOR2 :
-case SID_ATTR_CHAR_COLOR :
+bNoArgs = sal_True;
aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:CharColorExt ));
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM(
CharColorExt ));
break;
+case SID_ATTR_CHAR_COLOR :
+aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM( .uno:Color
));
+aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( Color ));
+break;
+
case SID_BACKGROUND_COLOR :
aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:BackgroundColor ));
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM(
BackgroundColor ));
break;
case SID_ATTR_CHAR_COLOR_BACKGROUND :
+bNoArgs = sal_True;
aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:CharBackgroundExt ));
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM(
CharBackgroundExt ));
break;
@@ -2369,7 +2377,10 @@ void SvxColorExtToolBoxControl::Select( sal_Bool )
Sequence PropertyValue aArgs( 1 );
aArgs[0].Name = aParamName;
-aArgs[0].Value = makeAny( (sal_uInt32)( mLastColor.GetColor() ));
+if ( bNoArgs )
+aArgs[0].Value = makeAny( GetToolBox().IsItemChecked( GetId() ));
+else
+aArgs[0].Value = makeAny( (sal_uInt32)( mLastColor.GetColor() ));
Dispatch( aCommand, aArgs );
}
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 5c3453a..1b567d4 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++
