[Libreoffice-commits] .: connectivity/source
connectivity/source/parse/sqliterator.cxx | 132 ++
connectivity/source/parse/sqlnode.cxx | 106 +++-
2 files changed, 117 insertions(+), 121 deletions(-)
New commits:
commit d1e5860bc001f092477421cb871636f3b0071e28
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Thu Mar 1 14:53:10 2012 +0530
Translate German comments.
diff --git a/connectivity/source/parse/sqliterator.cxx
b/connectivity/source/parse/sqliterator.cxx
index ae31689..6a3b157 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -72,8 +72,8 @@ namespace connectivity
Reference XNameAccess m_xTableContainer;
Reference XNameAccess m_xQueryContainer;
-::boost::shared_ptr OSQLTablesm_pTables; /// all tables
which participate in the SQL statement
-::boost::shared_ptr OSQLTablesm_pSubTables; /// all tables
from sub queries not the tables from the select tables
+::boost::shared_ptr OSQLTablesm_pTables; // all tables
which participate in the SQL statement
+::boost::shared_ptr OSQLTablesm_pSubTables; // all tables from
sub queries not the tables from the select tables
::boost::shared_ptr QueryNameSet m_pForbiddenQueryNames;
sal_uInt32 m_nIncludeMask;
@@ -216,14 +216,14 @@ void OSQLParseTreeIterator::setParseTree(const
OSQLParseNode * pNewParseTree)
return;
}
-// falls m_pParseTree aber keine Connection, dann Fehler
+// If m_pParseTree, but no connection then return
if ( !m_pImpl-m_xTableContainer.is() )
return;
m_aErrors = SQLException();
-// Statement-Typ ermitteln ...
+// Determine statement type ...
if (SQL_ISRULE(m_pParseTree,select_statement) ||
SQL_ISRULE(m_pParseTree,union_statement) )
{
m_eStatementType = SQL_STATEMENT_SELECT;
@@ -456,7 +456,7 @@ void OSQLParseTreeIterator::traverseOneTableName(
OSQLTables _rTables,const OSQ
::rtl::OUString aSchema,aTableName,aComposedName;
::rtl::OUString aTableRange(rTableRange);
-// Tabellenname abholen
+// Get table name
OSQLParseNode::getTableComponents(pTableName,aCatalog,aSchema,aTableName,m_pImpl-m_xDatabaseMetaData);
// create the composed name like DOMAIN.USER.TABLE1
@@ -479,16 +479,16 @@ void OSQLParseTreeIterator::traverseOneTableName(
OSQLTables _rTables,const OSQ
//-
void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode*
i_pJoinCondition)
{
-if (i_pJoinCondition-count() == 3// Ausdruck is geklammert
+if (i_pJoinCondition-count() == 3// Expression with brackets
SQL_ISPUNCTUATION(i_pJoinCondition-getChild(0),()
SQL_ISPUNCTUATION(i_pJoinCondition-getChild(2),)))
{
impl_fillJoinConditions(i_pJoinCondition-getChild(1));
}
-else if (SQL_ISRULEOR2(i_pJoinCondition,search_condition,boolean_term)
// AND/OR-Verknuepfung:
+else if (SQL_ISRULEOR2(i_pJoinCondition,search_condition,boolean_term)
// AND/OR logic operation:
i_pJoinCondition-count() == 3)
{
-// nur AND Verkn�pfung zulassen
+// Only allow AND logic operation
if ( SQL_ISTOKEN(i_pJoinCondition-getChild(1),AND) )
{
impl_fillJoinConditions(i_pJoinCondition-getChild(0));
@@ -498,7 +498,7 @@ void OSQLParseTreeIterator::impl_fillJoinConditions(const
OSQLParseNode* i_pJoin
else if (SQL_ISRULE(i_pJoinCondition,comparison_predicate))
{
// only the comparison of columns is allowed
-OSL_ENSURE(i_pJoinCondition-count() ==
3,OQueryDesignView::InsertJoinConnection: Fehler im Parse Tree);
+OSL_ENSURE(i_pJoinCondition-count() ==
3,OQueryDesignView::InsertJoinConnection: error in the parse tree);
if (SQL_ISRULE(i_pJoinCondition-getChild(0),column_ref)
SQL_ISRULE(i_pJoinCondition-getChild(2),column_ref)
i_pJoinCondition-getChild(1)-getNodeType() == SQL_NODE_EQUAL)
@@ -540,7 +540,7 @@ void OSQLParseTreeIterator::getQualified_join( OSQLTables
_rTables, const OSQLP
else
{
const OSQLParseNode* pColumnCommalist =
pJoin_spec-getChild(2);
-// Alle Columns in der column_commalist ...
+// All columns in the column_commalist ...
for (sal_uInt32 i = 0; i pColumnCommalist-count(); i++)
{
const OSQLParseNode * pCol = pColumnCommalist-getChild(i);
@@ -631,7 +631,7 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables
_rTables,const OSQLP
const OSQLParseNode* pTableName = NULL;
::rtl::OUString aTableRange;
for (sal_uInt32 i = 0; i pTableRefCommalist-count(); i++)
-{ // from clause durchlaufen
+{ // Process FROM clause
[Libreoffice-commits] .: 3 commits - sc/source sw/qa
sc/source/core/data/table2.cxx | 116 -
sw/qa/core/filters-test.cxx| 51 --
2 files changed, 82 insertions(+), 85 deletions(-)
New commits:
commit 58272b98319c5da2d433c0bc5e520a12ab73c71c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 11:07:16 2012 +0100
fix some iterator misuse in the new notes handling
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 1af4b49..9f24b47 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -175,18 +175,31 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol,
SCROW nStartRow, SCSIZE
aCol[j].InsertRow( nStartRow, nSize );
ScNotes aNotes(pDocument);
-for ( ScNotes::iterator itr = maNotes.begin(); itr != maNotes.end(); ++itr)
+ScNotes::iterator itr = maNotes.begin();
+while( itr != maNotes.end() )
{
-if (itr-first.second = nStartRow)
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+++itr;
+
+if (nCol = nStartRow)
{
-aNotes.insert(itr-first.first, itr-first.second + nSize,
itr-second);
-maNotes.ReleaseNote(itr-first.first, itr-first.second);
+aNotes.insert(nCol, nRow + nSize, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
}
}
-for ( ScNotes::iterator itr = aNotes.begin(); itr != aNotes.end(); ++itr)
+
+itr = aNotes.begin();
+while( itr != aNotes.end() )
{
-maNotes.insert( itr-first.first, itr-first.second, itr-second);
-aNotes.ReleaseNote(itr-first.first, itr-first.second);
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+++itr;
+
+maNotes.insert( nCol, nRow, pPostIt);
+aNotes.ReleaseNote( nCol, nRow);
}
DecRecalcLevel( false );
@@ -242,18 +255,31 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol,
SCROW nStartRow, SCSIZE
}
ScNotes aNotes(pDocument);
-for ( ScNotes::iterator itr = maNotes.begin(); itr != maNotes.end(); ++itr)
+ScNotes::iterator itr = maNotes.begin();
+while( itr != maNotes.end() )
{
-if (itr-first.second = nStartRow)
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+++itr;
+
+if (nCol = nStartRow)
{
-aNotes.insert(itr-first.first, itr-first.second - nSize,
itr-second);
-maNotes.ReleaseNote(itr-first.first, itr-first.second);
+aNotes.insert(nCol, nRow - nSize, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
}
}
-for ( ScNotes::iterator itr = aNotes.begin(); itr != aNotes.end(); ++itr)
+
+itr = aNotes.begin();
+while( itr != aNotes.end() )
{
-maNotes.insert( itr-first.first, itr-first.second, itr-second);
-aNotes.ReleaseNote(itr-first.first, itr-first.second);
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+++itr;
+
+maNotes.insert( nCol, nRow, pPostIt);
+aNotes.ReleaseNote( nCol, nRow);
}
{ // scope for bulk broadcast
@@ -339,20 +365,31 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW
nStartRow, SCROW nEndRow, SCSIZE
}
ScNotes aNotes(pDocument);
-for ( ScNotes::iterator itr = maNotes.begin(); itr != maNotes.end(); ++itr)
+ScNotes::iterator itr = maNotes.begin();
+while( itr != maNotes.end() )
{
-if (itr-first.first nStartCol)
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+++itr;
+
+if (nCol = nStartRow)
{
-aNotes.insert(itr-first.first + nSize, itr-first.second,
itr-second);
-maNotes.ReleaseNote(itr-first.first, itr-first.second);
+aNotes.insert(nCol + nSize, nRow, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
}
-else
-aNotes.insert( itr-first.first, itr-first.second, itr-second);
}
-for ( ScNotes::iterator itr = aNotes.begin(); itr != aNotes.end(); ++itr)
+
+itr = aNotes.begin();
+while( itr != aNotes.end() )
{
-maNotes.insert( itr-first.first, itr-first.second, itr-second);
-aNotes.ReleaseNote(itr-first.first, itr-first.second);
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+++itr;
+
+maNotes.insert( nCol, nRow, pPostIt);
+aNotes.ReleaseNote( nCol, nRow);
}
if (nStartCol0)// copy old attributes
@@ -437,20 +474,31 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW
nStartRow, SCROW nEndRow, SCSIZE
}
ScNotes aNotes(pDocument);
-
[Libreoffice-commits] .: sw/qa
sw/qa/extras/rtftok/data/fdo46662.rtf | 46 ++
sw/qa/extras/rtftok/rtftok.cxx| 35 +
2 files changed, 81 insertions(+)
New commits:
commit 7029ccec25bc0b15f9cea463ea3713e802eafc08
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Mar 1 11:38:47 2012 +0100
testcase for fdo#46662
diff --git a/sw/qa/extras/rtftok/data/fdo46662.rtf
b/sw/qa/extras/rtftok/data/fdo46662.rtf
new file mode 100644
index 000..db93c9c
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo46662.rtf
@@ -0,0 +1,46 @@
+{\rtf1
+{\*\listtable
+{\list\listtemplateid3
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'01\'00;}
+{\levelnumbers\'01;}
+\fi-360\li720\lin720 }
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'03\'00.\'01;}
+{\levelnumbers\'01\'03;}
+\fi-360\li1080\lin1080 }
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'05\'00.\'01.\'02;}
+{\levelnumbers\'01\'03\'05;}
+\fi-360\li1440\lin1440
+}
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'07\'00.\'01.\'02.\'03;}
+{\levelnumbers\'01\'03\'05\'07;}
+\fi-360\li1800\lin1800 }
+\listid3}
+}
+{\*\listoverridetable
+{\listoverride\listid3\listoverridecount0\ls3}
+}
+\pard\ls3
+{numbering with all sublevels: test 1
+\par
+}
+\pard\ls3\ilvl1
+{test 1.1
+\par
+}
+\pard\ls3\ilvl2
+{test 1.1.1
+\par
+}
+\pard\ls3\ilvl3
+{test 1.1.1.1
+\par
+}
+\pard\ls3
+{test 2
+\par
+}
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 0e4a31b..1174626 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -28,6 +28,7 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/style/XStyleFamiliesSupplier.hpp
#include com/sun/star/table/BorderLine2.hpp
#include com/sun/star/table/BorderLineStyle.hpp
#include com/sun/star/text/RelOrientation.hpp
@@ -60,6 +61,7 @@ public:
void testN695479();
void testFdo42465();
void testFdo45187();
+void testFdo46662();
CPPUNIT_TEST_SUITE(RtfModelTest);
#if !defined(MACOSX) !defined(WNT)
@@ -69,6 +71,7 @@ public:
CPPUNIT_TEST(testN695479);
CPPUNIT_TEST(testFdo42465);
CPPUNIT_TEST(testFdo45187);
+CPPUNIT_TEST(testFdo46662);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -266,6 +269,38 @@ void RtfModelTest::testFdo45187()
CPPUNIT_ASSERT(aFirstPoint.Y != aSecondPoint.Y);
}
+void RtfModelTest::testFdo46662()
+{
+load(OUString(RTL_CONSTASCII_USTRINGPARAM(fdo46662.rtf)));
+
+uno::Referencestyle::XStyleFamiliesSupplier
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XNameAccess
xStyles(xStyleFamiliesSupplier-getStyleFamilies(), uno::UNO_QUERY);
+uno::Referencecontainer::XNameAccess
xNumberingStyles(xStyles-getByName(OUString(RTL_CONSTASCII_USTRINGPARAM(NumberingStyles))),
uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet
xPropertySet(xNumberingStyles-getByName(OUString(RTL_CONSTASCII_USTRINGPARAM(WWNum3))),
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xLevels(xPropertySet-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NumberingRules))),
uno::UNO_QUERY);
+uno::Any aValue = xLevels-getByIndex(1); // 2nd level
+uno::Sequencebeans::PropertyValue aProps;
+aValue = aProps;
+
+for (int i = 0; i aProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aProps[i];
+
+if
(rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ParentNumbering)))
+{
+sal_Int16 nValue;
+rProp.Value = nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), nValue);
+}
+else if (rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(Suffix)))
+{
+rtl::OUString sValue;
+rProp.Value = sValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sValue.getLength());
+}
+}
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - Makefile sal/osl sd/source sot/inc sot/source svx/inc svx/source test/inc test/source tools/inc tools/source unusedcode.easy
Makefile |6 ++
sal/osl/unx/file.cxx |2
sd/source/filter/eppt/pptx-text.cxx | 12 -
sd/source/filter/eppt/text.hxx |2
sot/inc/sot/stg.hxx |1
sot/source/sdstor/ucbstorage.cxx | 17 ---
svx/inc/svx/xexch.hxx|1
svx/source/xoutdev/xexch.cxx | 10
test/inc/test/sheet/xdatapilottable2.hxx |1
test/inc/test/sheet/xnamedranges.hxx |2
test/inc/test/util/xsearchable.hxx |1
test/source/sheet/xdatapilottable2.cxx |4 +
test/source/sheet/xnamedranges.cxx |4 +
test/source/util/xsearchable.cxx |4 +
tools/inc/tools/stream.hxx |4 -
tools/inc/tools/unqidx.hxx |2
tools/source/memtools/unqidx.cxx | 22 -
tools/source/stream/strmunx.cxx | 70 ++-
unusedcode.easy | 20
19 files changed, 48 insertions(+), 137 deletions(-)
New commits:
commit f87e486d298d98beb3aa9bd1c4884877117cbdcc
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 1 10:06:06 2012 +
WaE: C4265: class has virtual functions, but destructor is not virtual
diff --git a/test/inc/test/sheet/xdatapilottable2.hxx
b/test/inc/test/sheet/xdatapilottable2.hxx
index 7b82bf8..25ce93e 100644
--- a/test/inc/test/sheet/xdatapilottable2.hxx
+++ b/test/inc/test/sheet/xdatapilottable2.hxx
@@ -50,6 +50,7 @@ public:
void testGetDrillDownData();
void testGetOutputRangeByType();
void testInsertDrillDownSheet();
+virtual ~XDataPilotTable2();
virtual uno::Reference uno::XInterface initDP2() = 0;
virtual uno::Reference uno::XInterface getSheets() = 0;
diff --git a/test/inc/test/sheet/xnamedranges.hxx
b/test/inc/test/sheet/xnamedranges.hxx
index 508fec5..b2a6012 100644
--- a/test/inc/test/sheet/xnamedranges.hxx
+++ b/test/inc/test/sheet/xnamedranges.hxx
@@ -43,6 +43,8 @@ public:
// removes given entry
XNamedRanges(const rtl::OUString rNameToRemove);
+virtual ~XNamedRanges();
+
virtual uno::Reference uno::XInterface init(sal_Int32 nSheets = 0) = 0;
// XNamedRanges
diff --git a/test/inc/test/util/xsearchable.hxx
b/test/inc/test/util/xsearchable.hxx
index f7b8758..673ce44 100644
--- a/test/inc/test/util/xsearchable.hxx
+++ b/test/inc/test/util/xsearchable.hxx
@@ -38,6 +38,7 @@ class OOO_DLLPUBLIC_TEST XSearchable
public:
XSearchable(const rtl::OUString rString, sal_Int32 nCount) :
maSearchString(rString), mnCount(nCount) {}
XSearchable() :
maSearchString(RTL_CONSTASCII_USTRINGPARAM(SearchString)), mnCount(1) {}
+virtual ~XSearchable();
void testFindFirst();
void testFindNext();
diff --git a/test/source/sheet/xdatapilottable2.cxx
b/test/source/sheet/xdatapilottable2.cxx
index de1bb97..dd29aa3 100644
--- a/test/source/sheet/xdatapilottable2.cxx
+++ b/test/source/sheet/xdatapilottable2.cxx
@@ -46,6 +46,10 @@ using namespace com::sun::star::uno;
namespace apitest {
+XDataPilotTable2::~XDataPilotTable2()
+{
+}
+
void XDataPilotTable2::testGetPositionData()
{
uno::Reference sheet::XDataPilotTable2 xDPTable(initDP2(),
UNO_QUERY_THROW);
diff --git a/test/source/sheet/xnamedranges.cxx
b/test/source/sheet/xnamedranges.cxx
index b5c9a46..9f52cc6 100644
--- a/test/source/sheet/xnamedranges.cxx
+++ b/test/source/sheet/xnamedranges.cxx
@@ -65,6 +65,10 @@ XNamedRanges::XNamedRanges(const rtl::OUString
rNameToRemove):
}
+XNamedRanges::~XNamedRanges()
+{
+}
+
void XNamedRanges::testAddNewByName()
{
uno::Reference sheet::XNamedRanges xNamedRanges(init(),
UNO_QUERY_THROW);
diff --git a/test/source/util/xsearchable.cxx b/test/source/util/xsearchable.cxx
index 7f3fdb0..040268b 100644
--- a/test/source/util/xsearchable.cxx
+++ b/test/source/util/xsearchable.cxx
@@ -74,6 +74,10 @@ void XSearchable::testFindNext()
}
}
+XSearchable::~XSearchable()
+{
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2eeef79b78242a89ef6901ba67b30f178d59027f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 1 09:31:54 2012 +
callcatcher: update list
diff --git a/Makefile b/Makefile
index 82cb710..e9a1880 100644
--- a/Makefile
+++ b/Makefile
@@ -467,6 +467,12 @@ findunusedcode:
| grep -v ^libwpg:: \
| grep -v ^lucene:: \
| grep -v ^salhelper:: \
+ | grep -v ^WP1 \
+ | grep -v ^WP3 \
+ | grep -v ^WP42 \
+ | grep -v ^WP6 \
+ | grep -v ^WPG \
+ | grep -v ^WPS \
unusedcode.easy
check: subsequentcheck
diff --git a/sd/source/filter/eppt/pptx-text.cxx
b/sd/source/filter/eppt/pptx-text.cxx
index b54acde..3848528 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1297,18 +1297,6 @@ TextObj::~TextObj()
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_svtools binfilter/inc
binfilter/bf_sc/source/core/inc/ddelink.hxx|3 -
binfilter/bf_sc/source/core/tool/sc_rechead.cxx| 31 --
binfilter/bf_svtools/source/memtools/tl_unqidx.cxx | 62 -
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 23 ---
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 23 +++
binfilter/inc/bf_sc/cell.hxx |3 -
binfilter/inc/bf_sc/chgtrack.hxx |9 ---
binfilter/inc/bf_sc/column.hxx |2
binfilter/inc/bf_sc/conditio.hxx |5 -
binfilter/inc/bf_sc/dbcolect.hxx |4 -
binfilter/inc/bf_sc/dpobject.hxx |1
binfilter/inc/bf_sc/olinetab.hxx |3 -
binfilter/inc/bf_sc/pivot.hxx |2
binfilter/inc/bf_sc/rangenam.hxx |4 -
binfilter/inc/bf_sc/rechead.hxx| 14
binfilter/inc/bf_sc/validat.hxx|2
binfilter/inc/bf_tools/string.hxx |1
17 files changed, 23 insertions(+), 169 deletions(-)
New commits:
commit 3419df8d8ad9c2e514a19dfb681d8a5ee009
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 1 09:32:12 2012 +
drop ScMultipleWriteHeader
diff --git a/binfilter/bf_sc/source/core/inc/ddelink.hxx
b/binfilter/bf_sc/source/core/inc/ddelink.hxx
index 4c09e17..5db1af8 100644
--- a/binfilter/bf_sc/source/core/inc/ddelink.hxx
+++ b/binfilter/bf_sc/source/core/inc/ddelink.hxx
@@ -36,7 +36,6 @@ namespace binfilter {
class ScDocument;
class ScMatrix;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
class ScDdeLink : public ::binfilter::SvBaseLink, public SfxBroadcaster
{
@@ -63,8 +62,6 @@ public:
ScDdeLink( ScDocument* pD, SvStream rStream,
ScMultipleReadHeader rHdr );
virtual ~ScDdeLink();
-void Store( SvStream, ScMultipleWriteHeader ) const {}
-
// von SvBaseLink ueberladen:
virtual voidDataChanged( const String rMimeType,
const ::com::sun::star::uno::Any rValue );
diff --git a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
index 695d22a..ce966ee 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
@@ -181,37 +181,6 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-// ---
-
-/*N*/ ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream rNewStream,
sal_uInt32 nDefault) :
-/*N*/ rStream( rNewStream ),
-/*N*/ aMemStream( 4096, 4096 )
-/*N*/ {
-/*N*/ nDataSize = nDefault;
-/*N*/ rStream nDataSize;
-/*N*/
-/*N*/ nDataPos = rStream.Tell();
-/*N*/ nEntryStart = nDataPos;
-/*N*/ }
-
-/*N*/ ScMultipleWriteHeader::~ScMultipleWriteHeader()
-/*N*/ {
-/*N*/ ULONG nDataEnd = rStream.Tell();
-/*N*/
-/*N*/ rStream (USHORT) SCID_SIZES;
-/*N*/ rStream static_castsal_uInt32(aMemStream.Tell());
-/*N*/ rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
-/*N*/
-/*N*/ if ( nDataEnd - nDataPos != nDataSize ) // Default
getroffen?
-/*N*/ {
-/*N*/ nDataSize = nDataEnd - nDataPos;
-/*N*/ ULONG nPos = rStream.Tell();
-/*N*/ rStream.Seek(nDataPos-sizeof(sal_uInt32));
-/*N*/ rStream nDataSize; // Groesse am
Anfang eintragen
-/*N*/ rStream.Seek(nPos);
-/*N*/ }
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
index 3356ccd..66ebdf8 100644
--- a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
@@ -98,31 +98,6 @@ sal_uIntPtr UniqueIndex::Insert( void* p )
/*
|*
-|*UniqueIndex::Insert()
-|*
-*/
-
-sal_uIntPtr UniqueIndex::Insert( sal_uIntPtr nIndex, void* p )
-{
-// NULL-Pointer ist nicht erlaubt
-if ( !p )
-return UNIQUEINDEX_ENTRY_NOTFOUND;
-
-sal_uIntPtr nContIndex = nIndex - nStartIndex;
-// Ist Array voll, dann expandieren
-if ( nContIndex = Container::GetSize() )
-SetSize( nContIndex + nReSize );
-
-// Object im Array speichern
-Container::Replace( p, nContIndex );
-
-// Anzahl der Eintraege erhoehen und Index zurueckgeben
-nCount++;
-return nIndex;
-}
-
-/*
-|*
|*UniqueIndex::Remove()
|*
*/
@@ -146,22 +121,6 @@ void* UniqueIndex::Remove( sal_uIntPtr nIndex )
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 456a59b24d4ba5ac341f76b4302e82b687e97f69
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Mar 1 11:56:08 2012 +0100
fix RTF import of drawing objects when there is no shape to send
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index fbe257c..ad45d96 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3245,7 +3245,7 @@ int RTFDocumentImpl::popState()
aFrame = m_aStates.top().aFrame;
bPopFrame = true;
}
-else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT)
+else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT
m_aStates.top().aDrawingObject.xShape.is())
{
RTFDrawingObject rDrawing = m_aStates.top().aDrawingObject;
uno::Referencedrawing::XShape xShape(rDrawing.xShape);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeMacOSX.conf redland/raptor
distro-configs/LibreOfficeMacOSX.conf |1 -
redland/raptor/raptor-1.4.18.entities.patch | 13 -
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 89f7da6d23eb348e4b16b529f95a40c635787807
Author: Petr Mladek pmla...@suse.cz
Date: Thu Mar 1 11:55:50 2012 +0100
Revert Use internal libxml for Mac release builds.
raptor is buildable with the older libxml2 now
This reverts commit 4591cd22409f870a0fa9263691945eea92359954.
diff --git a/distro-configs/LibreOfficeMacOSX.conf
b/distro-configs/LibreOfficeMacOSX.conf
index 1a1fd09..9366a04 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,7 +1,6 @@
--with-vendor=The Document Foundation
--enable-epm
--enable-binfilter
---without-system-libxml
--disable-cairo-canvas
--with-java-target-version=1.5
--enable-ext-presenter-minimizer
commit a5394f98f2b6e4498ef1981272f2af3999b7df5f
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 1 11:54:18 2012 +0100
raptor: make the entities patch work on older libxml2 versions
Add a runtime check whether the checked member is available.
diff --git a/redland/raptor/raptor-1.4.18.entities.patch
b/redland/raptor/raptor-1.4.18.entities.patch
index 4964dae..d311879 100644
--- a/redland/raptor/raptor-1.4.18.entities.patch
+++ b/redland/raptor/raptor-1.4.18.entities.patch
@@ -49,7 +49,7 @@
int raptor_sax2_init(void);
--- misc/raptor-1.4.18/src/raptor_libxml.c.old 2008-06-14 05:35:27.0
+0200
+++ misc/build/raptor-1.4.18/src/raptor_libxml.c 2012-02-15
16:52:08.0 +0100
-@@ -142,18 +142,115 @@ raptor_libxml_hasExternalSubset (void* u
+@@ -142,18 +142,126 @@ raptor_libxml_hasExternalSubset (void* u
static xmlParserInputPtr
raptor_libxml_resolveEntity(void* user_data,
@@ -161,9 +161,20 @@
+
+ret-owner = 1;
+
++/* ret-checked was added with commit a37a6ad91a61d168ecc4b29263def3363fff4da6
++ in libxml2 before 2.6.27 it does not exist and ret-children != 0 will be
++ tested instead, which is true due to xmlAddChildList above */
++#if LIBXML_VERSION = 20627 || !defined(__APPLE__)
+/* Mark this entity as having been checked - never do this again */
+if(!ret-checked)
+ ret-checked = 1;
++#else
++if (atoi(xmlParserVersion) = 20627) {
++int *const pChecked = (ret-owner) + 1;
++if (!*pChecked) /* owner precedes checked and is also of type int */
++ *pChecked = 1;
++}
++#endif
+ }
+
+ return ret;
___
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 - distro-configs/LibreOfficeMacOSX.conf redland/raptor
distro-configs/LibreOfficeMacOSX.conf |1 -
redland/raptor/raptor-1.4.18.entities.patch | 13 -
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 0b252f4706a0d4e113fff9cfe0f55f64f5e74f1f
Author: Petr Mladek pmla...@suse.cz
Date: Thu Mar 1 11:55:50 2012 +0100
Revert Use internal libxml for Mac release builds.
raptor is buildable with the older libxml2 now
This reverts commit 4591cd22409f870a0fa9263691945eea92359954.
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/distro-configs/LibreOfficeMacOSX.conf
b/distro-configs/LibreOfficeMacOSX.conf
index 1a1fd09..9366a04 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,7 +1,6 @@
--with-vendor=The Document Foundation
--enable-epm
--enable-binfilter
---without-system-libxml
--disable-cairo-canvas
--with-java-target-version=1.5
--enable-ext-presenter-minimizer
commit 41999cbca1753f2c7930f1e24641fa71576313c5
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 1 11:54:18 2012 +0100
raptor: make the entities patch work on older libxml2 versions
Add a runtime check whether the checked member is available.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/redland/raptor/raptor-1.4.18.entities.patch
b/redland/raptor/raptor-1.4.18.entities.patch
index 4964dae..d311879 100644
--- a/redland/raptor/raptor-1.4.18.entities.patch
+++ b/redland/raptor/raptor-1.4.18.entities.patch
@@ -49,7 +49,7 @@
int raptor_sax2_init(void);
--- misc/raptor-1.4.18/src/raptor_libxml.c.old 2008-06-14 05:35:27.0
+0200
+++ misc/build/raptor-1.4.18/src/raptor_libxml.c 2012-02-15
16:52:08.0 +0100
-@@ -142,18 +142,115 @@ raptor_libxml_hasExternalSubset (void* u
+@@ -142,18 +142,126 @@ raptor_libxml_hasExternalSubset (void* u
static xmlParserInputPtr
raptor_libxml_resolveEntity(void* user_data,
@@ -161,9 +161,20 @@
+
+ret-owner = 1;
+
++/* ret-checked was added with commit a37a6ad91a61d168ecc4b29263def3363fff4da6
++ in libxml2 before 2.6.27 it does not exist and ret-children != 0 will be
++ tested instead, which is true due to xmlAddChildList above */
++#if LIBXML_VERSION = 20627 || !defined(__APPLE__)
+/* Mark this entity as having been checked - never do this again */
+if(!ret-checked)
+ ret-checked = 1;
++#else
++if (atoi(xmlParserVersion) = 20627) {
++int *const pChecked = (ret-owner) + 1;
++if (!*pChecked) /* owner precedes checked and is also of type int */
++ *pChecked = 1;
++}
++#endif
+ }
+
+ return ret;
___
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 - 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:
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - 2 commits - distro-configs/LibreOfficeMacOSX.conf redland/raptor
distro-configs/LibreOfficeMacOSX.conf |1 -
redland/raptor/raptor-1.4.18.entities.patch | 13 -
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit d3bdda0e404df6832e43d10e0aad6e276aeba3f3
Author: Petr Mladek pmla...@suse.cz
Date: Thu Mar 1 11:55:50 2012 +0100
Revert Use internal libxml for Mac release builds.
raptor is buildable with the older libxml2 now
This reverts commit 4591cd22409f870a0fa9263691945eea92359954.
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Fridrich Strba fridrich.st...@suse.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/distro-configs/LibreOfficeMacOSX.conf
b/distro-configs/LibreOfficeMacOSX.conf
index 1a1fd09..9366a04 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,7 +1,6 @@
--with-vendor=The Document Foundation
--enable-epm
--enable-binfilter
---without-system-libxml
--disable-cairo-canvas
--with-java-target-version=1.5
--enable-ext-presenter-minimizer
commit 60b8209ea00ede3c3a677e9ecdb1f95e402f88b3
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 1 11:54:18 2012 +0100
raptor: make the entities patch work on older libxml2 versions
Add a runtime check whether the checked member is available.
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/redland/raptor/raptor-1.4.18.entities.patch
b/redland/raptor/raptor-1.4.18.entities.patch
index 4964dae..d311879 100644
--- a/redland/raptor/raptor-1.4.18.entities.patch
+++ b/redland/raptor/raptor-1.4.18.entities.patch
@@ -49,7 +49,7 @@
int raptor_sax2_init(void);
--- misc/raptor-1.4.18/src/raptor_libxml.c.old 2008-06-14 05:35:27.0
+0200
+++ misc/build/raptor-1.4.18/src/raptor_libxml.c 2012-02-15
16:52:08.0 +0100
-@@ -142,18 +142,115 @@ raptor_libxml_hasExternalSubset (void* u
+@@ -142,18 +142,126 @@ raptor_libxml_hasExternalSubset (void* u
static xmlParserInputPtr
raptor_libxml_resolveEntity(void* user_data,
@@ -161,9 +161,20 @@
+
+ret-owner = 1;
+
++/* ret-checked was added with commit a37a6ad91a61d168ecc4b29263def3363fff4da6
++ in libxml2 before 2.6.27 it does not exist and ret-children != 0 will be
++ tested instead, which is true due to xmlAddChildList above */
++#if LIBXML_VERSION = 20627 || !defined(__APPLE__)
+/* Mark this entity as having been checked - never do this again */
+if(!ret-checked)
+ ret-checked = 1;
++#else
++if (atoi(xmlParserVersion) = 20627) {
++int *const pChecked = (ret-owner) + 1;
++if (!*pChecked) /* owner precedes checked and is also of type int */
++ *pChecked = 1;
++}
++#endif
+ }
+
+ return ret;
___
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 - redland/raptor
redland/raptor/makefile.mk |3
redland/raptor/raptor-1.4.18.entities.patch | 394
2 files changed, 396 insertions(+), 1 deletion(-)
New commits:
commit 514ded8d3dc5b924bc790ae19853b21e040062eb
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 1 11:54:18 2012 +0100
raptor: make the entities patch work on older libxml2 versions
Add a runtime check whether the checked member is available.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/redland/raptor/raptor-1.4.18.entities.patch
b/redland/raptor/raptor-1.4.18.entities.patch
index 4964dae..d311879 100644
--- a/redland/raptor/raptor-1.4.18.entities.patch
+++ b/redland/raptor/raptor-1.4.18.entities.patch
@@ -49,7 +49,7 @@
int raptor_sax2_init(void);
--- misc/raptor-1.4.18/src/raptor_libxml.c.old 2008-06-14 05:35:27.0
+0200
+++ misc/build/raptor-1.4.18/src/raptor_libxml.c 2012-02-15
16:52:08.0 +0100
-@@ -142,18 +142,115 @@ raptor_libxml_hasExternalSubset (void* u
+@@ -142,18 +142,126 @@ raptor_libxml_hasExternalSubset (void* u
static xmlParserInputPtr
raptor_libxml_resolveEntity(void* user_data,
@@ -161,9 +161,20 @@
+
+ret-owner = 1;
+
++/* ret-checked was added with commit a37a6ad91a61d168ecc4b29263def3363fff4da6
++ in libxml2 before 2.6.27 it does not exist and ret-children != 0 will be
++ tested instead, which is true due to xmlAddChildList above */
++#if LIBXML_VERSION = 20627 || !defined(__APPLE__)
+/* Mark this entity as having been checked - never do this again */
+if(!ret-checked)
+ ret-checked = 1;
++#else
++if (atoi(xmlParserVersion) = 20627) {
++int *const pChecked = (ret-owner) + 1;
++if (!*pChecked) /* owner precedes checked and is also of type int */
++ *pChecked = 1;
++}
++#endif
+ }
+
+ return ret;
commit b1c116c9c0bbd3b367a7a644ca1ddd0e224d0f11
Author: Petr Mladek pmla...@suse.cz
Date: Tue Feb 28 11:02:38 2012 +0100
Disable problematic reading of external entities in raptor
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index bbedd36..8ad5b34 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -57,7 +57,8 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \
-raptor-aix.patch
+raptor-aix.patch \
+$(TARFILE_NAME).entities.patch
PATCH_FILES=$(OOO_PATCH_FILES)
diff --git a/redland/raptor/raptor-1.4.18.entities.patch
b/redland/raptor/raptor-1.4.18.entities.patch
new file mode 100644
index 000..4964dae
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.entities.patch
@@ -0,0 +1,383 @@
+--- misc/raptor-1.4.18/src/raptor.h.old2008-06-20 07:47:38.0
+0200
misc/build/raptor-1.4.18/src/raptor.h 2012-02-15 16:54:21.0
+0100
+@@ -376,6 +376,7 @@ typedef struct {
+ * @RAPTOR_FEATURE_JSON_EXTRA_DATA: JSON serializer extra top-level data
+ * @RAPTOR_FEATURE_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples
it finds (none, rdf-xml, atom-triples)
+ * @RAPTOR_FEATURE_ATOM_ENTRY_URI: Atom entry URI. If given, generate an
Atom Entry Document with the item having the given URI, otherwise generate an
Atom Feed Document with any items found.
++ * @RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: When reading XML, load external
entities.
+ * @RAPTOR_FEATURE_LAST: Internal
+ *
+ * Raptor parser, serializer or XML writer features.
+@@ -416,7 +417,8 @@ typedef enum {
+ RAPTOR_FEATURE_JSON_EXTRA_DATA,
+ RAPTOR_FEATURE_RSS_TRIPLES,
+ RAPTOR_FEATURE_ATOM_ENTRY_URI,
+- RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_ATOM_ENTRY_URI
++ RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES,
++ RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES
+ } raptor_feature;
+
+
+--- misc/raptor-1.4.18/src/raptor_feature.c.old2008-06-05
08:54:16.0 +0200
misc/build/raptor-1.4.18/src/raptor_feature.c 2012-02-15
16:55:09.0 +0100
+@@ -89,7 +89,8 @@ static const struct
+ { RAPTOR_FEATURE_JSON_CALLBACK , 6, jsonCallback, JSON serializer
callback },
+ { RAPTOR_FEATURE_JSON_EXTRA_DATA , 6, jsonExtraData, JSON serializer
extra data },
+ { RAPTOR_FEATURE_RSS_TRIPLES , 6, rssTriples, Atom/RSS serializer
writes extra RDF triples },
+- { RAPTOR_FEATURE_ATOM_ENTRY_URI, 6, atomEntryUri, Atom serializer
Entry URI }
++ { RAPTOR_FEATURE_ATOM_ENTRY_URI, 6, atomEntryUri, Atom serializer
Entry URI },
++ { RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, 1, loadExternalEntities, Load
external XML entities. }
+ };
+
+
+--- misc/raptor-1.4.18/src/raptor_internal.h.old 2008-06-03
07:04:09.0 +0200
misc/build/raptor-1.4.18/src/raptor_internal.h 2012-02-15
16:52:08.0 +0100
+@@ -983,6 +983,14 @@ struct raptor_sax2_s {
+
+ /* base URI for resolving relative URIs or xml:base URIs */
+
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sw/source
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 +++---
7 files changed, 43 insertions(+), 11 deletions(-)
New commits:
commit 5bfeedfcfd542717f40693524dcb7808f23ab42f
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 27 20:43:27 2012 +0100
SwSectionFrm: initialised members are happy members
Valgrind complained about uninitialised use in
SwSectionFrm::_CheckClipping (sectfrm.cxx:).
(cherry picked from commit f430b71c46186b53a6364a60b237c81245f3eabb)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index bc16e52..c3beb2e 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -71,7 +71,7 @@ protected:
public:
SwSectionFrm( SwSection , SwFrm* ); //Inhalt wird nicht
erzeugt!
SwSectionFrm( SwSectionFrm , sal_Bool bMaster );//_Nur_ zum Erzeugen von
Master/Follows
-~SwSectionFrm();
+virtual ~SwSectionFrm();
void Init();
virtual void CheckDirection( sal_Bool bVert );
diff --git a/sw/source/core/layout/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index 3f2ea28..35d38d1 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -71,10 +71,15 @@ SV_IMPL_PTRARR_SORT( SwDestroyList, SwSectionFrmPtr )
|* SwSectionFrm::SwSectionFrm(), ~SwSectionFrm()
|*
|*/
-SwSectionFrm::SwSectionFrm( SwSection rSect, SwFrm* pSib ) :
-SwLayoutFrm( rSect.GetFmt(), pSib ),
-SwFlowFrm( (SwFrm)*this ),
-pSection( rSect )
+SwSectionFrm::SwSectionFrm( SwSection rSect, SwFrm* pSib )
+: SwLayoutFrm( rSect.GetFmt(), pSib )
+, SwFlowFrm( static_castSwFrm(*this) )
+, pSection( rSect )
+, bFtnAtEnd(false)
+, bEndnAtEnd(false)
+, bCntntLock(false)
+, bOwnFtnNum(false)
+, bFtnLock(false)
{
nType = FRMC_SECTION;
commit 8e28ba240ae2f958a67c2502546651bd9aed76cd
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 27 20:43:27 2012 +0100
SwRootFrm::~SwRootFrm: refactor:
Since CWS swlayoutrefactoring the SwRootFrms are destroyed with
SwDoc::IsInDtor not set. This can cause at least reads of freed
SwRootFrm members when executing the dtors of SwRootFrm base class
SwLayoutFrm calling into SwRootFrm::GetPageAtPos.
Prevent this scenario by:
- moving the implementation of SwRootFrm base class dtors to new
methods SwFrm::Destroy and SwLayoutFrm::Destroy
- calling SwFrm::Destroy and SwLayoutFrm::Destroy explicitly before
SwRootFrm members are freed
(cherry picked from commit ebb74441790a9852b1a1532d6e025c324666f6fc)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 7e4a389..34fcb4b 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -401,6 +401,8 @@ protected:
void ColLock() { bColLocked = sal_True; }
void ColUnlock(){ bColLocked = sal_False; }
+void Destroy(); // for ~SwRootFrm
+
// Only used by SwRootFrm Ctor to get 'this' into mpRoot...
void setRootFrm( SwRootFrm* pRoot ) { mpRoot = pRoot; }
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 1144a9d..4c4e4e6 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -56,6 +56,8 @@ class SwLayoutFrm: public SwFrm
void CopySubtree( const SwLayoutFrm *pDest );
protected:
+void Destroy(); // for ~SwRootFrm
+
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
virtual void MakeAll();
@@ -104,7 +106,7 @@ public:
const sal_Bool bDefaultExpand = sal_True )
const;
SwLayoutFrm( SwFrmFmt*, SwFrm* );
-~SwLayoutFrm();
+virtual ~SwLayoutFrm();
virtual void Paint( SwRect const,
SwPrintData const*const pPrintData = NULL ) const;
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 788fc55..7e07fae 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -177,7 +177,7 @@ public:
static sal_Bool HasSameRect( const SwRect rRect );
SwRootFrm( SwFrmFmt*, ViewShell* );
-~SwRootFrm();
+virtual ~SwRootFrm();
void Init(SwFrmFmt*);
ViewShell *GetCurrShell() const { return pCurrShell; }
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 3b6b920..5277d83 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -629,8 +629,15 @@ SwRootFrm::~SwRootFrm()
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/core/data/documen2.cxx | 81 ---
1 file changed, 1 insertion(+), 80 deletions(-)
New commits:
commit 1b93146d442bb8396126d6106f05a5bb0ee9fffa
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 12:36:10 2012 +0100
don't try to update the range names twice
the update process is now done in cell.cxx:adjustRangeNames
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index f082069..7cd70c8 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -991,80 +991,6 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
if ( !bResultsOnly )
{
-bool bNamesLost = false;
-// array containing range names which might need update of indices.
-// The instances inserted into this vector are managed by the
-// range name container of this document, so no need to delete
-// them afterward.
-::std::vectorScRangeData* aSrcRangeNames;
-
-// the index mapping thereof
-ScRangeData::IndexMap aSrcRangeMap;
-bool bRangeNameReplace = false;
-
-// find named ranges that are used in the source sheet
-std::setsal_uInt16 aUsedNames;
-pSrcDoc-maTabs[nSrcPos]-FindRangeNamesInUse( 0, 0, MAXCOL,
MAXROW, aUsedNames );
-
-if (pSrcDoc-pRangeName)
-{
-ScRangeName::const_iterator itr =
pSrcDoc-pRangeName-begin(), itrEnd = pSrcDoc-pRangeName-end();
-for (; itr != itrEnd; ++itr)//! DB-Bereiche
Pivot-Bereiche auch !!!
-{
-sal_uInt16 nOldIndex = itr-second-GetIndex();
-bool bInUse = ( aUsedNames.find(nOldIndex) !=
aUsedNames.end() );
-if (bInUse)
-{
-const ScRangeData* pExistingData =
GetRangeName()-findByUpperName(itr-second-GetUpperName());
-if (pExistingData)
-{
-// the name exists already in the destination
document
-// - use the existing name, but show a warning
-// (when refreshing links, the existing name is
used and the warning not shown)
-
-sal_uInt16 nExistingIndex =
pExistingData-GetIndex();
-
-// don't modify the named range
-aSrcRangeMap.insert(
-ScRangeData::IndexMap::value_type(nOldIndex,
nExistingIndex));
-bRangeNameReplace = true;
-bNamesLost = true;
-}
-else
-{
-ScRangeData* pData = new ScRangeData( *itr-second
);
-pData-SetDocument(this);
-if ( pRangeName-findByIndex( pData-GetIndex() ) )
-pData-SetIndex(0); // need new index,
done in Insert
-if (!pRangeName-insert(pData))
-{
-OSL_FAIL(can't insert name); //
shouldn't happen
-pData = NULL;
-}
-else
-{
-pData-TransferTabRef( nSrcPos, nDestPos );
-aSrcRangeNames.push_back(pData);
-sal_uInt16 nNewIndex = pData-GetIndex();
-aSrcRangeMap.insert(
-
ScRangeData::IndexMap::value_type(nOldIndex, nNewIndex));
-if ( !bRangeNameReplace )
-bRangeNameReplace = ( nOldIndex !=
nNewIndex );
-}
-}
-}
-}
-}
-if ( bRangeNameReplace )
-{
-// first update all inserted named formulas if they contain
other
-// range names and used indices changed
-for (size_t i = 0, n = aSrcRangeNames.size(); i n; ++i)
//! DB-Bereiche Pivot-Bereiche auch
-aSrcRangeNames[i]-ReplaceRangeNamesInUse( aSrcRangeMap );
-
-// then update the formulas, they might need the just updated
range names
-maTabs[nDestPos]-ReplaceRangeNamesInUse( 0, 0, MAXCOL,
MAXROW, aSrcRangeMap );
-}
SCsTAB nDz = ((SCsTAB)nDestPos) - (SCsTAB)nSrcPos;
maTabs[nDestPos]-UpdateReference(URM_COPY, 0, 0, nDestPos,
@@ -1072,11 +998,6 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
[Libreoffice-commits] .: sc/source
sc/source/core/data/cell.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f7fbeac4cbb764ccd153f9aea37a07e66e96b809
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 12:59:14 2012 +0100
use the correct db range for the copy, fdo#46712
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 37285e7..bd616b1 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -218,7 +218,7 @@ void adjustDBRange(ScToken* pToken, ScDocument rNewDoc,
const ScDocument* pOldD
ScDBData* pNewDBData = aNewNamedDBs.findByName(aDBName);
if (!pNewDBData)
{
-pNewDBData = new ScDBData(*pNewDBData);
+pNewDBData = new ScDBData(*pDBData);
aNewNamedDBs.insert(pNewDBData);
}
pToken-SetIndex(pNewDBData-GetIndex());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source
sw/source/core/inc/frame.hxx |2 ++
sw/source/core/inc/layfrm.hxx|4 +++-
sw/source/core/inc/rootfrm.hxx |2 +-
sw/source/core/layout/newfrm.cxx |9 -
sw/source/core/layout/ssfrm.cxx | 21 +++--
5 files changed, 33 insertions(+), 5 deletions(-)
New commits:
commit 011a970de6f65fe6543337c7da643d998a450750
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 27 20:43:27 2012 +0100
SwRootFrm::~SwRootFrm: refactor:
Since CWS swlayoutrefactoring the SwRootFrms are destroyed with
SwDoc::IsInDtor not set. This can cause at least reads of freed
SwRootFrm members when executing the dtors of SwRootFrm base class
SwLayoutFrm calling into SwRootFrm::GetPageAtPos.
Prevent this scenario by:
- moving the implementation of SwRootFrm base class dtors to new
methods SwFrm::Destroy and SwLayoutFrm::Destroy
- calling SwFrm::Destroy and SwLayoutFrm::Destroy explicitly before
SwRootFrm members are freed
(cherry picked from commit ebb74441790a9852b1a1532d6e025c324666f6fc)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index ba148cc..f118233 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -442,6 +442,8 @@ protected:
void ColLock() { bColLocked = sal_True; }
void ColUnlock() { bColLocked = sal_False; }
+void Destroy(); // for ~SwRootFrm
+
// Only used by SwRootFrm Ctor to get 'this' into mpRoot...
void setRootFrm( SwRootFrm* pRoot ){ mpRoot = pRoot; }
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index c6d17ba..14f4a3e 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -56,6 +56,8 @@ class SwLayoutFrm: public SwFrm
void CopySubtree( const SwLayoutFrm *pDest );
protected:
+void Destroy(); // for ~SwRootFrm
+
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
virtual void MakeAll();
@@ -104,7 +106,7 @@ public:
const sal_Bool bDefaultExpand = sal_True )
const;
SwLayoutFrm( SwFrmFmt*, SwFrm* );
-~SwLayoutFrm();
+virtual ~SwLayoutFrm();
virtual void Paint( SwRect const,
SwPrintData const*const pPrintData = NULL ) const;
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index a73b28b..e460486 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -178,7 +178,7 @@ public:
static sal_Bool HasSameRect( const SwRect rRect );
SwRootFrm( SwFrmFmt*, ViewShell* );
-~SwRootFrm();
+virtual ~SwRootFrm();
void Init(SwFrmFmt*);
ViewShell *GetCurrShell() const { return pCurrShell; }
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index f51aa6b..e96ebb8 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -630,8 +630,15 @@ SwRootFrm::~SwRootFrm()
(*pCurrShells)[i]-pRoot = 0;
delete pCurrShells;
+pCurrShells = 0;
-OSL_ENSURE( 0==nAccessibleShells, Some accessible shells are left );
+// Some accessible shells are left = problems on second SwFrm::Destroy
call
+assert(0 == nAccessibleShells);
+
+// manually call base classes Destroy because it could call stuff
+// that accesses members of this
+SwLayoutFrm::Destroy();
+SwFrm::Destroy();
}
/*
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 6ac8bc7..a77b00b 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -365,7 +365,7 @@ Point SwFrm::GetFrmAnchorPos( sal_Bool
bIgnoreFlysAnchoredAtThisFrame ) const
|*
|*/
-SwFrm::~SwFrm()
+void SwFrm::Destroy()
{
// accessible objects for fly and cell frames have been already disposed
// by the destructors of the derived classes.
@@ -405,6 +405,7 @@ SwFrm::~SwFrm()
}
if ( pDrawObjs )
delete pDrawObjs;
+pDrawObjs = 0;
}
#if OSL_DEBUG_LEVEL 1
@@ -413,6 +414,14 @@ SwFrm::~SwFrm()
#endif
}
+SwFrm::~SwFrm()
+{
+if (!IsRootFrm()) // ~SwRootFrm already calls Destroy!
+{
+Destroy();
+}
+}
+
/*/
const SwFrmFmt * SwLayoutFrm::GetFmt() const
@@ -560,7 +569,7 @@ void SwCntntFrm::DelFrms( const SwCntntNode rNode )
|*/
-SwLayoutFrm::~SwLayoutFrm()
+void SwLayoutFrm::Destroy()
{
SwFrm *pFrm = pLower;
@@ -644,6 +653,14 @@ SwLayoutFrm::~SwLayoutFrm()
}
}
+SwLayoutFrm::~SwLayoutFrm()
+{
+if (!IsRootFrm()) // ~SwRootFrm already calls Destroy!
+{
+
[Libreoffice-commits] .: svx/source
svx/source/form/datanavi.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7b860d4970604f08ebd2e818bfd63891dd940804
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
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 38543c6..ebdaff3 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -304,7 +304,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();
@@ -1881,7 +1882,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-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-1' - svx/source
svx/source/form/datanavi.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1f6625282d773ab798714c562589e380f90b6252
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
(cherry picked from commit 369aea7f7402e9dc98e9347ae58999dad2d21652)
Singed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index bb92182..1f8d3ee 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -304,7 +304,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();
@@ -1881,7 +1882,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] .: 2 commits - svtools/source vcl/source
svtools/source/dialogs/addresstemplate.cxx |4 ++--
svtools/source/dialogs/addresstemplate.hrc |2 +-
svtools/source/dialogs/addresstemplate.src |2 +-
vcl/source/gdi/outdev3.cxx |2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit dce056ec03bcefda7ed5f36b5e51070f8f7f912d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 1 14:27:00 2012 +
LOCAGICAL-LOGICAL
diff --git a/svtools/source/dialogs/addresstemplate.cxx
b/svtools/source/dialogs/addresstemplate.cxx
index 27ed3ba..b295a73 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -181,7 +181,7 @@ public:
// first collect all known programmatic names
StringBag aKnownNames;
-rtl::OUString
sLogicalFieldNames(ResId::toString(SvtResId(STR_LOCAGICAL_FIELD_NAMES)));
+rtl::OUString
sLogicalFieldNames(ResId::toString(SvtResId(STR_LOGICAL_FIELD_NAMES)));
sal_Int32 nIndex = 0;
do
{
@@ -690,7 +690,7 @@ void AssignmentPersistentData::Commit()
implScrollFields(0, sal_False, sal_False);
// the logical names
-rtl::OUString
sLogicalFieldNames(ResId::toString(SvtResId(STR_LOCAGICAL_FIELD_NAMES)));
+rtl::OUString
sLogicalFieldNames(ResId::toString(SvtResId(STR_LOGICAL_FIELD_NAMES)));
sal_Int32 nAdjustedTokenCount =
comphelper::string::getTokenCount(sLogicalFieldNames, ';') +
(m_pImpl-bOddFieldNumber ? 1 : 0);
DBG_ASSERT(nAdjustedTokenCount ==
(sal_Int32)m_pImpl-aFieldLabels.size(),
AddressBookSourceDialog::AddressBookSourceDialog: inconsistence
between logical and UI field names!);
diff --git a/svtools/source/dialogs/addresstemplate.hrc
b/svtools/source/dialogs/addresstemplate.hrc
index 5fb89cd..7c6f5d0 100644
--- a/svtools/source/dialogs/addresstemplate.hrc
+++ b/svtools/source/dialogs/addresstemplate.hrc
@@ -81,7 +81,7 @@
#define STR_FIELD_CALENDAR 31
#define STR_FIELD_INVITE32
-#define STR_LOCAGICAL_FIELD_NAMES 33
+#define STR_LOGICAL_FIELD_NAMES 33
#endif // _SVT_ADDRESSTEMPLATE_HRC_
diff --git a/svtools/source/dialogs/addresstemplate.src
b/svtools/source/dialogs/addresstemplate.src
index 0e48459..a679174 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -181,7 +181,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
Size = MAP_APPFONT ( 50 , 14 ) ;
};
-String STR_LOCAGICAL_FIELD_NAMES
+String STR_LOGICAL_FIELD_NAMES
{
Text =
FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4;
// no need to translate this
commit 6c3699b4a6be5c2d37fa62ee152d26ae5cba3422
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 1 12:38:34 2012 +
I really only want to know if IsSymbolFont was toggled
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index d9367c0..ac507af 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2394,7 +2394,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry(
ImplDevFontList* pFontList,
aFontSelData.mpFontData = pFontData;
bool bNewIsSymbol = aFontSelData.mpFontData
aFontSelData.mpFontData-IsSymbolFont();
-if (bNewIsSymbol || bOrigWasSymbol)
+if (bNewIsSymbol != bOrigWasSymbol)
{
// it is possible, though generally unlikely, that at this point we
// will attempt to use a symbol font as a last-ditch fallback for a
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source svx/source sw/source
sc/source/ui/inc/tabvwsh.hxx |4
sc/source/ui/view/formatsh.cxx | 22 ++
sc/source/ui/view/tabvwsh4.cxx |1 -
svx/source/tbxctrls/tbcontrl.cxx | 12 +---
svx/source/tbxctrls/tbxcolorupdate.cxx | 12 +++-
sw/source/ui/docvw/edtwin.cxx |6 --
6 files changed, 18 insertions(+), 39 deletions(-)
New commits:
commit 085e8a07e61ef2d3a82e11094d8773ab17cfdb3c
Author: Winfried Donkers o...@dci-electronics.nl
Date: Thu Mar 1 13:41:14 2012 +0100
fdo#45671 calc cell background color simplified code for split button
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 1bd0fb1..05e6838 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -108,7 +108,6 @@ private:
static sal_uInt16 nInsertCtrlState;
static sal_uInt16 nInsCellsCtrlState;
static sal_uInt16 nInsObjCtrlState;
-static ColoraBackgroundColor;
SvxHtmlOptions aHTMLOpt;
ObjectSelectionType eCurOST;
@@ -424,9 +423,6 @@ public:
boolExecuteRetypePassDlg(ScPasswordHash eDesiredHash);
-voidSetBackgroundColor( const Color aCol ) { aBackgroundColor = aCol;
}
-Color GetBackgroundColor(){ return aBackgroundColor;
}
-
using ScTabView::ShowCursor;
// ugly hack to call Define Names from Manage Names
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 8a91f36..5ef7d4f 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1421,13 +1421,12 @@ void ScFormatShell::ExecuteAttr( SfxRequest rReq )
ScTabViewShell* pTabViewShell = GetViewData()-GetViewShell();
SfxBindingsrBindings = pViewData-GetBindings();
const SfxItemSet* pNewAttrs = rReq.GetArgs();
+sal_uInt16 nSlot = rReq.GetSlot();
pTabViewShell-HideListBox(); //
Autofilter-DropDown-Listbox
if ( !pNewAttrs )
{
-sal_uInt16 nSlot = rReq.GetSlot();
-
switch ( nSlot )
{
case SID_ATTR_CHAR_FONT:
@@ -1449,25 +1448,10 @@ void ScFormatShell::ExecuteAttr( SfxRequest rReq )
rBindings.Invalidate( nSlot );
}
break;
-
-case SID_BACKGROUND_COLOR:
-{
-// SID_BACKGROUND_COLOR without arguments - set
background to last used color
-
-SvxBrushItemaBrushItem( (const SvxBrushItem)
-
pTabViewShell-GetSelectionPattern()-
-GetItem( ATTR_BACKGROUND ) );
-aBrushItem.SetColor( pTabViewShell-GetBackgroundColor()
);
-
-pTabViewShell-ApplyAttr( aBrushItem );
-}
-break;
}
}
else
{
-sal_uInt16 nSlot = rReq.GetSlot();
-
switch ( nSlot )
{
case SID_ATTR_CHAR_OVERLINE:
@@ -1642,9 +1626,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest rReq )
pTabViewShell-GetSelectionPattern()-
GetItem( ATTR_BACKGROUND ) );
-Color aSet = rNewColorItem.GetValue();
-pTabViewShell-SetBackgroundColor( aSet );
-aBrushItem.SetColor( aSet );
+aBrushItem.SetColor( rNewColorItem.GetValue() );
pTabViewShell-ApplyAttr( aBrushItem );
}
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 5ad0d03..f8e2ab8 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -109,7 +109,6 @@ using namespace com::sun::star;
sal_uInt16 ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC;
sal_uInt16 ScTabViewShell::nInsCellsCtrlState = 0;
sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM;
-Color ScTabViewShell::aBackgroundColor = COL_TRANSPARENT;
// ---
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d6a3244..b750152 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2327,16 +2327,6 @@ void SvxColorExtToolBoxControl::StateChanged(
bChoiceFromPalette = sal_False;
switch( nSID )
{
-case SID_ATTR_CHAR_COLOR_EXT :
-case SID_ATTR_CHAR_COLOR_BACKGROUND_EXT :
-if ( SFX_ITEM_DONTCARE != eState )
-{
-const SfxBoolItem* pBool = PTR_CAST( SfxBoolItem, pState );
-rTbx.CheckItem( nId, pBool pBool-GetValue());
-}
-rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
-break;
-
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx | 26 --
editeng/source/editeng/impedit.hxx |5 ++---
editeng/source/editeng/impedit4.cxx | 24
3 files changed, 14 insertions(+), 41 deletions(-)
New commits:
commit a0cd57b926830e8798a5019b30776e94dd97c8a1
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 1 10:22:36 2012 +0200
Remove SvxFontTable and use std::vector instead
In removing tools/table.hxx usage, remove SvxFontTable and
convert to std::vectorSvxFontItem* because it was only
being used as a temporary list, not a map.
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 50f96a2..98268d9 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2161,32 +2161,6 @@ bool CharAttribList::DbgCheckAttribs() const
}
#endif
-SvxFontTable::SvxFontTable()
-{
-}
-
-SvxFontTable::~SvxFontTable()
-{
-SvxFontItem* pItem = First();
-while( pItem )
-{
-delete pItem;
-pItem = Next();
-}
-}
-
-sal_uLong SvxFontTable::GetId( const SvxFontItem rFontItem )
-{
-SvxFontItem* pItem = First();
-while ( pItem )
-{
-if ( *pItem == rFontItem )
-return GetCurKey();
-pItem = Next();
-}
-DBG_WARNING( Font not found: GetId() );
-return 0;
-}
SvxColorList::SvxColorList()
{
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 1c008fb..d02a959 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -80,7 +80,6 @@ DBG_NAMEEX( EditEngine )
class EditView;
class EditEngine;
-class SvxFontTable;
class SvxColorList;
class SvxSearchItem;
@@ -640,9 +639,9 @@ private:
sal_uInt32 WriteBin( SvStream rOutput, EditSelection aSel,
sal_Bool bStoreUnicode = sal_False ) const;
voidWriteItemAsRTF( const SfxPoolItem rItem, SvStream
rOutput, sal_uInt16 nPara, sal_uInt16 nPos,
-SvxFontTable rFontTable, SvxColorList rColorList );
+std::vectorSvxFontItem* rFontTable, SvxColorList
rColorList );
sal_BoolWriteItemListAsRTF( ItemList rLst, SvStream rOutput,
sal_uInt16 nPara, sal_uInt16 nPos,
-SvxFontTable rFontTable, SvxColorList rColorList );
+std::vectorSvxFontItem* rFontTable, SvxColorList
rColorList );
sal_Int32 LogicToTwips( sal_Int32 n );
inline shortGetXValue( short nXValue ) const;
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index f76b0ca..07d8074 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -277,7 +277,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream rOutput,
EditSelection aSel )
}
sal_Bool ImpEditEngine::WriteItemListAsRTF( ItemList rLst, SvStream rOutput,
sal_uInt16 nPara, sal_uInt16 nPos,
-SvxFontTable rFontTable, SvxColorList rColorList )
+std::vectorSvxFontItem* rFontTable, SvxColorList
rColorList )
{
const SfxPoolItem* pAttrItem = rLst.First();
while ( pAttrItem )
@@ -358,11 +358,11 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
// Generate and write out Font table ...
-SvxFontTable aFontTable;
+std::vectorSvxFontItem* aFontTable;
// default font must be up front, so DEF font in RTF
-aFontTable.Insert( 0, new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO ) ) );
-aFontTable.Insert( 1, new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CJK ) ) );
-aFontTable.Insert( 2, new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CTL ) ) );
+aFontTable.push_back( new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO ) ) );
+aFontTable.push_back( new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CJK ) ) );
+aFontTable.push_back( new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CTL ) ) );
for ( sal_uInt16 nScriptType = 0; nScriptType 3; nScriptType++ )
{
sal_uInt16 nWhich = EE_CHAR_FONTINFO;
@@ -376,14 +376,14 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
while ( pFontItem )
{
bool bAlreadyExist = false;
-sal_uLong nTestMax = nScriptType ? aFontTable.Count() : 1;
+sal_uLong nTestMax = nScriptType ? aFontTable.size() : 1;
for ( sal_uLong nTest = 0; !bAlreadyExist ( nTest nTestMax );
nTest++ )
{
-bAlreadyExist = *aFontTable.Get( nTest ) == *pFontItem;
+
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbcontrl.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 5af303c0cd4d46c459c6b90712843967d716c866
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 1 17:35:47 2012 +0100
-Werror=unused-variable
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b750152..d24421d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2319,8 +2319,6 @@ void SvxColorExtToolBoxControl::StateChanged(
sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
-sal_uInt16 nId = GetId();
-ToolBox rTbx = GetToolBox();
const SvxColorItem* pItem = 0;
if ( bChoiceFromPalette )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oowintool
oowintool |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 32781c2d268ed94eb46318a0398385baf31368c4
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 1 16:37:08 2012 +
given that we can build with java7 now, allow it for windows too
diff --git a/oowintool b/oowintool
index 28f16da..7c74ae0 100755
--- a/oowintool
+++ b/oowintool
@@ -227,8 +227,9 @@ sub print_dotnetsdk_dir()
sub print_jdk_dir()
{
my $dir =
+ reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\
Development\ Kit/1.7/JavaHome) ||
+ reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\
Development\ Kit/1.6/JavaHome) ||
reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\
Development\ Kit/1.5/JavaHome) ||
- reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\
Kit/1.6/JavaHome) ||
reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\
Development\ Kit/1.4/JavaHome) ||
reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\
Development\ Kit/1.3/JavaHome);
print cygpath($dir, 'w', $output_format);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/documen2.cxx | 79 ---
1 file changed, 79 deletions(-)
New commits:
commit fcc9e377ad525a919ab13e7b0424a6c6d5673878
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 12:36:10 2012 +0100
don't try to update the range names twice
the update process is now done in cell.cxx:adjustRangeNames
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index b0ae78e..567135d 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -994,80 +994,6 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
if ( !bResultsOnly )
{
-bool bNamesLost = false;
-// array containing range names which might need update of indices.
-// The instances inserted into this vector are managed by the
-// range name container of this document, so no need to delete
-// them afterward.
-::std::vectorScRangeData* aSrcRangeNames;
-
-// the index mapping thereof
-ScRangeData::IndexMap aSrcRangeMap;
-bool bRangeNameReplace = false;
-
-// find named ranges that are used in the source sheet
-std::setsal_uInt16 aUsedNames;
-pSrcDoc-maTabs[nSrcPos]-FindRangeNamesInUse( 0, 0, MAXCOL,
MAXROW, aUsedNames );
-
-if (pSrcDoc-pRangeName)
-{
-ScRangeName::const_iterator itr =
pSrcDoc-pRangeName-begin(), itrEnd = pSrcDoc-pRangeName-end();
-for (; itr != itrEnd; ++itr)//! DB-Bereiche
Pivot-Bereiche auch !!!
-{
-sal_uInt16 nOldIndex = itr-second-GetIndex();
-bool bInUse = ( aUsedNames.find(nOldIndex) !=
aUsedNames.end() );
-if (bInUse)
-{
-const ScRangeData* pExistingData =
GetRangeName()-findByUpperName(itr-second-GetUpperName());
-if (pExistingData)
-{
-// the name exists already in the destination
document
-// - use the existing name, but show a warning
-// (when refreshing links, the existing name is
used and the warning not shown)
-
-sal_uInt16 nExistingIndex =
pExistingData-GetIndex();
-
-// don't modify the named range
-aSrcRangeMap.insert(
-ScRangeData::IndexMap::value_type(nOldIndex,
nExistingIndex));
-bRangeNameReplace = true;
-bNamesLost = true;
-}
-else
-{
-ScRangeData* pData = new ScRangeData( *itr-second
);
-pData-SetDocument(this);
-if ( pRangeName-findByIndex( pData-GetIndex() ) )
-pData-SetIndex(0); // need new index,
done in Insert
-if (!pRangeName-insert(pData))
-{
-OSL_FAIL(can't insert name); //
shouldn't happen
-pData = NULL;
-}
-else
-{
-pData-TransferTabRef( nSrcPos, nDestPos );
-aSrcRangeNames.push_back(pData);
-sal_uInt16 nNewIndex = pData-GetIndex();
-aSrcRangeMap.insert(
-
ScRangeData::IndexMap::value_type(nOldIndex, nNewIndex));
-if ( !bRangeNameReplace )
-bRangeNameReplace = ( nOldIndex !=
nNewIndex );
-}
-}
-}
-}
-}
-if ( bRangeNameReplace )
-{
-// first update all inserted named formulas if they contain
other
-// range names and used indices changed
-for (size_t i = 0, n = aSrcRangeNames.size(); i n; ++i)
//! DB-Bereiche Pivot-Bereiche auch
-aSrcRangeNames[i]-ReplaceRangeNamesInUse( aSrcRangeMap );
-
-// then update the formulas, they might need the just updated
range names
-maTabs[nDestPos]-ReplaceRangeNamesInUse( 0, 0, MAXCOL,
MAXROW, aSrcRangeMap );
-}
SCsTAB nDz = ((SCsTAB)nDestPos) - (SCsTAB)nSrcPos;
maTabs[nDestPos]-UpdateReference(URM_COPY, 0, 0, nDestPos,
@@ -1075,11 +1001,6 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/documen2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 55b3c7430637d2b0005d7c0332e7221c69138a63
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 11:50:13 2012 +0100
use correct source table
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 567135d..cf3e81c 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -955,7 +955,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
// Copy the RTL settings
maTabs[nDestPos]-SetLayoutRTL(pSrcDoc-maTabs[nSrcPos]-IsLayoutRTL());
-
maTabs[nDestPos]-SetLoadingRTL(pSrcDoc-maTabs[nDestPos]-IsLoadingRTL());
+
maTabs[nDestPos]-SetLoadingRTL(pSrcDoc-maTabs[nSrcPos]-IsLoadingRTL());
}
else// bestehende Tabelle ersetzen
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/cell.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 94d4301ac51589f0f5ae39039c0f1f7379677b3a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 12:59:14 2012 +0100
use the correct db range for the copy, fdo#46712
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 8ddc540..9b431fa 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -226,7 +226,7 @@ void adjustDBRange(ScToken* pToken, ScDocument rNewDoc,
const ScDocument* pOldD
ScDBData* pNewDBData = aNewNamedDBs.findByName(aDBName);
if (!pNewDBData)
{
-pNewDBData = new ScDBData(*pNewDBData);
+pNewDBData = new ScDBData(*pDBData);
aNewNamedDBs.insert(pNewDBData);
}
pToken-SetIndex(pNewDBData-GetIndex());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basegfx/inc basegfx/source redland/raptor sot/inc sot/source unusedcode.easy
basegfx/inc/basegfx/polygon/b2dpolygontools.hxx |6 -- basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx |7 -- basegfx/inc/basegfx/polygon/b3dpolygontools.hxx |3 - basegfx/source/polygon/b2dpolygontools.cxx| 27 -- basegfx/source/polygon/b3dpolygonclipper.cxx | 12 basegfx/source/polygon/b3dpolygontools.cxx| 21 redland/raptor/makefile.mk| 13 +++-- sot/inc/sot/exchange.hxx | 17 -- sot/source/base/formats.cxx | 57 -- unusedcode.easy |5 - 10 files changed, 8 insertions(+), 160 deletions(-) New commits: commit ebbef3a92d968bc82bbb86109ed604434a071e1f Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Mar 1 20:20:24 2012 +0200 Move MinGW-specific magic inside MinGW-specific .IF branch diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index d898f94..c90c175 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -96,11 +96,6 @@ CONFIGURE_FLAGS=--disable-static --enable-shared --disable-gtk-doc --with-openss BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -.ELSE -# there is no wntmsci build environment in the tarball; we use custom dmakefile -BUILD_ACTION=dmake -BUILD_DIR=$(CONFIGURE_DIR)$/src -.ENDIF # Hack to get librdf.dll linked on mingw. I am already wearied of # fighting libtool's pseudo-intelligence, so I am just going to go with @@ -110,6 +105,14 @@ ALL : $(OUT)/lib/libraptor.la $(OUT)/lib/libraptor.la : $(MISC)/build/so_built_so_raptor $(SED) /^dlname/s@='@='../bin/@ $(MISC)/build/$(TARFILE_NAME)/src/libraptor.la $@ +.ELSE + +# there is no wntmsci build environment in the tarball; we use custom dmakefile +BUILD_ACTION=dmake +BUILD_DIR=$(CONFIGURE_DIR)$/src + +.ENDIF + .ELSE # WNT .IF $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC commit e8dbf6840ca118222ad95856dc7ea06eaffc3b66 Author: Elton Chung el...@layerjet.com Date: Fri Mar 2 01:58:12 2012 +0800 Remove unused code diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx index 3fdadbc..d26475e 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx @@ -316,9 +316,6 @@ namespace basegfx // distort polygon. rOriginal describes the original range, where the given points describe the distorted corresponding points. BASEGFX_DLLPUBLIC B2DPolygon distort(const B2DPolygon rCandidate, const B2DRange rOriginal, const B2DPoint rTopLeft, const B2DPoint rTopRight, const B2DPoint rBottomLeft, const B2DPoint rBottomRight); -// rotate polygon around given point with given angle. -BASEGFX_DLLPUBLIC B2DPolygon rotateAroundPoint(const B2DPolygon rCandidate, const B2DPoint rCenter, double fAngle); - // expand all segments (which are not yet) to curve segments. This is done with setting the control // vectors on the 1/3 resp. 2/3 distances on each segment. BASEGFX_DLLPUBLIC B2DPolygon expandToCurve(const B2DPolygon rCandidate); @@ -327,9 +324,6 @@ namespace basegfx // vectors on the 1/3 resp. 2/3 distances. The return value describes if a change took place. BASEGFX_DLLPUBLIC bool expandToCurveInPoint(B2DPolygon rCandidate, sal_uInt32 nIndex); -// set continuity for the whole curve. If not a curve, nothing will change. Non-curve points are not changed, too. -B2DPolygon setContinuity(const B2DPolygon rCandidate, B2VectorContinuity eContinuity); - // set continuity for given index. If not a curve, nothing will change. Non-curve points are not changed, too. // The return value describes if a change took place. BASEGFX_DLLPUBLIC bool setContinuityInPoint(B2DPolygon rCandidate, sal_uInt32 nIndex, B2VectorContinuity eContinuity); diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx index d125d47..a6ca714 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx @@ -52,13 +52,6 @@ namespace basegfx B3DORIENTATION_Z// Z-Axis }; -// Clip given 3D polygon against a plane orthogonal to X,Y or Z axis. The plane is defined using the -// enum ePlaneOrthogonal which names the vector orthogonal to the plane, the fPlaneOffset gives the distance -// of the plane from the center (0.0). -// The value bClipPositive defines on which side the return value will be (true - on positive side of plane). -// The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). -BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnOrthogonalPlane(const B3DPolyPolygon rCandidate, B3DOrientation
[Libreoffice-commits] .: tools/inc vcl/inc vcl/source
tools/inc/tools/wintypes.hxx |1 +
vcl/inc/svids.hrc|1 +
vcl/inc/vcl/msgbox.hxx |4
vcl/source/src/btntext.src |5 +
vcl/source/window/msgbox.cxx | 14 ++
5 files changed, 25 insertions(+)
New commits:
commit dfc9c72d7797862a9292bdda16ad8c107124a6df
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu Mar 1 20:13:21 2012 +0100
Added 'Copy to Clipboard' button to error dialogs
diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
index e4f0a0d..7820669 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/tools/inc/tools/wintypes.hxx
@@ -336,6 +336,7 @@ typedef sal_uInt16 StandardButtonType;
#define BUTTON_ABORT((StandardButtonType)9)
#define BUTTON_LESS ((StandardButtonType)10)
#define BUTTON_COUNT11
+#define BUTTON_COPY12
//
// - prominent place for ListBox window types -
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 5eba318..e337bc7 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -183,6 +183,7 @@
#define SV_BUTTONTEXT_IGNORE10108
#define SV_BUTTONTEXT_ABORT 10109
#define SV_BUTTONTEXT_LESS 10110
+#define SV_BUTTONTEXT_COPY 10111
#define SV_STDTEXT_FIRSTSV_STDTEXT_SERVICENOTAVAILABLE
#define SV_STDTEXT_SERVICENOTAVAILABLE 10200
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index fb960b8..1c1dcee 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -34,6 +34,8 @@
#include vcl/btndlg.hxx
#include vcl/image.hxx
#include vcl/bitmap.hxx
+#include vcl/button.hxx
+
class FixedText;
class FixedImage;
class CheckBox;
@@ -104,6 +106,8 @@ public:
sal_BoolGetCheckBoxState() const;
virtual SizeGetOptimalSize(WindowSizeType eType) const;
+
+DECL_LINK( ClickHdl, Button* );
};
// ---
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index c0303aa..6762f08 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -69,6 +69,11 @@ String SV_BUTTONTEXT_LESS
Text [ en-US ] = ~Less;
};
+String SV_BUTTONTEXT_COPY
+{
+Text [ en-US ] = Copy to Clipboard;
+};
+
String SV_BUTTONTEXT_IGNORE
{
Text [ en-US ] = ~Ignore;
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 4e5e796..3293929 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -34,6 +34,7 @@
#include brdwin.hxx
#include window.h
+#include vcl/edit.hxx
#include vcl/metric.hxx
#include vcl/svapp.hxx
#include vcl/wrkwin.hxx
@@ -399,6 +400,10 @@ void MessBox::ImplPosControls()
mpCheckBox-Show();
}
+AddButton( String( ResId( SV_BUTTONTEXT_COPY, *ImplGetResMgr() ) ),
BUTTON_COPY, 0 );
+Button* pCopyBtn = GetPushButton( BUTTON_COPY );
+pCopyBtn-SetClickHdl( LINK( this, MessBox, ClickHdl ) );
+
mpFixedText = new FixedText( this, nWinStyle );
if( mpFixedText-GetStyle() WB_EXTRAOFFSET ) // TODO: use
CalcMinimumSize() instead
aFixedSize.Width() += 2;
@@ -408,6 +413,15 @@ void MessBox::ImplPosControls()
SetPageSizePixel( aPageSize );
}
+IMPL_LINK( MessBox, ClickHdl, Button*, pBtn )
+{
+Edit aCopyHelper( this );
+aCopyHelper.SetText( maMessText, Selection( 0, maMessText.Len() ) );
+aCopyHelper.Copy();
+
+return 0;
+}
+
// ---
void MessBox::StateChanged( StateChangedType nType )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: embeddedobj/inc embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embeddedobj/Makefile embeddedobj/Module_embeddedobj.mk embeddedobj/prj embeddedobj/source embedd
Makefile |2 Repository.mk |2 RepositoryModule_ooo.mk|1 embeddedobj/Library_embobj.mk | 65 +++ embeddedobj/Library_emboleobj.mk | 89 embeddedobj/Makefile |7 + embeddedobj/Module_embeddedobj.mk | 35 ++ embeddedobj/inc/makefile.mk| 39 --- embeddedobj/prj/build.lst |7 - embeddedobj/prj/d.lst |8 - embeddedobj/prj/l10n |1 embeddedobj/prj/makefile.mk|1 embeddedobj/source/commonembedding/makefile.mk | 56 -- embeddedobj/source/general/makefile.mk | 60 --- embeddedobj/source/msole/exports.dxp |1 embeddedobj/source/msole/makefile.mk | 136 - embeddedobj/util/exports.dxp |1 embeddedobj/util/makefile.mk | 95 - postprocess/packcomponents/makefile.mk |8 + sc/CppunitTest_sc_filters_test.mk |5 sc/CppunitTest_sc_subsequent_filters_test.mk |5 sd/CppunitTest_sd_filters_test.mk |5 sd/CppunitTest_sd_regression_test.mk |5 23 files changed, 212 insertions(+), 422 deletions(-) New commits: commit d76e2d1cc396d0f1f57a0ba774be4194d8bf3459 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Feb 29 11:39:38 2012 +0100 embeddedobj: convert to gbuild diff --git a/Makefile b/Makefile index e9a1880..1739a10 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ desktop\ drawinglayer\ dtrans\ editeng\ +embeddedobj\ eventattacher\ extensions\ fileaccess\ @@ -152,7 +153,6 @@ crashrep\ ct2n\ curl\ dictionaries \ -embeddedobj\ embedserv\ epm\ expat\ diff --git a/Repository.mk b/Repository.mk index 9e7907a..a18cff9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -354,6 +354,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ deploymentgui \ dict_ja \ dict_zh \ +embobj \ +emboleobj \ fileacc \ index_data \ java_uno_accessbridge \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 28378aa..cca8623 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ drawinglayer \ dtrans \ editeng \ +embeddedobj \ eventattacher \ extensions \ fileaccess \ diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk new file mode 100644 index 000..b820eb6 --- /dev/null +++ b/embeddedobj/Library_embobj.mk @@ -0,0 +1,65 @@ +# -*- Mode: makefile-gmake; 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) 2012 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,embobj)) + +$(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj)) + +$(eval $(call gb_Library_set_include,embobj,\ + -I$(SRCDIR)/embeddedobj/source/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_api,embobj,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,embobj,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,embobj,\ + embeddedobj/source/commonembedding/embedobj \ + embeddedobj/source/commonembedding/inplaceobj \ + embeddedobj/source/commonembedding/miscobj \ + embeddedobj/source/commonembedding/persistence \ + embeddedobj/source/commonembedding/register \ + embeddedobj/source/commonembedding/specialobject \ + embeddedobj/source/commonembedding/visobj \ + embeddedobj/source/commonembedding/xfactory \ + embeddedobj/source/general/docholder \ +
[Libreoffice-commits] .: 3 commits - hwpfilter/source vcl/inc vcl/source
hwpfilter/source/hiodev.cxx |4 --
hwpfilter/source/hiodev.h |4 --
hwpfilter/source/htags.cxx|4 --
hwpfilter/source/htags.h |4 --
hwpfilter/source/lexer.cxx| 81 --
hwpfilter/source/mzstring.cxx |4 --
hwpfilter/source/mzstring.h |4 --
vcl/inc/vcl/animate.hxx |2 -
vcl/inc/vcl/cursor.hxx|2 -
vcl/inc/vcl/edit.hxx |2 -
vcl/inc/vcl/menu.hxx |2 -
vcl/inc/vcl/menubtn.hxx |2 -
vcl/inc/vcl/msgbox.hxx|2 -
vcl/inc/vcl/scrbar.hxx|2 -
vcl/inc/vcl/seleng.hxx|2 -
vcl/inc/vcl/tabctrl.hxx |2 -
vcl/inc/vcl/toolbox.hxx |2 -
vcl/source/window/msgbox.cxx |2 -
18 files changed, 11 insertions(+), 116 deletions(-)
New commits:
commit 945a2863fec0941431c082e9bd0e37ed925714c0
Author: Tor Lillqvist t...@iki.fi
Date: Thu Mar 1 22:20:15 2012 +0200
IMPL_LINK_NOARG follow-up to bd205223ec029a875c662474bb6d423d3cdd1994
diff --git a/vcl/inc/vcl/animate.hxx b/vcl/inc/vcl/animate.hxx
index e2a0af2..392b9ef 100644
--- a/vcl/inc/vcl/animate.hxx
+++ b/vcl/inc/vcl/animate.hxx
@@ -153,7 +153,7 @@ class VCL_DLLPUBLIC Animation
SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout );
-DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, Timer* );
+DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, void* );
public:
diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx
index 7e886dd..cb4eff2 100644
--- a/vcl/inc/vcl/cursor.hxx
+++ b/vcl/inc/vcl/cursor.hxx
@@ -68,7 +68,7 @@ private:
public:
SAL_DLLPRIVATE void ImplDraw();
SAL_DLLPRIVATE void ImplRestore();
-DECL_DLLPRIVATE_LINK( ImplTimerHdl, AutoTimer* );
+DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* );
SAL_DLLPRIVATE void ImplShow( bool bDrawDirect = true );
SAL_DLLPRIVATE void ImplHide();
SAL_DLLPRIVATE void ImplResume( bool bRestore = false );
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 0263daa..9ca82bd 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -93,7 +93,7 @@ private:
LinkmaUpdateDataHdl;
LinkmaAutocompleteHdl;
-DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, Timer* );
+DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, void* );
SAL_DLLPRIVATE boolImplTruncateToMaxLen( rtl::OUString,
sal_uInt32 nSelectionLen ) const;
SAL_DLLPRIVATE voidImplInitEditData();
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index c2d1047..87ae47b 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -188,7 +188,7 @@ protected:
SAL_DLLPRIVATE void ImplSelect();
SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16
nHighlightItem );
SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent,
sal_uInt16 nPos );
-DECL_DLLPRIVATE_LINK( ImplCallSelect, Menu* );
+DECL_DLLPRIVATE_LINK( ImplCallSelect, void* );
SAL_DLLPRIVATE void ImplFillLayoutData() const;
SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; }
diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx
index b9bdd81..4488753 100644
--- a/vcl/inc/vcl/menubtn.hxx
+++ b/vcl/inc/vcl/menubtn.hxx
@@ -60,7 +60,7 @@ private:
SAL_DLLPRIVATE voidImplInitMenuButtonData();
SAL_DLLPRIVATE voidImplExecuteMenu();
-DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, Timer* );
+DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* );
// Copy assignment is forbidden and not implemented.
SAL_DLLPRIVATE MenuButton( const MenuButton );
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 1c1dcee..4e963a3 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -107,7 +107,7 @@ public:
virtual SizeGetOptimalSize(WindowSizeType eType) const;
-DECL_LINK( ClickHdl, Button* );
+DECL_LINK( ClickHdl, void* );
};
// ---
diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx
index 6e894bc..36c31b6 100644
--- a/vcl/inc/vcl/scrbar.hxx
+++ b/vcl/inc/vcl/scrbar.hxx
@@ -95,7 +95,7 @@ private:
SAL_DLLPRIVATE sal_Bool ImplDrawNative( sal_uInt16 nDrawFlags );
SAL_DLLPRIVATE void ImplDragThumb( const Point rMousePos );
DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* );
-DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, AutoTimer* );
+DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, void* );
public:
ScrollBar( Window* pParent, WinBits nStyle = WB_VERT );
diff --git a/vcl/inc/vcl/seleng.hxx b/vcl/inc/vcl/seleng.hxx
index b4ed978..a5850db 100644
--- a/vcl/inc/vcl/seleng.hxx
+++ b/vcl/inc/vcl/seleng.hxx
@@ -96,7 +96,7 @@ private:
sal_uInt16 nMouseSensitivity;
sal_uInt16 nLockedMods;
sal_uInt16 nFlags;
-
[Libreoffice-commits] .: src/xlsrecord.py src/xlsstream.py
src/xlsrecord.py | 35 +--
src/xlsstream.py |3 ++-
2 files changed, 35 insertions(+), 3 deletions(-)
New commits:
commit 980a33eb78ee294c7ec701343c7f07108ca70d9a
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Thu Mar 1 15:41:20 2012 -0500
Handlers for SXInt and SXRng.
diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 5526773..4393c8f 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -3617,9 +3617,14 @@ class SXError(BaseRecordHandler):
pass
-class SXInteger(BaseRecordHandler):
+class SXInt(BaseRecordHandler):
+
+def __parseBytes (self):
+self.num = self.readSignedInt(2)
+
def parseBytes (self):
-pass
+self.__parseBytes()
+self.appendLineInt(value, self.num)
class SXString(BaseRecordHandler):
@@ -3632,6 +3637,32 @@ class SXString(BaseRecordHandler):
self.__parseBytes()
self.appendLineString(value, self.text)
+
+class SXRng(BaseRecordHandler):
+
+groupTypes = [
+numeric value,
+seconds,
+minutes,
+hours,
+days,
+months,
+quarters,
+years
+]
+
+def __parseBytes (self):
+flag = self.readUnsignedInt(2)
+self.fAutoStart = (flag 0x0001) != 0 # A
+self.fAutoEnd = (flag 0x0002) != 0 # B
+self.iByType= (flag 0x001C) / 4 # C
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLineBoolean(auto start, self.fAutoStart)
+self.appendLineBoolean(auto end, self.fAutoEnd)
+self.appendLineString(group type,
globals.getValueOrUnknown(SXRng.groupTypes, self.iByType))
+
# ---
# CT - Change Tracking
diff --git a/src/xlsstream.py b/src/xlsstream.py
index c8664c2..aab6ce5 100644
--- a/src/xlsstream.py
+++ b/src/xlsstream.py
@@ -141,7 +141,7 @@ recData = {
0x00C9: [SXDOUBLE, Double Value, xlsrecord.SXDouble],
0x00CA: [SXBOOLEAN, Boolean Value, xlsrecord.SXBoolean],
0x00CB: [SXERROR, Error Code, xlsrecord.SXError],
-0x00CC: [SXINTEGER, Integer Value, xlsrecord.SXInteger],
+0x00CC: [SXINT, Integer Value, xlsrecord.SXInt],
0x00CD: [SXSTRING, String, xlsrecord.SXString],
0x00CE: [SXDTR, Date Time Special Format, xlsrecord.SXDtr],
0x00CF: [SXEMPTY, Empty Value],
@@ -152,6 +152,7 @@ recData = {
0x00D5: [SXSTREAMID, PivotCache Stream ID, xlsrecord.SXStreamID],
0x00D6: [RSTRING, Cell with Character Formatting],
0x00D7: [DBCELL, Stream Offsets, xlsrecord.DBCell],
+0x00D8: [SXRNG, Numeric/Date Grouping Properties, xlsrecord.SXRng],
0x00DA: [BOOKBOOL, Workbook Option Flag],
0x00DC: [PARAMQRY, Query Parameters],
0x00DC: [SXEXT, External Source Information],
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - chart2/source svtools/inc svtools/source
chart2/source/tools/NameContainer.cxx |2
svtools/inc/svtools/addresstemplate.hxx|2
svtools/inc/svtools/brwbox.hxx |2
svtools/inc/svtools/calendar.hxx |2
svtools/inc/svtools/filechangedchecker.hxx |2
svtools/inc/svtools/filectrl.hxx |2
svtools/inc/svtools/prnsetup.hxx |2
svtools/inc/svtools/svlbox.hxx |8 +--
svtools/inc/svtools/svmedit.hxx|2
svtools/inc/svtools/svtabbx.hxx|4 -
svtools/inc/svtools/taskbar.hxx|2
svtools/inc/svtools/templdlg.hxx | 12 ++---
svtools/inc/svtools/texteng.hxx|2
svtools/inc/svtools/valueset.hxx |2
svtools/inc/svtools/wizardmachine.hxx |6 +-
svtools/source/edit/syntaxhighlight.cxx|2
svtools/source/filter/ixbm/xbmread.cxx | 64 ++---
17 files changed, 59 insertions(+), 59 deletions(-)
New commits:
commit 780f5bf5b177f93c8fd9ebd7ff1a322885074c8c
Author: Tor Lillqvist t...@iki.fi
Date: Thu Mar 1 23:09:42 2012 +0200
Presumably the intent is to zero the whole pHexTable, not just the 1st
element
diff --git a/svtools/source/filter/ixbm/xbmread.cxx
b/svtools/source/filter/ixbm/xbmread.cxx
index 6a8c2ee..84a8b02 100644
--- a/svtools/source/filter/ixbm/xbmread.cxx
+++ b/svtools/source/filter/ixbm/xbmread.cxx
@@ -65,7 +65,7 @@ XBMReader::~XBMReader()
void XBMReader::InitTable()
{
-memset( pHexTable, 0, sizeof( short ) );
+memset( pHexTable, 0, sizeof( short ) * 256 );
pHexTable[(int)'0'] = 0;
pHexTable[(int)'1'] = 1;
commit 2b26a54ecb589a67ee199759936a1adce148671a
Author: Tor Lillqvist t...@iki.fi
Date: Thu Mar 1 23:06:58 2012 +0200
Sillyish clang WaE: array subscript is of type 'char'
diff --git a/svtools/source/filter/ixbm/xbmread.cxx
b/svtools/source/filter/ixbm/xbmread.cxx
index e6fc446..6a8c2ee 100644
--- a/svtools/source/filter/ixbm/xbmread.cxx
+++ b/svtools/source/filter/ixbm/xbmread.cxx
@@ -67,36 +67,36 @@ void XBMReader::InitTable()
{
memset( pHexTable, 0, sizeof( short ) );
-pHexTable['0'] = 0;
-pHexTable['1'] = 1;
-pHexTable['2'] = 2;
-pHexTable['3'] = 3;
-pHexTable['4'] = 4;
-pHexTable['5'] = 5;
-pHexTable['6'] = 6;
-pHexTable['7'] = 7;
-pHexTable['8'] = 8;
-pHexTable['9'] = 9;
-pHexTable['A'] = 10;
-pHexTable['B'] = 11;
-pHexTable['C'] = 12;
-pHexTable['D'] = 13;
-pHexTable['E'] = 14;
-pHexTable['F'] = 15;
-pHexTable['X'] = 0;
-pHexTable['a'] = 10;
-pHexTable['b'] = 11;
-pHexTable['c'] = 12;
-pHexTable['d'] = 13;
-pHexTable['e'] = 14;
-pHexTable['f'] = 15;
-pHexTable['x'] = 0;
-pHexTable[' '] = -1;
-pHexTable[','] = -1;
-pHexTable['}'] = -1;
-pHexTable['\n'] = -1;
-pHexTable['\t'] = -1;
-pHexTable['\0'] = -1;
+pHexTable[(int)'0'] = 0;
+pHexTable[(int)'1'] = 1;
+pHexTable[(int)'2'] = 2;
+pHexTable[(int)'3'] = 3;
+pHexTable[(int)'4'] = 4;
+pHexTable[(int)'5'] = 5;
+pHexTable[(int)'6'] = 6;
+pHexTable[(int)'7'] = 7;
+pHexTable[(int)'8'] = 8;
+pHexTable[(int)'9'] = 9;
+pHexTable[(int)'A'] = 10;
+pHexTable[(int)'B'] = 11;
+pHexTable[(int)'C'] = 12;
+pHexTable[(int)'D'] = 13;
+pHexTable[(int)'E'] = 14;
+pHexTable[(int)'F'] = 15;
+pHexTable[(int)'X'] = 0;
+pHexTable[(int)'a'] = 10;
+pHexTable[(int)'b'] = 11;
+pHexTable[(int)'c'] = 12;
+pHexTable[(int)'d'] = 13;
+pHexTable[(int)'e'] = 14;
+pHexTable[(int)'f'] = 15;
+pHexTable[(int)'x'] = 0;
+pHexTable[(int)' '] = -1;
+pHexTable[(int)','] = -1;
+pHexTable[(int)'}'] = -1;
+pHexTable[(int)'\n'] = -1;
+pHexTable[(int)'\t'] = -1;
+pHexTable[(int)'\0'] = -1;
}
//
commit 68a571aeb5ea01fe2a10583c45efc109e8ae9968
Author: Tor Lillqvist t...@iki.fi
Date: Thu Mar 1 23:02:30 2012 +0200
WaE: equality comparison with extraneous parentheses
diff --git a/svtools/source/edit/syntaxhighlight.cxx
b/svtools/source/edit/syntaxhighlight.cxx
index 0e5beff..d4caa88 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -477,7 +477,7 @@ sal_Bool SimpleTokenizer_Impl::getNextToken(
/*out*/TokenTypes reType,
}
reType = TT_PARAMETER;
}
-else if ((c=='-'))
+else if (c=='-')
{
sal_Unicode cPeekNext = peekChar();
if (cPeekNext=='-')
commit 8a83ce2e7e6950450b63a5f189a48c8a4820b6d1
Author: Tor Lillqvist t...@iki.fi
Date: Thu Mar 1 23:00:49 2012 +0200
More IMPL_LINK_NOARG fixes for clang
diff --git a/svtools/inc/svtools/addresstemplate.hxx
b/svtools/inc/svtools/addresstemplate.hxx
index d69a765..7907408 100644
--- a/svtools/inc/svtools/addresstemplate.hxx
+++
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - sc/source
sc/source/core/data/cell.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 17322a611dd5add334f15539193dd0090e99ef01
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 12:59:14 2012 +0100
use the correct db range for the copy, fdo#46712
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 8ddc540..9b431fa 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -226,7 +226,7 @@ void adjustDBRange(ScToken* pToken, ScDocument rNewDoc,
const ScDocument* pOldD
ScDBData* pNewDBData = aNewNamedDBs.findByName(aDBName);
if (!pNewDBData)
{
-pNewDBData = new ScDBData(*pNewDBData);
+pNewDBData = new ScDBData(*pDBData);
aNewNamedDBs.insert(pNewDBData);
}
pToken-SetIndex(pNewDBData-GetIndex());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/app/app.cxx |3 ---
desktop/source/app/userinstall.cxx |5 -
desktop/source/migration/migration.cxx | 17 -
3 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 76e0d695a41326a5583dbc9702e0ce3b8219b514
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 1 22:27:56 2012 +0100
Move migrateSettingsIfNecessary into create_user_install
...so that it is only done once (see mail thread starting at
http://lists.freedesktop.org/archives/libreoffice/2012-February/027058.html
User installation migrated onto itself). Also, checking for the existence
of an old user installation needed to change from
ucbhelper::Content::isDocument
to osl::FileStatus::getFileType, as the UCB is not yet initialized at the
time
migrateSettingsIfNecessary is now called.
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e1bd1e0..61746be 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -36,7 +36,6 @@
#include userinstall.hxx
#include desktopcontext.hxx
#include exithelper.hxx
-#include migration.hxx
#include svtools/javacontext.hxx
#include com/sun/star/frame/XSessionManagerListener.hpp
@@ -1624,8 +1623,6 @@ int Desktop::Main()
// check whether the shutdown is caused by restart
pExecGlobals-bRestartRequested = ( xRestartManager.is()
xRestartManager-isRestartRequested( sal_True ) );
-
-Migration::migrateSettingsIfNecessary();
#endif
// keep a language options instance...
diff --git a/desktop/source/app/userinstall.cxx
b/desktop/source/app/userinstall.cxx
index 6b1672d..7fe9729 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -26,8 +26,9 @@
*
/
+#include sal/config.h
-
+#include migration.hxx
#include userinstall.hxx
#include langselect.hxx
@@ -261,6 +262,8 @@ namespace desktop {
return UserInstall::E_Creation;
}
}
+
+Migration::migrateSettingsIfNecessary();
#endif
try
{
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 4df893a..dd73e3a 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -44,7 +44,6 @@
#include tools/urlobj.hxx
#include osl/file.hxx
#include osl/mutex.hxx
-#include ucbhelper/content.hxx
#include osl/security.hxx
#include unotools/configmgr.hxx
@@ -576,17 +575,17 @@ install_info MigrationImpl::findInstallation(const
strings_v rVersions)
aUserInst += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(.));
#endif
aUserInst += aProfileName;
-try
+rtl::OUString url(
+INetURLObject(aUserInst).GetMainURL(INetURLObject::NO_DECODE));
+osl::DirectoryItem item;
+osl::FileStatus stat(osl_FileStatus_Mask_Type);
+if (osl::DirectoryItem::get(url, item) == osl::FileBase::E_None
+ item.getFileStatus(stat) == osl::FileBase::E_None
+ stat.getFileType() == osl::FileStatus::Directory)
{
-INetURLObject aObj(aUserInst);
-::ucbhelper::Content aCnt( aObj.GetMainURL(
INetURLObject::NO_DECODE ), uno::Reference ucb::XCommandEnvironment () );
-aCnt.isDocument();
-aInfo.userdata = aObj.GetMainURL( INetURLObject::NO_DECODE );
+aInfo.userdata = url;
aInfo.productname = aVersion;
}
-catch (const uno::Exception)
-{
-}
}
++i_ver;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - sc/source
sc/source/core/data/documen2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d69bb1d4535871b981df27f11bd4918ad3a41fe4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 11:50:13 2012 +0100
use correct source table
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index b0ae78e..c6bf77b 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -955,7 +955,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
// Copy the RTL settings
maTabs[nDestPos]-SetLayoutRTL(pSrcDoc-maTabs[nSrcPos]-IsLayoutRTL());
-
maTabs[nDestPos]-SetLoadingRTL(pSrcDoc-maTabs[nDestPos]-IsLoadingRTL());
+
maTabs[nDestPos]-SetLoadingRTL(pSrcDoc-maTabs[nSrcPos]-IsLoadingRTL());
}
else// bestehende Tabelle ersetzen
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/inc formula/inc svtools/inc
editeng/inc/editeng/outliner.hxx|2 +- formula/inc/formula/formula.hxx |2 +- formula/inc/formula/funcutl.hxx |2 +- svtools/inc/svtools/QueryFolderName.hxx |4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit f50f7368ab99bd2dd65fdfbc846cdfd532ae2133 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Mar 1 23:55:47 2012 +0100 More IMPL_LINK_NOARG fixes diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index f2e5264..faceb8a 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -617,7 +617,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster #ifdef _OUTLINER_CXX DECL_LINK( ParaVisibleStateChangedHdl, Paragraph* ); -DECL_LINK( BeginMovingParagraphsHdl, MoveParagraphsInfo* ); +DECL_LINK( BeginMovingParagraphsHdl, void* ); DECL_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo* ); DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos* ); DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos* ); diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index 25f2ad8..17f8fb4 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -106,7 +106,7 @@ private: ::std::auto_ptrFormulaDlg_Impl m_pImpl; SAL_WNODEPRECATED_DECLARATIONS_POP -DECL_LINK( UpdateFocusHdl, Timer*); +DECL_LINK( UpdateFocusHdl, void*); protected: voiddisableOk(); diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx index 188e0b4..398e685 100644 --- a/formula/inc/formula/funcutl.hxx +++ b/formula/inc/formula/funcutl.hxx @@ -44,7 +44,7 @@ private: Timer aTimer; IControlReferenceHandler* pAnyRefDlg; // parent dialog -DECL_LINK( UpdateHdl, Timer* ); +DECL_LINK( UpdateHdl, void* ); protected: virtual voidKeyInput( const KeyEvent rKEvt ); diff --git a/svtools/inc/svtools/QueryFolderName.hxx b/svtools/inc/svtools/QueryFolderName.hxx index b976271..3451614 100644 --- a/svtools/inc/svtools/QueryFolderName.hxx +++ b/svtools/inc/svtools/QueryFolderName.hxx @@ -49,8 +49,8 @@ private: OKButtonaOKBtn; CancelButtonaCancelBtn; -DECL_LINK( OKHdl, Button * ); -DECL_LINK( NameHdl, Edit * ); +DECL_LINK( OKHdl, void * ); +DECL_LINK( NameHdl, void * ); public: QueryFolderNameDialog( Window* _pParent, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/column.hxx |2 +-
sc/inc/postit.hxx |4 ++--
sc/source/core/data/column.cxx |5 ++---
sc/source/core/data/postit.cxx | 11 +++
sc/source/core/data/table2.cxx |6 +++---
5 files changed, 15 insertions(+), 13 deletions(-)
New commits:
commit 921fb226d2836673c1d3ef0f254708a5c5c0b313
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 2 01:59:01 2012 +0100
fix crashs in undo/redo realted to note captions
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 16746d6..1b370ce 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -297,7 +297,7 @@ public:
bool insert( SCCOL nCol, SCROW nRow, ScPostIt* );
bool insert( const ScAddress rPos, ScPostIt* );
-void erase(SCCOL, SCROW);
+void erase(SCCOL, SCROW, bool bForgetCaption = false);
void erase(const ScAddress rPos);
/** Returns and forgets the cell note object at the passed cell address. */
@@ -311,7 +311,7 @@ public:
ScNotes* clone(ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2, bool bCloneNoteCaption, SCTAB nTab);
void CopyFromClip(const ScNotes maNotes, ScDocument* pDoc, SCCOL nCol1,
SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy, SCTAB nTab, bool
bCloneCaption);
-void erase(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
+void erase(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool
bForgetCaption = false);
};
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 8ecacfa..8a0677f 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -1009,11 +1009,14 @@ bool ScNotes::insert(const ScAddress rPos, ScPostIt*
pPostIt)
return insert(rPos.Col(), rPos.Row(), pPostIt);
}
-void ScNotes::erase(SCCOL nCol, SCROW nRow)
+void ScNotes::erase(SCCOL nCol, SCROW nRow, bool bForgetCaption)
{
iterator itr = maNoteMap.find(std::pairSCCOL, SCROW(nCol, nRow));
if (itr != maNoteMap.end())
{
+if (bForgetCaption)
+itr-second-ForgetCaption();
+
delete itr-second;
maNoteMap.erase(itr);
}
@@ -1088,12 +1091,12 @@ void ScNotes::CopyFromClip(const ScNotes rNotes,
ScDocument* pDoc, SCCOL nCol1,
if (nCol+nDx = nCol1 nCol+nDx = nCol2 nRow+nDy = nRow1
nRow+nDy = nRow2)
{
erase(nCol+nDx, nRow+nDy);
-insert(nCol+nDx, nRow+nDy, itr-second-Clone( ScAddress(nCol,
nRow, nTab), *pDoc, ScAddress(nCol, nRow, nTab), bCloneCaption ));
+insert(nCol+nDx, nRow+nDy, itr-second-Clone( ScAddress(nCol,
nRow, nTab), *pDoc, ScAddress(nCol+nDx, nRow+nDy, nTab), bCloneCaption ));
}
}
}
-void ScNotes::erase(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
+void ScNotes::erase(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool
bForgetCaption)
{
ScNotes::iterator itr = maNoteMap.begin();
while(itr != maNoteMap.end())
@@ -1103,7 +1106,7 @@ void ScNotes::erase(SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2)
++itr;
if (nCol = nCol1 nCol = nCol2 nRow = nRow1 nRow = nRow2)
{
-erase(nCol, nRow);
+erase(nCol, nRow, bForgetCaption);
}
}
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 4cc42f6..19fa547 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -537,7 +537,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2, sal
}
if (nDelFlag IDF_NOTE)
-maNotes.erase( nCol1, nRow1, nCol2, nRow2);
+maNotes.erase( nCol1, nRow1, nCol2, nRow2, true );
if (IsStreamValid())
// TODO: In the future we may want to check if the table has been
@@ -561,7 +561,7 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const
ScMarkData rMark )
{
ScRange* pRange = aRangeList[i];
if (nDelFlag IDF_NOTE pRange)
-maNotes.erase(pRange-aStart.Col(), pRange-aStart.Row(),
pRange-aEnd.Col(), pRange-aEnd.Row());
+maNotes.erase(pRange-aStart.Col(), pRange-aStart.Row(),
pRange-aEnd.Col(), pRange-aEnd.Row(), true);
}
//
commit 1d1141cd06fcdbadd008744a28674d4b50457923
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 2 01:09:56 2012 +0100
remove unnecessary parameter
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 8d715fb..e503005 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -194,7 +194,7 @@ public:
voidDeleteRow( SCROW nStartRow, SCSIZE nSize );
voidDeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16
nDelFlag );
voidDeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag
);
-voidCopyToClip(SCROW nRow1, SCROW nRow2, ScColumn rColumn, bool
bKeepScenarioFlags, bool bCloneNoteCaptions);
+voidCopyToClip(SCROW nRow1, SCROW nRow2, ScColumn
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/document.hxx| 14 ---
sc/source/core/data/column.cxx |4 +-
sc/source/core/data/documen5.cxx |1
sc/source/core/data/table2.cxx |1
sc/source/filter/excel/excdoc.cxx |1
sc/source/ui/docshell/dbdocimp.cxx |1
sc/source/ui/docshell/docsh.cxx|2 +
sc/source/ui/docshell/docsh8.cxx |1
sc/source/ui/docshell/impex.cxx|1
sc/source/ui/unoobj/cellsuno.cxx |1
sc/source/ui/unoobj/docuno.cxx |1
sc/source/ui/view/formatsh.cxx | 67 ++---
12 files changed, 55 insertions(+), 40 deletions(-)
New commits:
commit 26ea23b6b5f1d80df688e4c7e325971709c3c4a6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 2 03:46:50 2012 +0100
some sal_Bool to bool
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 1ab4940..bc72117 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -181,11 +181,11 @@ void ScFormatShell::GetStyleState( SfxItemSet rSet )
ScTabViewShell* pTabViewShell = GetViewData()-GetViewShell();
SfxStyleSheetBasePool* pStylePool = pDoc-GetStyleSheetPool();
-sal_Bool bProtected = false;
+bool bProtected = false;
SCTAB nTabCount = pDoc-GetTableCount();
for (SCTAB i=0; inTabCount; i++)
if (pDoc-IsTabProtected(i))// ueberhaupt eine Tabelle
geschuetzt?
-bProtected = sal_True;
+bProtected = true;
SfxWhichIteraIter(rSet);
sal_uInt16 nWhich = aIter.FirstWhich();
@@ -240,7 +240,7 @@ void ScFormatShell::GetStyleState( SfxItemSet rSet )
{
ISfxTemplateCommon* pDesigner = SFX_APP()-
GetCurrentTemplateCommon(pTabViewShell-GetViewFrame()-GetBindings());
-sal_Bool bPage = pDesigner SFX_STYLE_FAMILY_PAGE ==
pDesigner-GetActualFamily();
+bool bPage = pDesigner SFX_STYLE_FAMILY_PAGE ==
pDesigner-GetActualFamily();
if ( bProtected || bPage )
rSet.DisableItem( nSlotId );
@@ -252,7 +252,7 @@ void ScFormatShell::GetStyleState( SfxItemSet rSet )
{
ISfxTemplateCommon* pDesigner = SFX_APP()-
GetCurrentTemplateCommon(pTabViewShell-GetViewFrame()-GetBindings());
-sal_Bool bPage = pDesigner SFX_STYLE_FAMILY_PAGE ==
pDesigner-GetActualFamily();
+bool bPage = pDesigner SFX_STYLE_FAMILY_PAGE ==
pDesigner-GetActualFamily();
if ( bProtected !bPage )
rSet.DisableItem( nSlotId );
@@ -289,7 +289,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
ScMarkData rMark = GetViewData()-GetMarkData();
ScModule* pScMod = SC_MOD();
String aRefName;
-sal_BoolbUndo = pDoc-IsUndoEnabled();
+boolbUndo = pDoc-IsUndoEnabled();
if ( (nSlotId == SID_STYLE_NEW)
|| (nSlotId == SID_STYLE_EDIT)
@@ -303,9 +303,9 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
SfxStyleSheetBasePool* pStylePool = pDoc-GetStyleSheetPool();
SfxStyleSheetBase* pStyleSheet = NULL;
-sal_Bool bStyleToMarked = false;
-sal_Bool bListAction = false;
-sal_Bool bAddUndo = false; // add ScUndoModifyStyle (style
modified)
+bool bStyleToMarked = false;
+bool bListAction = false;
+bool bAddUndo = false; // add ScUndoModifyStyle (style
modified)
ScStyleSaveData aOldData; // for undo/redo
ScStyleSaveData aNewData;
@@ -391,7 +391,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
case SID_STYLE_WATERCAN:
{
-sal_Bool bWaterCan = pScMod-GetIsWaterCan();
+bool bWaterCan = pScMod-GetIsWaterCan();
if( !bWaterCan )
{
@@ -418,7 +418,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
if ( !bWaterCan pStyleSheet )
{
-pScMod-SetWaterCan( sal_True );
+pScMod-SetWaterCan( true );
pTabViewShell-SetActivePointer( Pointer(POINTER_FILL) );
rReq.Done();
}
@@ -452,8 +452,8 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
pTabViewShell-RemoveStyleSheetInUse( pStyleSheet
);
pStylePool-Remove( pStyleSheet );
pTabViewShell-InvalidateAttribs();
-nRetMask = sal_True;
-bAddUndo = sal_True;
+nRetMask = true;
+bAddUndo = true;
rReq.Done();
}
else
@@ -508,10 +508,10
[Libreoffice-commits] .: sc/source
sc/source/core/data/table3.cxx | 65 +++--
1 file changed, 57 insertions(+), 8 deletions(-)
New commits:
commit d7db93f5f4972a94ab3157578e9c8795dc089caa
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 2 04:49:27 2012 +0100
implement SwapCol and SwapRow for note handling again
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index db0c249..da43fbc 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -580,14 +580,39 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
}
}
}
-for (ScNotes::iterator itr = maNotes.begin(); itr != maNotes.end(); ++itr)
+
+ScNotes aNoteMap(pDocument);
+ScNotes::iterator itr = maNotes.begin();
+while(itr != maNotes.end())
{
-if (itr-first.first == nCol1 || itr-first.first == nCol2)
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+++itr;
+
+if (nCol == nCol1)
{
-//only then we need to swap
-//TODO: implement it
+aNoteMap.insert(nCol, nRow, pPostIt);
+maNotes.ReleaseNote(nCol2, nRow);
+}
+else if (nCol == nCol2)
+{
+aNoteMap.insert(nCol, nRow, pPostIt);
+maNotes.ReleaseNote(nCol1, nRow);
+
}
}
+
+itr = aNoteMap.begin();
+{
+//we can here assume that there is no note in the target location
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+
+maNotes.insert(nCol, nRow, pPostIt);
+aNoteMap.ReleaseNote(nCol, nRow);
+}
}
void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
@@ -619,14 +644,38 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
SetRowFiltered(nRow2, nRow2, bRow1Filtered);
}
-for (ScNotes::iterator itr = maNotes.begin(); itr != maNotes.end(); ++itr)
+ScNotes aNoteMap(pDocument);
+ScNotes::iterator itr = maNotes.begin();
+while(itr != maNotes.end())
{
-if (itr-first.second == nRow1 || itr-first.second == nRow2)
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+++itr;
+
+if (nRow == nRow1)
+{
+aNoteMap.insert(nCol, nRow, pPostIt);
+maNotes.ReleaseNote(nCol, nRow2);
+}
+else if (nRow == nRow2)
{
-//only then we need to swap
-//TODO:implement it
+aNoteMap.insert(nCol, nRow, pPostIt);
+maNotes.ReleaseNote(nCol, nRow1);
+
}
}
+
+itr = aNoteMap.begin();
+{
+//we can here assume that there is no note in the target location
+SCCOL nCol = itr-first.first;
+SCROW nRow = itr-first.second;
+ScPostIt* pPostIt = itr-second;
+
+maNotes.insert(nCol, nRow, pPostIt);
+aNoteMap.ReleaseNote(nCol, nRow);
+}
}
short ScTable::Compare(SCCOLROW nIndex1, SCCOLROW nIndex2)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Module_tail_build.mk postprocess/prj
Module_tail_build.mk |1 + postprocess/prj/build.lst |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 75a6e52bc8d3062859f626f7466f5af55841a7b7 Author: David Tardon dtar...@redhat.com Date: Fri Mar 2 08:15:50 2012 +0100 move embeddedobj to tail_build diff --git a/Module_tail_build.mk b/Module_tail_build.mk index c761620..f03ef43 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ dtrans \ drawinglayer \ editeng \ +embeddedobj \ eventattacher \ extensions \ fileaccess \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index deb1fb8..88f604b 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL +po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL po postprocess usr1- all po_mkout NULL po postprocess\checkxmlnmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source dbaccess/source
cui/source/options/optgdlg.hxx |2 +- dbaccess/source/ui/dlg/dsselect.hxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 906ca2e0e58556353a40670828e111986285315a Author: Stephan Bergmann sberg...@redhat.com Date: Fri Mar 2 08:55:49 2012 +0100 WNT-only IMPL_LINK_NOARG fixes diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index cf69c7d..817cf46 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -80,7 +80,7 @@ private: DECL_LINK(HelpCheckHdl_Impl, void *); DECL_LINK(HelpAgentResetHdl_Impl, void *); #ifdef WNT -DECL_LINK( OnFileDlgToggled, CheckBox* ); +DECL_LINK( OnFileDlgToggled, void* ); #endif protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ); diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 56566c0..0081cb9 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -80,7 +80,7 @@ public: protected: DECL_LINK( ListDblClickHdl, ListBox * ); #ifdef HAVE_ODBC_ADMINISTRATION -DECL_LINK( ManageClickHdl, PushButton * ); +DECL_LINK( ManageClickHdl, void* ); DECL_LINK( ManageProcessFinished, void* ); #endif void fillListBox(const StringBag _rDatasources); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
