[Libreoffice-commits] .: sw/source
sw/source/core/doc/docdesc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ac73606a70618879f81a370e5ad24d84f46b8c66
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Thu Nov 24 09:12:56 2011 +0100
more German transaltions in docdesc.cxx
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 30f..b183466 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -113,7 +113,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
}
else
{
-nMinTop = nMinBottom = 1440;//al la WW: 1 Inch
+nMinTop = nMinBottom = 1440;// is like: 1 Inch
nMinLeft = nMinRight = 1800;// 1,25 Inch
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source
scp2/source/impress/registryitem_impress.scp |1 + 1 file changed, 1 insertion(+) New commits: commit 4e8524bdf3d4cec373bf0d1eb7295d8963a7bcdd Author: Tor Lillqvist tlillqv...@novell.com Date: Thu Aug 25 15:25:35 2011 +0300 Add .ppsx fdo#39963 Signed-off-by: Andras Timar ati...@suse.com diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index 063bcf9..ead0603 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -1034,6 +1034,7 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti ) CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_MSO_Reg, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_MSO_Reg, pps, PPS, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg, ppsx, PPSX, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot, gid_Module_Prg_Impress_MSO_Reg, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: icc/source
icc/source/create_sRGB_profile/makefile.mk |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit d24778870ab356828c3cf6d884b6630433549e34 Author: Jan Holesovsky ke...@suse.cz Date: Thu Nov 24 10:55:12 2011 +0100 Fix icc cross-compilation. diff --git a/icc/source/create_sRGB_profile/makefile.mk b/icc/source/create_sRGB_profile/makefile.mk index 56a9a67..8aab067 100644 --- a/icc/source/create_sRGB_profile/makefile.mk +++ b/icc/source/create_sRGB_profile/makefile.mk @@ -47,8 +47,8 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE CFLAGS+=$(SAMPLEICC_CFLAGS) .ELSE CFLAGS+= \ --I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/IccProfLib \ - -I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/Contrib$/ICC_utils +-I$(PRJ)$(INPATH)$/misc$/build$/SampleICC-1.3.2$/IccProfLib \ +-I$(PRJ)$(INPATH)$/misc$/build$/SampleICC-1.3.2$/Contrib$/ICC_utils .ENDIF # --- Files @@ -82,4 +82,8 @@ APP1OBJS= $(OBJFILES) ALLTAR: $(TARGET)$(EXECPOST) $(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST) +.IF $(CROSS_COMPILING) != YES cd $(BIN)$/ $(BIN)$/$(TARGET)$(EXECPOST) +.ELSE +cd $(BIN)$/ $(SRC_ROOT)$/icc$/$(INPATH_FOR_BUILD)$/bin$/$(TARGET) +.ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source
sc/source/filter/excel/xeview.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0bde24644b5457aa193ecc84ba37169a967de1c6
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Wed Nov 23 18:23:14 2011 -0500
fdo#39589: Avoid using ulimit_cast between signed and unsigned.
If you do, things go very very wrong. These *limit_cast try to be
clever and check ranges of various types before casting, but they
fail to do the right thing when casting a signed integer into unsigned.
Signed-off-by: Lionel Elie Mamane lio...@mamane.lu
diff --git a/sc/source/filter/excel/xeview.cxx
b/sc/source/filter/excel/xeview.cxx
index 437a953..5a02c3f 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -368,8 +368,8 @@ XclExpTabViewSettings::XclExpTabViewSettings( const
XclExpRoot rRoot, SCTAB nSc
else
{
// split window: position is in twips
-maData.mnSplitX = ulimit_cast sal_uInt16 (
rTabSett.maSplitPos.X() );
-maData.mnSplitY = ulimit_cast sal_uInt32 (
rTabSett.maSplitPos.Y() );
+maData.mnSplitX = static_castsal_uInt16(rTabSett.maSplitPos.X());
+maData.mnSplitY = static_castsal_uInt32(rTabSett.maSplitPos.Y());
}
// selection
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/xsltdialog/xmlfiltersettingsdialog.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 22468d4d7a03c0b002f76111950166e2a6bbee97 Author: Andras Timar ati...@suse.com Date: Thu Nov 24 11:56:19 2011 +0100 Global resources should have an identifier = 256 diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hrc b/filter/source/xsltdialog/xmlfiltersettingsdialog.hrc index d611e2d..7f12904 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hrc +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hrc @@ -39,5 +39,5 @@ #define PB_XML_FILTER_OPEN 7 #define BTN_XML_FILTER_HELP 8 #define PB_XML_FILTER_CLOSE 9 -#define STR_XML_FILTER_LISTBOX 10 +#define STR_XML_FILTER_LISTBOX 1000 #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - scripting/Extension_ScriptProviderForPython.mk scripting/source swext/Extension_wiki-publisher.mk swext/mediawiki swext/Zip_mediawiki_develop.mk
scripting/Extension_ScriptProviderForPython.mk|2 ++
scripting/source/pyprov/components.rdb|9 +
scripting/source/pyprov/manifest.xml |4 ++--
swext/Extension_wiki-publisher.mk |1 +
swext/Zip_mediawiki_develop.mk|1 +
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 10 --
swext/mediawiki/src/components.rdb| 11 +++
swext/mediawiki/src/manifest.xml |4 ++--
8 files changed, 28 insertions(+), 14 deletions(-)
New commits:
commit a91784222d777b66e3df645a86f40afb224e2537
Author: Michael Meeks michael.me...@suse.com
Date: Thu Nov 24 11:30:27 2011 +
remove legacy mediawiki active registration hook
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index 0350e07..597bfb7 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -108,16 +108,6 @@ public final class WikiEditorImpl extends WeakBase
return xFactory;
}
-public static boolean __writeRegistryServiceInfo( XRegistryKey
xRegistryKey )
-{
-boolean bResult = Factory.writeRegistryServiceInfo(
m_implementationName,
-m_serviceNames,
-xRegistryKey );
-return ( bResult Factory.writeRegistryServiceInfo(
WikiOptionsEventHandlerImpl.m_sImplementationName,
-
WikiOptionsEventHandlerImpl.m_pServiceNames,
- xRegistryKey ) );
-}
-
// com.sun.star.lang.XServiceInfo:
public String getImplementationName()
{
commit 148529c36cd6245c066289da8889aef506fd04bd
Author: Michael Meeks michael.me...@suse.com
Date: Wed Nov 23 17:14:33 2011 +
switch python scripting extension to passive registration
diff --git a/scripting/Extension_ScriptProviderForPython.mk
b/scripting/Extension_ScriptProviderForPython.mk
index 08d3cc7..4c4b043 100644
--- a/scripting/Extension_ScriptProviderForPython.mk
+++ b/scripting/Extension_ScriptProviderForPython.mk
@@ -30,5 +30,7 @@ $(eval $(call
gb_Extension_Extension,script-provider-for-python,scripting/source
$(eval $(call
gb_Extension_add_file,script-provider-for-python,pythonscript.py,\
$(SRCDIR)/scripting/source/pyprov/pythonscript.py))
+$(eval $(call gb_Extension_add_file,script-provider-for-python,components.rdb,\
+ $(SRCDIR)/scripting/source/pyprov/components.rdb))
# vim: set noet sw=4 ts=4:
diff --git a/scripting/source/pyprov/components.rdb
b/scripting/source/pyprov/components.rdb
new file mode 100644
index 000..70ee713
--- /dev/null
+++ b/scripting/source/pyprov/components.rdb
@@ -0,0 +1,9 @@
+?xml version=1.0?
+components xmlns=http://openoffice.org/2010/uno-components;
+component loader=com.sun.star.loader.Python uri=./pythonscript.py
+implementation
name=org.openoffice.pyuno.LanguageScriptProviderForPython
+service
name=com.sun.star.script.provider.ScriptProviderForPython/
+service
name=com.sun.star.script.provider.LanguageScriptProvider/
+/implementation
+/component
+/components
diff --git a/scripting/source/pyprov/manifest.xml
b/scripting/source/pyprov/manifest.xml
index 7e4e045..b1d7813 100755
--- a/scripting/source/pyprov/manifest.xml
+++ b/scripting/source/pyprov/manifest.xml
@@ -2,6 +2,6 @@
!DOCTYPE manifest:manifest PUBLIC -//OpenOffice.org//DTD Manifest 1.0//EN
Manifest.dtd
manifest:manifest xmlns:manifest=http://openoffice.org/2001/manifest;
manifest:file-entry
-manifest:media-type=application/vnd.sun.star.uno-component;type=python
-manifest:full-path=pythonscript.py/
+manifest:media-type=application/vnd.sun.star.uno-components
+manifest:full-path=components.rdb/
/manifest:manifest
commit 1025924f709d927db0785ff8099c68c23fdb9df7
Author: Michael Meeks michael.me...@suse.com
Date: Wed Nov 23 16:50:13 2011 +
switch mediawiki extension to passive registration
diff --git a/swext/Extension_wiki-publisher.mk
b/swext/Extension_wiki-publisher.mk
index 05d5fd8..61b39cd 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -46,6 +46,7 @@ $(eval $(call
gb_Extension_add_file,wiki-publisher,Types.xcu,$(WIKISRC)/src/regi
$(eval $(call
gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
$(eval $(call
gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
$(eval $(call
[Libreoffice-commits] .: sw/source
sw/source/core/doc/docdesc.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e4b8c76f9543199a41cd48e42148058a8189ff5f
Author: Michael Meeks michael.me...@suse.com
Date: Thu Nov 24 13:07:19 2011 +0100
better tranlation for a al WW :-)
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index b183466..ab95004 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -113,8 +113,8 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
}
else
{
-nMinTop = nMinBottom = 1440;// is like: 1 Inch
-nMinLeft = nMinRight = 1800;// 1,25 Inch
+nMinTop = nMinBottom = 1440;// as in MS Word: 1 Inch
+nMinLeft = nMinRight = 1800;//1,25 Inch
}
// set margins
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: patches/dev300
patches/dev300/apply|1
patches/dev300/mention-java-common-package.diff | 56
2 files changed, 57 deletions(-)
New commits:
commit bd4f6ffc37e76996f97368bc73844ce68e63acbe
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Nov 24 15:51:28 2011 +0100
remove mention-java-common-package.diff, downstreamed to
debian-experimental-3.5
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ce5a4d6..9967d1a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -345,7 +345,6 @@ debian-default-cairo-disable.diff
# read variables from /etc/libreoffice/sofficerc, since
/usr/lib/libreoffice/sofficerc
# just refers to it
oosplash-etc-libreoffice-sofficerc.diff
-mention-java-common-package.diff, ccheney
# mention openoffice.org-report-builder instead of getting people
# to download it from elsewhere
diff --git a/patches/dev300/mention-java-common-package.diff
b/patches/dev300/mention-java-common-package.diff
deleted file mode 100644
index 766d0a0..000
--- a/patches/dev300/mention-java-common-package.diff
+++ /dev/null
@@ -1,56 +0,0 @@
svtools/source/java/javainteractionhandler.cxx~2008-04-21
21:43:59.249678235 +0200
-+++ svtools/source/java/javainteractionhandler.cxx 2008-04-21
22:12:26.615433459 +0200
-@@ -75,9 +75,10 @@
- #include svtools/javainteractionhandler.hxx
- #include svtools/javacontext.hxx
-
-+#define DEFINE_CONST_UNICODE(CONSTASCII)
UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
-+
- using namespace com::sun::star::uno;
- using namespace com::sun::star::task;
--
- namespace svt
- {
-
-@@ -184,6 +185,9 @@
- aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND ));
-
- aWarningBox.SetText( aTitle );
-+String aText = String(aWarningBox.GetMessText());
-+aText.Append(DEFINE_CONST_UNICODE(\nPlease install the
libreoffice-java-common package for this functionality.));
-+aWarningBox.SetMessText( aText );
- nResult = aWarningBox.Execute();
-
- }
-@@ -256,6 +260,9 @@
- aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED ));
-
- aQueryBox.SetText( aTitle );
-+String aText = String(aQueryBox.GetMessText());
-+aText.Append(DEFINE_CONST_UNICODE(\nPlease install the
libreoffice-java-common package for this functionality.));
-+aQueryBox.SetMessText( aText );
- nResult = aQueryBox.Execute();
- if ( nResult == RET_YES )
- {
-@@ -297,6 +304,9 @@
- aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED));
-
- aErrorBox.SetText( aTitle );
-+String aText = String(aErrorBox.GetMessText());
-+aText.Append(DEFINE_CONST_UNICODE(\nPlease install the
libreoffice-java-common package for this functionality.));
-+aErrorBox.SetMessText( aText );
- nResult = aErrorBox.Execute();
- }
- else
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig 2008-04-11
05:19:31.0 -0500
-+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2009-03-05
19:54:38.0 -0600
-@@ -111,6 +111,9 @@
- if (errcode == JFW_E_NO_JAVA_FOUND)
- {
- fprintf(stderr,javaldx: Could not find a Java Runtime
Environment! \n);
-+fprintf(stderr,Please ensure that a JVM and the package
libreoffice-java-common\n);
-+fprintf(stderr,is installed.\n);
-+fprintf(stderr,If it is already installed then try removing
~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n);
- return false;
- }
- else if (errcode != JFW_E_NONE errcode != JFW_E_DIRECT_MODE)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source oox/inc oox/source svtools/inc svtools/source writerfilter/source
editeng/source/rtf/rtfgrf.cxx |9 ---
oox/inc/oox/helper/graphichelper.hxx |8 ++-
oox/source/helper/graphichelper.cxx| 65 -
svtools/inc/svtools/filter.hxx |6 +-
svtools/inc/svtools/wmf.hxx| 48 ++
svtools/source/filter/filter.cxx |8 +--
svtools/source/filter/wmf/winmtf.hxx | 14 +++--
svtools/source/filter/wmf/winwmf.cxx | 62 ---
svtools/source/filter/wmf/wmf.cxx |4 -
svtools/source/graphic/provider.cxx| 42 +++-
writerfilter/source/rtftok/rtfcontrolwords.cxx |2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 19 ++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1
13 files changed, 187 insertions(+), 101 deletions(-)
New commits:
commit f4f4a899f0d5520a497bbd07ccfef9086c54ca1c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Thu Nov 24 15:05:25 2011 +0100
RTF import: partly fixed the WMF images scaling.
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index 4ff9f35..2906caa 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -495,15 +495,8 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic rGrf,
SvxRTFPictureType rPicType )
}
String sTmpStr;
-WMF_APMFILEHEADER aAPMHeader;
-aAPMHeader.left=0;
-aAPMHeader.top=0;
-aAPMHeader.right=rPicType.nWidth;
-aAPMHeader.bottom=rPicType.nHeight;
-
-WMF_APMFILEHEADER *pAPMHeader=(aAPMHeader.right0
aAPMHeader.bottom0?aAPMHeader:NULL);
pTmpFile-Seek( STREAM_SEEK_TO_BEGIN );
-bValidBmp = 0 == rGF.ImportGraphic( rGrf, sTmpStr, *pTmpFile,
nImportFilter, NULL, 0, pAPMHeader );
+bValidBmp = 0 == rGF.ImportGraphic( rGrf, sTmpStr, *pTmpFile,
nImportFilter );
}
}
diff --git a/oox/inc/oox/helper/graphichelper.hxx
b/oox/inc/oox/helper/graphichelper.hxx
index f144cd1..d3507fa 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -37,6 +37,8 @@
#include oox/helper/binarystreambase.hxx
#include oox/helper/storagebase.hxx
+struct WMF_EXTERNALHEADER;
+
namespace com { namespace sun { namespace star {
namespace awt { struct Point; }
namespace awt { struct Size; }
@@ -115,7 +117,8 @@ public:
/** Imports a graphic from the passed input stream. */
::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic
importGraphic(
-const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm ) const;
+const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm,
+const WMF_EXTERNALHEADER* pExtHeader = NULL )
const;
/** Imports a graphic from the passed binary memory block. */
::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic
@@ -133,7 +136,8 @@ public:
/** Creates a persistent graphic object from the passed input stream.
@return The URL of the created and internally cached graphic object.
*/
::rtl::OUString importGraphicObject(
-const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm ) const;
+const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm,
+const WMF_EXTERNALHEADER* pExtHeader = NULL )
const;
/** Creates a persistent graphic object from the passed binary memory
block.
@return The URL of the created and internally cached graphic object.
*/
diff --git a/oox/source/helper/graphichelper.cxx
b/oox/source/helper/graphichelper.cxx
index 941cc80..fd3046e 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -39,6 +39,7 @@
#include com/sun/star/graphic/XGraphicProvider.hpp
#include com/sun/star/util/MeasureUnit.hpp
#include comphelper/seqstream.hxx
+#include svtools/wmf.hxx
#include oox/helper/containerhelper.hxx
#include oox/helper/propertyset.hxx
#include oox/token/tokens.hxx
@@ -47,7 +48,8 @@ namespace oox {
//
-using namespace ::com::sun::star::awt;
+
+using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::graphic;
@@ -130,7 +132,7 @@ GraphicHelper::GraphicHelper( const Reference
XComponentContext rxContext, c
maDeviceInfo.PixelPerMeterX = maDeviceInfo.PixelPerMeterY = 3500.0; //
some default just in case
if( xFrame.is() ) try
{
-Reference XDevice xDevice( xFrame-getContainerWindow(),
UNO_QUERY_THROW );
+
[Libreoffice-commits] .: 6 commits - avmedia/source configure.in lingucomponent/source lotuswordpro/source sal/rtl sc/source sw/source tools/inc tools/Library_tl.mk tools/source unusedcode.easy
avmedia/source/quicktime/player.cxx | 31 -
configure.in |2
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 31 -
lotuswordpro/source/filter/explode.cxx |2
lotuswordpro/source/filter/xfilter/xfutil.cxx|2
sal/rtl/source/debugprint.cxx| 67 ---
sal/rtl/source/makefile.mk | 33 -
sc/source/core/tool/compiler.cxx | 27
sw/source/core/frmedt/tblsel.cxx |2
tools/Library_tl.mk |3
tools/inc/tools/string.hxx |5
tools/source/string/debugprint.cxx | 48 ---
tools/source/string/strimp.cxx | 53
tools/source/string/tustring.cxx | 32 +
unusedcode.easy |2
15 files changed, 36 insertions(+), 304 deletions(-)
New commits:
commit 3af0c948254751eade9bff772b849720747c5494
Author: Daisuke Nishino niboshi...@gmail.com
Date: Thu Nov 24 23:08:04 2011 +0900
Fix logic inversion
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 8ab53d5..b70503b 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2122,7 +2122,7 @@ sal_Bool _FndBoxCopyCol( const SwTableBox* rpBox, void*
pPara )
}
else
{
-if( 0 != pFndPara-rBoxes.count( rpBox ) )
+if( 0 == pFndPara-rBoxes.count( rpBox ) )
{
delete pFndBox;
return sal_True;
commit c8c53816593f30c54c7feef705ac6732eefc0833
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 15:06:57 2011 +
WaE: uninitialized value
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx
b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index 8471ff6..480482f 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -131,7 +131,7 @@ rtl::OUString DateTimeToOUString(XFDateTime dt)
rtl::OUString GetTableColName(sal_Int32 col)
{
-int remain;
+int remain = 0;
charch;
std::string strOut;
commit 2affd5e0195d828800b0a7a4dbad8c71d528b374
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 15:01:15 2011 +
WaE: uninitialized value
diff --git a/lotuswordpro/source/filter/explode.cxx
b/lotuswordpro/source/filter/explode.cxx
index 69c979d..241d43d 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -349,7 +349,7 @@ void Decompression::ToString(sal_uInt32 nBits, sal_Char
*pChar, sal_uInt32 nLen)
*/
sal_uInt32 Decompression::Decode(HuffmanTreeNode * pRoot)
{
-sal_uInt32 nRet;
+sal_uInt32 nRet(0);
sal_uInt32 nRead, nReadAlready;
if( 0 != ReadBits(1, nReadAlready))
commit 89f057a09d8684f697a822662907cfede7ef0a3f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 09:51:32 2011 +
ditch dbg_dump
diff --git a/avmedia/source/quicktime/player.cxx
b/avmedia/source/quicktime/player.cxx
index f7efb51..e4550a0 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -32,37 +32,6 @@
#include framegrabber.hxx
#include window.hxx
-// dbg_dump for development
-#if OSL_DEBUG_LEVEL 1
-#include rtl/strbuf.hxx
-#include rtl/ustring.hxx
-
-const sal_Char *dbg_dump(const rtl::OString rStr)
-{
-static rtl::OStringBuffer aStr;
-
-aStr = rtl::OStringBuffer(rStr);
-aStr.append(static_castchar(0));
-return aStr.getStr();
-}
-
-const sal_Char *dbg_dump(const rtl::OUString rStr)
-{
-return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
-}
-
-const sal_Char *dbg_dump(rtl_String *pStr)
-{
-return dbg_dump(rtl::OString(pStr));
-}
-
-const sal_Char *dbg_dump(rtl_uString *pStr)
-{
-return dbg_dump(rtl::OUString(pStr));
-}
-
-#endif
-
using namespace ::com::sun::star;
namespace avmedia { namespace quicktime {
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index 336b373..3f7cc2d 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -61,37 +61,6 @@ using ::rtl::OUStringBuffer;
using ::rtl::OUStringToOString;
///
-// dbg_dump for development
-#if OSL_DEBUG_LEVEL 1
-#include rtl/strbuf.hxx
-#include rtl/ustring.hxx
-
-const sal_Char *dbg_dump(const rtl::OString rStr)
-{
-static rtl::OStringBuffer aStr;
-
-aStr = rtl::OStringBuffer(rStr);
-aStr.append(static_castchar(0));
-return aStr.getStr();
-}
[Libreoffice-commits] .: icc/source
icc/source/create_sRGB_profile/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec9f3466d33536f68d86bde9f0389f46f8f147a2 Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 24 16:05:48 2011 + might need to augment library path diff --git a/icc/source/create_sRGB_profile/makefile.mk b/icc/source/create_sRGB_profile/makefile.mk index 8aab067..2703492 100644 --- a/icc/source/create_sRGB_profile/makefile.mk +++ b/icc/source/create_sRGB_profile/makefile.mk @@ -83,7 +83,7 @@ ALLTAR: $(TARGET)$(EXECPOST) $(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST) .IF $(CROSS_COMPILING) != YES -cd $(BIN)$/ $(BIN)$/$(TARGET)$(EXECPOST) +cd $(BIN)$/ $(AUGMENT_LIBRARY_PATH) $(BIN)$/$(TARGET)$(EXECPOST) .ELSE cd $(BIN)$/ $(SRC_ROOT)$/icc$/$(INPATH_FOR_BUILD)$/bin$/$(TARGET) .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: patches/dev300
patches/dev300/apply |2 --
patches/dev300/help-msg-add-package-info.diff | 11 ---
2 files changed, 13 deletions(-)
New commits:
commit 2a81e5d48e60fd9dd2729dbcd2cd1dfd6d6c2bd0
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Nov 24 17:15:34 2011 +0100
remove help-msg-add-package-info.diff, downstreamed to
debian-experimental-3.5
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9967d1a..c958f4b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -359,8 +359,6 @@ sensible-browser.diff
# add JDK paths for MySQL, PostgreSQL, JTDS
jdbc-driver-classpaths-debian.diff
-help-msg-add-package-info.diff
-
soffice-opengl-and-locking-config.diff, mklose
#configures-explicit-arch.diff
diff --git a/patches/dev300/help-msg-add-package-info.diff
b/patches/dev300/help-msg-add-package-info.diff
deleted file mode 100644
index 510cf00..000
--- a/patches/dev300/help-msg-add-package-info.diff
+++ /dev/null
@@ -1,11 +0,0 @@
sfx2/source/appl/sfxhelp.cxx~ 2006-02-15 02:53:15.839949000 +0100
-+++ sfx2/source/appl/sfxhelp.cxx 2006-02-15 02:55:01.389949000 +0100
-@@ -151,7 +151,7 @@
-
- NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) :
-
--ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) ) )
-+ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST )
).Append(String(DEFINE_CONST_UNICODE(.\nPlease install the
openoffice.org-help-en-us package or the locale specific help package
openoffice.org-help-language-code.))) )
- {
- // Error message: No help available
- }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: patches/dev300
patches/dev300/apply|1 patches/dev300/sensible-ooomua.diff | 44 2 files changed, 45 deletions(-) New commits: commit 9238fa2c3543fc8b41533bc5b1a8fdcc338ec887 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Nov 24 17:37:46 2011 +0100 remove sensible-ooomua.diff, downstreamed to debian-experimental-3.5 diff --git a/patches/dev300/apply b/patches/dev300/apply index c958f4b..fc3f05f 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -353,7 +353,6 @@ reportdesign-mention-package.diff, rengelha # build using -O2 on x86 and sparc according to Debian policy. debian-opt.diff -sensible-ooomua.diff sensible-browser.diff # add JDK paths for MySQL, PostgreSQL, JTDS diff --git a/patches/dev300/sensible-ooomua.diff b/patches/dev300/sensible-ooomua.diff deleted file mode 100644 index 0023884..000 --- a/patches/dev300/sensible-ooomua.diff +++ /dev/null @@ -1,44 +0,0 @@ -Index: Common.xcu -=== -RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v -retrieving revision 1.31 -diff -u -u -r1.31 Common.xcu officecfg/registry/data/org/openoffice/Office/Common.xcu 23 Mar 2005 10:53:46 - 1.31 -+++ officecfg/registry/data/org/openoffice/Office/Common.xcu 25 May 2005 23:23:30 - -@@ -651,8 +651,7 @@ - /node - node oor:name=ExternalMailer install:module=unixdesktop - prop oor:name=Program -- value oor:external= -- com.sun.star.configuration.backend.DesktopBackend ExternalMailer/ -+ valuesensible-ooomua/value - /prop - /node - node oor:name=Font -Index: shell/source/unix/misc/senddoc.sh -=== -RCS file: /cvs/gsl/shell/source/unix/misc/senddoc.sh,v -retrieving revision 1.8 -diff -u -u -r1.8 senddoc.sh shell/source/unix/misc/senddoc.sh 27 Sep 2005 12:55:00 - 1.8 -+++ shell/source/unix/misc/senddoc.sh 16 Feb 2006 00:38:29 - -@@ -91,6 +91,19 @@ - shift - fi - -+case `basename $MAILER` in -+sensible-ooomua) -+if [ -n $GNOME_DESKTOP_SESSION_ID -a -x /usr/bin/evolution ]; then -+MAILER=/usr/bin/evolution -+elif [ -n $KDE_FULL_SESSION -a -x /usr/bin/kmail ]; then -+MAILER=/usr/bin/kmail -+elif [ -x /usr/bin/evolution ]; then -+# default -+MAILER=/usr/bin/evolution -+fi -+;; -+esac -+ - # autodetect mail client from executable name - case `basename $MAILER | sed 's/-.*$//'` in - ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/forms/elementimport.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 49846da1652661e73acffd1ee8df0419aadf5cdb
Author: Eike Rathke er...@redhat.com
Date: Thu Nov 24 17:40:44 2011 +0100
fdo#43152 ooo#114415 fixed crash on unnamed form element
An unnamed form element without parent container lead to a crash when
trying to
obtain a unique name by iterating over (now not) existing container
elements.
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index 3fde263..10c4b2f 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -495,8 +495,11 @@ namespace xmloff
{
// no optimization here. If this method gets called, the XML stream
did not contain a name for the
// element, which is a heavy error. So in this case we don't care for
performance
-Sequence ::rtl::OUString aNames =
m_xParentContainer-getElementNames();
static const ::rtl::OUString
sUnnamedName(RTL_CONSTASCII_USTRINGPARAM(unnamed));
+OSL_ENSURE(m_xParentContainer.is(),
OElementImport::implGetDefaultName: no parent container!);
+if (!m_xParentContainer.is())
+return sUnnamedName;
+Sequence ::rtl::OUString aNames =
m_xParentContainer-getElementNames();
::rtl::OUString sReturn;
const ::rtl::OUString* pNames = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/misc/glosdoc.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit efdcb1692b48612fb7ad95f6385e7372fc06d891
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 16:53:29 2011 +
check glossary path for sanity
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 3db77a0..3701238 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -220,6 +220,8 @@ void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) {
sal_Bool SwGlossaries::NewGroupDoc(String rGroupName, const String rTitle)
{
sal_uInt16 nNewPath = (sal_uInt16)rGroupName.GetToken(1,
GLOS_DELIM).ToInt32();
+if(nNewPath = m_pPathArr-Count())
+return sal_False;
String sNewFilePath(*(*m_pPathArr)[nNewPath]);
String sNewGroup = lcl_CheckFileName(sNewFilePath, rGroupName.GetToken(0,
GLOS_DELIM));
sNewGroup += GLOS_DELIM;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/inc/frame.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 2ebe5c9e8adafd51285a3e38e109631ed8f9cf3d Author: Ivan Timofeev timofeev@gmail.com Date: Thu Nov 24 18:58:42 2011 +0400 remove private copy ctor, base class SwClient is noncopyable diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index d331a8b..7e4a389 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -354,8 +354,6 @@ class SwFrm: public SwClient, public SfxBroadcaster SwFrm* _GetIndNext(); void SetDirFlags( sal_Bool bVert ); -SwFrm( SwFrm ); //Kopieren ist nicht erlaubt. - const SwLayoutFrm* ImplGetNextLayoutLeaf( bool bFwd ) const; protected: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - bridges/source sal/osl solenv/inc
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 24
sal/osl/android/Makefile |5
sal/osl/android/jni/lo-bootstrap.c | 122 ++-
solenv/inc/_tg_shl.mk| 40 +++
solenv/inc/tg_shl.mk |4
5 files changed, 170 insertions(+), 25 deletions(-)
New commits:
commit c366d95851fe00c6cfd4d0efd6628cab42eb6ff9
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 24 19:02:17 2011 +0200
Use RTLD_DEFAULT on Android
dlopen()ing NULL (the main program) and dlsym()ing on that handle does
not work on Android as in GNU/Linux. So don't bother with that, just
call dlsym(RTLD_DEFAULT, symbol) instead.
But, it doesn't help, it won't find the type_infos anyway, as they are
weak symbols and the dlsym() at least in Android 4.0 does not like
weak symbols, Symbol is not global.
So the fallback branch that dynamically generates a type_info, which
normally should get used only for inter-process UNO (and thus
presumably never on Android) is taken instead.
But, that didn't work either at least with NDK r7 thanks to a bug in
its libgnustl_shared.so. But we now patch that at run-time in
android_main() in sal/osl/android/jni/lo-bootstrap.c.
Are we having fun yet?
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index 7833ca3..cbf3353 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -108,7 +108,9 @@ namespace CPPU_CURRENT_NAMESPACE
t_rtti_map m_rttis;
t_rtti_map m_generatedRttis;
+#ifndef ANDROID
void * m_hApp;
+#endif
public:
RTTI() SAL_THROW( () );
@@ -118,13 +120,17 @@ namespace CPPU_CURRENT_NAMESPACE
};
//
RTTI::RTTI() SAL_THROW( () )
+#ifndef ANDROID
: m_hApp( dlopen( 0, RTLD_LAZY ) )
+#endif
{
}
//
RTTI::~RTTI() SAL_THROW( () )
{
+#ifndef ANDROID
dlclose( m_hApp );
+#endif
}
//
@@ -153,7 +159,14 @@ namespace CPPU_CURRENT_NAMESPACE
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
+#ifndef ANDROID
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
+#else
+rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+// Unfortunately dlsym for weak symbols doesn't work in
+// Android 4.0 at least, sigh, so we will always take the
+// else branch below.
+#endif
if (rtti)
{
@@ -165,11 +178,22 @@ namespace CPPU_CURRENT_NAMESPACE
{
// try to lookup the symbol in the generated rtti map
t_rtti_map::const_iterator iFind2( m_generatedRttis.find(
unoName ) );
+
if (iFind2 == m_generatedRttis.end())
{
// we must generate it !
// symbol and rtti-name is nearly identical,
// the symbol is prefixed with _ZTI
+
+#ifdef ANDROID
+// This code is supposed to be used only used for
+// inter-process UNO, says sberg. Thus it should
+// be unnecessary and never reached for
+// Android. But see above...
+
+// OSL_ASSERT (iFind2 != m_generatedRttis.end());
+// return NULL;
+#endif
char const * rttiName = symName.getStr() +4;
#if OSL_DEBUG_LEVEL 1
fprintf( stderr,generated rtti for %s\n, rttiName );
commit 5df86787093a8c9c73557fb8d01581a15bad5d86
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 24 18:59:47 2011 +0200
Binary patch the mmapped libgnustl_shared.so from NDK r7
Poke in a jump to our replacement for std::type_info::operator==. See
http://code.google.com/p/android/issues/detail?id=22165 .
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index a22ddfc..29dedef 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -107,12 +107,10 @@ install: ndk-build
run: install
# Note: these are just examples.
#
-# The first two ones should work
adb shell am start -n org.libreoffice.android/.Bootstrap -e
lo-main-library libcppunittester -e lo-main-cmdline
$(APP_DATA_PATH)/lib/libqa_sal_types.so
#
adb shell am start -n org.libreoffice.android/.Bootstrap -e
lo-main-library libcppunittester -e lo-main-cmdline
$(APP_DATA_PATH)/lib/libtest_i18npool_test_breakiterator.so --protector
libunoexceptionprotector.so unoexceptionprotector
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb
[Libreoffice-commits] .: sal/osl
sal/osl/android/jni/lo-bootstrap.c | 90 ++---
1 file changed, 46 insertions(+), 44 deletions(-)
New commits:
commit de5840a524a9868e23672a69d8764bbfe269cf2a
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 24 19:29:54 2011 +0200
Reduce logging verbosity and tune levels
diff --git a/sal/osl/android/jni/lo-bootstrap.c
b/sal/osl/android/jni/lo-bootstrap.c
index 1c2971d..5dba3fd 100644
--- a/sal/osl/android/jni/lo-bootstrap.c
+++ b/sal/osl/android/jni/lo-bootstrap.c
@@ -55,6 +55,8 @@
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, lo-bootstrap,
__VA_ARGS__))
#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, lo-bootstrap,
__VA_ARGS__))
+#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR,
lo-bootstrap, __VA_ARGS__))
+#define LOGF(...) ((void)__android_log_print(ANDROID_LOG_FATAL,
lo-bootstrap, __VA_ARGS__))
#define ROUND_DOWN(ptr,multiple) (void *)(((unsigned) (ptr)) ~((multiple)-1))
@@ -209,14 +211,14 @@ Java_org_libreoffice_android_Bootstrap_dlneeds(JNIEnv*
env,
String = (*env)-FindClass(env, java/lang/String);
if (String == NULL) {
-LOGI(Could not find the String class);
+LOGE(Could not find the String class);
free_ptrarray((void **) needed);
return NULL;
}
result = (*env)-NewObjectArray(env, n_needed, String, NULL);
if (result == NULL) {
-LOGI(Could not create the String array);
+LOGE(Could not create the String array);
free_ptrarray((void **) needed);
return NULL;
}
@@ -265,7 +267,7 @@ Java_org_libreoffice_android_Bootstrap_dlcall(JNIEnv* env,
jclass StringArray = (*env)-FindClass(env, [Ljava/lang/String;);
if (StringArray == NULL) {
-LOGI(Could not find String[] class);
+LOGE(Could not find String[] class);
return 0;
}
@@ -275,7 +277,7 @@ Java_org_libreoffice_android_Bootstrap_dlcall(JNIEnv* env,
int i, result;
for (i = 0; i argc; i++) {
argv[i] = (*env)-GetStringUTFChars(env,
(*env)-GetObjectArrayElement(env, argument, i), NULL);
-LOGI(argv[%d] = %s, i, argv[i]);
+/* LOGI(argv[%d] = %s, i, argv[i]); */
}
argv[argc] = NULL;
@@ -338,12 +340,12 @@
Java_org_libreoffice_android_Bootstrap_setup__Ljava_lang_String_2Ljava_lang_Stri
fd = open(apkFilePath, O_RDONLY);
if (fd == -1) {
-LOGI(Could not open %s, apkFilePath);
+LOGE(Could not open %s, apkFilePath);
(*env)-ReleaseStringUTFChars(env, apkFile, apkFilePath);
return JNI_FALSE;
}
if (fstat(fd, st) == -1) {
-LOGI(Could not fstat %s, apkFilePath);
+LOGE(Could not fstat %s, apkFilePath);
close(fd);
(*env)-ReleaseStringUTFChars(env, apkFile, apkFilePath);
return JNI_FALSE;
@@ -352,7 +354,7 @@
Java_org_libreoffice_android_Bootstrap_setup__Ljava_lang_String_2Ljava_lang_Stri
close(fd);
if (apk_file == MAP_FAILED) {
-LOGI(Could not mmap %s, apkFilePath);
+LOGE(Could not mmap %s, apkFilePath);
(*env)-ReleaseStringUTFChars(env, apkFile, apkFilePath);
return JNI_FALSE;
}
@@ -381,12 +383,12 @@
Java_org_libreoffice_android_Bootstrap_setup__ILjava_lang_Object_2I(JNIEnv* env,
StringArray = (*env)-FindClass(env, [Ljava/lang/String;);
if (StringArray == NULL) {
-LOGI(Could not find String[] class);
+LOGE(Could not find String[] class);
return JNI_FALSE;
}
if (!(*env)-IsInstanceOf(env, lo_main_argument, StringArray)) {
-LOGI(lo_main_argument is not a String[]?);
+LOGE(lo_main_argument is not a String[]?);
return JNI_FALSE;
}
@@ -397,7 +399,7 @@
Java_org_libreoffice_android_Bootstrap_setup__ILjava_lang_Object_2I(JNIEnv* env,
const jbyte *s = (*env)-GetStringUTFChars(env,
(*env)-GetObjectArrayElement(env, lo_main_argument, i), NULL);
lo_main_argv[i] = strdup(s);
(*env)-ReleaseStringUTFChars(env, (*env)-GetObjectArrayElement(env,
lo_main_argument, i), s);
-LOGI(argv[%d] = %s, i, lo_main_argv[i]);
+/* LOGI(argv[%d] = %s, i, lo_main_argv[i]); */
}
lo_main_argv[lo_main_argc] = NULL;
@@ -448,12 +450,12 @@ lo_dlneeds(const char *library)
fd = open(library, O_RDONLY);
if (fd == -1) {
-LOGI(lo_dlneeds: Could not open library %s: %s, library,
strerror(errno));
+LOGE(lo_dlneeds: Could not open library %s: %s, library,
strerror(errno));
return NULL;
}
if (read(fd, hdr, sizeof(hdr)) sizeof(hdr)) {
-LOGI(lo_dlneeds: Could not read ELF header of %s, library);
+LOGE(lo_dlneeds: Could not read ELF header of %s, library);
close(fd);
return NULL;
}
@@ -461,12 +463,12 @@ lo_dlneeds(const char *library)
/* Read in .shstrtab */
if (lseek(fd, hdr.e_shoff + hdr.e_shstrndx * sizeof(shdr),
[Libreoffice-commits] .: sw/source
0 files changed New commits: commit 49e4c3e5e139f0443e5432d99d6514038b62ce84 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Nov 10 18:01:47 2011 +0100 remove executable bit on a .cxx file diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/folderitem_ooo.scp |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 43353984e883d932e8fdaf3a25cc3d9bfc839dd0 Author: Andras Timar ati...@suse.com Date: Thu Nov 24 18:43:11 2011 +0100 Desktop launcher w/o version number for silent MSI version diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index 7381735..e1a25e9 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -45,7 +45,11 @@ FolderItem gid_Folderitem_Soffice End FolderItem gid_Folderitem_Soffice_Desktop +#ifdef ENABLE_SILENT_MSI +Name = %PRODUCTNAME; +#else Name = %PRODUCTNAME %PRODUCTVERSION; +#endif ModuleID = gid_Module_Root; FolderID = PREDEFINED_DESKTOP; FileID = gid_Brand_File_Bin_Soffice; @@ -54,7 +58,7 @@ FolderItem gid_Folderitem_Soffice_Desktop ComponentIDFile = gid_Brand_File_Desktophelper_Txt; WkDir = gid_Brand_Dir_Program; Parameter = ; - Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME); +Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME); ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE); ComponentCondition = CREATEDESKTOPLINK=1; End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/ooxmlmathimport'
New branch 'feature/ooxmlmathimport' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - patches/dev300
patches/dev300/apply|3 --- patches/dev300/open-url-support-iceanimals.diff | 22 -- patches/dev300/seamonkey-is-iceape.diff | 22 -- 3 files changed, 47 deletions(-) New commits: commit e0335749ad65bdb78f4da2315197b6066bb24563 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Nov 24 18:37:45 2011 +0100 upstream patches/dev300/seamonkey-is-iceape.diff diff --git a/patches/dev300/apply b/patches/dev300/apply index f4af29b..73b9c4e 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -481,8 +481,6 @@ novell-win32-agfa-monotype-fonts.diff, tml [ DebianOnly ] -seamonkey-is-iceape.diff - # build against xulrunner 1.9.1+ xulrunner-1.9.1.diff, ccheney diff --git a/patches/dev300/seamonkey-is-iceape.diff b/patches/dev300/seamonkey-is-iceape.diff deleted file mode 100644 index 10fccb6..000 --- a/patches/dev300/seamonkey-is-iceape.diff +++ /dev/null @@ -1,22 +0,0 @@ configure.in-old 2008-05-03 23:27:00.0 +0200 -+++ configure.in 2008-05-03 23:27:37.0 +0200 -@@ -795,7 +795,7 @@ - components cannot be built against a contemporary - mozilla. The flavour used can be specified by - --with-system-mozilla=flavour. Supported are: -- libxul (default), xulrunner, firefox, seamonkey, -+ libxul (default), xulrunner, firefox, iceape, - mozilla - ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no) - -@@ -4134,8 +4134,8 @@ - MOZ_FLAVOUR=libxul - elif test -n $with_system_mozilla test $with_system_mozilla = xulrunner; then - MOZ_FLAVOUR=xulrunner --elif test -n $with_system_mozilla test $with_system_mozilla = seamonkey; then -- MOZ_FLAVOUR=seamonkey -+elif test -n $with_system_mozilla test $with_system_mozilla = iceape; then -+ MOZ_FLAVOUR=iceape - elif test -n $with_system_mozilla test $with_system_mozilla = firefox; then - MOZ_FLAVOUR=firefox - elif test -n $with_system_mozilla test $with_system_mozilla = mozilla; then commit 4264a8542d6b6da19b548c192662f5d7565c31ca Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Nov 24 18:36:26 2011 +0100 upstream open-url-support-iceanimals.dif diff --git a/patches/dev300/apply b/patches/dev300/apply index ceb0678..f4af29b 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -481,7 +481,6 @@ novell-win32-agfa-monotype-fonts.diff, tml [ DebianOnly ] -open-url-support-iceanimals.diff seamonkey-is-iceape.diff # build against xulrunner 1.9.1+ diff --git a/patches/dev300/open-url-support-iceanimals.diff b/patches/dev300/open-url-support-iceanimals.diff deleted file mode 100644 index 3928954..000 --- a/patches/dev300/open-url-support-iceanimals.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: open-url.sh -=== shell/source/unix/misc/open-url.sh (Revision 277618) -+++ shell/source/unix/misc/open-url.sh (Arbeitskopie) -@@ -58,7 +58,7 @@ - exit 0 - fi - # mozilla derivates may need -remote semantics -- for i in thunderbird mozilla netscape; do -+ for i in icedove thunderbird iceape mozilla netscape; do - mailer=`which $i` - if [ ! -z $mailer ]; then - run_mozilla $mailer $1 -@@ -84,7 +84,7 @@ - exit 0 - fi - # mozilla derivates may need -remote semantics -- for i in firefox mozilla netscape; do -+ for i in iceweasel firefox iceape mozilla netscape; do - browser=`which $i` - if [ ! -z $browser ]; then - run_mozilla $browser $1 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source wizards/com
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |1 +
wizards/com/sun/star/wizards/form/StyleApplier.java|2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ef3a19eed2dc3aaddf3d48a204eff934b7002055
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Nov 24 19:37:46 2011 +0100
fdo#37626: form wizard recognise # also at beginning of line
This was keeping the Base form wizard from applying styles
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java
b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 1dedca3..433384c 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -343,7 +343,7 @@ public class StyleApplier
String[] sPropList =
JavaTools.ArrayoutofString(scurline, :);
String sPropValue = sPropList[1];
sPropValue = sPropValue.trim();
-if (sPropValue.indexOf(#) 0)
+if (sPropValue.indexOf(#) -1)
{
sPropValue =
JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING,
PropertyNames.SEMI_COLON);
sPropValue =
JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING,
PropertyNames.SPACE);
commit 8d2780d42f6ee67688f176b0e04bc294575550ba
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Nov 23 21:46:48 2011 +0100
psql-sdbc: TODO note
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 91eb3df..d2a0684 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1503,6 +1503,7 @@ static void columnMetaData2DatabaseTypeDescription(
const OUString columnNamePattern ) throw (SQLException, RuntimeException)
{
// LEM TODO: review in comparison with JDBC driver
+// OK, confirmed it does not return consecutive values in
ORDINAL_POSITION; needs to be fixed.
Statics statics = getStatics();
// continue !
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source vcl/inc vcl/source
sc/source/ui/app/inputwin.cxx | 110 ++
sc/source/ui/inc/inputwin.hxx |5 +
vcl/inc/vcl/toolbox.hxx |9 +++
vcl/source/window/toolbox.cxx | 17 ++
4 files changed, 99 insertions(+), 42 deletions(-)
New commits:
commit 50171e51373800bfe598e461d551f873aff87f09
Author: Noel Power noel.po...@novell.com
Date: Thu Nov 24 19:45:09 2011 +
tweak toolbar layout for gsoc formula/input bar other misc changes
summary:
* tweak toolbar layout to layout the toolbar items aligned to top of highest
item
* make Capture/ReleaseMouse logic much simpler
* make resize detection simpler
* control toolbar height ( e.g. don't let visible grid area be overrun by
toolbar )
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 427c2d9..685dc4f 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -179,6 +179,7 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings*
pBind ) :
aTextCancel ( ScResId( SCSTR_QHELP_BTNCANCEL ) ),
aTextSum( ScResId( SCSTR_QHELP_BTNSUM ) ),
aTextEqual ( ScResId( SCSTR_QHELP_BTNEQUAL ) ),
+mnMaxY (0),
bIsOkCancelMode ( false ),
bIsMultiLine( false ),
bInResize ( false )
@@ -750,6 +751,14 @@ void ScInputWindow::DataChanged( const DataChangedEvent
rDCEvt )
ToolBox::DataChanged( rDCEvt );
}
+bool ScInputWindow::IsPointerAtResizePos()
+{
+if ( GetOutputSizePixel().Height() - GetPointerPosPixel().Y() = 4 )
+return true;
+else
+return false;
+}
+
void ScInputWindow::MouseMove( const MouseEvent rMEvt )
{
if ( lcl_isExperimentalMode() )
@@ -757,62 +766,79 @@ void ScInputWindow::MouseMove( const MouseEvent rMEvt )
Point aPosPixel = GetPointerPosPixel();
ScInputBarGroup* pGroupBar = dynamic_cast ScInputBarGroup* (
pRuntimeWindow.get() );
-if ( bInResize || ( GetOutputSizePixel().Height() - aPosPixel.Y() = 4
) )
-{
+
+if ( bInResize || IsPointerAtResizePos() )
SetPointer( Pointer( POINTER_WINDOW_SSIZE ) );
+else
+SetPointer( Pointer( POINTER_ARROW ) );
-if ( rMEvt.IsLeft() )
+if ( bInResize )
+{
+// detect direction
+long nResizeThreshold = ( (long)TBX_WINDOW_HEIGHT * 0.7 );
+bool bResetPointerPos = false;
+
+// Detect attempt to expand toolbar too much
+if ( aPosPixel.Y() = mnMaxY )
{
-// Don't leave the mouse pointer leave *this* window
-CaptureMouse();
-bInResize = true;
-}
-else
+bResetPointerPos = true;
+aPosPixel.Y() = mnMaxY;
+} // or expanding down
+else if ( GetOutputSizePixel().Height() - aPosPixel.Y()
-nResizeThreshold )
+{
+pGroupBar-IncrementVerticalSize();
+bResetPointerPos = true;
+} // or shrinking up
+else if ( ( GetOutputSizePixel().Height() - aPosPixel.Y() )
nResizeThreshold )
{
-ReleaseMouse();
-bInResize = false;
+bResetPointerPos = true;
+pGroupBar-DecrementVerticalSize();
}
-if ( bInResize )
+if ( bResetPointerPos )
{
-// Trigger resize
-long nResizeThreshold = ( (long)TBX_WINDOW_HEIGHT * 0.7 );
-bool bResetPointerPos = false;
-if ( GetOutputSizePixel().Height() - aPosPixel.Y()
-nResizeThreshold )
-{
-pGroupBar-IncrementVerticalSize();
-bResetPointerPos = true;
-}
-else if ( ( GetOutputSizePixel().Height() - aPosPixel.Y() )
nResizeThreshold )
-{
-bResetPointerPos = true;
-pGroupBar-DecrementVerticalSize();
-}
-
-if ( bResetPointerPos )
-{
-aPosPixel.Y() = GetOutputSizePixel().Height();
-SetPointerPosPixel( aPosPixel );
-}
-
+aPosPixel.Y() = GetOutputSizePixel().Height();
+SetPointerPosPixel( aPosPixel );
}
}
-else
-{
-ReleaseMouse();
-SetPointer( Pointer( POINTER_ARROW ) );
-}
}
ToolBox::MouseMove( rMEvt );
}
+void ScInputWindow::MouseButtonDown( const MouseEvent rMEvt )
+{
+if ( lcl_isExperimentalMode() )
+{
+if ( rMEvt.IsLeft() )
+{
+if ( IsPointerAtResizePos() )
+{
+// Don't leave the mouse pointer leave *this* window
+CaptureMouse();
+bInResize = true;
+
[Libreoffice-commits] .: 2 commits - default_images/brand default_images/framework instsetoo_native/inc_common instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_op
dev/null |binary instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/installfirstuse.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/installpartial.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/installstatemenu.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/networkinstall.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico |binary instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico |binary instsetoo_native/util/makefile.mk | 21 ++ 17 files changed, 6 insertions(+), 15 deletions(-) New commits: commit b6e5f5da292f89782f3084753de4c0c172dd4517 Author: Thorsten Behrens tbehr...@suse.com Date: Thu Nov 24 14:05:53 2011 +0100 Cleanup: unused / duplicated artwork * the framework/res stuff was stale, only the brand/ thing is used nowadays * framework/source/services/backingwindow.cxx only used left/right/space, the rest can go diff --git a/default_images/brand/shell/backing.png b/default_images/brand/shell/backing.png deleted file mode 100644 index 4b830ba..000 Binary files a/default_images/brand/shell/backing.png and /dev/null differ diff --git a/default_images/brand/shell/backing_left_hc.png b/default_images/brand/shell/backing_left_hc.png deleted file mode 100644 index 4b830ba..000 Binary files a/default_images/brand/shell/backing_left_hc.png and /dev/null differ diff --git a/default_images/framework/res/backing.png b/default_images/framework/res/backing.png deleted file mode 100644 index 4b830ba..000 Binary files a/default_images/framework/res/backing.png and /dev/null differ diff --git a/default_images/framework/res/backing_right.png b/default_images/framework/res/backing_right.png deleted file mode 100644 index b95e877..000 Binary files a/default_images/framework/res/backing_right.png and /dev/null differ diff --git a/default_images/framework/res/backing_rtl_left.png b/default_images/framework/res/backing_rtl_left.png deleted file mode 100644 index 4b830ba..000 Binary files a/default_images/framework/res/backing_rtl_left.png and /dev/null differ diff --git a/default_images/framework/res/backing_rtl_right.png b/default_images/framework/res/backing_rtl_right.png deleted file mode 100644 index b95e877..000 Binary files a/default_images/framework/res/backing_rtl_right.png and /dev/null differ diff --git a/default_images/framework/res/backing_space.png b/default_images/framework/res/backing_space.png deleted file mode 100644 index 1f3060c..000 Binary files a/default_images/framework/res/backing_space.png and /dev/null differ commit 23e1476c9309042d4e6246b57feb829f675d9f5a Author: Thorsten Behrens tbehr...@suse.com Date: Thu Nov 24 13:39:57 2011 +0100 Cleanup: remove unused artwork, consolidate remaining. * the *.ico files were simply copied around, for the msi templates, and then later customized by copying nologobanner/install onto them * now holding only one copy of the icons, removed later-deleted other *.bmp files diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico new file mode 100644 index 000..1c6f14e Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico new file mode 100644 index 000..e7136d0 Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico new file mode 100644 index 000..2eb32be Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico differ diff --git
[Libreoffice-commits] .: sal/osl
sal/osl/android/jni/lo-bootstrap.c | 185 -
1 file changed, 121 insertions(+), 64 deletions(-)
New commits:
commit 1c08f9066ca235018f69bc0999f7c61391de27a6
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 24 22:53:01 2011 +0200
Replace also the std::type_info::before() in libgnustl_shared.so
It too suffers from the same problem as operator==: Compares name
pointers, not name strings. Thus with two things to patch, had to
refactor it.
(before() doesn't seem to get called when running the bridgetest at
least, though.)
Noticed that there is no need to wrap the replacement asm snippets
with dummy C functions. Just having them at the outermost level in the
source file works as expected.
diff --git a/sal/osl/android/jni/lo-bootstrap.c
b/sal/osl/android/jni/lo-bootstrap.c
index 5dba3fd..2e17155 100644
--- a/sal/osl/android/jni/lo-bootstrap.c
+++ b/sal/osl/android/jni/lo-bootstrap.c
@@ -826,71 +826,117 @@ lo_dlcall_argc_argv(void *function,
return result;
}
+/* There is a bug in std::type_info::operator== and
+ * std::type_info::before() in libgnustl_shared.so in NDK r7 at
+ * least. They compare the type name pointers instead of comparing the
+ * type name strings. See
+ * http://code.google.com/p/android/issues/detail?id=22165 . So patch
+ * that, poke in jumps to our own code snippets below instead.
+ */
+
/* Replacement std::type_info::operator== */
-static void
-dummy_patched_operator_equals_arm(void)
-{
-__asm(.arm\n
- .global patched_operator_equals_arm\n
- patched_operator_equals_arm:\n
- push {lr}\n
+__asm(.arm\n
+ .global replacement_operator_equals_arm\n
+ replacement_operator_equals_arm:\n
+ push {lr}\n
- /* Load name pointers into r0 and r1 */
- ldr r0, [r0, #4]\n
- ldr r1, [r1, #4]\n
+ /* Load name pointers into r0 and r1 */
+ ldr r0, [r0, #4]\n
+ ldr r1, [r1, #4]\n
- /* First compare pointers */
- cmp r0, r1\n
+ /* First compare pointers */
+ cmp r0, r1\n
- /* If equal, return true */
- beq .Lx1\n
+ /* If equal, return true */
+ beq .L.equals.1\n
- /* Otherwise call strcmp */
- bl strcmp\n
+ /* Otherwise call strcmp */
+ bl strcmp\n
- /* And return true or false */
- cmp r0, #0\n
- moveq r0, #1\n
- movne r0, #0\n
- b .Lx9\n
+ /* And return true or false */
+ cmp r0, #0\n
+ moveq r0, #1\n
+ movne r0, #0\n
+ b .L.equals.9\n
- .Lx1:\n
- mov r0, #1\n
+ .L.equals.1:\n
+ mov r0, #1\n
- .Lx9:\n
- pop {pc}\n
- );
-}
+ .L.equals.9:\n
+ pop {pc}\n
+ );
+
+extern unsigned int replacement_operator_equals_arm;
+
+/* The ARM (not Thumb) code of the operator== in NDK r7 */
+static unsigned int expected_operator_equals_r7_code[] = {
+0xe5903004, /* ldr r3, [r0, #4] */
+0xe5910004, /* ldr r0, [r1, #4] */
+0xe153, /* cmp r3, r0 */
+0x13a0, /* movne, #0 */
+0x03a1, /* moveq r0, #1 */
+0xe12fff1e /* bx lr */
+};
+
+/* Ditto for std::type_info::before() */
+
+__asm(.arm\n
+ .global replacement_method_before_arm\n
+ replacement_method_before_arm:\n
+ push {lr}\n
+
+ /* Load name pointers into r0 and r1 */
+ ldr r0, [r0, #4]\n
+ ldr r1, [r1, #4]\n
+
+ /* First compare pointers */
+ cmp r0, r1\n
+
+ /* If equal, return false */
+ beq .L.before.1\n
-extern unsigned int patched_operator_equals_arm;
+ /* Otherwise call strcmp */
+ bl strcmp\n
+
+ /* And return true or false */
+ cmp r0, #0\n
+ movlt r0, #1\n
+ movge r0, #0\n
+ b .L.before.9\n
+
+ .L.before.1:\n
+ mov r0, #0\n
+
+ .L.before.9:\n
+ pop {pc}\n
+ );
+
+extern unsigned int replacement_method_before_arm;
+
+static unsigned int expected_method_before_r7_code[] = {
+0xe5903004, /* ldr r3, [r0, #4] */
+0xe5910004, /* ldr r0, [r1, #4] */
+0xe153, /* cmp r3, r0 */
+0x23a0, /* movcs r0, #0 */
+0x33a1, /* movcc r0, #1 */
+0xe12fff1e /* bx lr */
+};
static void
-patch_type_info_operator_equals(void)
+patch(const char *symbol,
+ const char *plaintext,
+ unsigned *expected_code,
+ size_t expected_code_size,
+ unsigned *replacement_code)
{
-/* There is a bug in std::type_info::operator== in
- * libgnustl_shared.so in NDK r7 at least. It compares the type
- * name pointers instead of comparing the type name strings. See
- * http://code.google.com/p/android/issues/detail?id=22165 . So
- * patch it, poke in a jump to our own code above instead.
- */
[Libreoffice-commits] .: solenv/gdb
solenv/gdb/libreoffice/sw.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0ba08657f23d273721592c30f10d37e43a49ec2 Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 24 21:03:45 2011 + SwIndex::nIndex renamed to SwIndex::m_nIndex diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 0b2ff7f..f41533a 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -36,7 +36,7 @@ class SwPositionPrinter(object): def to_string(self): node = self.value['nNode']['pNd'].dereference(); -offset = self.value['nContent']['nIndex'] +offset = self.value['nContent']['m_nIndex'] return %s (node %d, offset %d) % (self.typename, node['nOffset'], offset) class SwPaMPrinter(object): ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - basctl/source oox/Package_inc.mk tools/source unusedcode.easy
basctl/source/basicide/baside2.cxx |2 +-
basctl/source/basicide/baside2.hxx |2 +-
oox/Package_inc.mk |1 +
tools/source/inet/inetstrm.cxx | 22 +++---
unusedcode.easy|1 -
5 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit f4eb51fc238a427f148b0dde253570f4030bddf0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 21:48:33 2011 +
fix build error, deliver oox/helper/attributelist.hxx
diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
index ac2ad7d..5564eab 100644
--- a/oox/Package_inc.mk
+++ b/oox/Package_inc.mk
@@ -41,6 +41,7 @@ $(eval $(call
gb_Package_add_file,oox_inc,inc/oox/export/drawingml.hxx,oox/expor
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/export/shapes.hxx,oox/export/shapes.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/export/utils.hxx,oox/export/utils.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/export/vmlexport.hxx,oox/export/vmlexport.hxx))
+$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/helper/attributelist.hxx,oox/helper/attributelist.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/helper/binarystreambase.hxx,oox/helper/binarystreambase.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/helper/containerhelper.hxx,oox/helper/containerhelper.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/helper/graphichelper.hxx,oox/helper/graphichelper.hxx))
commit 33a03b669bf195a25efa273ad38402fb2e54aa78
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 21:41:31 2011 +
no need for BasicErrorHdl to be a LINK
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 8b57961..fb6ed3a 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -659,7 +659,7 @@ void ModulWindow::ManageBreakPoints()
}
-IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
+long ModulWindow::BasicErrorHdl( StarBASIC * pBasic )
{
DBG_CHKTHIS( ModulWindow, 0 );
GoOnTop();
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index ebf501e..119aa60 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -326,7 +326,7 @@ private:
String aCurPath;
::rtl::OUString m_aModule;
-DECL_LINK( BasicErrorHdl, StarBASIC * );
+longBasicErrorHdl( StarBASIC* pBasic );
longBasicBreakHdl( StarBASIC* pBasic );
voidCheckCompileBasic();
diff --git a/unusedcode.easy b/unusedcode.easy
index 3283270..98cc325 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -227,7 +227,6 @@ MetricBox::RemoveValue(long, FieldUnit)
MetricField::ConvertValue(long, unsigned short, FieldUnit, MapUnit)
MiscSettings::SetDisablePrinting(unsigned char)
MiscSettings::SetEnableATToolSupport(unsigned char)
-ModulWindow::LinkStubBasicErrorHdl(void*, void*)
MoreButton::RemoveWindow(Window*)
MultiLineEdit::GetHScrollBar() const
MultiLineEdit::GetLeftMargin() const
commit e2b73031e810bc5b29101a9d22ab0264ae676d99
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 21:35:32 2011 +
ByteString-rtl::OString
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index eadeec5..6b1011b 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -503,14 +503,14 @@ int INetMessageOStream::PutMsgLine (const sal_Char
*pData, sal_uIntPtr nSize)
// Check for header or body.
if (!IsHeaderParsed())
{
-ByteString aField (pData);
-sal_uInt16 nPos = aField.Search (':');
-if (nPos != STRING_NOTFOUND)
+rtl::OString aField(pData);
+sal_Int32 nPos = aField.indexOf(':');
+if (nPos != -1)
{
-ByteString aName (
-aField.Copy (0, nPos));
-ByteString aValue (
-aField.Copy (nPos + 1, aField.Len() - nPos + 1));
+rtl::OString aName(
+aField.copy(0, nPos));
+rtl::OString aValue(
+aField.copy(nPos + 1, aField.getLength() - nPos + 1));
aValue = comphelper::string::stripStart(aValue, ' ');
pTargetMsg-SetHeaderField (
@@ -1614,11 +1614,11 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char
*pData, sal_uIntPtr nSize)
// Determine boundary.
rtl::OString aType(rtl::OUStringToOString(
pMsg-GetContentType(), RTL_TEXTENCODING_ASCII_US));
-ByteString aLowerType(aType);
-aLowerType.ToLowerAscii();
+rtl::OString aLowerType(aType.toAsciiLowerCase());
-sal_uInt16 nPos = aLowerType.Search (boundary=);
-ByteString aBoundary(aType.copy(nPos + 9));
+sal_Int32 nPos =
[Libreoffice-commits] .: icc/SampleICC-1.3.2.patch
icc/SampleICC-1.3.2.patch | 10 ++ 1 file changed, 10 insertions(+) New commits: commit 48d9feabd967f28bff8e73475f700f2ab009c4bc Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 24 23:45:00 2011 +0200 Need string.h for the mem* functions on Android diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch index cb65c42..e150a95 100644 --- a/icc/SampleICC-1.3.2.patch +++ b/icc/SampleICC-1.3.2.patch @@ -5157,3 +5157,13 @@ #ifdef WIN32 typedef unsigned short mode_t; +--- misc/SampleICC-1.3.2/IccProfLib/md5.cpp misc/build/SampleICC-1.3.2/IccProfLib/md5.cpp +@@ -26,6 +26,7 @@ + + #include md5.h + #include memory.h ++#include string.h + + static void MD5Transform (UINT4 [4], unsigned char [64]); + static void Encode (unsigned char *, UINT4 *, unsigned int); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4-4' - setup_native/source
setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
| 205 +-
setup_native/source/win32/customactions/shellextensions/makefile.mk
|3
2 files changed, 27 insertions(+), 181 deletions(-)
New commits:
commit 5ddec51eae718d7ee48ca3e3096d7e5dd60f445e
Author: Andras Timar ati...@suse.com
Date: Thu Nov 24 23:10:30 2011 +0100
change logic of IsOfficeRunning custom action fdo#36677
instead of trying to rename a file or folder in
Program Files directory - which is write protected
anyway normally - installer checks the process list,
if there is a process called soffice.bin.
diff --git
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index 0cf8458..3432ddd 100644
---
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -53,6 +53,10 @@
#include stdio.h
#include sal/macros.h
+// works with Windows XP as well as with Windows 7
+#define PSAPI_VERSION 1
+#include psapi.h
+
#include systools/win32/uwinapi.h
#include ../tools/seterror.hxx
@@ -93,201 +97,42 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle,
const std::_tstring sPro
return result;
}
-static inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring
sProperty)
-{
-std::_tstring value = GetMsiProperty(handle, sProperty);
-return (value.length() 0);
-}
-
-static inline void UnsetMsiProperty(MSIHANDLE handle, const std::_tstring
sProperty)
+extern C UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
{
-MsiSetProperty(handle, sProperty.c_str(), NULL);
-}
+std::_tstring sOfficeInstallPath = GetMsiProperty(handle,
TEXT(INSTALLLOCATION));
+// Property empty - no office installed
+if ( sOfficeInstallPath.length() == 0 )
+return ERROR_SUCCESS;
-static inline void SetMsiProperty(MSIHANDLE handle, const std::_tstring
sProperty)
-{
-MsiSetProperty(handle, sProperty.c_str(), TEXT(1));
-}
+DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processses ought to
be enough for anybody */
-static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA,
DWORD dwFlags )
-{
-BOOL fSuccess = FALSE; // assume failure
+if ( !EnumProcesses( aProcesses, sizeof(aProcesses), cbNeeded ) )
+return ERROR_INSTALL_FAILURE;
-// Windows 9x has a special mechanism to move files after reboot
+cProcesses = cbNeeded / sizeof(DWORD);
-if ( dwFlags MOVEFILE_DELAY_UNTIL_REBOOT )
+// Check if there is soffice.bin among the processes
+for ( unsigned int i = 0; i cProcesses; i++ )
{
-CHAR szExistingFileNameA[MAX_PATH];
-CHAR szNewFileNameA[MAX_PATH] = NUL;
-
-// Path names in WININIT.INI must be in short path name form
-
-if (
-GetShortPathNameA( lpExistingFileNameA, szExistingFileNameA,
MAX_PATH )
-(!lpNewFileNameA || GetShortPathNameA( lpNewFileNameA,
szNewFileNameA, MAX_PATH ))
-)
+if( aProcesses[i] != 0 )
{
-CHAR szBuffer[32767];// The buffer size must not
exceed 32K
-DWORD dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION,
szBuffer, SAL_N_ELEMENTS(szBuffer), WININIT_FILENAME );
-
-CHAR szRename[MAX_PATH]; // This is enough for at most
to times 67 chracters
-strcpy( szRename, szNewFileNameA );
-strcat( szRename, = );
-strcat( szRename, szExistingFileNameA );
-size_t lnRename = strlen(szRename);
-
-if ( dwBufLen + lnRename + 2 = SAL_N_ELEMENTS(szBuffer) )
+TCHAR szProcessName[MAX_PATH] = TEXT(unknown);
+HANDLE hProcess = OpenProcess( PROCESS_QUERY_INFORMATION |
PROCESS_VM_READ, FALSE, aProcesses[i] );
+if (NULL != hProcess )
{
-CopyMemory( szBuffer[dwBufLen], szRename, lnRename );
-szBuffer[dwBufLen + lnRename ] = 0;
-szBuffer[dwBufLen + lnRename + 1 ] = 0;
-
-fSuccess = WritePrivateProfileSectionA( RENAME_SECTION,
szBuffer, WININIT_FILENAME );
+HMODULE hMod;
+if ( EnumProcessModules( hProcess, hMod, sizeof(hMod),
cbNeeded) )
+GetModuleBaseName( hProcess, hMod, szProcessName,
sizeof(szProcessName)/sizeof(TCHAR) );
}
-else
-SetLastError( ERROR_BUFFER_OVERFLOW );
-}
-}
-else
-{
-
-fSuccess = MoveFileA( lpExistingFileNameA, lpNewFileNameA );
-
-if ( !fSuccess GetLastError() != ERROR_ACCESS_DENIED
-0 != (dwFlags (MOVEFILE_COPY_ALLOWED |
MOVEFILE_REPLACE_EXISTING)) )
-{
-BOOL bFailIfExist = 0 == (dwFlags
[Libreoffice-commits] .: 6 commits - configure.in distro-configs/LibreOfficeAndroid.conf jvmaccess/source jvmfwk/plugins sal/osl
configure.in|6 +++---
distro-configs/LibreOfficeAndroid.conf |1 -
jvmaccess/source/virtualmachine.cxx | 11 ++-
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 17 -
sal/osl/android/jni/lo-bootstrap.c |5 +
sal/osl/android/jni/lo-bootstrap.h | 13 -
6 files changed, 46 insertions(+), 7 deletions(-)
New commits:
commit 811de66d7fd8c93c43d8e4e2dc73720033ba939b
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Nov 25 01:40:23 2011 +0200
First attempt at getting access to the Java VM on Android
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 7b5b262..08193bb 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -35,6 +35,10 @@
# include windows.h
#endif
+#ifdef ANDROID
+# include dlfcn.h
+#endif
+
#if OSL_DEBUG_LEVEL 0
#include stdio.h
#endif
@@ -581,6 +585,8 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
rtl::OUString sRuntimeLib = getRuntimeLib(pInfo-arVendorData);
JFW_TRACE2(OUSTR([Java framework] Using Java runtime library: )
+ sRuntimeLib + OUSTR(.\n));
+
+#ifndef ANDROID
// On linux we load jvm with RTLD_GLOBAL. This is necessary for debugging,
because
// libjdwp.so need a symbol (fork1) from libjvm which it only gets if the
jvm is loaded
// witd RTLD_GLOBAL. On Solaris libjdwp.so is correctly linked with
libjvm.so
@@ -749,7 +755,16 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
*ppVm = pJavaVM;
JFW_TRACE2([Java framework] sunjavapluginSAL_DLLEXTENSION has
created a VM.\n);
}
-
+#else
+(void) arOptions;
+(void) cOptions;
+// On Android we always have a Java VM as we only expect this code
+// to be run in an Android app anyway.
+struct JNIInvokeInterface* * (*lo_get_javavm)(void) = (struct
JNIInvokeInterface* * (*)(void)) dlsym(RTLD_DEFAULT, lo_get_javavm);
+fprintf(stderr, Got lo_get_javavm = %p, lo_get_javavm);
+*ppVm = (JavaVM *) (*lo_get_javavm)();
+fprintf(stderr, lo_get_javavm returns %p, (*lo_get_javavm)());
+#endif
return errcode;
}
commit 15f6fec4d4224857a9dc15ff1e121a93ab4b9541
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Nov 25 01:39:20 2011 +0200
Add lo_get_javavm() to get the JavaVM we are runnning in
diff --git a/sal/osl/android/jni/lo-bootstrap.c
b/sal/osl/android/jni/lo-bootstrap.c
index 2e17155..bd84411 100644
--- a/sal/osl/android/jni/lo-bootstrap.c
+++ b/sal/osl/android/jni/lo-bootstrap.c
@@ -983,6 +983,11 @@ patch(const char *symbol,
int) replacement_code - ((int) code + 8)) / 4) 0x00FF));
}
+JavaVM *
+lo_get_javavm(void)
+{
+return app-activity-vm;
+}
void
android_main(struct android_app* state)
diff --git a/sal/osl/android/jni/lo-bootstrap.h
b/sal/osl/android/jni/lo-bootstrap.h
index c01ae3c..258d9d2 100644
--- a/sal/osl/android/jni/lo-bootstrap.h
+++ b/sal/osl/android/jni/lo-bootstrap.h
@@ -29,13 +29,17 @@
#if defined(ANDROID)
+#include jni.h
#include dlfcn.h
+#ifdef __cplusplus
+extern C {
+#endif
+
char **lo_dlneeds(const char *library);
void *lo_dlopen(const char *library);
-
void *lo_dlsym(void *handle,
const char *symbol);
@@ -48,6 +52,13 @@ void *lo_apkentry(const char *filename,
int lo_dlcall_argc_argv(void *function,
int argc,
const char **argv);
+
+JavaVM *lo_get_javavm(void);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b1b915c809b86df6cde84ecff091036901f6de14
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Nov 25 01:01:10 2011 +0200
Android compilation fix
diff --git a/jvmaccess/source/virtualmachine.cxx
b/jvmaccess/source/virtualmachine.cxx
index da7aa38..3e12088 100644
--- a/jvmaccess/source/virtualmachine.cxx
+++ b/jvmaccess/source/virtualmachine.cxx
@@ -105,7 +105,16 @@ JNIEnv * VirtualMachine::attachThread(bool * pAttached)
const
}
if (pEnv == 0)
{
-if (m_pVm-AttachCurrentThread(reinterpret_cast void ** (pEnv), 0)
+if (m_pVm-AttachCurrentThread
+(
+#ifndef ANDROID
+ reinterpret_cast void ** (pEnv),
+#else
+ // The Android jni.h has AttachCurrentThread() taking a
+ // JNIEnv** and not void **
+ pEnv,
+#endif
+ 0)
!= JNI_OK)
return 0;
*pAttached = true;
commit 9ee4f4eb52b0c03a2902acc081c847c4514fea35
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Nov 25 00:49:49 2011 +0200
Android is after all Java-based, so let's not avoid it
An Android app always runs in the context of a Java (well, Dalvik)
virtual machine.
Sure, there will now be some
[Libreoffice-commits] .: 9 commits - filter/source oox/inc oox/source sc/inc sc/source
filter/source/config/fragments/types/calc_MS_Excel_40.xcu | 2 filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu | 2 filter/source/config/fragments/types/calc_MS_Excel_5095.xcu | 2 filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu | 2 filter/source/config/fragments/types/calc_MS_Excel_95.xcu | 2 filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu | 2 filter/source/config/fragments/types/calc_MS_Excel_97.xcu | 2 filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu | 2 oox/inc/oox/xls/richstring.hxx | 1 oox/source/xls/commentsbuffer.cxx | 2 oox/source/xls/richstring.cxx | 16 ++-- oox/source/xls/worksheethelper.cxx | 5 + sc/inc/dptabsrc.hxx | 1 sc/source/core/data/dptabsrc.cxx| 16 sc/source/core/data/table1.cxx | 1 sc/source/core/data/table5.cxx | 4 + sc/source/filter/excel/impop.cxx| 4 - sc/source/ui/unoobj/scdetect.cxx| 38 -- sc/source/ui/view/drawutil.cxx | 12 +++ sc/source/ui/view/drawvie4.cxx | 2 sc/source/ui/view/drawview.cxx | 2 sc/source/ui/view/gridwin3.cxx | 2 sc/source/ui/view/gridwin4.cxx | 4 + 23 files changed, 99 insertions(+), 27 deletions(-) New commits: commit 31012ab9d7035f942486c87ecc1a79b4d6579975 Author: Eike Rathke er...@redhat.com Date: Fri Nov 25 00:59:12 2011 +0100 Fixed #i116848# Shapes are at wrong position # Original author: Niklas Nebel n...@openoffice.org Taken from OOO340 repository, changeset 7ebd38de6d70 introduced with CWS dr78. diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 1e6f330..cdd8abb 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -245,7 +245,7 @@ void ScDrawView::CalcNormScale( Fraction rFractX, Fraction rFractY ) const if (nEndCol20) nEndCol = 20; if (nEndRow20) -nEndRow = 1000; +nEndRow = 20; Fraction aZoom(1,1); ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev, aZoom,aZoom, diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index bfd65dd..0494dcb 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -332,7 +332,7 @@ void ScDrawView::RecalcScale() if (nEndCol20) nEndCol = 20; if (nEndRow20) -nEndRow = 1000; +nEndRow = 20; // #i116848# instead of a large row number for an empty sheet, heights are multiplied in CalcScale ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY, aScaleX,aScaleY ); diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 4e3189c..69a2b6a 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -266,7 +266,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce ) SCROW nEndRow = 0; pDoc-GetTableArea( nTab, nEndCol, nEndRow ); if (nEndCol20) nEndCol = 20; -if (nEndRow20) nEndRow = 1000; +if (nEndRow20) nEndRow = 20; ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, this, pViewData-GetZoomX(),pViewData-GetZoomY(), pViewData-GetPPTX(),pViewData-GetPPTY(), commit 8a838b9fbf46ece9680824cd3a044ab7338bf306 Author: Eike Rathke er...@redhat.com Date: Fri Nov 25 00:04:53 2011 +0100 calc69: #i118068# handle all-hidden case in ScDrawUtil::CalcScale # Original author: Niklas Nebel n...@openoffice.org * found as LGPLv3-only fix at svn rev 1172138 (http://svn.apache.org/viewvc?view=revisionrevision=1172138) Plus the original comment from the replaced code why it is there, to fix #i116848# diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index 54b4ef9..1cb5c74 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.cxx @@ -82,6 +82,18 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, nPixelY += ScViewData::ToPixel(nHeight, nPPTY); } +//
[Libreoffice-commits] .: solenv/gbuild unotest/source
solenv/gbuild/platform/IOS_ARM_GCC.mk |1
solenv/gbuild/platform/macosx.mk |1
solenv/gbuild/platform/solaris.mk |1
solenv/gbuild/platform/unxgcc.mk |2
solenv/gbuild/platform/unxgcc_gdbforjunit.sh | 52 ++
unotest/source/java/org/openoffice/test/OfficeConnection.java | 81 ++
6 files changed, 110 insertions(+), 28 deletions(-)
New commits:
commit 74f44646ba5b400cc39d78940677f136711459b5
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 25 04:16:28 2011 +0100
gdb stacktraces for subsequentchecks
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 8f013fb..f8d4454 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -302,6 +302,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}
\
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
+ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
endef
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4b84db4..3beb093 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -383,6 +383,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}
\
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
+ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
endef
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 28dbba8..a51edbf 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -367,6 +367,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}
\
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
+ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
endef
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 7df93f0..8c8380c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -382,6 +382,8 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}
\
-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR) \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
+ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
+
-Dorg.openoffice.test.arg.postprocesscommand=$(GBUILDDIR)/platform/unxgcc_gdbforjunit.sh
\
endef
diff --git a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
new file mode 100755
index 000..ced0444
--- /dev/null
+++ b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen bjoern.michael...@canonical.com
+# Portions created by the Initial Developer are Copyright (C) 2010 Canonical,
+# Ltd. . All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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
+# instead of those above.
+#
+
+# we expect our work directory to be where soffice had been started
+# $(1) should be the path to the executable
+
+OFFICEFILE=${1}
+WORKDIR=${2}
+
+if test -e ${WORKDIR}/core
+then
+STORELOCATION=`mktemp
[Libreoffice-commits] .: oox/source
oox/source/mathml/importutils.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 20c8eb409e2b48d57f392c146f7414bab3551664 Author: David Tardon dtar...@redhat.com Date: Fri Nov 25 07:26:10 2011 +0100 add missing include diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index 1dcb84e..8037e2b 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -29,6 +29,8 @@ #include oox/mathml/importutils.hxx #include assert.h +#include stdio.h + #include oox/token/tokens.hxx #include oox/token/namespaces.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
