[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
