[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry
officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 6441b280c34c55301df169577de24f25ed0280b4 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Apr 24 12:06:43 2012 +0200 default to Office 2007/2010 filter for ooxml export, fdo#48941 (cherry picked from commit f3d7d6ece96d74e55dc92babfd12812dfe1a4793) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu index 4593983..e0d569d 100644 --- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu +++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu @@ -30,7 +30,7 @@ node oor:name=ModuleDependendFilterOrder node oor:name=com.sun.star.sheet.SpreadsheetDocument oor:op=replace install:module=calc prop oor:name=SortedFilterList -value oor:separator=;calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;Calc Office Open XML;Calc Office Open XML Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery/value +value oor:separator=;calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery;Calc Office Open XML;Calc Office Open XML Template/value /prop /node node oor:name=com.sun.star.drawing.DrawingDocument oor:op=replace install:module=draw @@ -40,7 +40,7 @@ /node node oor:name=com.sun.star.presentation.PresentationDocument oor:op=replace install:module=impress prop oor:name=SortedFilterList -value oor:separator=;impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile/value +value oor:separator=;impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template/value /prop /node node oor:name=com.sun.star.formula.FormulaProperties oor:op=replace install:module=math @@ -55,7 +55,7 @@ /node node oor:name=com.sun.star.text.TextDocument oor:op=replace install:module=writer prop oor:name=SortedFilterList -value oor:separator=;writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;Office Open XML Text;Office Open XML Text Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook
[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] .: Branch 'libreoffice-3-5-3' - unotools/source
unotools/source/config/historyoptions.cxx | 38 ++
1 file changed, 28 insertions(+), 10 deletions(-)
New commits:
commit 76abd1abea8b23e843104756f3942c94e5e81d64
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Apr 20 09:21:42 2012 +0200
fdo#46074 Ignore corrupted items in Recent Documents
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
(cherry picked from commit 488b766836ef41c51670175fc2eeff7c9640e86c)
Signed-off-by: Noel Power noel.po...@novell.com
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/unotools/source/config/historyoptions.cxx
b/unotools/source/config/historyoptions.cxx
index 73161be..5ba2045 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -35,6 +35,7 @@
#include com/sun/star/uno/Any.hxx
#include com/sun/star/uno/Sequence.hxx
+#include cassert
#include deque
#include algorithm
@@ -440,20 +441,37 @@ Sequence Sequence PropertyValue
SvtHistoryOptions_Impl::GetList( EHistoryT
const sal_Int32 nLength =
xOrderList-getElementNames().getLength();
Sequence Sequence PropertyValue aRet(nLength);
+sal_Int32 nCount = 0;
for(sal_Int32 nItem=0; nItemnLength; ++nItem)
{
-::rtl::OUString sUrl;
-xOrderList-getByName(::rtl::OUString::valueOf(nItem)) =
xSet;
-xSet-getPropertyValue(s_sHistoryItemRef) = sUrl;
-
-xItemList-getByName(sUrl) = xSet;
-seqProperties[s_nOffsetURL ].Value = sUrl;
-xSet-getPropertyValue(s_sFilter) =
seqProperties[s_nOffsetFilter ].Value;
-xSet-getPropertyValue(s_sTitle)=
seqProperties[s_nOffsetTitle].Value;
-xSet-getPropertyValue(s_sPassword) =
seqProperties[s_nOffsetPassword ].Value;
-aRet[nItem] = seqProperties;
+try
+{
+::rtl::OUString sUrl;
+xOrderList-getByName(::rtl::OUString::valueOf(nItem)) =
xSet;
+xSet-getPropertyValue(s_sHistoryItemRef) = sUrl;
+
+xItemList-getByName(sUrl) = xSet;
+seqProperties[s_nOffsetURL ].Value = sUrl;
+xSet-getPropertyValue(s_sFilter) =
seqProperties[s_nOffsetFilter ].Value;
+xSet-getPropertyValue(s_sTitle)=
seqProperties[s_nOffsetTitle].Value;
+xSet-getPropertyValue(s_sPassword) =
seqProperties[s_nOffsetPassword ].Value;
+aRet[nCount++] = seqProperties;
+}
+catch(const css::uno::Exception ex)
+{
+// https://bugs.freedesktop.org/show_bug.cgi?id=46074
+// FILEOPEN: No Recent Documents... discusses a problem
+// with corrupted
/org.openoffice.Office/Histories/Histories
+// configuration items; to work around that problem, simply
+// ignore such corrupted individual items here, so that at
+// least newly added items are successfully reported back
+// from this function:
+LogHelper::logIt(ex);
+}
}
+assert(nCount = nLength);
+aRet.realloc(nCount);
seqReturn = aRet;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 8 commits - offapi/com sw/source udkapi/com
/iop/iop.idl
b/udkapi/com/sun/star/corba/iop/iop.idl
index b748c05..2d6a7fa 100644
--- a/udkapi/com/sun/star/corba/iop/iop.idl
+++ b/udkapi/com/sun/star/corba/iop/iop.idl
@@ -62,7 +62,7 @@ module com { module sun { module star { module corba { module
iop
*/
published struct IOR
{
-CorbaString8 type_id;
+com::sun::star::corba::CorbaString8 type_id;
sequence TaggedProfile profiles;
};
commit a7f3ca4c5bf3aa1ad28a701bf6d0bea71a107f53
Author: Tomas Hlavaty t...@logand.com
Date: Sun Jan 22 18:05:20 2012 +0100
add missing #ifndef
diff --git a/udkapi/com/sun/star/corba/corba.idl
b/udkapi/com/sun/star/corba/corba.idl
index 45c239a..8f5d62b 100644
--- a/udkapi/com/sun/star/corba/corba.idl
+++ b/udkapi/com/sun/star/corba/corba.idl
@@ -25,6 +25,9 @@
* for a copy of the LGPLv3 License.
*
/
+#ifndef __com_sun_star_corba_corba_idl__
+#define __com_sun_star_corba_corba_idl__
+
module com { module sun { module star { module corba
{
/**
@@ -103,4 +106,6 @@ module com { module sun { module star { module corba
}; }; }; };
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7dbbb51f78f7a6f25a288739f9294576c399237b
Author: Tomas Hlavaty t...@logand.com
Date: Mon Jan 16 19:55:42 2012 +0100
idl type reference fixed
diff --git a/offapi/com/sun/star/report/meta/XFormulaParser.idl
b/offapi/com/sun/star/report/meta/XFormulaParser.idl
index bc7575b..665f307 100644
--- a/offapi/com/sun/star/report/meta/XFormulaParser.idl
+++ b/offapi/com/sun/star/report/meta/XFormulaParser.idl
@@ -55,7 +55,7 @@ interface XFormulaParser
Names and symbols not defined here lead to a parser/print error.
*/
-[attribute] sequence sheet::FormulaOpCodeMapEntry OpCodeMap;
+[attribute] sequence com::sun::star::sheet::FormulaOpCodeMapEntry
OpCodeMap;
/** return the mapper for op codes.
*/
commit ec24cfbfb98bc610688e2118d16da51a78427dfd
Author: Michael Stahl mst...@redhat.com
Date: Fri Apr 20 12:12:14 2012 +0200
LoggerRemote.idl: include with full path
diff --git a/udkapi/com/sun/star/util/logging/LoggerRemote.idl
b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
index 83c1f98..0a6fcee 100644
--- a/udkapi/com/sun/star/util/logging/LoggerRemote.idl
+++ b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
@@ -30,8 +30,8 @@
#define __com_sun_star_webtop_Logger_idl__
#include com/sun/star/uno/XInterface.idl
-#include XLogger.idl
-#include XLoggerRemote.idl
+#include com/sun/star/util/logging/XLogger.idl
+#include com/sun/star/util/logging/XLoggerRemote.idl
//=
commit 33ee840e7b45eb971feef83215841edc0ba66cd7
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 19 23:30:13 2012 +0200
fix STL conversion e94c4ab5523c7dcbee2f1b7fd47685529498e774 harder
looping vector iterators and push_back/erase don't mix well
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 03e9731..5ef023d 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -643,9 +643,9 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
SvPtrarr aCheck( 64 );
-for (SwLineRects::iterator it = this-begin(); it != this-end(); ++it)
+for (size_t i = 0; i this-size(); )
{
-SwLineRect rL1 = (*it);
+SwLineRect rL1 = (*this)[i];
if ( !rL1.GetTab() || rL1.IsPainted() || rL1.IsLocked() )
continue;
@@ -737,6 +737,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
rL1.GetTab(), SUBCOL_TAB ) );
if ( isFull() )
{
+--i;
k = aCheck.Count();
break;
}
@@ -776,6 +777,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
rL1.GetTab(), SUBCOL_TAB ) );
if ( isFull() )
{
+--i;
k = aCheck.Count();
break;
}
@@ -790,7 +792,11 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
}
if ( bRemove )
{
-this-erase( it );
+this-erase(this-begin() + i);
+}
+else
+{
+++i;
}
}
}
@@ -806,11 +812,11 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const
SwLineRects rRects )
{
// All help lines that are covered by any border will be removed or split
-for (SwSubsRects::iterator it = this-begin(); it != this-end(); ++it)
+for (size_t i = 0; i this-size(); ++i)
{
// get a copy instead
[Libreoffice-commits] .: 4 commits - editeng/source sax/qa sax/source xmloff/source
editeng/source/editeng/editdoc.cxx |4
sax/qa/cppunit/test_converter.cxx | 72 +
sax/source/tools/converter.cxx | 155 ++---
xmloff/source/core/xmluconv.cxx|2
4 files changed, 219 insertions(+), 14 deletions(-)
New commits:
commit ee376102becc16c0c44d23e5eb2a322aadc45197
Author: Michael Stahl mst...@redhat.com
Date: Fri Apr 20 18:39:36 2012 +0200
fdo#48969: add unit test for Converter::convertDouble
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 4a3d364..a8dad87 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -39,11 +39,13 @@
#include com/sun/star/util/DateTime.hpp
#include com/sun/star/util/Date.hpp
#include com/sun/star/util/Duration.hpp
+#include com/sun/star/util/MeasureUnit.hpp
#include sax/tools/converter.hxx
using namespace ::com::sun::star;
+using namespace ::com::sun::star::util::MeasureUnit;
using sax::Converter;
@@ -58,10 +60,12 @@ public:
void testDuration();
void testDateTime();
+void testDouble();
CPPUNIT_TEST_SUITE(ConverterTest);
CPPUNIT_TEST(testDuration);
CPPUNIT_TEST(testDateTime);
+CPPUNIT_TEST(testDouble);
CPPUNIT_TEST_SUITE_END();
private:
@@ -249,6 +253,74 @@ void ConverterTest::testDateTime()
OSL_TRACE(\nSAX CONVERTER TEST END);
}
+void doTestDouble(char const*const pis, double const rd,
+sal_Int16 const nSourceUnit, sal_Int16 const nTargetUnit)
+{
+::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
+double od;
+bool bSuccess(Converter::convertDouble(od, is, nSourceUnit, nTargetUnit));
+OSL_TRACE(%f, od);
+CPPUNIT_ASSERT(bSuccess);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(rd, od, 0.0001);
+::rtl::OUStringBuffer buf;
+Converter::convertDouble(buf, od, true, nTargetUnit, nSourceUnit);
+OSL_TRACE(%s,
+::rtl::OUStringToOString(buf.getStr(),
RTL_TEXTENCODING_UTF8).getStr());
+CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
+}
+
+void ConverterTest::testDouble()
+{
+doTestDouble(42, 42.0, TWIP, TWIP);
+doTestDouble(42, 42.0, POINT, POINT);
+doTestDouble(42, 42.0, MM_100TH, MM_100TH);
+doTestDouble(42, 42.0, MM_10TH, MM_10TH);
+doTestDouble(42, 42.0, MM, MM); // identity don't seem to add unit?
+doTestDouble(42, 42.0, CM, CM);
+doTestDouble(42, 42.0, INCH, INCH);
+doTestDouble(2pt, 40.0, POINT, TWIP);
+doTestDouble(20pc, 1, TWIP, POINT);
+doTestDouble(4, 2.26771653543307, MM_100TH, TWIP);
+doTestDouble(4, 22.6771653543307, MM_10TH, TWIP);
+doTestDouble(4mm, 226.771653543307, MM, TWIP);
+doTestDouble(4cm, 2267.71653543307, CM, TWIP);
+doTestDouble(4in, 5760.0, INCH, TWIP);
+doTestDouble(1440pc, 1.0, TWIP, INCH);
+doTestDouble(567pc, 1.000125, TWIP, CM);
+doTestDouble(56.7pc, 1.000125, TWIP, MM);
+doTestDouble(5.67pc, 1.000125, TWIP, MM_10TH);
+doTestDouble(0.567pc, 1.000125, TWIP, MM_100TH);
+doTestDouble(42pt, 1.48166, POINT, CM);
+doTestDouble(42pt, 14.8166, POINT, MM);
+doTestDouble(42pt, 148.166, POINT, MM_10TH);
+doTestDouble(42pt, 1481.66, POINT, MM_100TH);
+doTestDouble(72pt, 1.0, POINT, INCH);
+doTestDouble(3.5in, 8.89, INCH, CM);
+doTestDouble(3.5in, 88.9, INCH, MM);
+doTestDouble(3.5in, 889.0, INCH, MM_10TH);
+doTestDouble(3.5in, 8890.0, INCH, MM_100TH);
+doTestDouble(2in, 144, INCH, POINT);
+doTestDouble(5.08cm, 2.0, CM, INCH);
+doTestDouble(3.5cm, 3500.0, CM, MM_100TH);
+doTestDouble(3.5cm, 350.0, CM, MM_10TH);
+doTestDouble(3.5cm, 35.0, CM, MM);
+doTestDouble(10cm, 283.464566929134, CM, POINT);
+doTestDouble(0.5cm, 283.464566929134, CM, TWIP);
+doTestDouble(10mm, 28.3464566929134, MM, POINT);
+doTestDouble(0.5mm, 28.3464566929134, MM, TWIP);
+doTestDouble(10, 2.83464566929134, MM_10TH, POINT);
+doTestDouble(0.5, 2.83464566929134, MM_10TH, TWIP);
+doTestDouble(10, 0.283464566929134, MM_100TH, POINT);
+doTestDouble(0.5, 0.283464566929134, MM_100TH, TWIP);
+doTestDouble(10mm, 1.0, MM, CM);
+doTestDouble(10mm, 100.0, MM, MM_10TH);
+doTestDouble(20mm, 2000.0, MM, MM_100TH);
+doTestDouble(300, 30.0, MM_10TH, MM);
+doTestDouble(400, 4.0, MM_100TH, MM);
+doTestDouble(600, 6000.0, MM_10TH, MM_100TH);
+doTestDouble(700, 70.0, MM_100TH, MM_10TH);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ConverterTest);
}
commit 62a0b2405798a3be6a4e38652f1da7a685c84bfc
Author: Michael Stahl mst...@redhat.com
Date: Fri Apr 20 18:36:16 2012 +0200
fdo#48969: GetConversionFactor: add inch as source unit
Also, add whole bunch of missing cases while at it.
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 4fe6d7f..e8fe38e 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1788,9 +1788,16 @@ double
Converter
[Libreoffice-commits] .: 5 commits - svx/source
svx/source/form/fmexpl.cxx|5 -
svx/source/form/fmshimp.cxx | 17 ++---
svx/source/form/navigatortree.cxx | 122 +-
svx/source/inc/fmexpl.hxx | 11 +--
svx/source/inc/fmshimp.hxx|7 +-
5 files changed, 85 insertions(+), 77 deletions(-)
New commits:
commit 59a51999c60127bc3ad6a36679f9ea7234bbfc8e
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 19 12:58:19 2012 +0200
svx: fix debug warnings from STL conversion
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index f76654a..648c857 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2304,7 +2304,9 @@ IMPL_LINK(FmXFormShell, OnFoundData,
FmFoundRecordInformation*, pfriWhere)
LoopGrids(GA_FORCE_SYNC);
// und zum Feld (dazu habe ich vor dem Start des Suchens die
XVclComponent-Interfaces eingesammelt)
-DBG_ASSERT(pfriWhere-nFieldPos m_arrSearchedControls.Count(),
FmXFormShell::OnFoundData : ungueltige Daten uebergeben !);
+SAL_WARN_IF(static_castsize_t(pfriWhere-nFieldPos) =
+m_arrSearchedControls.size(),
+svx.form, FmXFormShell::OnFoundData : invalid index!);
SdrObject* pObject = m_arrSearchedControls.at(pfriWhere-nFieldPos);
m_pShell-GetFormView()-UnMarkAll(m_pShell-GetFormView()-GetSdrPageView());
diff --git a/svx/source/form/navigatortree.cxx
b/svx/source/form/navigatortree.cxx
index c6d716f..bae1e49 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1639,7 +1639,9 @@ namespace svxform
return;
CollectSelectionData(SDI_ALL);
-DBG_ASSERT( m_nFormsSelected + m_nControlsSelected + (m_bRootSelected
? 1 : 0) == m_arrCurrentSelection.size(),
+SAL_WARN_IF(static_castsize_t(m_nFormsSelected + m_nControlsSelected
++ (m_bRootSelected ? 1 : 0)) != m_arrCurrentSelection.size(),
+svx.form,
NavigatorTree::ShowSelectionProperties : selection meta data
invalid !);
commit f765f52c39e79b633bbc8f1a16567572b7bf7a1a
Author: Noel Grandin n...@peralex.com
Date: Mon Apr 16 00:16:05 2012 +0200
Convert SV_DECL_PTRARR_DEL to boost::ptr_vector
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index dc33eb0..f76654a 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -4105,8 +4105,6 @@ sal_Bool SearchableControlIterator::ShouldStepInto(const
Reference XInterface
//==
//==
-SV_IMPL_PTRARR(StatusForwarderArray, SfxStatusForwarder*)
-
SFX_IMPL_MENU_CONTROL(ControlConversionMenuController, SfxBoolItem);
//--
@@ -4124,7 +4122,7 @@
ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI
{
_rBindings.Invalidate(m_pConversionMenu-GetItemId(i));
SfxStatusForwarder* pForwarder = new
SfxStatusForwarder(m_pConversionMenu-GetItemId(i), *this);
-m_aStatusForwarders.C40_INSERT(SfxStatusForwarder, pForwarder,
m_aStatusForwarders.Count());
+m_aStatusForwarders.push_back(pForwarder);
}
}
}
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 26eb304..9664b4e 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -74,6 +74,7 @@
#include queue
#include set
#include vector
+#include boost/ptr_container/ptr_vector.hpp
typedef std::vectorSdrObject* SdrObjArray;
// SV_DECL_OBJARR(FmFormArray, ::com::sun::star::uno::Reference
::com::sun::star::form::XForm, 32, 16);
@@ -584,7 +585,7 @@ public:
};
//
-SV_DECL_PTRARR_DEL(StatusForwarderArray, SfxStatusForwarder*, 16)
+typedef boost::ptr_vectorSfxStatusForwarder StatusForwarderArray;
class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl
{
protected:
commit eb13c2c5b127910367ed2dac4fd2166a6d9c8a70
Author: Noel Grandin n...@peralex.com
Date: Sun Apr 15 22:55:48 2012 +0200
Convert SV_DECL_PTRARR to std::vector
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 29a45c0..dc33eb0 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2305,8 +2305,7 @@ IMPL_LINK(FmXFormShell, OnFoundData,
FmFoundRecordInformation*, pfriWhere)
// und zum Feld (dazu habe ich vor dem Start des Suchens die
XVclComponent-Interfaces eingesammelt)
DBG_ASSERT(pfriWhere-nFieldPos m_arrSearchedControls.Count(),
FmXFormShell::OnFoundData : ungueltige Daten uebergeben !);
-SdrObject* pObject = m_arrSearchedControls.GetObject(pfriWhere-nFieldPos);
-DBG_ASSERT(pObject != NULL, FmXFormShell::OnFoundData : unerwartet :
ungueltiges VclControl-Interface
[Libreoffice-commits] .: desktop/unx
desktop/unx/source/start.c | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
New commits:
commit f92d22565d4d389b0c93d45a1995521431585694
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 19 15:00:18 2012 +0200
oosplash: improve signal handlers:
- global variable should be volatile
- signal is deprecated, use sigaction instead
- exit from the handler
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 307cd88..d1a09a7 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -766,7 +766,7 @@ exec_javaldx (Args *args)
#endif
// has to be a global :(
-oslProcess * g_pProcess = 0;
+oslProcess * volatile g_pProcess = 0;
void sigterm_handler(int ignored)
{
@@ -776,8 +776,10 @@ void sigterm_handler(int ignored)
// forward signal to soffice.bin
osl_terminateProcess(g_pProcess);
}
+_exit(255);
}
+
SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
{
int fd = 0;
@@ -787,10 +789,18 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
Args *args;
int status = 0;
struct splash* splash = NULL;
+struct sigaction sigpipe_action;
+struct sigaction sigterm_action;
/* turn SIGPIPE into an error */
-signal( SIGPIPE, SIG_IGN );
-signal( SIGTERM, sigterm_handler );
+memset(sigpipe_action, 0, sizeof(struct sigaction));
+sigpipe_action.sa_handler = SIG_IGN;
+sigemptyset(sigpipe_action.sa_mask);
+sigaction(SIGPIPE, sigpipe_action, 0);
+memset(sigterm_action, 0, sizeof(struct sigaction));
+sigterm_action.sa_handler = sigterm_handler;
+sigemptyset(sigterm_action.sa_mask);
+sigaction(SIGTERM, sigterm_action, 0);
args = args_parse ();
args-pAppPath = get_app_path( argv[0] );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6cd7aa59a8bc918f637a68df8002c4b58e9469f4 Author: Michael Stahl mst...@redhat.com Date: Thu Apr 19 16:16:07 2012 +0200 gb_LinkTarget_add_static_libs never existed diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 10dc633..d618b63 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -453,7 +453,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ ) ifneq ($(OS),WNT) ifeq ($(OS),MACOSX) -$(call gb_LinkTarget_add_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ pixman-1 \ ) else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit a34f98bdacac4bffe8cfdcd6e6459617d204cfd2 Author: Michael Stahl mst...@redhat.com Date: Thu Apr 19 16:51:40 2012 +0200 this pixman-1 thing wasn't even registered diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d618b63..26de781 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -437,9 +437,15 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ cairo \ )) ifneq ($(OS),WNT) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + pixman-1 \ +)) +else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pixman-1 \ )) +endif # MACOSX endif # WNT define gb_LinkTarget__use_cairo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 12 commits - sc/source xmloff/source
sc/source/ui/unoobj/chart2uno.cxx| 118 +--
xmloff/source/core/xmlimp.cxx| 26 ++---
xmloff/source/core/xmltkmap.cxx | 13 +-
xmloff/source/style/xmlnumfe.cxx | 24 ++---
xmloff/source/style/xmlnumfi.cxx | 49 +--
xmloff/source/style/xmlnumi.cxx | 14 +--
xmloff/source/style/xmltabi.cxx | 15 +--
xmloff/source/text/XMLTextColumnsContext.cxx | 16 +--
xmloff/source/text/txtparai.cxx | 39
9 files changed, 144 insertions(+), 170 deletions(-)
New commits:
commit e53047ade900f18ad6c6c241ddfdef715c2172fd
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 18 15:25:33 2012 +0200
loop with erase(begin()) looks sort of inefficient
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 255aa94..77a5b5b 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -72,7 +72,7 @@ struct SvXMLNumFmtEntry
aName(rN), nKey(nK), bRemoveAfterUse(bR) {}
};
-class SvXMLNumFmtEntryArr : public boost::ptr_vectorSvXMLNumFmtEntry {};
+typedef ::boost::ptr_vectorSvXMLNumFmtEntry SvXMLNumFmtEntryArr;
struct SvXMLEmbeddedElement
{
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx
b/xmloff/source/text/XMLTextColumnsContext.cxx
index e5c0750..8bb2065 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -342,11 +342,10 @@ XMLTextColumnsContext::~XMLTextColumnsContext()
{
if( pColumns )
{
-while( !pColumns-empty() )
+for (XMLTextColumnsArray_Impl::iterator it = pColumns-begin();
+it != pColumns-end(); ++it)
{
-XMLTextColumnContext_Impl *pColumn = *pColumns-begin();
-pColumns-erase( pColumns-begin() );
-pColumn-ReleaseRef();
+ (*it)-ReleaseRef();
}
}
if( pColumnSep )
commit f36861d4a367672e1ec6fc44e9367996c7cc6405
Author: Noel Grandin n...@peralex.com
Date: Sun Apr 15 00:28:11 2012 +0200
Convert SV_DECL_PTRARR_SORT_DEL to boost::ptr_set
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index d9f291a..f85ba87 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -30,6 +30,7 @@
#include svl/svarray.hxx
#include xmloff/xmltkmap.hxx
#include xmloff/xmltoken.hxx
+#include boost/ptr_container/ptr_set.hpp
using namespace ::xmloff::token;
@@ -72,9 +73,7 @@ public:
}
};
-typedef SvXMLTokenMapEntry_Impl *SvXMLTokenMapEntry_ImplPtr;
-SV_DECL_PTRARR_SORT_DEL( SvXMLTokenMap_Impl, SvXMLTokenMapEntry_ImplPtr, 5 )
-SV_IMPL_OP_PTRARR_SORT( SvXMLTokenMap_Impl, SvXMLTokenMapEntry_ImplPtr )
+class SvXMLTokenMap_Impl : public boost::ptr_setSvXMLTokenMapEntry_Impl {};
// -
@@ -84,10 +83,10 @@ SvXMLTokenMapEntry_Impl *SvXMLTokenMap::_Find( sal_uInt16
nKeyPrefix,
SvXMLTokenMapEntry_Impl *pRet = 0;
SvXMLTokenMapEntry_Impl aTst( nKeyPrefix, rLName );
-sal_uInt16 nPos;
-if( pImpl-Seek_Entry( aTst, nPos ) )
+SvXMLTokenMap_Impl::iterator it = pImpl-find( aTst );
+if( it != pImpl-end() )
{
-pRet = (*pImpl)[nPos];
+pRet = *it;
}
return pRet;
@@ -98,7 +97,7 @@ SvXMLTokenMap::SvXMLTokenMap( const SvXMLTokenMapEntry *pMap
) :
{
while( pMap-eLocalName != XML_TOKEN_INVALID )
{
-pImpl-Insert( new SvXMLTokenMapEntry_Impl( *pMap ) );
+pImpl-insert( new SvXMLTokenMapEntry_Impl( *pMap ) );
pMap++;
}
}
commit b06d5cc4c234e3495833263192e694c0e9fc0533
Author: Noel Grandin n...@peralex.com
Date: Sun Apr 15 00:16:52 2012 +0200
Convert SV_DECL_PTRARR_SORT_DEL to boost:ptr_set
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 3bb00d1..255aa94 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -52,6 +52,7 @@
#include xmloff/xmltoken.hxx
#include boost/ptr_container/ptr_vector.hpp
+#include boost/ptr_container/ptr_set.hpp
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
@@ -86,8 +87,7 @@ struct SvXMLEmbeddedElement
sal_Bool operator ( const SvXMLEmbeddedElement r ) const { return
nFormatPos r.nFormatPos; }
};
-typedef SvXMLEmbeddedElement* SvXMLEmbeddedElementPtr;
-SV_DECL_PTRARR_SORT_DEL( SvXMLEmbeddedElementArr, SvXMLEmbeddedElementPtr, 0 )
+typedef boost::ptr_setSvXMLEmbeddedElement SvXMLEmbeddedElementArr;
//-
@@ -380,10 +380,6 @@ static SvXMLDefaultDateFormat aDefaultDateFormats[] =
//-
-SV_IMPL_OP_PTRARR_SORT( SvXMLEmbeddedElementArr, SvXMLEmbeddedElementPtr
[Libreoffice-commits] .: 2 commits - binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
binfilter/bf_starmath/source/starmath_register.cxx|2
binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx |1
binfilter/bf_svtools/source/items/svt_macitem.cxx |1
binfilter/bf_svtools/source/memtools/makefile.mk |1
binfilter/bf_svtools/source/memtools/tl_contnr.cxx| 81
binfilter/bf_svtools/source/memtools/tl_table.cxx | 363 ++
binfilter/bf_svtools/source/misc/svt_imap.cxx |1
binfilter/bf_svtools/source/misc/svt_urihelper.cxx|1
binfilter/bf_svtools/source/misc1/svt_inettype.cxx|2
binfilter/bf_svtools/source/uno/svt_unoevent.cxx |1
binfilter/bf_svtools/source/uno/svt_unoimap.cxx |1
binfilter/bf_svx/source/editeng/editdoc.hxx |1
binfilter/bf_sw/source/core/text/inftxt.hxx |2
binfilter/inc/bf_sc/chgtrack.hxx |2
binfilter/inc/bf_sch/schopt.hxx |2
binfilter/inc/bf_sfx2/objsh.hxx |2
binfilter/inc/bf_svtools/macitem.hxx |2
binfilter/inc/bf_svtools/zforlist.hxx |2
binfilter/inc/bf_svx/forbiddencharacterstable.hxx |2
binfilter/inc/bf_svx/svdmodel.hxx |2
binfilter/inc/bf_svx/xtable.hxx |1
binfilter/inc/bf_sw/hints.hxx |2
binfilter/inc/bf_tools/contnr.hxx |9
binfilter/inc/bf_tools/table.hxx | 153 +++
24 files changed, 617 insertions(+), 20 deletions(-)
New commits:
commit 319d686449ecf259763137d98e7ac2ce16701a28
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 18 16:23:24 2012 +0200
move tools/table.hxx to binfilter
diff --git a/binfilter/bf_starmath/source/starmath_register.cxx
b/binfilter/bf_starmath/source/starmath_register.cxx
index d2461ed..1f32129 100644
--- a/binfilter/bf_starmath/source/starmath_register.cxx
+++ b/binfilter/bf_starmath/source/starmath_register.cxx
@@ -35,8 +35,6 @@
#include cppuhelper/factory.hxx
-#include tools/table.hxx
-
namespace binfilter {
using namespace ::rtl;
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
index 92e47a0..f109375 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -40,7 +40,6 @@
#include sot/object.hxx
#include boost/shared_ptr.hpp
#include tools/debug.hxx
-#include tools/table.hxx
#include vcl/graph.hxx
#include vcl/virdev.hxx
#include tools/poly.hxx
diff --git a/binfilter/bf_svtools/source/items/svt_macitem.cxx
b/binfilter/bf_svtools/source/items/svt_macitem.cxx
index 3b2a7f6..8244278 100644
--- a/binfilter/bf_svtools/source/items/svt_macitem.cxx
+++ b/binfilter/bf_svtools/source/items/svt_macitem.cxx
@@ -27,7 +27,6 @@
/
#include tools/stream.hxx
-#include tools/table.hxx
#include bf_svtools/macitem.hxx
diff --git a/binfilter/bf_svtools/source/memtools/makefile.mk
b/binfilter/bf_svtools/source/memtools/makefile.mk
index 24aaa10..112b16b 100644
--- a/binfilter/bf_svtools/source/memtools/makefile.mk
+++ b/binfilter/bf_svtools/source/memtools/makefile.mk
@@ -40,6 +40,7 @@ INC+= -I$(PRJ)$/inc$/bf_svtools
SLOFILES=\
$(SLO)$/svt_svarray.obj \
$(SLO)$/tl_contnr.obj \
+$(SLO)$/tl_table.obj \
$(SLO)$/tl_unqidx.obj
# --- Targets ---
diff --git a/binfilter/bf_svtools/source/memtools/tl_table.cxx
b/binfilter/bf_svtools/source/memtools/tl_table.cxx
new file mode 100644
index 000..2b9d27f
--- /dev/null
+++ b/binfilter/bf_svtools/source/memtools/tl_table.cxx
@@ -0,0 +1,363 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy
[Libreoffice-commits] .: basctl/source tools/Library_tl.mk tools/Package_inc.mk tools/inc tools/source
basctl/source/basicide/baside2.hxx |2
tools/Library_tl.mk|1
tools/Package_inc.mk |1
tools/inc/tools/table.hxx | 148 ---
tools/source/memtools/table.cxx| 358 -
5 files changed, 510 deletions(-)
New commits:
commit d85b7f1548cbf0091812fcec1f9a37e1220de4a9
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 18 16:51:56 2012 +0200
move tools/table.hxx to binfilter
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index a274eec..bae4730 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -57,8 +57,6 @@ class SvxSearchItem;
#include objdlg.hxx
#include set
-#include tools/table.hxx
-
DBG_NAMEEX( ModulWindow )
#define MARKER_NOMARKER 0x
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 2571031..975574f 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -88,7 +88,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/memtools/contnr \
tools/source/memtools/mempool \
tools/source/memtools/multisel \
-tools/source/memtools/table \
tools/source/memtools/unqidx \
tools/source/misc/appendunixshellword \
tools/source/misc/extendapplicationenvironment \
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index b4765f9..46b829f 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -83,7 +83,6 @@ $(eval $(call
gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hx
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx))
-$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx))
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx))
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
diff --git a/tools/inc/tools/table.hxx b/tools/inc/tools/table.hxx
deleted file mode 100644
index ec6927e..000
--- a/tools/inc/tools/table.hxx
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef _TOOLS_TABLE_HXX
-#define _TOOLS_TABLE_HXX
-
-#include tools/toolsdllapi.h
-#include tools/solar.h
-#include tools/contnr.hxx
-
-// -
-// - Table -
-// -
-
-#define TABLE_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
-
-class TOOLS_DLLPUBLIC Table : private Container
-{
-private:
-sal_uIntPtr nCount;
-TOOLS_DLLPRIVATE sal_uIntPtrImplGetIndex( sal_uIntPtr nKey,
sal_uIntPtr* pIndex = NULL ) const;
-public:
-Table( sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 );
-Table( const Table rTable ) : Container( rTable )
-{ nCount = rTable.nCount; }
-
-sal_BoolInsert( sal_uIntPtr nKey, void* p );
-void* Remove( sal_uIntPtr nKey );
-void* Replace( sal_uIntPtr nKey, void* p );
-void* Get( sal_uIntPtr nKey ) const;
-
-voidClear() { Container::Clear(); nCount = 0; }
-sal_uIntPtr Count() const { return( nCount ); }
-
-void* GetCurObject() const;
-sal_uIntPtr GetCurKey() const { return
(sal_uIntPtr)Container::GetCurObject(); }
-sal_uIntPtr GetKey( const void* p ) const;
-sal_BoolIsKeyValid( sal_uIntPtr nKey ) const;
-
-void* GetObject( sal_uIntPtr nPos ) const
-{ return Container::GetObject( (nPos*2)+1 ); }
-sal_uIntPtr GetObjectKey( sal_uIntPtr nPos ) const
-{ return (sal_uIntPtr)Container
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 22 ++ 1 file changed, 16 insertions(+), 6 deletions(-) New commits: commit 49bd0e4e6bb0ed0671de72d84700ddcc49828f69 Author: Michael Stahl mst...@redhat.com Date: Wed Apr 18 22:15:19 2012 +0200 fdo#48647: drawinglayer: fix double hairline borders: Clipping the border polygon to the region defined by the Extends is sufficient to create a nice looking 1 twip double border in Writer. (regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2) diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index 1834d36..86f58d6 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -114,9 +114,14 @@ namespace drawinglayer aLeft.append(aTmpStart); aLeft.append(aTmpEnd); -xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( -aLeft, -getRGBColorLeft())); +basegfx::B2DPolyPolygon const aClipped = +basegfx::tools::clipPolygonOnPolyPolygon( +aLeft, aClipRegion, true, true); + +xRetval[nInsert++] = +new PolyPolygonHairlinePrimitive2D( +aClipped, +getRGBColorLeft()); aGap.append( getStart() - getExtendLeftStart() * aVector ); aGap.append( getEnd() + getExtendLeftEnd() * aVector ); @@ -159,9 +164,14 @@ namespace drawinglayer aRight.append(aTmpStart); aRight.append(aTmpEnd); -xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( -aRight, -getRGBColorRight())); +basegfx::B2DPolyPolygon const aClipped = +basegfx::tools::clipPolygonOnPolyPolygon( +aRight, aClipRegion, true, true); + +xRetval[nInsert++] = +new PolyPolygonHairlinePrimitive2D( +aClipped, +getRGBColorRight()); aGap.append( getStart() - getExtendRightStart() * aVector ); aGap.append( getEnd() + getExtendRightEnd() * aVector ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_tools/table.hxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit baafe1cf57fa101e6308ed9f60cf0be46d3c22d8
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 18 23:12:58 2012 +0200
table.hxx: oops, forgot TOOLS_DLLPUBLIC in there
diff --git a/binfilter/inc/bf_tools/table.hxx b/binfilter/inc/bf_tools/table.hxx
index e39b334..89d61af 100644
--- a/binfilter/inc/bf_tools/table.hxx
+++ b/binfilter/inc/bf_tools/table.hxx
@@ -28,7 +28,6 @@
#ifndef _TOOLS_TABLE_HXX
#define _TOOLS_TABLE_HXX
-#include tools/toolsdllapi.h
#include tools/solar.h
#include bf_tools/contnr.hxx
@@ -41,11 +40,11 @@ namespace binfilter
#define TABLE_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
-class TOOLS_DLLPUBLIC Table : private Container
+class Table : private Container
{
private:
sal_uIntPtr nCount;
-TOOLS_DLLPRIVATE sal_uIntPtrImplGetIndex( sal_uIntPtr nKey,
sal_uIntPtr* pIndex = NULL ) const;
+SAL_DLLPRIVATE sal_uIntPtrImplGetIndex( sal_uIntPtr nKey, sal_uIntPtr*
pIndex = NULL ) const;
public:
Table( sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 );
Table( const Table rTable ) : Container( rTable )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/layout/paintfrm.cxx | 20 1 file changed, 16 insertions(+), 4 deletions(-) New commits: commit b08e9f3023e9ea1ca0926334becac939ca8fdfac Author: Michael Stahl mst...@redhat.com Date: Tue Apr 17 22:30:25 2012 +0200 fdo#38635: sw: fix border corner gaps: The start and end points of the vertical and adjacent horizontal borders were apart by 1.5 to 3 twips, leading to small visible gaps in the corners. This is fixed by using lcl_AlignWidth/lcl_AlignHeight on the border widths, and by always computing the start/end positions from the outer edge, which makes the horizontal and vertical start/end points match. (regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 1c09c4d..03e9731 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -4616,8 +4616,13 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, nExtentOE = lcl_GetExtent( pBottomBorder, NULL ); } -basegfx::B2DPoint aStart( aRect.Left() + aRect.Width() / 2.0, aRect.Top() + lcl_GetLineWidth( pTopBorder ) / 2.0 ); -basegfx::B2DPoint aEnd( aRect.Left() + aRect.Width() / 2.0, aRect.Bottom() - lcl_GetLineWidth( pBottomBorder ) / 2.0 ); +double const fStartX( (_bLeft) // fdo#38635: always from outer edge +? aRect.Left() + (aRect.Width() / 2.0) +: aRect.Right() - (aRect.Width() / 2.0)); +basegfx::B2DPoint const aStart(fStartX, +aRect.Top() + lcl_AlignHeight(lcl_GetLineWidth(pTopBorder))/2.0 ); +basegfx::B2DPoint const aEnd(fStartX, +aRect.Bottom() - lcl_AlignHeight(lcl_GetLineWidth(pBottomBorder))/2.0 ); double nLeftWidth = !_bLeft ? pLeftRightBorder-GetOutWidth() : pLeftRightBorder-GetInWidth( ); double nRightWidth = !_bLeft ? pLeftRightBorder-GetInWidth() : pLeftRightBorder-GetOutWidth( ); @@ -4691,8 +4696,15 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop, nExtentOE = lcl_GetExtent( NULL, pRightBorder ); } -basegfx::B2DPoint aStart( aRect.Left() + lcl_GetLineWidth( pLeftBorder ) / 2.0, aRect.Top() + aRect.Height() / 2.0 ); -basegfx::B2DPoint aEnd( aRect.Right() - lcl_GetLineWidth( pRightBorder ) / 2.0, aRect.Top() + aRect.Height() / 2.0 ); +double const fStartY( (_bTop) // fdo#38635: always from outer edge +? aRect.Top()+ (aRect.Height() / 2.0) +: aRect.Bottom() - (aRect.Height() / 2.0)); +basegfx::B2DPoint const aStart( +aRect.Left() + lcl_AlignWidth(lcl_GetLineWidth(pLeftBorder))/2.0, +fStartY ); +basegfx::B2DPoint const aEnd( +aRect.Right() - lcl_AlignWidth(lcl_GetLineWidth(pRightBorder))/2.0, +fStartY ); double nLeftWidth = !_bTop ? pTopBottomBorder-GetOutWidth() : pTopBottomBorder-GetInWidth( ); double nRightWidth = !_bTop ? pTopBottomBorder-GetInWidth() : pTopBottomBorder-GetOutWidth( ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/filter/html/htmlex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c5285699162ad2888c7df015cdf035ab5bf00379
Author: Michael Stahl mst...@redhat.com
Date: Mon Apr 16 13:03:04 2012 +0200
C++ overloading is clearly the best invention ever
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 6b58bab..57df9d4 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2050,7 +2050,7 @@ bool HtmlExport::CreateOutlinePages()
}
// Seite 0 wird der zugeklappte Outline, Seite 1 der aufgeklappte
-for( int nPage = 0; nPage (mbImpress?2:1) bOk; nPage++ )
+for (sal_Int32 nPage = 0; nPage (mbImpress?2:1) bOk; ++nPage)
{
// Html Kopf
String aStr(maHTMLHeader);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sw/source
sw/source/core/layout/paintfrm.cxx | 231 ++---
1 file changed, 142 insertions(+), 89 deletions(-)
New commits:
commit 502c93143ef29989692ca3e63e3e6abc255fd53f
Author: Michael Stahl mst...@redhat.com
Date: Mon Apr 16 16:12:39 2012 +0200
fdo#38635: fix border printing:
Apparently this special case in lcl_PaintLeftRightLine for printer
output devices is no longer necessary with the new drawing layer borders
and causes the vertical border lines to be far too short, leading to
visible gaps in the PDF.
(regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2)
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 1fbe09c..255cf14 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4595,73 +4595,6 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
if ( _rAttrs.JoinedWithNext( _rFrm ) ) pBottomBorder = NULL;
}
-// OD 06.05.2003 #107169# - adjustments for printer output device
-if ( bPrtOutputDev )
-{
-// substract width of outer top line.
-if ( rBox.GetTop() (!bCnt || _rAttrs.GetTopLine( _rFrm )) )
-{
-long nDist = ::lcl_AlignHeight( rBox.GetTop()-GetOutWidth() );
-(aRect.*_rRectFn-fnSubTop)( -nDist );
-// OD 19.05.2003 #109667# - If outer top line is hair line,
calculated
-// top has to be adjusted.
-if ( nDist == 1 )
-{
-if ( _rFrm.IsVertical() )
-{
-// right of border rectangle has to be checked and adjusted
-Point aCompPt( aRect.Right(), 0 );
-Point aRefPt( aCompPt.X() + 1, aCompPt.Y() );
-lcl_CompPxPosAndAdjustPos( *(pGlobalShell-GetOut()),
- aRefPt, aCompPt,
- sal_True, -1 );
-aRect.Right( aCompPt.X() );
-}
-else
-{
-// top of border rectangle has to be checked and adjusted
-Point aCompPt( 0, aRect.Top() );
-Point aRefPt( aCompPt.X(), aCompPt.Y() - 1 );
-lcl_CompPxPosAndAdjustPos( *(pGlobalShell-GetOut()),
- aRefPt, aCompPt,
- sal_False, +1 );
-aRect.Top( aCompPt.Y() );
-}
-}
-}
-// substract width of outer bottom line.
-if ( rBox.GetBottom() (!bCnt || _rAttrs.GetBottomLine( _rFrm )) )
-{
-long nDist = ::lcl_AlignHeight( rBox.GetBottom()-GetOutWidth());
-(aRect.*_rRectFn-fnAddBottom)( -nDist );
-// OD 19.05.2003 #109667# - If outer bottom line is hair line,
calculated
-// top has to be adjusted.
-if ( nDist == 1 )
-{
-if ( _rFrm.IsVertical() )
-{
-// left of border rectangle has to be checked and adjusted
-Point aCompPt( aRect.Left(), 0 );
-Point aRefPt( aCompPt.X() - 1, aCompPt.Y() );
-lcl_CompPxPosAndAdjustPos( *(pGlobalShell-GetOut()),
- aRefPt, aCompPt,
- sal_True, +1 );
-aRect.Left( aCompPt.X() );
-}
-else
-{
-// bottom of border rectangle has to be checked and
adjusted
-Point aCompPt( 0, aRect.Bottom() );
-Point aRefPt( aCompPt.X(), aCompPt.Y() + 1 );
-lcl_CompPxPosAndAdjustPos( *(pGlobalShell-GetOut()),
- aRefPt, aCompPt,
- sal_False, -1 );
-aRect.Bottom( aCompPt.Y() );
-}
-}
-}
-}
-
if ( !pLeftRightBorder-GetInWidth() )
{
// OD 06.05.2003 #107169# - add 6th parameter
commit 0868a0155a2b57daf7b862d120aead0458372b17
Author: Michael Stahl mst...@redhat.com
Date: Mon Apr 16 16:12:36 2012 +0200
fdo#38215: merge consecutive border lines:
This re-implements the merging that was done by SwLineRects::AddLineRect,
SwLineRect::MakeUnion with the drawing layer border lines.
This is used to merge borders of paragraphs and of tables that have the
separating border-model, which fixes both the tiny dividing gaps
between successive borders in the second bugdoc and the weird subtly
differently rendered successive borders in the first bugdoc.
(regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2)
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index ba22f6f
[Libreoffice-commits] .: sw/source
sw/source/core/layout/paintfrm.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 44092833d3a0f0d6074c64bd0e64bbdf11109afe
Author: Michael Stahl mst...@redhat.com
Date: Mon Apr 16 16:34:21 2012 +0200
fdo#38215: forgot idiotic C++ syntax (fix 0868a0155a)
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 255cf14..1c09c4d 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -500,7 +500,7 @@ lcl_TryMergeBorderLine(BorderLinePrimitive2D const rThis,
if (rThis.getStart().getX() == rOther.getStart().getX())
{
assert(rThis.getEnd().getX() == rOther.getEnd().getX());
-pairbool, pairdouble, double const res = lcl_TryMergeLines(
+pairbool, pairdouble, double const res =
lcl_TryMergeLines(
make_pair(rThis.getStart().getY(), rThis.getEnd().getY()),
make_pair(rOther.getStart().getY(),rOther.getEnd().getY()));
if (res.first) // merge them
@@ -518,7 +518,7 @@ lcl_TryMergeBorderLine(BorderLinePrimitive2D const rThis,
if (rThis.getStart().getY() == rOther.getStart().getY())
{
assert(rThis.getEnd().getY() == rOther.getEnd().getY());
-pairbool, pairdouble, double const res = lcl_TryMergeLines(
+pairbool, pairdouble, double const res =
lcl_TryMergeLines(
make_pair(rThis.getStart().getX(), rThis.getEnd().getX()),
make_pair(rOther.getStart().getX(),rOther.getEnd().getX()));
if (res.first) // merge them
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/cppunittester
sal/cppunittester/cppunittester.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3c854f6d316ddd7a3ddf85a148a8cf2e0c047e50 Author: Michael Stahl mst...@redhat.com Date: Fri Apr 13 18:31:26 2012 +0200 WaE: initialization order diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 7886c80..6cae612 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -118,8 +118,8 @@ class CPPUNIT_API ProtectedFixtureFunctor private: const std::string testlib; const std::string args; -CppUnit::TestResult result; std::vectorCppUnit::Protector * protectors; +CppUnit::TestResult result; public: ProtectedFixtureFunctor(const std::string testlib_, const std::string args_, std::vectorCppUnit::Protector* protectors_, CppUnit::TestResult result_) : testlib(testlib_) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - solenv/gbuild sw/inc sw/source
solenv/gbuild/UnoApiTarget.mk |6 +++---
sw/inc/editsh.hxx |1 -
sw/source/core/edit/edattr.cxx |1 +
sw/source/ui/shells/textsh1.cxx |8 +---
4 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 37af4b002422f889ceecc21474a4b049f516b72e
Author: Aldo Román Nureña aldo.roman.nur...@gmail.com
Date: Sun Apr 8 23:39:12 2012 -0500
fdo#35042: previous color applied instead of no fill
There was a missing line when last select highlight color was no fill
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 1e8ef39..9cb232b 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1120,15 +1120,17 @@ void SwTextShell::Execute(SfxRequest rReq)
if(pItem)
{
aSet = ((const SvxColorItem*)pItem)-GetValue();
-rEdtWin.SetTextBackColor(aSet);
+rEdtWin.SetTextBackColor(aSet); //select last color
}
+else
+rEdtWin.SetTextBackColor(Color(COL_TRANSPARENT)); //if last
was no fill
if(!pApply (rWrtSh.HasSelection() || rReq.IsAPI()))
{
SvxBrushItem aBrushItem(RES_CHRATR_BACKGROUND);
if(pItem)
-aBrushItem.SetColor(aSet);
+aBrushItem.SetColor(aSet); //set the selected color
else
-aBrushItem.SetColor(Color(COL_TRANSPARENT));
+aBrushItem.SetColor(Color(COL_TRANSPARENT));//set no
fill color
rWrtSh.SetAttr( aBrushItem );
}
else if(!pApply || pApply-nColor !=
SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
commit 2dca19256f28b04aed07c63f10ba07c16ff81542
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 10 13:03:01 2012 +0200
move include out of editsh.hxx
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 051d39a..ecb77d5 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -44,7 +44,6 @@
#include tblenum.hxx
#include IMark.hxx
-#include algorithm
#include vector
#include set
#include swundo.hxx
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 8ccb5d3..d2b7a70 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -56,6 +56,7 @@
#include charfmt.hxx // #i27615#
#include numrule.hxx
+#include algorithm
/*
* harte Formatierung (Attribute)
commit 7042f9bc5b4bdf64555ce7313425702594cdb7e2
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 10 12:00:31 2012 +0200
UnoApiTarget.mk: whitespace
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 02d2391..64ed831 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -196,7 +196,7 @@ $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) :| \
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES += $(2)/$(3).idl
$(call gb_UnoApiTarget_get_dep_target,$(1)) : \
- $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))
+ $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))
$(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) : \
$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done)
endif
@@ -301,10 +301,10 @@ $(call gb_UnoApiHeadersTarget_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs_native,\
rm -rf \
$(call gb_UnoApiHeadersTarget_get_dir,$*) \
- $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \
+ $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \
$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*)
\
$(call gb_UnoApiHeadersTarget_get_target,$*) \
- $(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*))
\
+ $(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*))
\
$(call
gb_UnoApiHeadersTarget_get_comprehensive_target,$*)
define gb_UnoApiHeadersTarget_UnoApiHeadersTarget
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - oovbaapi/ttt.diff sw/CppunitTest_sw_regression_test.mk sw/source
oovbaapi/ttt.diff| 410 ---
sw/CppunitTest_sw_regression_test.mk |4
sw/source/core/layout/paintfrm.cxx | 20 +
3 files changed, 20 insertions(+), 414 deletions(-)
New commits:
commit 5913506b2193e93ca2767ab7365ab2e76ed7848f
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 4 22:35:08 2012 +0200
fdo#45562: paint borders in SwFlyFrm::Paint:
Painting borders of Flys in the heaven layer cannot be done correctly in
SwRootFrm::Paint, because delaying until then paints over other drawing
objects that are on top of the frame, so do it in SwFlyFrm::Paint,
like the old border painting code used to.
(regression from 804d0a896731629397c5328c13c04a45bc55f459)
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index bac034e..80ec5a1 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3025,8 +3025,6 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) const
if ( bExtraData )
pPage-RefreshExtraData( aPaintRect );
-// have to paint frame borders added in heaven layer here...
-ProcessPrimitives(g_pBorderLines-GetBorderLines_Clear());
DELETEZ(g_pBorderLines);
pVout-Leave();
@@ -3741,12 +3739,28 @@ void SwCellFrm::Paint(SwRect const rRect, SwPrintData
const*const) const
void MA_FASTCALL lcl_PaintLowerBorders( const SwLayoutFrm *pLay,
const SwRect rRect, const SwPageFrm *pPage );
+struct BorderLinesGuard
+{
+explicit BorderLinesGuard() : m_pBorderLines(g_pBorderLines)
+{
+g_pBorderLines = new BorderLines;
+}
+~BorderLinesGuard()
+{
+delete g_pBorderLines;
+g_pBorderLines = m_pBorderLines;
+}
+private:
+BorderLines *const m_pBorderLines;
+};
+
void SwFlyFrm::Paint(SwRect const rRect, SwPrintData const*const) const
{
//because of the overlapping of frames and drawing objects the flys have to
//paint their borders (and those of the internal ones) directly.
//e.g. #33066#
pLines-LockLines(sal_True);
+BorderLinesGuard blg; // this should not paint borders added from PaintBaBo
SwRect aRect( rRect );
aRect._Intersection( Frm() );
@@ -3957,6 +3971,8 @@ void SwFlyFrm::Paint(SwRect const rRect, SwPrintData
const*const) const
// and then unlock other lines.
pLines-PaintLines( pOut );
pLines-LockLines( sal_False );
+// have to paint frame borders added in heaven layer here...
+ProcessPrimitives(g_pBorderLines-GetBorderLines_Clear());
pOut-Pop();
commit 6e8cbfc63a30c3924d61e22d9cdf43ede78ee288
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 5 12:10:34 2012 +0200
sw: remove more silly realpath from makefile
diff --git a/sw/CppunitTest_sw_regression_test.mk
b/sw/CppunitTest_sw_regression_test.mk
index ca83d32..27b9c07 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -71,8 +71,8 @@ $(eval $(call
gb_CppunitTest_add_linked_libs,sw_regression_test, \
))
$(eval $(call gb_CppunitTest_set_include,sw_regression_test,\
--I$(realpath $(SRCDIR)/sw/source/ui/inc) \
--I$(realpath $(SRCDIR)/sw/inc) \
+-I$(SRCDIR)/sw/source/ui/inc \
+-I$(SRCDIR)/sw/inc \
$$(INCLUDE) \
))
commit cd546c166ed5ec72f97994f2eddf292e06bbb052
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 5 12:09:57 2012 +0200
oovbaapi: remove bogus ttt.diff
diff --git a/oovbaapi/ttt.diff b/oovbaapi/ttt.diff
deleted file mode 100644
index 4af8d1f..000
--- a/oovbaapi/ttt.diff
+++ /dev/null
@@ -1,410 +0,0 @@
-diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile
-new file mode 100644
/dev/null
-+++ b/oovbaapi/Makefile
-@@ -0,0 +1,38 @@
-+#*
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# http://www.openoffice.org/license.html
-+# for a copy of the LGPLv3 License
[Libreoffice-commits] .: 2 commits - sfx2/source shell/source
sfx2/source/dialog/filedlghelper.cxx | 11 ++-
shell/source/win32/shlxthandler/propsheets/makefile.mk |2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit dc2fe18e95731dcb7c9e2027f45fdaf265490592
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 5 18:09:41 2012 +0200
fdo#43895 lp#905355: fix the fix so it doesn't crash
rtl::OUString rtl::OUString::copy(sal_Int32) const: Assertion
`beginIndex = 0 beginIndex = getLength()' failed.
(regression from dd2fe95cce75f1157bd1c75d286a0047b2e4175e)
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 0018912..37a2f29 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1641,8 +1641,17 @@ void FileDialogHelper_Impl::getRealFilter( String
_rFilter ) const
void FileDialogHelper_Impl::verifyPath()
{
#ifdef UNX
+static char const s_FileScheme[] = file://;
+if (0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
+maPath.getStr(), maPath.getLength(),
+s_FileScheme, RTL_CONSTASCII_LENGTH(s_FileScheme)))
+{
+return;
+}
+const OString sFullPath = OUStringToOString(
+maPath.copy(RTL_CONSTASCII_LENGTH(s_FileScheme)) + maFileName,
+osl_getThreadTextEncoding() );
struct stat aFileStat;
-const OString sFullPath = OUStringToOString(
maPath.copy(RTL_CONSTASCII_LENGTH(file://)) + maFileName,
osl_getThreadTextEncoding() );
stat( sFullPath.getStr(), aFileStat );
// lp#905355, fdo#43895
// Check that the file has read only permission and is in /tmp -- this is
commit d564c79e6d0780882845a28d8ab32f9eb3dee03b
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 5 12:59:37 2012 +0200
shell: fix silly flags from 2c5a817591
diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk
b/shell/source/win32/shlxthandler/propsheets/makefile.mk
index 1d67510..08adff7 100644
--- a/shell/source/win32/shlxthandler/propsheets/makefile.mk
+++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk
@@ -41,7 +41,7 @@ CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE
-D_WIN32_IE=0x501
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE
-D_NTSDK -DUNICODE -D_UNICODE
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-CDEFS_X64+=-U_WIN32_IE -D_WIN32_WINNT=0x0501 -U_WIN32_WINNT -D_WIN32_IE=0x501
+CDEFS_X64+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501
.ENDIF
.IF $(SYSTEM_ZLIB) == YES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - vcl/inc vcl/source writerfilter/source
vcl/inc/graphite_layout.hxx|4 +-
vcl/source/glyphs/graphite_layout.cxx | 46 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 18 ++---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 -
4 files changed, 32 insertions(+), 38 deletions(-)
New commits:
commit 5fa13451520a3e7e291611b47a151f770eaf3314
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Apr 4 11:04:45 2012 +0200
fdo#48104 fix RTF import of \page in inner groups
If we have a postponed page break and it's sent to dmapper during a new
inner group, we'll still have the page break request after the parser
state is popped, leading to duplicated page breaks. Instead of the
earlier workaround, just send the proper token to the domain mapper, and
it'll handle it properly.
(backport of 7b58fc3dafc789aa55fff5ffef6ab83c3aa8b6e0)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ef4d3b8..9600414 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -304,7 +304,6 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
m_bFormField(false),
m_bWasInFrame(false),
m_bIsInFrame(false),
-m_bHasPage(false),
m_aUnicodeBuffer(),
m_aHexBuffer()
{
@@ -432,7 +431,6 @@ void RTFDocumentImpl::checkNeedPap()
{
dispatchSymbol(RTF_PAR);
m_bNeedPap = false;
-
m_aStates.top().aParagraphSprms.erase(NS_sprm::LN_PFPageBreakBefore);
}
Mapper().props(pParagraphProperties);
if (hasBreakBeforeFrame)
@@ -1377,12 +1375,6 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
m_bWasInFrame = inFrame();
if (!m_bWasInFrame)
m_bNeedPar = false;
-if (m_bHasPage)
-{
-// this has to be reset even without a pard, since it's a
symbol in RTF terms
-
m_aStates.top().aParagraphSprms.erase(NS_sprm::LN_PFPageBreakBefore);
-m_bHasPage = false;
-}
}
break;
case RTF_SECT:
@@ -1505,10 +1497,10 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
break;
case RTF_PAGE:
{
-RTFValue::Pointer_t pValue(new RTFValue(1));
-dispatchSymbol(RTF_PAR);
-
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PFPageBreakBefore,
pValue));
-m_bHasPage = true;
+sal_uInt8 sBreak[] = { 0xc };
+Mapper().text(sBreak, 1);
+if (!m_bNeedPap)
+parBreak();
}
break;
default:
@@ -1713,7 +1705,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_KEEP: if (m_pCurrentBuffer != m_aTableBuffer) nParam =
NS_sprm::LN_PFKeep; break;
case RTF_KEEPN: if (m_pCurrentBuffer != m_aTableBuffer) nParam =
NS_sprm::LN_PFKeepFollow; break;
case RTF_INTBL: m_pCurrentBuffer = m_aTableBuffer; nParam =
NS_sprm::LN_PFInTable; break;
-case RTF_PAGEBB: nParam = NS_sprm::LN_PFPageBreakBefore; m_bHasPage =
false; break;
+case RTF_PAGEBB: nParam = NS_sprm::LN_PFPageBreakBefore; break;
default: break;
}
if (nParam = 0)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 3644375..4a28e62 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -450,8 +450,6 @@ namespace writerfilter {
bool m_bWasInFrame;
/// If a frame start token is already sent to dmapper (nesting
them is not OK).
bool m_bIsInFrame;
-/// If we should reset the page break property when we start
the next paragraph.
-bool m_bHasPage;
// Unicode characters are collected here so we don't have to
send them one by one.
rtl::OUStringBuffer m_aUnicodeBuffer;
/// Same for hex characters.
commit 3c6b299634b7b08a54b203d984192e1f7bcf9cf3
Author: Martin Hosken martin_hos...@sil.org
Date: Wed Apr 4 14:44:33 2012 +0700
Fix cursor movement in graphite fonts
(cherry picked from commit 9b6b1558a3654625ce9a5bef2bee5245db81ff88)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index c6c711d..838c32d 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -163,9 +163,9 @@ private:
void expandOrCondense(ImplLayoutArgs rArgs);
voidfillFrom(gr_segment * rSeg, ImplLayoutArgs rArgs, float
fScaling
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/layout/flowfrm.cxx | 49 +++
sw/source/core/text/txtfly.cxx| 118 ++
2 files changed, 81 insertions(+), 86 deletions(-)
New commits:
commit 3fd17063706df98b1606f7a5426019ce8f1db201
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 4 14:46:35 2012 +0200
flowfrm.cxx: tweak comment translation
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index ed88edc..51fa1be 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -313,28 +313,26 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm
*pPage, const SwRect rRe
// it's reasonable to relocate and test-format (2).
//
// Bit 1 in this case means that there are objects anchored to myself,
-// bit 2 means that I have to avoid other objects.
+// bit 2 means that I have to evade other objects.
-// If a SurroundObj that desires to be wrapped around overlaps with the
Rect,
-// it's required to float (because we can't guess the relationships).
+// If a SurroundObj that desires to be wrapped around overlaps with the
+// Rect, it's required to flow (because we can't guess the relationships).
// However it's possible for a test formatting to happen.
-//
-// If the SurroundObj is a Fly and I'm a Lower, or the Fly is a lower of
+// If the SurroundObj is a Fly and I'm a Lower, or the Fly is a Lower of
// mine, then it doesn't matter.
-//
// If the SurroundObj is anchored in a character bound Fly, and I'm not
// a Lower of that character bound Fly myself, then the Fly doesn't matter.
-//#32639# If the object is anchored with me, i can neglect it, because
-//it's likely that it will follow the flow. A test formatting is not
-//allowed in that case, however!
+// #32639# If the object is anchored with me, i can ignore it, because
+// it's likely that it will follow me with the flow. A test formatting is
+// not allowed in that case, however!
sal_uInt8 nRet = 0;
SwFlowFrm *pTmp = this;
do
{ // If there are objects hanging either on me or on a follow, we can't
// do a test formatting, because paragraph bound objects wouldn't
// be properly considered, and character bound objects shouldn't
-// be test formatted either.
+// be test formatted at all.
if( pTmp-GetFrm()-GetDrawObjs() )
nRet = 1;
pTmp = pTmp-GetFollow();
@@ -372,7 +370,7 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm
*pPage, const SwRect rRe
}
// Don't do this if the object is anchored behind me in the
text
-// flow, because then I wouldn't avoid it.
+// flow, because then I wouldn't evade it.
if ( ::IsFrmInSameKontext( pAnchor, rThis ) )
{
if ( rFmt.GetAnchor().GetAnchorId() == FLY_AT_PARA )
@@ -381,7 +379,7 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm
*pPage, const SwRect rRe
sal_uLong nTmpIndex =
rFmt.GetAnchor().GetCntntAnchor()-nNode.GetIndex();
// Now we're going to check whether the current
paragraph before
// the anchor of the displacing object sits in the
text. If this
-// is the case, we don't try to avoid it.
+// is the case, we don't try to evade it.
// The index is being determined via SwFmtAnchor,
because it's
// getting quite expensive otherwise.
if( ULONG_MAX == nIndex )
@@ -473,7 +471,7 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
while ( pCnt pLay-IsAnLower( pCnt ) )
{
// It's possible for the CntFrm to be locked, and we don't want
-// to end up in an endless sideways movement, so we're not even
+// to end up in an endless page migration, so we're not even
// going to call Calc!
OSL_ENSURE( pCnt-IsTxtFrm(), The Graphic has landed. );
if ( ((SwTxtFrm*)pCnt)-IsLocked() ||
@@ -498,7 +496,7 @@ sal_Bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm
*pParent, SwFrm *pSibl
//returns sal_True if there's a LayoutFrm in the chain.
sal_Bool bRet = sal_False;
-// The chain beginning with pStart is being hanged before the sibling
+// The chain beginning with pStart is inserted before pSibling
// under the parent. We take care to invalidate as required.
// I'm receiving a finished chain. We need to update the pointers for
@@ -790,8 +788,8 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
|*
|* SwFrm::GetLeaf()
|*
-|* DescriptionReturns the next/previous Layout leave that's NOT
-|* below this (or even is this itself). Also
[Libreoffice-commits] .: sc/source
sc/source/core/data/sortparam.cxx | 40 +
sc/source/ui/docshell/dbdocfun.cxx |5 ++--
2 files changed, 18 insertions(+), 27 deletions(-)
New commits:
commit 61af0e1c3c1c9003c741d64840f9b6f39ea87ead
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 4 20:37:04 2012 +0200
ScDBDocFunc::Sort: work around STL assertion in sc_unoapi
from dbdocfun.cxx:588:
error: attempt to subscript container with out-of-bounds index 0,
but container only holds 0 elements.
The code in sortparam.cxx still looks quite wrong, and
in table3.cxx there are various arrays hard-coded to size 3...
(regression from a02b445c39d969fedc554fc2c500b88a27a13906)
diff --git a/sc/source/core/data/sortparam.cxx
b/sc/source/core/data/sortparam.cxx
index 069e410..21bf327 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -175,8 +175,6 @@ ScSortParam::ScSortParam( const ScSubTotalParam rSub,
const ScSortParam rOld )
aCollatorLocale( rOld.aCollatorLocale ), aCollatorAlgorithm(
rOld.aCollatorAlgorithm ),
nCompatHeader( rOld.nCompatHeader )
{
-sal_uInt16 nNewCount = 0;
-sal_uInt16 nSortSize = GetSortKeyCount();
sal_uInt16 i;
// zuerst die Gruppen aus den Teilergebnissen
@@ -184,42 +182,34 @@ ScSortParam::ScSortParam( const ScSubTotalParam rSub,
const ScSortParam rOld )
for (i=0; iMAXSUBTOTAL; i++)
if (rSub.bGroupActive[i])
{
-if (nNewCount nSortSize)
-{
-maKeyState[nNewCount].bDoSort = true;
-maKeyState[nNewCount].nField = rSub.nField[i];
-maKeyState[nNewCount].bAscending = rSub.bAscending;
-++nNewCount;
-}
+#if 0
+// FIXME this crashes in sc_unoapi currently; table3.cxx has nMaxSorts = 3...
+ScSortKeyState key;
+key.bDoSort = true;
+key.nField = rSub.nField[i];
+key.bAscending = rSub.bAscending;
+maKeyState.push_back(key);
+#endif
}
// dann dahinter die alten Einstellungen
-for (i=0; inSortSize; i++)
+for (i=0; i rOld.GetSortKeyCount(); i++)
if (rOld.maKeyState[i].bDoSort)
{
SCCOLROW nThisField = rOld.maKeyState[i].nField;
bool bDouble = false;
-for (sal_uInt16 j=0; jnNewCount; j++)
+for (sal_uInt16 j = 0; j GetSortKeyCount(); j++)
if ( maKeyState[j].nField == nThisField )
bDouble = true;
if (!bDouble) // ein Feld nicht zweimal eintragen
{
-if (nNewCount nSortSize)
-{
-maKeyState[nNewCount].bDoSort = true;
-maKeyState[nNewCount].nField = nThisField;
-maKeyState[nNewCount].bAscending =
rOld.maKeyState[i].bAscending;
-++nNewCount;
-}
+ScSortKeyState key;
+key.bDoSort = true;
+key.nField = nThisField;
+key.bAscending = rOld.maKeyState[i].bAscending;
+maKeyState.push_back(key);
}
}
-
-for (i=nNewCount; inSortSize; i++) // Rest loeschen
-{
-maKeyState[nNewCount].bDoSort = false;
-maKeyState[nNewCount].nField = 0;
-maKeyState[nNewCount].bAscending = true;
-}
}
//
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index a54f906..c315147 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -585,7 +585,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam
rSortParam,
}
// don't call ScDocument::Sort with an empty SortParam (may be empty here
if bCopy is set)
-if ( aLocalParam.maKeyState[0].bDoSort )
+if (aLocalParam.GetSortKeyCount() aLocalParam.maKeyState[0].bDoSort)
pDoc-Sort( nTab, aLocalParam, bRepeatQuery );
sal_Bool bSave = sal_True;
@@ -593,7 +593,8 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam
rSortParam,
{
ScSortParam aOldSortParam;
pDBData-GetSortParam( aOldSortParam );
-if ( aOldSortParam.maKeyState[0].bDoSort aOldSortParam.bInplace )
// Inplace-Sortierung gemerkt?
+if (aOldSortParam.GetSortKeyCount()
+aOldSortParam.maKeyState[0].bDoSort aOldSortParam.bInplace)
{
bSave = false;
aOldSortParam.nDestCol = rSortParam.nDestCol;
___
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 |1 + 1 file changed, 1 insertion(+) New commits: commit 05fde8006966df49221871fe3489aba8c2ca8e3f Author: Miklos Vajna vmik...@suse.cz Date: Sat Mar 24 17:14:12 2012 +0100 fdo#46955 fix RTF import of all capitals char prop diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index d5d8ee6..ef4d3b8 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2770,6 +2770,7 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam case RTF_STRIKED: nSprm = NS_sprm::LN_CFDStrike; break; case RTF_SCAPS: nSprm = NS_sprm::LN_CFSmallCaps; break; case RTF_IMPR: nSprm = NS_sprm::LN_CFImprint; break; +case RTF_CAPS: nSprm = NS_sprm::LN_CFCaps; break; default: break; } if (nSprm = 0) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/LinkTarget.mk |5 +++-- solenv/gbuild/platform/macosx.mk | 10 +- 2 files changed, 8 insertions(+), 7 deletions(-) New commits: commit 0683821d07132fb7635174b46d7423ecabc2703e Author: Michael Stahl mst...@redhat.com Date: Tue Apr 3 12:01:31 2012 +0200 gbuild: ObjC command invocation more consistent diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 8cef9b9..83f395a 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -232,7 +232,7 @@ gb_ObjCObject_get_source = $(1)/$(2).m # gb_ObjCObject__command $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) - $(call gb_ObjCObject__command,$@,$*,$) + $(call gb_ObjCObject__command,$@,$*,$,$(call gb_ObjObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 22a1fa8..e501c2b 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -132,15 +132,15 @@ endef define gb_ObjCObject__command $(call gb_Output_announce,$(2),$(true),OCC,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) \ - mkdir -p $(dir $(call gb_ObjCObject_get_dep_target,$(2))) \ + mkdir -p $(dir $(1)) $(dir $(4)) \ $(gb_CC) \ - $(DEFS) $(T_OBJCFLAGS) \ + $(DEFS) \ + $(T_OBJCFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_ObjCObject_get_target,$(2)) \ - -MP -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef commit adaf721ccdac1d08c9fd63d72844bc5bcc1875e6 Author: Michael Stahl mst...@redhat.com Date: Tue Apr 3 11:55:28 2012 +0200 LinkTarget.mk: only call gb_Object__command_dep if dep file doesn't exist (infinite loop regression from a4e2453b42b54ba904c1ee8ad07e26f1e6d939e5) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 11eeb02..8cef9b9 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -236,7 +236,8 @@ $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),% ifeq ($(gb_FULLDEPS),$(true)) $(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%) - $(call gb_Object__command_dep,$@,$(call gb_ObjCObject_get_target,$*)) + $(if $(wildcard $@),touch $@,\ + $(call gb_Object__command_dep,$@,$(call gb_ObjCObject_get_target,$*))) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/txtnode/fntcache.cxx | 155 ++--
1 file changed, 78 insertions(+), 77 deletions(-)
New commits:
commit c39cb68bec7eb5048c3a5feb669cc9e60a8a4371
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 3 14:25:24 2012 +0200
fntcache.cxx: translate comments
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 4ddeb3d..bf15370 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -37,8 +37,8 @@
#include com/sun/star/i18n/CharacterIteratorMode.hdl
#include com/sun/star/i18n/WordType.hdl
#include breakit.hxx
-#include viewsh.hxx // Bildschirmabgleich
-#include viewopt.hxx // Bildschirmabgleich abschalten, ViewOption
+#include viewsh.hxx
+#include viewopt.hxx
#include fntcache.hxx
#include IDocumentSettingAccess.hxx
#include swfont.hxx // CH_BLANK + CH_BULLET
@@ -61,12 +61,12 @@
using namespace ::com::sun::star;
-// globale Variablen, werden in FntCache.Hxx bekanntgegeben
-// Der FontCache wird in TxtInit.Cxx _TXTINIT erzeugt und in _TXTEXIT geloescht
+// global variables declared in fntcache.hxx
+// FontCache is created in txtinit.cxx _TextInit and deleted in _TextFinit
SwFntCache *pFntCache = NULL;
-// Letzter Font, der durch ChgFntCache eingestellt wurde.
+// last Font set by ChgFntCache
SwFntObj *pLastFont = NULL;
-// Die MagicNumber, die den Fonts zur Identifizierung verpasst wird
+// MagicNumber used to identify Fonts
sal_uInt8* pMagicNo = NULL;
Color *pWaveCol = 0;
@@ -285,9 +285,8 @@ void lcl_calcLinePos( const CalcLinePosData rData,
*
* sal_uInt16 SwFntObj::GetFontAscent( const OutputDevice rOut )
*
- * Beschreibung: liefern den Ascent des Fonts auf dem
- * gewuenschten Outputdevice zurueck, ggf. muss der Bildschirmfont erst
- * erzeugt werden.
+ * Returns the Ascent of the Font on the given output device;
+ * it may be necessary to create the screen font first.
*/
sal_uInt16 SwFntObj::GetFontAscent( const ViewShell *pSh, const OutputDevice
rOut )
@@ -303,7 +302,7 @@ sal_uInt16 SwFntObj::GetFontAscent( const ViewShell *pSh,
const OutputDevice rO
}
else
{
-if ( nPrtAscent == USHRT_MAX ) // DruckerAscent noch nicht bekannt?
+if (nPrtAscent == USHRT_MAX) // printer ascent unknown?
{
CreatePrtFont( rOut );
const Font aOldFnt( rRefDev.GetFont() );
@@ -329,9 +328,8 @@ sal_uInt16 SwFntObj::GetFontAscent( const ViewShell *pSh,
const OutputDevice rO
*
* sal_uInt16 SwFntObj::GetFontHeight( const OutputDevice* pOut )
*
- * Beschreibung: liefern die H?he des Fonts auf dem
- * gewuenschten Outputdevice zurueck, ggf. muss der Bildschirmfont erst
- * erzeugt werden.
+ * Returns the height of the Font on the given output device;
+ * it may be necessary to create the screen font first.
*/
sal_uInt16 SwFntObj::GetFontHeight( const ViewShell* pSh, const OutputDevice
rOut )
@@ -347,7 +345,7 @@ sal_uInt16 SwFntObj::GetFontHeight( const ViewShell* pSh,
const OutputDevice rO
}
else
{
-if ( nPrtHeight == USHRT_MAX ) // PrinterHeight noch nicht bekannt?
+if (nPrtHeight == USHRT_MAX) // printer height unknown?
{
CreatePrtFont( rOut );
const Font aOldFnt( rRefDev.GetFont() );
@@ -483,12 +481,11 @@ void SwFntObj::CreateScrFont( const ViewShell rSh, const
OutputDevice rOut )
pScrFont = pPrtFont;
}
-// Zoomfaktor ueberpruefen, z.B. wg. PrtOle2 beim Speichern
+// check zoom factor, e.g. because of PrtOle2 during export
{
-// Sollte der Zoomfaktor des OutputDevices nicht mit dem der View-
-// Options uebereinstimmen, so darf dieser Font nicht gecacht
-// werden, deshalb wird der Zoomfaktor auf einen ungueltigen Wert
-// gesetzt.
+// In case the zoom factor of the output device differs from the
+// one in the ViewOptions, this Font must not be cached,
+// hence set zoom factor to an invalid value
long nTmp;
if( pOut-GetMapMode().GetScaleX().IsValid()
pOut-GetMapMode().GetScaleY().IsValid()
@@ -541,10 +538,9 @@ void SwFntObj::GuessLeading( const ViewShell
const sal_uInt16 nWinHeight = sal_uInt16( aWinMet.GetSize().Height() );
if( pPrtFont-GetName().Search( aWinMet.GetName() ) USHRT_MAX )
{
-// Wenn das Leading auf dem Window auch 0 ist, dann
-// muss es auch so bleiben (vgl. StarMath!).
+// If the Leading on the Window is also 0, then it has to stay
+// that way (see also StarMath).
long nTmpLeading = (long)aWinMet.GetIntLeading();
- // einen Versuch haben wir noch wg. 31003:
if( nTmpLeading = 0 )
{
pWin
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/LinkTarget.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 72e7082f158d5d4216ea94a7617cdc39fc3a7e4b Author: Michael Stahl mst...@redhat.com Date: Tue Apr 3 14:46:15 2012 +0200 LinkTarget.mk: fix stupid typo in 0683821d diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 83f395a..a217086 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -232,7 +232,7 @@ gb_ObjCObject_get_source = $(1)/$(2).m # gb_ObjCObject__command $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) - $(call gb_ObjCObject__command,$@,$*,$,$(call gb_ObjObject_get_dep_target,$*)) + $(call gb_ObjCObject__command,$@,$*,$,$(call gb_ObjCObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - cui/source solenv/gbuild writerfilter/source
cui/source/inc/border.hxx |3 +--
cui/source/tabpages/border.cxx | 15 +--
solenv/gbuild/filter-showIncludes.pl | 19 +--
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8
4 files changed, 31 insertions(+), 14 deletions(-)
New commits:
commit b2d8d2d3cacbfc6d505248b81ea0e94272def439
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Mar 23 12:47:41 2012 +0100
fdo#47326 fix RTF import of mixed super/nonsuper text
In most cases \super has its own group, but it's valid to have mixed
super and non-super text in a single group, as long as \super and
\nosupersub keywords are used: handle this.
(backport of f84e0e6b1b0ec5f52ee963a62ac420cd872a771e)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 241e05d..d5d8ee6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1950,6 +1950,14 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().aCharacterSprms-push_back(make_pair(NS_ooxml::LN_EG_RPrBase_vertAlign,
pValue));
}
break;
+case RTF_NOSUPERSUB:
+if (m_pCurrentBuffer == m_aSuperBuffer)
+{
+replayBuffer(m_aSuperBuffer);
+m_pCurrentBuffer = 0;
+}
+
m_aStates.top().aCharacterSprms.erase(NS_ooxml::LN_EG_RPrBase_vertAlign);
+break;
case RTF_LINEPPAGE:
case RTF_LINECONT:
{
commit b2a20dad907bfd6ca14847d548b44ad8b9ee5321
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Apr 2 17:20:26 2012 +0200
show synchronized checked only if all margins are the same, related
fdo#44337
(cherry picked from commit 149650b087ab5b15ef23e4ac6af5368b2820af1e)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 7766ec9..ecb6c9e 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -125,8 +125,7 @@ private:
boolmbTLBREnabled; /// true = Top-left to
bottom-right border enabled.
boolmbBLTREnabled; /// true = Bottom-left to
top-right border enabled.
boolmbUseMarginItem;
-
-static sal_Bool bSync;
+boolmbSync;
#ifdef _SVX_BORDER_CXX
// Handler
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d6c474f..709d04b 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -86,8 +86,6 @@ static sal_uInt16 pRanges[] =
0
};
-sal_Bool SvxBorderTabPage::bSync = sal_True;
-
// ---
void lcl_SetDecimalDigitsTo1(MetricField rField)
{
@@ -147,7 +145,8 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
mbVerEnabled( false ),
mbTLBREnabled( false ),
mbBLTREnabled( false ),
-mbUseMarginItem( false )
+mbUseMarginItem( false ),
+mbSync(true)
{
// diese Page braucht ExchangeSupport
@@ -217,7 +216,6 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
SetFieldUnit(aRightMF, eFUnit);
SetFieldUnit(aTopMF, eFUnit);
SetFieldUnit(aBottomMF, eFUnit);
-aSynchronizeCB.Check(bSync);
aSynchronizeCB.SetClickHdl(LINK(this, SvxBorderTabPage,
SyncHdl_Impl));
aLeftMF.SetModifyHdl(LINK(this, SvxBorderTabPage,
ModifyDistanceHdl_Impl));
aRightMF.SetModifyHdl(LINK(this, SvxBorderTabPage,
ModifyDistanceHdl_Impl));
@@ -571,6 +569,11 @@ void SvxBorderTabPage::Reset( const SfxItemSet rSet )
}
LinesChanged_Impl( 0 );
+if(aLeftMF.GetValue() == aRightMF.GetValue() aTopMF.GetValue() ==
aBottomMF.GetValue() aTopMF.GetValue() == aLeftMF.GetValue())
+mbSync = true;
+else
+mbSync = false;
+aSynchronizeCB.Check(mbSync);
}
// ---
@@ -1153,7 +1156,7 @@ IMPL_LINK( SvxBorderTabPage, LinesChanged_Impl, void*,
EMPTYARG )
IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField)
{
-if ( bSync )
+if ( mbSync )
{
sal_Int64 nVal = pField-GetValue();
if(pField != aLeftMF)
@@ -1170,7 +1173,7 @@ IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl,
MetricField*, pField)
IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox)
{
-bSync = pBox-IsChecked();
+mbSync = pBox-IsChecked();
return 0;
}
commit 9d8662264abfad3da87e1662abda4556333889f0
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Mar 30 13:44:33 2012 +0200
filter-showIncludes.pl: Attempt to prevent creating incomplete .d files
[Libreoffice-commits] .: 3 commits - basctl/source svtools/inc svtools/source svtools/workben sw/inc sw/source
basctl/source/basicide/baside2.hxx |5 +
basctl/source/basicide/baside2b.cxx | 16 +---
svtools/inc/svtools/calendar.hxx| 16 ++--
svtools/source/control/calendar.cxx | 134 +---
svtools/workben/svdem.cxx |2
sw/inc/crsrsh.hxx |1
sw/inc/tblsel.hxx |3
sw/source/core/crsr/trvltbl.cxx |2
sw/source/core/frmedt/fetab.cxx | 14 +--
sw/source/core/frmedt/tblsel.cxx| 25 ++
10 files changed, 109 insertions(+), 109 deletions(-)
New commits:
commit 9ef0b8e3aa2137af67624dbd757fe464e44202ed
Author: Noel Grandin n...@peralex.com
Date: Mon Apr 2 23:18:19 2012 +0200
Convert tools/table.hxx to std::set in EditorWindow class in basctl module
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index c7b3f05..8adbe15 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -51,11 +51,11 @@ class SvxSearchItem;
#include sfx2/progress.hxx
#include svtools/syntaxhighlight.hxx
#include unotools/options.hxx
-#include tools/table.hxx
#include breakpoint.hxx
#include linenumberwindow.hxx
#include objdlg.hxx
+#include set
#include tools/table.hxx
@@ -95,6 +95,8 @@ inline void ProgressInfo::StepProgress()
SetState( ++nCurState );
}
+typedef std::setsal_uInt16 SyntaxLineSet;
+
class EditorWindow : public Window, public SfxListener
{
private:
@@ -113,7 +115,7 @@ private:
SyntaxHighlighter aHighlighter;
Timer aSyntaxIdleTimer;
-Table aSyntaxLineTable;
+SyntaxLineSet aSyntaxLineTable;
DECL_LINK(SyntaxTimerHdl, void *);
ProgressInfo* pProgress;
ModulWindow*pModulWindow;
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index efe352f..ef67435 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -628,7 +628,7 @@ void EditorWindow::CreateEditEngine()
for ( sal_uInt16 nLine = 0; nLine nLines; nLine++ )
-aSyntaxLineTable.Insert( nLine, (void*)(sal_uInt16)1 );
+aSyntaxLineTable.insert( nLine );
ForceSyntaxTimeout();
DELETEZ( pProgress );
@@ -793,7 +793,7 @@ void EditorWindow::ImpDoHighlight( sal_uLong nLine )
if ( aChanges.Len() )
{
for ( long n = aChanges.Min() + 1; n = aChanges.Max(); n++ )
-aSyntaxLineTable.Insert( n, (void*)(sal_uLong)1 );
+aSyntaxLineTable.insert( n );
aSyntaxIdleTimer.Start();
}
@@ -868,7 +868,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong
nPara )
{
if ( bDelayHighlight )
{
-aSyntaxLineTable.Insert( nPara, (void*)(sal_uLong)1 );
+aSyntaxLineTable.insert( nPara );
aSyntaxIdleTimer.Start();
}
else
@@ -884,13 +884,11 @@ IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl)
// pEditEngine-SetUpdateMode( sal_False );
bHighlightning = sal_True;
-sal_uInt16 nLine;
-void* p = aSyntaxLineTable.First();
-while ( p )
+for ( SyntaxLineSet::const_iterator it = aSyntaxLineTable.begin();
+ it != aSyntaxLineTable.end(); ++it )
{
-nLine = (sal_uInt16)aSyntaxLineTable.GetCurKey();
+sal_uInt16 nLine = *it;
DoSyntaxHighlight( nLine );
-p = aSyntaxLineTable.Next();
}
// #i45572#
@@ -899,7 +897,7 @@ IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl)
pEditEngine-SetModified( bWasModified );
-aSyntaxLineTable.Clear();
+aSyntaxLineTable.clear();
bHighlightning = sal_False;
return 0;
commit e5a916d8e79a3d105040f3fb832134bf7b32
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 29 18:14:00 2012 +0200
Convert tools/table.hxx usage to std::set in Calendar class in svtools
module
Also change the API slightly, removing GetSelectedData(int index) and
replacing
it with GetLastSelectedDate(), since the only usage of GetSelectedData in
the codebase only needed to get the last date.
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 922be10..c7b3f05 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -51,6 +51,7 @@ class SvxSearchItem;
#include sfx2/progress.hxx
#include svtools/syntaxhighlight.hxx
#include unotools/options.hxx
+#include tools/table.hxx
#include breakpoint.hxx
#include linenumberwindow.hxx
diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index 4d099d4..c9df5a1 100644
--- a/svtools/inc/svtools/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
@@ -36,8 +36,8 @@
#include vcl/ctrl.hxx
#include vcl/timer.hxx
#include vcl/field.hxx
+#include set
-class Table;
class MouseEvent;
class TrackingEvent;
class KeyEvent;
@@ -162,12 +162,15 @@ calls or by ending a selection.
// - Calendar -
//
[Libreoffice-commits] .: 7 commits - scripting/examples scripting/java scripting/workben solenv/gbuild sw/source vcl/source
solenv/gbuild/JavaClassSet.mk | 20 +--- sw/source/core/layout/paintfrm.cxx | 27 +-- vcl/source/gdi/sallayout.cxx | 10 +++--- 3 files changed, 33 insertions(+), 24 deletions(-) New commits: commit 788a19ceff33e347a8f3ee104084391c288db52d Author: Michael Stahl mst...@redhat.com Date: Fri Mar 23 15:31:55 2012 +0100 scripting: don't need x bits for these diff --git a/scripting/examples/java/HelloWorld/HelloWorld.java b/scripting/examples/java/HelloWorld/HelloWorld.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/MemoryUsage/MemoryUsage.java b/scripting/examples/java/MemoryUsage/MemoryUsage.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/Newsgroup/MimeConfiguration.java b/scripting/examples/java/Newsgroup/MimeConfiguration.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/Newsgroup/NewsGroup.java b/scripting/examples/java/Newsgroup/NewsGroup.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/Newsgroup/OfficeAttachment.java b/scripting/examples/java/Newsgroup/OfficeAttachment.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/Newsgroup/PostNewsgroup.java b/scripting/examples/java/Newsgroup/PostNewsgroup.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/Newsgroup/Sender.java b/scripting/examples/java/Newsgroup/Sender.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/Newsgroup/StatusWindow.java b/scripting/examples/java/Newsgroup/StatusWindow.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java b/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/debugger/DebugRunner.java b/scripting/examples/java/debugger/DebugRunner.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/debugger/OOBeanShellDebugger.java b/scripting/examples/java/debugger/OOBeanShellDebugger.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/debugger/OORhinoDebugger.java b/scripting/examples/java/debugger/OORhinoDebugger.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/debugger/OOScriptDebugger.java b/scripting/examples/java/debugger/OOScriptDebugger.java old mode 100755 new mode 100644 diff --git a/scripting/examples/java/selector/ScriptSelector.java b/scripting/examples/java/selector/ScriptSelector.java old mode 100755 new mode 100644 diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java old mode 100755 new mode 100644 diff --git a/scripting/java/com/sun
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - scripting/Jar_HelloWorld.mk scripting/Jar_Highlight.mk scripting/Jar_MemoryUsage.mk scripting/Jar_ScriptFramework.mk scripting/Jar_Scrip
scripting/Jar_HelloWorld.mk |2 scripting/Jar_Highlight.mk |2 scripting/Jar_MemoryUsage.mk |2 scripting/Jar_ScriptFramework.mk |2 scripting/Jar_ScriptProviderForBeanShell.mk |4 scripting/Jar_ScriptProviderForJava.mk |5 + scripting/Jar_ScriptProviderForJavaScript.mk |2 scripting/examples/java/HelloWorld/HelloWorld.java |2 scripting/examples/java/HelloWorld/parcel-descriptor.xml |2 scripting/examples/java/Highlight/HighlightText.java |2 scripting/examples/java/Highlight/parcel-descriptor.xml |2 scripting/examples/java/MemoryUsage/MemoryUsage.java |2 scripting/examples/java/MemoryUsage/parcel-descriptor.xml |2 scripting/examples/java/Newsgroup/MimeConfiguration.java |2 scripting/examples/java/Newsgroup/NewsGroup.java |2 scripting/examples/java/Newsgroup/OfficeAttachment.java |2 scripting/examples/java/Newsgroup/PostNewsgroup.java |2 scripting/examples/java/Newsgroup/Sender.java |2 scripting/examples/java/Newsgroup/StatusWindow.java |2 scripting/examples/java/Newsgroup/SubscribedNewsgroups.java |2 scripting/examples/java/debugger/DebugRunner.java |2 scripting/examples/java/debugger/OOBeanShellDebugger.java |2 scripting/examples/java/debugger/OORhinoDebugger.java |2 scripting/examples/java/debugger/OOScriptDebugger.java |2 scripting/examples/java/debugger/parcel-descriptor.xml |2 scripting/examples/java/selector/ScriptSelector.java |2 scripting/examples/java/selector/parcel-descriptor.xml |2 scripting/java/Framework/MANIFEST.MF |2 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 46 +- scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java |6 - scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java |3 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java |3 scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF |2 scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java |2 scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java |3 35 files changed, 109 insertions(+), 17 deletions(-) New commits: commit a6604b06a1d5ff997c38b27c7860f20f48e302d3 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Mar 23 16:11:42 2012 +0100 fdo#46102: Fix Java script examples after gbuild'ification ...they contained no class files anymore, due to missing gb_Jar_set_packageroot calls. However, those calls only work for subdirectories, i.e., the example .java files need to be put into a package (I chose org.libreoffice.example.java_scripts) for all of them). This in turn required adaption of the parcel-descriptor.xml files; not sure what the logicalname entries there are good for if anything -- the macro names at Tools - Macros - Run Macro... now unfortunately(?) contain the fully qualified paths for the HelloWorld, HighlightText, and MemoryUpdate examples. There are additional examples at scripting/examples/java/ that apparently do not get packaged (but I adapted them anyway). (cherry picked from commit 0b9fda25f321ce2697179064e330843237177668) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/scripting/Jar_HelloWorld.mk b/scripting
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/edit/edundo.cxx |4
sw/source/core/frmedt/feshview.cxx |8
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit f24153cded54954da7f0d80941707715c78e4627
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 22 23:03:05 2012 +0100
fdo#39003: fix autoformat Undo cursors:
SwEditShell::Undo: Because the Undo actions nowadays create new shell
cursors directly (while previously they worked on a SwUndoIter), it is
necessary to remove the shell cursor ring before Pop() because Pop(false)
only restores the current cursor from the stack, not the rest of the ring.
(regression from CWS undoapi, 1ba0c1878116ada5dc4ebdecdb1e0a3da9758547)
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 95c9252..26b64b0 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -142,6 +142,10 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
.getStr());
}
+if (bRestoreCrsr)
+{ // fdo#39003 Pop does not touch the rest of the cursor ring
+KillPams(); // so call this first to get rid of unwanted cursors
+}
Pop( !bRestoreCrsr );
GetDoc()-SetRedlineMode( eOld );
commit 06d1d69fc8c214251cf9dbc7f87756651657d3bf
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 22 14:52:41 2012 +0100
SwFEShell::ShouldObjectBeSelected leaks pPos
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index 7c6dd99..be852a9 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1163,13 +1163,13 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point
rPt)
dynamic_castconst SwTxtFrm*(pCntntFrm);
if ( pTxtFrm )
{
-SwPosition* pPos =
-new SwPosition( *(pTxtFrm-GetTxtNode()) );
+SwPosition aPos( *(pTxtFrm-GetTxtNode()) );
Point aTmpPt( rPt );
-if ( pTxtFrm-GetKeyCrsrOfst( pPos, aTmpPt ) )
+if (pTxtFrm-GetKeyCrsrOfst(aPos, aTmpPt))
{
SwRect aCursorCharRect;
-if ( pTxtFrm-GetCharRect(
aCursorCharRect, *pPos ) )
+if (pTxtFrm-GetCharRect(aCursorCharRect,
+aPos))
{
if ( aCursorCharRect.IsOver( SwRect(
pObj-GetLastBoundRect() ) ) )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sw/inc sw/source writerfilter/source
sw/inc/bparr.hxx|8 --
sw/source/core/bastyp/bparr.cxx | 16 +
sw/source/core/docnode/ndcopy.cxx |2 -
sw/source/core/docnode/nodes.cxx| 34 ++--
sw/source/core/txtnode/ndtxt.cxx|6
writerfilter/source/dmapper/PropertyMap.cxx | 23 ++
6 files changed, 59 insertions(+), 30 deletions(-)
New commits:
commit a4788b254268aa2d61b14678301f22cdbd27d2e7
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 10:42:02 2012 +0100
Revert sw-outline-numbering-broken-fix.diff: outline numbering fix in
master docs
This reverts commit 9a11bd42af0db32fd06c84dd955ee563134665ce.
Removing attributes from the _source_ node in SwTxtNode::MakeCopy does
not make any sens at all, and the cited issue i#96092 was apparently
fixed independently in CWS sw31bf04 by the change to ndtxt.cxx in
1524aa18b9ddf7a4181e3f278155c48655084452.
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 2461505..4aabfba 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -266,7 +266,7 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const
SwNodeIndex rIdx ) const
// kopiere Attribute/Text
if( !pCpyAttrNd-HasSwAttrSet() )
// wurde ein AttrSet fuer die Numerierung angelegt, so loesche diesen!
-pCpyAttrNd-ResetAllAttr();
+pTxtNd-ResetAllAttr();
// if Copy-Textnode unequal to Copy-Attrnode, then copy first
// the attributes into the new Node.
commit cc99bb9f383a65912d004e227a5b6a88b401bbba
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 10:37:46 2012 +0100
writerfilter: PropertyMap: speed this up a bit
Using XMultiPropertySet reduces the number of SwTxtNodes created for the
bugdoc from rhbz#789022 from ~5k to ~3k.
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 575730f..ee3ba7f 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -32,6 +32,7 @@
#include i18nutil/paper.hxx
#include rtl/oustringostreaminserter.hxx
#include com/sun/star/beans/PropertyValue.hpp
+#include com/sun/star/beans/XMultiPropertySet.hpp
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/table/BorderLine2.hpp
#include com/sun/star/container/XEnumeration.hpp
@@ -986,6 +987,28 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl rDM_Impl )
void SectionPropertyMap::_ApplyProperties( uno::Reference beans::XPropertySet
xStyle )
{
PropertyNameSupplier rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
+uno::Referencebeans::XMultiPropertySet const xMultiSet(xStyle,
+uno::UNO_QUERY);
+if (xMultiSet.is())
+{ // FIXME why is this a STL container???
+uno::Sequencertl::OUString names(this-size());
+uno::Sequenceuno::Any values(this-size());
+PropertyMap::iterator it = this-begin();
+for (size_t i = 0; it != this-end(); ++it, ++i)
+{
+names[i] = rPropNameSupplier.GetName(it-first.eId);
+values[i] = it-second;
+}
+try
+{
+xMultiSet-setPropertyValues(names, values);
+}
+catch( const uno::Exception )
+{
+OSL_FAIL( Exception in PageStyle::setPropertyValue);
+}
+return;
+}
PropertyMap::iterator aMapIter = begin();
while( aMapIter != end())
{
commit 082906e1f4cf58fdfab1a4064e2b7955fcdaeb8a
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 10:25:45 2012 +0100
rhbz#789022: SwNodes: fix inconsistent outline check:
SwNodes::UpdateOutlineNode will add/remove the node from
SwNodes::pOutlineNds depending on IsOutline(), while various SwNodes
methods that move and delete nodes check GetAttrOutlineLevel() != 0,
which may be false even if IsOutline() is true.
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 518de82..ab12430 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -173,7 +173,7 @@ void SwNodes::ChgNode( SwNodeIndex rDelPos, sal_uLong nSz,
pTxtNode-RemoveFromList();
-if ( pTxtNode-GetAttrOutlineLevel() != 0 )//-end,zhaojianwei
+if (pTxtNode-IsOutline())
{
const SwNodePtr pSrch = (SwNodePtr)rNd;
pOutlineNds-Remove( pSrch );
@@ -188,8 +188,7 @@ void SwNodes::ChgNode( SwNodeIndex rDelPos, sal_uLong nSz,
rTxtNd.AddToList();
-if( bInsOutlineIdx
-0 != rTxtNd.GetAttrOutlineLevel() )//-end,zhaojianwei
+if (bInsOutlineIdx rTxtNd.IsOutline())
{
const SwNodePtr pSrch
[Libreoffice-commits] .: 3 commits - codemaker/README idlc/README javaunohelper/cppumaker sw/inc sw/source
codemaker/README |7 +--
idlc/README | 10 +-
javaunohelper/cppumaker/Makefile |2 +-
sw/inc/swtable.hxx|2 ++
sw/source/core/table/swtable.cxx |7 +++
sw/source/filter/ww8/WW8TableInfo.cxx |3 +--
6 files changed, 21 insertions(+), 10 deletions(-)
New commits:
commit 5c3dd5af41bc801ee6023513399c01c632dc7779
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 21 17:15:06 2012 +0100
fdo#45522: WW8TableInfo::processSwTable: check that table has layout
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index e97de42..6473986 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -326,6 +326,8 @@ public:
#ifdef DBG_UTIL
void CheckConsistency() const;
#endif
+
+bool HasLayout() const;
};
class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt.
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 3c0b4c1..c5f0d09 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2800,6 +2800,13 @@ void SwTable::RegisterToFormat( SwFmt rFmt )
rFmt.Add( this );
}
+bool SwTable::HasLayout() const
+{
+const SwFrmFmt* pFrmFmt = GetFrmFmt();
+//a table in a clipboard document doesn't have any layout information
+return pFrmFmt SwIteratorSwTabFrm,SwFmt::FirstElement(*pFrmFmt);
+}
+
void SwTableLine::RegisterToFormat( SwFmt rFmt )
{
rFmt.Add( this );
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 72993ba..7df6abc 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -631,8 +631,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable)
WW8TableNodeInfo * pPrev = NULL;
-SwFrmFmt * pFrmFmt = pTable-GetFrmFmt();
-if (pFrmFmt != NULL pTable-IsTblComplex())
+if (pTable-IsTblComplex() pTable-HasLayout())
{
pPrev = processSwTableByLayout(pTable);
commit dfa1983b5dcce0d74db76ea08b5d6334a82320b4
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 15:11:53 2012 +0100
javaunohelper: missing dependecy on udkapi.rdb
diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile
index f0f3642..8ed1298 100644
--- a/javaunohelper/cppumaker/Makefile
+++ b/javaunohelper/cppumaker/Makefile
@@ -28,7 +28,7 @@
gb_PARTIALBUILD := T
include $(GBUILDDIR)/gbuild_simple.mk
-done : $(gb_UnoApiTarget_CPPUMAKERTARGET)
+done : $(gb_UnoApiTarget_CPPUMAKERTARGET) $(OUTDIR)/bin/udkapi.rdb
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,cppumaker -C -BUCR -O. \
-Tcom.sun.star.beans.NamedValue \
commit 31fcce969deb8002307a1cd029867008a1c11ff0
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 14:26:18 2012 +0100
idlc/README: correct nonsense added in 534b3a9b2e
diff --git a/codemaker/README b/codemaker/README
index 96a08ac..3410b4b 100644
--- a/codemaker/README
+++ b/codemaker/README
@@ -1,2 +1,5 @@
-UNO interface declaration/stub generators for C++ (headers), Java (class
files), ... the one for .Net is in cli_ure.
-
+UNO interface declaration/stub generators for:
+- C++: cppumaker generates headers (.hpp and .hdl files) that provide
+ the UNO API C++ binding
+- Java: javamaker generates class files that provide the JVM UNO API binding
+- the one for .Net is in module cli_ure
diff --git a/idlc/README b/idlc/README
index 1b4c1f7..16eda1b 100644
--- a/idlc/README
+++ b/idlc/README
@@ -1,6 +1,6 @@
-Contains the C++ IDL compiler: idlcpp
+Contains the UNO IDL compiler, idlc, and preprocessor, idlcpp
+
+This compiler generates binary RDB fragments that can be assembled
+into a RDB (UNO type library) with the regmerge tool, as is done
+primarily in the offapi and udkapi directories.
-This compiler generates C++ headers - .hpp and .hdl files that provide
-the UNO C++ binding. That compilation is done primarily in the offapi
-and udkapi directories.
-2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/inc sw/source
sw/inc/swtable.hxx|2 ++
sw/source/core/table/swtable.cxx |7 +++
sw/source/filter/ww8/WW8TableInfo.cxx |3 +--
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit ea92fb2b82a050c24a72c55a484163b07263ab4c
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 21 17:15:06 2012 +0100
fdo#45522: WW8TableInfo::processSwTable: check that table has layout
(cherry picked from commit 5c3dd5af41bc801ee6023513399c01c632dc7779)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index fb1d253..73df08c 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -326,6 +326,8 @@ public:
#ifdef DBG_UTIL
void CheckConsistency() const;
#endif
+
+bool HasLayout() const;
};
class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt.
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index ae36c31..d961289 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2804,6 +2804,13 @@ void SwTable::RegisterToFormat( SwFmt rFmt )
rFmt.Add( this );
}
+bool SwTable::HasLayout() const
+{
+const SwFrmFmt* pFrmFmt = GetFrmFmt();
+//a table in a clipboard document doesn't have any layout information
+return pFrmFmt SwIteratorSwTabFrm,SwFmt::FirstElement(*pFrmFmt);
+}
+
void SwTableLine::RegisterToFormat( SwFmt rFmt )
{
rFmt.Add( this );
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 6171430..095c94b 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -631,8 +631,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable)
WW8TableNodeInfo * pPrev = NULL;
-SwFrmFmt * pFrmFmt = pTable-GetFrmFmt();
-if (pFrmFmt != NULL pTable-IsTblComplex())
+if (pTable-IsTblComplex() pTable-HasLayout())
{
pPrev = processSwTableByLayout(pTable);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - icu/icu4c-parallel-buid.patch icu/makefile.mk
icu/icu4c-parallel-buid.patch | 20 icu/makefile.mk |3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) New commits: commit 21229eeab92f5d84ae2d5fd7b7a83abc67ab1b4a Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Mar 17 09:21:11 2012 +0100 fix icu parallel build (cherry picked from commit ff5a80024aab426d03394ad0b4da8067028097ff) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/icu/icu4c-parallel-buid.patch b/icu/icu4c-parallel-buid.patch new file mode 100644 index 000..3f33869 --- /dev/null +++ b/icu/icu4c-parallel-buid.patch @@ -0,0 +1,20 @@ +--- misc/build/icu/source/extra/uconv/Makefile.in.sav 2010-09-29 20:37:14.0 +0200 misc/build/icu/source/extra/uconv/Makefile.in 2011-10-19 01:12:22.0 +0200 +@@ -147,7 +147,7 @@ $(UCONVMSG_LIB): resfiles + endif + + +-package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc ++package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc + $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst + + $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk +@@ -159,7 +159,7 @@ $(RESDIR)/$(RESDIR).lst: Makefile $(srcd + + # no install for static mode + ifneq ($(UCONVMSG_MODE),static) +-install-resfiles: $(RESFILES) ++install-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc + $(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR) + $(INVOKE) $(TOOLBINDIR)/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst + else diff --git a/icu/makefile.mk b/icu/makefile.mk index 338333c..aaf8bf2 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -54,7 +54,8 @@ PATCH_FILES=\ icu4c-escapespace.patch \ icu4c-strict-c.patch \ CVE-2011-4599.patch \ -arm-assembler.patch +arm-assembler.patch \ +icu4c-parallel-buid.patch .IF $(OS)==ANDROID PATCH_FILES+=\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild sw/source
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 18 ++---
sw/source/core/layout/paintfrm.cxx | 44
2 files changed, 42 insertions(+), 20 deletions(-)
New commits:
commit 804d0a896731629397c5328c13c04a45bc55f459
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 16 15:35:49 2012 +0100
fdo#42750: delay painting borders until after subsidiary lines
With commit 0f0896c26fb260d1bbf31d7a886df3f61837f0f2, borders are drawn
immediately, but then the subsidiary lines are drawn over the borders,
hiding 1 twip wide borders completely.
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index dac3e27..958e279 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -119,6 +119,7 @@
#include drawinglayer/primitive2d/textlayoutdevice.hxx
#include svx/sdr/contact/objectcontacttools.hxx
#include svx/unoapi.hxx
+#include comphelper/sequenceasvector.hxx
#include basegfx/matrix/b2dhommatrix.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
#include basegfx/polygon/b2dpolygon.hxx
@@ -219,6 +220,22 @@ public:
inline void Ins( const SwRect rRect, const sal_uInt8 nSCol );
};
+class BorderLines
+{
+::comphelper::SequenceAsVector
+ ::drawinglayer::primitive2d::Primitive2DReference m_Lines;
+public:
+void AddBorderLine(
+::drawinglayer::primitive2d::Primitive2DReference const xLine)
+{
+m_Lines.push_back(xLine);
+}
+drawinglayer::primitive2d::Primitive2DSequence GetBorderLines() const
+{
+return m_Lines.getAsConstList();
+}
+};
+
//- End of classes for border lines --
static ViewShell *pGlobalShell = 0;
@@ -252,6 +269,7 @@ static double aEdgeScale = 0.5;
// be compared with pLines before the work in order to avoid help lines
// to hide borders.
// bTablines is sal_True during the Paint of a table.
+static BorderLines *g_pBorderLines = 0;
static SwLineRects *pLines = 0;
static SwSubsRects *pSubsLines = 0;
// global variable for sub-lines of body, header, footer, section and footnote
frames.
@@ -334,6 +352,7 @@ class SwSavePaintStatics
SwFlyFrm *pSRetoucheFly,
*pSRetoucheFly2,
*pSFlyOnlyDraw;
+BorderLines*pBLines;
SwLineRects*pSLines;
SwSubsRects*pSSubsLines;
SwSubsRects*pSSpecSubsLines;
@@ -359,6 +378,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
pSRetoucheFly ( pRetoucheFly ),
pSRetoucheFly2 ( pRetoucheFly2 ),
pSFlyOnlyDraw ( pFlyOnlyDraw ),
+pBLines ( g_pBorderLines),
pSLines ( pLines),
pSSubsLines ( pSubsLines),
pSSpecSubsLines ( pSpecSubsLines),
@@ -383,6 +403,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
aScaleX = aScaleY = 1.0;
aMinDistScale = 0.73;
aEdgeScale = 0.5;
+g_pBorderLines = 0;
pLines = 0;
pSubsLines = 0;
pSpecSubsLines = 0L;
@@ -397,6 +418,7 @@ SwSavePaintStatics::~SwSavePaintStatics()
pRetoucheFly = pSRetoucheFly;
pRetoucheFly2 = pSRetoucheFly2;
pFlyOnlyDraw = pSFlyOnlyDraw;
+g_pBorderLines = pBLines;
pLines = pSLines;
pSubsLines = pSSubsLines;
pSpecSubsLines = pSSpecSubsLines;
@@ -2889,6 +2911,7 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) const
pSubsLines = new SwSubsRects;
pSpecSubsLines = new SwSubsRects;
}
+g_pBorderLines = new BorderLines;
aPaintRect._Intersection( aRect );
@@ -3002,6 +3025,9 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) const
DELETEZ( pSubsLines );
DELETEZ( pSpecSubsLines );
}
+// fdo#42750: delay painting these until after subsidiary lines
+ProcessPrimitives(g_pBorderLines-GetBorderLines());
+DELETEZ(g_pBorderLines);
pVout-Leave();
// #i68597#
@@ -4507,11 +4533,8 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrm, _rRectFn,
bPrtOutputDev );
}
-// TODO Postpone the processing of the primitives
if ( lcl_GetLineWidth( pLeftRightBorder ) 0 )
{
-drawinglayer::primitive2d::Primitive2DSequence aSequence( 1 );
-
double nExtentIS = lcl_GetExtent( pTopBorder, NULL );
double nExtentIE = lcl_GetExtent( pBottomBorder, NULL );
double nExtentOS = lcl_GetExtent( NULL, pTopBorder );
@@ -4533,21 +4556,22 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
Color aLeftColor = _bLeft ? pLeftRightBorder-GetColorOut( _bLeft ) :
pLeftRightBorder
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit c6246139df005d6ac4627bc8f4665539effb6e94
Author: Noel Power noel.po...@novell.com
Date: Thu Mar 8 16:01:36 2012 +
fix uno bootstrapping for .NET ( and perhaps c++ ) fdo#46832
(cherry picked from commit c3d806be7d30a437607d924a4d33f13fe20dd1ba)
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 11d2a1e..2cf856c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -368,7 +368,9 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if
$(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib)
msvcprtd.lib kernel32.lib) user32.lib) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1));
RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) false;
fi) \
- $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $@.manifest ]; then
mt.exe $(MTFLAGS) -manifest $@.manifest -outputresource:$@\;1; fi) ; exit $$RC)
+ $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ];
then mt.exe $(MTFLAGS) -manifest $(DLLTARGET).manifest
-outputresource:$(DLLTARGET)\;2; fi) \
+ $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then
mt.exe $(MTFLAGS) -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+ ; exit $$RC)
endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/Library_fps.mk fpicker/source
fpicker/Library_fps.mk |1
fpicker/source/win32/folderpicker/Fopentry.cxx | 102 -
2 files changed, 103 deletions(-)
New commits:
commit f04e6b0e965e3a4301e705fb41a15c5560765b5b
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 15 10:28:33 2012 +0100
fdo#47246: fpicker: merge fop into fps: remove Fopentry.cxx
Forgot that in 095528351c3c916ef3c79f7275113ec628b4d473.
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index e70bdf4..986b167 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,fps,\
fpicker/source/win32/filepicker/VistaFilePickerImpl \
fpicker/source/win32/filepicker/WinFileOpenImpl \
fpicker/source/win32/folderpicker/FolderPicker \
- fpicker/source/win32/folderpicker/Fopentry \
fpicker/source/win32/folderpicker/MtaFop \
fpicker/source/win32/folderpicker/WinFOPImpl \
fpicker/source/win32/misc/AutoBuffer \
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx
b/fpicker/source/win32/folderpicker/Fopentry.cxx
deleted file mode 100644
index e90ea62..000
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-
-//---
-// includes of other projects
-//---
-#include cppuhelper/factory.hxx
-#include com/sun/star/container/XSet.hpp
-#include osl/diagnose.h
-
-#include FolderPicker.hxx
-
-#include FOPServiceInfo.hxx
-#include WinFOPImpl.hxx
-
-//---
-// namespace directives
-//---
-
-using namespace ::rtl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::container ;
-using namespace ::com::sun::star::lang ;
-using namespace ::com::sun::star::registry ;
-using namespace ::cppu ;
-using com::sun::star::ui::dialogs::XFolderPicker;
-
-
-namespace
-{
-
-//---
-//
-//---
-
-Reference XInterface SAL_CALL createInstance( const Reference
XMultiServiceFactory rServiceManager )
-{
-return Reference XInterface ( static_cast XFolderPicker* ( new
CFolderPicker( rServiceManager ) ) );
-}
-}
-
-extern C
-{
-
-//--
-// component_getFactory
-// returns a factory to create XFilePicker-Services
-//--
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char*
pImplName, uno_Interface* pSrvManager, uno_Interface* )
-{
-void* pRet = 0;
-
-if ( pSrvManager ( 0 == rtl_str_compare( pImplName,
FOLDER_PICKER_IMPL_NAME ) ) )
-{
-Sequence OUString aSNS( 1 );
-aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
FOLDER_PICKER_SERVICE_NAME ) );
-
-Reference XSingleServiceFactory xFactory ( createSingleFactory(
-reinterpret_cast XMultiServiceFactory* ( pSrvManager ),
-OUString::createFromAscii( pImplName ),
-createInstance,
-aSNS ) );
-if ( xFactory.is() )
-{
-xFactory-acquire();
-pRet = xFactory.get();
-}
-}
-
-return pRet;
-}
-
-} // extern C
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab
[Libreoffice-commits] .: Repository.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable
Repository.mk|4 +++ desktop/Executable_sbase.mk |9 +++- desktop/Executable_scalc.mk |9 +++- desktop/Executable_sdraw.mk |9 +++- desktop/Executable_simpress.mk |9 +++- desktop/Executable_smath.mk |9 +++- desktop/Executable_sweb.mk |9 +++- desktop/Executable_swriter.mk|9 +++- desktop/Module_desktop.mk|1 desktop/StaticLibrary_winlauncher.mk | 38 +++ 10 files changed, 71 insertions(+), 35 deletions(-) New commits: commit 5cc6398985181574b68ab15386176fb806386490 Author: Michael Stahl mst...@redhat.com Date: Wed Mar 14 12:30:53 2012 +0100 fdo#47246: desktop: factor out a winlauncher static library diff --git a/Repository.mk b/Repository.mk index ee6835c..351a365 100644 --- a/Repository.mk +++ b/Repository.mk @@ -83,6 +83,10 @@ $(eval $(call gb_Helper_register_executables,OOO,\ unopkgio \ )) +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + winlauncher \ +)) + else $(eval $(call gb_Helper_register_executables,OOO,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 37738a0..f3caf5b 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,sbase)) $(eval $(call gb_Executable_set_targettype_gui,sbase,YES)) -$(eval $(call gb_Executable_set_include,sbase,\ -$$(INCLUDE) \ -)) - $(eval $(call gb_Executable_add_defs,sbase,\ -DUNICODE \ )) @@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,sbase,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_linked_static_libs,sbase,\ +winlauncher \ +)) + $(eval $(call gb_Executable_add_noexception_objects,sbase,\ -desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/sbase \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index ec72742..3c9990b 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,scalc)) $(eval $(call gb_Executable_set_targettype_gui,scalc,YES)) -$(eval $(call gb_Executable_set_include,scalc,\ -$$(INCLUDE) \ -)) - $(eval $(call gb_Executable_add_defs,scalc,\ -DUNICODE \ )) @@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,scalc,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_linked_static_libs,scalc,\ +winlauncher \ +)) + $(eval $(call gb_Executable_add_noexception_objects,scalc,\ -desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/scalc \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 24fec0e..dcea97d 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,sdraw)) $(eval $(call gb_Executable_set_targettype_gui,sdraw,YES)) -$(eval $(call gb_Executable_set_include,sdraw,\ -$$(INCLUDE) \ -)) - $(eval $(call gb_Executable_add_defs,sdraw,\ -DUNICODE \ )) @@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,sdraw,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_linked_static_libs,sdraw,\ +winlauncher \ +)) + $(eval $(call gb_Executable_add_noexception_objects,sdraw,\ -desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/sdraw \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index f0b7241..ab0cbc0 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,simpress)) $(eval $(call gb_Executable_set_targettype_gui,simpress,YES)) -$(eval $(call gb_Executable_set_include,simpress,\ -$$(INCLUDE) \ -)) - $(eval $(call gb_Executable_add_defs,simpress,\ -DUNICODE \ )) @@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,simpress,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_linked_static_libs,simpress,\ +winlauncher \ +)) + $(eval $(call gb_Executable_add_noexception_objects,simpress,\ -desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/simpress \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index ff73c2a..fe1607b 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,smath)) $(eval $(call gb_Executable_set_targettype_gui,smath,YES)) -$(eval $(call gb_Executable_set_include,smath,\ -$$(INCLUDE) \ -)) - $(eval $(call gb_Executable_add_defs,smath,\ -DUNICODE \ )) @@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,smath,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_linked_static_libs,smath,\ +winlauncher \ +)) + $(eval $(call
[Libreoffice-commits] .: dtrans/Library_dnd.mk dtrans/Library_ftransl.mk dtrans/Library_sysdtrans.mk
dtrans/Library_dnd.mk |1 - dtrans/Library_ftransl.mk |5 - dtrans/Library_sysdtrans.mk |1 - 3 files changed, 4 insertions(+), 3 deletions(-) New commits: commit fe4be5047988782f3143a1af505c5eecb3f2af5a Author: Michael Stahl mst...@redhat.com Date: Wed Mar 14 13:20:50 2012 +0100 fdo#47246: dtrans: fix multiply linked ImplHelper No idea whether linking ftransl against static library dtobj is good, but the other two libraries here link against it already... diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 58f0f00..141d15b 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,dnd,\ dtrans/source/win32/dnd/target \ dtrans/source/win32/dnd/targetdragcontext \ dtrans/source/win32/dnd/targetdropcontext \ - dtrans/source/win32/misc/ImplHelper \ )) # vim: set noet sw=4 ts=4: diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index 3ba3c3e..706cbd0 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -50,8 +50,11 @@ $(eval $(call gb_Library_add_linked_libs,ftransl,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_linked_static_libs,ftransl,\ + dtobj \ +)) + $(eval $(call gb_Library_add_exception_objects,ftransl,\ - dtrans/source/win32/misc/ImplHelper \ dtrans/source/win32/ftransl/ftransl \ dtrans/source/win32/ftransl/ftranslentry \ )) diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 8fb7a41..8507675 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -67,7 +67,6 @@ $(eval $(call gb_Library_add_exception_objects,sysdtrans,\ dtrans/source/win32/clipb/WinClipboard \ dtrans/source/win32/clipb/wcbentry \ dtrans/source/win32/clipb/MtaOleClipb \ - dtrans/source/win32/misc/ImplHelper \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - Repository.mk desktop/Executable_soffice.bin.mk desktop/Executable_soffice.mk desktop/Executable_unopkg.mk desktop/Module_desktop.mk desktop/StaticLibrary_winexten
Repository.mk|1 desktop/Executable_soffice.bin.mk|5 -- desktop/Executable_soffice.mk|6 -- desktop/Executable_unopkg.mk |6 -- desktop/Module_desktop.mk|1 desktop/StaticLibrary_winextendloaderenv.mk | 34 + fpicker/Library_fop.mk | 67 --- fpicker/Library_fps.mk |6 ++ fpicker/Module_fpicker.mk|1 fpicker/source/win32/filepicker/FPentry.cxx | 28 +++ fpicker/source/win32/folderpicker/MtaFop.cxx |2 fpicker/source/win32/fps.component | 37 ++ fpicker/util/fop.component | 34 - fpicker/util/fps.component | 34 - postprocess/packcomponents/makefile.mk |3 - postprocess/rebase/coffbase.txt |1 scp2/source/ooo/file_library_ooo.scp | 11 17 files changed, 111 insertions(+), 166 deletions(-) New commits: commit 5142e628b563a9876e8884c5dd4914eff4a2f307 Author: Michael Stahl mst...@redhat.com Date: Wed Mar 14 16:20:27 2012 +0100 fdo#47246: fpicker: merge fop library into fps: Since nobody seems to know why these are separate, merge fop into fps. In case this untested change doesn't work out it should be reverted :) diff --git a/fpicker/Library_fop.mk b/fpicker/Library_fop.mk deleted file mode 100644 index 2d6091d..000 --- a/fpicker/Library_fop.mk +++ /dev/null @@ -1,67 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# 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) 2011 Matúš Kukan matus.ku...@gmail.com (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. - -$(eval $(call gb_Library_Library,fop)) - -$(eval $(call gb_Library_set_componentfile,fop,fpicker/util/fop)) - -$(eval $(call gb_Library_add_api,fop,\ - offapi \ - udkapi \ -)) - -$(eval $(call gb_Library_add_defs,fop,\ - -DUNICODE \ - -D_UNICODE \ -)) - -$(eval $(call gb_Library_add_linked_libs,fop,\ - comphelper \ - cppu \ - cppuhelper \ - sal \ - tl \ - vcl \ - advapi32 \ - gdi32 \ - ole32 \ - oleaut32 \ - shell32 \ - $(gb_STDLIBS) \ -)) - -$(eval $(call gb_Library_add_exception_objects,fop,\ - fpicker/source/win32/folderpicker/FolderPicker \ - fpicker/source/win32/folderpicker/Fopentry \ - fpicker/source/win32/folderpicker/MtaFop \ - fpicker/source/win32/folderpicker/WinFOPImpl \ - fpicker/source/win32/misc/AutoBuffer \ - fpicker/source/win32/misc/resourceprovider \ - fpicker/source/win32/misc/WinImplHelper \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 3d8a0a5..e70bdf4 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,fps)) $(eval $(call gb_Library_add_nativeres,fps,fps/src)) -$(eval $(call gb_Library_set_componentfile,fps,fpicker/util/fps)) +$(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps)) $(eval $(call gb_Library_add_api,fps,\ offapi \ @@ -93,6 +93,10 @@ $(eval $(call gb_Library_add_exception_objects,fps,\ fpicker/source/win32/filepicker/VistaFilePickerEventHandler \ fpicker/source/win32/filepicker/VistaFilePickerImpl \ fpicker/source/win32/filepicker/WinFileOpenImpl \ + fpicker/source/win32/folderpicker/FolderPicker \ + fpicker/source/win32/folderpicker/Fopentry \ + fpicker/source/win32/folderpicker/MtaFop \ + fpicker/source/win32/folderpicker/WinFOPImpl \ fpicker/source/win32/misc/AutoBuffer \ fpicker/source/win32/misc/resourceprovider \ fpicker/source/win32/misc/WinImplHelper \ diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk index 1f0696f..0491e54 100644 --- a/fpicker/Module_fpicker.mk +++ b/fpicker/Module_fpicker.mk @@ -44,7
[Libreoffice-commits] .: 2 commits - Repository.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Module_canvas.mk canvas/StaticLibrary_directxcanvas.mk ucb/Library_ucpodma1.m
Repository.mk |1 canvas/Library_directx9canvas.mk | 19 ++ canvas/Library_gdipluscanvas.mk | 19 ++ canvas/Module_canvas.mk |1 canvas/StaticLibrary_directxcanvas.mk | 62 ++ ucb/Library_ucpodma1.mk |5 ++ 6 files changed, 76 insertions(+), 31 deletions(-) New commits: commit a13a88bd2c673d059b60e339dcf3b8fabf991f18 Author: Michael Stahl mst...@redhat.com Date: Wed Mar 14 21:08:03 2012 +0100 fdo#47246: canvas: split out static library directxcanvas diff --git a/Repository.mk b/Repository.mk index 147eca9..6f1b12c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -84,6 +84,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\ )) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + directxcanvas \ winextendloaderenv \ winlauncher \ )) diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 070df09..0b1da59 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -61,37 +61,26 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\ $(gb_STDLIBS) \ )) -ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,directx9canvas,\ d3d9 \ gdi32 \ gdiplus \ )) -endif + +$(eval $(call gb_Library_add_linked_static_libs,directx9canvas,\ + directxcanvas \ +)) $(eval $(call gb_Library_add_exception_objects,directx9canvas,\ canvas/source/directx/dx_9rm \ - canvas/source/directx/dx_bitmap \ - canvas/source/directx/dx_bitmapcanvashelper \ - canvas/source/directx/dx_canvasbitmap \ canvas/source/directx/dx_canvascustomsprite \ - canvas/source/directx/dx_canvasfont \ - canvas/source/directx/dx_canvashelper \ - canvas/source/directx/dx_canvashelper_texturefill \ canvas/source/directx/dx_config \ - canvas/source/directx/dx_devicehelper \ - canvas/source/directx/dx_gdiplususer \ - canvas/source/directx/dx_impltools \ - canvas/source/directx/dx_linepolypolygon \ canvas/source/directx/dx_spritecanvas \ canvas/source/directx/dx_spritecanvashelper \ canvas/source/directx/dx_spritedevicehelper \ canvas/source/directx/dx_spritehelper \ canvas/source/directx/dx_surfacebitmap \ canvas/source/directx/dx_surfacegraphics \ - canvas/source/directx/dx_textlayout \ - canvas/source/directx/dx_textlayout_drawhelper \ - canvas/source/directx/dx_vcltools \ )) # vim: set noet sw=4 ts=4: diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 7531d75..3be70e5 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -67,28 +67,17 @@ $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ $(gb_STDLIBS) \ )) -ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ gdi32 \ gdiplus \ )) -endif + +$(eval $(call gb_Library_add_linked_static_libs,gdipluscanvas,\ + directxcanvas \ +)) $(eval $(call gb_Library_add_exception_objects,gdipluscanvas,\ - canvas/source/directx/dx_bitmap \ - canvas/source/directx/dx_bitmapcanvashelper \ canvas/source/directx/dx_canvas \ - canvas/source/directx/dx_canvasbitmap \ - canvas/source/directx/dx_canvasfont \ - canvas/source/directx/dx_canvashelper \ - canvas/source/directx/dx_canvashelper_texturefill \ - canvas/source/directx/dx_devicehelper \ - canvas/source/directx/dx_gdiplususer \ - canvas/source/directx/dx_impltools \ - canvas/source/directx/dx_linepolypolygon \ - canvas/source/directx/dx_textlayout \ - canvas/source/directx/dx_textlayout_drawhelper \ - canvas/source/directx/dx_vcltools \ )) # vim: set noet sw=4 ts=4: diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk index 8595611..e7aad78 100644 --- a/canvas/Module_canvas.mk +++ b/canvas/Module_canvas.mk @@ -49,6 +49,7 @@ ifneq ($(strip $(ENABLE_DIRECTX)),) $(eval $(call gb_Module_add_targets,canvas,\ Library_directx9canvas \ Library_gdipluscanvas \ + StaticLibrary_directxcanvas \ )) endif diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk new file mode 100644 index 000..cd74a2c --- /dev/null +++ b/canvas/StaticLibrary_directxcanvas.mk @@ -0,0 +1,62 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# +# 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
[Libreoffice-commits] .: 5 commits - filter/inc filter/source sw/source toolkit/inc toolkit/source writerfilter/inc
filter/inc/filter/msfilter/msdffimp.hxx | 14 +
filter/source/graphicfilter/icgm/actimpr.cxx | 10 -
filter/source/graphicfilter/icgm/elements.cxx | 33
filter/source/graphicfilter/icgm/elements.hxx |7
filter/source/msfilter/msdffimp.cxx | 142 --
sw/source/ui/docvw/srcedtw.cxx| 23 +-
sw/source/ui/inc/srcedtw.hxx |7
toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx |5
toolkit/source/helper/unopropertyarrayhelper.cxx | 26 +--
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 13 +
10 files changed, 130 insertions(+), 150 deletions(-)
New commits:
commit a4a7b956dc0ad439b52ef188ba0f4e5bcc215f91
Author: Noel Grandin noelgran...@gmail.com
Date: Sun Mar 11 13:14:36 2012 +0200
Convert tools/table.hxx usage to std::set in toolkit module in
UnoPropertyArrayHelper class
diff --git a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
index c109528..8fc5aef 100644
--- a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
@@ -32,9 +32,8 @@
#include toolkit/dllapi.h
#include cppuhelper/propshlp.hxx
-#include tools/table.hxx
-
#include list
+#include set
#include toolkit/dllapi.h
//
@@ -43,7 +42,7 @@
class TOOLKIT_DLLPUBLIC UnoPropertyArrayHelper : public
::cppu::IPropertyArrayHelper
{
private:
-Table maIDs;
+std::setsal_Int32 maIDs;
protected:
sal_BoolImplHasProperty( sal_uInt16 nPropId ) const;
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx
b/toolkit/source/helper/unopropertyarrayhelper.cxx
index 59403f8..17f518e 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.cxx
@@ -29,6 +29,7 @@
#include toolkit/helper/unopropertyarrayhelper.hxx
#include toolkit/helper/property.hxx
+#include map
//
// class UnoPropertyArrayHelper
@@ -39,14 +40,14 @@ UnoPropertyArrayHelper::UnoPropertyArrayHelper( const
::com::sun::star::uno::Seq
sal_Int32 nIDs = rIDs.getLength();
const sal_Int32* pIDs = rIDs.getConstArray();
for ( sal_Int32 n = 0; n nIDs; n++ )
-maIDs.Insert( pIDs[n], (void*)1L );
+maIDs.insert( pIDs[n] );
}
UnoPropertyArrayHelper::UnoPropertyArrayHelper( const std::list sal_uInt16
rIDs )
{
std::list sal_uInt16 ::const_iterator iter;
for( iter = rIDs.begin(); iter != rIDs.end(); ++iter)
- maIDs.Insert( *iter, (void*)1L);
+ maIDs.insert( *iter );
}
sal_Bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const
@@ -54,7 +55,7 @@ sal_Bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16
nPropId ) const
if ( ( nPropId = BASEPROPERTY_FONTDESCRIPTORPART_START ) ( nPropId =
BASEPROPERTY_FONTDESCRIPTORPART_END ) )
nPropId = BASEPROPERTY_FONTDESCRIPTOR;
-return maIDs.Get( nPropId ) ? sal_True : sal_False;
+return maIDs.find( nPropId ) != maIDs.end() ? sal_True : sal_False;
}
// ::cppu::IPropertyArrayHelper
@@ -76,29 +77,28 @@ sal_Bool
UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString *
{
// Sortiert nach Namen...
-Table aSortedPropsIds;
-sal_uInt32 nProps = maIDs.Count();
-for ( sal_uInt32 s = 0; s nProps; s++ )
+std::mapsal_Int32, sal_uInt16 aSortedPropsIds;
+for( std::setsal_Int32::const_iterator it = maIDs.begin(); it !=
maIDs.end(); ++it)
{
-sal_uInt16 nId = sal::static_int_cast sal_uInt16 (
-maIDs.GetObjectKey( s ));
-aSortedPropsIds.Insert( 1+GetPropertyOrderNr( nId ),
(void*)(sal_uIntPtr)nId );
+sal_uInt16 nId = sal::static_int_cast sal_uInt16 (*it);
+aSortedPropsIds[ 1+GetPropertyOrderNr( nId ) ] = nId;
if ( nId == BASEPROPERTY_FONTDESCRIPTOR )
{
// Einzelproperties...
for ( sal_uInt16 i = BASEPROPERTY_FONTDESCRIPTORPART_START; i =
BASEPROPERTY_FONTDESCRIPTORPART_END; i++ )
-aSortedPropsIds.Insert( 1+GetPropertyOrderNr( i ),
(void*)(sal_uIntPtr)i );
+aSortedPropsIds[ 1+GetPropertyOrderNr( i ) ] = i;
}
}
-nProps = aSortedPropsIds.Count(); // koennen jetzt mehr sein
+sal_uInt32 nProps = aSortedPropsIds.size(); // koennen jetzt mehr sein
::com::sun::star::uno::Sequence ::com::sun::star::beans::Property
aProps( nProps );
::com::sun::star::beans::Property* pProps = aProps.getArray();
-for ( sal_uInt32 n = 0; n nProps; n++ )
+std::mapsal_Int32, sal_uInt16::const_iterator it =
aSortedPropsIds.begin();
+for ( sal_uInt32 n = 0; n nProps; n++, ++it )
{
-sal_uInt16 nId = (sal_uInt16)(sal_uLong)aSortedPropsIds.GetObject( n );
+sal_uInt16
[Libreoffice-commits] .: 11 commits - Makefile Repository.mk desktop/Library_deploymentmisc.mk desktop/Library_sofficeapp.mk desktop/Library_unopkgapp.mk desktop/source extensions/Executable_nsplugin.
Makefile |7
Repository.mk|3
desktop/Library_deploymentmisc.mk|1
desktop/Library_sofficeapp.mk|6
desktop/Library_unopkgapp.mk |1
desktop/source/app/lockfile.cxx | 227 ---
desktop/source/app/lockfile.hxx | 97 ---
desktop/source/deployment/inc/lockfile.hxx | 99 +++
desktop/source/deployment/misc/lockfile.cxx | 227 +++
desktop/source/pkgchk/unopkg/unopkg_misc.cxx |2
extensions/Executable_nsplugin.mk|5
extensions/Executable_pluginapp.bin.mk |6
extensions/Library_npsoplugin.mk |2
extensions/Library_pl.mk |6
extensions/Module_extensions.mk |2
extensions/StaticLibrary_npsoenv.mk | 34
extensions/StaticLibrary_plugcon.mk | 75
sax/Library_expwrap.mk |2
sax/Library_fastsax.mk |9 -
sax/Library_sax.mk |1
sax/inc/xml2utf.hxx | 11 -
sax/source/expatwrap/xml2utf.cxx |8
sdext/CppunitTest_pdfimport.mk |5
sdext/Executable_pdf2xml.mk | 23 --
sdext/Executable_pdfunzip.mk | 23 --
sdext/Library_pdfimport.mk | 29 ---
sdext/Module_sdext.mk|1
sdext/StaticLibrary_pdfimport_s.mk | 76 +
smoketest/CppunitTest_smoketest.mk |5
vcl/Library_vcl.mk |4
30 files changed, 561 insertions(+), 436 deletions(-)
New commits:
commit b7c79fc2efddc38bea2a459d146c2f80300eb34e
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 18:26:00 2012 +0100
sax: replace Min/Max macros with std::max
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 2421442..b22b96a 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -29,10 +29,6 @@
#include sax/dllapi.h
-// TODO: Woher?
-#define Max( a, b ) (((a)(b)) ? (a) : (b) )
-#define Min( a, b ) (((a)(b)) ? (a) : (b) )
-
/*
*
* Text2UnicodeConverter
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index edebc8a..b49d3dc 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -27,12 +27,13 @@
/
#include string.h
+#include algorithm
+
#include sal/types.h
#include rtl/textenc.h
#include rtl/tencinfo.h
-
#include com/sun/star/io/XInputStream.hpp
using namespace ::com::sun::star::uno;
@@ -54,8 +55,9 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert(
Sequencesal_Int8 seq , sal_In
throw NotConnectedException();
}
if( ! m_bStarted ) {
-nMaxToRead = Max( 512 , nMaxToRead ); // it should be possible to
find the encoding attribute
- // within the first 512 bytes
== 128 chars in UCS-4
+// it should be possible to find the encoding attribute
+// within the first 512 bytes == 128 chars in UCS-4
+nMaxToRead = ::std::max( 512 , nMaxToRead );
}
sal_Int32 nRead;
commit 7191b52c00b1affbf44c7bf6d4cd43d21ae5e3ce
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 18:06:28 2012 +0100
Makefile: subsequentcheck should only run tests
... so drop the dependency on dev-install (with it, subsequentcheck is
just a synonym for check, which does not seem useful).
diff --git a/Makefile b/Makefile
index 4af3892..c9ff3b8 100644
--- a/Makefile
+++ b/Makefile
@@ -486,9 +486,9 @@ findunusedcode:
| grep -v ^WPS \
unusedcode.easy
-check: subsequentcheck
+check: dev-install subsequentcheck
-subsequentcheck: dev-install
+subsequentcheck :| $(if $(filter-out
subsequentcheck,$(MAKECMDGOALS)),dev-install)
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
debugrun:
commit 5f86eca62fc53fbd9de2a6d74188116722bd9d62
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 17:55:32 2012 +0100
Makefile: add $(module).subsequentcheck targets
diff --git a/Makefile b/Makefile
index f43fa3c..4af3892 100644
--- a/Makefile
+++ b/Makefile
@@ -254,6 +254,9 @@ $(1).all: bootstrap fetch
$(1).clean:
cd $(1) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean
gb_PARTIALBUILD=T
+$(1).subsequentcheck:
+ cd $(1) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
subsequentcheck gb_PARTIALBUILD=T
+
$(1).deliver:
@true
commit 9365c975f8d2423c238961c0771ddeeae687f4cf
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 18:16:54 2012 +0100
sax: move xml2utf.cxx to libsax to prevent duplicate linkage warnings
diff --git a/sax/Library_expwrap.mk b
[Libreoffice-commits] .: sw/source
sw/source/core/layout/flowfrm.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b7c2124b39e8a93c8dadfaec5257e491da9fdda1
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 22:42:15 2012 +0100
SwFlowFrm::CalcUpperSpace: fix crash with null pPrevFrm in framework_unoapi
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index fe1ed54..1aacdbc 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1626,8 +1626,11 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs
*pAttrs,
bool bContextualSpacing = pAttrs-GetULSpace().GetContext();
delete pAccess;
-if (bContextualSpacing lcl_getContextualSpacing(pPrevFrm)
lcl_IdenticalStyles(pPrevFrm, rThis))
+if (bContextualSpacing pPrevFrm lcl_getContextualSpacing(pPrevFrm)
+ lcl_IdenticalStyles(pPrevFrm, rThis))
+{
return 0;
+}
else
return nUpper;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppcanvas/source pyuno/source
cppcanvas/source/inc/implrenderer.hxx|2 +-
cppcanvas/source/mtfrenderer/emfplus.cxx |6 +++---
pyuno/source/module/pyuno.cxx|2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 24b449b7fcaaee20ef8feebfd64fc761535f77a8
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 9 15:35:36 2012 +0100
cppcanvas: processEMFPlus: fix valgrind warning:
When reading EmfPlusRecordTypeDrawImagePoints, handle the variant where
points are stored as 16-bit integers instead of floats correctly.
Found via valgrind on loading bugdoc from fdo#42252.
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index d41d504..034af02 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -215,7 +215,7 @@ static float GetSwapFloat( SvStream rSt )
/* EMF+ */
void ReadRectangle (SvStream s, float x, float y, float width,
float height, sal_uInt32 flags = 0);
-void ReadPoint (SvStream s, float x, float y, sal_uInt32 flags
= 0);
+void ReadPoint (SvStream s, float x, float y, sal_uInt32 flags);
void MapToDevice (double x, double y);
::basegfx::B2DPoint Map (double ix, double iy);
::basegfx::B2DSize MapSize (double iwidth, double iheight);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 953a0c8..4c92728 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1406,9 +1406,9 @@ namespace cppcanvas
if (unknown == 3) { // it probably means number of
points defining destination rectangle
float x1, y1, x2, y2, x3, y3;
-ReadPoint (rMF, x1, y1);
-ReadPoint (rMF, x2, y2);
-ReadPoint (rMF, x3, y3);
+ReadPoint (rMF, x1, y1, flags);
+ReadPoint (rMF, x2, y2, flags);
+ReadPoint (rMF, x3, y3, flags);
BitmapEx aBmp( image.graphic.GetBitmapEx () );
const Rectangle aCropRect
(::vcl::unotools::pointFromB2DPoint (Map (sx, sy)),
commit 06484b6946ac6a974c24af6624fb75bbe298c1e8
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 9 11:28:28 2012 +0100
fdo#46926: fix the fix for Python 3
Thanks to Maxime de Roucy for the hint that the cmpfunc type doesn't
exist.
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 555fefd..d51ad3b 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -661,7 +661,7 @@ static PyTypeObject PyUNOType =
(printfunc) 0,
(getattrfunc) PyUNO_getattr,
(setattrfunc) PyUNO_setattr,
-(cmpfunc) 0,
+/* this type does not exist in Python 3: (cmpfunc) */ 0,
(reprfunc) PyUNO_repr,
0,
0,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 6eea398000f04c68f422ab07353ea4631f4edb5e
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Jan 9 15:51:10 2012 +0100
fdo#46337: don't use an invalidated iterator
(cherry picked from commit 2df1c40b4b7cb3107a68984db644f10097f04c3c)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d9f3376..0ea06b7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -517,7 +517,7 @@ void DocxAttributeOutput::StartRun( const SwRedlineData*
pRedlineData )
void DocxAttributeOutput::EndRun()
{
// Write field starts
-for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt !=
m_Fields.end(); ++pIt )
+for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt !=
m_Fields.end(); )
{
// Add the fields starts for all but hyperlinks and TOCs
if ( pIt-bOpen pIt-pField )
@@ -528,10 +528,11 @@ void DocxAttributeOutput::EndRun()
// Unknown fields sould be removed too
if ( !pIt-bClose || ( pIt-eType == ww::eUNKNOWN ) )
{
-m_Fields.erase( pIt );
---pIt;
+pIt = m_Fields.erase( pIt );
+continue;
}
}
+++pIt;
}
// write the run properties + the text, already in the correct order
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/docvw/edtwin.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 87279e0e812bac7f2c17f2758a39bcfd942214af Author: Michael Stahl mst...@redhat.com Date: Fri Mar 9 20:30:56 2012 +0100 fdo#45962: fix context menu key yanking cursor out of header/footer For the context menu key VCL synthesizes a cursor position that is the center of the window, hence likely to be in the document body. When SwEditWin::Command calls lcl_CheckHeaderFooterClick, it then moves the document view cursor; prevent that by only calling that for actual mouse events. (regression from a6176612ff1a6a142a68964b2c0834d28125fc45) diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 2613779..bb2daba 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -4733,7 +4733,7 @@ void SwEditWin::Command( const CommandEvent rCEvt ) if (rView.GetPostItMgr()-IsHit(rCEvt.GetMousePosPixel())) return; -if ( lcl_CheckHeaderFooterClick( rSh, +if (rCEvt.IsMouseEvent() lcl_CheckHeaderFooterClick( rSh, PixelToLogic( rCEvt.GetMousePosPixel() ), 1 ) ) return; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sdext/Configuration_minimizer.mk sdext/Configuration_presenter.mk solenv/gbuild tail_build/prj
sdext/Configuration_minimizer.mk |2 +- sdext/Configuration_presenter.mk |2 +- solenv/gbuild/AllLangResTarget.mk |3 ++- solenv/gbuild/ComponentTarget.mk |7 --- solenv/gbuild/Configuration.mk| 34 ++ solenv/gbuild/Executable.mk |2 +- solenv/gbuild/Package.mk | 19 ++- solenv/gbuild/Rdb.mk |8 +--- solenv/gbuild/UnoApiTarget.mk |9 + solenv/gbuild/Zip.mk |2 +- tail_build/prj/build.lst |2 +- 11 files changed, 57 insertions(+), 33 deletions(-) New commits: commit 294b86e3dbbdb9b136cb17a51687f4e2762711cf Author: Michael Stahl mst...@redhat.com Date: Thu Mar 8 09:55:50 2012 +0100 gbuild: fix mkdir optimization with make 3.81 The problem is that make 3.81 does not match pattern rules whose target ends with '/' against directories. (regression from 408822b54724f8170a1296ddd67e50d8291c8ee1, 90491a073c5b5faee782ad5eab63276fda2342e6) So use a fake file .dir in the respective directory, and try not to spawn unnecessary mkdir processes by checking for existence via realpath. This is all quite ugly and should be reverted once support for make 3.81 is dropped. Also, fix a pre-existing problem of pattern rules with multiple targets that used to work by accident in Package.mk. diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 344f6d8..1df1fb1 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -356,7 +356,8 @@ $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target, $(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) $(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1)) -$(call gb_ResTarget_get_outdir_imagelist_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_imagelist_target,$(1))) +$(call gb_ResTarget_get_outdir_imagelist_target,$(1)) :| \ + $(dir $(call gb_ResTarget_get_outdir_imagelist_target,$(1))).dir $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1)) diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index adec783..9eb0ea5 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -52,8 +52,9 @@ $(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$ $(call gb_ComponentTarget_get_target,%) : $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.)) -$(call gb_ComponentTarget_get_outdir_target,%/) : - mkdir -p $@ +# the .dir is for make 3.81, which ignores trailing / +$(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir : + mkdir -p $(dir $@) $(call gb_ComponentTarget_get_outdir_target,%) : $(call gb_Deliver_deliver,$,$@) @@ -63,7 +64,7 @@ $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) $(call gb_ComponentTarget_get_outdir_target,$(1)) : \ $(call gb_ComponentTarget_get_target,$(1)) \ - | $(dir $(call gb_ComponentTarget_get_outdir_target,$(1))) + | $(dir $(call gb_ComponentTarget_get_outdir_target,$(1))).dir $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1)) endef diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index c16bc13..ffced85 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -101,8 +101,11 @@ $(call gb_XcsTarget_get_clean_target,%) : rm -f $(call gb_XcsTarget_get_target,$*) \ $(call gb_XcsTarget_get_outdir_target,$(XCSFILE))) -$(call gb_XcsTarget_get_outdir_target,%/) : - mkdir -p $@ +# the .dir is for make 3.81, which ignores trailing / +$(dir $(call gb_XcsTarget_get_outdir_target,%))%/.dir : + $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) +$(dir $(call gb_XcsTarget_get_outdir_target,%)).dir : + $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) $(call gb_XcsTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ @@ -145,8 +148,11 @@ $(call gb_XcuDataTarget_get_clean_target,%) : rm -f $(call gb_XcuDataTarget_get_target,$*) \ $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE))) -$(call gb_XcuDataTarget_get_outdir_target,%/) : - mkdir -p $@ +# the .dir is for make 3.81, which ignores trailing / +$(dir $(call
[Libreoffice-commits] .: sw/source
sw/source/core/fields/docufld.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 49e07aa0de601dfa43820f3ff1d54d0c80054016
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 8 16:50:32 2012 +0100
docufld.cxx: Apple gcc can't find min(sal_Int32, int)
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index 1f2e16e..79233a1 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2566,7 +2566,8 @@ const rtl::OUString SwCombinedCharField::GetPar1() const
void SwCombinedCharField::SetPar1(const rtl::OUString rStr)
{
-sCharacters = rStr.copy(0, std::min(rStr.getLength(),
MAX_COMBINED_CHARACTERS));
+sCharacters = rStr.copy(0, std::min(rStr.getLength(),
+static_castsal_Int32(MAX_COMBINED_CHARACTERS)));
}
bool SwCombinedCharField::QueryValue( uno::Any rAny,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - pyuno/source qadevOOo/tests sw/source
pyuno/source/module/pyuno.cxx| 13 ++-
pyuno/source/module/uno.py | 14 ++-
qadevOOo/tests/java/ifc/beans/_XPropertySet.java |4 +
sw/source/core/layout/atrfrm.cxx | 22 ++---
sw/source/core/layout/colfrm.cxx |2
sw/source/core/layout/findfrm.cxx| 45 +--
sw/source/core/layout/flycnt.cxx | 33
sw/source/core/layout/flyincnt.cxx |2
sw/source/core/layout/pagedesc.cxx |7 -
sw/source/core/layout/paintfrm.cxx | 52 ++---
sw/source/core/layout/wsfrm.cxx | 90 +++
11 files changed, 148 insertions(+), 136 deletions(-)
New commits:
commit 387389b644b91808fdee74846b2d855382f48ed7
Author: David Bolen db3l@gmail.com
Date: Wed Mar 7 11:13:52 2012 +0100
fdo#46926: fix UNO struct comparison in Python 2
This requires setting a rich comparison flag in Python 2, while Python 3
uses rich comparison by default.
(regression from a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe)
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index b7724c7..555fefd 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -641,9 +641,16 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject
*that, int op )
{
raisePyExceptionWithAny( makeAny( e ) );
}
-return Py_False;
+return (op == Py_EQ ? Py_False : Py_True);
}
+/* Python 2 has a tp_flags value for rich comparisons. Python 3 does not (on
by default) */
+#ifdef Py_TPFLAGS_HAVE_RICHCOMPARE
+#define TP_FLAGS (Py_TPFLAGS_HAVE_RICHCOMPARE)
+#else
+#define TP_FLAGS 0
+#endif
+
static PyTypeObject PyUNOType =
{
PyVarObject_HEAD_INIT( PyType_Type, 0 )
@@ -654,7 +661,7 @@ static PyTypeObject PyUNOType =
(printfunc) 0,
(getattrfunc) PyUNO_getattr,
(setattrfunc) PyUNO_setattr,
-0,
+(cmpfunc) 0,
(reprfunc) PyUNO_repr,
0,
0,
@@ -665,7 +672,7 @@ static PyTypeObject PyUNOType =
(getattrofunc)0,
(setattrofunc)0,
NULL,
-0,
+TP_FLAGS,
NULL,
(traverseproc)0,
(inquiry)0,
commit 4634cbc237239da771e0f6a81f78171ecec726ba
Author: David Bolen db3l@gmail.com
Date: Wed Mar 7 11:07:42 2012 +0100
fdo#46859: adapt string type checks to work with both Python 2 and 3
(regression from a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe)
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index f93ac5e..e82d2fe 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -35,6 +35,12 @@ try:
except ImportError:
import builtins as __builtin__
+try:
+unicode
+except NameError:
+# Python 3 compatibility
+unicode = str
+
import socket # since on Windows sal3.dll no longer calls WSAStartup
# all functions and variables starting with a underscore (_) must be
considered private
@@ -159,9 +165,9 @@ class Bool(object):
Note: This class is deprecated. Use python's True and False directly
instead
def __new__(cls, value):
-if isinstance(value, str) and value == true:
+if isinstance(value, (str, unicode)) and value == true:
return True
-if isinstance(value, str) and value == false:
+if isinstance(value, (str, unicode)) and value == false:
return False
if value:
return True
@@ -171,7 +177,7 @@ class Char:
Represents a UNO char, use an instance of this class to explicitly pass a
char to UNO
# @param value pass a Unicode string with length 1
def __init__(self,value):
-assert isinstance(value, str)
+assert isinstance(value, unicode)
assert len(value) == 1
self.value=value
@@ -179,7 +185,7 @@ class Char:
return Char instance %s % (self.value, )
def __eq__(self, that):
-if isinstance(that, str):
+if isinstance(that, (str, unicode)):
if len(that) 1:
return False
return self.value == that[0]
commit 73867da36960adf8b79ff34c7094c63aa5a05940
Author: Michael Stahl mst...@redhat.com
Date: Tue Mar 6 23:51:54 2012 +0100
qadevOOo: _XPropertySet.java: fix unrealistic expectations:
We can't assume that when setting properties whose semantics we don't
know to random values in an arbitrary order, a non-changing value
indicates any kind of error.
The only real error this test can detect is if setting a property
crashes.
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
index 07efacb..09e933f 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
@@ -319,11 +319,15 @@ public class _XPropertySet extends MultiMethodTest {
property '+ propertyName
[Libreoffice-commits] .: 2 commits - sw/JunitTest_sw_complex.mk sw/qa
sw/JunitTest_sw_complex.mk |2
sw/qa/complex/writer/CheckFields.java | 173
sw/qa/complex/writer/testdocuments/fdo39694.ott |binary
3 files changed, 175 insertions(+)
New commits:
commit 870e5a8e8251967b513b4255231ee9665b085431
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 5 12:20:48 2012 +0100
fdo#39694, fdo#42073: add junit test for these
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 28d3282..381417b 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
sw/qa/complex/writer/CheckBookmarks \
sw/qa/complex/writer/CheckCrossReferences \
sw/qa/complex/writer/CheckFlies \
+sw/qa/complex/writer/CheckFields \
sw/qa/complex/writer/CheckIndexedPropertyValues \
sw/qa/complex/writer/CheckNamedPropertyValues \
sw/qa/complex/writer/LoadSaveTest \
@@ -60,6 +61,7 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
complex.writer.CheckBookmarks \
complex.checkColor.CheckChangeColor \
complex.writer.CheckCrossReferences \
+complex.writer.CheckFields\
complex.writer.CheckFlies \
complex.writer.CheckIndexedPropertyValues \
complex.writer.CheckNamedPropertyValues \
diff --git a/sw/qa/complex/writer/CheckFields.java
b/sw/qa/complex/writer/CheckFields.java
new file mode 100644
index 000..f966e52
--- /dev/null
+++ b/sw/qa/complex/writer/CheckFields.java
@@ -0,0 +1,173 @@
+/* -*- 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 Red Hat, Inc., Michael Stahl mst...@redhat.com
(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.
+ */
+
+package complex.writer;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.container.XEnumeration;
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextContent;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextField;
+import com.sun.star.text.XTextFieldsSupplier;
+import com.sun.star.text.XTextRange;
+import com.sun.star.text.XTextCursor;
+
+import org.openoffice.test.OfficeConnection;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import java.util.Set;
+import java.util.HashSet;
+
+
+public class CheckFields
+{
+private static final OfficeConnection connection = new OfficeConnection();
+
+@BeforeClass public static void setUpConnection() throws Exception {
+connection.setUp();
+//Thread.sleep(5000);
+}
+
+@AfterClass public static void tearDownConnection()
+throws InterruptedException, com.sun.star.uno.Exception
+{
+connection.tearDown();
+}
+
+private XMultiServiceFactory m_xMSF = null;
+private XComponentContext m_xContext = null;
+private XTextDocument m_xDoc = null;
+
+@Before public void before() throws Exception
+{
+m_xMSF = UnoRuntime.queryInterface(
+XMultiServiceFactory.class,
+connection.getComponentContext().getServiceManager());
+m_xContext = connection.getComponentContext();
+assertNotNull(could not get component context., m_xContext);
+m_xDoc = util.WriterTools.createTextDoc(m_xMSF);
+}
+
+@After public void after()
+{
+util.DesktopTools.closeDoc(m_xDoc);
+}
+
+@Test
+public void test_fdo39694_load() throws Exception
+{
+PropertyValue[] loadProps = new PropertyValue[2];
+loadProps[0] = new PropertyValue();
+loadProps[0].Name = AsTemplate;
+loadProps[0].Value = new Boolean(true
[Libreoffice-commits] .: sw/qa
sw/qa/complex/writer/CheckFields.java |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 72a3c7a2778c493ef1d3f740a0b4b14f805c624a
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 5 12:32:39 2012 +0100
sw: CheckFields: oops, forgot to close the document
diff --git a/sw/qa/complex/writer/CheckFields.java
b/sw/qa/complex/writer/CheckFields.java
index f966e52..00c6916 100644
--- a/sw/qa/complex/writer/CheckFields.java
+++ b/sw/qa/complex/writer/CheckFields.java
@@ -36,6 +36,7 @@ import com.sun.star.lang.XServiceInfo;
import com.sun.star.beans.XPropertySet;
import com.sun.star.beans.PropertyValue;
import com.sun.star.container.XEnumeration;
+import com.sun.star.util.XCloseable;
import com.sun.star.text.XText;
import com.sun.star.text.XTextContent;
import com.sun.star.text.XTextDocument;
@@ -138,6 +139,11 @@ public class CheckFields
}
}
assertTrue(placeholders.isEmpty());
+XCloseable xClos = (XCloseable) UnoRuntime.queryInterface(
+XCloseable.class, xComp);
+if (xClos != null) {
+xClos.close(true);
+}
}
@Test
___
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 | 30 +++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1
2 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit e67c7884d10caf4714d152f1d98c0f4f7e6c10f1
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 11:38:29 2012 +0100
implement RTF import of non-box paragraph borders
(cherry picked from commit 343b52ee76f1a88a27007319af644dcce76536cc)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 413a82f..737350b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -146,7 +146,7 @@ static RTFSprms lcl_getLastAttributes(RTFSprms rSprms, Id
nId)
static void lcl_putBorderProperty(std::stackRTFParserState aStates, Id nId,
RTFValue::Pointer_t pValue)
{
-if (aStates.top().nBorderState == BORDER_PARAGRAPH)
+if (aStates.top().nBorderState == BORDER_PARAGRAPH_BOX)
for (int i = 0; i 4; i++)
{
RTFValue::Pointer_t p =
aStates.top().aParagraphSprms.find(lcl_getParagraphBorder(i));
@@ -156,6 +156,12 @@ static void
lcl_putBorderProperty(std::stackRTFParserState aStates, Id nId, R
rAttributes-push_back(make_pair(nId, pValue));
}
}
+else if (aStates.top().nBorderState == BORDER_PARAGRAPH)
+{
+// Attributes of the last border type
+RTFSprms rAttributes =
lcl_getLastAttributes(aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PrBase_pBdr);
+rAttributes-push_back(make_pair(nId, pValue));
+}
else if (aStates.top().nBorderState == BORDER_CELL)
{
// Attributes of the last border type
@@ -1754,7 +1760,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcLeft,
pValue));
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcBottom,
pValue));
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcRight,
pValue));
-m_aStates.top().nBorderState = BORDER_PARAGRAPH;
+m_aStates.top().nBorderState = BORDER_PARAGRAPH_BOX;
}
break;
case RTF_LTRSECT:
@@ -1831,6 +1837,26 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().nBorderState = BORDER_PAGE;
}
break;
+case RTF_BRDRT:
+case RTF_BRDRL:
+case RTF_BRDRB:
+case RTF_BRDRR:
+{
+RTFSprms aAttributes;
+RTFSprms aSprms;
+RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
+switch (nKeyword)
+{
+case RTF_BRDRT: nParam = lcl_getParagraphBorder(0); break;
+case RTF_BRDRL: nParam = lcl_getParagraphBorder(1); break;
+case RTF_BRDRB: nParam = lcl_getParagraphBorder(2); break;
+case RTF_BRDRR: nParam = lcl_getParagraphBorder(3); break;
+default: break;
+}
+lcl_putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PrBase_pBdr, nParam, pValue);
+m_aStates.top().nBorderState = BORDER_PARAGRAPH;
+}
+break;
case RTF_CLVMGF:
{
RTFValue::Pointer_t pValue(new
RTFValue(NS_ooxml::LN_Value_ST_Merge_restart));
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 0e92eb4..713fd7d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -116,6 +116,7 @@ namespace writerfilter {
{
BORDER_NONE,
BORDER_PARAGRAPH,
+BORDER_PARAGRAPH_BOX,
BORDER_CELL,
BORDER_PAGE
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - oox/source sfx2/source sw/inc sw/source unotest/source
oox/source/drawingml/shape.cxx| 28 -
sfx2/source/doc/QuerySaveDocument.cxx |5 +
sw/inc/txtfld.hxx |3
sw/source/core/crsr/crstrvl.cxx |3
sw/source/core/txtnode/atrfld.cxx |7 +
sw/source/core/txtnode/thints.cxx |3
sw/source/core/unocore/unofield.cxx | 48 --
unotest/source/java/org/openoffice/test/OfficeConnection.java |7 +
8 files changed, 64 insertions(+), 40 deletions(-)
New commits:
commit 6be1128916b9c9441969d9a37a4b6694ac26eb8b
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 2 21:43:52 2012 +0100
SwXTextField::setPropertyValue: simplify a bit:
It looks like the second call to PutValue() was accidentally inserted
in f462a51fcc8e50f3255d2d8c98a4c6408dce725e.
Also, pDoc is valid when pField is.
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index db452a4..bb6bef8 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1893,18 +1893,14 @@ void SwXTextField::setPropertyValue(const OUString
rPropertyName, const uno::An
else
{
SwDoc * pDoc = GetDoc();
-
-if (NULL != pDoc)
-{
-const SwTxtFld* pTxtFld = pFmtFld-GetTxtFld();
-if(!pTxtFld)
-throw uno::RuntimeException();
-SwPosition aPosition( pTxtFld-GetTxtNode() );
-aPosition.nContent = *pTxtFld-GetStart();
-pDoc-PutValueToField( aPosition, rValue, pEntry-nWID);
-}
+assert(pDoc);
+const SwTxtFld* pTxtFld = pFmtFld-GetTxtFld();
+if(!pTxtFld)
+throw uno::RuntimeException();
+SwPosition aPosition( pTxtFld-GetTxtNode() );
+aPosition.nContent = *pTxtFld-GetStart();
+pDoc-PutValueToField( aPosition, rValue, pEntry-nWID);
}
-pField-PutValue( rValue, pEntry-nWID );
//#i100374# notify SwPostIt about new field content
if (RES_POSTITFLD== nWhich pFmtFld)
commit e85130f7224a5902bbb172a9af4abb1ac2205237
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 2 20:48:22 2012 +0100
unofield.cxx: fix indentation a little
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 0cc0223..db452a4 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1878,7 +1878,7 @@ void SwXTextField::setPropertyValue(const OUString
rPropertyName, const uno::An
if(pField)
{
-// Sonderbehandlung Serienbrieffeld
+// special treatment for mail merge fields
sal_uInt16 nWhich = pField-Which();
if( RES_DBFLD == nWhich
(rPropertyName.equalsAsciiL(
SW_PROP_NAME(UNO_NAME_DATA_BASE_NAME)) ||
@@ -1886,8 +1886,8 @@ void SwXTextField::setPropertyValue(const OUString
rPropertyName, const uno::An
rPropertyName.equalsAsciiL(
SW_PROP_NAME(UNO_NAME_DATA_TABLE_NAME))||
rPropertyName.equalsAsciiL(
SW_PROP_NAME(UNO_NAME_DATA_COLUMN_NAME
{
-// hier muss ein neuer Feldtyp angelegt werden und
-// das Feld an den neuen Typ umgehaengt werden
+// here a new field type must be created and the field must
+// be registered at the new type
OSL_FAIL(not implemented);
}
else
@@ -1906,11 +1906,12 @@ void SwXTextField::setPropertyValue(const OUString
rPropertyName, const uno::An
}
pField-PutValue( rValue, pEntry-nWID );
-//#i100374# notify SwPostIt about new field content
-if (RES_POSTITFLD== nWhich pFmtFld)
-{
-const_castSwFmtFld*(pFmtFld)-Broadcast(SwFmtFldHint( 0,
SWFMTFLD_CHANGED ));
-}
+//#i100374# notify SwPostIt about new field content
+if (RES_POSTITFLD== nWhich pFmtFld)
+{
+const_castSwFmtFld*(pFmtFld)-Broadcast(
+SwFmtFldHint( 0, SWFMTFLD_CHANGED ));
+}
// fdo#42073 notify SwTxtFld about changes of the expanded string
if (pFmtFld-GetTxtFld())
@@ -1918,10 +1919,10 @@ void SwXTextField::setPropertyValue(const OUString
rPropertyName, const uno::An
pFmtFld-GetTxtFld()-Expand();
}
-//#i100374# changing a document field should set the modify flag
-SwDoc* pDoc = GetDoc();
-if (pDoc)
-pDoc-SetModified();
+//#i100374# changing a document field should set the modify flag
+SwDoc* pDoc = GetDoc();
+if (pDoc)
+pDoc-SetModified();
}
else if(m_pProps)
commit e3dfae0741aae8581cd3fc713ba1b4459bb22d88
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 2 21:32:27 2012 +0100
fdo#42073: sw
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - reportbuilder/util writerfilter/source
reportbuilder/util/makefile.mk |2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 59 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 13 +
3 files changed, 72 insertions(+), 2 deletions(-)
New commits:
commit 7c04bc04476acc6ccaec7c7a2e6cb569215cd20f
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Feb 21 16:40:57 2012 +0100
implement import of RTF_DOB{X,Y}{MARGIN,PAGE}
(cherry picked from commit fa9e867a342a37d84f02f7e801962761cc1d2b6f)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a5f3578..413a82f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1967,8 +1967,31 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_POSXR: m_aStates.top().aFrame.nHoriAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_right; break;
case RTF_DPLINE:
-
m_aStates.top().aDrawingObject.xShape.set(getModelFactory()-createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.LineShape))),
uno::UNO_QUERY);
-
m_aStates.top().aDrawingObject.xPropertySet.set(m_aStates.top().aDrawingObject.xShape,
uno::UNO_QUERY);
+{
+
m_aStates.top().aDrawingObject.xShape.set(getModelFactory()-createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.LineShape))),
uno::UNO_QUERY);
+
m_aStates.top().aDrawingObject.xPropertySet.set(m_aStates.top().aDrawingObject.xShape,
uno::UNO_QUERY);
+std::vectorbeans::PropertyValue rPendingProperties =
m_aStates.top().aDrawingObject.aPendingProperties;
+for (std::vectorbeans::PropertyValue::iterator i =
rPendingProperties.begin(); i != rPendingProperties.end(); ++i)
+
m_aStates.top().aDrawingObject.xPropertySet-setPropertyValue(i-Name,
i-Value);
+}
+break;
+case RTF_DOBXMARGIN:
+case RTF_DOBYMARGIN:
+{
+beans::PropertyValue aPropertyValue;
+aPropertyValue.Name =
OUString(RTL_CONSTASCII_USTRINGPARAM((nKeyword == RTF_DOBXMARGIN ?
HoriOrientRelation : VertOrientRelation)));
+aPropertyValue.Value =
text::RelOrientation::PAGE_PRINT_AREA;
+
m_aStates.top().aDrawingObject.aPendingProperties.push_back(aPropertyValue);
+}
+break;
+case RTF_DOBXPAGE:
+case RTF_DOBYPAGE:
+{
+beans::PropertyValue aPropertyValue;
+aPropertyValue.Name =
OUString(RTL_CONSTASCII_USTRINGPARAM((nKeyword == RTF_DOBXPAGE ?
HoriOrientRelation : VertOrientRelation)));
+aPropertyValue.Value = text::RelOrientation::PAGE_FRAME;
+
m_aStates.top().aDrawingObject.aPendingProperties.push_back(aPropertyValue);
+}
break;
default:
#if OSL_DEBUG_LEVEL 1
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 98fa57c..0e92eb4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -187,6 +187,7 @@ namespace writerfilter {
public:
uno::Referencedrawing::XShape xShape;
uno::Referencebeans::XPropertySet xPropertySet;
+std::vectorbeans::PropertyValue aPendingProperties;
};
/// Stores the properties of a picture.
commit 059172306a4c4f8fc800a539d9fb1266301822ad
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Feb 21 15:15:08 2012 +0100
implement import of RTF_DPLINE, regression from LO 3.4
(cherry picked from commits bbef8b4a93ff840fa6306cc6e41e1e2dd3e6c8fa and
456a59b24d4ba5ac341f76b4302e82b687e97f69)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7f1569e..a5f3578 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1285,6 +1285,9 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
// This destination should be ignored by readers that support
nested tables.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
break;
+case RTF_DO:
+m_aStates.top().nDestinationState = DESTINATION_DRAWINGOBJECT;
+break;
default:
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(%s: TODO handle destination '%s', OSL_THIS_FUNC,
lcl_RtfToString(nKeyword));
@@ -1963,6 +1966,10 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_POSXL: m_aStates.top
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - svx/source
svx/source/form/datanavi.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0aaa35c6d3b07a273af6a1be2d26add4a9d537cd
Author: Noel Power noel.po...@novell.com
Date: Thu Mar 1 12:10:56 2012 +
fix crash using instances dialog of dataform navigator fdo#44816
also silence a valgrind 'Conditional jump or move depends on uninitialised
value(s)' where initial state of a checkbox was undefined
(cherry picked from commit 7b860d4970604f08ebd2e818bfd63891dd940804)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index e2e0b17..6718cd1 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -306,7 +306,8 @@ namespace svxform
m_pNaviWin ( _pNaviWin ),
m_bHasModel( false ),
m_eGroup ( _eGroup ),
-m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) )
+m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ),
+m_bLinkOnce ( false )
{
FreeResource();
@@ -1883,7 +1884,6 @@ namespace svxform
m_aTabCtrl.SetPageText( nId, sNewName );
bIsDocModified = true;
}
-delete(pPage);
}
break;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sax/qa sax/source
sax/qa/cppunit/test_converter.cxx |6 ++
sax/source/tools/converter.cxx|2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit f3e65a72f8c37ee3795ed83b93f7483d45d5b403
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 29 14:08:17 2012 +0100
sax: ConverterTest: add leap year tests
(cherry picked from commit 0d9757e43217929fa172c1feecd161873cd7019b)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 64bbf29..4a3d364 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -212,6 +212,10 @@ void ConverterTest::testDateTime()
doTest( util::DateTime(99, 59, 59, 23, 31, 12, ),
-12-31T23:59:59.9Z,
-12-31T23:59:59.99 );
+doTest( util::DateTime(0, 0, 0, 0, 29, 2, 2000), // leap year
+2000-02-29T00:00:00-00:00, 2000-02-29T00:00:00 );
+doTest( util::DateTime(0, 0, 0, 0, 29, 2, 1600), // leap year
+1600-02-29T00:00:00-00:00, 1600-02-29T00:00:00 );
doTest( util::DateTime(0, 0, 0, 24, 1, 1, 333)
/*(0, 0, 0, 0, 2, 1, 333)*/,
0333-01-01T24:00:00/*, 0333-01-02T00:00:00*/ );
@@ -240,6 +244,8 @@ void ConverterTest::testDateTime()
doTestDateTimeF( 0001-01-02T00:00:00+14:01 ); // invalid: TZ +14:00
doTestDateTimeF( 0001-01-02T00:00:00-15:00 ); // invalid: TZ -14:00
doTestDateTimeF( 0001-01-02T00:00:00-14:01 ); // invalid: TZ -14:00
+doTestDateTimeF( 2100-02-29T00:00:00-00:00 ); // invalid: no leap year
+doTestDateTimeF( 1900-02-29T00:00:00-00:00 ); // invalid: no leap year
OSL_TRACE(\nSAX CONVERTER TEST END);
}
commit a2d96b51f3272ecbdc0f4f9d4b2ee65409892554
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Feb 28 22:01:52 2012 -0500
Correctly calculate leap year.
With the old code, year 2000 would not be a leap year, but it actually
is. With this, Calc correctly loads cell with date value of 2000-2-29.
(regression from CWS sw33bf02 8786083eb9dabb0d7b328a217ba99a1d71493ad7)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Eike Rathke er...@redhat.com
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 3c993bd0c3120445f27cb37e6ecfd8b45c6605e0)
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index f2dea8a..eb22e0f 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1320,7 +1320,7 @@ readDateTimeComponent(const ::rtl::OUString rString,
static bool lcl_isLeapYear(const sal_uInt32 nYear)
{
return ((nYear % 4) == 0)
- !(((nYear % 100) == 0) || ((nYear % 400) == 0));
+ (((nYear % 100) != 0) || ((nYear % 400) == 0));
}
static sal_uInt16
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - 2 commits - sax/qa sax/source
sax/qa/cppunit/test_converter.cxx |6 ++
sax/source/tools/converter.cxx|2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 9a0d2a6d2f8972bdc62795f81529fc1354158fd5
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 29 14:08:17 2012 +0100
sax: ConverterTest: add leap year tests
(cherry picked from commit 0d9757e43217929fa172c1feecd161873cd7019b)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 64bbf29..4a3d364 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -212,6 +212,10 @@ void ConverterTest::testDateTime()
doTest( util::DateTime(99, 59, 59, 23, 31, 12, ),
-12-31T23:59:59.9Z,
-12-31T23:59:59.99 );
+doTest( util::DateTime(0, 0, 0, 0, 29, 2, 2000), // leap year
+2000-02-29T00:00:00-00:00, 2000-02-29T00:00:00 );
+doTest( util::DateTime(0, 0, 0, 0, 29, 2, 1600), // leap year
+1600-02-29T00:00:00-00:00, 1600-02-29T00:00:00 );
doTest( util::DateTime(0, 0, 0, 24, 1, 1, 333)
/*(0, 0, 0, 0, 2, 1, 333)*/,
0333-01-01T24:00:00/*, 0333-01-02T00:00:00*/ );
@@ -240,6 +244,8 @@ void ConverterTest::testDateTime()
doTestDateTimeF( 0001-01-02T00:00:00+14:01 ); // invalid: TZ +14:00
doTestDateTimeF( 0001-01-02T00:00:00-15:00 ); // invalid: TZ -14:00
doTestDateTimeF( 0001-01-02T00:00:00-14:01 ); // invalid: TZ -14:00
+doTestDateTimeF( 2100-02-29T00:00:00-00:00 ); // invalid: no leap year
+doTestDateTimeF( 1900-02-29T00:00:00-00:00 ); // invalid: no leap year
OSL_TRACE(\nSAX CONVERTER TEST END);
}
commit b1f7724610f9b7db10e86f544d0fa01b94efb531
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Feb 28 22:01:52 2012 -0500
Correctly calculate leap year.
With the old code, year 2000 would not be a leap year, but it actually
is. With this, Calc correctly loads cell with date value of 2000-2-29.
(regression from CWS sw33bf02 8786083eb9dabb0d7b328a217ba99a1d71493ad7)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Eike Rathke er...@redhat.com
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 3c993bd0c3120445f27cb37e6ecfd8b45c6605e0)
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index f2dea8a..eb22e0f 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1320,7 +1320,7 @@ readDateTimeComponent(const ::rtl::OUString rString,
static bool lcl_isLeapYear(const sal_uInt32 nYear)
{
return ((nYear % 4) == 0)
- !(((nYear % 100) == 0) || ((nYear % 400) == 0));
+ (((nYear % 100) != 0) || ((nYear % 400) == 0));
}
static sal_uInt16
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sax/qa sax/source
sax/qa/cppunit/test_converter.cxx |6 ++
sax/source/tools/converter.cxx|2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit eebc3e941131ffb09439f69313e697e0ed660135
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 29 14:08:17 2012 +0100
sax: ConverterTest: add leap year tests
(cherry picked from commit 0d9757e43217929fa172c1feecd161873cd7019b)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index dcd5bb7..4e3a56f 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -212,6 +212,10 @@ void ConverterTest::testDateTime()
doTest( util::DateTime(0, 0, 0, 24, 1, 1, 333)
/*(0, 0, 0, 0, 2, 1, 333)*/,
0333-01-01T24:00:00/*, 0333-01-02T00:00:00*/ );
+doTest( util::DateTime(0, 0, 0, 0, 29, 2, 2000), // leap year
+2000-02-29T00:00:00-00:00, 2000-02-29T00:00:00 );
+doTest( util::DateTime(0, 0, 0, 0, 29, 2, 1600), // leap year
+1600-02-29T00:00:00-00:00, 1600-02-29T00:00:00 );
doTestDateTimeF( +0001-01-01T00:00:00 ); // invalid: ^+
doTestDateTimeF( 1-01-01T00:00:00 ); // invalid: 4 Y
doTestDateTimeF( 0001-1-01T00:00:00 ); // invalid: 2 M
@@ -234,6 +238,8 @@ void ConverterTest::testDateTime()
doTestDateTimeF( 0001-01-02T00:00:00+14:01 ); // invalid: TZ +14:00
doTestDateTimeF( 0001-01-02T00:00:00-15:00 ); // invalid: TZ -14:00
doTestDateTimeF( 0001-01-02T00:00:00-14:01 ); // invalid: TZ -14:00
+doTestDateTimeF( 2100-02-29T00:00:00-00:00 ); // invalid: no leap year
+doTestDateTimeF( 1900-02-29T00:00:00-00:00 ); // invalid: no leap year
OSL_TRACE(\nSAX CONVERTER TEST END\n);
}
commit ff47b3717ca8bc561917c8ad5cd8bb5749638270
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Feb 28 22:01:52 2012 -0500
Correctly calculate leap year.
With the old code, year 2000 would not be a leap year, but it actually
is. With this, Calc correctly loads cell with date value of 2000-2-29.
(regression from CWS sw33bf02 8786083eb9dabb0d7b328a217ba99a1d71493ad7)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Eike Rathke er...@redhat.com
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 3c993bd0c3120445f27cb37e6ecfd8b45c6605e0)
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 74d056c..0414297 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1154,7 +1154,7 @@ readDateTimeComponent(const ::rtl::OUString rString,
static bool lcl_isLeapYear(const sal_uInt32 nYear)
{
return ((nYear % 4) == 0)
- !(((nYear % 100) == 0) || ((nYear % 400) == 0));
+ (((nYear % 100) != 0) || ((nYear % 400) == 0));
}
static sal_uInt16
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdograf.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 0c6d89941118368ccbb596362a545db5d3a07dbe
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 29 22:34:51 2012 +0100
fdo#46340: fix crash in SdrGrafObj::getInputStream:
Add the ridiculous hack that used to be here (and distributed across
various GetDocumentStream methods to make it non-obvious)
that makes this not crash by accident.
(regression from fd95f1ab6220c6a530fd2e4e727417f504a5db51)
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 23f81df..6fd9cf3 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1335,6 +1335,14 @@ Reference XInputStream SdrGrafObj::getInputStream()
::comphelper::LifecycleProxy proxy;
xStream.set(
pModel-GetDocumentStream(pGraphic-GetUserData(), proxy));
+// fdo#46340: this may look completely insane, and it is,
+// but it also prevents a crash: the LifecycleProxy will go out
+// of scope, but the xStream must be returned; the UcbStreamHelper
+// will actually copy the xStream to a temp file (because it is
+// not seekable), which makes it not crash...
+SvStream *const pStream =
+utl::UcbStreamHelper::CreateStream(xStream);
+xStream.set(new utl::OInputStreamWrapper(pStream, true));
}
else if( pGraphic GetGraphic().IsLink() )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - bin/convwatch.py cppu/source sfx2/source solenv/gdb svl/source sw/source
bin/convwatch.py | 424 +++
cppu/source/threadpool/jobqueue.cxx |9
cppu/source/threadpool/jobqueue.hxx |6
sfx2/source/doc/sfxbasemodel.cxx | 20 -
solenv/gdb/libreoffice/__init__.py |2
solenv/gdb/libreoffice/cppu.py |2
solenv/gdb/libreoffice/sal.py|2
solenv/gdb/libreoffice/svl.py|2
solenv/gdb/libreoffice/sw.py |2
solenv/gdb/libreoffice/tl.py |2
solenv/gdb/libreoffice/util/__init__.py |2
solenv/gdb/libreoffice/util/compatibility.py |2
solenv/gdb/libreoffice/util/printing.py |2
solenv/gdb/libreoffice/util/string.py|2
solenv/gdb/libreoffice/util/uno.py |2
svl/source/inc/poolio.hxx|2
sw/source/core/inc/frame.hxx |2
sw/source/core/inc/layfrm.hxx|4
sw/source/core/inc/rootfrm.hxx |2
sw/source/core/inc/sectfrm.hxx |2
sw/source/core/layout/newfrm.cxx |9
sw/source/core/layout/sectfrm.cxx| 13
sw/source/core/layout/ssfrm.cxx | 22 +
23 files changed, 501 insertions(+), 36 deletions(-)
New commits:
commit fa5e41067bc15c38dcc6c0c6fb327adad0444774
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 27 20:55:58 2012 +0100
add convwatch.py
diff --git a/bin/convwatch.py b/bin/convwatch.py
new file mode 100755
index 000..7880234
--- /dev/null
+++ b/bin/convwatch.py
@@ -0,0 +1,424 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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 Red Hat, Inc., Michael Stahl mst...@redhat.com
+# (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.
+
+import getopt
+import os
+import subprocess
+import sys
+import time
+import uuid
+try:
+from urllib.parse import quote
+except ImportError:
+from urllib import quote
+
+try:
+import pyuno
+import uno
+import unohelper
+except ImportError:
+print(pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables)
+print(PYTHONPATH=/installation/opt/program)
+print(URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc)
+raise
+
+try:
+from com.sun.star.document import XDocumentEventListener
+except ImportError:
+print(UNO API class not found: try to set URE_BOOTSTRAP variable)
+print(URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc)
+raise
+
+### utilities ###
+
+def partition(list, pred):
+left = []
+right = []
+for e in list:
+if pred(e):
+left.append(e)
+else:
+right.append(e)
+return (left, right)
+
+def filelist(dir, suffix):
+if len(dir) == 0:
+raise Exception(filelist: empty directory)
+if not(dir[-1] == /):
+dir += /
+files = [dir + f for f in os.listdir(dir)]
+#print(files)
+return [f for f in files
+if os.path.isfile(f) and os.path.splitext(f)[1] == suffix]
+
+def getFiles(dirs, suffix):
+files = []
+for dir in dirs:
+files += filelist(dir, suffix)
+return files
+
+### UNO utilities ###
+
+class OfficeConnection:
+def __init__(self, args):
+self.args = args
+self.soffice = None
+self.socket = None
+self.xContext = None
+def setUp(self):
+(method, sep, rest) = self.args[--soffice].partition(:)
+if sep != ::
+raise Exception(soffice parameter does not specify method)
+if method == path:
+socket = pipe,name=pytest + str(uuid.uuid1())
+try:
+userdir = self.args[--userdir]
+except KeyError:
+raise Exception('path' method requires --userdir)
+if not(userdir.startswith(file://)):
+raise Exception(--userdir must be file URL)
+self.soffice
[Libreoffice-commits] .: reportbuilder/util
reportbuilder/util/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b72d62a7180db7e5fd1831d0455dee59fee1edb Author: Michael Stahl mst...@redhat.com Date: Thu Feb 23 12:34:21 2012 +0100 reportbuilder: untested fix for WITH_LANG build Signed-off-by: Andras Timar ati...@suse.com diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index 78672bb..d3cc505 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -152,7 +152,7 @@ $(DESCRIPTION_SRC): description.xml $(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all $(SED) s/#VERSION#/$(EXTENSION_VERSION)/ $@ $@.new mv $@.new $@ -@$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR) +@@-$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR) .ELSE $(SED) s/#VERSION#/$(EXTENSION_VERSION)/ $ $@ .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sw/source vcl/source
sw/source/core/doc/doclay.cxx |3 +++
sw/source/core/docnode/ndcopy.cxx |2 +-
sw/source/core/unocore/unotext.cxx|6 --
vcl/source/glyphs/graphite_layout.cxx |2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 91fab30f3b1617024ee2eadf3c7ad1ea84d7f6dd
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 22 23:58:04 2012 +0100
fdo#46482: prevent duplication of frames:
SwDoc::MakeFlySection: abuse the SwDoc::mbRedlineMove flag, which
(with the fix for fdo#40599) does exactly what is necessary to prevent
the spurious copies.
Also, remove the ugly hack to work around this problem from
SwXText::convertToTextFrame.
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 17264ca..c184135 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -840,8 +840,10 @@ if( GetIDocumentUndoRedo().DoesUndo() )
SwPaM* pTmp = (SwPaM*)rPam;
sal_Bool bOldFlag = mbCopyIsMove;
bool const bOldUndo = GetIDocumentUndoRedo().DoesUndo();
+bool const bOldRedlineMove(IsRedlineMove());
mbCopyIsMove = sal_True;
GetIDocumentUndoRedo().DoUndo(false);
+SetRedlineMove(true);
do {
if( pTmp-HasMark()
*pTmp-GetPoint() != *pTmp-GetMark() )
@@ -850,6 +852,7 @@ if( GetIDocumentUndoRedo().DoesUndo() )
}
pTmp = static_castSwPaM*(pTmp-GetNext());
} while ( rPam != pTmp );
+SetRedlineMove(bOldRedlineMove);
mbCopyIsMove = bOldFlag;
GetIDocumentUndoRedo().DoUndo(bOldUndo);
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 2c25700..c83d243 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1720,12 +1720,6 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
SwFmtAnchor aAnchor((*i)-GetAnchor());
aAnchor.SetAnchor(aMovePam.Start());
m_pImpl-m_pDoc-SetAttr(aAnchor, *(*i));
-
-// delete the old anchor
-SwSpzFrmFmts* pFrmFmts =
m_pImpl-m_pDoc-GetSpzFrmFmts();
-// here we rely on that fact that this is a sorted
list, where the last element is the newly created frame
-SwFrmFmt *pFrmFmt = (*pFrmFmts)[pFrmFmts-Count()-1];
-m_pImpl-m_pDoc-DelLayoutFmt(pFrmFmt);
}
}
}
commit 23e52c207760c596cc2f841ef59f3100c110d591
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 22 23:48:57 2012 +0100
fdo#40599 i#112763: fix frame duplication:
SwDoc::CopyFlyInFlyImpl: When called from SwRedline::CopyToSection, do not
copy frames that are anchored at the redline end node by checking
IsRedlineMove(); these frames are not deleted by DelCopyOfSection and were
thus duplicated on every Show/Hide redlines.
(regression from 62ebbb006b4a11974e14dd61d3c453a98336f951 (CWS os131))
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 07bf4a4..2461505 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1431,7 +1431,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
bool bAdd = false;
if( pAPos-nNode rRg.aEnd )
bAdd = true;
-if( !bAdd )
+if (!bAdd !IsRedlineMove()) // fdo#40599: not for redline move
{
bool bEmptyNode = false;
bool bLastNode = false;
commit d066f7e4afb3c9e395932ba7bf8715ad0770bcdd
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 22 23:48:52 2012 +0100
vcl: crash in GraphiteLayout::expandOrCondense:
When printing the bugdoc from i#103958:
error: attempt to subscript container with out-of-bounds index 5, but
container only holds 5 elements.
#4 0x7fd37902be5e in GraphiteLayout::expandOrCondense (this=0x35296a8,
rArgs=...) at vcl/source/glyphs/graphite_layout.cxx:848
#5 0x7fd37902bc54 in GraphiteLayout::AdjustLayout (this=0x35296a8,
rArgs=...) at vcl/source/glyphs/graphite_layout.cxx:812
#6 0x7fd3790345c8 in GraphiteServerFontLayout::AdjustLayout
(this=0x3529640, rArgs=...) at vcl/inc/graphite_serverfont.hxx:76
#7 0x7fd378d5c91d in OutputDevice::forceFallbackFontToFit
(this=0x35022c0, rFallback=..., rFallbackFont=..., rFontSelData=...,
nFallbackLevel=1, rLayoutArgs=..., rOrigMetric=...) at
vcl/source/gdi/outdev3.cxx:6094
#8 0x7fd378d5cece in OutputDevice::ImplGlyphFallbackLayout
(this=0x35022c0, pSalLayout=0x36136c0, rLayoutArgs=...) at
vcl/source/gdi/outdev3.cxx:6206
#9
[Libreoffice-commits] .: 5 commits - pyuno/source sd/source sw/source xmlsecurity/source
pyuno/source/module/pyuno_gc.cxx |5 +
sd/source/ui/accessibility/AccessibleTreeNode.cxx |6 +
sd/source/ui/toolpanel/ScrollPanel.cxx|2
sw/source/core/layout/ftnfrm.cxx |2
sw/source/core/layout/newfrm.cxx |2
xmlsecurity/source/helper/xsecverify.cxx | 86 ++
6 files changed, 87 insertions(+), 16 deletions(-)
New commits:
commit e72e8dcd332474321439eb266528eb7e5fc8809f
Author: Michael Stahl mst...@redhat.com
Date: Sat Feb 18 00:06:42 2012 +0100
AccessibleTreeNode: fix headless crash
On closing a document in headless mode, the
accessibility::AccessibleTreeNode::WindowEventListener will access a deleted
mrTreeNode member and crash; don't do anything in the listener if the
AccessibleTreeNode has been disposed.
#0 0x in ?? ()
#1 0x7f99842d6887 in accessibility::AccessibleTreeNode::UpdateStateSet
(this=0x27a99f80) at sd/source/ui/accessibility/AccessibleTreeNode.cxx:285
#2 0x7f99842d803e in
accessibility::AccessibleTreeNode::WindowEventListener (this=0x27a99f80,
pEvent=0x7f997fd64f40) at sd/source/ui/accessibility/AccessibleTreeNode.cxx:694
#3 0x7f99842d7f3d in
accessibility::AccessibleTreeNode::LinkStubWindowEventListener
(pThis=0x27a99f80, pCaller=0x7f997fd64f40) at
sd/source/ui/accessibility/AccessibleTreeNode.cxx:670
#4 0x7f99b88a1442 in Link::Call (this=0x279f94e0,
pCaller=0x7f997fd64f40) at solver/unxlngx6/inc/tools/link.hxx:140
#5 0x7f99b88cdecf in VclEventListeners::Call (this=0x27a946f0,
pEvent=0x7f997fd64f40) at vcl/source/app/vclevent.cxx:72
#6 0x7f99b8d2e76e in Window::CallEventListeners (this=0x27a98280,
nEvent=1009, pData=0x0) at vcl/source/window/window.cxx:5188
#7 0x7f99b8d2e6cf in Window::ImplCallEventListeners (this=0x27a98280,
nEvent=1009, pData=0x0) at vcl/source/window/window.cxx:5171
#8 0x7f99b8d2df63 in Window::PreNotify (this=0x27a98280, rNEvt=...) at
vcl/source/window/window.cxx:5037
#9 0x7f99b8d4aa0c in ImplCallPreNotify (rEvt=...) at
vcl/source/window/winproc.cxx:86
#10 0x7f99b8d2910e in Window::ImplGrabFocus (this=0x2703d230, nFlags=0)
at vcl/source/window/window.cxx:4033
#11 0x7f99b8d3749f in Window::GrabFocus (this=0x2703d230) at
vcl/source/window/window.cxx:7493
#12 0x7f99b8d2b624 in Window::~Window (this=0x27a98280,
__in_chrg=optimized out) at vcl/source/window/window.cxx:4493
#13 0x7f99b88fa514 in Control::~Control (this=0x27a98280,
__in_chrg=optimized out) at vcl/source/control/ctrl.cxx:88
#14 0x7f99845521e4 in sd::toolpanel::ScrollPanel::~ScrollPanel
(this=0x27a98280, __in_chrg=optimized out) at
sd/source/ui/toolpanel/ScrollPanel.cxx:91
#15 0x7f99845522e8 in sd::toolpanel::ScrollPanel::~ScrollPanel
(this=0x27a98280, __in_chrg=optimized out) at
sd/source/ui/toolpanel/ScrollPanel.cxx:112
#16 0x7f9984565d76 in std::auto_ptrsd::toolpanel::TreeNode::reset
(this=0x27a94970, __p=0x0)
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 554c73d..2831895 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -637,6 +637,9 @@ sal_Bool AccessibleTreeNode::IsDisposed (void)
IMPL_LINK(AccessibleTreeNode, StateChangeListener, TreeNodeStateChangeEvent*,
pEvent)
{
+if (rBHelper.bDisposed || rBHelper.bInDispose)
+return 1; // mrTreeNode is probably dead
+
OSL_ASSERT(pEvent!=NULL);
OSL_ASSERT(pEvent-mrSource==mrTreeNode);
@@ -669,6 +672,9 @@ IMPL_LINK(AccessibleTreeNode, StateChangeListener,
TreeNodeStateChangeEvent*, pE
IMPL_LINK(AccessibleTreeNode, WindowEventListener, VclWindowEvent*, pEvent)
{
+if (rBHelper.bDisposed || rBHelper.bInDispose)
+return 1; // mrTreeNode is probably dead
+
switch (pEvent-GetId())
{
case VCLEVENT_WINDOW_HIDE:
commit cdfa3bd5e4c62dc88158a4c6c4908404baf1f529
Author: Michael Stahl mst...@redhat.com
Date: Sat Feb 18 00:06:41 2012 +0100
sd::toolpanel::ScrollPanel::~ScrollPanel: bogus static_cast
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx
b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 0a84e75..7c43aa4 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -97,7 +97,7 @@ ScrollPanel::~ScrollPanel (void)
TreeNode* pControl = pNode;
// When the node has been created as TitledControl then use its
// control instead of pNode directly.
-TitledControl* pTitledControl = static_castTitledControl*(pNode);
+TitledControl* pTitledControl = dynamic_castTitledControl*(pNode);
if (pTitledControl != NULL)
pControl = pTitledControl-GetControl();
commit 29177b1d04b845e8e6bf8edc8beb34b76a95d9c3
Author: Michael Stahl mst...@redhat.com
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basegfx/source
basegfx/source/tools/unotools.cxx | 113 +++---
1 file changed, 58 insertions(+), 55 deletions(-)
New commits:
commit 3c65e1fef5a4b4e41b4b3846712d7e76e94a34e8
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 15 11:25:57 2012 +0100
Fix fdo#45779 - accessing empty polygon.
Guard access to first polygon point.
(cherry picked from commit d37abad97d72bae0fd0269de12e94c7a7d3fd7e1)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/basegfx/source/tools/unotools.cxx
b/basegfx/source/tools/unotools.cxx
index 63b0f4e..6febfd3 100644
--- a/basegfx/source/tools/unotools.cxx
+++ b/basegfx/source/tools/unotools.cxx
@@ -187,70 +187,73 @@ namespace unotools
std::vectorawt::Point aPoints; aPoints.reserve(nLoopCount);
std::vectordrawing::PolygonFlags aFlags;
aFlags.reserve(nLoopCount);
-// prepare insert index and current point
-basegfx::B2DCubicBezier aBezier;
-aBezier.setStartPoint(rPoly.getB2DPoint(0));
-
-for(sal_uInt32 b(0L); bnLoopCount; b++)
+if( nCount )
{
-// add current point (always) and remember StartPointIndex for
evtl. later corrections
-const awt::Point
aStartPoint(fround(aBezier.getStartPoint().getX()),
-
fround(aBezier.getStartPoint().getY()));
-const sal_uInt32 nStartPointIndex(aPoints.size());
-aPoints.push_back(aStartPoint);
-aFlags.push_back(drawing::PolygonFlags_NORMAL);
-
-// prepare next segment
-const sal_uInt32 nNextIndex((b + 1) % nCount);
-aBezier.setEndPoint(rPoly.getB2DPoint(nNextIndex));
-aBezier.setControlPointA(rPoly.getNextControlPoint(b));
-
aBezier.setControlPointB(rPoly.getPrevControlPoint(nNextIndex));
-
-if(aBezier.isBezier())
-{
-// if one is used, add always two control points due to
the old schema
-aPoints.push_back(
awt::Point(fround(aBezier.getControlPointA().getX()),
-
fround(aBezier.getControlPointA().getY())) );
-aFlags.push_back(drawing::PolygonFlags_CONTROL);
-
-aPoints.push_back(
awt::Point(fround(aBezier.getControlPointB().getX()),
-
fround(aBezier.getControlPointB().getY())) );
-aFlags.push_back(drawing::PolygonFlags_CONTROL);
-}
+// prepare insert index and current point
+basegfx::B2DCubicBezier aBezier;
+aBezier.setStartPoint(rPoly.getB2DPoint(0));
-// test continuity with previous control point to set flag
value
-if(aBezier.getControlPointA() != aBezier.getStartPoint()
(bClosed || b))
+for(sal_uInt32 b(0L); bnLoopCount; b++)
{
-const basegfx::B2VectorContinuity
eCont(rPoly.getContinuityInPoint(b));
-
-if(basegfx::CONTINUITY_C1 == eCont)
+// add current point (always) and remember StartPointIndex
for evtl. later corrections
+const awt::Point
aStartPoint(fround(aBezier.getStartPoint().getX()),
+
fround(aBezier.getStartPoint().getY()));
+const sal_uInt32 nStartPointIndex(aPoints.size());
+aPoints.push_back(aStartPoint);
+aFlags.push_back(drawing::PolygonFlags_NORMAL);
+
+// prepare next segment
+const sal_uInt32 nNextIndex((b + 1) % nCount);
+aBezier.setEndPoint(rPoly.getB2DPoint(nNextIndex));
+aBezier.setControlPointA(rPoly.getNextControlPoint(b));
+
aBezier.setControlPointB(rPoly.getPrevControlPoint(nNextIndex));
+
+if(aBezier.isBezier())
{
-aFlags[nStartPointIndex] =
drawing::PolygonFlags_SMOOTH;
+// if one is used, add always two control points due
to the old schema
+aPoints.push_back(
awt::Point(fround(aBezier.getControlPointA().getX()),
+
fround(aBezier.getControlPointA().getY())) );
+aFlags.push_back(drawing::PolygonFlags_CONTROL);
+
+aPoints.push_back(
awt::Point(fround(aBezier.getControlPointB().getX()),
+
fround(aBezier.getControlPointB().getY())) );
+aFlags.push_back(drawing::PolygonFlags_CONTROL);
}
-else if(basegfx::CONTINUITY_C2 == eCont)
+
+// test continuity with previous
[Libreoffice-commits] .: 3 commits - scp2/source sw/source
scp2/source/ooo/file_ooo.scp| 14 --
sw/source/filter/ww8/ww8par.cxx |3 +--
2 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 9c4581a6b61c0836c3a44eaaf454b9ba560e937a
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 15 13:13:29 2012 +0100
fdo#45530: scp2: java accessibilty bridge cleanup:
AFAIK java_uno_accessbridge.jar is only required on WNT.
Also remove the duplicate old definition of gid_File_Jar_Accessbridge
that was effectively disabled by 6fdde9acfd5aebd23400e7101c8ddff80fcdd8fa.
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index e2c0c68..4d5d771 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -379,16 +379,6 @@ File gid_File_Help_Schart_Zip
End
#endif
-#if defined SOLAR_JAVA defined INCLUDE_JAVA_ACCESSBRIDGE defined WNT
-
-File gid_File_Jar_Accessbridge
-TXT_FILE_BODY;
-Name = java_uno_accessbridge.jar;
-Dir = gid_Dir_Classes;
-Styles = (PACKED,DONT_OVERWRITE);
-End
-
-#endif
#ifdef SOLAR_JAVA
#ifndef SYSTEM_LUCENE
@@ -426,6 +416,9 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax )
STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
STD_JAR_FILE( gid_File_Jar_Query, query )
STD_JAR_FILE( gid_File_Jar_Web, web )
+#endif
+
+#if defined SOLAR_JAVA defined WNT
STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
#endif
commit fbe60c962259ae0449acd65e74fd790530045e93
Author: Masataka Shinke mshi...@users.sourceforge.jp
Date: Wed Feb 15 13:10:44 2012 +0100
fdo#45530: Accessibility does not work on WNT
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index cae313a..e2c0c68 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -426,6 +426,7 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax )
STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
STD_JAR_FILE( gid_File_Jar_Query, query )
STD_JAR_FILE( gid_File_Jar_Web, web )
+STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
#endif
#ifdef SOLAR_JAVA
commit c1f723fd53e8c41b80285d11a149e0044f580e2f
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 17:47:28 2012 +0100
sw: ww8: ~SwIndexReg assertion:
Remove pointless SwPosition that triggers the assertion when
loading bugdoc from i#87910 from wwSectionManager::InsertSegments.
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 5c74e18..ad88e98 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4118,8 +4118,7 @@ void wwSectionManager::InsertSegments()
if (pTxtNd)
{
SwNodeIndex aIdx(*pTxtNd);
-SwPosition aPos(aIdx);
-SwPaM aTest(aPos);
+SwPaM aTest(aIdx);
mrReader.rDoc.DelFullPara(aTest);
pTxtNd = 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 5 commits - connectivity/source odk/settings offapi/com solenv/gbuild writerfilter/source
connectivity/source/inc/odbc/OBoundParam.hxx |2 +-
odk/settings/std.mk|4 ++--
offapi/com/sun/star/sdbc/XDatabaseMetaData.idl | 16 +---
solenv/gbuild/Executable.mk|4
solenv/gbuild/Helper.mk|1 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +--
6 files changed, 22 insertions(+), 12 deletions(-)
New commits:
commit 0a28ddf2084f86743e229667ae2c9b7e4f95e49e
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Feb 14 06:19:08 2012 +0100
correct documentation of com::sun::star::sdbc::XDatabaseMetaData
(cherry picked from commit 7535373fa693ddff5311054800efcc602cdcacd9)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
index 20dc8b3..ce07b4e 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
@@ -44,31 +44,33 @@
the form of
type scope=com::sun::star::sdbcXResultSet/type
objects.
-You can use the normal type scope=com::sun::star::sdbcXResultSet/type
+You can use the normal type scope=com::sun::star::sdbcXRow/type
+(or type scope=com::sun::star::sdbXColumn/type)
methods such as
-member scope=com::sun::star::sdbcXResultSet::getString()/member
+member scope=com::sun::star::sdbcXRow::getString()/member
and
-member scope=com::sun::star::sdbcXResultSet::getInt()/member
+member scope=com::sun::star::sdbcXRow::getInt()/member
to retrieve the data from these XResultSets. If a given form of
metadata is not available, these methods should throw a
type scope=com::sun::star::sdbcSQLException/type
.
-That a value of type scope=com::sun::star::sdbcXResultSet/type is
NULL/
-can be checked with the method member
scope=com::sun::star::sdbcXResultSet::wasNull()/member.
+After calling one of the getXXX() methods,
+one can check whether that value is NULL/
+with the method member
scope=com::sun::star::sdbcXRow::wasNull()/member.
In the text only (may be NULL/) is mentioned for this case.
/p
pSome of these methods take arguments that are String patterns. These
arguments all have names such as fooPattern. Within a pattern String, %
means match any substring of 0 or more characters, and _ means match
any one character. Only metadata entries matching the search pattern
-are returned. If a search pattern argument is set to VOID/,
+is returned. If a search pattern argument is set to VOID/,
that argument's criteria will be dropped from the search.
/p
p
A
type scope=com::sun::star::sdbcSQLException/type
will be thrown if a driver does not support
-a meta data method. In the case of methods that return an XResultSet,
+a metadata method. In the case of methods that return an XResultSet,
either an XResultSet (which may be empty) is returned or a
SQLException is thrown./p
*/
commit b88db173e610da5058099d5524e8fa7db2fc733d
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Feb 13 12:52:21 2012 +0100
n#695479 fix RTF import of text frames with exact height
(cherry picked from commit e0328096dc21ce12d15db2045074e7860872570f)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f0aa513..df60ff7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3375,6 +3375,7 @@ RTFSprms RTFFrame::getSprms()
{
NS_ooxml::LN_CT_FramePr_x,
NS_ooxml::LN_CT_FramePr_y,
+NS_ooxml::LN_CT_FramePr_hRule, // Make sure nHRule is processed before
nH
NS_sprm::LN_PWHeightAbs,
NS_sprm::LN_PDxaWidth,
NS_sprm::LN_PDxaFromText,
@@ -3385,8 +3386,7 @@ RTFSprms RTFFrame::getSprms()
NS_ooxml::LN_CT_FramePr_yAlign,
NS_sprm::LN_PWr,
NS_ooxml::LN_CT_FramePr_dropCap,
-NS_ooxml::LN_CT_FramePr_lines,
-NS_ooxml::LN_CT_FramePr_hRule
+NS_ooxml::LN_CT_FramePr_lines
};
for ( int i = 0, len = sizeof( pNames ) / sizeof( Id ); i len; ++i )
@@ -3438,7 +3438,10 @@ RTFSprms RTFFrame::getSprms()
{
sal_Int32 nHRule =
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto;
if ( nH 0 )
+{
nHRule =
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact;
+nH = -nH; // The negative value just sets nHRule
+}
else if ( nH 0 )
nHRule =
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_atLeast;
pValue.reset(new RTFValue(nHRule));
commit f3f925c8a4784cf578d2ab2d1b3f593f582bcdbc
Author: Lionel Elie
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - connectivity/source
connectivity/source/inc/odbc/OBoundParam.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit adb1ed5f13b4638690ca2966138eb2c61bdb1b53 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 14 14:54:03 2012 +0100 odbc 64 bit crash: correct buffer length allocation for a SQLLEN (cherry picked from commit 84d21e4de26bd69f7ca5b10f2c72779f07e11347) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index 5817aac..b8856e9 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -68,7 +68,7 @@ namespace connectivity // to a Java sal_Int32. The jdbcodbc 'C' bridge provides an // interface to do this. -paramLength = new sal_Int8[4]; +paramLength = new sal_Int8[sizeof(SQLLEN)]; } // ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - binfilter/bf_forms binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/inc
binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx |6 -
binfilter/bf_sfx2/source/doc/timestamp.cxx |4 +--
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 13
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx |4 ++-
binfilter/inc/bf_tools/string.hxx | 10 +
5 files changed, 25 insertions(+), 12 deletions(-)
New commits:
commit 485398ddf96c6a7ca9e0903fa8f83f76cae43e3c
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 23:37:14 2012 +0100
binfilter::TimeStamp::Load: fix date/time on LP64 platform regression
diff --git a/binfilter/bf_sfx2/source/doc/timestamp.cxx
b/binfilter/bf_sfx2/source/doc/timestamp.cxx
index 90ed421..bea1920 100644
--- a/binfilter/bf_sfx2/source/doc/timestamp.cxx
+++ b/binfilter/bf_sfx2/source/doc/timestamp.cxx
@@ -223,8 +223,8 @@ BOOL TimeStamp::Load ( SvStream rStream )
impl_adjustName ( m_sModifiedByName ) ;
// Load date and time from stream.
-long nDate ;
-long nTime ;
+sal_Int32 nDate ;
+sal_Int32 nTime ;
rStream nDate nTime ;
commit 508835a5ea8d385b3a740b769d75cdd4c3362809
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 23:36:16 2012 +0100
binfilter::frm::OInterfaceContainer::disposing: fix boost assertion
diff --git a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
index 53811e1..7a65da5 100644
--- a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
+++ b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
@@ -486,13 +486,17 @@ void SAL_CALL OInterfaceContainer::disposing(const
EventObject _rSource) throw(
OInterfaceContainer::disposing: map element not normalized!
);
if ( i-second.get() == _rSource.Source.get() )
+{
// found it
+m_aMap.erase(i);
break;
+}
++i;
+
+DBG_ASSERT( i != m_aMap.end(), OInterfaceContainer::disposing:
inconsistency: the element was in m_aItems, but not in m_aMap! );
}
-m_aMap.erase(i);
m_aItems.erase(j);
}
}
commit 76647a6e03d72de7f7359e3f86ae3e9bebeffa95
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 23:35:27 2012 +0100
binfilter::XColorItem::GetValue: null pointer crash
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 35eaa77..341b16a 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -354,8 +354,10 @@ XubString aNameOrIndexEmptyString;
/*N*/ {
/*N*/ if (!IsIndex())
/*N*/ return aColor;
-/*N*/ else
+/*N*/ else if (pTable)
/*?*/ return pTable-Get(GetIndex())-GetColor();
+else
+return Color(); // whatever
/*N*/
/*N*/ }
commit d38915fd08569ea5c7138f1755d539cc399d4f00
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 23:32:37 2012 +0100
binfilter: fix insta-crash string constructors
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index b0d7279..81f864c 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -219,6 +219,19 @@ STRING::STRING( const STRING rStr )
mpData = rStr.mpData;
}
+STRING::STRING( const ::STRING rStr )
+{
+DBG_CTOR( STRING, DBGCHECKSTRING );
+DBG_CHKOBJ( rStr, STRING, DBGCHECKSTRING );
+
+// this is good enough for binfilter...
+STRING temp;
+temp.Assign(rStr);
+
+STRING_ACQUIRE((STRING_TYPE *)temp.mpData);
+mpData = temp.mpData;
+}
+
// ---
STRING::STRING( const STRING rStr, xub_StrLen nPos, xub_StrLen nLen )
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 0b4c00e..3eab25a 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -141,10 +141,7 @@ private:
public:
ByteString();
ByteString( const ByteString rStr );
-ByteString( const ::ByteString rStr )
-{
-Assign(rStr);
-}
+ByteString( const ::ByteString rStr );
ByteString( const ByteString rStr, xub_StrLen nPos,
xub_StrLen nLen );
ByteString( const rtl::OString rStr );
ByteString( const sal_Char* pCharStr );
@@ -376,10 +373,7 @@ private:
public:
UniString();
UniString( const UniString rStr );
-UniString( const ::UniString rStr )
-{
-Assign(rStr
[Libreoffice-commits] .: Makefile
Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 15a6211803a28fd88b33b89a3f13455665360ce9 Author: Michael Stahl mst...@redhat.com Date: Mon Feb 13 15:49:21 2012 +0100 Makefile: don't build everything twice on make check diff --git a/Makefile b/Makefile index 815959f..30f13b0 100644 --- a/Makefile +++ b/Makefile @@ -442,7 +442,7 @@ check: subsequentcheck_after_build subsequentcheck_after_build: build dev-install-link @cd smoketestoo_native unset MAKEFLAGS \ - $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck subsequentcheck: smoketestoo_native ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source
sc/source/filter/xml/xmlstyli.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 4078a190d3b957577bc1d96c895dcdc19f4ed263
Author: Eike Rathke er...@redhat.com
Date: Thu Jan 26 14:03:13 2012 +0100
resolved fdo#38595 border width lost in ODF import
backported 34315e7ec4062f9521cd19951b5f7f6ad9ce0d2e
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index f4b7d6b..08a867f 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -173,12 +173,14 @@ void
ScXMLCellImportPropertyMapper::finished(::std::vector XMLPropertyState
pBorders[i]-maValue = aBorderLine;
if( pBorderWidths[i] )
{
+// Merge style:border-line-width values to fo:border values. Do
+// not override fo:border line width or line style with an
+// empty value!
table::BorderLine2 aBorderLineWidth;
pBorderWidths[i]-maValue = aBorderLineWidth;
aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
pBorders[i]-maValue = aBorderLine;
}
}
@@ -197,7 +199,6 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector
XMLPropertyState
aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
pDiagBorders[i]-maValue = aBorderLine;
if (pDiagBorderWidths[i])
pDiagBorderWidths[i]-mnIndex = -1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfsdrexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8411534883e960a8404d24937f813eb20accecdd
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 6 16:09:49 2012 +0100
RtfSdrExport::StartShape: replace 75
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index f0c8d68..8d9644c 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -464,7 +464,7 @@ sal_Int32 RtfSdrExport::StartShape()
return -1;
m_aShapeProps.insert(std::pairOString,OString(OString(shapeType),
OString::valueOf(sal_Int32(m_nShapeType;
-if (m_nShapeType == 75)
+if (ESCHER_ShpInst_PictureFrame == m_nShapeType)
impl_writeGraphic();
m_rAttrOutput.RunText().append('{').append(OOO_STRING_SVTOOLS_RTF_SHP);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 14 +-
sw/source/filter/ww8/rtfattributeoutput.hxx |5 +++
sw/source/filter/ww8/rtfsdrexport.cxx | 36
sw/source/filter/ww8/rtfsdrexport.hxx |3 ++
4 files changed, 51 insertions(+), 7 deletions(-)
New commits:
commit d2e2e3817376787f1804ee808bd37cc99815799a
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 6 16:09:49 2012 +0100
RtfSdrExport::StartShape: replace 75
(cherry picked from commit 8411534883e960a8404d24937f813eb20accecdd)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index 9ba99a4..e78d73c 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -480,7 +480,7 @@ sal_Int32 RtfSdrExport::StartShape()
return -1;
m_aShapeProps.insert(std::pairOString,OString(OString(shapeType),
OString::valueOf(sal_Int32(m_nShapeType;
-if (m_nShapeType == 75)
+if (ESCHER_ShpInst_PictureFrame == m_nShapeType)
impl_writeGraphic();
m_rAttrOutput.RunText().append('{').append(OOO_STRING_SVTOOLS_RTF_SHP);
commit ec0f75dffbdea7b508f1476fde90d1aeab6afde5
Author: Miklos Vajna vmik...@frugalware.org
Date: Sun Feb 5 00:24:08 2012 +0100
fdo#42656 fix RTF export of picture frame shape type
(cherry picked from commit 32fa7e9208b2053d2ff7743b88b0c0edacb8a7e7)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9ade064..b66f84f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3139,7 +3139,7 @@ static bool StripMetafileHeader(const sal_uInt8
*rpGraphicAry, unsigned long r
return false;
}
-static OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, sal_uInt32
nLimit = 64)
+OString RtfAttributeOutput::WriteHex(const sal_uInt8* pData, sal_uInt32 nSize,
sal_uInt32 nLimit)
{
OStringBuffer aRet;
@@ -3160,17 +3160,17 @@ static OString WriteHex(const sal_uInt8* pData,
sal_uInt32 nSize, sal_uInt32 nLi
return aRet.makeStringAndClear();
}
-static OString WriteHex(sal_Int32 nNum)
+OString RtfAttributeOutput::WriteHex(sal_Int32 nNum)
{
-return WriteHex((sal_uInt8*)nNum, sizeof(sal_Int32));
+return RtfAttributeOutput::WriteHex((sal_uInt8*)nNum, sizeof(sal_Int32));
}
-static OString WriteHex(OString sString)
+OString RtfAttributeOutput::WriteHex(OString sString)
{
OStringBuffer aRet;
aRet.append(WriteHex(sString.getLength()+1));
-aRet.append(WriteHex((sal_uInt8*)sString.getStr(), sString.getLength()+1));
+aRet.append(RtfAttributeOutput::WriteHex((sal_uInt8*)sString.getStr(),
sString.getLength()+1));
return aRet.makeStringAndClear();
}
@@ -3253,7 +3253,7 @@ static OString ExportPICT( const SwFlyFrmFmt* pFlyFrmFmt,
const Size rOrig, con
StripMetafileHeader(pGraphicAry, nSize);
}
aRet.append(RtfExport::sNewLine);
-aRet.append(WriteHex(pGraphicAry, nSize));
+aRet.append(RtfAttributeOutput::WriteHex(pGraphicAry, nSize));
aRet.append('}');
}
return aRet.makeStringAndClear();
@@ -3286,7 +3286,7 @@ void RtfAttributeOutput::FlyFrameOLEData( SwOLENode
rOLENode )
const sal_uInt8* pNativeData = (sal_uInt8*)pStream-GetData();
m_aRunText.append(WriteHex(nNativeDataSize));
m_aRunText.append(RtfExport::sNewLine);
-m_aRunText.append(WriteHex(pNativeData, nNativeDataSize, 126));
+m_aRunText.append(RtfAttributeOutput::WriteHex(pNativeData,
nNativeDataSize, 126));
m_aRunText.append(RtfExport::sNewLine);
delete pStream;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index c96de2c..8766c5a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -561,6 +561,11 @@ public:
/// Font pitch.
void FontPitchType( FontPitch ePitch ) const;
+
+/// Writes binary data as a hex dump.
+static rtl::OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize,
sal_uInt32 nLimit = 64);
+static rtl::OString WriteHex(sal_Int32 nNum);
+static rtl::OString WriteHex(rtl::OString sString);
};
#endif // _RTFATTRIBUTEOUTPUT_HXX_
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index badda4e..9ba99a4 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -29,10 +29,13 @@
#include rtfsdrexport.hxx
#include rtfattributeoutput.hxx
+#include rtfexportfilter.hxx
#include svtools/rtfkeywd.hxx
#include editeng/editobj.hxx
#include svx/svdotext.hxx
+#include svx/unoapi.hxx
+#include vcl/cvtgrf.hxx
using rtl::OString;
using rtl::OStringBuffer;
@@ -438,6 +441,37 @@ void
[Libreoffice-commits] .: 8 commits - solenv/gdb sot/inc sot/source sw/source tools/inc tools/source ucb/source unusedcode.easy
/filelist.cxx b/sot/source/base/filelist.cxx
index 052657e..146ad41 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -67,17 +67,6 @@ FileList FileList::operator=( const FileList rFileList )
return *this;
}
-/*
-|*
-|*FileList::GetFormatName()
-|*
-\*/
-
-sal_uLong FileList::GetFormat()
-{
-return FORMAT_FILE_LIST;
-}
-
/**
|*
|* virtuelle SvData-Methoden
diff --git a/unusedcode.easy b/unusedcode.easy
index be5d0b8..99538e1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -23,7 +23,6 @@ EditView::SetCursor(Cursor const)
EditView::SetPointer(Pointer const)
FieldEntry::GetBookmarkType()
FileControl::SetButtonText(String const)
-FileList::GetFormat()
FileStat::FileStat()
FileStat::FileStat(void const*)
FileStream::FileStream(rtl::OString const, FileAccessMode)
commit 5e7c721c80b3d968bbc83cf7f744dde9483a2d19
Author: Greg Kroah-Hartman gre...@linuxfoundation.org
Date: Mon Feb 6 14:05:38 2012 -0800
tools: fsys: Delete unused DirEntry::GetDevice()
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index b53caac..f8be021 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -241,27 +241,6 @@ String DirEntry::GetVolume() const
String());
}
-DirEntry DirEntry::GetDevice() const
-{
- DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
-DirEntry aPath( *this );
-aPath.ToAbs();
-
-struct stat buf;
-while (stat(rtl::OUStringToOString(aPath.GetFull(),
osl_getThreadTextEncoding()).getStr(), buf))
-{
-if (aPath.Level() = 1)
-return String();
-aPath = aPath [1];
-}
-mymnttab rMnt = mymnt::get();
-return ((buf.st_dev == rMnt.mountdevice ||
-GetMountEntry(buf.st_dev, rMnt)) ?
-String( rMnt.mountpoint, osl_getThreadTextEncoding()) :
-String());
-}
-
/*
|*
|*DirEntry::SetCWD()
diff --git a/unusedcode.easy b/unusedcode.easy
index 036c9bb..be5d0b8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -18,7 +18,6 @@ DdeTopic::DdeTopic(String const)
DdeTopic::RemoveItem(DdeItem const)
DffPropSet::SetPropertyValue(unsigned int, unsigned int) const
Dialog::Dialog(Window*, ResId const)
-DirEntry::GetDevice() const
EditView::GetSelectionMode() const
EditView::SetCursor(Cursor const)
EditView::SetPointer(Pointer const)
commit 80f96ca6b5bd8a491275c5e192196642854a885c
Author: Daniel Mihalyi amidab...@gmail.com
Date: Mon Feb 6 18:04:37 2012 +0100
In the current glib version only the main glib.h can be included directly.
diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx
b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 990ea9f..5c8e7aa 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -35,7 +35,7 @@
#include com/sun/star/ucb/XContentCreator.hpp
#include ucbhelper/contenthelper.hxx
-#include glib/gthread.h
+#include glib.h
#include libgnomevfs/gnome-vfs-ops.h
#include libgnomevfs/gnome-vfs-directory.h
commit b5dc729643c198440ca9eec9e29db065343827b9
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 6 22:17:13 2012 +0100
sw: undobj.cxx: deploy some asserts
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index b2a5243..2671511 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -235,19 +235,19 @@ private:
void SwUndo::Undo()
{
-OSL_ENSURE(false, SwUndo::Undo(): ERROR: must call Undo(context)
instead);
+assert(false); // SwUndo::Undo(): ERROR: must call UndoWithContext instead
}
void SwUndo::Redo()
{
-OSL_ENSURE(false, SwUndo::Redo(): ERROR: must call Redo(context)
instead);
+assert(false); // SwUndo::Redo(): ERROR: must call RedoWithContext instead
}
void SwUndo::UndoWithContext(SfxUndoContext rContext)
{
::sw::UndoRedoContext *const pContext(
dynamic_cast ::sw::UndoRedoContext * ( rContext));
-OSL_ASSERT(pContext);
+assert(pContext);
if (!pContext) { return; }
UndoRedoRedlineGuard const g(*pContext, *this);
UndoImpl(*pContext);
@@ -257,7 +257,7 @@ void SwUndo::RedoWithContext(SfxUndoContext rContext)
{
::sw::UndoRedoContext *const pContext(
dynamic_cast ::sw::UndoRedoContext * ( rContext));
-OSL_ASSERT(pContext);
+assert(pContext);
if (!pContext) { return; }
UndoRedoRedlineGuard const g(*pContext, *this);
RedoImpl(*pContext);
@@ -267,7 +267,7 @@ void SwUndo::Repeat(SfxRepeatTarget rContext)
{
::sw::RepeatContext *const pRepeatContext(
dynamic_cast ::sw::RepeatContext * ( rContext));
-OSL_ASSERT(pRepeatContext);
+assert(pRepeatContext
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - editeng/source
editeng/source/items/borderline.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit e44b64d297293b83459fddda968923750e2f6a5b
Author: Eike Rathke er...@redhat.com
Date: Thu Feb 2 19:11:37 2012 +0100
resolved fdo#42784 BorderLine with only InnerWidth set does not work
(cherry picked from commit 971f826a96f0938bfcfd8dfe26edd50d8e031bb4)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 61cecce..d15f53c 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -300,6 +300,22 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
else
{
SetStyle( nStyle );
+if (nOut == 0 nIn 0)
+{
+// If only inner width is given swap inner and outer widths for
+// single line styles, otherwise GuessWidth() marks this as invalid
+// and returns a 0 width.
+switch (nStyle)
+{
+case SOLID:
+case DOTTED:
+case DASHED:
+::std::swap( nOut, nIn);
+break;
+default:
+; // nothing
+}
+}
m_nWidth = m_aWidthImpl.GuessWidth( nOut, nIn, nDist );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - editeng/source
editeng/source/items/borderline.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit 4b410ce0e8d70f57e341ca513118ec67f69dd25e
Author: Eike Rathke er...@redhat.com
Date: Thu Feb 2 19:11:37 2012 +0100
resolved fdo#42784 BorderLine with only InnerWidth set does not work
(cherry picked from commit 971f826a96f0938bfcfd8dfe26edd50d8e031bb4)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 88adf29..b6f8e47 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -302,6 +302,22 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
else
{
SetStyle( nStyle );
+if (nOut == 0 nIn 0)
+{
+// If only inner width is given swap inner and outer widths for
+// single line styles, otherwise GuessWidth() marks this as invalid
+// and returns a 0 width.
+switch (nStyle)
+{
+case SOLID:
+case DOTTED:
+case DASHED:
+::std::swap( nOut, nIn);
+break;
+default:
+; // nothing
+}
+}
m_nWidth = m_aWidthImpl.GuessWidth( nOut, nIn, nDist );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - editeng/source
editeng/source/editeng/edtspell.cxx | 65
1 file changed, 37 insertions(+), 28 deletions(-)
New commits:
commit 874f2e53b24ad24d4e99f0df54ba6539d1958371
Author: Michael Stahl mst...@redhat.com
Date: Fri Feb 3 14:19:47 2012 +0100
WrongList::TextInserted: fix STL crash
vector iterators and insert don't mix well
(regression from dfbf0cabfa8310502e19642d56c746cc0d454d27)
diff --git a/editeng/source/editeng/edtspell.cxx
b/editeng/source/editeng/edtspell.cxx
index f13fb1a..eda0d61 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -242,48 +242,51 @@ void WrongList::TextInserted( sal_uInt16 nPos, sal_uInt16
nNew, sal_Bool bPosIsS
nInvalidEnd = nPos+nNew;
}
-for (WrongList::iterator i = begin(); i != end(); ++i)
+for (WrongList::size_type i = 0; i size(); ++i)
{
+WrongRange rWrong = (*this)[i]; // why does this thing derive vector?
sal_Bool bRefIsValid = sal_True;
-if (i-nEnd = nPos)
+if (rWrong.nEnd = nPos)
{
// Move all Wrongs after the insert position...
-if (i-nStart nPos)
+if (rWrong.nStart nPos)
{
-i-nStart += nNew;
-i-nEnd += nNew;
+rWrong.nStart += nNew;
+rWrong.nEnd += nNew;
}
// 1: Starts before and goes until nPos...
-else if (i-nEnd == nPos)
+else if (rWrong.nEnd == nPos)
{
// Should be halted at a blank!
if ( !bPosIsSep )
-i-nEnd += nNew;
+rWrong.nEnd += nNew;
}
// 2: Starts before and goes until after nPos...
-else if (i-nStart nPos i-nEnd nPos)
+else if ((rWrong.nStart nPos) (rWrong.nEnd nPos))
{
-i-nEnd += nNew;
+rWrong.nEnd += nNew;
// When a separator remove and re-examine the Wrong
if ( bPosIsSep )
{
// Split Wrong...
-WrongRange aNewWrong(i-nStart, nPos);
-i-nStart = nPos + 1;
-insert(i, aNewWrong);
-bRefIsValid = sal_False;// Reference no longer valid
after Insert, the other was inserted in front of this position
+WrongRange aNewWrong(rWrong.nStart, nPos);
+rWrong.nStart = nPos + 1;
+insert(begin() + i, aNewWrong);
+// Reference no longer valid after Insert, the other
+// was inserted in front of this position
+bRefIsValid = false;
++i; // Not this again...
}
}
// 3: Attribute starts at position ..
-else if (i-nStart == nPos)
+else if (rWrong.nStart == nPos)
{
-i-nEnd += nNew;
+rWrong.nEnd += nNew;
if ( bPosIsSep )
-++(i-nStart);
+++(rWrong.nStart);
}
}
-SAL_WARN_IF(bRefIsValid i-nStart = i-nEnd, editeng,
+SAL_WARN_IF(bRefIsValid rWrong.nStart = rWrong.nEnd, editeng,
TextInserted, WrongRange: Start = End?!);
(void)bRefIsValid;
}
commit aa274d8f587afa9e876334a1b6303bcec0a9
Author: Michael Stahl mst...@redhat.com
Date: Fri Feb 3 13:34:07 2012 +0100
editeng: convert some DBG_ASSERTs
diff --git a/editeng/source/editeng/edtspell.cxx
b/editeng/source/editeng/edtspell.cxx
index 77a65dd..f13fb1a 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -55,7 +55,7 @@ EditSpellWrapper::EditSpellWrapper( Window* _pWin,
sal_Bool bIsStart, sal_Bool bIsAllRight, EditView* pView ) :
SvxSpellWrapper( _pWin, xChecker, bIsStart, bIsAllRight )
{
-DBG_ASSERT( pView, One view has to be abandoned! );
+SAL_WARN_IF( !pView, editeng, One view has to be abandoned! );
// Keep IgnoreList, delete ReplaceList...
if (SvxGetChangeAllList().is())
SvxGetChangeAllList()-clear();
@@ -283,11 +283,12 @@ void WrongList::TextInserted( sal_uInt16 nPos, sal_uInt16
nNew, sal_Bool bPosIsS
++(i-nStart);
}
}
-DBG_ASSERT(!bRefIsValid || i-nStart i-nEnd, TextInserted,
WrongRange: Start = End?!);
+SAL_WARN_IF(bRefIsValid i-nStart = i-nEnd, editeng,
+TextInserted, WrongRange: Start = End?!);
(void)bRefIsValid;
}
-DBG_ASSERT( !DbgIsBuggy(), InsertWrong: WrongList broken! );
+SAL_WARN_IF(DbgIsBuggy(), editeng, InsertWrong: WrongList broken!);
}
void WrongList::TextDeleted( sal_uInt16 nPos, sal_uInt16 nDeleted )
@@ -343,7 +344,8 @@ void WrongList::TextDeleted( sal_uInt16 nPos, sal_uInt16
[Libreoffice-commits] .: 2 commits - sc/source sw/source
sc/source/ui/unoobj/cellsuno.cxx |3 +--
sw/source/core/unocore/unotbl.cxx |2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 697743161a6047902ee880851b23c9aef1bfa392
Author: Michael Stahl mst...@redhat.com
Date: Fri Feb 3 21:06:18 2012 +0100
fdo#45115: sc: fix setting borders
Same problem in ScHelperFunctions::GetBorderLine.
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 1bddc21..7844d9f 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -953,8 +953,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal(
sheet::GeneralFunction eSummary )
const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine(
::editeng::SvxBorderLine rLine, const table::BorderLine rStruct )
{
// Calc needs Twips, and there are 1/100mm in the Uno structure
-rLine.SetStyle( ::editeng::SvxBorderStyle( table::BorderLineStyle::SOLID )
);
-rLine.GuessLinesWidths( rLine.GetStyle(),
+rLine.GuessLinesWidths( editeng::NO_STYLE,
(sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ),
(sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ),
(sal_uInt16)HMMToTwips( rStruct.LineDistance ) );
commit ef9881001e4ddfa6bfbe7d83f482393bb76d926a
Author: Michael Stahl mst...@redhat.com
Date: Fri Feb 3 18:49:56 2012 +0100
fdo#45115: SwXTextTable: fix setting borders
This plus e549f52f16c4a519ed3eddb9c66c19bacc247590 fixes the problem.
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index a928d15..9526160 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -136,7 +136,7 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine rLine,
SvxBorderLine rSvxLi
{
rSvxLine.SetColor(Color(rLine.Color));
-rSvxLine.GuessLinesWidths(
editeng::SvxBorderStyle(table::BorderLineStyle::SOLID),
+rSvxLine.GuessLinesWidths( editeng::NO_STYLE,
MM100_TO_TWIP( rLine.OuterLineWidth ),
MM100_TO_TWIP( rLine.InnerLineWidth ),
MM100_TO_TWIP( rLine.LineDistance ) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - officecfg/registry sc/source sw/source xmloff/inc xmloff/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |2
sc/source/filter/xml/xmlstyle.cxx|4 -
sw/source/ui/uiview/view.cxx |2
xmloff/inc/xmloff/txtparae.hxx |3 -
xmloff/source/draw/sdpropls.cxx | 23 ++
xmloff/source/style/XMLPageExport.cxx|3 +
xmloff/source/text/txtparae.cxx | 32 ---
7 files changed, 57 insertions(+), 12 deletions(-)
New commits:
commit e2bc0c04ba0c33e02f1842013041f26ccb2de77d
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 2 12:53:59 2012 +0100
fdo#45446: officecfg: turn off SaveBackwardCompatibleODF
As detailed in the bug, this option is the reason why LO writes several
elements and attributes that are not valid in ODF; the corresponding
bugs in the import filters are all fixed in OOo 2.4 or earlier,
so there is no reason to risk interoperability problems with other ODF
impolementations for this any more.
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 215999a..744c7f2 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -594,7 +594,7 @@
node oor:name=Save
node oor:name=Document
prop oor:name=SaveBackwardCompatibleODF oor:type=xs:boolean
-valuetrue/value
+valuefalse/value
/prop
prop oor:name=CreateBackup install:module=gconflockdown
value oor:external=
commit e0de9f832f8f27de473242440ca4b544ab7b9216
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 2 12:51:46 2012 +0100
fdo#45447: add an assertion when anchored to page 0
XMLTextParagraphExport::addTextFrameAttributes: detect invalid anchor
page number; this really should be fixed in Writer/writerfilter though.
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 0335b74..3cd935a 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2501,6 +2501,8 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
{
sal_Int16 nPage = 0;
rPropSet-getPropertyValue( sAnchorPageNo ) = nPage;
+SAL_WARN_IF(nPage = 0, xmloff,
+ERROR: writing invalid anchor-page-number 0);
::sax::Converter::convertNumber( sValue, (sal_Int32)nPage );
GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_PAGE_NUMBER,
sValue.makeStringAndClear() );
commit 6c15b856242127ddca766da72489ba287e21
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 2 12:44:03 2012 +0100
fdo#45534: ODF export: fix draw:fit-to-size
In ODF 1.1 and 1.2 this attribute is of type boolean, so only write the
new values if the extended format is selected.
(regression introduced with e479f47f7d48dbd0d701bf347b6a2d5121ba3d34)
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 448d921..7c68585 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -619,6 +619,15 @@ SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
+SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] =
+{
+{ XML_FALSE,drawing::TextFitToSizeType_NONE },
+{ XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL },
+{ XML_TRUE, drawing::TextFitToSizeType_ALLLINES },
+{ XML_TRUE, drawing::TextFitToSizeType_AUTOFIT },
+{ XML_TOKEN_INVALID, 0 }
+};
+
SvXMLEnumMapEntry const pXML_FitToSize_Enum[] =
{
{ XML_FALSE,drawing::TextFitToSizeType_NONE },
@@ -1047,7 +1056,19 @@ const XMLPropertyHandler*
XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum,
::getCppuType((const com::sun::star::drawing::TextVerticalAdjust*)0) );
break;
case XML_SD_TYPE_FITTOSIZE:
-pHdl = new XMLEnumPropertyHdl( pXML_FitToSize_Enum,
::getCppuType((const com::sun::star::drawing::TextFitToSizeType*)0) );
+{
+if (mpExport (mpExport-getDefaultVersion()
+= SvtSaveOptions::ODFVER_012))
+{
+pHdl = new
XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12,
+::getCppuType(static_castconst
com::sun::star::drawing::TextFitToSizeType*(0)));
+}
+else
+{
+pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum,
+::getCppuType(static_castconst
com::sun::star::drawing::TextFitToSizeType*(0)));
+}
+}
break;
case
[Libreoffice-commits] .: cui/source
cui/source/dialogs/about.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 38ce8bbbd13ff031943052865c072e86f67ef4ee Author: Michael Stahl mst...@redhat.com Date: Thu Feb 2 20:12:40 2012 +0100 cui: about.cxx: nSpace was not declared in this scope diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 0b0ae4a..e1f13b1 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -251,7 +251,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId rId) : aLTSize = aInfoLink.CalcMinimumSize(); aLTPnt.X() = ( aOutSiz.Width() - aLTSize.Width() ) / 2; -aLTPnt.Y() = aLTPnt.Y() + aLTSize.Height() + nSpace; +aLTPnt.Y() = aLTPnt.Y() + aLTSize.Height() + nLineSpace; aInfoLink.SetPosSizePixel( aLTPnt, aLTSize ); nY += aLTSize.Height() + nLineSpace; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - wizards/com
wizards/com/sun/star/wizards/ui/ControlScroller.java | 23 ---
1 file changed, 23 deletions(-)
New commits:
commit b6c00fb358cbfcd74d71e99a8fe3b277a1f87a32
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jan 31 17:10:26 2012 +0100
Fix fdo#42543: Don't paint a frame around the list of edit boxes.
This conflicts with commit efc6b840a0423099d6c3e0d33c14d34637fbba4c that
reorders painting of windows when they overlap; and in this case, the frame
image paints over the controls.
The sideeffect is that the dialog looks nicer ;-)
(cherry picked from commit d26f06b33b6958cb15b16dbfe3e12ab0126c23a7)
Signed-off-by: Lubos Lunak l.lu...@suse.cz
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Noel Power nopo...@suse.com
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java
b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index c9aeee6..a04d1c1 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -39,7 +39,6 @@ public abstract class ControlScroller
protected WizardDialog CurUnoDialog;
protected XMultiServiceFactory xMSF;
-private Object oImgControl;
protected int ncurfieldcount;
protected int nblockincrement;
private int nlineincrement;
@@ -113,17 +112,6 @@ public abstract class ControlScroller
int ScrollHeight = iCompHeight - 2;
nlineincrement = 1;
sIncSuffix =
com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(),
imgBackground);
-oImgControl =
CurUnoDialog.insertControlModel(com.sun.star.awt.UnoControlImageControlModel,
imgBackground + sIncSuffix,
-new String[]
-{
-PropertyNames.PROPERTY_BORDER,
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_POSITION_X,
PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_WIDTH
-},
-new Object[]
-{
-new Short(1), new Integer(iCompHeight), ICompPosX, new
Integer(iCompPosY), IStep, ICompWidth
-});
-oImgControl = CurUnoDialog.xDlgContainer.getControl(imgBackground +
sIncSuffix);
-setComponentMouseTransparent();
xScrollBar = CurUnoDialog.insertScrollBar(TitleScrollBar +
sIncSuffix, 0,
new AdjustmentListenerImpl(),
new String[]
@@ -143,17 +131,6 @@ public abstract class ControlScroller
}
}
-public void setComponentMouseTransparent()
-{
-CurUnoDialog.getPeerConfiguration().setPeerProperties(oImgControl, new
String[]
-{
-MouseTransparent
-}, new Boolean[]
-{
-Boolean.TRUE
-});
-}
-
protected void setScrollBarOrientationHorizontal()
{
Helper.setUnoPropertyValue(xScrollBar, PropertyNames.ORIENTATION, new
Integer(ScrollBarOrientation.HORIZONTAL));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sw/source
sw/source/core/fields/reffld.cxx | 39 ---
1 file changed, 24 insertions(+), 15 deletions(-)
New commits:
commit 5de902f2b66e64bc4b4755356db3b259c01ddcdd
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Jan 30 11:35:42 2012 +0100
fdo#35669: more robust references merging
(cherry picked from commit 458d56d9b35f2ecb2eea2589737079390b10ee26)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c15c542..eca22ba 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -974,11 +974,13 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc,
sal_Bool bField )
GetFieldIdsFromDoc( rDoc, aDstIds );
// Define the mappings now
-sal_uInt16 nMaxDstId = *aIds.end();
+sal_uInt16 nMaxDstId = -1;
+if ( !aIds.empty() )
+nMaxDstId = *aIds.rbegin();
// Map all the src fields to their value + nMaxDstId
for ( std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt !=
aDstIds.end(); ++pIt )
-AddId( nMaxDstId++, *pIt );
+AddId( ++nMaxDstId, *pIt );
// Change the Sequence number of all the SetExp fields in the
destination document
SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
commit d3294590d6c15205cc0a176e96ef04f2816079cd
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Thu Jan 26 15:30:01 2012 +0100
fdo#35669: properly merge ref fields in master documents
(cherry picked from commit 5e51960dede5015b862df05b7b16f02884647889)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 98111d0..c15c542 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -972,6 +972,26 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc,
sal_Bool bField )
{
GetFieldIdsFromDoc( rDestDoc, aIds );
GetFieldIdsFromDoc( rDoc, aDstIds );
+
+// Define the mappings now
+sal_uInt16 nMaxDstId = *aIds.end();
+
+// Map all the src fields to their value + nMaxDstId
+for ( std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt !=
aDstIds.end(); ++pIt )
+AddId( nMaxDstId++, *pIt );
+
+// Change the Sequence number of all the SetExp fields in the
destination document
+SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
+if( pType )
+{
+SwIteratorSwFmtFld,SwFieldType aIter( *pType );
+for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
+if( pF-GetTxtFld() )
+{
+sal_uInt16 n =
((SwSetExpField*)pF-GetFld())-GetSeqNumber( );
+((SwSetExpField*)pF-GetFld())-SetSeqNumber(
sequencedIds[ n ] );
+}
+}
}
else
{
@@ -1030,21 +1050,8 @@ void _RefIdsMap::Check( SwDoc rDoc, SwDoc rDestDoc,
SwGetRefField rFld,
AddId( n, nSeqNo );
rFld.SetSeqNo( n );
-// und noch die Felder oder Fuss-/EndNote auf die neue
-// Id umsetzen
-if( bField )
-{
-SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName,
false );
-if( pType )
-{
-SwIteratorSwFmtFld,SwFieldType aIter( *pType );
-for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
-if( pF-GetTxtFld() nSeqNo ==
-((SwSetExpField*)pF-GetFld())-GetSeqNumber() )
-((SwSetExpField*)pF-GetFld())-SetSeqNumber( n );
-}
-}
-else
+// und noch die Fuss-/EndNote auf die neue Id umsetzen
+if( !bField )
{
SwTxtFtn* pFtnIdx;
for( sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().Count(); i
nCnt; ++i )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - 2 commits - connectivity/source sw/source
connectivity/source/drivers/odbcbase/OResultSet.cxx | 14 +++---
connectivity/source/drivers/odbcbase/OStatement.cxx | 14 +++---
connectivity/source/inc/odbc/OResultSet.hxx |2 +-
sw/source/filter/ww8/ww8scan.cxx| 18 +-
4 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit fb22e20d218e46eab5a3609db6e376a8f00ca904
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sun Jan 29 21:17:36 2012 +0100
use proper sizes for SQL(Get|Set)StmtAttr
Fixes fdo#34432 (driver smashes our stack on 64bits arch)
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 1787744..e97b819 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -123,7 +123,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle
,OStatement_Base* pStmt) :
catch(const Exception)
{ // we don't want our result destroy here
}
-SQLINTEGER nCurType = 0;
+SQLULEN nCurType = 0;
try
{
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,nCurType,SQL_IS_UINTEGER,0);
@@ -1268,7 +1268,7 @@ Sequence sal_Int32 SAL_CALL OResultSet::deleteRows(
const Sequence Any
//--
sal_Int32 OResultSet::getResultSetConcurrency() const
{
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
SQLRETURN nReturn =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CONCURRENCY,nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nReturn );
if(SQL_CONCUR_READ_ONLY == nValue)
@@ -1281,7 +1281,7 @@ sal_Int32 OResultSet::getResultSetConcurrency() const
//--
sal_Int32 OResultSet::getResultSetType() const
{
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_SENSITIVITY,nValue,SQL_IS_UINTEGER,0);
if(SQL_SENSITIVE == nValue)
nValue = ResultSetType::SCROLL_SENSITIVE;
@@ -1289,7 +1289,7 @@ sal_Int32 OResultSet::getResultSetType() const
nValue = ResultSetType::SCROLL_INSENSITIVE;
else
{
-SQLINTEGER nCurType = 0;
+SQLULEN nCurType = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,nCurType,SQL_IS_UINTEGER,0);
if(SQL_CURSOR_KEYSET_DRIVEN == nCurType)
nValue = ResultSetType::SCROLL_SENSITIVE;
@@ -1310,7 +1310,7 @@ sal_Int32 OResultSet::getFetchDirection() const
//--
sal_Int32 OResultSet::getFetchSize() const
{
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE,nValue,SQL_IS_UINTEGER,0);
return nValue;
}
@@ -1328,7 +1328,7 @@ sal_Bool OResultSet::isBookmarkable() const
if(!m_aConnectionHandle)
return sal_False;
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,nValue,SQL_IS_UINTEGER,0);
sal_Int32 nAttr = 0;
@@ -1679,7 +1679,7 @@ sal_Bool OResultSet::move(IResultSetHelper::Movement
_eCursorPosition, sal_Int32
//
-
sal_Int32 OResultSet::getDriverPos() const
{
-sal_Int32 nValue = 0;
+SQLULEN nValue = 0;
SQLRETURN nRet =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_NUMBER,nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nRet );
OSL_TRACE( __FILE__: OResultSet::getDriverPos() = Ret = %d, RowNum = %d,
RowPos = %d,nRet,nValue , m_nRowPos);
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx
b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 1e8558c..d79e188 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -300,7 +300,7 @@ sal_Bool OStatement_Base::lockIfNecessary (const
::rtl::OUString sql) throw( SQ
OSL_ENSURE(m_aStatementHandle,StatementHandle is null!);
try
{
-SQLINTEGER nLock = SQL_CONCUR_LOCK;
+const SQLULEN nLock = SQL_CONCUR_LOCK;
THROW_SQL(N3SQLSetStmtAttr(m_aStatementHandle,
SQL_CONCURRENCY,(SQLPOINTER)(sal_IntPtr)nLock,SQL_IS_UINTEGER));
}
catch (const SQLWarning warn)
@@ -683,7 +683,7 @@ sal_Int64 OStatement_Base::getMaxRows() const
sal_Int32 OStatement_Base::getResultSetConcurrency() const
{
OSL_ENSURE(m_aStatementHandle,StatementHandle is null!);
-sal_uInt32 nValue;
+SQLULEN nValue;
SQLRETURN nRetCode =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CONCURRENCY,nValue,SQL_IS_UINTEGER,0
[Libreoffice-commits] Changes to 'master-deleted'
New branch 'master-deleted' available with the following commits: commit 97a0d15e61e991e84e6229ea90f6fc7fc301b379 Author: Michael Stahl mst...@redhat.com Date: Sat Jan 28 20:18:21 2012 +0100 replace obsolete master branch with README that points at new repo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-backup'
New branch 'master-backup' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-deleted'
New branch 'master-deleted' available with the following commits: commit 20fc1e56e329e6d3f93c52d7af24f32d7571de3c Author: Michael Stahl mst...@redhat.com Date: Sat Jan 28 20:52:00 2012 +0100 replace obsolete master branch with README that points at new repo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-backup'
New branch 'master-backup' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-deleted'
New branch 'master-deleted' available with the following commits: commit 00a6c3c148e4c0e867816b4c361abb19d9ece7eb Author: Michael Stahl mst...@redhat.com Date: Sat Jan 28 20:52:10 2012 +0100 replace obsolete master branch with README that points at new repo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-deleted'
New branch 'master-deleted' available with the following commits: commit f457a7fdbb4400f34844af0492dc32d2f3623c95 Author: Michael Stahl mst...@redhat.com Date: Sat Jan 28 20:52:27 2012 +0100 replace obsolete master branch with README that points at new repo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-backup'
New branch 'master-backup' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-deleted'
New branch 'master-deleted' available with the following commits: commit 2e626373db2412ac22e8c5c27a60d11cd29e875b Author: Michael Stahl mst...@redhat.com Date: Sat Jan 28 20:52:45 2012 +0100 replace obsolete master branch with README that points at new repo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-backup'
New branch 'master-backup' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-deleted'
New branch 'master-deleted' available with the following commits: commit 171a91841e447a76f9cb1e5b42ab85e23e8a4ca2 Author: Michael Stahl mst...@redhat.com Date: Sat Jan 28 20:52:50 2012 +0100 replace obsolete master branch with README that points at new repo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-backup'
New branch 'master-backup' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-deleted'
New branch 'master-deleted' available with the following commits: commit 428df2c52fba1dfd728bff7bc981e00b983704dd Author: Michael Stahl mst...@redhat.com Date: Sat Jan 28 20:53:39 2012 +0100 replace obsolete master branch with README that points at new repo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'master-deleted'
New branch 'master-deleted' available with the following commits: commit 0e1042f42101dd2a7407a38d204de6f4de28890a Author: Michael Stahl mst...@redhat.com Date: Sat Jan 28 20:53:50 2012 +0100 replace obsolete master branch with README that points at new repo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
