[Libreoffice-commits] .: formula/inc formula/source unusedcode.easy
formula/inc/formula/tokenarray.hxx |1 -
formula/source/core/api/token.cxx |5 -
unusedcode.easy|1 -
3 files changed, 7 deletions(-)
New commits:
commit d142091d4c98672c49f57be23f90e5ec8445e754
Author: Javier Silva Sanahuja jsilv...@uoc.edu
Date: Mon Apr 23 11:42:50 2012 +0530
Unused code removal
diff --git a/formula/inc/formula/tokenarray.hxx
b/formula/inc/formula/tokenarray.hxx
index 8b217a2..c5aee7d 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -210,7 +210,6 @@ public:
/** Xcl import may play dirty tricks with OpCode!=ocExternal.
Others don't use! */
FormulaToken* AddExternal( const String rStr, OpCode eOp = ocExternal );
-FormulaToken* AddBad( const sal_Unicode* pStr ); /// ocBad with String
FormulaToken* AddBad( const String rStr ); /// ocBad with String
FormulaToken* AddStringXML( const String rStr );/// ocStringXML with
String, temporary during import
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index 3a4f632..f426a31 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -770,11 +770,6 @@ FormulaToken* FormulaTokenArray::AddExternal( const
String rStr,
return Add( new FormulaExternalToken( eOp, rStr ) );
}
-FormulaToken* FormulaTokenArray::AddBad( const sal_Unicode* pStr )
-{
-return AddBad( String( pStr ) );
-}
-
FormulaToken* FormulaTokenArray::AddBad( const String rStr )
{
return Add( new FormulaStringOpToken( ocBad, rStr ) );
diff --git a/unusedcode.easy b/unusedcode.easy
index b09221f..daf8d4c 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -707,7 +707,6 @@ drawinglayer::attribute::SdrTextAttribute::isWrongSpell()
const
drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D(basegfx::B2DPolyPolygon
const, drawinglayer::attribute::LineAttribute const)
formula::EditBox::EditBox(Window*, long)
formula::FormulaListBox::FormulaListBox(Window*, long)
-formula::FormulaTokenArray::AddBad(unsigned short const*)
formula::FormulaTokenIterator::First()
jfw_plugin::VendorBase::createInstance()
jfw_plugin::VendorBase::getJavaExePaths(int*)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - editeng/source linguistic/source sw/source wizards/com
editeng/source/items/frmitems.cxx |3
linguistic/source/lngprophelp.cxx |1
sw/source/core/doc/doccomp.cxx | 15 ++-
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 45
+++---
4 files changed, 44 insertions(+), 20 deletions(-)
New commits:
commit cfdd2f747acc85bfc8ee1536ed2e0a4bdfbe2937
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Sun Mar 4 00:57:53 2012 +0100
Dropdown list in Letter Wizard are now ordered alphabetically
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index 736233c..c7e6e96 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -27,6 +27,8 @@
/
package com.sun.star.wizards.letter;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Vector;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.WrappedTargetException;
@@ -65,6 +67,20 @@ import com.sun.star.wizards.common.Helper;
public class LetterWizardDialogImpl extends LetterWizardDialog
{
+private class Strings
+{
+public String Norm;
+public String NormPath;
+public String LanguageLabel;
+
+public Strings(String norm, String normPath, String languageLabel)
+{
+Norm = norm;
+NormPath = normPath;
+LanguageLabel = languageLabel;
+}
+}
+
protected void enterStep(int OldStep, int NewStep)
{
}
@@ -1163,9 +1179,8 @@ public class LetterWizardDialogImpl extends
LetterWizardDialog
e.printStackTrace();
}
-Vector NormsVector = new Vector();
-Vector NormsPathVector = new Vector();
-Vector LanguageLabelsVector = new Vector();
+Vector StringsVector = new Vector();
+
String[] LanguageLabels;
boolean found = false;
@@ -1202,21 +1217,25 @@ public class LetterWizardDialogImpl extends
LetterWizardDialog
if (found)
{
-NormsVector.add(cIsoCode);
-NormsPathVector.add(nameList[i]);
-LanguageLabelsVector.add(lc.getLanguageString(MSID));
+StringsVector.add(new Strings(cIsoCode, (String)nameList[i],
lc.getLanguageString(MSID)));
}
}
+Collections.sort(StringsVector, new Comparator() {
+public int compare(Object a, Object b) {
+return
((Strings)a).LanguageLabel.compareTo(((Strings)b).LanguageLabel);
+}
+});
-Norms = new String[NormsVector.size()];
-NormsVector.toArray(Norms);
-
-NormPaths = new String[NormsPathVector.size()];
-NormsPathVector.toArray(NormPaths);
+Norms = new String[StringsVector.size()];
+NormPaths = new String[StringsVector.size()];
+LanguageLabels = new String[StringsVector.size()];
-LanguageLabels = new String[LanguageLabelsVector.size()];
-LanguageLabelsVector.toArray(LanguageLabels);
+for(int i = 0; iStringsVector.size(); i++) {
+Norms[i] = ((Strings)StringsVector.elementAt(i)).Norm;
+NormPaths[i] = ((Strings)StringsVector.elementAt(i)).NormPath;
+LanguageLabels[i] =
((Strings)StringsVector.elementAt(i)).LanguageLabel;
+}
setControlProperty(lstLetterNorm, PropertyNames.STRING_ITEM_LIST,
LanguageLabels);
}
commit fb172ff8a71765799d5e45edebfeae72243dcf46
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu Mar 8 14:52:14 2012 +0100
fdo#43424: Comparing empty document with attached one crashes LO
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 8f4f56d..1e1bd06 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1327,14 +1327,17 @@ void SwCompareData::ShowDelete( const CompareData
rData, sal_uLong nStt,
((SwCompareLine*)rData.GetLine( nEnd-1 ))-GetEndNode(), 1 );
sal_uInt16 nOffset = 0;
-const CompareLine* pLine;
-if( GetLineCount() == nInsPos )
+const CompareLine* pLine = 0;
+if( nInsPos = 1 )
{
-pLine = GetLine( nInsPos-1 );
-nOffset = 1;
+if( GetLineCount() == nInsPos )
+{
+pLine = GetLine( nInsPos-1 );
+nOffset = 1;
+}
+else
+pLine = GetLine( nInsPos );
}
-else
-pLine = GetLine( nInsPos );
const SwNode* pLineNd;
if( pLine )
commit 1ad284007d898c68665c91979be3bd326c290ba1
Author: Dezsi Szabolcs dezsisz...@hotmail.com
Date:
[Libreoffice-commits] .: solenv/gbuild solenv/inc
solenv/gbuild/platform/macosx.mk |2 +- solenv/inc/unxmacx.mk| 12 +--- 2 files changed, 10 insertions(+), 4 deletions(-) New commits: commit c29b6b2a065bbf7ade2d6b62dfd1c0245318f355 Author: Tor Lillqvist t...@iki.fi Date: Sun Apr 22 22:44:08 2012 +0300 No -malign-natural in Clang, not Apple's at least diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index d4d113d..819fbef 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -75,7 +75,7 @@ gb_CXXFLAGS := \ -Wno-non-virtual-dtor \ -fno-strict-aliasing \ -fsigned-char \ - -malign-natural \ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,-malign-natural) \ #-Wshadow \ break in compiler headers already #-fsigned-char \ might be removed? #-malign-natural \ might be removed? diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 1ca6a82..1a7c891 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -88,7 +88,7 @@ CC*=gcc objc*=$(CC) objcpp*=$(CXX) -CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS) +CFLAGS=-fsigned-char -fmessage-length=0 -c $(EXTRA_CFLAGS) .IF $(DISABLE_DEPRECATION_WARNING) == TRUE CFLAGS+=-Wno-deprecated-declarations @@ -97,7 +97,10 @@ CFLAGS+=-Wno-deprecated-declarations # Compilation flags # - # Normal C compilation flags -CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS) +CFLAGSCC=-pipe -fsigned-char $(ARCH_FLAGS) +.IF $(COM_GCC_IS_CLANG) != TRUE +CFLAGSCC+=-malign-natural +.ENDIF # Normal Objective C compilation flags #OBJCFLAGS=-no-precomp @@ -117,7 +120,10 @@ CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs CFLAGS_NO_EXCEPTIONS=-fno-exceptions # Normal C++ compilation flags -CFLAGSCXX=-pipe -malign-natural -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy +CFLAGSCXX=-pipe -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy +.IF $(COM_GCC_IS_CLANG) != TRUE +CFLAGSCXX+=-malign-natural +.ENDIF .IF $(HAVE_GCC_NO_LONG-DOUBLE) == TRUE CFLAGSCXX+= -Wno-long-double .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/defaultbootstrap.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 0bbf79005a697c6781047c01f05eb660836a18e1
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 23 11:47:45 2012 +0200
Do not fail for legacy rdb that only contains root key
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index 4921011..a11f220 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1318,7 +1318,12 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString
const uri) {
static_cast cppu::OWeakObject * (this));
}
RegistryKeyArray impls;
-if (rootKey.openSubKeys(IMPLEMENTATIONS, impls) != REG_NO_ERROR) {
+switch (rootKey.openSubKeys(IMPLEMENTATIONS, impls)) {
+case REG_NO_ERROR:
+break;
+case REG_KEY_NOT_EXISTS:
+return true;
+default:
throw css::uno::DeploymentException(
Failure reading legacy rdb file + uri,
static_cast cppu::OWeakObject * (this));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - sdext/source
sdext/source/pdfimport/tree/pdfiprocessor.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5a39623867709b271db738ba259817eb5d6f1674 Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com Date: Sat Apr 21 10:06:19 2012 +0700 Fix fdo#45848 regression from 5dd4f9ecb2f50cf76b44472e4438297b6c65184c The change: -if(m_GlyphsList.size()1) +if(!m_GlyphsList.empty()) is incorrect, so change it back. (cherry picked from commit bcb4defef7c9147a94ef19a51a18715449d3572d) Signed-off-by: Caolán McNamara caol...@redhat.com (cherry picked from commit fc0c85e8628bf90afd4a47c20b3d1bc2a9c01b36) Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Michael Meeks michael.me...@suse.com Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 6d0e34e..a800643 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -399,7 +399,7 @@ void PDFIProcessor::processGlyphLine() } -if(!m_GlyphsList.empty()) +if(m_GlyphsList.size()1) processGlyph( 0, m_GlyphsList[m_GlyphsList.size()-1], pPara, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 66 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 +
writerfilter/source/rtftok/rtftokenizer.cxx|4 +
3 files changed, 53 insertions(+), 21 deletions(-)
New commits:
commit ed5010f24fc3992945f72225e3d7d1351f048404
Author: Miklos Vajna vmik...@suse.cz
Date: Sun Apr 15 14:10:49 2012 +0200
fdo#39053 writerfilter: implement RTF_BIN
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
writerfilter/source/rtftok/rtftokenizer.cxx
(cherry-picked from 5187174cd4054486100ef29125ee4a36f7e3bee3)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 016943d..aca6a29 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -609,34 +609,42 @@ void RTFDocumentImpl::resolve(Stream rMapper)
int RTFDocumentImpl::resolvePict(bool bInline)
{
SvMemoryStream aStream;
-int b = 0, count = 2;
+SvStream *pStream = 0;
-// Feed the destination text to a stream.
-OString aStr =
OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US);
-const char *str = aStr.getStr();
-for (int i = 0; i aStr.getLength(); ++i)
+if (!m_pBinaryData.get())
{
-char ch = str[i];
-if (ch != 0x0d ch != 0x0a)
+pStream = aStream;
+int b = 0, count = 2;
+
+// Feed the destination text to a stream.
+OString aStr =
OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US);
+const char *str = aStr.getStr();
+for (int i = 0; i aStr.getLength(); ++i)
{
-b = b 4;
-sal_Int8 parsed = m_pTokenizer-asHex(ch);
-if (parsed == -1)
-return ERROR_HEX_INVALID;
-b += parsed;
-count--;
-if (!count)
-{
-aStream (char)b;
-count = 2;
-b = 0;
+char ch = str[i];
+if (ch != 0x0d ch != 0x0a)
+{
+b = b 4;
+sal_Int8 parsed = m_pTokenizer-asHex(ch);
+if (parsed == -1)
+return ERROR_HEX_INVALID;
+b += parsed;
+count--;
+if (!count)
+{
+aStream (char)b;
+count = 2;
+b = 0;
+}
}
}
}
+else
+pStream = m_pBinaryData.get();
// Store, and get its URL.
-aStream.Seek(0);
-uno::Referenceio::XInputStream xInputStream(new
utl::OInputStreamWrapper(aStream));
+pStream-Seek(0);
+uno::Referenceio::XInputStream xInputStream(new
utl::OInputStreamWrapper(pStream));
WMF_EXTERNALHEADER aExtHeader;
aExtHeader.mapMode = m_aStates.top().aPicture.eWMetafile;
aExtHeader.xExt = m_aStates.top().aPicture.nWidth;
@@ -775,6 +783,19 @@ int RTFDocumentImpl::resolvePict(bool bInline)
int RTFDocumentImpl::resolveChars(char ch)
{
+if (m_aStates.top().nInternalState == INTERNAL_BIN)
+{
+m_pBinaryData.reset(new SvMemoryStream());
+*m_pBinaryData ch;
+for (int i = 0; i m_aStates.top().nBinaryToRead - 1; ++i)
+{
+Strm() ch;
+*m_pBinaryData ch;
+}
+m_aStates.top().nInternalState = INTERNAL_NORMAL;
+return 0;
+}
+
if (m_aStates.top().nInternalState != INTERNAL_HEX)
checkUnicode(false, true);
@@ -2778,6 +2799,10 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
lcl_putNestedSprm(m_aStates.top().aTableSprms,
NS_ooxml::LN_CT_Lvl_rPr, NS_sprm::LN_CRgFtc0, pValue);
}
break;
+case RTF_BIN:
+m_aStates.top().nInternalState = INTERNAL_BIN;
+m_aStates.top().nBinaryToRead = nParam;
+break;
default:
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(%s: TODO handle value '%s', OSL_THIS_FUNC,
lcl_RtfToString(nKeyword));
@@ -3595,6 +3620,7 @@ RTFParserState::RTFParserState(RTFDocumentImpl
*pDocumentImpl)
nCurrentEncoding(0),
nUc(1),
nCharsToSkip(0),
+nBinaryToRead(0),
nListLevelNum(0),
aListLevelEntries(),
aLevelNumbers(),
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 0126882..1d0a37d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -281,6 +281,8 @@ namespace writerfilter {
int nUc;
/// Characters to skip, set to nUc by \u.
int nCharsToSkip;
+/// Characters to read, once in binary mode.
+
[Libreoffice-commits] .: configure.in
configure.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 62a318eea86feb9340970c71eac835d09b78 Author: Tomas Chvatal tchva...@suse.cz Date: Mon Apr 23 13:23:57 2012 +0200 Add all the available themes to the list. diff --git a/configure.in b/configure.in index 15d8ce6..e6d8844 100644 --- a/configure.in +++ b/configure.in @@ -9472,13 +9472,13 @@ dnl === AC_MSG_CHECKING([which themes to include]) # if none given, use all available themes if test x$with_theme = x -o x$with_theme = xyes; then -with_theme=default crystal hicontrast oxygen tango +with_theme=crystal hicontrast human oxygen tango fi WITH_THEMES= for theme in $with_theme; do case $theme in -default|crystal|hicontrast|oxygen|tango|human) : ;; +classic|crystal|galaxy|hicontrast|human|industrial|oxygen|tango) : ;; *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; esac WITH_THEMES=$WITH_THEMES $theme ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - bridges/source testtools/source
bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx | 16 +---
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 16
testtools/source/bridgetest/makefile.mk |4
3 files changed, 21 insertions(+), 15 deletions(-)
New commits:
commit b8044cb828af149a4598b35a4d46d8fe4205ae74
Author: David Tardon dtar...@redhat.com
Date: Mon Apr 23 13:51:51 2012 +0200
i hope this is fixed now
diff --git a/testtools/source/bridgetest/makefile.mk
b/testtools/source/bridgetest/makefile.mk
index 3e31ba6..f87327e 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -146,15 +146,11 @@ ALLTAR: \
runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
$(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
.IF $(CROSS_COMPILING)!=YES
-.IF $(COM)$(OS)$(CPU) == GCCMACOSXP
-@echo Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me.
-.ELSE
cd $(DLLDEST) $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
-ro uno_services.rdb -ro uno_types.rdb \
-s com.sun.star.test.bridge.BridgeTest -- \
com.sun.star.test.bridge.CppTestObject
.ENDIF
-.ENDIF
$(DLLDEST)/services.rdb :
$(COPY) $(SOLARXMLDIR)/ure/services.rdb $@
commit 84dbc4fe2547f8fc341a46d7f000e721c81e63ee
Author: David Tardon dtar...@redhat.com
Date: Mon Apr 23 13:19:39 2012 +0200
do not let gcc use registers we are setting ourselves
gcc uses a register for the function call--and it tried r9 here...
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index 34e8c63..f409bf7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -67,7 +67,6 @@ static void callVirtualMethod(
// of floating point registers f1 to f8
unsigned long * mfunc;// actual function to be invoked
- void (*ptr)();
int gpr[8]; // storage for gpregisters, map to r3-r10
int off; // offset used to find function
#ifndef __NO_FPRS__
@@ -243,7 +242,8 @@ static void callVirtualMethod(
mfunc = *((unsigned long **)pAdjustedThisPtr);// get the address of
the vtable
mfunc = (unsigned long *)((char *)mfunc + off); // get the address from
the vtable entry at offset
mfunc = *((unsigned long **)mfunc); // the function is
stored at the address
- ptr = (void (*)())mfunc;
+ typedef void (*FunctionCall)(sal_uInt32, sal_uInt32, sal_uInt32,
sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32);
+ FunctionCall ptr = (FunctionCall)mfunc;
/* Set up the machine registers and invoke the function */
@@ -272,7 +272,17 @@ static void callVirtualMethod(
: 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
);
-(*ptr)();
+// tell gcc that r3 to r10 are not available to it for doing the TOC and
exception munge on the func call
+register sal_uInt32 r3 __asm__(r3);
+register sal_uInt32 r4 __asm__(r4);
+register sal_uInt32 r5 __asm__(r5);
+register sal_uInt32 r6 __asm__(r6);
+register sal_uInt32 r7 __asm__(r7);
+register sal_uInt32 r8 __asm__(r8);
+register sal_uInt32 r9 __asm__(r9);
+register sal_uInt32 r10 __asm__(r10);
+
+(*ptr)(r3, r4, r5, r6, r7, r8, r9, r10);
__asm__ __volatile__ (
mr %0, 3\n\t
commit c4c9484a1f55266c92e83406ddee3715affed7f6
Author: David Tardon dtar...@redhat.com
Date: Mon Apr 23 09:47:41 2012 +0200
save register arguments first
The mr stores r11 to indeterminate register (r9 in my case) before
storing it into the output variable, thus overwriting one of our input
arguments... This later leads to nice segfault in
testtools/source/bridgetest ...
I suppose there is a better way to get the variable, but I do not know
it .-)
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 425c5b5..3cb94dd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -504,13 +504,6 @@ static typelib_TypeClass cpp_mediate(
extern C void privateSnippetExecutor( ... )
{
-volatile long nOffsetAndIndex;
-
-//mr %r3, %r11# move into arg1 the 64bit value passed from OOo
-__asm__ __volatile__ (
-mr %0,11\n\t
-: =r (nOffsetAndIndex) : );
-
sal_uInt64 gpreg[ppc64::MAX_GPR_REGS];
double fpreg[ppc64::MAX_SSE_REGS];
@@ -537,11 +530,18 @@ extern C void privateSnippetExecutor( ... )
stfd 12, 88(%1)\t\n
stfd 13, 96(%1)\t\n
: : r (gpreg), r (fpreg)
-: r0, r3, r4, r5, r6, r7, r8, r9, r10,
+: r0, r3, r4, r5, r6, r7, r8, r9, r10, r11,
fr1, fr2, fr3, fr4, fr5, fr6, fr7, fr8,
[Libreoffice-commits] .: 8 commits - clucene/CustomTarget_source.mk clucene/patches connectivity/source idlc/source odk/source testtools/source
clucene/CustomTarget_source.mk |1
clucene/patches/clucene-multimap-put.patch |9 +++
connectivity/source/drivers/jdbc/Array.cxx |4 +--
connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx |6 ++---
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx | 12
+-
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx | 12
+-
idlc/source/scanner.ll |3 +-
odk/source/unoapploader/unx/unoapploader.c |6 +++--
testtools/source/bridgetest/makefile.mk|4 +++
9 files changed, 37 insertions(+), 20 deletions(-)
New commits:
commit 85c2f280ef21780de8aa2aa3c35148afc38f70b7
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 23 14:18:24 2012 +0200
Revert i hope this is fixed now
This reverts commit b8044cb828af149a4598b35a4d46d8fe4205ae74.
84dbc4fe2547f8fc341a46d7f000e721c81e63ee fixed the bridge for PPC on Linux,
not
Mac OS X.
diff --git a/testtools/source/bridgetest/makefile.mk
b/testtools/source/bridgetest/makefile.mk
index f87327e..3e31ba6 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -146,11 +146,15 @@ ALLTAR: \
runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
$(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
.IF $(CROSS_COMPILING)!=YES
+.IF $(COM)$(OS)$(CPU) == GCCMACOSXP
+@echo Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me.
+.ELSE
cd $(DLLDEST) $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
-ro uno_services.rdb -ro uno_types.rdb \
-s com.sun.star.test.bridge.BridgeTest -- \
com.sun.star.test.bridge.CppTestObject
.ENDIF
+.ENDIF
$(DLLDEST)/services.rdb :
$(COPY) $(SOLARXMLDIR)/ure/services.rdb $@
commit 40813789450f4e7aa506a191a2d1360c2b077d89
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 23 14:15:42 2012 +0200
Minor improvement of previous fix
diff --git a/odk/source/unoapploader/unx/unoapploader.c
b/odk/source/unoapploader/unx/unoapploader.c
index 087f086..90c1cd1 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -100,7 +100,7 @@ int main( int argc, char *argv[] )
struct stat stat;
int ret;
-char unoinfoSuffix[] = /unoinfo;
+static char const unoinfoSuffix[] = /unoinfo;
char * unoinfo = malloc(
pathlen + RTL_CONSTASCII_LENGTH(unoinfoSuffix) + 1);
/*TODO: overflow */
commit 5b3d15241feb47e914c6835664a90c346d69411d
Author: Catalin Iacob iacobcata...@gmail.com
Date: Thu Apr 19 21:16:59 2012 +0200
WaE: Clang implicit conversion changes signedness
The various *Card* members call getByIndex(rowIndex) and getByIndex expects
sal_uInt32 so change everything to it. Change callers as well to adapt to
the change.
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index a4cc600..c3d151e 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -179,19 +179,19 @@ nsresult MNSMozabProxy::QueryHelperStub()
case ProxiedFunc::FUNC_QUERYHELPER_DELETE_CARD:
if (m_Args-arg2 m_Args-arg3 ) //m_Args-arg2 used to get the
cord number
{
-rv =
mHelper-deleteCard(*((sal_Int32*)m_Args-arg2),(nsIAbDirectory*)m_Args-arg3);
+rv =
mHelper-deleteCard(*((sal_uInt32*)m_Args-arg2),(nsIAbDirectory*)m_Args-arg3);
}
break;
case ProxiedFunc::FUNC_QUERYHELPER_COMMIT_CARD:
if (m_Args-arg2 m_Args-arg3 ) //m_Args-arg2 used to get the
cord number
{
-rv =
mHelper-commitCard(*((sal_Int32*)m_Args-arg2),(nsIAbDirectory*)m_Args-arg3);
+rv =
mHelper-commitCard(*((sal_uInt32*)m_Args-arg2),(nsIAbDirectory*)m_Args-arg3);
}
break;
case ProxiedFunc::FUNC_QUERYHELPER_RESYNC_CARD:
if (m_Args-arg2) //m_Args-arg2 used to get the cord number
{
-rv = mHelper-resyncRow(*((sal_Int32*)m_Args-arg2));
+rv = mHelper-resyncRow(*((sal_uInt32*)m_Args-arg2));
}
break;
default:
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 2c51dc9..6e9079c 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -470,7 +470,7 @@ nsIAbCard * getUpdatedCard( nsIAbCard* card)
return sal_False; \
}
-sal_Int32 MQueryHelper::commitCard(const sal_Int32 rowIndex,nsIAbDirectory *
directory)
+sal_Int32
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) New commits: commit 3120273ab10e9e8b765e2d13a90b62102a45c56f Author: Stephan Bergmann sberg...@redhat.com Date: Mon Apr 23 14:28:48 2012 +0200 Port gcc3_linux_powerpc fix to gcc3_macosx_powerpc This ports 84dbc4fe2547f8fc341a46d7f000e721c81e63ee do not let gcc use registers we are setting ourselves, in the hope that it is also an improvement for Mac OS X PPC. (But the patch was applied blindly, so please revert if it makes things worse instead.) diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx index 59cec3c..0750980 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx @@ -67,7 +67,6 @@ static void callVirtualMethod( // of floating point registers f1 to f13 unsigned long * mfunc;// actual function to be invoked - void (*ptr)(); int gpr[8]; // storage for gpregisters, map to r3-r10 int off; // offset used to find function double fpr[13]; // storage for fpregisters, map to f1-f13 @@ -208,7 +207,8 @@ static void callVirtualMethod( mfunc = *((unsigned long **)pAdjustedThisPtr);// get the address of the vtable mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset mfunc = *((unsigned long **)mfunc); // the function is stored at the address - ptr = (void (*)())mfunc; + typedef void (*FunctionCall)(sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32); + FunctionCall ptr = (FunctionCall)mfunc; /* Set up the machine registers and invoke the function */ @@ -240,7 +240,17 @@ static void callVirtualMethod( f10, f11, f12, f13 ); -(*ptr)(); +// tell gcc that r3 to r10 are not available to it for doing the TOC and exception munge on the func call +register sal_uInt32 r3 __asm__(r3); +register sal_uInt32 r4 __asm__(r4); +register sal_uInt32 r5 __asm__(r5); +register sal_uInt32 r6 __asm__(r6); +register sal_uInt32 r7 __asm__(r7); +register sal_uInt32 r8 __asm__(r8); +register sal_uInt32 r9 __asm__(r9); +register sal_uInt32 r10 __asm__(r10); + +(*ptr)(r3, r4, r5, r6, r7, r8, r9, r10); __asm__ __volatile__ ( ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oovbaapi/ooo sc/source vbahelper/source
oovbaapi/ooo/vba/excel/XWorksheets.idl |1 +
sc/source/ui/vba/vbaworksheets.cxx |7 +++
sc/source/ui/vba/vbaworksheets.hxx |1 +
vbahelper/source/vbahelper/vbahelper.cxx | 13 -
4 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 17c8f6745f9f98013c1b08de8ec03be66546c7fc
Author: Noel Power noel.po...@novell.com
Date: Mon Apr 23 13:33:15 2012 +0100
support Sheets.PrintPreview bnc#757844
there is still a little wrinkle, the preview shell always shows what sheets
are selected, it's currently not possible to specify the sheets to preview
diff --git a/oovbaapi/ooo/vba/excel/XWorksheets.idl
b/oovbaapi/ooo/vba/excel/XWorksheets.idl
index 17c80ce..cca74f9 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheets.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheets.idl
@@ -45,6 +45,7 @@ interface XWorksheets
void PrintOut( [in] any From, [in] any To, [in] any Copies, [in] any
Preview, [in] any ActivePrinter, [in] any PrintToFile, [in] any Collate, [in]
any PrToFileName );
void Select( [in] any Replace );
void Copy( [in] any Before, [in] any After);
+void PrintPreview( [in] any EnableChanges );
};
}; }; };
diff --git a/sc/source/ui/vba/vbaworksheets.cxx
b/sc/source/ui/vba/vbaworksheets.cxx
index 89f169a..3d218fa 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -537,4 +537,11 @@ bool ScVbaWorksheets::nameExists( uno::Reference
sheet::XSpreadsheetDocument
return false;
}
+void ScVbaWorksheets::PrintPreview( const css::uno::Any EnableChanges ) throw
(css::uno::RuntimeException)
+{
+// need test, print preview current active sheet
+// !! TODO !! get view shell from controller
+PrintPreviewHelper( EnableChanges, excel::getBestViewShell( mxModel ) );
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/vba/vbaworksheets.hxx
b/sc/source/ui/vba/vbaworksheets.hxx
index c34ec08..b184d78 100644
--- a/sc/source/ui/vba/vbaworksheets.hxx
+++ b/sc/source/ui/vba/vbaworksheets.hxx
@@ -73,6 +73,7 @@ public:
virtual css::uno::Any createCollectionObject( const css::uno::Any aSource
);
virtual void SAL_CALL Select( const css::uno::Any Replace ) throw
(css::uno::RuntimeException);
virtual void SAL_CALL Copy ( const css::uno::Any Before, const
css::uno::Any After) throw (css::uno::RuntimeException);
+virtual void SAL_CALL PrintPreview( const css::uno::Any EnableChanges )
throw (css::uno::RuntimeException);
// ScVbaWorksheets_BASE
virtual css::uno::Any SAL_CALL Item( const css::uno::Any Index1, const
css::uno::Any Index2 ) throw
(css::uno::RuntimeException);
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx
b/vbahelper/source/vbahelper/vbahelper.cxx
index b91ef85..0ef22fd 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -473,7 +473,18 @@ void PrintOutHelper( SfxViewShell* pViewShell, const
uno::Any From, const uno::
void PrintPreviewHelper( const css::uno::Any /*EnableChanges*/,
SfxViewShell* pViewShell )
{
-dispatchExecute( pViewShell, SID_VIEWSHELL1 );
+SfxViewFrame* pViewFrame = NULL;
+if ( pViewShell )
+pViewFrame = pViewShell-GetViewFrame();
+if ( pViewFrame )
+{
+if ( !pViewFrame-GetFrame().IsInPlace() )
+{
+dispatchExecute( pViewShell, SID_VIEWSHELL1 );
+while ( isInPrintPreview( pViewFrame ) )
+Application::Yield();
+}
+}
}
bool extractBoolFromAny( const uno::Any rAny ) throw (uno::RuntimeException)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/parameter.pm |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 071d6daf5c798e89887a84a17fb3b64824fdbc6f
Author: Tomas Chvatal tchva...@suse.cz
Date: Mon Apr 23 14:39:39 2012 +0200
Fix undefined destdir if the directory was not existing prior the run.
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 6d99aaa..198a381 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -152,7 +152,10 @@ sub getparameter
elsif ($param eq -destdir)# new parameter for simple installer
{
$installer::globals::rootpath ne die must set destdir
before -i or -simple;
-$installer::globals::destdir = Cwd::realpath( shift @ARGV );
+
+ my $path = shift(@ARGV);
+ mkdir $path;
+$installer::globals::destdir = Cwd::realpath($path);
}
elsif ($param eq -simple) # new parameter for simple installer
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/parameter.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f3480645bd444649491942c501ec679a46eb8d09
Author: Tomas Chvatal tchva...@suse.cz
Date: Mon Apr 23 14:42:26 2012 +0200
Whitespace torture
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 198a381..e84dbdc 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -153,8 +153,8 @@ sub getparameter
{
$installer::globals::rootpath ne die must set destdir
before -i or -simple;
- my $path = shift(@ARGV);
- mkdir $path;
+my $path = shift(@ARGV);
+mkdir $path;
$installer::globals::destdir = Cwd::realpath($path);
}
elsif ($param eq -simple) # new parameter for simple installer
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo.lst.in openssl/makefile.mk openssl/openssl-asm-fix.patch openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/opensslmingw.patch openssl/o
ooo.lst.in|2 +- openssl/makefile.mk | 16 openssl/openssl-asm-fix.patch |4 ++-- openssl/openssl.patch | 24 openssl/opensslios.patch |4 ++-- openssl/openssllnx.patch | 28 ++-- openssl/opensslmacosx.patch | 12 ++-- openssl/opensslmingw.patch| 16 openssl/opensslsol.patch | 28 ++-- openssl/version.mk|4 ++-- 10 files changed, 69 insertions(+), 69 deletions(-) New commits: commit 957cb927a77a1e19d2a1d4804cbbe9816150654b Author: Petr Mladek pmla...@suse.cz Date: Mon Apr 23 11:26:12 2012 +0200 update internal openssl to version 0.9.8v including important bug fixes diff --git a/ooo.lst.in b/ooo.lst.in index 1d6bfde..04dfa6b 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -1,6 +1,6 @@ http://dev-www.libreoffice.org/src 86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz -63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz +51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 226e86c..04a8683 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -46,10 +46,10 @@ TARGET=openssl @echo openssl disabled .ENDIF -OPENSSL_NAME=openssl-0.9.8o +OPENSSL_NAME=openssl-0.9.8v TARFILE_NAME=$(OPENSSL_NAME) -TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 +TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce PATCH_FILES=openssl-asm-fix.patch CONFIGURE_DIR=. @@ -86,8 +86,8 @@ UNAME=$(shell uname) .IF $(OS) == LINUX || $(OS) == FREEBSD || $(OS) == ANDROID PATCH_FILES+=openssllnx.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map .IF $(CPU) == I .IF $(UNAME) == GNU/kFreeBSD CONFIGURE_ACTION=Configure debian-kfreebsd-i386 @@ -104,15 +104,15 @@ UNAME=$(shell uname) CONFIGURE_ACTION=Configure linux-generic32 .ENDIF # if you build openssl as shared library you have to patch the Makefile.Shared LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \ -#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' +#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8v.map' .ENDIF .IF $(OS) == SOLARIS PATCH_FILES+=opensslsol.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map -#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8e.map' +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map +#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8v.map' # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary diff --git a/openssl/openssl-asm-fix.patch b/openssl/openssl-asm-fix.patch index bb722be..76013eb 100644 --- a/openssl/openssl-asm-fix.patch +++ b/openssl/openssl-asm-fix.patch @@ -1,5 +1,5 @@ misc/build/openssl-0.9.8o/crypto/md32_common.h.sav 2010-03-29 13:23:11.0 +0200 -+++ misc/build/openssl-0.9.8o/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100 +--- misc/build/openssl-0.9.8v/crypto/md32_common.h.sav 2010-03-29 13:23:11.0 +0200 misc/build/openssl-0.9.8v/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100 @@ -165,7 +165,7 @@ asm ( \ roll %1,%0\ diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 88f7088..538b2c1 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,5 +1,5 @@ misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -9,8 +9,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte
[Libreoffice-commits] .: 2 commits - test/Library_test.mk test/source
test/Library_test.mk |1 -
test/source/sheet/xdatabaserange.cxx |2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 1b66253254275f259e18847e2039baceab4ba458
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Apr 23 15:39:17 2012 +0200
fix true-sal_False introduced in 6a018de
diff --git a/test/source/sheet/xdatabaserange.cxx
b/test/source/sheet/xdatabaserange.cxx
index 7715305..d8cb3a0 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -116,7 +116,7 @@ void XDatabaseRange::testGetSortDescriptor()
{
sal_Bool bBindFormatsToContent = sal_False;
xProp.Value = bBindFormatsToContent;
-CPPUNIT_ASSERT(bBindFormatsToContent == sal_False);
+CPPUNIT_ASSERT(bBindFormatsToContent == sal_True);
}
else if (xProp.Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CopyOutputData)))
{
commit 5e66f8ee1e1168944c4092e3d4b1b720abdb440e
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Apr 23 13:24:58 2012 +0200
Revert it seems tests runtime-depend on ucpchelp1 too
It did not help with the race condition at all.
This reverts commit 1b62ccdcb5a44effe4f6f9de105d96fbbd18102d.
diff --git a/test/Library_test.mk b/test/Library_test.mk
index b795f8a..571d26c 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -56,7 +56,6 @@ ifeq ($(GUIBASE),unx)
$(call gb_Library_get_target,test) : \
$(call gb_Library_get_target,desktop_detector) \
$(call gb_Library_get_target,vclplug_svp) \
-$(call gb_Library_get_target,ucpchelp1) \
endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vbahelper/source
vbahelper/source/msforms/vbacombobox.cxx |1 -
vbahelper/source/msforms/vbaimage.cxx |1 -
vbahelper/source/msforms/vbascrollbar.cxx |1 -
vbahelper/source/msforms/vbaspinbutton.cxx |1 -
vbahelper/source/vbahelper/vbacommandbarhelper.hxx |1 -
5 files changed, 5 deletions(-)
New commits:
commit 9cb75ccaa7d529d0469e70229ad511bc2bc12abb
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Apr 23 23:04:49 2012 +0900
removed unused static data
diff --git a/vbahelper/source/msforms/vbacombobox.cxx
b/vbahelper/source/msforms/vbacombobox.cxx
index cf3d0ab..cd4b5d4 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -47,7 +47,6 @@ using namespace ooo::vba;
//StringItemList list of items
const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM(Text) );
-const static rtl::OUString SELECTEDITEMS(
RTL_CONSTASCII_USTRINGPARAM(SelectedItems) );
const static rtl::OUString ITEMS(
RTL_CONSTASCII_USTRINGPARAM(StringItemList) );
const static rtl::OUString CONTROLSOURCEPROP(
RTL_CONSTASCII_USTRINGPARAM(DataFieldProperty) );
diff --git a/vbahelper/source/msforms/vbaimage.cxx
b/vbahelper/source/msforms/vbaimage.cxx
index 3135d94..1c3ea44 100644
--- a/vbahelper/source/msforms/vbaimage.cxx
+++ b/vbahelper/source/msforms/vbaimage.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star;
using namespace ooo::vba;
-const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM(Label) );
ScVbaImage::ScVbaImage( const uno::Reference XHelperInterface xParent,
const uno::Reference uno::XComponentContext xContext, const uno::Reference
uno::XInterface xControl, const uno::Reference frame::XModel xModel,
AbstractGeometryAttributes* pGeomHelper ) : ImageImpl_BASE( xParent, xContext,
xControl, xModel, pGeomHelper )
{
}
diff --git a/vbahelper/source/msforms/vbascrollbar.cxx
b/vbahelper/source/msforms/vbascrollbar.cxx
index 3969ac1..bc2e263 100644
--- a/vbahelper/source/msforms/vbascrollbar.cxx
+++ b/vbahelper/source/msforms/vbascrollbar.cxx
@@ -34,7 +34,6 @@ using namespace ooo::vba;
const static rtl::OUString LARGECHANGE(
RTL_CONSTASCII_USTRINGPARAM(BlockIncrement) );
const static rtl::OUString SMALLCHANGE(
RTL_CONSTASCII_USTRINGPARAM(LineIncrement) );
-const static rtl::OUString ORIENTATION(
RTL_CONSTASCII_USTRINGPARAM(Orientation) );
const static rtl::OUString SCROLLVALUE(
RTL_CONSTASCII_USTRINGPARAM(ScrollValue) );
const static rtl::OUString SCROLLMAX(
RTL_CONSTASCII_USTRINGPARAM(ScrollValueMax) );
const static rtl::OUString SCROLLMIN(
RTL_CONSTASCII_USTRINGPARAM(ScrollValueMin) );
diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx
b/vbahelper/source/msforms/vbaspinbutton.cxx
index bd4fda3..c93f642 100644
--- a/vbahelper/source/msforms/vbaspinbutton.cxx
+++ b/vbahelper/source/msforms/vbaspinbutton.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star;
using namespace ooo::vba;
-const static rtl::OUString ORIENTATION(
RTL_CONSTASCII_USTRINGPARAM(Orientation) );
const static rtl::OUString SPINVALUE( RTL_CONSTASCII_USTRINGPARAM(SpinValue)
);
const static rtl::OUString SPINMAX(
RTL_CONSTASCII_USTRINGPARAM(SpinValueMax) );
const static rtl::OUString SPINMIN(
RTL_CONSTASCII_USTRINGPARAM(SpinValueMin) );
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
index 8c4be0c..130074f 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
@@ -46,7 +46,6 @@ static const char ITEM_DESCRIPTOR_LABEL[] = Label;
static const char ITEM_DESCRIPTOR_TYPE[]= Type;
static const char ITEM_DESCRIPTOR_STYLE[] = Style;
static const char ITEM_DESCRIPTOR_ISVISIBLE[] = IsVisible;
-static const char ITEM_DESCRIPTOR_RESOURCEURL[] = ResourceURL;
static const char ITEM_DESCRIPTOR_UINAME[] = UIName;
static const char ITEM_DESCRIPTOR_ENABLED[] = Enabled;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/registry/dp_backend.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 6a80adb094d87cddc103d84d5616e1ecae899889 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Apr 23 16:22:53 2012 +0200 Unused sDataFolderURL diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index fef95a8..7b654d3 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -233,7 +233,6 @@ OUString PackageRegistryBackend::createFolder( ucbhelper::Content dataContent; ::dp_misc::create_folder(dataContent, sDataFolder, xCmdEnv); -const OUString sDataFolderURL = dp_misc::expandUnoRcUrl(sDataFolder); const String baseDir(sDataFolder); const ::utl::TempFile aTemp(baseDir, sal_True); const OUString url = aTemp.GetURL(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - oox/inc oox/source sw/qa writerfilter/source
oox/inc/oox/vml/vmlshape.hxx |1 +
oox/source/token/properties.txt |1 +
oox/source/vml/vmlshape.cxx |2 ++
oox/source/vml/vmlshapecontext.cxx |1 +
sw/qa/extras/ooxmltok/data/n757890.docx |binary
sw/qa/extras/ooxmltok/ooxmltok.cxx | 27 +++
writerfilter/source/dmapper/DomainMapper.cxx |2 ++
7 files changed, 34 insertions(+)
New commits:
commit 8ee0e1f3fc54727f03674be415302109f6d87dc1
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Apr 23 17:00:23 2012 +0200
n#757890 add testcase
diff --git a/sw/qa/extras/ooxmltok/data/n757890.docx
b/sw/qa/extras/ooxmltok/data/n757890.docx
new file mode 100644
index 000..f70368a
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n757890.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 5aff21c..e5bdece 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -28,11 +28,14 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/text/HoriOrientation.hpp
#include com/sun/star/text/SetVariableType.hpp
#include com/sun/star/text/TextContentAnchorType.hpp
#include com/sun/star/text/XDependentTextField.hpp
#include com/sun/star/text/XPageCursor.hpp
+#include com/sun/star/text/XTextDocument.hpp
#include com/sun/star/text/XTextFieldsSupplier.hpp
+#include com/sun/star/text/XTextFramesSupplier.hpp
#include com/sun/star/text/XTextViewCursorSupplier.hpp
#include test/bootstrapfixture.hxx
@@ -53,6 +56,7 @@ public:
void testN751117();
void testN751017();
void testN750935();
+void testN757890();
CPPUNIT_TEST_SUITE(OoxmlModelTest);
#if !defined(MACOSX) !defined(WNT)
@@ -60,6 +64,7 @@ public:
CPPUNIT_TEST(testN751117);
CPPUNIT_TEST(testN751017);
CPPUNIT_TEST(testN750935);
+CPPUNIT_TEST(testN757890);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -185,6 +190,28 @@ void OoxmlModelTest::testN750935()
CPPUNIT_ASSERT_EQUAL(sal_Int16(5), xCursor-getPage());
}
+void OoxmlModelTest::testN757890()
+{
+load(n757890.docx);
+
+// The w:pStyle token affected the text outside the textbox.
+uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xParaEnum =
xParaEnumAccess-createEnumeration();
+uno::Referencebeans::XPropertySet xPara(xParaEnum-nextElement(),
uno::UNO_QUERY);
+OUString aValue;
+xPara-getPropertyValue(ParaStyleName) = aValue;
+CPPUNIT_ASSERT_EQUAL(OUString(Heading 1), aValue);
+
+// This wan't centered
+uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0),
uno::UNO_QUERY);
+sal_Int16 nValue;
+xFrame-getPropertyValue(HoriOrient) = nValue;
+CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::CENTER, nValue);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(OoxmlModelTest);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 5dd8e91934618532bdb7f3d80035d8301a782b32
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Apr 23 16:22:54 2012 +0200
n#757890 dmapper: paragraph properties of shape text should have limited
scope
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index dcc20cf..b597ddf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3239,10 +3239,12 @@ void DomainMapper::markLastParagraphInSection( )
void DomainMapper::lcl_startShape( uno::Reference drawing::XShape xShape )
{
m_pImpl-PushShapeContext( xShape );
+lcl_startParagraphGroup();
}
void DomainMapper::lcl_endShape( )
{
+lcl_endParagraphGroup();
m_pImpl-PopShapeContext( );
}
commit a5b3bf724e355ceb476991f4ecaa56fd019e3067
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Apr 23 11:48:42 2012 +0200
n#757890 oox: implement mso-position-horizontal shape property for
textframes
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 82c0f3e..d969577 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -80,6 +80,7 @@ struct ShapeTypeModel
::rtl::OUString maMarginLeft; /// X position of the shape
bounding box to shape anchor (number with unit).
::rtl::OUString maMarginTop;/// Y position of the shape
bounding box to shape anchor (number with unit).
::rtl::OUString maPositionVerticalRelative; /// The Y position is
relative to this.
+::rtl::OUString maPositionHorizontal;
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source
vcl/source/gdi/pngread.cxx | 27 +++
1 file changed, 19 insertions(+), 8 deletions(-)
New commits:
commit 15afc7ab406141983f8b64fca116586e3c1cb581
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 19 20:46:59 2012 +0100
fail earlier on oversized images
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 1c590b5..2302e33 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -620,14 +620,6 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size
rPreviewSizeHint )
mnScansize = static_cast sal_uInt32 ( nScansize64 );
-// TODO: switch between both scanlines instead of copying
-mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ];
-mpScanCurrent = mpInflateInBuf;
-mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ];
-
-if ( !mpInflateInBuf || !mpScanPrior )
-return sal_False;
-
// calculate target size from original size and the preview hint
if( rPreviewSizeHint.Width() || rPreviewSizeHint.Height() )
{
@@ -662,6 +654,25 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size
rPreviewSizeHint )
maTargetSize.Width() = (maOrigSize.Width() + mnPreviewMask)
mnPreviewShift;
maTargetSize.Height() = (maOrigSize.Height() + mnPreviewMask)
mnPreviewShift;
+//round bits up to nearest multiple of 8 and divide by 8 to get num of
bytes per pixel
+int nBytesPerPixel = ((mnTargetDepth + 7) ~7)/8;
+
+//stupidly big, forget about it
+if (maTargetSize.Width() = SAL_MAX_INT32 / nBytesPerPixel /
maTargetSize.Height())
+{
+SAL_WARN( vcl, overlarge png dimensions:
+maTargetSize.Width() x maTargetSize.Height() depth:
mnTargetDepth);
+return sal_False;
+}
+
+// TODO: switch between both scanlines instead of copying
+mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ];
+mpScanCurrent = mpInflateInBuf;
+mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ];
+
+if ( !mpInflateInBuf || !mpScanPrior )
+return sal_False;
+
mpBmp = new Bitmap( maTargetSize, mnTargetDepth );
mpAcc = mpBmp-AcquireWriteAccess();
if( !mpAcc )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - ooo.lst.in openssl/makefile.mk openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/opensslmingw.patch openssl/open
ooo.lst.in |2 +- openssl/makefile.mk | 16 openssl/openssl.patch | 24 openssl/opensslios.patch|4 ++-- openssl/openssllnx.patch| 28 ++-- openssl/opensslmacosx.patch | 12 ++-- openssl/opensslmingw.patch | 16 openssl/opensslsol.patch| 28 ++-- openssl/version.mk |4 ++-- 9 files changed, 67 insertions(+), 67 deletions(-) New commits: commit 696bd00021e3e959ed8b4854611799cda96f187d Author: Petr Mladek pmla...@suse.cz Date: Mon Apr 23 10:37:37 2012 +0200 update internal openssl to version 0.9.8v including important bug fixes Signed-off-by: Fridrich Strba fridrich.st...@graduateinstitute.ch diff --git a/ooo.lst.in b/ooo.lst.in index 0e493e2..408e0ee 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -1,6 +1,6 @@ http://dev-www.libreoffice.org/src 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz -63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz +51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.tar.bz2 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 diff --git a/openssl/makefile.mk b/openssl/makefile.mk index f537838..eb4f455 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -46,10 +46,10 @@ TARGET=openssl @echo openssl disabled .ENDIF -OPENSSL_NAME=openssl-0.9.8o +OPENSSL_NAME=openssl-0.9.8v TARFILE_NAME=$(OPENSSL_NAME) -TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 +TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce CONFIGURE_DIR=. CONFIGURE_ACTION=config @@ -75,8 +75,8 @@ UNAME=$(shell uname) .IF $(OS) == LINUX || $(OS) == FREEBSD || $(OS) == ANDROID PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map .IF $(CPU) == I .IF $(UNAME) == GNU/kFreeBSD CONFIGURE_ACTION=Configure debian-kfreebsd-i386 @@ -93,15 +93,15 @@ UNAME=$(shell uname) CONFIGURE_ACTION=Configure linux-generic32 .ENDIF # if you build openssl as shared library you have to patch the Makefile.Shared LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \ -#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' +#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8v.map' .ENDIF .IF $(OS) == SOLARIS PATCH_FILES=opensslsol.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map -#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8e.map' +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map +#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8v.map' # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 88f7088..538b2c1 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,5 +1,5 @@ misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -9,8 +9,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -20,8 +20,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * misc/openssl-0.9.8o/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200 -+++ misc/build/openssl-0.9.8o/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100 +--- misc/openssl-0.9.8v/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200 misc/build/openssl-0.9.8v/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100 @@ -1,11 +1,11 @@ -perl util\mkfiles.pl MINFO @@ -43,8 +43,8 @@ -perl util\mkdef.pl 32 ssleay ms\ssleay32.def +%1 util\mkdef.pl 32 libeay ms\libeay32.def +%1 util\mkdef.pl 32 ssleay ms\ssleay32.def misc/openssl-0.9.8o/util/mk1mf.pl 2009-09-20
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - vcl/unx
vcl/unx/gtk/window/gtkframe.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 348cd8a0feb871f5b7f2e558f118cdece7132d3d
Author: Michael Meeks michael.me...@suse.com
Date: Thu Apr 19 14:34:35 2012 +0100
fdo#46687 - fix find toolbar X error handling
Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com
(cherry picked from commit 9eed733f85e8003696271e63a3fcfc660511b7ef)
Sigbed-off-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 4869c45..f96df12 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2224,6 +2224,8 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
// to do this we need to synchronize with the XServer
GetGenericData()-ErrorTrapPush();
XSetInputFocus( getDisplay()-GetDisplay(),
widget_get_xid(m_pWindow), RevertToParent, CurrentTime );
+// fdo#46687 - an XSync should not be necessary - but for some
reason it is.
+XSync( getDisplay()-GetDisplay(), False );
GetGenericData()-ErrorTrapPop();
}
#endif
@@ -3282,9 +3284,11 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget,
GdkEvent*, gpointer frame )
#if !GTK_CHECK_VERSION(3,0,0)
if( bSetFocus )
{
+GetGenericData()-ErrorTrapPush();
XSetInputFocus( pThis-getDisplay()-GetDisplay(),
widget_get_xid(pWidget),
RevertToParent, CurrentTime );
+GetGenericData()-ErrorTrapPop();
}
#else
(void)pWidget; (void)bSetFocus;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/source
shell/source/win32/shlxthandler/res/shlxthdl.manifest |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 86a85224bcf3191254a4372085cac0ac040c883a Author: Andras Timar ati...@suse.com Date: Mon Apr 23 17:57:17 2012 +0200 s/OpenOffice/LibreOffice/ diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.manifest b/shell/source/win32/shlxthandler/res/shlxthdl.manifest index a785006..36131a3 100755 --- a/shell/source/win32/shlxthandler/res/shlxthdl.manifest +++ b/shell/source/win32/shlxthandler/res/shlxthdl.manifest @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=UTF-8 standalone=yes? assembly xmlns=urn:schemas-microsoft-com:asm.v1 manifestVersion=1.0 -assemblyIdentity version=1.0.0.0 processorArchitecture=x86 name=OpenOffice.shlxthdl type=win32 / -descriptionOpenOffice Shell Extension/description +assemblyIdentity version=1.0.0.0 processorArchitecture=x86 name=LibreOffice.shlxthdl type=win32 / +descriptionLibreOffice Shell Extension/description dependency dependentAssembly assemblyIdentity type=win32 name=Microsoft.Windows.Common-Controls version=6.0.0.0 processorArchitecture=X86 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_services.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit b0547b358b2262a7f75b932ba37f35155a5c2406
Author: Michael Meeks michael.me...@suse.com
Date: Mon Apr 23 16:58:59 2012 +0100
bomb out compilation of cairo canvas for mac or windows
This is to avoid unintended regressions based on configure options.
diff --git a/canvas/source/cairo/cairo_services.cxx
b/canvas/source/cairo/cairo_services.cxx
index dfb694f..f9ca5d6 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -46,6 +46,10 @@
using namespace ::com::sun::star;
+#if defined(WNT) || defined (MACOSX)
+# error The cairo canvas should not be enabled on Windows or Mac cf
fdo#46901
+#endif
+
namespace cairocanvas
{
static uno::Referenceuno::XInterface initCanvas( Canvas* pCanvas )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/defaultbootstrap.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 015283bb50e8d0d8127ea7c06deda202441f051e
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 23 18:41:29 2012 +0200
Trying to parse legacy rdb as XML can cause InvalidRegistryException, too
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index a11f220..f156ce1 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1276,9 +1276,11 @@ void ServiceManager::readRdbFile(rtl::OUString const
uri, bool optional) {
}
SAL_INFO(cppuhelper, Ignored optional uri);
} catch (css::registry::InvalidRegistryException e) {
-throw css::uno::DeploymentException(
-InvalidRegistryException: + e.Message,
-static_cast cppu::OWeakObject * (this));
+if (!readLegacyRdbFile(uri)) {
+throw css::uno::DeploymentException(
+InvalidRegistryException: + e.Message,
+static_cast cppu::OWeakObject * (this));
+}
} catch (css::uno::RuntimeException ) {
if (!readLegacyRdbFile(uri)) {
throw;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - config_host.mk.in configure.in cppuhelper/inc cppu/inc sal/inc solenv/gbuild
config_host.mk.in |7 + configure.in | 116 + cppu/inc/com/sun/star/uno/Sequence.h |2 cppu/inc/com/sun/star/uno/Type.h |4 cppu/inc/typelib/typedescription.h |4 cppuhelper/inc/cppuhelper/interfacecontainer.h |6 - cppuhelper/inc/cppuhelper/propshlp.hxx |2 cppuhelper/inc/cppuhelper/weak.hxx |6 - sal/inc/rtl/string.hxx |4 solenv/gbuild/CppunitTest.mk |2 solenv/gbuild/Executable.mk|2 solenv/gbuild/Library.mk |2 solenv/gbuild/LinkTarget.mk| 72 ++- solenv/gbuild/StaticLibrary.mk |2 solenv/gbuild/gbuild.mk|7 + solenv/gbuild/platform/WNT_INTEL_GCC.mk| 10 -- solenv/gbuild/platform/com_GCC_defs.mk | 25 + solenv/gbuild/platform/unxgcc.mk | 15 --- 18 files changed, 204 insertions(+), 84 deletions(-) New commits: commit 8d1fbba77fdec3cdc7c7b1e28f9560243cbbd3ff Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Apr 23 19:15:24 2012 +0200 doxygen warning fixes diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h index 380bcb7..6095fdd 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.h +++ b/cppu/inc/com/sun/star/uno/Sequence.h @@ -110,7 +110,7 @@ public: @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors */ -inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire ) +inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire dummy ) SAL_THROW(()); /** Constructor: Creates a copy of given elements. diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h index e11551e..b6afd2e 100644 --- a/cppu/inc/com/sun/star/uno/Type.h +++ b/cppu/inc/com/sun/star/uno/Type.h @@ -112,14 +112,14 @@ public: @param pType C type description reference @param dummy UNO_TYPE_NO_ACQUIRE to force obvious distinction to other constructors */ -inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW(()); +inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire dummy ) SAL_THROW(()); /** Constructor: Type is (copy) constructed by given C type description reference without acquiring it. @param pType C type description reference @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors */ -inline Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW(()); +inline Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire dummy ) SAL_THROW(()); /** Copy constructor: Type is copy constructed by given type. diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h index c4d957a..346836f 100644 --- a/cppu/inc/typelib/typedescription.h +++ b/cppu/inc/typelib/typedescription.h @@ -330,8 +330,6 @@ typedef struct _typelib_InterfaceMethodTypeDescription sal_BoolbOneWay; /** the interface description this method is a member of - -@since #i21150# */ struct _typelib_InterfaceTypeDescription * pInterface; /** the inherited direct base method (null for a method that is not @@ -367,8 +365,6 @@ typedef struct _typelib_InterfaceAttributeTypeDescription typelib_TypeDescriptionReference * pAttributeTypeRef; /** the interface description this attribute is a member of - -@since #i21150# */ struct _typelib_InterfaceTypeDescription * pInterface; /** the inherited direct base attribute (null for an attribute that is not diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h index 8282893..77c39f6 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.h +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h @@ -331,7 +331,7 @@ public: The lifetime must be longer than the lifetime of this object. */ -inline OMultiTypeInterfaceContainerHelperVar( ::osl::Mutex ) SAL_THROW(()); +inline OMultiTypeInterfaceContainerHelperVar( ::osl::Mutex rMutex ) SAL_THROW(()); /** Deletes all containers. */ @@ -450,7 +450,7 @@ struct OBroadcastHelperVar /** Initialize the structur. bDispose and bInDispose are set to false. - @param rMutex the mutex reference. + @param rMutex_ the mutex reference. */ OBroadcastHelperVar( ::osl::Mutex rMutex_ ) SAL_THROW(()) : rMutex( rMutex_ ) @@ -536,7 +536,7 @@ public: The lifetime must be longer than the lifetime of this object. */ -
[Libreoffice-commits] .: 2 commits - basic/source dbaccess/source
basic/source/uno/namecont.cxx |2 +-
dbaccess/source/ui/uno/copytablewizard.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 67d022ac0ce5e67565e0589f4cd9eb05a8fd5a3c
Author: Abeer Sethi abeersethi...@gmail.com
Date: Thu Apr 12 18:05:34 2012 +0530
Bug 42982 Patch - copytablewizard.cxx
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx
b/dbaccess/source/ui/uno/copytablewizard.cxx
index 5af49b9..3933353 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -983,7 +983,7 @@ SharedConnection
CopyTableWizard::impl_extractConnection_throw( const Reference
{
OSL_PRECOND( m_xSourceConnection.is(),
CopyTableWizard::impl_createSourceStatement_throw: illegal call! );
if ( !m_xSourceConnection.is() )
-throw RuntimeException( ::rtl::OUString(), *const_cast
CopyTableWizard* ( this ) );
+throw RuntimeException(
CopyTableWizard::impl_createSourceStatement_throw: illegal call!,
*const_cast CopyTableWizard* ( this ));
::utl::SharedUNOComponent XPreparedStatement xStatement;
switch ( m_nCommandType )
@@ -1029,7 +1029,7 @@ SharedConnection
CopyTableWizard::impl_extractConnection_throw( const Reference
default:
// this should not have survived initialization phase
-throw RuntimeException( ::rtl::OUString(), *const_cast
CopyTableWizard* ( this ) );
+throw RuntimeException(No case matched, this should not have survived
the initialization phase, *const_cast CopyTableWizard* ( this ));
}
return xStatement;
@@ -1165,7 +1165,7 @@ void CopyTableWizard::impl_copyRows_throw( const
Reference XResultSet _rxSou
{
OSL_PRECOND( m_xDestConnection.is(),
CopyTableWizard::impl_copyRows_throw: illegal call! );
if ( !m_xDestConnection.is() )
-throw RuntimeException( ::rtl::OUString(), *this );
+throw RuntimeException( m_xDestConnection is set to null,
CopyTableWizard::impl_copyRows_throw: illegal call!, *this );
Reference XDatabaseMetaData xDestMetaData(
m_xDestConnection-getMetaData(), UNO_QUERY_THROW );
commit c9afb3f5a7f713d34f70b680c5d4ab3db4044d1c
Author: Abeer Sethi abeersethi...@gmail.com
Date: Thu Apr 12 17:47:36 2012 +0530
This incorporates the suggested changes.
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c6ff1ba..384b19c 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -298,7 +298,7 @@ void SAL_CALL NameContainer::addContainerListener( const
Reference XContainerLi
throw (RuntimeException)
{
if( !xListener.is() )
-throw RuntimeException();
+throw RuntimeException(addContainerListener called with null
xListener, static_cast cppu::OWeakObject * (this));
Reference XInterface xIface( xListener, UNO_QUERY );
maContainerListeners.addInterface( xIface );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source i18nutil/inc i18nutil/source sd/inc sd/source vcl/source
cui/source/tabpages/page.cxx |4 ++--
cui/source/tabpages/page.h|3 ++-
cui/source/tabpages/page.src |3 ++-
i18nutil/inc/i18nutil/paper.hxx |7 ---
i18nutil/source/utility/paper.cxx |6 --
sd/inc/sdenumdef.hxx |2 +-
sd/source/core/drawdoc2.cxx |2 +-
sd/source/ui/app/sdmod1.cxx | 10 ++
sd/source/ui/dlg/dlgass.cxx |6 ++
sd/source/ui/dlg/dlgass.src | 10 ++
sd/source/ui/inc/dlgass.hrc |1 +
vcl/source/gdi/print.cxx |2 +-
vcl/source/src/print.src |1 -
13 files changed, 44 insertions(+), 13 deletions(-)
New commits:
commit 9c99dac0968c405537cd6094a46c7f6de01ccc4e
Author: Rob Snelders programm...@ertai.nl
Date: Wed Apr 18 23:30:26 2012 +0200
fdo#42986 Add Presentationsize 16:9 Widescreen
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index efa495b..417b311 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -989,7 +989,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox
*, pBox )
{
// Draw: if paper format the margin shall be 1 cm
long nTmp = 0;
-sal_Bool bScreen = ( PAPER_SCREEN == ePaper );
+sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )|| (
PAPER_SCREEN_16_9 == ePaper));
if ( !bScreen )
// no margin if screen
@@ -1400,7 +1400,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
-if ( ePaper != PAPER_SCREEN IsMarginOutOfRange() )
+if ( ePaper != PAPER_SCREEN_4_3 ePaper != PAPER_SCREEN_16_9
IsMarginOutOfRange() )
{
if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText
).Execute() == RET_NO )
{
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index bc7ad78..87858fe 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -54,7 +54,7 @@
#define PAPERSIZE_C65 16
#define PAPERSIZE_DL17
#define PAPERSIZE_DIA 18
-#define PAPERSIZE_SCREEN19
+#define PAPERSIZE_SCREEN_4_319
#define PAPERSIZE_C 20
#define PAPERSIZE_D 21
#define PAPERSIZE_E 22
@@ -74,6 +74,7 @@
#define PAPERSIZE_B6_JIS36
#define PAPERSIZE_POSTCARD_JP 46
#define PAPERSIZE_A656
+#define PAPERSIZE_SCREEN_16_9 78
#endif
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 91873c7..2137ff2 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -452,7 +452,8 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
C5 Envelope ; PAPERSIZE_C5 ; ;
C4 Envelope ; PAPERSIZE_C4 ; ;
Dia Slide ; PAPERSIZE_DIA ; ;
- Screen ; PAPERSIZE_SCREEN ; ;
+ Screen 4:3 ; PAPERSIZE_SCREEN_4_3 ; ;
+ Screen 16:9 ; PAPERSIZE_SCREEN_16_9 ; ;
Japanese Postcard ; PAPERSIZE_POSTCARD_JP; ;
};
};
diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx
index d5be9ec..98b88bd 100644
--- a/i18nutil/inc/i18nutil/paper.hxx
+++ b/i18nutil/inc/i18nutil/paper.hxx
@@ -58,7 +58,7 @@ enum Paper
PAPER_ENV_C65,
PAPER_ENV_DL,
PAPER_SLIDE_DIA,
-PAPER_SCREEN,
+PAPER_SCREEN_4_3,
PAPER_C,
PAPER_D,
PAPER_E,
@@ -116,11 +116,12 @@ enum Paper
PAPER_ARCHB,
PAPER_ARCHC,
PAPER_ARCHD,
-PAPER_ARCHE
+PAPER_ARCHE,
+PAPER_SCREEN_16_9
};
// defined for 'equal size' test with the implementation array
-#define NUM_PAPER_ENTRIES (PAPER_ARCHE - PAPER_A0 + 1)
+#define NUM_PAPER_ENTRIES (PAPER_SCREEN_16_9 - PAPER_A0 + 1)
// -
// - Paper -
diff --git a/i18nutil/source/utility/paper.cxx
b/i18nutil/source/utility/paper.cxx
index 63b5cff..a79089d 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -93,7 +93,7 @@ static PageDesc aDinTab[] =
{ MM2MM100( 114 ), MM2MM100( 229 ),EnvC65, NULL },
{ MM2MM100( 110 ), MM2MM100( 220 ),EnvDL, DL },
{ MM2MM100( 180),MM2MM100( 270 ),NULL, NULL }, //Dia
-{ MM2MM100( 210),MM2MM100( 280 ),NULL, NULL }, //Screen
+{ MM2MM100( 210),MM2MM100( 280 ),NULL, NULL }, //Screen 4:3
{ IN2MM100( 17 ),IN2MM100( 22 ), AnsiC, CSheet },
{ IN2MM100( 22 ),IN2MM100( 34 ), AnsiD, DSheet },
{ IN2MM100( 34 ),IN2MM100( 44 ), AnsiE, ESheet },
@@ -155,7 +155,9 @@ static PageDesc aDinTab[] =
{ IN2MM100( 12 ),IN2MM100( 18 ), ARCHB, NULL },
{ IN2MM100( 18 ),IN2MM100( 24 ), ARCHC, NULL },
{ IN2MM100( 24 ),IN2MM100( 36 ), ARCHD, NULL },
-{ IN2MM100( 36 ),IN2MM100( 48 ), ARCHE, NULL }
+{ IN2MM100( 36 ),IN2MM100( 48 ), ARCHE, NULL },
[Libreoffice-commits] .: svl/source
svl/source/numbers/zforlist.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cf9c715aee2f97a1a6f611fe46a47e238cb03658
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 23 21:39:14 2012 +0200
Avoid bogus warnings (GCC 4.4.6)
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 83a1232..93007ab 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1303,7 +1303,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short
nType )
if ( nDefaultFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
{ // look for a defined standard
sal_uInt32 nStopKey = CLOffset + SV_COUNTRY_LANGUAGE_OFFSET;
-sal_uInt32 nKey;
+sal_uInt32 nKey = 0; // avoid bogus warning (GCC 4.4.6)
SvNumberFormatTable::iterator it2 = aFTable.find( CLOffset );
while ( it2 != aFTable.end() (nKey = it2-first ) = CLOffset
nKey nStopKey )
{
@@ -3326,7 +3326,7 @@ sal_uInt32
SvNumberFormatter::ImpGetDefaultCurrencyFormat()
{
// look for a defined standard
sal_uInt32 nStopKey = CLOffset + SV_COUNTRY_LANGUAGE_OFFSET;
-sal_uInt32 nKey;
+sal_uInt32 nKey = 0; // avoid bogus warning (GCC 4.4.6)
SvNumberFormatTable::iterator it2 = aFTable.lower_bound( CLOffset );
while ( it2 != aFTable.end() (nKey = it2-first) = CLOffset
nKey nStopKey )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/pngread.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f5be85719985ce54ff65b88aaa420ed5b2e7a9b Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 23 20:35:40 2012 +0100 cut out negative widths/heights early diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 81b9280..a7cf7ec 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -472,7 +472,7 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size rPreviewSizeHint ) maOrigSize.Width() = ImplReadsal_uInt32(); maOrigSize.Height() = ImplReadsal_uInt32(); -if ( !maOrigSize.Width() || !maOrigSize.Height() ) +if (maOrigSize.Width() = 0 || maOrigSize.Height() = 0) return sal_False; mnPngDepth = *(maDataIter++); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b97f109cb62de8f005a7e2fdc95c92f94d120676
Author: Rene Engelhard r...@debian.org
Date: Mon Apr 23 22:07:20 2012 +0200
fix gtk3salnativewidgets-gtk build with gcc 4.4
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index aaa4bd7..6bd2280 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -622,7 +622,7 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext
*context,
{
if ( !pSpinVal )
{
-std::fprintf( stderr, Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist!\n );
+fprintf( stderr, Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist!\n );
return;
}
areaRect = pSpinVal-maUpperRect;
@@ -1335,10 +1335,10 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
}
aInfo.m_eWidth = WIDTH_ULTRA_CONDENSED;
-std::fprintf( stderr, font name BEFORE system match: \%s\\n,
aFamily.getStr() );
+fprintf( stderr, font name BEFORE system match: \%s\\n,
aFamily.getStr() );
// match font to e.g. resolve Sans
psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
-std::fprintf( stderr, font match %s, name AFTER: \%s\\n,
+fprintf( stderr, font match %s, name AFTER: \%s\\n,
aInfo.m_nID != 0 ? succeeded : failed,
rtl::OUStringToOString( aInfo.m_aStyleName,
RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
@@ -1447,7 +1447,7 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
gchar* pThemeName = NULL;
g_object_get( pSettings, gtk-theme-name, pThemeName, (char *)NULL );
#if OSL_DEBUG_LEVEL 1
-std::fprintf( stderr, Theme name is \%s\\n, pThemeName );
+fprintf( stderr, Theme name is \%s\\n, pThemeName );
#endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sfx2/source solenv/gbuild svtools/source svx/source
sfx2/source/doc/objcont.cxx |6 +-
solenv/gbuild/gbuild.help.txt |4
solenv/gbuild/gbuild.mk | 11 +++
svtools/source/filter/filter.cxx |3 +++
svx/source/unodraw/UnoGraphicExporter.cxx |5 +
5 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit bf286107121648bb90c582ac2d56001161915ce4
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Apr 23 23:03:29 2012 +0200
Add some more timelogging, for graphic export here.
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 1034738..398cf85 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -51,6 +51,7 @@
#include svtools/sfxecode.hxx
#include svtools/ehdl.hxx
#include tools/datetime.hxx
+#include rtl/logfile.hxx
#include math.h
#include unotools/saveopt.hxx
@@ -170,7 +171,10 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool
bFullContent ) const
aDevice.SetDigitLanguage( eLang );
-((SfxObjectShell*)this)-DoDraw( aDevice, Point(0,0), aTmpSize,
JobSetup(), nAspect );
+{
+RTL_LOGFILE_PRODUCT_CONTEXT( aLog, PERFORMANCE
SfxObjectShell::CreatePreviewMetaFile_Impl );
+((SfxObjectShell*)this)-DoDraw( aDevice, Point(0,0), aTmpSize,
JobSetup(), nAspect );
+}
pFile-Stop();
return pFile;
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index fb86d9b..634802f 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -68,6 +68,7 @@
#include unotools/localfilehelper.hxx
#include rtl/bootstrap.hxx
#include rtl/instance.hxx
+#include rtl/logfile.hxx
#include vector
#include SvFilterOptionsDialog.hxx
@@ -1714,6 +1715,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const String rPath,
sal_uInt16 GraphicFilter::ExportGraphic( const Graphic rGraphic, const
INetURLObject rPath,
sal_uInt16 nFormat, const uno::Sequence beans::PropertyValue *
pFilterData )
{
+RTL_LOGFILE_CONTEXT( aLog, GraphicFilter::ExportGraphic() (thb) );
sal_uInt16 nRetValue = GRFILTER_FORMATERROR;
DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID,
GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID );
sal_BoolbAlreadyExists = ImplDirEntryHelper::Exists( rPath );
@@ -1736,6 +1738,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic
rGraphic, const INetURLO
sal_uInt16 GraphicFilter::ExportGraphic( const Graphic rGraphic, const
String rPath,
SvStream rOStm, sal_uInt16 nFormat, const uno::Sequence
beans::PropertyValue * pFilterData )
{
+RTL_LOGFILE_CONTEXT( aLog, GraphicFilter::ExportGraphic() (thb) );
sal_uInt16 nFormatCount = GetExportFormatCount();
ResetLastError();
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 6ee3ed0..46220ea 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -45,6 +45,7 @@
#include com/sun/star/task/XInteractionHandler.hpp
#include com/sun/star/task/XInteractionContinuation.hpp
+#include rtl/logfile.hxx
#include comphelper/interaction.hxx
#include framework/interaction.hxx
#include com/sun/star/drawing/GraphicFilterRequest.hpp
@@ -594,6 +595,8 @@ void GraphicExporter::ParseSettings( const Sequence
PropertyValue aDescripto
bool GraphicExporter::GetGraphic( ExportSettings rSettings, Graphic
aGraphic, sal_Bool bVectorType )
{
+RTL_LOGFILE_CONTEXT( aLog, UnoGraphicExporter::GetGraphic (thb) );
+
if( !mpDoc || !mpUnoPage )
return false;
@@ -976,6 +979,8 @@ bool GraphicExporter::GetGraphic( ExportSettings
rSettings, Graphic aGraphic,
sal_Bool SAL_CALL GraphicExporter::filter( const Sequence PropertyValue
aDescriptor )
throw(RuntimeException)
{
+RTL_LOGFILE_CONTEXT( aLog, UnoGraphicExporter::export (thb) );
+
::SolarMutexGuard aGuard;
if( NULL == mpUnoPage )
commit 0c00198b97e9dd7ee4aab0cb2f0e0fed681c852c
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Apr 23 23:02:06 2012 +0200
Resurrect TIMELOG absolute time logging facility
This somehow fell through the cracks of gbuildification -
make timelog=t now again enables those RTL_LOGFILE_ macros.
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 3e17075..6506022 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -62,6 +62,10 @@ INTERACTIVE VARIABLES:
3... = symbols + no optimizations + extra debug output
(usually
extremely verbose). Levels 2 are not used very
much.
+ TIMELOG / timelog
+ If not empty enable the RTL_LOGFILE_* time logging
facility.
+ export RTL_LOGFILE=rtl_logfile.nopid when running
office, to
+ get timestamps written out.
YACCFLAGS Add
[Libreoffice-commits] .: sc/sdi sc/source sfx2/inc sfx2/sdi
sc/sdi/cellsh.sdi |1 +
sc/source/ui/src/popup.src|6 ++
sc/source/ui/view/cellsh.cxx |2 ++
sc/source/ui/view/cellsh1.cxx |7 +--
sfx2/inc/sfx2/sfxcommands.h |1 +
sfx2/inc/sfx2/sfxsids.hrc |2 +-
sfx2/sdi/sfx.sdi | 24
7 files changed, 40 insertions(+), 3 deletions(-)
New commits:
commit 60cea1f49ec6781e541fbd7949c4271d213d3e0d
Author: Noel Power noel.po...@novell.com
Date: Mon Apr 23 23:14:13 2012 +0100
tweak paste-only context menu ( add paste only number )
changed the text to really only paste text, also added pasteonly | number
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 4f586e8..ebcf86e 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -163,6 +163,7 @@ interface CellSelection
SID_PASTE_ONLY [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ]
SID_PASTE_ONLY_TEXT [ ExecMethod = ExecuteEdit; StateMethod =
GetClipState; ]
SID_PASTE_ONLY_FORMULA [ ExecMethod = ExecuteEdit; StateMethod =
GetClipState; ]
+SID_PASTE_ONLY_VALUE [ ExecMethod = ExecuteEdit; StateMethod =
GetClipState; ]
SID_CLIPBOARD_FORMAT_ITEMS [ ExecMethod = ExecuteEdit; StateMethod =
GetClipState; ]
SID_EXTERNAL_SOURCE [ ExecMethod = ExecuteEdit; StateMethod =
GetBlockState; ]
FID_MERGE_ON[ ExecMethod = Execute; StateMethod = GetState; ]
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index de6fba5..6e27ce3 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -151,6 +151,12 @@ Menu RID_POPUP_CELLS
};
MenuItem
{
+Identifier = SID_PASTE_ONLY_VALUE ;
+HelpId = CMD_SID_PASTE_ONLY_VALUE ;
+Text [ en-US ] = ~Number ;
+};
+MenuItem
+{
Identifier = SID_PASTE_ONLY_FORMULA ;
HelpId = CMD_SID_PASTE_ONLY_FORMULA ;
Text [ en-US ] = ~Formula ;
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 0d76bb7..bb18878 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -449,6 +449,7 @@ IMPL_LINK( ScCellShell, ClipboardChanged,
TransferableDataHelper*, pDataHelper )
SfxBindings rBindings = GetViewData()-GetBindings();
rBindings.Invalidate( SID_PASTE );
rBindings.Invalidate( SID_PASTE_SPECIAL );
+rBindings.Invalidate( SID_PASTE_ONLY_VALUE );
rBindings.Invalidate( SID_PASTE_ONLY_TEXT );
rBindings.Invalidate( SID_PASTE_ONLY_FORMULA );
rBindings.Invalidate( SID_CLIPBOARD_FORMAT_ITEMS );
@@ -539,6 +540,7 @@ void ScCellShell::GetClipState( SfxItemSet rSet )
{
rSet.DisableItem( SID_PASTE );
rSet.DisableItem( SID_PASTE_SPECIAL );
+rSet.DisableItem( SID_PASTE_ONLY_VALUE );
rSet.DisableItem( SID_PASTE_ONLY_TEXT );
rSet.DisableItem( SID_PASTE_ONLY_FORMULA );
rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 35c162f..7c650c4 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1369,6 +1369,7 @@ void ScCellShell::ExecuteEdit( SfxRequest rReq )
}
pTabViewShell-CellContentChanged();// = PasteFromXXX ???
break;
+case SID_PASTE_ONLY_VALUE:
case SID_PASTE_ONLY_TEXT:
case SID_PASTE_ONLY_FORMULA:
{
@@ -1377,8 +1378,10 @@ void ScCellShell::ExecuteEdit( SfxRequest rReq )
{
rReq.SetSlot( FID_INS_CELL_CONTENTS );
rtl::OUString aFlags;
-if ( nSlot == SID_PASTE_ONLY_TEXT )
-aFlags = VDS;
+if ( nSlot == SID_PASTE_ONLY_VALUE )
+aFlags = V;
+else if ( nSlot == SID_PASTE_ONLY_TEXT )
+aFlags = S;
else
aFlags = F;
rReq.AppendItem( SfxStringItem( FID_INS_CELL_CONTENTS, aFlags
) );
diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
index e6e22c2..cb41efe 100644
--- a/sfx2/inc/sfx2/sfxcommands.h
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -202,6 +202,7 @@
#define CMD_SID_CLIPBOARD_FORMAT_ITEMS .uno:ClipboardFormatItems
#define CMD_SID_PASTE_SPECIAL .uno:PasteSpecial
#define CMD_SID_PASTE_ONLY .uno:PasteOnly
+#define CMD_SID_PASTE_ONLY_VALUE.uno:PasteOnlyValue
#define CMD_SID_PASTE_ONLY_TEXT .uno:PasteOnlyText
#define CMD_SID_PASTE_ONLY_FORMULA .uno:PasteOnlyFormula
#define CMD_SID_DOCPATH .uno:DocPath
diff --git a/sfx2/inc/sfx2/sfxsids.hrc
[Libreoffice-commits] .: sdext/source
sdext/source/presenter/PresenterComponent.cxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit 1f1f8ac4db7aa40f299a104927499e72d39fd932
Author: David Tardon dtar...@redhat.com
Date: Tue Apr 24 07:24:18 2012 +0200
remove leftover component_writeInfo
diff --git a/sdext/source/presenter/PresenterComponent.cxx
b/sdext/source/presenter/PresenterComponent.cxx
index b73d617..581427c 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -106,12 +106,6 @@ extern C
return g_moduleCount.canUnload( g_moduleCount , pTime );
}
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-void * pServiceManager, void * pRegistryKey )
-{
-return component_writeInfoHelper(pServiceManager, pRegistryKey,
gServiceEntries);
-}
-
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void *
pRegistryKey )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/inc l10ntools/prj l10ntools/source xmlhelp/source
l10ntools/inc/l10ntools/HelpIndexer.hxx | 13
l10ntools/inc/l10ntools/HelpSearch.hxx|1
l10ntools/inc/l10ntools/LuceneHelper.hxx | 53 --
l10ntools/prj/d.lst |1
l10ntools/source/help/HelpIndexer.cxx |2
l10ntools/source/help/HelpIndexer_main.cxx|2
l10ntools/source/help/HelpSearch.cxx |2
l10ntools/source/help/LuceneHelper.cxx|2
l10ntools/source/help/LuceneHelper.hxx| 53 ++
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx |1
10 files changed, 73 insertions(+), 57 deletions(-)
New commits:
commit b3fcbe7d2b163dbc7c6e68f6db214d3df47fda57
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Apr 24 07:42:07 2012 +0200
do not export usage of CLucene headers outside of l10ntools
that'd require CLUCENE_CFLAGS everywhere where it's used, and it's not
necessary
diff --git a/l10ntools/inc/l10ntools/HelpIndexer.hxx
b/l10ntools/inc/l10ntools/HelpIndexer.hxx
index df492bb..f81bca3 100644
--- a/l10ntools/inc/l10ntools/HelpIndexer.hxx
+++ b/l10ntools/inc/l10ntools/HelpIndexer.hxx
@@ -31,13 +31,24 @@
#define HELPINDEXER_HXX
#include l10ntools/dllapi.h
-#include l10ntools/LuceneHelper.hxx
#include rtl/ustring.hxx
#include set
// I assume that TCHAR is defined as wchar_t throughout
+namespace lucene
+{
+namespace document
+{
+class Document;
+}
+namespace util
+{
+class Reader;
+}
+}
+
class L10N_DLLPUBLIC HelpIndexer {
private:
rtl::OUString d_lang;
diff --git a/l10ntools/inc/l10ntools/HelpSearch.hxx
b/l10ntools/inc/l10ntools/HelpSearch.hxx
index 1a1b3c0..e4a846a 100644
--- a/l10ntools/inc/l10ntools/HelpSearch.hxx
+++ b/l10ntools/inc/l10ntools/HelpSearch.hxx
@@ -31,7 +31,6 @@
#define HELPSEARCH_HXX
#include l10ntools/dllapi.h
-#include l10ntools/LuceneHelper.hxx
#include rtl/ustring.hxx
#include vector
diff --git a/l10ntools/inc/l10ntools/LuceneHelper.hxx
b/l10ntools/inc/l10ntools/LuceneHelper.hxx
deleted file mode 100644
index c990647..000
--- a/l10ntools/inc/l10ntools/LuceneHelper.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the License); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an AS IS basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Gert van Valkenhoef g.h.m.van.valkenh...@rug.nl
- * (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the GPLv3+), or
- * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#ifndef LUCENEHELPER_HXX
-#define LUCENEHELPER_HXX
-
-#if defined _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4068 4263 4264 4266)
-#endif
-
-#include CLucene.h
-#include CLucene/analysis/LanguageBasedAnalyzer.h
-
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include rtl/ustring.hxx
-#include vector
-
-std::vectorTCHAR OUStringToTCHARVec(rtl::OUString const rStr);
-rtl::OUString TCHARArrayToOUString(TCHAR const *str);
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index 99aac56..e9329dc 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -47,7 +47,6 @@ mkdir: %_DEST%\bin\help\com\sun\star\help
..\inc\l10ntools\dllapi.h %_DEST%\inc\l10ntools\dllapi.h
..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx
..\inc\l10ntools\file.hxx %_DEST%\inc\l10ntools\file.hxx
-..\inc\l10ntools\LuceneHelper.hxx %_DEST%\inc\l10ntools\LuceneHelper.hxx
..\inc\l10ntools\HelpIndexer.hxx %_DEST%\inc\l10ntools\HelpIndexer.hxx
..\inc\l10ntools\HelpSearch.hxx %_DEST%\inc\l10ntools\HelpSearch.hxx
..\source\filter\merge\FCFGMerge.cfg %_DEST%\inc\l10ntools\FCFGMerge.cfg
diff --git a/l10ntools/source/help/HelpIndexer.cxx
b/l10ntools/source/help/HelpIndexer.cxx
index 608c6cb..3c595b4 100644
--- a/l10ntools/source/help/HelpIndexer.cxx
+++ b/l10ntools/source/help/HelpIndexer.cxx
@@ -37,6 +37,8 @@
#include algorithm
+#include LuceneHelper.hxx
+
using namespace lucene::document;
HelpIndexer::HelpIndexer(rtl::OUString
Re: PATCH: made available under the MPL/LPGLv3+
Pushed. Thank you! Looking for more ;) On 04/22/2012 09:42 PM, Javier Silva Sanahuja wrote: Hi: I send you a patch in order to erase the unused code: formula::FormulaTokenArray::AddBad(unsigned short const*). Best Regards Javier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Pushed] PATCH: made available under the MPL/LPGLv3+
Pushed. Thank you! Looking for more ;) On 04/22/2012 09:42 PM, Javier Silva Sanahuja wrote: Hi: I send you a patch in order to erase the unused code: formula::FormulaTokenArray::AddBad(unsigned short const*). Best Regards Javier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 48778, which changed state. Bug 48778 Summary: FILEOPEN arbitrary.pptx will CRASH https://bugs.freedesktop.org/show_bug.cgi?id=48778 What|Old Value |New Value Resolution||WORKSFORME Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW:3-5] fdo#39053 writerfilter: implement RTF_BIN
Hi,
See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5187174
Regression from 3.4; testcase in sw/qa/extras/rtftok/data/fdo39053.rtf;
backported patch attached.
Thanks,
Miklos
From 0e53b7a1eda752017a620c7b6f07bcba342e1490 Mon Sep 17 00:00:00 2001
From: Miklos Vajna vmik...@suse.cz
Date: Sun, 15 Apr 2012 14:10:49 +0200
Subject: [PATCH] fdo#39053 writerfilter: implement RTF_BIN
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
writerfilter/source/rtftok/rtftokenizer.cxx
---
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 64 +---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 ++
writerfilter/source/rtftok/rtftokenizer.cxx|4 +-
3 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 023b6c6..621288d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -609,34 +609,42 @@ void RTFDocumentImpl::resolve(Stream rMapper)
int RTFDocumentImpl::resolvePict(bool bInline)
{
SvMemoryStream aStream;
-int b = 0, count = 2;
+SvStream *pStream = 0;
-// Feed the destination text to a stream.
-OString aStr = OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
-const char *str = aStr.getStr();
-for (int i = 0; i aStr.getLength(); ++i)
+if (!m_pBinaryData.get())
{
-char ch = str[i];
-if (ch != 0x0d ch != 0x0a)
+pStream = aStream;
+int b = 0, count = 2;
+
+// Feed the destination text to a stream.
+OString aStr = OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
+const char *str = aStr.getStr();
+for (int i = 0; i aStr.getLength(); ++i)
{
-b = b 4;
-sal_Int8 parsed = m_pTokenizer-asHex(ch);
-if (parsed == -1)
-return ERROR_HEX_INVALID;
-b += parsed;
-count--;
-if (!count)
+char ch = str[i];
+if (ch != 0x0d ch != 0x0a)
{
-aStream (char)b;
-count = 2;
-b = 0;
+b = b 4;
+sal_Int8 parsed = m_pTokenizer-asHex(ch);
+if (parsed == -1)
+return ERROR_HEX_INVALID;
+b += parsed;
+count--;
+if (!count)
+{
+aStream (char)b;
+count = 2;
+b = 0;
+}
}
}
}
+else
+pStream = m_pBinaryData.get();
// Store, and get its URL.
-aStream.Seek(0);
-uno::Referenceio::XInputStream xInputStream(new utl::OInputStreamWrapper(aStream));
+pStream-Seek(0);
+uno::Referenceio::XInputStream xInputStream(new utl::OInputStreamWrapper(pStream));
WMF_EXTERNALHEADER aExtHeader;
aExtHeader.mapMode = m_aStates.top().aPicture.eWMetafile;
aExtHeader.xExt = m_aStates.top().aPicture.nWidth;
@@ -775,6 +783,19 @@ int RTFDocumentImpl::resolvePict(bool bInline)
int RTFDocumentImpl::resolveChars(char ch)
{
+if (m_aStates.top().nInternalState == INTERNAL_BIN)
+{
+m_pBinaryData.reset(new SvMemoryStream());
+*m_pBinaryData ch;
+for (int i = 0; i m_aStates.top().nBinaryToRead - 1; ++i)
+{
+Strm() ch;
+*m_pBinaryData ch;
+}
+m_aStates.top().nInternalState = INTERNAL_NORMAL;
+return 0;
+}
+
if (m_aStates.top().nInternalState != INTERNAL_HEX)
checkUnicode(false, true);
@@ -2784,6 +2805,10 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
lcl_putNestedSprm(m_aStates.top().aTableSprms, NS_ooxml::LN_CT_Lvl_rPr, NS_sprm::LN_CRgFtc0, pValue);
}
break;
+case RTF_BIN:
+m_aStates.top().nInternalState = INTERNAL_BIN;
+m_aStates.top().nBinaryToRead = nParam;
+break;
default:
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(%s: TODO handle value '%s', OSL_THIS_FUNC, lcl_RtfToString(nKeyword));
@@ -3601,6 +3626,7 @@ RTFParserState::RTFParserState(RTFDocumentImpl *pDocumentImpl)
nCurrentEncoding(0),
nUc(1),
nCharsToSkip(0),
+nBinaryToRead(0),
nListLevelNum(0),
aListLevelEntries(),
aLevelNumbers(),
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 0126882..1d0a37d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -281,6 +281,8 @@ namespace writerfilter {
int nUc;
/// Characters to skip, set to nUc by \u.
int nCharsToSkip;
+/// Characters to
Re: make check problem in libtest_smoketest building master
On 04/22/2012 10:51 PM, David Ostrovsky wrote: your patch was still not pushed. So we have two options here: 1. push your patch (I attached it with description ;-) 2. use make interactive variable LDFLAGS, a lá make LDFLAGS='-Wl,--no-as-needed' check Any ideas on this? I still do not see why we need the two different libraries at all, smoketest (from smoketest/Library_smoketest.mk) and smoketest_test (from smoketest/CppunitTest_smoketest.mk), both containing the exact same CppUnit test code. If we want the feature of http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c478c911033243df90ba290b32732a1fd70130e create installation set for tests and produce the CppUnit test code library not only for direct consumption in the CppunitTest_*.mk makefile, but also for inclusion in installation sets, then we should probably make solenv/gbuild/CppunitTest.mk more flexible, so that CppUnit test libraries need not necessarily built directly in their CppunitTest_*.mk. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Pushed] [PATCH] Remove unused vcl methods.
El dl 23 de 04 de 2012 a les 11:36 +0530, en/na Muthu Subramanian K va escriure: Thank you for the patch! It's a pleasure! I believe this is your first patch? Can you confirm that this (and possibly your future contributions) is licensed under the MPL/LGPLv3+ dual license, please? Yes, it's my first patch and it is licensed under the MPL/LGPLv3+ dual license. Thank you so much again! Thanks to LO community for your great job :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
PATCH: Remove unused code from editeng
Hello,
These is the patch that I've created. Is my first patch, so I hope this will be
correct. If you detect any problem, please let me know.Thanks!Licence: made
available under the MPL/LGPLv3+
Ferran Vidal From 553d11cbb902cf30f499c27e834d0f5c26c4f134 Mon Sep 17 00:00:00 2001
From: Ferran Vidal vidalmargi...@hotmail.com
Date: Sat, 21 Apr 2012 13:34:26 +0200
Subject: [PATCH] Removed unused code from editeng
---
editeng/source/editeng/editdoc.cxx |5 -
editeng/source/editeng/editdoc.hxx |1 -
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 23549a7..110daf5 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2711,11 +2711,6 @@ size_t CharAttribList::Count() const
return aAttribs.size();
}
-void CharAttribList::Clear()
-{
-aAttribs.clear();
-}
-
const EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich, sal_uInt16 nPos ) const
{
// Backwards, if one ends where the next starts.
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 531652c..8dfe4f6 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -236,7 +236,6 @@ public:
voidOptimizeRanges( SfxItemPool rItemPool );
size_t Count() const;
-void Clear();
voidInsertAttrib( EditCharAttrib* pAttrib );
--
1.7.5.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Sat, 2012-04-21 at 09:09 -0500, Norbert Thiebaud wrote: + bytemark machine #2 + working on *BSD in virtualbox with little joy help appreciated (Norbert) + need 3x BSD virtual-boxes (ideally) I'd like to know a bit more about this item; Norbert, would you prefer real boxes if possible ? So - one advantage of a VM here, is that -if- we have a 'standard' virtual-machine for this, and do the tinderbox-ness in some snapshot or somesuch; then in the event of problems, QA or Developers could re-use the same VM for doing their own testing, so in some ways that might be more generally useful. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Fri, 2012-04-20 at 17:54 +0200, Tommy wrote: + LibO 4.0 + planned to be incrementally developed / migrated anyway + postpone until license change done (Bjoern) + concerns about breaking all extensions at once (Norbert) + better to do incremental improvement ? + how much will we get done for this anyway ? + consider longer support cycle for LibO 3.6.x etc. + discuss late. what do you mean with incrementally developed ? As a contrast to a 'big bang' change, whereby we have a 'make or break' type event, with some broken state of master for months, and the potential for endless slippage :-) Instead, we want to do a large number of small, incremental changes each of which is complete, safe, and leaves the product in a broadly ship-able state (modulo minor regressions we can catch in the normal way). So - essentially, just our normal development flow, but changing the things we've not been able to change in the past :-) HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On 04/23/2012 10:55 AM, Michael Meeks wrote: So - one advantage of a VM here, is that -if- we have a 'standard' virtual-machine for this, and do the tinderbox-ness in some snapshot or somesuch; then in the event of problems, QA or Developers could re-use the same VM for doing their own testing, so in some ways that might be more generally useful. Another general advantage of doing tinderbox builds in a VM would be that each build can start from a known-good VM snapshot and a runaway build can be stopped cleanly. So problems like steadily filling up tmp or leftover processes after a hung test would become non-issues. (Not that they do plague us, though; just for the record.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Mon, Apr 23, 2012 at 4:08 AM, Stephan Bergmann sberg...@redhat.com wrote: On 04/23/2012 10:55 AM, Michael Meeks wrote: So - one advantage of a VM here, is that -if- we have a 'standard' virtual-machine for this, and do the tinderbox-ness in some snapshot or somesuch; then in the event of problems, QA or Developers could re-use the same VM for doing their own testing, so in some ways that might be more generally useful. Another general advantage of doing tinderbox builds in a VM would be that each build can start from a known-good VM snapshot and a runaway build can be stopped cleanly. So problems like steadily filling up tmp or leftover processes after a hung test would become non-issues. (Not that they do plague us, though; just for the record.) Not really. VM or not the tinderbox operate continuously... we do not re-ipl the VM after each build (good thing otherwise we would have to pull the git tree from the time the VM was created, which would take longer and longer) My main motivation to consider VMs in that case was simply 1 physical Box, 3 BSD flavors :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On 04/23/2012 11:15 AM, Norbert Thiebaud wrote: On Mon, Apr 23, 2012 at 4:08 AM, Stephan Bergmannsberg...@redhat.com wrote: On 04/23/2012 10:55 AM, Michael Meeks wrote: So - one advantage of a VM here, is that -if- we have a 'standard' virtual-machine for this, and do the tinderbox-ness in some snapshot or somesuch; then in the event of problems, QA or Developers could re-use the same VM for doing their own testing, so in some ways that might be more generally useful. Another general advantage of doing tinderbox builds in a VM would be that each build can start from a known-good VM snapshot and a runaway build can be stopped cleanly. So problems like steadily filling up tmp or leftover processes after a hung test would become non-issues. (Not that they do plague us, though; just for the record.) Not really. VM or not the tinderbox operate continuously... we do not re-ipl the VM after each build (good thing otherwise we would have to pull the git tree from the time the VM was created, which would take longer and longer) This is solvable with updating the VM's git repos in the background, just taking the latest image when starting a VM. Before we abandoned work on OOo at Oracle last year, we were busy setting up a cool VM cluster for such builds. Michael's remark about handing failed build VMs over to devs reminded me about the various benefits we envisioned from that work. But, unfortunately, of course nothing came out of it... And yeah, rather unrelated to the current tinbuild setup, of course. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][PUSHED][REVIEW 3-5-3] fix fdo#45848 pdfimport regression
On 21/04/12 22:06, Caolán McNamara wrote: On Sat, 2012-04-21 at 10:09 +0700, Korrawit Pruegsanusak wrote: Hello all, Please find the attached patch to fix fdo#45848. I've tested the patch at libreoffice-3.5.2.2 tag on Windows XP, but not tested on master yet. Of course, please review and push it to appropriate branch(es). :) Pushed to master and 3-5. Need more reviewers to get it into 3-5-3 +1 obviously makes sense ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 3-5-3] fix fdo#45848 pdfimport regression
On Sat, 2012-04-21 at 21:06 +0100, Caolán McNamara wrote: Pushed to master and 3-5. Need more reviewers to get it into 3-5-3 Looks like a no-brainer to me too; +1, one more needed for 3-3-5. Thanks Korrawit :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Mon, Apr 23, 2012 at 4:24 AM, Stephan Bergmann sberg...@redhat.com wrote: This is solvable with updating the VM's git repos in the background, just taking the latest image when starting a VM. Before we abandoned work on OOo at Oracle last year, we were busy setting up a cool VM cluster for such builds. Michael's remark about handing failed build VMs over to devs reminded me about the various benefits we envisioned from that work. Yeah that sound cool indeed... but pretty resource intensive and not 'distributed friendly' To work you need the devs to come to the VMs rather than the other way around ( because practically transferring 20-30 GB over internet is a pretty high barrier) So we wold have to have a set of 'centralized servers' and manage the credential of all the devs that want access to it... and then manage somehow the 'traffic' on these box to avoid congestion Not inconceivable, but need some thinking and some tooling to make it practical... But, as you said... that is a completely different ballgame... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Windows build with ActiveX
On Fri, 2012-04-20 at 22:48 +0200, Mat M wrote: Is it intentional we do not provide it by default or not ? Yes, it is. We disable it in distro-configs/LibreOfficeWin32.conf (--disable-activex-component). You can enable it in your own build and play with it. As Tor mentined in the other thread, it does not work as one can expect, and it has no maintaner, so in order to avoid numerous bug reports we simply disable it. Michael Meeks will be disappointed :) You know, I think I'm confusing the ActiveX control with some other form of Windows embeddability (perhaps via some more vanilla COM embeddability ?). Hey ho, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-5-3] fix fdo#45848 pdfimport regression
On 04/23/2012 11:33 AM, Michael Meeks wrote: On Sat, 2012-04-21 at 21:06 +0100, Caolán McNamara wrote: Pushed to master and 3-5. Need more reviewers to get it into 3-5-3 Looks like a no-brainer to me too; +1, one more needed for 3-3-5. By my counting, the two Michaels' sign-offs would already have been enough, but can't hurt to have one more, anyway. Pushed to libreoffice-3-5-3 now. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED][3-5] Re: [REVIEW:3-5] fdo#39053 writerfilter: implement RTF_BIN
On 23/04/12 09:41, Miklos Vajna wrote: Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=5187174 Regression from 3.4; testcase in sw/qa/extras/rtftok/data/fdo39053.rtf; backported patch attached. pushed to libreoffice-3-5 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
How to convert doc files to ps format using the utility of LibreOffice without installing it
Hi All, I basically want to convert the doc files into ps(print script) format using the document conversion utility of LibreOffice but without installing LibreOffice on my machine. I want to write my own code for this.I know its quite tough but still if someone can provide any reference on how to move forward on this it would be very helpful to me. Ankit ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to convert doc files to ps format using the utility of LibreOffice without installing it
So you want to use LibreOffice without installing LibreOffice? Sound like you need a quantum computer. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to convert doc files to ps format using the utility of LibreOffice without installing it
On 23/04/12 12:30, Ankit Jain wrote: Hi All, I basically want to convert the doc files into ps(print script) format using the document conversion utility of LibreOffice but without installing LibreOffice on my machine. I want to write my own code for this.I know its quite tough but still if someone can provide any reference on how to move forward on this it would be very helpful to me. guess this is possible, you could install LibreOffice on _another_ computer and connect remotely via an UNO TCP connection, then use something like loadComponentFromURL to load documents and XPrintable to print them to a file, perhaps on some NFS share or HTTP server... that way you only need the URE installed on the client machine, which is much smaller. see e.g. http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Storing_Documents#Printing_Documents http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/Text/Printing_Text_Documents ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 23/04/12 09:49, Stephan Bergmann wrote: On 04/22/2012 10:51 PM, David Ostrovsky wrote: your patch was still not pushed. So we have two options here: 1. push your patch (I attached it with description ;-) 2. use make interactive variable LDFLAGS, a lá make LDFLAGS='-Wl,--no-as-needed' check Any ideas on this? I still do not see why we need the two different libraries at all, smoketest (from smoketest/Library_smoketest.mk) and smoketest_test (from smoketest/CppunitTest_smoketest.mk), both containing the exact same CppUnit test code. me neither, but i guess shipping the thing produced by CppunitTest currently doesn't work because the RPATH is wrong, and furthermore i don't really get the point of shipping cppunittests anyway. If we want the feature of http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c478c911033243df90ba290b32732a1fd70130e create installation set for tests and produce the CppUnit test code library not only for direct consumption in the CppunitTest_*.mk makefile, but also for inclusion in installation sets, then we should probably make solenv/gbuild/CppunitTest.mk more flexible, so that CppUnit test libraries need not necessarily built directly in their CppunitTest_*.mk. well i don't think complicating the gbuild core for this rather bizarre special case is a good idea; if anything i'd first investigate whether just changing the RPATH for Cppunittests and shipping the Cppunit_smoketest instead of the ordinary Library_smoketest fixes things up so everybody is happy? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to convert doc files to ps format using the utility of LibreOffice without installing it
Basically, don't bother to try to do it without installing LibreOffice. LibreOffice does not have some magic simple convert-doc-to-postscript library that you could use. Sure, you could try to come up with a customized installation of LibreOffice that includes only those bits that are needed for this special case. But it's a lot of work, and *you* have to do it, *and* *you* have to support it yourself. And please don't send private mail on a subject that starts on a mailing list. The whole point of mailing lists, in the context of Open Source, is that the discussion is public and archived for others to see later. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Some fixes for Clang warnings
[accidentally had dropped libreoffice@ from my original response]
Original Message
Subject: Re: [PATCH] Some fixes for Clang warnings
Date: Mon, 23 Apr 2012 09:36:46 +0200
From: Stephan Bergmann sberg...@redhat.com
To: Catalin Iacob iacobcata...@gmail.com
On 04/22/2012 09:57 PM, Catalin Iacob wrote:
I tried to build with Clang and --enable-werror to see if that finds
any bugs. Attached are results so far; there is still quite some to
compile and Clang also consistently crashes on a file.
...reminds me of my stripped-down testcase for such a crash (see
attached test2.cc), which I did not yet follow up to.
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 47ca98f..23d4871 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -987,7 +987,7 @@ inline void EnvironmentsData::registerEnvironment(
uno_Environment ** ppEnv )
if (iFind == aName2EnvMap.end())
{
(*pEnv-acquireWeak)( pEnv );
-::std::pair OUString2EnvironmentMap::iterator, bool insertion(
+::std::pair OUString2EnvironmentMap::iterator, bool insertion
SAL_UNUSED_PARAMETER (
This one made me smile, as it cleverly reuses SAL_UNUSED_PARAMETER for
something it was not originally designed for. However, I would prefer
to stick to the standard idiom
(void) insertion; // avoid warnings
here (so that also compilers for which SAL_UNUSED_PARAMETER expands to
nothing can potentially benefit from the silenced warning), or, even
better, replace the following OSL_ENSURE with SAL_WARN or SAL_INFO
(which never expands to code that hides its arguments from the compiler).
SAL_UNUSED_PARAMETER was solely meant to annotate anonymous function
parameters that cannot be dropped (because the given function needs to
adhere to a certain function type).
Stephan
// /data/clang/inst/bin/clang -c test2.cc
templatetypename T struct SZ {};
templatetypename T struct S0 {
S0(int = 0) {}
S0(SZT) {}
};
templatetypename T struct S1 {
S1() { new S0int(); }
};
struct S2: S1int {
S2() {}
};
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
Hi David,
thanks a lot for looking at it. Your patch is almost perfect. Well,
there are still some open questions, see below. :-)
David Ostrovsky píše v So 21. 04. 2012 v 14:23 +0200:
Hi,
here is the patch to remove strip solver configure option.
Some places still has a strip code, for example in solenv/bin/deliver.pl
sub initialize_strip {
if ((!defined $ENV{CROSS_COMPILING}) || ($ENV{CROSS_COMPILING} ne
'YES')) {
$strip .= 'guw ' if ($^O eq 'cygwin');
[...]
was not sure if it is still needed.
Please, remove strip from deliver.pl. Otherwise, the binaries will be
always stripped. We need non-stripped binaries when producing debuginfo
packages on Linux.
Hmm, we might want to keep the strip stuff and the -dontstrip options in
the in the perl installer. It is handy when you have debug build and you
need to send someone the small stripped build. It is a big difference in
the size. I am not sure if make install should strip by default or
not. Bjoern, Lubos, what do you think?
Best Regards,
Petr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to convert doc to ps format using the utility of LibreOffice
I will provide the complete details on what I am trying to do. I don't want to install LibreOffice on my machine but still want to use the utility of LibreOffice to convert the doc to ps(print-script) format.I know this is quite tough and there is a lot of interdependency but still can someone provide me any reference that would help me and the basic approach how to proceed.Any help would be greatly appreciated. I want use the source code of LibreOffice Writer to do this.So please tell me what components in Writer that does this conversion or any idea so that at least I can move forward. Thanks Ankit ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
On Monday 23 of April 2012, Petr Mladek wrote: Hmm, we might want to keep the strip stuff and the -dontstrip options in the in the perl installer. It is handy when you have debug build and you need to send someone the small stripped build. It is a big difference in the size. I am not sure if make install should strip by default or not. Bjoern, Lubos, what do you think? It should not, it should do what the name says. If the functionality is deemed useful, it can be an extra target like other build systems have (e.g. automake has install-strip). -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
On Mon, Apr 23, 2012 at 01:37:29PM +0200, Lubos Lunak wrote: On Monday 23 of April 2012, Petr Mladek wrote: Hmm, we might want to keep the strip stuff and the -dontstrip options in the in the perl installer. It is handy when you have debug build and you need to send someone the small stripped build. It is a big difference in the size. I am not sure if make install should strip by default or not. Bjoern, Lubos, what do you think? It should not, it should do what the name says. If the functionality is deemed useful, it can be an extra target like other build systems have (e.g. automake has install-strip). Sounds good to me. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Some fixes for Clang warnings
On 04/23/2012 01:24 PM, Stephan Bergmann wrote:
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 47ca98f..23d4871 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -987,7 +987,7 @@ inline void EnvironmentsData::registerEnvironment(
uno_Environment ** ppEnv )
if (iFind == aName2EnvMap.end())
{
(*pEnv-acquireWeak)( pEnv );
- ::std::pair OUString2EnvironmentMap::iterator, bool insertion(
+ ::std::pair OUString2EnvironmentMap::iterator, bool insertion
SAL_UNUSED_PARAMETER (
This one made me smile, as it cleverly reuses SAL_UNUSED_PARAMETER for
something it was not originally designed for. However, I would prefer
to stick to the standard idiom
(void) insertion; // avoid warnings
here (so that also compilers for which SAL_UNUSED_PARAMETER expands to
nothing can potentially benefit from the silenced warning), or, even
better, replace the following OSL_ENSURE with SAL_WARN or SAL_INFO
(which never expands to code that hides its arguments from the compiler).
SAL_UNUSED_PARAMETER was solely meant to annotate anonymous function
parameters that cannot be dropped (because the given function needs to
adhere to a certain function type).
Pushed most of these now:
0001-WaE-Clang-empty-forloop-body.patch: trivially fixed tabs to spaces
0004-WaE-Clang-adding-int-to-a-string-does-not-append-to-.patch: added a
follow-up to go all the way to static char const unoinfoSuffix[]
0005-WaE-Clang-C-linkage-warning.patch: already fixed as
18f117ae6bde53f4427c777d7bbfca2cf6afdb04
0006-WaE-patch-CLucene-to-avoid-Clang-unused-parameter-wa.patch: it
could be useful to have some link in clucene/CustomTarget_source.mk
indicating that the patch has been sent upstream, too
0007-WaE-Clang-expression-result-unused.patch,
0008-WaE-Clang-implicit-conversion-changes-signedness.patch, and
0009-WaE-Clang-implicit-conversion-changes-signedness.patch: no comments
Only 0002-WaE-Clang-unused-variable.patch and
0003-WaE-Clang-unused-variable.patch I did not push. Can you change
them as I suggested above (or just let me know if you want me to do that)?
Thanks a lot,
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: master install does not respect destdir variabe
Just for the refference, fixed in the git now by http://cgit.freedesktop.org/libreoffice/core/commit/?id=071d6daf5c798e89887a84a17fb3b64824fdbc6f Tom ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Proposal: move pre-onegit repos into libreoffice-obsolete as 3.4 is EOL
Hi there, just a short note (maybe to be discussed in the ESC call): http://cgit.freedesktop.org/libreoffice/ is overloaded with obsolete repositories, making it hard for a curious newcomer to find his way around and be dragged in. If it is not too much work, could we possibly move all the obsolete repositories to: http://cgit.freedesktop.org/libreoffice-obsolete/ as 3.4 is EOL and thus those repositories are mostly dead? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Proposal: move pre-onegit repos into libreoffice-obsolete as 3.4 is EOL
On 23/04/12 14:43, Bjoern Michaelsen wrote: Hi there, just a short note (maybe to be discussed in the ESC call): http://cgit.freedesktop.org/libreoffice/ is overloaded with obsolete repositories, making it hard for a curious newcomer to find his way around and be dragged in. If it is not too much work, could we possibly move all the obsolete repositories to: http://cgit.freedesktop.org/libreoffice-obsolete/ as 3.4 is EOL and thus those repositories are mostly dead? they are dead, but all documentation about building LO 3.3/3.4 points to these, and there may well be people trying to build older versions for some reason. would it be possible to just hide them in the web interface, so the old URLs still work, but the obsolete stuff doesn't clutter up the overview? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Proposal: move pre-onegit repos into libreoffice-obsolete as 3.4 is EOL
On Mon, Apr 23, 2012 at 02:50:52PM +0200, Michael Stahl mst...@redhat.com wrote: would it be possible to just hide them in the web interface, so the old URLs still work, but the obsolete stuff doesn't clutter up the overview? AFAIK cgit has its static list of repos, which is updated by a nightly cronjob, so probably best to ask Freedesktop infra about what would be the best for them to mark these repos as obsolete. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Weird runtime error
Hi all, after finally making my tinderbox build and install lo I get this error when I try to launch any of the apps. scarabeus@arcarius: ~ $ lowriter terminate called after throwing an instance of 'com::sun::star::uno::DeploymentException' The problem here is that the install ended without any error, so I really have no idea what is missing there. Cheers Tom ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Weird runtime error
On Mon, Apr 23, 2012 at 03:12:01PM +0200, Tomáš Chvátal tomas.chva...@gmail.com wrote: after finally making my tinderbox build and install lo I get this error when I try to launch any of the apps. scarabeus@arcarius: ~ $ lowriter terminate called after throwing an instance of 'com::sun::star::uno::DeploymentException' The problem here is that the install ended without any error, so I really have no idea what is missing there. Try mv ~/.config/libreoffice/ ~/.config/libreoffice.old? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Help about Calc Functions
I have tried to figure out the thinking behind the Calc Functions Help, but after a couple of days I have given up because it looks impossible to understand. Basically, the problems are the following: 1. Functions are not listed alphabetically. Does it make sense? Does it make sense to swap them inside the file to create al alphabetical order (which is the usual order for human beings)? 2. Size of files is wildly different. There are huge files like Math Functions and small files like Financial Functions which are even split in sections (where the contents do not follow any order, while it would be more useful to have - for instance - Financial Functions A-L instead of Financial Functions Part One). Does it make sense to split large files to make them more manageable? Does it make sense to rename sections to make them like these: A-L and M-Z? (Of course, this does not mean that I already know how to split help files or to create new help files... but it might be worth studying it if it makes sense to improve the overall usability of the help, which is now almost useless in several areas). 3. There are comments like see also TANG. Does it make sense to make these comments, which might sometimes be useful, be visible to end users? In my opinion, having this kind of stuff buried into XML and invisible to the end user does not make sense, so either I uncomment it making it visible to end user or I delete it (I feel that the first option is the best one). Sorry for the length. Ciao, Italo -- Italo Vignoli - it...@italovignoli.com mob +39.348.5653829 - VoIP 5316...@messagenet.it skype italovignoli - gtalk italo.vign...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Mac OSX daily build 26/10/2011 - Base Report Builder, Beanshell, and Javascript extensions disabled
On 04/08/2012 11:38 AM, Kálmán „KAMI” Szalai wrote: Finally I get managed to release a new bugfix/feature version. Now it is working under LibO 3.4 and 3.5. Can you test it then cherry-pick it to 3.4 and3.5 branches? Version 1.3.5 of the Barcode extension (as now included in LO -3-5 and master repos) is still broken. Its META-INF/manifest.xml still claims the included barcode-loader.py is an old-style (i.e., active-registration) component (application/vnd.sun.star.uno-component;type=Python), but barcode-loader.py still has no writeRegistryInfo. Stephan 2011-10-28 15:56 keltezéssel, Stephan Bergmann írta: On 10/28/2011 10:07 AM, Alexander Thurgood wrote: I can also confirm this with my own build from master from this morning 28/10/2011, build ID : [...] --enable-ext-barcode Kami, can you help me? Just asked on #libreoffice-dev: does anybody know anything about the barcode extension? Alexander Thurgood said on ML that it was not working in current Mac builds, but it (as downloaded from http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt) appears to be not working in any recent LibO? The included barcode-loader.py apparently still uses active registration, but does not provide a writeRegistryInfo function? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
REMINDER: Release 3.5.3-rc2 from libreoffice-3-5-3 branch
Hi, please note that the commit deadline for 3.5.3-rc2 is today, April 23, 2012. It will be used as LO-3.5.3 final if no blocker is reported. See also http://wiki.documentfoundation.org/ReleasePlan#3.5_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr PS: Please, help also with reviewing the pending patches. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED-3-5 PUSHED-3-5-3] fdo#46687 fix find toolbar crash ...
On 04/20/2012 01:03 PM, Caolán McNamara wrote: On Fri, 2012-04-20 at 00:01 +0200, Bjoern Michaelsen wrote: Pushed to -3-5, still needs two signoffs for 3-5-3. +1, looks safe. Another +1 and pushed to -3-5-3 now. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
PATCH: Remove unused code from editing
- Mensaje reenviado - De: Vicente Rafael Estévez Vacas rafaeste...@yahoo.es Para: libreoffice-boun...@lists.freedesktop.org libreoffice-boun...@lists.freedesktop.org CC: Estévez Vacas Vicente rafaeste...@yahoo.es Enviado: Lunes 23 de abril de 2012 13:39 Asunto: PATCH: Remove unused code from editing Thanks 0001-PATCH-Remove-unused-code-from-editing.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
Lubos Lunak píše v Po 23. 04. 2012 v 13:37 +0200: On Monday 23 of April 2012, Petr Mladek wrote: Hmm, we might want to keep the strip stuff and the -dontstrip options in the in the perl installer. It is handy when you have debug build and you need to send someone the small stripped build. It is a big difference in the size. I am not sure if make install should strip by default or not. Bjoern, Lubos, what do you think? It should not, it should do what the name says. If the functionality is deemed useful, it can be an extra target like other build systems have (e.g. automake has install-strip). Hmm, it is a bit more complicated. The installation sets, for the upstream release, are generated during normal build. make install is called only by developers or Linux distro packagers. I am not sure but I think that strip reduces size of binaries even when you build without -g. It just removes something less important. I am not sure what is the win but we might want to always strip binaries for the official installation sets to optimize download size for normal users. David, could you please do some investigation here? I wonder what is the difference when you build without debugging symbols and when you strip or non-strip the final binaries in the installation set. If you do tests on linux. You might want to use --enable-epm --with-package-format=rpm deb and compare the generated tar.gz in instsetoo_native/unxlng?6.pro/LibreOffice/*/install/*_download Make sure that you do not strip in solver: + remove strip in deliver.pl + remove strip in the gbuild makefiles Also you need to be capable to strip in the perl installer + use or not use -dontstrip when calling make_installer.pl in instsetoo_native/util/makefile.mk Best Regards, Petr PS: Your original patch actually forgot to update instsetoo_native/util/makefile.mk :-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #295 from utter koe...@gmail.com 2012-04-23 09:50:10 PDT --- Propose Bug 4 Can cause serious annoyance to people distributing pdf docs created from LibO Writer. See example inside bug report. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 utter koe...@gmail.com changed: What|Removed |Added Depends on||4 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help about Calc Functions
Hi Italo, please have a look at http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category and http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_alphabetically Those indexes are needed in the help. Italo Vignoli schrieb: I have tried to figure out the thinking behind the Calc Functions Help, but after a couple of days I have given up because it looks impossible to understand. Basically, the problems are the following: 1. Functions are not listed alphabetically. Does it make sense? Does it make sense to swap them inside the file to create al alphabetical order (which is the usual order for human beings)? Both kind of indexes are needed, see the above mentioned Wiki-pages. In the help an alphabetic index of spreadsheet functions is missing. 2. Size of files is wildly different. There are huge files like Math Functions and small files like Financial Functions which are even split in sections (where the contents do not follow any order, while it would be more useful to have - for instance - Financial Functions A-L instead of Financial Functions Part One). Does it make sense to split large files to make them more manageable? Does it make sense to rename sections to make them like these: A-L and M-Z? I find the splitting in Part One, Part Two ... very unhandy, because I always need to look in all parts to find a function, when searching inside the help. Grouping of functions are meaningful, when they are easily confused, for example LOOKUP and MATCH. But in most cases I prefer a one function - one file structure together with an index. But unfortunately that would end up in more then 400 files. So some grouping seems to be necessary. I personally would prefer to have an alphabetic order inside the statistical functions. But a thematic order might be useful too, if the topic is mentioned in the header. Part One, Part Two... are useless. For an example of a thematic structure look at the violet part on bottom of http://en.wikipedia.org/wiki/Statistics. (Of course, this does not mean that I already know how to split help files or to create new help files... but it might be worth studying it if it makes sense to improve the overall usability of the help, which is now almost useless in several areas). I agree. But even a more precise description like those linked in http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_alphabetically does not help all users. There are examples missing, from which the user can decide, whether that function is useful in his case. The problem is, that such a help with useful examples would be to large to be provided as in-build help. Such help needs to go to the Wiki. Even the pure description might be to complex to be shown in the in-build help. For example see my description in http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_CHISQDIST_function 3. There arecomments like see also TANG. Does it make sense to make these comments, which might sometimes be useful, be visible to end users? In my opinion, having this kind of stuff buried into XML and invisible to the end user does not make sense, so either I uncomment it making it visible to end user or I delete it (I feel that the first option is the best one). Are those comments inserted to help translators to get a consistent translation for cognate functions? Sorry for the length. Ciao, Italo Perhaps more a topic for documentat...@global.libreoffice.org than for libreoffice@lists.freedesktop.org Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help about Calc Functions
Hi Italo, On 23/04/2012 16:55, Italo Vignoli wrote: I have tried to figure out the thinking behind the Calc Functions Help, but after a couple of days I have given up because it looks impossible to understand. Basically, the problems are the following: 1. Functions are not listed alphabetically. Does it make sense? Does it make sense to swap them inside the file to create al alphabetical order (which is the usual order for human beings)? 2. Size of files is wildly different. There are huge files like Math Functions and small files like Financial Functions which are even split in sections (where the contents do not follow any order, while it would be more useful to have - for instance - Financial Functions A-L instead of Financial Functions Part One). Does it make sense to split large files to make them more manageable? Does it make sense to rename sections to make them like these: A-L and M-Z? (Of course, this does not mean that I already know how to split help files or to create new help files... but it might be worth studying it if it makes sense to improve the overall usability of the help, which is now almost useless in several areas). 3. There arecomments like see also TANG. Does it make sense to make these comments, which might sometimes be useful, be visible to end users? In my opinion, having this kind of stuff buried into XML and invisible to the end user does not make sense, so either I uncomment it making it visible to end user or I delete it (I feel that the first option is the best one). For information, because the Help file was not so helpful, we wrote a wiki page some (long) time ago, this page was referenced in the HC2 file and was maintained more that the HC2 file. I've ported it on LibreOffice, but it's in French however I know you read it and may be it can help you to figure out how it could look better. http://wiki.documentfoundation.org/FR/Calc/Fonctions_listees_par_categories Kind regards Sophie Sorry for the length. Ciao, Italo -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Committee Member - Co-founder The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
patch dociter.cxx
Hi. i send a patch for libreoffice (fich dociter.cxx) thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help about Calc Functions
Regina Henschel wrote: Perhaps more a topic for documentat...@global.libreoffice.org than for libreoffice@lists.freedesktop.org No, I do not want to write documentation, I am trying to figure out how to hack the help to improve it, because most users still refer to the help when they do not know how to do something. I have already started cleaning useless comments, and while doing this I stumbled upon the see also... comments on Calc, and from these to the rest of the story. LibreOffice Help is really bad, and should be rebuilt from scratch, but this is really impossible. So, I am working at improving it, starting from the easiest stuff. You have answered to the alphabetical order, and to the part one, part two stuff. They seem both improvements over the actual situation. -- Italo Vignoli - it...@italovignoli.com mob +39.348.5653829 - VoIP 5316...@messagenet.it skype italovignoli - gtalk italo.vign...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License
All my contributions, past and future, to LibreOffice are licensed under the terms of the MPL / LGPLv3+. http://wiki.documentfoundation.org/Development/Developers https://bugs.freedesktop.org/show_bug.cgi?id=42982 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: per library debug builds now possible via ./configure
On Friday 20 of April 2012, Lubos Lunak wrote: On Monday 16 of April 2012, Bjoern Michaelsen wrote: On Mon, Apr 16, 2012 at 01:50:00PM +0200, Lubos Lunak wrote: Is it possible to do the build also the other way around, i.e. e.g. all but sc? Not yet, feel free to add it if you think it is essential. ... and if I understand the change correctly, I'd have to manually find out what all the dependencies actually are. Given that sc/sd/sw are the biggest three, it probably even makes the biggest difference to disable the two that one does not work on. ALLBUTSCSW=`find . -name Library*.mk| sed -e 's/^.*Library_//' -e 's/.mk$//'|grep -v sc |grep -v sw` ./autogen.sh --enable-debug=$ALLBUTSCSW should be enough. How about this? Pushed. Short version for whoever has already started to use this: Prepend Library_ to every item you pass to --enable-debug, or simply use directory names with / appended, and pass it to --enable-symbols instead. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused code (sc)
This patch removes unused code as listed in unusedcode.easy 0001-Remove-unused-code-in-sc.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
typos in feature/coretext branch?
Hello Norbert, all, In commit [1], is it intended to have a trailing question marks like this: +export ENABLE_CORETEXT?=@ENABLE_CORETEXT@ and -export GMAKE_PARALLELISM=@GMAKE_PARALLELISM@ +export GMAKE_PARALLELISM?=@GMAKE_PARALLELISM@ And I think the message in AC_MSG_CHECKING is incorrect: +if test $_os = Darwin; then + AC_MSG_CHECKING([whether to build the MySQL Connector extension]) + if test $enable_coretext = yes; then [1] http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/coretextid=1f4a9f88d9031b520a034f19c20605a7a647dab7 Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
How to get text attributes on Writer?
Given a certain cursor (or PaM) position on Writer, how can I get the current font height? Or check if two PaM have the same height/style? I can't understand the pool model... Thank you in advance, Rodolfo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: typos in feature/coretext branch?
On Mon, Apr 23, 2012 at 1:12 PM, Korrawit Pruegsanusak detective.conan.1...@gmail.com wrote: Hello Norbert, all, In commit [1], is it intended to have a trailing question marks like this: +export ENABLE_CORETEXT?=@ENABLE_CORETEXT@ and -export GMAKE_PARALLELISM=@GMAKE_PARALLELISM@ +export GMAKE_PARALLELISM?=@GMAKE_PARALLELISM@ Yes it is intended, this allow to override this after the autogen... which allow to switch come ENABLE_CORETEXT yes/no on the fly and also to drop the //ism to 1 for instance on certain partial rebuild. both very convenient while coding that feature :-) And I think the message in AC_MSG_CHECKING is incorrect: +if test $_os = Darwin; then + AC_MSG_CHECKING([whether to build the MySQL Connector extension]) + if test $enable_coretext = yes; then yep, looks like a botched cut-and-paste :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
license statement
To whom it may concern, Collabora has a general policy of contributing code to open source projects under the that project's existing licensing terms. All contributions past, present, and future (while this choice of project license is in place) made to LibreOffice from Collabora are available under the terms the MPL / LGPLv3+. Regards, Rob -- Robert McQueen +44 7876 562 564 Director, Collabora Ltd. http://www.collabora.co.uk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Weird runtime error
Hi, This is the trace with --enable-dbgutil of this crash, no more warn:desktop:12777:1:/media/Medias/core/desktop/source/app/app.cxx:702: UNO Exception: InvalidRegistryException: file:///media/Medias/core/solver/unxlngx6/installation/opt/program/../share/extensions/presenter-screen/components.rdb: duplicate implementation name=com.sun.star.comp.Draw.framework.PresenterScreenJob terminate called after throwing an instance of 'com::sun::star::uno::DeploymentException' No more Best regards Le 23 avril 2012 19:49, Christina Roßmanith chrrossman...@gmx.de a écrit : Hi, I observe the same error but moving ~/.config/libreoffice to libreoffice.old does not help. More ideas? Christina Am 23.04.2012 15:17, schrieb Miklos Vajna: On Mon, Apr 23, 2012 at 03:12:01PM +0200, Tomáš Chvátal tomas.chvatal@gmail.**com tomas.chva...@gmail.com wrote: after finally making my tinderbox build and install lo I get this error when I try to launch any of the apps. scarabeus@arcarius: ~ $ lowriter terminate called after throwing an instance of 'com::sun::star::uno::**DeploymentException' The problem here is that the install ended without any error, so I really have no idea what is missing there. Try mv ~/.config/libreoffice/ ~/.config/libreoffice.old? __**_ LibreOffice mailing list LibreOffice@lists.freedesktop.**org LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/**mailman/listinfo/libreofficehttp://lists.freedesktop.org/mailman/listinfo/libreoffice __**_ LibreOffice mailing list LibreOffice@lists.freedesktop.**org LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/**mailman/listinfo/libreofficehttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Arnaud Versini ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Windows build with ActiveX
Something like OLE, cf the module embedserv, which iw as questioning about in the other thread :) huh oh Mat Le Mon, 23 Apr 2012 11:41:04 +0200, Michael Meeks michael.me...@suse.com a écrit: On Fri, 2012-04-20 at 22:48 +0200, Mat M wrote: Is it intentional we do not provide it by default or not ? Yes, it is. We disable it in distro-configs/LibreOfficeWin32.conf (--disable-activex-component). You can enable it in your own build and play with it. As Tor mentined in the other thread, it does not work as one can expect, and it has no maintaner, so in order to avoid numerous bug reports we simply disable it. Michael Meeks will be disappointed :) You know, I think I'm confusing the ActiveX control with some other form of Windows embeddability (perhaps via some more vanilla COM embeddability ?). Hey ho, Michael. -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Some fixes for Clang warnings
On Monday 23 of April 2012, Catalin Iacob wrote: The plan is also to report the Clang crash that I encountered, I can report your test too while I'm at it if I can reproduce it (didn't try yet) and then keep going, as time allows, with Clang + werror and see what else turns out. Note that I do not get any crash with the test2.cc test file with SUSE Linux clang version 3.1 (trunk 154660) (based on LLVM 3.1svn), nor I see any other compiler crash during LO compile, so you might want to upgrade first. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice][GSoC2012] Enhancing Impress svg export filter
Hi all, my GSoC proposal has been accepted! I'm really happy that also this GSoC I'll contribute to the LibreOffice project. I want to thanks Thorsten and Fridrich for having placed their trust in me again for this GSoC. My proposal is about improving the project I started the last GSoC. The project was about implementing a new Impress feature in order to let a user to be able to export a presentation as a browsable svg document with support for animations. In the last GSoC I ported a good amount of the impress animation engine from C++ to JavaScript. At present the svg export filter supports several shape effects, but there is still a lot of work to do. For the upcoming GSoC the main goals will be: - Porting the part of the Impress animation engine responsible for transition effects and slide transitions. - Implement support for repeated and rewinded animations. - Go backward by one single effect. - A new text export implementation that provides better support for text search engines and best appearance. - Provide support for text animations. - Export embedded svg pictures in a transparent way. I'll start coding on May 21, I'll keep a logbook where I'll annotate the project advance as any issue I'll have to face. I'll also provide a weekly summary on the project state that I'll post on this ml. As I have write access to the Libre Office git repository I'll submit my code in the form of a feature branch. In the meanwhile, when I'm not too busy, I'll spend my time by getting again cozy with the source code I have to work on, and in accumulating and discussing ideas on implementation aspects. I'll also set up any development tools I could need and I'll define a good pool of browsers to utilize for testing. About this last point I'd like to know if there is interest in performing test on IE 10 that at present is supported only by Windows 8. Cheers, -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Problem with configure checks for gcc options that clang does not support
Unfortunately, at least the Apple Clang doesn't generate any compilation error or *proper* warning for command-line options it doesn't understand, like -fno-enforce-eh-specs. It just prints out clang: warning: argument unused during compilation: '-fno-enforce-eh-specs' to stderr... Even with -Werror, this is just printed, it doesn't cause the compilation to exit with failure. So probably configure should check if this warning is printed to stderr when checking what command-line options are supported? One can get rid of the warning with the option -Qunused-arguments, but I think that would be counter-productive. After all, if configure thinks that the compiler supports something, even if it doesn't, that misleading knowledge might be used to compile the code in a wrong fashion. So it is useful to see what options are used even if they don't have any effect. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] PATCH: Remove unused code from editing
On Mon, 2012-04-23 at 17:13 +0100, Vicente Rafael Estévez Vacas wrote: Asunto: PATCH: Remove unused code from editing Basically good. Though you need to build after your make your changes to pick up that there's a small mixup between the unused sdr::contact::ViewObjectContactOfUnoControl::isControlVisible and the used sdr::contact::ViewObjectContactOfUnoControl_Impl::impl_isControlVisible_nofail fixed up with http://cgit.freedesktop.org/libreoffice/core/commit/?id=9be39efcc55f9c4a8f7c02bdded299c0ef7e54fd Can you confirm that your code is submitted under our preferred LGPLv3+/MPL+ combination ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Your GSoC project - first step
On 04/23/2012 06:07 PM, Kohei Yoshida wrote: Hi Daniel, First of all, welcome aboard for GSoC 2012! We are very excited to have you work on Calc's performance improvement this summer. According to the official GSoC timeline, we should spend the first couple of weeks getting to know your mentors (which is, me and Markus), read documentation, and get up to speed on your project. I assume that, since you've already worked on two easy hacks, you already know how to build, hack, and submit patches using git enough to get started. If not, you are welcome to ask us for help. I talked with Markus briefly, and we think that as a starter, we should stay on the xlsx import code and make a few more improvements there before moving on to other areas. We have already covered the named ranges import, and now we will shift our focus to cell value import, and hopefully make it a bit faster than it currently is. The first thing we'd like you to do toward this goal is to create a test xlsx document, and add it to our filters-test. Markus knows more about this filters-test framework, so I'll let him fill you in on the details. Last but not least, can you give us a brief introduction of yourself now that you are officially in? :-) Looking forward to working with you this summer! Kohei Hi, Kohei, I am excited and grateful to be able to work on the GSOC Calc performance improvements project! Yes, I have had the opportunity to speak to both you and Markus on different occasions in the past few weeks, and I'm glad to have you as my mentors. For documentation, I have been using a combination of http://opengrok.libreoffice.org, http://api.libreoffice.org, http://wiki.documentfoundation.org/Development/Code_Overview, docs.libreoffice.org, grepping the code on my own file system, and sometimes miscellaneous other ways. I also have looked into your editor recommendation and your class diagram. Are there other recommendations for documentation other than these? Yes, I am comfortable building, hacking, and submitting patches using git. As I've stated before, I will be mostly busy with end of the semester school assignments and finals until the end of the first week of May. Even so, I will do what I can on LibreOffice related tasks. As for the filters-test framework and test xslx document, I look forward to learning more. An introduction of myself: I am from Mississippi, USA and joined the United States Marine Corps upon graduating high school. I traveled to places in the USA like South Carolina, North Carolina, and California, but I spent the majority of my time in Okinawa, Japan. In the USMC, I performed many duties, but I was primarily the IT Support for my unit. I was Honorably Discharged after five years of service and came back to Mississippi. A year later, I started attending college to pursue my dream of becoming a software developer. I currently plan to graduate in December of this year with a BS in Software Engineering. Although I have yet to gain professional experience developing software, I have worked on several different programming assignments and software projects during my school course work, and I have experimented with software development outside of school. Inside and outside of school work, I have had the opportunity to use general development technologies such C, C++, Java, and Python and web development technologies such as HTML, CSS, jQuery, Java EE, and PHP. Once I obtain my degree, I aim to be employed as a full time software developer, and I am willing to relocate. Once again, thank you, Kohei, Markus, and the LibreOffice community, for allowing me to work on LibreOffice as a part of this year's GSOC. Respectfully, Daniel Bankston ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Weird runtime error
On Mon, Apr 23, 2012 at 10:28:09PM +0200, Arnaud Versini wrote: Hi, This is the trace with --enable-dbgutil of this crash, no more warn:desktop:12777:1:/media/Medias/core/desktop/source/app/app.cxx:702: UNO Exception: InvalidRegistryException: file:///media/Medias/core/solver/unxlngx6/installation/opt/program/../share/extensions/presenter-screen/components.rdb: duplicate implementation name=com.sun.star.comp.Draw.framework.PresenterScreenJob terminate called after throwing an instance of 'com::sun::star::uno::DeploymentException' Does commit 1f1f8ac4db7aa40f299a104927499e72d39fd932 remove leftover component_writeInfo help? d. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Sat, 2012-04-21 at 09:09 -0500, Norbert Thiebaud wrote: + bytemark machine #2 + working on *BSD in virtualbox with little joy help appreciated (Norbert) + need 3x BSD virtual-boxes (ideally) I'd like to know a bit more about this item; Norbert, would you prefer real boxes if possible ? So - one advantage of a VM here, is that -if- we have a 'standard' virtual-machine for this, and do the tinderbox-ness in some snapshot or somesuch; then in the event of problems, QA or Developers could re-use the same VM for doing their own testing, so in some ways that might be more generally useful. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Office XP/2003, 2007/2010 formats import/export -- most used feature.
Hello everyone! The MAB has been chaotic lately... actually it turned out that I didn't get a lot of mails and missed out a lot of comments following the LONG discussion in the bug... so sorry about that, I noticed them now. What I've been trying to add to MAB are broken import/export features/regressions of Office XP/2003, 2007/2010 formats. Everyone should realize that this's the most important and features of LO, without which it's adoption is impossible. No one uses ODF... any non-IT personal uses Office XP/2003, 2007/2010 formats, and that's apparent when you search for docs on the web. Yes, nowadays most of them are PDF, but next comes doc/docx/ppt/pptx etc... Whatever documents you get in ODF, are IT related, on top of that it's the rarest possible case you get one. In enterprise environments, this's always the case. For libreoffice to be used anywhere except for IT environments, the Office XP/2003, 2007/2010 format import/export should be perfect, otherwise the software cannot be adopted by any chance. You can take a hint form commercial products, they always advertise support for Office XP/2003, 2007/2010 formats, cause they know it's the most important feature. And as of the current time, there're regressions over regressions in this field. Since the OOo fork, i/o bugs have boomed in the bugzilla and everyone's complaining about it. It's very easy to get hands on documents which do not open/open incorrectly in LO. LO even breaks existing Office XP/2003, 2007/2010 formats causing data loss. Imagine someone sending a .docx saved via libreoffice which does not open or opens wrongly formatting in MS office... he'll come to know about that bug when it's too late, this's surely going to make um leave LO at that moment. These bugs are more critical than a few crashes and I estimate there're ~200 bugs in LO's bugzilla alone. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [ANN] LibreOffice 3.5.2 RC2 test builds available
Hi Fridrich, On Sat, 2012-04-21 at 16:43 -0700, Pedro wrote: So - Fridrich is going to do a re-spin. The (only) change (in a nutshell) is to delete the cairocanvas.uno.dll from the program/ directory - so you can even test it before it goes live. ... I think this was not cherry-picked or whatever you call it to master. Bother ! :-) I can see exactly the same problem in version 3.6.0alpha0+ (Build ID: 8a78020) and it is fixed by disabling Hardware acceleration. Should I REOPEN the bug? I think we'll be alright. I'll commit an assert in case this code is build on Windows / Mac to master in a bit ... ;-) Thanks for re-reporting though ! Regards, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [ANN] LibreOffice 3.5.2 RC2 test builds available
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 23/04/12 16:30, Michael Meeks wrote: I think this was not cherry-picked or whatever you call it to master. Bother ! :-) The problem is that we disabled it in the release build configuration file. If the tinderbox is buidling without using the configuration file, the defaults apply and it seems that cairo canvas is part of the defaults. We should just disable that for windows I guess. Cheers F. -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.18 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk+Vb94ACgkQu9a1imXPdA9QEACeLXvVMG7N5ROIWRPTIKN5jEse zrUAmgNQkJYnt15moAXFr2hE+caBUgvs =jkEH -END PGP SIGNATURE- ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
