[Libreoffice-commits] .: configure.in
configure.in |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 47d7d1e987e1caa030c7623767d9dfe3d85eb924 Author: Tor Lillqvist t...@iki.fi Date: Tue Sep 27 09:46:00 2011 +0300 Enforce use of internal Python for MacOSX 10.[45] only, as apparently is the intent diff --git a/configure.in b/configure.in index 6a98396..791b693 100644 --- a/configure.in +++ b/configure.in @@ -4771,8 +4771,8 @@ no|disable) dnl MinGW cross-compilation setups.) AC_MSG_RESULT([internal]) enable_python=internal -elif test $_os = Darwin; then -AC_MSG_RESULT([internal, neither 10.4's nor 10.5's Python is compatible with Python3-ified pyuno]) +elif test $_os = Darwin -a \( $with_macosx_version_min_required = 10.4 -o $with_macosx_version_min_required = 10.5 \); then +AC_MSG_RESULT([internal, the Python in Mac OS X $with_macosx_version_min_required is incompatible with Python3-ified pyuno]) enable_python=internal else AC_MSG_RESULT([checking below]) @@ -4783,6 +4783,9 @@ internal) AC_MSG_RESULT([internal]) ;; system) +if test $_os = Darwin -a \( $with_macosx_version_min_required = 10.4 -o $with_macosx_version_min_required = 10.5 \); then +AC_MSG_ERROR([Cannot use system Python, the Python in Mac OS X $with_macosx_version_min_required is incompatible with Python3-ified pyuno]) +fi AC_MSG_RESULT([system]) ;; *) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc sal/osl sal/textenc
sal/inc/osl/module.h| 24 ++
sal/inc/osl/module.hxx | 15
sal/osl/unx/module.c| 168 +++-
sal/osl/w32/module.cxx |6 +
sal/textenc/textenc.cxx | 12 ---
5 files changed, 144 insertions(+), 81 deletions(-)
New commits:
commit 193715bbf0e59256fd8da7ebd8dc5eb937615281
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 27 10:06:54 2011 +0200
FullTextEncodingDataSingleton must not call itself recursively.
Happened on non-standard locales (like hu_HU on Linux) when
osl_loadModuleRelative
wanted to access non-standard text encodings.
For Windows, the fix is still only a TODO: FIXME dummy.
diff --git a/sal/inc/osl/module.h b/sal/inc/osl/module.h
index c103e41..6784232 100644
--- a/sal/inc/osl/module.h
+++ b/sal/inc/osl/module.h
@@ -102,6 +102,30 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char
*pModuleName, sal_Int32 nR
oslModule SAL_CALL osl_loadModuleRelative(
oslGenericFunction baseModule, rtl_uString * relativePath, sal_Int32 mode);
+/** Load a module located relative to some other module.
+
+@param baseModule
+must point to a function that is part of the code of some loaded module;
+must not be NULL.
+
+@param relativePath
+a relative URL containing only ASCII (0x01--7F) characters; must not be
+NULL.
+
+@param mode
+the SAL_LOADMODULE_xxx flags.
+
+@return
+a non-NULL handle to the loaded module, or NULL if an error occurred.
+
+@since LibreOffice 3.5
+*/
+oslModule SAL_CALL osl_loadModuleRelativeAscii(
+oslGenericFunction baseModule, char const * relativePath, sal_Int32 mode);
+/* This function is guaranteed not to call into
+ FullTextEncodingDataSingleton in sal/textenc/textenc.cxx, so can be used
+ in its implementation without running into circles. */
+
/** Retrieve the handle of an already loaded module.
This function can be used to search for a function symbol in the process
address space.
diff --git a/sal/inc/osl/module.hxx b/sal/inc/osl/module.hxx
index cfc1c5e..3ece623 100644
--- a/sal/inc/osl/module.hxx
+++ b/sal/inc/osl/module.hxx
@@ -102,6 +102,16 @@ public:
return is();
}
+/// @since LibreOffice 3.5
+sal_Bool SAL_CALL loadRelative(
+oslGenericFunction baseModule, char const * relativePath,
+sal_Int32 mode = SAL_LOADMODULE_DEFAULT)
+{
+unload();
+m_Module = osl_loadModuleRelativeAscii(baseModule, relativePath, mode);
+return is();
+}
+
void SAL_CALL unload()
{
if (m_Module)
@@ -144,6 +154,11 @@ public:
return ( osl_getFunctionSymbol( m_Module, ustrFunctionSymbolName.pData
) );
}
+/// @since LibreOffice 3.5
+oslGenericFunction SAL_CALL getFunctionSymbol(char const * name) const {
+return osl_getAsciiFunctionSymbol(m_Module, name);
+}
+
operator oslModule() const
{
return m_Module;
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index 63fbc20..7db8011 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -46,6 +46,69 @@
/* implemented in file.c */
extern int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
+static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) {
+sal_Bool result = sal_False;
+/* Bah, we do want to use dladdr here also on iOS, I think? */
+#if !defined(NO_DL_FUNCTIONS) || defined(IOS)
+#if defined(AIX)
+int i;
+int size = 4 * 1024;
+char *buf, *filename=NULL;
+struct ld_info *lp;
+
+if ((buf = malloc(size)) == NULL)
+return result;
+
+while((i = loadquery(L_GETINFO, buf, size)) == -1 errno == ENOMEM)
+{
+size += 4 * 1024;
+if ((buf = malloc(size)) == NULL)
+break;
+}
+
+lp = (struct ld_info*) buf;
+while (lp)
+{
+unsigned long start = (unsigned long)lp-ldinfo_dataorg;
+unsigned long end = start + lp-ldinfo_datasize;
+if (start = (unsigned long)address end (unsigned long)address)
+{
+filename = lp-ldinfo_filename;
+break;
+}
+if (!lp-ldinfo_next)
+break;
+lp = (struct ld_info*) ((char *) lp + lp-ldinfo_next);
+}
+
+if (filename)
+{
+rtl_string_newFromStr(path, filename);
+result = sal_True;
+}
+else
+{
+result = sal_False;
+}
+
+free(buf);
+#else
+Dl_info dl_info;
+
+if ((result = dladdr(address, dl_info)) != 0)
+{
+rtl_string_newFromStr(path, dl_info.dli_fname);
+result = sal_True;
+}
+else
+{
+result = sal_False;
+}
+#endif
+#endif
+return result;
+}
+
/*/
/* osl_loadModule */
/*/
@@ -104,6 +167,34 @@ oslModule SAL_CALL
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/unx
vcl/unx/inc/plugins/gtk/gtkdata.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit b3d61e7991192986dcd7103d3c86ee50f8425504 Author: Radek Doulik r...@novell.com Date: Tue Jun 21 13:25:16 2011 +0200 fix crash when changing screen resolution - m_aXineramaScreenIndexMap in GtkSalDisplay was shadowing the same field in SalDisplay, which led to crash in saldisp.cxx code in SalDisplay::addXineramaScreenUnique Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com Signed-off-by: Michael Meeks michael.me...@novell.com diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx index 93443f9..db7ebcf 100644 --- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkdata.hxx @@ -60,7 +60,6 @@ class GtkSalDisplay : public SalDisplay GdkDisplay*m_pGdkDisplay; GdkCursor *m_aCursors[ POINTER_COUNT ]; boolm_bStartupCompleted; -std::vector int m_aXineramaScreenIndexMap; GdkCursor* getFromXPM( const unsigned char *pBitmap, const unsigned char *pMask, int nWidth, int nHeight, int nXHot, int nYHot ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cairo/cairo cairo/cairo-1.8.0.ios.patch cairo/cairo-1.8.0.no-atsui.patch
cairo/cairo-1.8.0.ios.patch | 30 --
cairo/cairo-1.8.0.no-atsui.patch | 32
cairo/cairo/makefile.mk |4
3 files changed, 36 insertions(+), 30 deletions(-)
New commits:
commit 98ab45513c8ba98fc20c3584985b88adbc134db0
Author: Tor Lillqvist t...@iki.fi
Date: Tue Sep 27 12:40:32 2011 +0300
Make cairo build against MacOSX SDK 10.5
Factor out the part of the iOS patch that comments out ATSUI-using API
into a new patch file, and use that when building against the MacOSX
SDK 10.5.
Whether the callers of cairo will build then, no idea... Will see.
diff --git a/cairo/cairo-1.8.0.ios.patch b/cairo/cairo-1.8.0.ios.patch
index e26d03d..3a679c5 100644
--- a/cairo/cairo-1.8.0.ios.patch
+++ b/cairo/cairo-1.8.0.ios.patch
@@ -9,19 +9,6 @@
CAIRO_BEGIN_DECLS
-@@ -66,8 +66,12 @@
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
-
-+#if 0
-+
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
-+
-+#endif /* 0 */
-
- #endif /* CAIRO_HAS_QUARTZ_FONT */
-
--- misc/build/cairo-1.8.0.org/src/cairo-quartz-surface.c
+++ misc/build/cairo-1.8.0/src/cairo-quartz-surface.c
@@ -152,10 +152,6 @@
@@ -47,23 +34,6 @@
/* If we're clipping, OSX 10.5 (at least as of 10.5.2) has a
* bug (apple bug ID #5834794) where the glyph
* advances/positions are not transformed by the text matrix
misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c
-+++ misc/build/cairo-1.8.0/src/cairo-quartz-font.c
-@@ -766,6 +766,8 @@
- }
-
-
-+#if 0
-+
- /*
- * compat with old ATSUI backend
- */
-@@ -808,3 +808,5 @@
- {
- return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
- }
-+
-+#endif /* 0 */
--- misc/build/cairo-1.8.0.org/configure
+++ misc/build/cairo-1.8.0/configure
@@ -29309,6 +29309,7 @@
diff --git a/cairo/cairo-1.8.0.no-atsui.patch b/cairo/cairo-1.8.0.no-atsui.patch
new file mode 100644
index 000..c4fd961
--- /dev/null
+++ b/cairo/cairo-1.8.0.no-atsui.patch
@@ -0,0 +1,32 @@
+--- misc/build/cairo-1.8.0.org/src/cairo-quartz.h
misc/build/cairo-1.8.0/src/cairo-quartz.h
+@@ -66,8 +66,12 @@
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
+
++#if 0
++
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
++
++#endif /* 0 */
+
+ #endif /* CAIRO_HAS_QUARTZ_FONT */
+
+--- misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c
misc/build/cairo-1.8.0/src/cairo-quartz-font.c
+@@ -766,6 +766,8 @@
+ }
+
+
++#if 0
++
+ /*
+ * compat with old ATSUI backend
+ */
+@@ -808,3 +808,5 @@
+ {
+ return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
+ }
++
++#endif /* 0 */
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 3f411aa..c13b5a8 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -50,6 +50,7 @@ TARFILE_MD5=4ea70ea87b47e92d318d4e7f5b940f47
PATCH_FILES=..$/$(TARFILE_NAME).patch
.IF $(OS) == IOS
+PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch
PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch
.ENDIF
@@ -107,6 +108,9 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS)
.ENDIF # $(SYSBASE)!=
CONFIGURE_DIR=
CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config .
.$/configure
+.IF $(MAC_OS_X_VERSION_MIN_REQUIRED) 1040
+PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch
+.ENDIF
CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg
--enable-quartz --enable-quartz-font --enable-gtk-doc=no
--enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config
ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
.IF $(CROSS_COMPILING)==YES
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - README.cross solenv/bin
README.cross | 26 ++
solenv/bin/linkoo | 35 +--
2 files changed, 47 insertions(+), 14 deletions(-)
New commits:
commit 07a7e3a76a2b64735f5c96a399d1da78a6209dd8
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Sep 27 12:02:01 2011 +0200
Add MinGW debugging hints.
diff --git a/README.cross b/README.cross
index 5325a4f..a3966da 100644
--- a/README.cross
+++ b/README.cross
@@ -172,6 +172,32 @@ CXX_FOR_BUILD=ccache g++
--without-helppack-integration
--without-myspell-dicts
+Once you have compiled it, you may want to try to run it:
+
+$ cd instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US
+$ tar xf LibO-Dev_OOO350m1_Win_x86_install-arc_en-US.tar.gz
+$ cd LibO-Dev_OOO350m1_Win_x86_install-arc_en-US/LibO-dev\ 3.5/program
+$ cp /usr/i686-w64-mingw32/sys-root/mingw/bin/* ./
+$ wine soffice.exe
+
+And if you are brave enough, you can even debug it. First you have to add the
+URE dll's to the wine's PATH using 'wine regedit' - see
+http://www.winehq.org/docs/wineusr-guide/environment-variables, and add
+Z:\local\libreoffice\master-mingw32\instsetoo_native\wntgcci.pro\LibreOffice_Dev\archive\install\en-US\LibO-Dev_OOO350m1_Win_x86_install-arc_en-US\LibO-dev
3.5\URE\bin
+to Path.
+
+Then run linkoo, so that when you rebuild something, you can directly see the
+changes the next time you run it:
+
+solenv/bin/linkoo
'your_clone_dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_OOO350m1_Win_x86_install-arc_en-US/LibO-dev
3.5' your_clone_dir
+
+And start debugging:
+
+$ winedbg soffice.bin
+
+Would be great to be able to use winedbg --gdb, but it was crashing here :-( -
+but maybe you'll be more lucky.
+
TODO:
- installation
commit abc08aefee5e7e93b86fa484ddbbea0b29aa3f37
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Sep 27 11:56:58 2011 +0200
Add MinGW handling to linkoo.
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 2a43dfd..51d9351 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -69,24 +69,28 @@ my $LIBVER;
my $OOO_BUILD;
my $OOO_INSTALL;
-my $program_dir = 'basis-link/program';
+my $basis_dir = 'basis-link/program';
+my $win_basis_dir = 'Basis/program';
my $brand_program_dir = 'program';
-my $ure_misc_dir = 'basis-link/ure-link/share/misc';
-my $ure_java_dir = 'basis-link/ure-link/share/java';
my $ure_lib_dir = 'basis-link/ure-link/lib';
+my $win_ure_lib_dir = 'URE/bin';
my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
-my $dllre = '\.so$';
-
my %replaceable = (
-$brand_program_dir = $dllre,
-$program_dir = \\.rdb,
-$ure_lib_dir = ($dllre|\\.so\\.3\$),
-$program_dir . '/resource' = '\.res$',
-$program_dir . '/classes' = '\.jar$',
+$brand_program_dir = (\\.so|\\.dll|\\.exe|\\.bin|\\.com)\$,
+$basis_dir = \\.rdb,
+$win_basis_dir = \\.rdb,
+$ure_lib_dir = (\\.so\$|\\.so\\.3\$),
+$win_ure_lib_dir = (\\.dll|\\.exe|\\.bin|\\.com)\$,
+$basis_dir . '/resource' = '\.res$',
+$basis_dir . '/classes' = '\.jar$',
+$win_basis_dir . '/resource' = '\.res$',
+$win_basis_dir . '/classes' = '\.jar$',
'basis-link/share/config' = '\.zip$',
-'ure/share/misc' = '\.rdb'
+'Basis/share/config' = '\.zip$',
+'ure/share/misc' = '\.rdb$',
+'URE/misc' = '\.rdb$'
#'share/uno_packages' = '\.zip$'
);
@@ -176,7 +180,7 @@ sub do_link(@)
if (!$dry_run) {
# re-write the link
unlink ($dest/$dest_name);
- symlink ($src/$src_name, $dest/$dest_name) || die Failed
to symlink: $!;
+ symlink ($src/$src_name, $dest/$dest_name) || die Failed
to symlink $src/$src_name: $!;
print [$dest_name];
} else {
print re-make link $src/$src_name = $dest/$dest_name\n;
@@ -191,7 +195,7 @@ sub do_link(@)
rename ($dest/$dest_name, $dest/linked/$dest_name) ||
defined $dont_check_link || die Failed rename of
$dest/$dest_name: $!;
- symlink ($src/$src_name, $dest/$dest_name) || die Failed to
symlink: $!;
+ symlink ($src/$src_name, $dest/$dest_name) || die Failed to
symlink $src/$src_name: $!;
print $dest_name;
} else {
print move / symlink $src/$src_name = $dest/$dest_name\n;
@@ -306,6 +310,8 @@ sub evilness($)
sub link_gdb_py()
{
+return if ($TARGET eq 'wntgcci.pro');
+
print Special gdb.py helpers case: ;
my $dirh;
my @basis;
@@ -337,6 +343,8 @@ sub link_gdb_py()
sub link_pagein_files()
{
+return if ($TARGET eq 'wntgcci.pro');
+
print pagein case:;
my $src = $OOO_BUILD/solver/$TARGET/bin;
my $dest = $OOO_INSTALL/ . $brand_program_dir;
@@ -380,7 +388,6 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die linkoo requires
absolute paths ($OOO_
-d $OOO_INSTALL || die No such directory $OOO_INSTALL;
-w $OOO_INSTALL || die You need write access to $OOO_INSTALL;
-d
[Libreoffice-commits] .: solenv/inc
solenv/inc/extension_helplink.mk |4 ++--
solenv/inc/extension_post.mk |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1b5bcb6562abc4fe684fe4e046bde93df1af3d12
Author: Thorsten Behrens tbehr...@novell.com
Date: Tue Sep 27 12:16:55 2011 +0200
Make extension cross-buildable again.
diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk
index c9fa15e..df61f42 100644
--- a/solenv/inc/extension_helplink.mk
+++ b/solenv/inc/extension_helplink.mk
@@ -74,6 +74,6 @@ $(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES)
$(XHPLINKSRC)/$$(@:b:s/_/./
$(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp $(my_cp)
com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod
$(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))}
-checkcfsandsegname _0 _3 $(TOUCH) $@
.ENDIF
.ELSE
--$(RM) $(XHPLINKSRC)/$(@:b)/content/*.*
--$(RM) $(XHPLINKSRC)/$(@:b)/caption/*.*
+-$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/content/*.*
+-$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/caption/*.*
.ENDIF
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 82421e2..ca65e5a 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -161,7 +161,7 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
.IF $(GUI) == WNT
PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/license.txt
.ELSE # $(GUI) == WNT
-PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
+PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/LICENSE
.ENDIF # $(GUI) == WNT
.ELSE # $(CUSTOM_LICENSE) ==
PACKLICDEPS=$(CUSTOM_LICENSE)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - lingucomponent/source sfx2/source svx/inc svx/source unusedcode.easy
lingucomponent/source/languageguessing/guess.cxx |6 lingucomponent/source/languageguessing/guess.hxx |2 lingucomponent/source/languageguessing/simpleguesser.cxx | 95 +++ lingucomponent/source/languageguessing/simpleguesser.hxx |4 sfx2/source/dialog/filtergrouping.cxx| 41 -- svx/inc/svx/svddrgv.hxx |7 - svx/source/svdraw/svddrgv.cxx| 63 - unusedcode.easy | 10 - 8 files changed, 85 insertions(+), 143 deletions(-) New commits: commit 45f536210e8c0376bc047db024e88566557994c5 Author: Caolán McNamara caol...@redhat.com Date: Tue Sep 27 12:28:42 2011 +0100 update list diff --git a/unusedcode.easy b/unusedcode.easy index 2008d48..51939c1 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -74,6 +74,7 @@ CharPosArray::Replace(int const*, unsigned short, unsigned short) CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const, void*), void*) CloneList::Count() const Color::IncreaseContrast(unsigned char) +ComboBox::SetTopEntry(unsigned short) CommunicationLinkList::DeleteAndDestroy(unsigned short, unsigned short) CommunicationLinkList::Insert(CommunicationLink const*, unsigned short) CommunicationLinkList::Insert(CommunicationLink const**, unsigned short) @@ -154,7 +155,6 @@ ElementCollector::setSecurityId(int) EnhWMFReader::ReadGDIComment() ExtraKernInfo::HasKernPairs() const FieldEntry::GetBookmarkType() -FileControl::ResetButtonText() FileControl::SetButtonText(String const) FileList::GetFormat() FileStat::FileStat(void const*, void const*) @@ -526,6 +526,7 @@ ScDPItemData::CreateTypeString() ScDPItemData::GetNumFormat() const ScDPSaveData::Refresh(com::sun::star::uno::Referencecom::sun::star::sheet::XDimensionsSupplier const) ScDdeLink::ResetValue() +ScDocFunc::ModifyAllRangeNames(ScRangeName const*, std::mapshort, ScRangeName const*, std::lessshort, std::allocatorstd::pairshort const, ScRangeName const* const) ScDocRowHeightUpdater::TabRanges::TabRanges() ScDocument::HasControl(short, Rectangle const) ScDocument::InvalidateControls(Window*, short, Rectangle const) @@ -552,6 +553,7 @@ ScMultiTextWnd::GetLineCount() ScMyCellInfo::ScMyCellInfo() ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport) ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport) +ScNameDlg::CalcCurTableAssign(String, ScRangeData*) ScNamedRangeObj::SetContentWithGrammar(rtl::OUString const, formula::FormulaGrammar::Grammar) ScNamedRangeObj::getImplementation(com::sun::star::uno::Referencecom::sun::star::uno::XInterface) ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const @@ -1115,6 +1117,7 @@ SvxLineColorItem::SvxLineColorItem(Color const, unsigned short) SvxListBoxControl::RegisterControl(unsigned short, SfxModule*) SvxMSConvertOCXControls::OCX_Factory(String const) SvxMSConvertOCXControls::WriteOCXExcelKludgeStream(SotStorageStreamRef, com::sun::star::uno::Referencecom::sun::star::awt::XControlModel const, com::sun::star::awt::Size const, String) +SvxMSConvertOCXControls::WriteOCXStream(SotStorageRef, com::sun::star::uno::Referencecom::sun::star::awt::XControlModel const, com::sun::star::awt::Size const, String) SvxMSDffManager::GetAutoForm(MSO_SPT) const SvxMSDffManager::ImportFontWork(SvStream, SfxItemSet, Rectangle) const SvxMSDffManager::Scale(PolyPolygon) const @@ -2883,6 +2886,7 @@ sw::util::AuthorInfos::Remove(sw::util::AuthorInfo* const, unsigned short) sw::util::AuthorInfos::Remove(unsigned short, unsigned short) test::OfficeConnection::OfficeConnection() test::OfficeConnection::getComponentContext() const +test::OfficeConnection::isStillAlive() const test::OfficeConnection::setUp() test::OfficeConnection::tearDown() test::OfficeConnection::~OfficeConnection() commit ca3c96b0753a280021989563422bab7698dc1bd8 Author: Caolán McNamara caol...@redhat.com Date: Tue Sep 27 01:18:49 2011 +0100 callcatcher: some unused methods diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx index 6c98039..f7ee89c 100644 --- a/svx/inc/svx/svddrgv.hxx +++ b/svx/inc/svx/svddrgv.hxx @@ -70,7 +70,6 @@ protected: sal_uIntPtr nDragXorPolyLimit; sal_uIntPtr nDragXorPointLimit; -sal_uInt16 nRubberEdgeDraggingLimit; sal_uInt16 nDetailedEdgeDraggingLimit; unsignedbFramDrag : 1;// z.Zt. FrameDrag @@ -238,10 +237,8 @@ public: // Gummibaender sondern komplette Neuberechnunen sind beim Draggen sichtbar. // Diese detalierte Darstellung ist eh nur beim MoveDrag moeglich. // Defaultwert ist 10 -void SetDetailedEdgeDragging(sal_Bool bOn); // Default an sal_Bool
[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
binfilter/bf_sw/source/core/doc/makefile.mk |1
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 18
binfilter/bf_sw/source/core/doc/sw_docredln.cxx |7 -
binfilter/bf_sw/source/core/doc/sw_extinput.cxx | 90
binfilter/bf_sw/source/core/inc/fntcache.hxx|1
binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx | 17 ---
binfilter/inc/bf_sw/doc.hxx |8 -
7 files changed, 142 deletions(-)
New commits:
commit 08f5cda4a6c8ef2b3084156ed60a588bf007cbce
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 27 12:33:50 2011 +0100
callcatcher: newly unused code
diff --git a/binfilter/bf_sw/source/core/doc/makefile.mk
b/binfilter/bf_sw/source/core/doc/makefile.mk
index fe8a3f0..1ce5b6b 100644
--- a/binfilter/bf_sw/source/core/doc/makefile.mk
+++ b/binfilter/bf_sw/source/core/doc/makefile.mk
@@ -67,7 +67,6 @@ SLOFILES =\
$(SLO)$/sw_docsort.obj \
$(SLO)$/sw_docstat.obj \
$(SLO)$/sw_doctxm.obj \
-$(SLO)$/sw_extinput.obj \
$(SLO)$/sw_fmtcol.obj \
$(SLO)$/sw_ftnidx.obj \
$(SLO)$/sw_gctable.obj \
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index 7d17d5d..d707279 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -867,24 +867,6 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*N*/ return pFmt;
/*N*/ }
-
-/*N*/ SwFrmFmt SwDoc::GetTblFrmFmt(USHORT nFmt, BOOL bUsed ) const
-/*N*/ {
-/*?*/ USHORT nRemoved = 0;
-/*?*/ if(bUsed)
-/*?*/ {
-/*?*/ SwAutoFmtGetDocNode aGetHt( aNodes );
-/*?*/ for ( USHORT i = 0; i = nFmt; i++ )
-/*?*/ {
-/*?*/ while ( (*pTblFrmFmtTbl)[ i + nRemoved]-GetInfo( aGetHt ))
-/*?*/ {
-/*?*/ nRemoved++;
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ return *((*pTblFrmFmtTbl)[nRemoved + nFmt]);
-/*N*/}
-
/*N*/ SwTableFmt* SwDoc::MakeTblFrmFmt( const String rFmtName,
/*N*/ SwFrmFmt *pDerivedFrom )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index e25f472..453ee51 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -184,13 +184,6 @@ Verhalten von Delete-Redline:
/*N*/ return DeleteRedline( aTemp, bSaveInUndo, nDelType );
/*N*/ }
-
-/*N*/ USHORT SwDoc::GetRedlinePos( const SwNode rNd, USHORT /*nType*/ ) const
-/*N*/ {
-/*N*/ rNd.GetIndex();
-/*N*/ return USHRT_MAX;
-/*N*/ }
-
/*N*/ const SwRedline* SwDoc::GetRedline( const SwPosition /*rPos*/,
/*N*/ USHORT* pFndPos ) const
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_extinput.cxx
b/binfilter/bf_sw/source/core/doc/sw_extinput.cxx
deleted file mode 100644
index e1acb86..000
--- a/binfilter/bf_sw/source/core/doc/sw_extinput.cxx
+++ /dev/null
@@ -1,90 +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.
- *
- /
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-
-
-#include osl/diagnose.h
-#include horiornt.hxx
-
-#include extinput.hxx
-#include doc.hxx
-namespace binfilter {
-
-
-
-
-
-
-
-
-// die Doc Schnittstellen:
-
-
-
-/*N*/ SwExtTextInput* SwDoc::GetExtTextInput( const SwNode rNd,
-/*N*/ xub_StrLen nCntntPos ) const
-/*N*/ {
-/*N*/ SwExtTextInput* pRet = 0;
-/*N*/ if( pExtInputRing )
-/*N*/ {
-/*?*/ ULONG nNdIdx = rNd.GetIndex();
-/*?*/ SwExtTextInput* pTmp = (SwExtTextInput*)pExtInputRing;
-/*?*/ do {
-/*?*/ ULONG nPt = pTmp-GetPoint()-nNode.GetIndex(),
-/*?*/ nMk =
[Libreoffice-commits] .: configure.in
configure.in | 31 +--
1 file changed, 25 insertions(+), 6 deletions(-)
New commits:
commit f8682923858c39a5e980324388b2ca482d0d45fa
Author: Tor Lillqvist t...@iki.fi
Date: Tue Sep 27 14:34:06 2011 +0300
Fix system Python configuration for MacOSX SDK = 10.6
diff --git a/configure.in b/configure.in
index 791b693..3224852 100644
--- a/configure.in
+++ b/configure.in
@@ -4809,7 +4809,11 @@ if test $cross_compiling = yes; then
fi
else
if test $enable_python = system; then
-dnl This causes an error if no Python found
+# This causes an error if no python command is found
+# Note that this takes the system python called just python,
+# which isn't actually what we want on MacOSX when building
+# against the 10.6 SDK. But that shouldn't matter, we
+# select the correct python command manually below anyway.
AM_PATH_PYTHON([2.6])
elif test $enable_python = auto; then
dnl This allows lack of system Python
@@ -4825,14 +4829,29 @@ fi
if test $enable_python = system; then
if test $_os = Darwin; then
-#TODO: conditionalize for chosen Mac-SDK (configure switch not yet
available)
-AC_MSG_ERROR([system python is not compatible with pyuno anymore, you
need to compile against Mac OSX 10.6 or later (needs Python 2.6 or newer)])
-
PYTHON_CFLAGS=-I/Developer/SDKs/MacOSX10.6/System/Library/Frameworks/Python.framework/Versions/2.6/include/python2.6
+# We already have logic above to make sure the system Python
+# is used only when building against SDK 10.6 or newer.
+
+# Make sure we use the 2.6 Python when building against the
+# 10.6 SDK.
+case $with_macosx_sdk in
+10.6)
+python_version=2.6;;
+10.7)
+python_version=2.7;;
+*)
+# ???
+python_version=2.7;;
+esac
+PYTHON=python$python_version
+
+
PYTHON_CFLAGS=-I/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk/System/Library/Frameworks/Python.framework/Versions/${python_version}/include/python${python_version}
PYTHON_LIBS=-framework Python
fi
if test -n $PYTHON_CFLAGS -a -n $PYTHON_LIBS; then
-dnl Fallback: Accept these in the environment.
- :
+# Fallback: Accept these in the environment, or as set above
+# for MacOSX.
+:
elif test $cross_compiling != yes; then
python_include=`$PYTHON -c import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('INCLUDEPY'));`
python_version=`$PYTHON -c import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('VERSION'));`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Repository.mk
Repository.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 5e9b48bd17b7e360c35407ad56bf202ac4260277 Author: Tor Lillqvist t...@iki.fi Date: Tue Sep 27 15:30:38 2011 +0300 Add bestreversemap diff --git a/Repository.mk b/Repository.mk index a161c0e..73e591f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Helper_register_repository,SRCDIR)) $(eval $(call gb_Helper_register_executables,NONE, \ +bestreversemap \ bmp \ bmpsum \ g2g \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/filter/wmf/enhwmf.cxx | 136 +--
svtools/source/filter/wmf/winmtf.hxx |3
2 files changed, 55 insertions(+), 84 deletions(-)
New commits:
commit f6a34255af1339cd7132b7527dc0c10c10d38249
Author: Marc-Andre Laverdiere marc-an...@atc.tcs.com
Date: Mon Sep 19 17:27:50 2011 +0530
Minor refactoring on WMF loading
diff --git a/svtools/source/filter/wmf/enhwmf.cxx
b/svtools/source/filter/wmf/enhwmf.cxx
index 10fa8f3..618f13d 100644
--- a/svtools/source/filter/wmf/enhwmf.cxx
+++ b/svtools/source/filter/wmf/enhwmf.cxx
@@ -351,14 +351,14 @@ void EnhWMFReader::ReadGDIComment()
* pWMF: the stream containings the polygons
* */
template class T
-Polygon WMFReadPolygon(sal_uInt16 nStartIndex, sal_uInt16 nPoints, SvStream
rWMF)
+Polygon EnhWMFReader::ReadPolygon(sal_uInt16 nStartIndex, sal_uInt16 nPoints)
{
Polygon aPolygon(nPoints);
-for (sal_uInt16 i = nStartIndex ; i nPoints rWMF.good(); i++ )
+for (sal_uInt16 i = nStartIndex ; i nPoints pWMF-good(); i++ )
{
T nX, nY;
-rWMF nX nY;
-if (!rWMF.good())
+*pWMF nX nY;
+if (pWMF-good())
break;
aPolygon[ i ] = Point( nX, nY );
}
@@ -366,6 +366,44 @@ Polygon WMFReadPolygon(sal_uInt16 nStartIndex, sal_uInt16
nPoints, SvStream rWM
return aPolygon;
}
+template class T
+void EnhWMFReader::ReadAndDrawPolyPolygon()
+{
+sal_uInt32 i, nPoly, nGesPoints, nPoints;
+pWMF-SeekRel( 0x10 );
+// Number of polygons
+*pWMF nPoly nGesPoints;
+if ( pWMF-good()
+( nGesPoints SAL_MAX_UINT32 / sizeof(Point) ) //check against
numeric overflowing
+( nPoly SAL_MAX_UINT32 / sizeof(sal_uInt16) )
+( ( nPoly * sizeof( sal_uInt16 ) ) = ( nEndPos - pWMF-Tell() ) ))
+{
+//Get number of points in each polygon
+sal_uInt16 * pnPoints = new sal_uInt16[ nPoly ];
+for ( i = 0; i nPoly pWMF-good(); i++ )
+{
+*pWMF nPoints;
+pnPoints[ i ] = (sal_uInt16)nPoints;
+} //end for
+if ( pWMF-good() ( nGesPoints * (sizeof(T)+sizeof(T)) ) = (
nEndPos - pWMF-Tell() ) )
+{
+// Get polygon points
+Point * pPtAry = new Point[ nGesPoints ];
+for ( i = 0; i nGesPoints pWMF-good(); i++ )
+{
+T nX, nY;
+*pWMF nX nY;
+pPtAry[ i ] = Point( nX, nY );
+} //end for
+// Create PolyPolygon Actions
+PolyPolygon aPolyPoly( (sal_uInt16)nPoly, pnPoints, pPtAry );
+pOut-DrawPolyPolygon( aPolyPoly, bRecordPath );
+delete[] pPtAry;
+} //end if
+delete[] pnPoints;
+} //end if
+}
+
sal_Bool EnhWMFReader::ReadEnhWMF()
{
sal_uInt32 nStretchBltMode = 0;
@@ -452,7 +490,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
i++;
nPoints++;
}
-Polygon aPoly = WMFReadPolygonsal_Int32(i, nPoints, *pWMF);
+Polygon aPoly = ReadPolygonsal_Int32(i, nPoints);
pOut-DrawPolyBezier( aPoly, bFlag, bRecordPath );
}
break;
@@ -461,7 +499,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
{
pWMF-SeekRel( 16 );
*pWMF nPoints;
-Polygon aPoly = WMFReadPolygonsal_Int32(0, nPoints, *pWMF);
+Polygon aPoly = ReadPolygonsal_Int32(0, nPoints);
pOut-DrawPolygon( aPoly, bRecordPath );
}
break;
@@ -478,7 +516,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
i++;
nPoints++;
}
-Polygon aPolygon = WMFReadPolygonsal_Int32(i, nPoints,
*pWMF);
+Polygon aPolygon = ReadPolygonsal_Int32(i, nPoints);
pOut-DrawPolyLine( aPolygon, bFlag, bRecordPath );
}
break;
@@ -523,42 +561,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
case EMR_POLYPOLYGON :
{
-sal_uInt32 i, nPoly, nGesPoints;
-pWMF-SeekRel( 0x10 );
-
-// Number of polygons:
-*pWMF nPoly nGesPoints;
-
-if ( ( nGesPoints SAL_MAX_UINT32 / sizeof(Point) ) (
nPoly SAL_MAX_UINT32 / sizeof(sal_uInt16) ) )
-{
-if ( ( nPoly * sizeof(sal_uInt16) ) = ( nEndPos -
pWMF-Tell() ) )
-{
-sal_uInt16* pnPoints = new sal_uInt16[ nPoly ];
-
-for ( i = 0; i nPoly; i++ )
-{
-*pWMF nPoints;
-pnPoints[ i ] = (sal_uInt16)nPoints;
-}
-
-if ( ( nGesPoints *
(sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) = ( nEndPos - pWMF-Tell() ) )
-{
-
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo | 77 --
1 file changed, 40 insertions(+), 37 deletions(-)
New commits:
commit 28cf0a3cf30c81d8e0120ed13147f1a71b5b46d5
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Sep 27 14:45:00 2011 +0200
Process options early so that $TARGET is set when we need it.
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index d8997a8..5da680c 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -69,6 +69,46 @@ my $LIBVER;
my $OOO_BUILD;
my $OOO_INSTALL;
+# process options
+for my $a (@ARGV) {
+
+# options
+if ($a =~ /--dry-run/) {
+$dry_run = 1;
+} elsif (($a eq '--help') || ($a eq '-h')) {
+ $usage = 1;
+
+# ordered arguments
+} elsif (!defined $OOO_INSTALL) {
+ $OOO_INSTALL = $a;
+} elsif (!defined $OOO_BUILD) {
+ $OOO_BUILD = $a;
+} else {
+ print Unknown argument '$a'\n;
+ $usage = 1;
+}
+}
+
+if (!defined $OOO_BUILD defined $ENV{SRC_ROOT}) {
+$OOO_BUILD = $ENV{SRC_ROOT};
+}
+
+if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD) {
+printf Usage: linkoo /path/to/ooo/install [/path/to/ooo/build/tree]
[--dry-run]\n;
+exit (1);
+}
+
+substr ($OOO_INSTALL, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_INSTALL does not qualify);
+substr ($OOO_BUILD, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_BUILD does not qualify);
+
+-d $OOO_INSTALL || die No such directory $OOO_INSTALL;
+-w $OOO_INSTALL || die You need write access to $OOO_INSTALL;
+-d $OOO_BUILD || die No such directory $OOO_BUILD;
+
+($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
+
+
+# setup global variables
my $basis_dir = 'basis-link/program';
my $win_basis_dir = 'Basis/program';
my $brand_program_dir = 'program';
@@ -356,43 +396,6 @@ sub link_pagein_files()
print \n;
}
-for my $a (@ARGV) {
-
-# options
-if ($a =~ /--dry-run/) {
-$dry_run = 1;
-} elsif (($a eq '--help') || ($a eq '-h')) {
- $usage = 1;
-
-# ordered arguments
-} elsif (!defined $OOO_INSTALL) {
- $OOO_INSTALL = $a;
-} elsif (!defined $OOO_BUILD) {
- $OOO_BUILD = $a;
-} else {
- print Unknown argument '$a'\n;
- $usage = 1;
-}
-}
-
-if (!defined $OOO_BUILD defined $ENV{SRC_ROOT}) {
-$OOO_BUILD = $ENV{SRC_ROOT};
-}
-
-if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD) {
-printf Usage: linkoo /path/to/ooo/install [/path/to/ooo/build/tree]
[--dry-run]\n;
-exit (1);
-}
-
-substr ($OOO_INSTALL, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_INSTALL does not qualify);
-substr ($OOO_BUILD, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_BUILD does not qualify);
-
--d $OOO_INSTALL || die No such directory $OOO_INSTALL;
--w $OOO_INSTALL || die You need write access to $OOO_INSTALL;
--d $OOO_BUILD || die No such directory $OOO_BUILD;
-
-($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
-
evilness ('undo');
my $installed_files = build_installed_list ($OOO_INSTALL);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: idlc/source
idlc/source/preproc/unix.c | 36
1 file changed, 36 deletions(-)
New commits:
commit 41bc308973c8567aaa368949a02f1cf420c1ee8a
Author: Tor Lillqvist t...@iki.fi
Date: Tue Sep 27 15:59:48 2011 +0300
Let's rely on memmove() being sane on all our platforms
Defining an own memmove() here is silly. It breaks compilation against
MacOSX 10.6 SDK where memmove is a macro. If we really wanted to avoid
the system memmove() here, surely we should then use
rtl_moveMemory(). But since when is idlcpp performance critical?
diff --git a/idlc/source/preproc/unix.c b/idlc/source/preproc/unix.c
index b0a8f47..461f1d5 100644
--- a/idlc/source/preproc/unix.c
+++ b/idlc/source/preproc/unix.c
@@ -212,40 +212,4 @@ void
setsource(fp, -1, fd, NULL, 0);
}
-
-/* memmove is defined here because some vendors don't provide it at
- all and others do a terrible job (like calling malloc) */
-
-#if !defined(__IBMC__) !defined(WNT) !defined(__GLIBC__)
-
-void *
-memmove(void *dp, const void *sp, size_t n)
-{
-unsigned char *cdp, *csp;
-
-if (n = 0)
-return 0;
-cdp = dp;
-csp = (unsigned char *) sp;
-if (cdp csp)
-{
-do
-{
-*cdp++ = *csp++;
-} while (--n);
-}
-else
-{
-cdp += n;
-csp += n;
-do
-{
-*--cdp = *--csp;
-} while (--n);
-}
-return 0;
-}
-
-#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] .: sc/qa
sc/qa/unit/filters-test.cxx | 13 +
sc/qa/unit/ucalc.cxx|1 +
2 files changed, 14 insertions(+)
New commits:
commit 0e3361c0aee39c72e4f85d408676ac38efcf9bd0
Author: Michael Meeks michael.me...@suse.com
Date: Tue Sep 27 14:43:26 2011 +0100
assert on the console in a helpful way as/when we get a message dialog
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 3b9bc50..f1ae199 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -35,6 +35,7 @@
#include cppunit/extensions/HelperMacros.h
#include cppunit/plugin/TestPlugIn.h
+#include rtl/strbuf.hxx
#include osl/file.hxx
#include osl/process.h
@@ -229,6 +230,8 @@ ScDocShellRef FiltersTest::load(const rtl::OUString
rFilter, const rtl::OUStrin
if (!xDocShRef-DoLoad(aSrcMed))
// load failed.
xDocShRef.Clear();
+//else
+//SfxObjectShell::SetCurrentComponent( xDocShRef-GetModel() );
return xDocShRef;
}
@@ -686,8 +689,18 @@ FiltersTest::FiltersTest()
m_aSrcRoot += m_aFileRoot;
}
+static void aBasicErrorFunc( const String rErr, const String rAction )
+{
+rtl::OStringBuffer aErr( Unexpected dialog: );
+aErr.append( rtl::OUStringToOString( rAction, RTL_TEXTENCODING_ASCII_US )
);
+aErr.append( Error: );
+aErr.append( rtl::OUStringToOString( rErr, RTL_TEXTENCODING_ASCII_US ) );
+CPPUNIT_ASSERT_MESSAGE( aErr.getStr(), false);
+}
+
void FiltersTest::setUp()
{
+ErrorHandler::RegisterDisplay( aBasicErrorFunc );
}
FiltersTest::~FiltersTest()
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index b3260ca..b3f6fd3 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -48,6 +48,7 @@
#include cppunit/extensions/HelperMacros.h
#include cppunit/plugin/TestPlugIn.h
+#include rtl/strbuf.hxx
#include osl/file.hxx
#include osl/process.h
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/pathoptions.cxx | 33 +
1 file changed, 9 insertions(+), 24 deletions(-)
New commits:
commit baa36ed2f1f35f311e11aa630ea16e969f841303
Author: Michael Meeks michael.me...@suse.com
Date: Tue Sep 27 14:44:54 2011 +0100
remove obsolete and unused defines
diff --git a/unotools/source/config/pathoptions.cxx
b/unotools/source/config/pathoptions.cxx
index 7bfbf48..b760576 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -70,32 +70,17 @@ using ::rtl::OUString;
using ::rtl::OString;
using ::rtl::OStringToOUString;
-// define
-
-#define SEARCHPATH_DELIMITER';'
-
-#define ASCII_STR(s)OUString(
RTL_CONSTASCII_USTRINGPARAM(s) )
-
-#define SIGN_STARTVARIABLE ASCII_STR($()
-#define SIGN_ENDVARIABLEASCII_STR())
+#define SEARCHPATH_DELIMITER ';'
+#define SIGN_STARTVARIABLEOUString( RTL_CONSTASCII_USTRINGPARAM( $( ) )
+#define SIGN_ENDVARIABLE OUString( RTL_CONSTASCII_USTRINGPARAM( ) ) )
// Supported variables by the old SvtPathOptions implementation
-#define SUBSTITUTE_INST $(inst)
-#define SUBSTITUTE_PROG $(prog)
-#define SUBSTITUTE_USER $(user)
-#define SUBSTITUTE_INSTPATH $(instpath)
-#define SUBSTITUTE_PROGPATH $(progpath)
-#define SUBSTITUTE_USERPATH $(userpath)
-#define SUBSTITUTE_INSTURL $(insturl)
-#define SUBSTITUTE_PROGURL $(progurl)
-#define SUBSTITUTE_USERURL $(userurl)
-#define SUBSTITUTE_PATH $(path)
-//#define SUBSTITUTE_LANG $(lang)
-#define SUBSTITUTE_LANGID $(langid)
-#define SUBSTITUTE_VLANG$(vlang)
-#define SUBSTITUTE_WORKDIRURL $(workdirurl)
-
-#define STRPOS_NOTFOUND -1
+#define SUBSTITUTE_INSTPATH $(instpath)
+#define SUBSTITUTE_PROGPATH $(progpath)
+#define SUBSTITUTE_USERPATH $(userpath)
+#define SUBSTITUTE_PATH $(path)
+
+#define STRPOS_NOTFOUND -1
struct OUStringHashCode
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_test_filters.mk sc/prj sc/source
sc/CppunitTest_sc_test_filters.mk |2 ++
sc/prj/build.lst |2 +-
sc/source/ui/inc/namedlg.hxx |2 ++
sc/source/ui/namedlg/namedlg.cxx | 34 ++
sc/source/ui/src/namedlg.src |8
5 files changed, 43 insertions(+), 5 deletions(-)
New commits:
commit bc406a77b582ab799428b9fbf05afdbed75dbeb7
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Sep 27 16:04:00 2011 +0200
add dependencies for vba unit test
diff --git a/sc/CppunitTest_sc_test_filters.mk
b/sc/CppunitTest_sc_test_filters.mk
index cf524d9..1b13294 100644
--- a/sc/CppunitTest_sc_test_filters.mk
+++ b/sc/CppunitTest_sc_test_filters.mk
@@ -125,6 +125,8 @@ $(eval $(call
gb_RdbTarget_add_old_components,sc_filters_test,\
configmgr \
ucb1 \
ucpfile1 \
+ basprov \
+ scriptframe \
))
# we need to
diff --git a/sc/prj/build.lst b/sc/prj/build.lst
index 7f48e14..27b7c30 100644
--- a/sc/prj/build.lst
+++ b/sc/prj/build.lst
@@ -1,2 +1,2 @@
-sc sc : filter TRANSLATIONS:translations vbahelper oovbaapi
svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test
xmloff desktop ucb package configmgr officecfg NULL
+sc sc : filter TRANSLATIONS:translations vbahelper oovbaapi
svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test
xmloff desktop ucb package configmgr officecfg scripting NULL
sc sc\prj nmake - all sc_prj NULL
commit acbeb839aa718381f13f4f3097ff17ee46e06de8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Sep 27 15:16:17 2011 +0200
move the checkboxes below the more button
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 8a55623..c956cc1 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -188,6 +188,7 @@ private:
void ScopeChanged();
void NameModified();
void BackPushed();
+void MorePushed();
void SelectionChanged();
@@ -201,6 +202,7 @@ private:
DECL_LINK( SelectionChangedHdl_Impl, void* );
DECL_LINK( BackBtnHdl, void * );
DECL_LINK( ScopeChangedHdl, void* );
+DECL_LINK( MoreBtnHdl, void* );
protected:
virtual voidRefInputDone( sal_Bool bForced = sal_False );
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 47ff629..1e5733a 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -304,6 +304,7 @@ void ScNameDlg::Init()
maLbScope.SetSelectHdl( LINK(this, ScNameDlg, ScopeChangedHdl) );
maBtnDelete.SetClickHdl ( LINK( this, ScNameDlg, RemoveBtnHdl ) );
maBtnModify.SetClickHdl ( LINK( this, ScNameDlg, ModifyBtnHdl ) );
+maBtnMore.SetClickHdl ( LINK( this, ScNameDlg, MoreBtnHdl ) );
maBtnBack.Disable();
@@ -644,6 +645,34 @@ void ScNameDlg::ModifiedPushed()
}
}
+namespace {
+
+void MoveWindow( Window rButton, long nPixel)
+{
+Point aPoint = rButton.GetPosPixel();
+aPoint.Y() += nPixel;
+rButton.SetPosPixel(aPoint);
+}
+
+}
+
+void ScNameDlg::MorePushed()
+{
+//depending on the state of the button, move all elements beloe up/down
+long nPixel = 85;
+if (!maBtnMore.GetState())
+{
+nPixel *= -1;
+}
+MoveWindow(maBtnAdd, nPixel);
+MoveWindow(maBtnModify, nPixel);
+MoveWindow(maBtnBack, nPixel);
+MoveWindow(maBtnDelete, nPixel);
+MoveWindow(maBtnHelp, nPixel);
+MoveWindow(maBtnClose, nPixel);
+MoveWindow(maFlDiv, nPixel);
+}
+
IMPL_LINK( ScNameDlg, CloseBtnHdl, void *, EMPTYARG )
{
Close();
@@ -698,4 +727,9 @@ IMPL_LINK( ScNameDlg, ScopeChangedHdl, void*, EMPTYARG )
return 0;
}
+IMPL_LINK( ScNameDlg, MoreBtnHdl, void*, EMPTYARG )
+{
+MorePushed();
+return 0;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index be1c84c..00c5c82 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -148,7 +148,7 @@ ModelessDialog RID_SCDLG_NAMES
CheckBox BTN_PRINTAREA
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA;
-Pos = MAP_APPFONT ( 6 , 255 ) ;
+Pos = MAP_APPFONT ( 6 , 208 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = ~Print range ;
TabStop = TRUE ;
@@ -156,7 +156,7 @@ ModelessDialog RID_SCDLG_NAMES
CheckBox BTN_CRITERIA
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA;
-Pos = MAP_APPFONT ( 6 , 270 ) ;
+Pos = MAP_APPFONT ( 6 , 223 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = ~Filter ;
TabStop = TRUE ;
@@ -164,7 +164,7 @@ ModelessDialog RID_SCDLG_NAMES
CheckBox BTN_ROWHEADER
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER;
-Pos = MAP_APPFONT ( 110, 270 ) ;
+Pos = MAP_APPFONT ( 110, 223 ) ;
Size = MAP_APPFONT ( 82 , 10 ) ;
[Libreoffice-commits] .: cui/source sd/source vcl/inc vcl/source
cui/source/inc/cuitabarea.hxx|6 ++---
cui/source/tabpages/tabarea.cxx |8 ---
cui/source/tabpages/tabline.cxx | 12 ---
cui/source/tabpages/tparea.cxx |9 +++-
cui/source/tabpages/tpbitmap.cxx | 36 +--
cui/source/tabpages/tpcolor.cxx | 40 ---
cui/source/tabpages/tpgradnt.cxx | 33 ++--
cui/source/tabpages/tphatch.cxx | 33 ++--
cui/source/tabpages/tpline.cxx | 21 +++-
cui/source/tabpages/tplnedef.cxx | 30 +
cui/source/tabpages/tplneend.cxx | 30 +
cui/source/tabpages/tpshadow.cxx | 14 +
sd/source/ui/dlg/tpoption.cxx|8 ---
vcl/inc/vcl/window.hxx |2 +
vcl/source/window/window2.cxx| 16 +++
15 files changed, 100 insertions(+), 198 deletions(-)
New commits:
commit 642553238cc531f39049150ff52cf4e152b5abe6
Author: Michael Meeks michael.me...@suse.com
Date: Tue Sep 27 12:37:00 2011 +0100
add GetParentDialog to VCL's Window, and remove DLGWIN cut/paste
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 69102ba..64801ca 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -653,9 +653,9 @@ class SvxLoadSaveEmbed {
DECL_LINK( ClickLoadHdl_Impl, void * );
DECL_LINK( ClickSaveHdl_Impl, void * );
public:
-SvxLoadSaveEmbed( Window *pParent, const ResId aLoad,
- const ResId aSave, const ResId aEmbed,
- const ResId aTableName,
+SvxLoadSaveEmbed( Window *pParent, Window *pDialog,
+ const ResId aLoad, const ResId aSave,
+ const ResId aEmbed, const ResId aTableName,
XPropertyListType t, XOutdevItemPool* mpXPool );
XPropertyListRef GetList();
void HideLoadSaveEmbed();
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index f4634c0..cda945a 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -48,14 +48,6 @@
#include dlgname.hxx
#include dialmgr.hxx
-#define DLGWIN this-GetParent()-GetParent()
-
-/*
-|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
-|*
-|/
-
SvxAreaTabDialog::SvxAreaTabDialog
(
Window* pParent,
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 3620265..1e14d9d 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -45,18 +45,6 @@
#include svx/xtable.hxx
#include svx/drawitem.hxx
-#define DLGWIN this-GetParent()-GetParent()
-
-#define BITMAP_WIDTH 32
-#define BITMAP_HEIGHT 12
-#define XOUT_WIDTH150
-
-/*
-|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
-|*
-\/
-
SvxLineTabDialog::SvxLineTabDialog
(
Window* pParent,
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index c675255..93244a3 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -54,7 +54,6 @@
#include svl/intitem.hxx
#include sfx2/request.hxx
#include paragrph.hrc
-#define DLGWIN this-GetParent()-GetParent()
// static
@@ -812,7 +811,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet rSet )
if( *pnBitmapListState )
{
if( *pnBitmapListState CT_CHANGED )
-pBitmapList = ( (SvxAreaTabDialog*) DLGWIN )-
+pBitmapList = ( (SvxAreaTabDialog*) GetParentDialog() )-
GetNewBitmapList();
_nPos = aLbBitmap.GetSelectEntryPos();
@@ -832,7 +831,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet rSet )
if( *pnHatchingListState )
{
if( *pnHatchingListState CT_CHANGED )
-pHatchingList = ( (SvxAreaTabDialog*) DLGWIN )-
+pHatchingList = ( (SvxAreaTabDialog*) GetParentDialog() )-
GetNewHatchingList();
_nPos = aLbHatching.GetSelectEntryPos();
@@ -854,7 +853,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet rSet )
if( *pnGradientListState )
{
if( *pnGradientListState CT_CHANGED )
-pGradientList = ( (SvxAreaTabDialog*) DLGWIN )-
+pGradientList = ( (SvxAreaTabDialog*) GetParentDialog() )-
GetNewGradientList();
[Libreoffice-commits] .: cairo/cairo
cairo/cairo/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 516d2e05183770d93037b388a2af4928d90bf83a Author: Tor Lillqvist t...@iki.fi Date: Tue Sep 27 17:53:25 2011 +0300 Hmm, why did I think the ATSUI API would be gone in the 10.5 SDK? The ATSUI API that cairo uses seems to compile fine against both 10.5 and 10.6 SDKs. Maybe then against 10.7 it won't? diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 500cdea..fda29af 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -108,7 +108,7 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) .ENDIF # $(SYSBASE)!= CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . .$/configure -.IF $(MAC_OS_X_VERSION_MIN_REQUIRED) = 1050 +.IF $(MAC_OS_X_VERSION_MIN_REQUIRED) = 1070 PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch .ENDIF CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - redland/raptor redland/rasqal redland/redland
redland/raptor/makefile.mk|1
redland/raptor/raptor-1.4.18.patch.rindex | 62 ++
redland/rasqal/makefile.mk|2
redland/rasqal/rasqal-0.9.16.patch.autotools | 27 +++
redland/redland/makefile.mk |2
redland/redland/redland-1.0.8.patch.autotools | 11
6 files changed, 83 insertions(+), 22 deletions(-)
New commits:
commit 201344f80572d839f9c5ff7ff6359f6555f93932
Author: Thorsten Behrens tbehr...@novell.com
Date: Tue Sep 27 17:42:51 2011 +0200
Replace raptor rindex calls with strrchr
Seems android libc is missing that - replaced by non-deprecated
posix func.
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 3b6f696..d437a4d 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -57,6 +57,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \
+$(TARFILE_NAME).patch.rindex \
raptor-aix.patch
.IF $(CROSS_COMPILING)==YES
diff --git a/redland/raptor/raptor-1.4.18.patch.rindex
b/redland/raptor/raptor-1.4.18.patch.rindex
new file mode 100644
index 000..d0c0652
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.rindex
@@ -0,0 +1,62 @@
+--- misc/raptor-1.4.18/librdfa/curie.c 2008-06-14 07:33:37.0 +0200
misc/build/raptor-1.4.18/librdfa/curie.c 2011-09-27 14:48:34.0
+0200
+@@ -122,7 +122,7 @@
+ {
+ // if we have a relative URI, chop off the name of the file
+ // and replace it with the relative pathname
+- char* end_index = rindex(context-base, '/');
++ char* end_index = strrchr(context-base, '/');
+
+ if(end_index != NULL)
+ {
+@@ -130,7 +130,7 @@
+ char* end_index2;
+
+ tmpstr = rdfa_replace_string(tmpstr, context-base);
+-end_index2= rindex(tmpstr, '/');
++end_index2= strrchr(tmpstr, '/');
+ end_index2++;
+ *end_index2 = '\0';
+
+--- misc/raptor-1.4.18/librdfa/rdfa.c 2008-06-16 04:02:58.0 +0200
misc/build/raptor-1.4.18/librdfa/rdfa.c2011-09-27 15:03:12.0
+0200
+@@ -163,7 +163,7 @@
+ {
+ char* href_start = strstr(base_start, href=);
+ char* uri_start = href_start + 6;
+- char* uri_end = index(uri_start, '');
++ char* uri_end = strchr(uri_start, '');
+
+ if((uri_start != NULL) (uri_end != NULL))
+ {
+@@ -898,8 +898,8 @@
+ if(context-xml_literal != NULL)
+ {
+ // get the data between the first tag and the last tag
+- content_start = index(context-xml_literal, '');
+- content_end = rindex(context-xml_literal, '');
++ content_start = strchr(context-xml_literal, '');
++ content_end = strrchr(context-xml_literal, '');
+
+ if((content_start != NULL) (content_end != NULL))
+ {
+--- misc/raptor-1.4.18/librdfa/triple.c2008-06-14 07:33:37.0
+0200
misc/build/raptor-1.4.18/librdfa/triple.c 2011-09-27 15:02:59.0
+0200
+@@ -437,7 +437,7 @@
+ current_object_literal = context-content;
+ type = RDF_TYPE_PLAIN_LITERAL;
+}
+- else if(index(context-xml_literal, '') == NULL)
++ else if(strchr(context-xml_literal, '') == NULL)
+{
+ current_object_literal = context-plain_literal;
+ type = RDF_TYPE_PLAIN_LITERAL;
+@@ -467,7 +467,7 @@
+// [current element], i.e., not including the element itself, and
+// giving it a datatype of rdf:XMLLiteral.
+if((current_object_literal == NULL)
+- (index(context-xml_literal, '') != NULL)
++ (strchr(context-xml_literal, '') != NULL)
+ ((context-datatype == NULL) ||
+(strcmp(context-datatype,
+http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral;) ==
0)))
commit e4486fe169054dde895e69a452aad94d3f3ca74a
Author: Thorsten Behrens tbehr...@novell.com
Date: Tue Sep 27 17:40:43 2011 +0200
More Android config.sub fixing.
More parse fixing for android os string.
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index ce3a6cf..dbad2d2 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -144,7 +144,7 @@ OUT2INC+=src$/rasqal.h
.IF $(OS)==MACOSX
OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib
src$/.libs$/librasqal.dylib
OUT2BIN+=src/rasqal-config
-.ELIF $(OS)==IOS || $(OS)==ANDROID
+.ELIF $(OS)==IOS
OUT2LIB+=src$/.libs$/librasqal.a
OUT2BIN+=src/rasqal-config
.ELIF $(OS)==WNT
diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools
b/redland/rasqal/rasqal-0.9.16.patch.autotools
index 19b8792..a8e07a3 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.autotools
+++ b/redland/rasqal/rasqal-0.9.16.patch.autotools
@@ -1,14 +1,23 @@
misc/rasqal-0.9.16/config.sub
-+++ misc/build/rasqal-0.9.16/config.sub
-@@ -1272,7 +1272,7
[Libreoffice-commits] .: redland/redland
redland/redland/redland-1.0.8.patch.autotools | 20 1 file changed, 20 insertions(+) New commits: commit ed73eb561c8176ac552d8cab0a587043c25f6799 Author: Thorsten Behrens tbehr...@novell.com Date: Tue Sep 27 18:06:49 2011 +0200 More Android config.sub fixing. This time the redland library. diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools index 5b29d0b..c46b69d 100644 --- a/redland/redland/redland-1.0.8.patch.autotools +++ b/redland/redland/redland-1.0.8.patch.autotools @@ -1,3 +1,23 @@ +--- misc/redland-1.0.8/config.sub 2008-06-28 19:57:26.0 +0200 misc/build/redland-1.0.8/config.sub2011-09-27 15:16:38.0 +0200 +@@ -120,7 +120,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* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1262,7 +1262,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* \ --- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008 +++ misc/build/redland-1.0.8/configure Wed Feb 18 13:27:43 2009 @@ -4671,7 +4671,7 @@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executa
desktop/Executable_quickstart.mk |2 +- desktop/Executable_sbase.mk|2 +- desktop/Executable_scalc.mk|2 +- desktop/Executable_sdraw.mk|2 +- desktop/Executable_simpress.mk |2 +- desktop/Executable_smath.mk|2 +- desktop/Executable_soffice.mk |2 +- desktop/Executable_sweb.mk |2 +- desktop/Executable_swriter.mk |2 +- solenv/gbuild/Library.mk |1 - solenv/gbuild/platform/windows.mk | 14 -- solenv/gbuild/platform/winmingw.mk | 14 -- vcl/Library_vcl.mk |2 +- 13 files changed, 26 insertions(+), 23 deletions(-) New commits: commit b6d8251eee90b7e24ebb3f8452eff36a507e6d91 Author: David Tardon dtar...@redhat.com Date: Tue Sep 27 20:00:22 2011 +0200 move windows-only call into platform/win* diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index baa8d9e..10bee87 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -60,7 +60,6 @@ $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk endif $(call gb_Library_get_target,$(1)) : AUXTARGETS := $(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1))) -$(call gb_Library_add_default_nativeres,$(1),$(1)/default) endef diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index e2ba1a4..901b57a 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -508,6 +508,8 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \ $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \ $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \ +$(call gb_Library_add_default_nativeres,$(1),$(1)/default) + endif $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index 50a5a7e..d4f475c 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -516,6 +516,8 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) +$(call gb_Library_add_default_nativeres,$(1),$(1)/default) + endef define gb_Library_add_default_nativeres commit 2e2dcefb5fde4672f1fef96a3be6a046c3bad3bb Author: David Tardon dtar...@redhat.com Date: Tue Sep 27 19:54:42 2011 +0200 make WinResTarget's name independent of LinkTarget diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 593ef1f..3259cc1 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -60,6 +60,6 @@ $(eval $(call gb_Executable_add_exception_objects,quickstart,\ desktop/win32/source/QuickStart/QuickStart \ )) -$(eval $(call gb_Executable_add_nativeres,quickstart,src)) +$(eval $(call gb_Executable_add_nativeres,quickstart,quickstart/src)) # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index d5e0991..14e6487 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sbase,\ desktop/win32/source/applauncher/sbase \ )) -$(eval $(call gb_Executable_add_nativeres,sbase,src)) +$(eval $(call gb_Executable_add_nativeres,sbase,sbase/src)) # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 550add6..401e557 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,scalc,\ desktop/win32/source/applauncher/scalc \ )) -$(eval $(call gb_Executable_add_nativeres,scalc,src)) +$(eval $(call gb_Executable_add_nativeres,scalc,scalc/src)) # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 29fb387..e8296e7 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sdraw,\ desktop/win32/source/applauncher/sdraw \ )) -$(eval $(call gb_Executable_add_nativeres,sdraw,src)) +$(eval $(call gb_Executable_add_nativeres,sdraw,sdraw/src)) # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 281718c..1b649d8 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,simpress,\ desktop/win32/source/applauncher/simpress \ )) -$(eval $(call gb_Executable_add_nativeres,simpress,src)) +$(eval $(call gb_Executable_add_nativeres,simpress,simpress/src)) # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index e8de100..365c435 100644 --- a/desktop/Executable_smath.mk +++
[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch binfilter/bf_xmloff binfilter/inc
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx |4 -
binfilter/bf_sc/source/core/tool/sc_compiler.cxx |6 -
binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx |2
binfilter/bf_sch/source/core/sch_memchrt.cxx | 30 -
binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx| 34 --
binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx | 18 ++---
binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx|6 -
binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx |6 -
binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx | 42 ++---
binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx|2
binfilter/inc/bf_sch/memchrt.hxx |2
11 files changed, 74 insertions(+), 78 deletions(-)
New commits:
commit 34c2ec87db4b6962ded661157056c58163e39821
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 27 20:23:45 2011 +0200
Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const
*().
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index 8e72ef0..55ac80e 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -1245,8 +1245,8 @@ bool
ODatabaseForm::fillParameters(::osl::ResettableMutexGuard _rClearForNotifi
}
catch( const Exception )
{
-OSL_FAIL( ::rtl::OString(
ODatabaseForm::fillParameters: master-detail parameter number )
-+= ::rtl::OString::valueOf(
sal_Int32(aFind-second + 1) ));
+OSL_FAIL( (::rtl::OString(
ODatabaseForm::fillParameters: master-detail parameter number )
+ += ::rtl::OString::valueOf(
sal_Int32(aFind-second + 1) )).getStr() );
}
++aFind;
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index 73d6ae7..dbb3a44 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -2992,7 +2992,7 @@ namespace binfilter {
/*N*/ {
/*N*/ ::rtl::OUStringBuffer aBuffer;
/*N*/ ScToken* p = CreateStringFromToken( aBuffer, pInToken,
bAllowArrAdvance );
-/*N*/ rFormula += aBuffer;
+/*N*/ rFormula += aBuffer.makeStringAndClear();
/*N*/ return p;
/*N*/ }
@@ -3140,7 +3140,7 @@ namespace binfilter {
/*?*/ break;
/*?*/ }
/*N*/ if ( aBuffer.getLength() )
-/*N*/ rBuffer.append(aBuffer);
+/*N*/ rBuffer.append(aBuffer.makeStringAndClear());
/*N*/ else
/*?*/ rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
/*N*/ break;
@@ -3177,7 +3177,7 @@ namespace binfilter {
/*N*/ {
/*N*/ ::rtl::OUStringBuffer aBuffer( pArr-GetLen() * 2 );
/*N*/ CreateStringFromTokenArray( aBuffer );
-/*N*/ rFormula = aBuffer;
+/*N*/ rFormula = aBuffer.makeStringAndClear();
/*N*/ }
/*N*/ void ScCompiler::CreateStringFromTokenArray( ::rtl::OUStringBuffer
rBuffer )
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx
b/binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx
index 2d1e506..0c297aa 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx
@@ -100,7 +100,7 @@ void ScXMLContentContext::Characters( const
::rtl::OUString rChars )
void ScXMLContentContext::EndElement()
{
-sValue.append(sOUText);
+sValue.append(sOUText.toString());
}
}
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx
b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index a8967e7..bf5e151 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -686,41 +686,39 @@ using namespace ::com::sun::star;
//
-/*N*/ ::rtl::OUStringBuffer SchMemChart::getXMLStringForCellAddress( const
SchCellAddress rCell )
+/*N*/ void SchMemChart::getXMLStringForCellAddress( const SchCellAddress
rCell, rtl::OUStringBuffer * output )
/*N*/ {
-/*N*/ ::rtl::OUStringBuffer aBuffer;
+/*N*/ OSL_ASSERT(output != 0);
/*N*/ ::std::vector SchSingleCell ::const_iterator aIter;
/*N*/ const ::std::vector SchSingleCell ::const_iterator aEndIter =
rCell.maCells.end();
/*N*/
/*N*/ for( aIter = rCell.maCells.begin(); aIter != aEndIter; aIter++ )
/*N*/ {
/*N*/ sal_Int32 nCol = aIter-mnColumn;
-/*N*/ aBuffer.append( (sal_Unicode)'.' );
+/*N*/ output-append( (sal_Unicode)'.' );
/*N*/ if( ! aIter-mbRelativeColumn )
[Libreoffice-commits] .: vcl/ios
vcl/ios/source/dtrans/ios_clipboard.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 296823ab8634b0980fc8fe81a2de2b043d036179
Author: Tor Lillqvist t...@iki.fi
Date: Tue Sep 27 22:35:24 2011 +0300
More WaE fixes for iOS
diff --git a/vcl/ios/source/dtrans/ios_clipboard.cxx
b/vcl/ios/source/dtrans/ios_clipboard.cxx
index 69f9473..a59d023 100644
--- a/vcl/ios/source/dtrans/ios_clipboard.cxx
+++ b/vcl/ios/source/dtrans/ios_clipboard.cxx
@@ -184,8 +184,8 @@ ReferenceXTransferable SAL_CALL
IosClipboard::getContents() throw(RuntimeExcep
}
-void SAL_CALL IosClipboard::setContents(const ReferenceXTransferable
xTransferable,
-const ReferenceXClipboardOwner xClipboardOwner)
+void SAL_CALL IosClipboard::setContents(const ReferenceXTransferable
/*xTransferable*/,
+const ReferenceXClipboardOwner
/*xClipboardOwner*/)
throw( RuntimeException )
{
#if 0 // ???
@@ -321,7 +321,7 @@ void
IosClipboard::fireLostClipboardOwnershipEvent(ReferenceXClipboardOwner ol
}
-void IosClipboard::provideDataForType(UIPasteboard* sender, NSString* type)
+void IosClipboard::provideDataForType(UIPasteboard* /*sender*/, NSString*
/*type*/)
{
#if 0 // ???
if( mXClipboardContent.is() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: idlc/source
idlc/source/idlccompile.cxx | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit 82836f28150a48a5ffce41d189cc8a62393c2ae0 Author: Tor Lillqvist t...@iki.fi Date: Tue Sep 27 22:44:33 2011 +0300 WaE: comparison between signed and unsigned integer expressions diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 281d2b2..8e3d4d4 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -152,12 +152,11 @@ OString makeTempName(const OString prefix) #if defined(SAL_W32) || defined(SAL_UNX) -OSL_ASSERT( sizeof(tmpFilePattern) ( tmpPath.getLength() - + RTL_CONSTASCII_LENGTH( -PATH_SEPARATOR ) - + prefix.getLength() - + RTL_CONSTASCII_LENGTH( -XX) ) ); +OSL_ASSERT( sizeof(tmpFilePattern) +(size_t) ( tmpPath.getLength() + + RTL_CONSTASCII_LENGTH( PATH_SEPARATOR ) + + prefix.getLength() + + RTL_CONSTASCII_LENGTH( XX) ) ); tmpFilePattern[ sizeof(tmpFilePattern)-1 ] = '\0'; strncpy(tmpFilePattern, tmpPath.getStr(), sizeof(tmpFilePattern)-1); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: icu/makefile.mk
icu/makefile.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 2a214cc6d34937a5a996f9fd4b6eb6ed4823f727 Author: Tor Lillqvist t...@iki.fi Date: Tue Sep 27 23:31:37 2011 +0300 Compile also ICU for debugging if --enable-debug diff --git a/icu/makefile.mk b/icu/makefile.mk index 65ba458..c1b7a0b 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -76,9 +76,14 @@ CC:=gcc $(EXTRA_CFLAGS) .ENDIF # $(EXTRA_CFLAGS)!= .ENDIF # $(OS)==MACOSX +.IF $(debug) != +icu_CFLAGS+=-g $(ARCH_FLAGS) +icu_CXXFLAGS+=-g $(ARCH_FLAGS) +.ELSE icu_CFLAGS+=-O $(ARCH_FLAGS) -icu_LDFLAGS+=$(EXTRA_LINKFLAGS) icu_CXXFLAGS+=-O $(ARCH_FLAGS) +.ENDIF +icu_LDFLAGS+=$(EXTRA_LINKFLAGS) # until someone introduces SOLARIS 64-bit builds .IF $(OS)==SOLARIS ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: formula/source
formula/source/core/api/FormulaCompiler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 928f7a47a15d53817697283ba0a7fa4987ea458f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Sep 27 23:11:16 2011 +0200
Fixx FormulaCompiler build after the O[U]String[Buffer] changes
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index da3682e..2543caf 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1609,7 +1609,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken(
String rFormula, FormulaT
{
rtl::OUStringBuffer aBuffer;
FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP,
bAllowArrAdvance );
-rFormula += aBuffer.makeStringAndClear();
+rFormula += aBuffer.makeStringAndClear().getStr();
return p;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: formula/source
formula/source/core/api/FormulaCompiler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 59af654b80c595905ebf4fbc5c6454359beda337
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 27 23:28:58 2011 +0200
Revert Fixx FormulaCompiler build after the O[U]String[Buffer] changes
Obsoleted by the subsequent fix to tools/string.hxx.
This reverts commit 928f7a47a15d53817697283ba0a7fa4987ea458f.
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 2543caf..da3682e 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1609,7 +1609,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken(
String rFormula, FormulaT
{
rtl::OUStringBuffer aBuffer;
FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP,
bAllowArrAdvance );
-rFormula += aBuffer.makeStringAndClear().getStr();
+rFormula += aBuffer.makeStringAndClear();
return p;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/attr/cellatr.cxx |2 --
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx |2 +-
sw/source/core/doc/docbm.cxx |4 ++--
sw/source/ui/config/caption.cxx |4
sw/source/ui/lingu/hyp.cxx |4
sw/source/ui/shells/textsh1.cxx | 22 --
6 files changed, 3 insertions(+), 35 deletions(-)
New commits:
commit 199d83a44d07eeed1ffb27ad2a2f3ba5e40a0491
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Sep 28 13:47:45 2011 +0900
removed dead code
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index abd2dfd..d2b566d 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -43,8 +43,6 @@
#include switerator.hxx
-//TYPEINIT1( SwFmt, SwClient ); //rtti fuer SwFmt
-
/*
|*
*/
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx
index 405a976..e24262f 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/ui/config/caption.cxx
@@ -29,15 +29,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include precompiled_sw.hxx
-
#include osl/diagnose.h
#include numrule.hxx
#include caption.hxx
-#define VERSION_01 1
-#define CAPTION_VERSION VERSION_01
-
InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName*
pOleId) :
bUseCaption(sal_False),
eObjType(eType),
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx
index 2795507..26c0276 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/ui/lingu/hyp.cxx
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include precompiled_sw.hxx
-
-
#include initui.hxx
#include view.hxx
#include edtwin.hxx
@@ -42,14 +40,12 @@
#include com/sun/star/beans/XPropertySet.hpp
#include swwait.hxx
-
#include hyp.hxx
#include mdiexp.hxx
#include olmenu.hrc
#include unomid.h
-#define HYPHHERE'-'
#define PSH (pView-GetWrtShell())
using namespace ::com::sun::star;
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 7ccc72d..55a268e 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1480,29 +1480,7 @@ void SwTextShell::GetState( SfxItemSet rSet )
case FN_INSERT_PAGEHEADER:
case FN_INSERT_PAGEFOOTER:
{
-#ifndef CHECK_MENU
rSet.Put( SfxObjectShellItem( nWhich, GetView().GetDocShell()
));
-#else
-// Seitenvorlagen besorgen
-sal_Bool bFound = sal_False;
-sal_uInt16 n, nCnt = rSh.GetPageDescCnt();
-for( n = 0; n nCnt; ++n )
-{
-const SwPageDesc rDesc = rSh.GetPageDesc( n );
-if( FN_INSERT_PAGEHEADER == nWhich
-? !rDesc.GetMaster().GetHeader().IsActive()
-: !rDesc.GetMaster().GetFooter().IsActive() )
-{
-bFound = sal_True;
-break;
-}
-}
-
-if( bFound )
-rSet.Put( SfxObjectShellItem( nWhich,
GetView().GetDocShell() ));
-else
-rSet.DisableItem( nWhich );
-#endif
}
break;
case FN_TABLE_SORT_DIALOG:
commit a80533c4a787e30973316778d482b0245815fac9
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Sep 28 00:14:05 2011 +0900
fix typo in message
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index c228387..fdd9c5a 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -122,7 +122,7 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any rVal,
sal_uInt8 nMemberId
}
break;
default:
-OSL_FAIL( SwFmtWrapInfluenceOnObjPos::QueryValue() - unknown
MemberId );
+OSL_FAIL( SwFmtWrapInfluenceOnObjPos::PutValue(..) - unknown
MemberId );
bRet = false;
}
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index a867f99..27c2211 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -481,7 +481,7 @@ namespace sw { namespace mark
bool MarkManager::renameMark(::sw::mark::IMark* io_pMark, const
::rtl::OUString rNewName)
{
OSL_PRECOND(io_pMark-GetMarkPos().GetDoc() == m_pDoc,
-MarkManager::repositionMark(..)
+MarkManager::renameMark(..)
- Mark is not in my doc.);
if(io_pMark-GetName() == rNewName)
return true;
@@ -748,7 +748,7 @@ namespace sw { namespace mark
