[Libreoffice-commits] .: afms/README apple_remote/README beanshell/README cppunit/README epm/README hsqldb/README hyphen/README icc/README libwpd/README libwpg/README libwps/README libxmlsec/README li

2012-02-08 Thread Kohei Yoshida 
 afms/README   |1 +
 apple_remote/README   |1 +
 beanshell/README  |4 
 cppunit/README|3 +++
 epm/README|3 +++
 hsqldb/README |5 +
 hyphen/README |1 +
 icc/README|   22 ++
 libwpd/README |1 +
 libwpg/README |1 +
 libwps/README |1 +
 libxmlsec/README  |   34 ++
 libxmlsec/readme.txt  |   32 
 lpsolve/README|1 +
 lucene/README |1 +
 mdds/README   |1 +
 mysqlcppconn/README   |1 +
 mythes/README |1 +
 np_sdk/README |1 +
 openssl/README|7 +++
 redland/README|   19 +--
 rhino/README  |6 --
 sane/README   |1 +
 twain/README  |1 +
 unixODBC/README   |1 +
 vigra/README  |1 +
 x11_extensions/README |1 +
 xsltml/README |4 ++--
 28 files changed, 98 insertions(+), 58 deletions(-)

New commits:
commit dd929dd089abb86bc2206bc9749722682c70f3f1
Author: Josh Heidenreich 
Date:   Thu Feb 9 13:42:42 2012 +1030

Added and improved READMEs for modules whihc used to be in libs-extern

diff --git a/afms/README b/afms/README
new file mode 100644
index 000..5bf
--- /dev/null
+++ b/afms/README
@@ -0,0 +1 @@
+External library.
diff --git a/apple_remote/README b/apple_remote/README
new file mode 100644
index 000..8705e88
--- /dev/null
+++ b/apple_remote/README
@@ -0,0 +1 @@
+Adds support for the Apple Remote (a remote control) to control Impress.
diff --git a/beanshell/README b/beanshell/README
new file mode 100644
index 000..0b03fd3
--- /dev/null
+++ b/beanshell/README
@@ -0,0 +1,4 @@
+Java interpreter from [http://www.beanshell.org/] with some patches.
+
+So you can write java in command shell; interactive java good for 
prototyping/macros.
+
diff --git a/cppunit/README b/cppunit/README
new file mode 100644
index 000..f71c260
--- /dev/null
+++ b/cppunit/README
@@ -0,0 +1,3 @@
+C++ port of the JUnit framework for unit testing.
+
+From [http://sourceforge.net/projects/cppunit/]
diff --git a/epm/README b/epm/README
new file mode 100644
index 000..c3ec298
--- /dev/null
+++ b/epm/README
@@ -0,0 +1,3 @@
+Enhanced Package Manager, From [http://freshmeat.net/projects/epm]
+
+Nasty hack for packaging, not useful, but default build uses, every linux 
packager disables this.
diff --git a/hsqldb/README b/hsqldb/README
new file mode 100644
index 000..8e43980
--- /dev/null
+++ b/hsqldb/README
@@ -0,0 +1,5 @@
+Java database engine from [http://hsqldb.org/].
+
+Default database format for OpenOffice.org.
+Also used in LibreOffice but shall be replaced as default by SQLite.
+
diff --git a/hyphen/README b/hyphen/README
new file mode 100644
index 000..327b5b6
--- /dev/null
+++ b/hyphen/README
@@ -0,0 +1 @@
+Hyphenator library from [http://hunspell.sourceforge.net]
diff --git a/icc/README b/icc/README
index 672371d..0c1a730 100644
--- a/icc/README
+++ b/icc/README
@@ -1,15 +1,16 @@
-Date: 2008-01-11
+Library used to build the sRGB profile for PDF/A-1a export with patches.
 
 This project is used to generate the ICC color
 profile needed in module vcl in order to export
 to PDF/A-1a.
-It's composed of a small application, which lurks in:
 
-icc/source/create_sRGB_profile
+It's composed of a small application, which lurks in:
+[git:icc/source/create_sRGB_profile]
 
 That application links to a support library
 (icc/download/SampleICC-1.3.2), build at OOo
 build time.
+
 Finally, the application is run at OOo build time to
 generate the only file delivered to solver:
 sRGB-IEC61966-2.1.hxx.
@@ -17,23 +18,20 @@ sRGB-IEC61966-2.1.hxx.
 If you need to change the data into the ICC profile,
 please change the create_sRGB_profile.
 
-The library was downloaded from:
-http://sampleicc.sourceforge.net
-on 2007-08-23.
+The library was downloaded from [http://sampleicc.sourceforge.net] on 
2007-08-23.
 
 For information on ICC profiles, you may want to visit:
-http://www.color.org
+[http://www.color.org]
 
-Notes for porters
-=
-the endianess and other platform specific configuration
+== Notes for porters ==
+
+Ehe endianess and other platform specific configuration
 are in:
 
-/misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h
+icc//misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h
 
 The patchs:
 SampleICC-1.3.2.patch tweaks the build to use the endianness
 detected in sal.
 
 beppe...@openoffice.org
-
diff --git a/libwpd/README b/libwpd/README
new file mode 100644
index 000..2cc9c8a
--- /dev/null
+++ b/libwpd/README
@@ -0,0 +1 @@
+From [http://libwpd.sourceforge.net/]. Not modified. WordPerfect filter - SAX 
api - emits callbacks when things happen. 
diff --git a/libwpg/README b/libwpg/README
new file mode 100644
index 000..19a154d
--- /dev/null
+++ b/libwpg/README
@@ -0,0 +1 @@
+From [http://libwpg.

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

2012-02-08 Thread Kohei Yoshida 
 sc/source/core/data/documen2.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 3544c86341bd32864cac7f30124a53aef79b89fd
Author: Markus Mohrhard 
Date:   Wed Feb 8 17:48:15 2012 +0100

copy settings for RTL with sheets, fdo#45768

Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 40a10ba..b0ae78e 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -913,6 +913,10 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 
 // Copy the custom print range if exists.
 maTabs[nNewPos]->CopyPrintRange(*maTabs[nOldPos]);
+
+// Copy the RTL settings
+maTabs[nNewPos]->SetLayoutRTL(maTabs[nOldPos]->IsLayoutRTL());
+maTabs[nNewPos]->SetLoadingRTL(maTabs[nOldPos]->IsLoadingRTL());
 }
 else
 SetAutoCalc( bOldAutoCalc );
@@ -948,6 +952,10 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, 
SCTAB nSrcPos,
 pSrcDoc->GetName(nSrcPos, aName);
 CreateValidTabName(aName);
 bValid = InsertTab(nDestPos, aName);
+
+// Copy the RTL settings
+
maTabs[nDestPos]->SetLayoutRTL(pSrcDoc->maTabs[nSrcPos]->IsLayoutRTL());
+
maTabs[nDestPos]->SetLoadingRTL(pSrcDoc->maTabs[nDestPos]->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

2012-02-08 Thread Kohei Yoshida 
 sc/source/ui/docshell/impex.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a00c5917a8deb465cc1322e14a81340f9d69
Author: Markus Mohrhard 
Date:   Wed Feb 8 23:37:49 2012 +0100

we need to explicitly set the paste area in ScMarkData, fdo#45481

Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index c538977..5abf7d5 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -263,7 +263,7 @@ void ScImportExport::EndPaste()
 pRedoDoc->InitUndo( pDoc, aRange.aStart.Tab(), aRange.aEnd.Tab() );
 pDoc->CopyToDocument( aRange, IDF_ALL | IDF_NOCAPTIONS, false, 
pRedoDoc );
 ScMarkData aDestMark;
-aDestMark.SelectOneTable( aRange.aStart.Tab() );
+aDestMark.SetMarkArea(aRange);
 pDocSh->GetUndoManager()->AddUndoAction(
 new ScUndoPaste(pDocSh, aRange, aDestMark, pUndoDoc, pRedoDoc, 
IDF_ALL, NULL));
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - sc/Module_sc.mk sc/source

2012-02-08 Thread Markus Mohrhard 
 sc/Module_sc.mk  |4 ++--
 sc/source/core/data/documen2.cxx |8 
 sc/source/ui/docshell/impex.cxx  |2 +-
 sc/source/ui/view/preview.cxx|   15 ++-
 4 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 73088aaaed3ad16f80405a3d87cea437d350b893
Author: Markus Mohrhard 
Date:   Wed Feb 8 23:37:49 2012 +0100

we need to explicitly set the paste area in ScMarkData, fdo#45481

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index ede56eb..dd1ed03 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -263,7 +263,7 @@ void ScImportExport::EndPaste()
 pRedoDoc->InitUndo( pDoc, aRange.aStart.Tab(), aRange.aEnd.Tab() );
 pDoc->CopyToDocument( aRange, IDF_ALL | IDF_NOCAPTIONS, false, 
pRedoDoc );
 ScMarkData aDestMark;
-aDestMark.SelectOneTable( aRange.aStart.Tab() );
+aDestMark.SetMarkArea(aRange);
 pDocSh->GetUndoManager()->AddUndoAction(
 new ScUndoPaste(pDocSh, aRange, aDestMark, pUndoDoc, pRedoDoc, 
IDF_ALL, NULL));
 }
commit b14f61c40c1ddd897ba4b54c063753c2e3550d46
Author: Markus Mohrhard 
Date:   Wed Feb 8 21:04:05 2012 +0100

remove unnecessary check

diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 51e581c..67e6171 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -269,7 +269,6 @@ void ScPreview::CalcPages()
 
 long nThisStart = nTotalPages;
 ScPrintFunc aPrintFunc( this, pDocShell, i, nAttrPage, 0, NULL, 
&aOptions );
-aPrintFunc.InitParam( &aOptions );
 long nThisTab = aPrintFunc.GetTotalPages();
 nPages[i] = nThisTab;
 nTotalPages += nThisTab;
@@ -291,10 +290,7 @@ void ScPreview::CalcPages()
 if (nTabCount > nTabsTested)
 nTabsTested = nTabCount;
 
-//  testen, ob hinter letzter Seite
-
-if ( nTabsTested >= nTabCount )
-TestLastPage();
+TestLastPage();
 
 aState.nDocPages = nTotalPages;
 
commit d7eddc670410d7194918ff99c735052b880469d8
Author: Markus Mohrhard 
Date:   Wed Feb 8 21:02:01 2012 +0100

remove unnecessary temporary variable

diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 4d72ef9..51e581c 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -231,7 +231,6 @@ void ScPreview::CalcPages()
 ScDocument* pDoc = pDocShell->GetDocument();
 nTabCount = pDoc->GetTableCount();
 
-SCTAB nAnz = nTabCount;
 SCTAB nStart = nTabsTested;
 if (!bValid)
 {
@@ -242,7 +241,7 @@ void ScPreview::CalcPages()
 
 // update all pending row heights with a single progress bar,
 // instead of a separate progress for each sheet from ScPrintFunc
-pDocShell->UpdatePendingRowHeights( nAnz-1, true );
+pDocShell->UpdatePendingRowHeights( nTabCount-1, true );
 
 //  PrintOptions is passed to PrintFunc for SkipEmpty flag,
 //  but always all sheets are used (there is no selected sheet)
@@ -252,7 +251,8 @@ void ScPreview::CalcPages()
 nPages.push_back(0);
 while (nStart > static_cast(nFirstAttr.size()))
 nFirstAttr.push_back(0);
-for (SCTAB i=nStart; i(nPages.size()))
 nPages.push_back(0);
@@ -269,6 +269,7 @@ void ScPreview::CalcPages()
 
 long nThisStart = nTotalPages;
 ScPrintFunc aPrintFunc( this, pDocShell, i, nAttrPage, 0, NULL, 
&aOptions );
+aPrintFunc.InitParam( &aOptions );
 long nThisTab = aPrintFunc.GetTotalPages();
 nPages[i] = nThisTab;
 nTotalPages += nThisTab;
@@ -287,8 +288,8 @@ void ScPreview::CalcPages()
 
 nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages );
 
-if (nAnz > nTabsTested)
-nTabsTested = nAnz;
+if (nTabCount > nTabsTested)
+nTabsTested = nTabCount;
 
 //  testen, ob hinter letzter Seite
 
commit d893218da7b3e77c97eb7c96384728776f7c870c
Author: Markus Mohrhard 
Date:   Wed Feb 8 20:06:42 2012 +0100

use slowcheck in sc

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index ef47326..074b1f1 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -42,11 +42,12 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
+CppunitTest_sc_ucalc \
 CppunitTest_sc_filters_test \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sc,\
-CppunitTest_sc_ucalc \
+CppunitTest_sc_subsequent_filters_test \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
@@ -59,7 +60,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 CppunitTest_sc_namedrangeobj \
 CppunitTest_sc_namedrangesobj \
 CppunitTest_sc_tablesheetsobj \
-CppunitTest_sc_subsequent_filters_test \
 ))
 
 # vim: set noet sw=4 ts=4:
commit b1c9d167ef96df5c3a781ed825d789505a325324
Author: Markus Mohrhard 
Date:   Wed Feb 8 17:48:15 2012 +0100

copy settings for RTL with sheets, fdo#4576

[Libreoffice-commits] .: 3 commits - sc/inc sc/source

2012-02-08 Thread Kohei Yoshida 
 sc/inc/collect.hxx  |   45 ---
 sc/source/core/tool/collect.cxx |  120 +---
 sc/source/ui/app/inputhdl.cxx   |   12 
 3 files changed, 9 insertions(+), 168 deletions(-)

New commits:
commit 1eecb1841e8692e03e8e0aecaa99e3e7a3300d4c
Author: Kohei Yoshida 
Date:   Wed Feb 8 20:34:23 2012 -0500

ScSortedCollection is now officially unused.  Nuking it.

diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx
index d175fa3..3dc738f 100644
--- a/sc/inc/collect.hxx
+++ b/sc/inc/collect.hxx
@@ -29,22 +29,10 @@
 #ifndef SC_COLLECT_HXX
 #define SC_COLLECT_HXX
 
-#include "address.hxx"
-#include 
-
-#ifndef INCLUDED_LIMITS_H
-#include 
-#define INCLUDED_LIMITS_H
-#endif
 #include "scdllapi.h"
+#include "rtl/ustring.hxx"
 
-#define MAXCOLLECTIONSIZE   16384
-#define MAXDELTA1024
-#define SCPOS_INVALID   USHRT_MAX
-
-#include 
-
-class ScDocument;
+#include 
 
 class SC_DLLPUBLIC ScDataObject
 {
@@ -83,35 +71,6 @@ public:
 ScCollection&   operator=( const ScCollection& rCol );
 };
 
-
-class SC_DLLPUBLIC  ScSortedCollection : public ScCollection
-{
-private:
-sal_BoolbDuplicates;
-protected:
-// for ScStrCollection load/store
-voidSetDups( sal_Bool bVal ) { bDuplicates = bVal; }
-sal_BoolIsDups() const { return bDuplicates; }
-public:
-ScSortedCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup 
= false);
-ScSortedCollection(const ScSortedCollection& rScSortedCollection) :
-ScCollection(rScSortedCollection),
-bDuplicates(rScSortedCollection.bDuplicates) {}
-
-virtual sal_uInt16  IndexOf(ScDataObject* pScDataObject) const;
-virtual short   Compare(ScDataObject* pKey1, ScDataObject* pKey2) 
const = 0;
-virtual sal_BoolIsEqual(ScDataObject* pKey1, ScDataObject* pKey2) 
const;
-sal_BoolSearch(ScDataObject* pScDataObject, sal_uInt16& rIndex) 
const;
-virtual sal_BoolInsert(ScDataObject* pScDataObject);
-virtual sal_BoolInsertPos(ScDataObject* pScDataObject, sal_uInt16& 
nIndex);
-
-sal_Booloperator==(const ScSortedCollection& rCmp) const;
-};
-
-//
-// TypedScStrCollection: wie ScStrCollection, nur, dass Zahlen vor Strings
-// sortiert werden
-
 class TypedStrData
 {
 public:
diff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxx
index 2bbf244..e8f3de6 100644
--- a/sc/source/core/tool/collect.cxx
+++ b/sc/source/core/tool/collect.cxx
@@ -26,16 +26,15 @@
  *
  /
 
+#include 
 
-
+#include "collect.hxx"
+#include "global.hxx"
 
 #include 
-#include 
-#include 
 
-#include "rechead.hxx"
-#include "collect.hxx"
-#include "document.hxx" // fuer TypedStrData Konstruktor
+#define MAXCOLLECTIONSIZE   16384
+#define MAXDELTA1024
 
 // ---
 
@@ -197,115 +196,6 @@ ScDataObject*   ScCollection::Clone() const
 return new ScCollection(*this);
 }
 
-//
-// ScSortedCollection
-//
-
-ScSortedCollection::ScSortedCollection(sal_uInt16 nLim, sal_uInt16 nDel, 
sal_Bool bDup) :
-ScCollection (nLim, nDel),
-bDuplicates ( bDup)
-{
-}
-
-//
-
-sal_uInt16 ScSortedCollection::IndexOf(ScDataObject* pScDataObject) const
-{
-sal_uInt16 nIndex;
-if (Search(pScDataObject, nIndex))
-return nIndex;
-else
-return 0x;
-}
-
-//
-
-sal_Bool ScSortedCollection::Search(ScDataObject* pScDataObject, sal_uInt16& 
rIndex) const
-{
-rIndex = nCount;
-sal_Bool bFound = false;
-short nLo = 0;
-short nHi = nCount - 1;
-short nIndex;
-short nCompare;
-while (nLo <= nHi)
-{
-nIndex = (nLo + nHi) / 2;
-nCompare = Compare(pItems[nIndex], pScDataObject);
-if (nCompare < 0)
-nLo = nIndex + 1;
-else
-{
-nHi = nIndex - 1;
-if (nCompare == 0)
-{
-bFound = sal_True;
-nLo = nIndex;
-}
-}
-}
-rIndex = nLo;
-return bFound;
-}
-
-//
-
-sal_Bool ScSortedCollection::Insert(ScDataObject* pScDataObject)
-{
-sal_uInt16 nIndex;
-sal_Bool bFound = Search(pScDataObject, nIndex);
-if (bFound)
-{
-if (bDuplicates)
-return AtInsert(nIndex, pScDataObject);
-else
-

[Libreoffice-commits] .: 2 commits - dbaccess/source

2012-02-08 Thread Lionel Elie Mamane 
 dbaccess/source/core/api/RowSetCache.cxx |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit bd9d0aa967eb69e436925fc64b16051019e6818d
Author: Lionel Elie Mamane 
Date:   Thu Feb 9 02:14:05 2012 +0100

Revert "Tentative fix for invalid iterator range regression"

This reverts commit 23151ab53574e0e893f4507313ff15388638746a.

Fixed root cause in previous commit.

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index 04d1436..f2301f0 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -940,14 +940,7 @@ sal_Bool ORowSetCache::moveWindow()
 bCheck = fill(aIter, aNewEnd, nPos, bCheck);
 }
 
-if ( aEnd <= aNewEnd )
-{
-::std::rotate(m_pMatrix->begin(), aEnd, aNewEnd);
-}
-else
-{
-::std::rotate(m_pMatrix->begin(), aNewEnd, aEnd);
-}
+::std::rotate(m_pMatrix->begin(), aEnd, aNewEnd);
 // now correct the iterator in our iterator vector
 //  rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be 
used because they decrement and here we need to increment
 ORowSetCacheMap::iterator aCacheIter = 
m_aCacheIterators.begin();
commit 370fa77a418fe8903c48080db6e33a9cb8531869
Author: Lionel Elie Mamane 
Date:   Wed Feb 8 19:08:20 2012 +0100

ORowSetCache::moveWindow fix variable inversion; fixes subsequentcheck

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index 77eae6e..04d1436 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -914,7 +914,7 @@ sal_Bool ORowSetCache::moveWindow()
 // m_nEndPos < nNewEndPos when window not filled (e.g. there are 
less rows in total than window size)
 m_nEndPos = std::min(nNewEndPos, m_nEndPos);
 const sal_Int32 nOverlapSize = m_nEndPos - m_nStartPos;
-const sal_Int32 nStartPosOffset = nNewStartPos - m_nStartPos; // 
by how much m_nStartPos moves
+const sal_Int32 nStartPosOffset = m_nStartPos - nNewStartPos; // 
by how much m_nStartPos moves
 m_nStartPos = nNewStartPos;
 OSL_ENSURE( static_cast(nOverlapSize) <= 
m_pMatrix->size(), "new window end is after end of cache matrix!" );
 // the first position in m_pMatrix whos data we don't keep;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - configure.in Makefile

2012-02-08 Thread René Engelhard 
 Makefile |2 ++
 configure.in |   29 +
 2 files changed, 31 insertions(+)

New commits:
commit 5582b7f129a4db4204107f2a38ac809684aa6893
Author: Rene Engelhard 
Date:   Tue Feb 7 06:36:49 2012 +

add testtools to dmake_modules

diff --git a/Makefile b/Makefile
index 24b2a5b..38ed6fc 100644
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,7 @@ postgresql\
 postprocess\
 python\
 pyuno\
+pyuno-py3\
 rdbmaker\
 readlicense_oo\
 redland\
@@ -226,6 +227,7 @@ stlport\
 stoc\
 store\
 sysui\
+testtools\
 tomcat\
 translations\
 udm\
commit 8f06cc44149ca6be84b1cd8ce0f609d2dc3db346
Author: Rene Engelhard 
Date:   Tue Feb 7 06:28:46 2012 +

configure.in: readd arch-detection for kFreeBSD

diff --git a/configure.in b/configure.in
index 7102f10..7910b2b 100644
--- a/configure.in
+++ b/configure.in
@@ -2820,6 +2820,35 @@ freebsd*)
 SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
 ;;
 
+kfreebsd*)
+COM=GCC
+GUI=UNX
+GUIBASE=unx
+OS=LINUX
+
+case "$host_cpu" in
+
+i*86)
+CPU=I
+CPUNAME=INTEL
+OUTPATH=unxkfgi6
+;;
+x86_64)
+CPU=X
+CPUNAME=X86_64
+LIB64="lib64"
+OUTPATH=unxkfgx6
+;;
+*)
+AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+;;
+esac
+SOLAREXTRALIB="-L../$LIB64"
+SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
+SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+;;
+
 linux-gnu*)
 COM=GCC
 GUI=UNX
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source

2012-02-08 Thread Stephan Bergmann 
 l10ntools/source/common.hxx |  113 
 1 file changed, 113 insertions(+)

New commits:
commit 1d3124675ae5a33afe2c417a198557f20dc689e0
Author: Stephan Bergmann 
Date:   Wed Feb 8 22:28:53 2012 +0100

New file was missing from previous commit

diff --git a/l10ntools/source/common.hxx b/l10ntools/source/common.hxx
new file mode 100644
index 000..89808f7
--- /dev/null
+++ b/l10ntools/source/common.hxx
@@ -0,0 +1,113 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann 
+ *   (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_L10NTOOLS_SOURCE_COMMON_HXX
+#define INCLUDED_L10NTOOLS_SOURCE_COMMON_HXX
+
+#include "sal/config.h"
+
+#include 
+#include 
+
+#include "osl/file.hxx"
+#include "osl/process.h"
+#include "osl/thread.h"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textcvt.h"
+#include "rtl/uri.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+namespace common {
+
+inline rtl::OString pathnameToken(char const * pathname, char const * root) {
+rtl::OUString cwd;
+if (osl_getProcessWorkingDir(&cwd.pData) != osl_Process_E_None) {
+std::cerr << "Error: Cannot determine cwd\n";
+std::exit(EXIT_FAILURE);
+}
+rtl::OUString full;
+if (!rtl_convertStringToUString(
+&full.pData, pathname, rtl_str_getLength(pathname),
+osl_getThreadTextEncoding(),
+(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
+{
+std::cerr << "Error: Cannot convert input pathname to UTF-16\n";
+std::exit(EXIT_FAILURE);
+}
+if (osl::FileBase::getAbsoluteFileURL(cwd, full, full)
+!= osl::FileBase::E_None)
+{
+std::cerr << "Error: Cannot convert input pathname to absolute URL\n";
+std::exit(EXIT_FAILURE);
+}
+if (root == 0) {
+std::cerr << "Error: No project root argument\n";
+std::exit(EXIT_FAILURE);
+}
+rtl::OUString base;
+if (!rtl_convertStringToUString(
+&base.pData, root, rtl_str_getLength(root),
+osl_getThreadTextEncoding(),
+(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
+{
+std::cerr << "Error: Cannot convert project root to UTF-16\n";
+std::exit(EXIT_FAILURE);
+}
+base = rtl::Uri::convertRelToAbs(full, base);
+if (full.getLength() <= base.getLength() || base.isEmpty()
+|| base[base.getLength() - 1] != '/'
+|| full[base.getLength() - 1] != '/')
+{
+std::cerr << "Error: Cannot extract suffix from input pathname\n";
+std::exit(EXIT_FAILURE);
+}
+full = full.copy(base.getLength()).replace('/', '\\');
+rtl::OString suffix;
+if (!full.convertToString(
+&suffix, osl_getThreadTextEncoding(),
+(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
+ | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
+{
+std::cerr << "Error: Cannot convert suffix from UTF-16\n";
+std::exit(EXIT_FAILURE);
+}
+return suffix;
+}
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-02-08 Thread Stephan Bergmann 
 solenv/gbuild/AllLangResTarget.mk |2 +-
 solenv/gbuild/Configuration.mk|2 +-
 solenv/gbuild/Extension.mk|5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit aa11b4c86e4b41be542623b7d98a3fb8e5d30745
Author: Stephan Bergmann 
Date:   Wed Feb 8 21:57:19 2012 +0100

Properly rebuild files generated by l10ntools programs

(Changing the corresponding build-order-only dependencies to proper ones 
should
be safe here, as all mentions of $^ are within $(filter) calls.)

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 21570c7..635778d 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 
 endef
 
-$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% 
$(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% 
$(gb_Helper_MISCDUMMY)  $(gb_SrsPartMergeTarget_TRANSEXTARGET)
$(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p 
$(dir $@) && cp $< $@)
 
 
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 0674837..1743be4 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -238,7 +238,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-l all)
 endef
 
-$(call gb_XcuMergeTarget_get_target,%) : | $(gb_XcuMergeTarget_CFGEXTARGET)
+$(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET)
$(if $(SDF),$(call gb_XcuMergeTarget__command,$@,$*,$(filter 
%.xcu,$^)),mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
 
 $(call gb_XcuMergeTarget_get_clean_target,%) :
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 5ee8a97..fc7708e 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -61,8 +61,7 @@ $(call gb_Extension_get_workdir,%)/description.xml :
mkdir -p $(call gb_Extension_get_workdir,$*) && \
cp -f $(LOCATION)/description.xml $@)
 else
-$(call gb_Extension_get_workdir,%)/description.xml : | \
-   $(gb_Extension_XRMEXTARGET)
+$(call gb_Extension_get_workdir,%)/description.xml : 
$(gb_Extension_XRMEXTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
 ifeq ($(OS_FOR_BUILD),WNT)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -168,7 +167,7 @@ endef
 
 define gb_Extension_localize_help_onelang
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_workdir,$(1))/$(2)
-$(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
+$(call gb_Extension_get_workdir,$(1))/$(2) : $(3) gb_Extension_HELPEXTARGET
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)
 ifeq ($(OS_FOR_BUILD),WNT)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

2012-02-08 Thread Stephan Bergmann 
 dbaccess/source/core/api/RowSetCache.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 23151ab53574e0e893f4507313ff15388638746a
Author: Stephan Bergmann 
Date:   Wed Feb 8 21:51:38 2012 +0100

Tentative fix for invalid iterator range regression

37b5dce665a03d3404e6a710b82bef16d740d178 re-wrote a std::rotate call to 
cause
an "error: function requires a valid iterator range [__middle, __last)" 
abort
from debug-mode GCC libstdc++ during smoketest.  Lionel should check whether
this fix is actually good -- at least, it causes "make check" to succeed 
again.

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index df833a2..77eae6e 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -940,7 +940,14 @@ sal_Bool ORowSetCache::moveWindow()
 bCheck = fill(aIter, aNewEnd, nPos, bCheck);
 }
 
-::std::rotate(m_pMatrix->begin(), aEnd, aNewEnd);
+if ( aEnd <= aNewEnd )
+{
+::std::rotate(m_pMatrix->begin(), aEnd, aNewEnd);
+}
+else
+{
+::std::rotate(m_pMatrix->begin(), aNewEnd, aEnd);
+}
 // now correct the iterator in our iterator vector
 //  rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be 
used because they decrement and here we need to increment
 ORowSetCacheMap::iterator aCacheIter = 
m_aCacheIterators.begin();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basegfx/inc basegfx/source

2012-02-08 Thread Caolán McNamara 
 basegfx/inc/basegfx/tools/unopolypolygon.hxx |   15 +--
 basegfx/source/tools/unopolypolygon.cxx  |5 -
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit fb9908eece3076ad88c160654450d3069d28c0d8
Author: Caolán McNamara 
Date:   Wed Feb 8 16:48:59 2012 +

use boost::noncopyable

diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx 
b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
index ca04b7a..9f41983 100644
--- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx
+++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 namespace basegfx
@@ -48,8 +49,10 @@ namespace unotools
   ::com::sun::star::rendering::XBezierPolyPolygon2D,
   ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase;
 
-class BASEGFX_DLLPUBLIC UnoPolyPolygon : private cppu::BaseMutex,
-   public UnoPolyPolygonBase
+class BASEGFX_DLLPUBLIC UnoPolyPolygon
+: private cppu::BaseMutex
+, private boost::noncopyable
+, public UnoPolyPolygonBase
 {
 public:
 explicit UnoPolyPolygon( const B2DPolyPolygon& );
@@ -96,15 +99,15 @@ namespace unotools
  sal_Int32 nNumberOfPoints ) const;
 
 /// Get cow copy of internal polygon. not thread-safe outside this 
object.
-B2DPolyPolygon getPolyPolygonUnsafe() const;
+B2DPolyPolygon getPolyPolygonUnsafe() const
+{
+return maPolyPoly;
+}
 
 /// Called whenever internal polypolygon gets modified
 virtual void modifying() const {}
 
 private:
-UnoPolyPolygon( const UnoPolyPolygon& );
-UnoPolyPolygon& operator=( const UnoPolyPolygon& );
-
 B2DPolyPolygonmaPolyPoly;
 ::com::sun::star::rendering::FillRule meFillRule;
 };
diff --git a/basegfx/source/tools/unopolypolygon.cxx 
b/basegfx/source/tools/unopolypolygon.cxx
index 80203c2..2ffaabd 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -445,11 +445,6 @@ namespace unotools
 return aSubsetPoly;
 }
 
-B2DPolyPolygon UnoPolyPolygon::getPolyPolygonUnsafe() const
-{
-return maPolyPoly;
-}
-
 #define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon"
 #define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D"
 ::rtl::OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( 
uno::RuntimeException )
___
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 - sc/source

2012-02-08 Thread Eike Rathke 
 sc/source/core/data/document.cxx |2 +-
 sc/source/ui/app/inputwin.cxx|   17 +
 sc/source/ui/inc/inputwin.hxx|4 
 3 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit 01cb770ff2c97a3befee5f52ff0563d5e9525f29
Author: Noel Power 
Date:   Tue Feb 7 11:47:13 2012 +

fix problem with vba Range.Copy ( for multirange ) bnc#707486
(cherry picked from commit b0602d2f179182de42bffb739252cc3f3705d18f)

Signed-off-by: Eike Rathke 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 61fdbe5..93a067e 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1948,7 +1948,7 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam,
 {
 pClipDoc->ResetClip( this, nTab );
 i = nTab;
-nEndTab = nTab;
+nEndTab = nTab + 1;
 }
 else
 pClipDoc->ResetClip(this, pMarks);
commit 910c68b5ddc30fb8dc63b67470105d0960fa04a1
Author: Noel Power 
Date:   Tue Feb 7 15:36:29 2012 +

make ctrl-shift-f2 change focus to the inputline fdo#40957
(cherry picked from commit 09d7b5e6039827d0f02f424370f929caff179ac9)

Signed-off-by: Eike Rathke 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 37caced..3e53062 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -697,7 +697,7 @@ void ScInputWindow::StopEditEngine( sal_Bool bAll )
 
 void ScInputWindow::TextGrabFocus()
 {
-aTextWindow.GrabFocus();
+aTextWindow.TextGrabFocus();
 }
 
 void ScInputWindow::TextInvalidate()
@@ -712,12 +712,13 @@ void ScInputWindow::SwitchToTextWin()
 aTextWindow.StartEditEngine();
 if ( SC_MOD()->IsEditMode() )
 {
-aTextWindow.GrabFocus();
+aTextWindow.TextGrabFocus();
 EditView* pView = aTextWindow.GetEditView();
 if (pView)
 {
-xub_StrLen nLen = pView->GetEditEngine()->GetTextLen(0);
-ESelection aSel( 0, nLen, 0, nLen );
+sal_uInt16 nPara =  pView->GetEditEngine()->GetParagraphCount() ? 
( pView->GetEditEngine()->GetParagraphCount() - 1 ) : 0;
+xub_StrLen nLen = pView->GetEditEngine()->GetTextLen( nPara );
+ESelection aSel( nPara, nLen, nPara, nLen );
 pView->SetSelection( aSel );// set cursor to end 
of text
 }
 }
@@ -1115,6 +1116,10 @@ IMPL_LINK( ScInputBarGroup, Impl_ScrollHdl, ScrollBar*, 
EMPTYARG )
 return 0;
 }
 
+void ScInputBarGroup::TextGrabFocus()
+{
+aMultiTextWnd.TextGrabFocus();
+}
 
 //
 //  ScMultiTextWnd
@@ -2018,6 +2023,10 @@ void ScTextWnd::DataChanged( const DataChangedEvent& 
rDCEvt )
 Window::DataChanged( rDCEvt );
 }
 
+void ScTextWnd::TextGrabFocus()
+{
+GrabFocus();
+}
 
 //
 //  Positionsfenster
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index eec7fed..ae8383d 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -65,6 +65,7 @@ public:
 virtual voidMakeDialogEditView() = 0;
 virtual voidSetFormulaMode( sal_Bool bSet ) = 0;
 virtual sal_BoolIsInputActive() = 0;
+virtual voidTextGrabFocus() = 0;
 };
 
 class ScTextWnd : public ScTextWndBase, public DragSourceHelper // edit 
window
@@ -85,6 +86,8 @@ public:
 virtual voidStartEditEngine();
 virtual voidStopEditEngine( sal_Bool bAll );
 
+virtual voidTextGrabFocus();
+
 virtual voidDataChanged( const DataChangedEvent& rDCEvt );
 
 virtual voidSetFormulaMode( sal_Bool bSet );
@@ -223,6 +226,7 @@ public:
 virtual voidResize();
 virtual const String&   GetTextString() const;
 virtual voidStopEditEngine( sal_Bool bAll );
+virtual voidTextGrabFocus();
 voidInitEditEngine(SfxObjectShell* pObjSh);
 voidSetFormulaMode( sal_Bool bSet );
 boolIsFocus();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-02-08 Thread Cédric Bosdonnat 
 sw/source/core/layout/frmtool.cxx |   43 ++
 1 file changed, 16 insertions(+), 27 deletions(-)

New commits:
commit 2a22e664811e10ca58ec66ba8fd10b1a6185c178
Author: Cédric Bosdonnat 
Date:   Wed Feb 8 18:58:13 2012 +0100

fdo#39006: Fixed layout loop

OD's comment was right: forcing a restart of the layout may cause
loops... and we falled into that case. As this seems to be useless,
removed the whole thing.

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 9bc3957..c19dbf7 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -724,33 +724,22 @@ SwFlyNotify::~SwFlyNotify()
  ( !pFly->ISA(SwFlyFreeFrm) ||
!static_cast(pFly)->IsNoMoveOnCheckClip() ) )
 {
-// #i54138# - suppress restart of the layout process
-// on changed frame height.
-// Note: It doesn't seem to be necessary and can cause layout loops.
-if ( bPosChgd )
-{
-// indicate a restart of the layout process
-pFly->SetRestartLayoutProcess( true );
-}
-else
-{
-// lock position
-pFly->LockPosition();
-
-if ( !pFly->ConsiderForTextWrap() )
-{
-// indicate that object has to be considered for text wrap
-pFly->SetConsiderForTextWrap( true );
-// invalidate 'background' in order to allow its 'background'
-// to wrap around it.
-pFly->NotifyBackground( pFly->GetPageFrm(),
-pFly->GetObjRectWithSpaces(),
-PREP_FLY_ARRIVE );
-// invalidate position of anchor frame in order to force
-// a re-format of the anchor frame, which also causes a
-// re-format of the invalid previous frames of the anchor 
frame.
-pFly->AnchorFrm()->InvalidatePos();
-}
+// lock position
+pFly->LockPosition();
+
+if ( !pFly->ConsiderForTextWrap() )
+{
+// indicate that object has to be considered for text wrap
+pFly->SetConsiderForTextWrap( true );
+// invalidate 'background' in order to allow its 'background'
+// to wrap around it.
+pFly->NotifyBackground( pFly->GetPageFrm(),
+pFly->GetObjRectWithSpaces(),
+PREP_FLY_ARRIVE );
+// invalidate position of anchor frame in order to force
+// a re-format of the anchor frame, which also causes a
+// re-format of the invalid previous frames of the anchor frame.
+pFly->AnchorFrm()->InvalidatePos();
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source sc/source

2012-02-08 Thread Noel Power 
 oox/source/token/properties.txt |2 +
 oox/source/xls/drawingbase.cxx  |6 
 sc/source/ui/unoobj/docuno.cxx  |   60 
 3 files changed, 68 insertions(+)

New commits:
commit 4908c16a73b397f83c327789f113658c1ea4d904
Author: Noel Power 
Date:   Wed Feb 8 17:45:34 2012 +

handle row and column offsets for imported shape with cell anchor fdo#45266

This is an update to the previous commit ( for the same bug ) 
d3a26738b426846ee1a787e7c97280fc43002961

diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 94a1947..176ae08 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -218,6 +218,7 @@ HelpText
 HideInactiveSelection
 HoriJustify
 HoriJustifyMethod
+HoriOrientPosition
 HorizontalSplitMode
 HorizontalSplitPositionTwips
 IgnoreBlankCells
@@ -496,6 +497,7 @@ VertJustifyMethod
 VerticalAlign
 VerticalSplitMode
 VerticalSplitPositionTwips
+VertOrientPosition
 ViewBox
 Visible
 VisibleFlag
diff --git a/oox/source/xls/drawingbase.cxx b/oox/source/xls/drawingbase.cxx
index 91ed337..cfc9f32 100644
--- a/oox/source/xls/drawingbase.cxx
+++ b/oox/source/xls/drawingbase.cxx
@@ -308,6 +308,12 @@ ShapeAnchor::applyToXShape( const 
::com::sun::star::uno::Reference< ::com::sun::
 {
 PropertySet aShapeProp( rxShape );
 aShapeProp.setProperty( PROP_Anchor, getFromCell() );
+CellAnchorModel offSets;
+offSets.mnColOffset = maFrom.mnColOffset;
+offSets.mnRowOffset = maFrom.mnRowOffset;
+EmuPoint aPos = calcCellAnchorEmu( offSets );
+aShapeProp.setProperty( PROP_HoriOrientPosition, lclEmuToHmm( aPos.X ) 
);
+aShapeProp.setProperty( PROP_VertOrientPosition, lclEmuToHmm( aPos.Y ) 
);
 }
 }
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index ba7157e..0b3b231 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -194,6 +194,55 @@ const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap()
 return aRowsPropertyMap_Impl;
 }
 
+struct OrientationInfo
+{
+OrientationInfo() : mnVert( 0 ), mnHori( 0 ) {}
+uno::Reference< beans::XPropertySet > mxShape;
+sal_Int32 mnVert;
+sal_Int32 mnHori;
+};
+
+void lcl_captureShapeOrientationInfo( std::vector< OrientationInfo >& infos, 
ScModelObj& rModel )
+{
+rtl::OUString sHori( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HORIPOS ) );
+rtl::OUString sVert( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VERTPOS ) );
+
+uno::Reference xPages( rModel.getDrawPages(), 
uno::UNO_QUERY );
+if ( xPages.is() )
+{
+for ( sal_Int32 nIndex = 0, nPages = xPages->getCount(); nIndex < 
nPages; ++nIndex )
+{
+uno::Reference xShapes( 
xPages->getByIndex( nIndex ), uno::UNO_QUERY );
+for ( sal_Int32 nShapeIndex = 0, nShapes = xShapes->getCount(); 
nShapeIndex < nShapes; ++nShapeIndex )
+{
+uno::Reference< beans::XPropertySet > xShape( 
xShapes->getByIndex( nShapeIndex ), uno::UNO_QUERY );
+uno::Reference< table::XCell > xCell( 
xShape->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
SC_UNONAME_ANCHOR ) ) ), uno::UNO_QUERY );
+// only capture orientation if the shape is anchored to cell
+if ( xShape.is() && xCell.is() )
+{
+uno::Reference< beans::XPropertySetInfo > xPropInfo = 
xShape->getPropertySetInfo();
+if ( xPropInfo.is() && xPropInfo->hasPropertyByName( sHori 
) && xPropInfo->hasPropertyByName( sVert ) )
+{
+OrientationInfo aShape;
+aShape.mxShape = xShape;
+xShape->getPropertyValue( sHori ) >>= aShape.mnHori;
+xShape->getPropertyValue( sVert ) >>= aShape.mnVert;
+infos.push_back( aShape );
+}
+}
+}
+}
+}
+}
+
+void lcl_applyShapeOrientationInfo( std::vector< OrientationInfo >& infos )
+{
+for ( std::vector< OrientationInfo >::iterator it = infos.begin(), it_end 
= infos.end(); it != it_end; ++it )
+{
+it->mxShape->setPropertyValue( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HORIPOS ) ), uno::makeAny( it->mnHori ) 
);
+it->mxShape->setPropertyValue( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VERTPOS ) ), uno::makeAny( it->mnVert ) 
);
+}
+}
 using sc::HMMToTwips;
 using sc::TwipsToHMM;
 
@@ -1692,7 +1741,18 @@ void SAL_CALL ScModelObj::setPropertyValue(
 {
 pDoc->EnableAdjustHeight( bAdjustHeightEnabled );
 if( bAdjustHeightEnabled )
+{
+// during import ( e.g. oox ) shapes anchored by cell lose
+// any additional Hori/Vert orientation ( which offsets the
+// shape position rel

[Libreoffice-commits] .: 5 commits - i18nutil/inc i18nutil/source unusedcode.easy vcl/inc vcl/source

2012-02-08 Thread Norbert Thiebaud 
 i18nutil/inc/i18nutil/unicode.hxx   |4 --
 i18nutil/source/utility/unicode.cxx |   67 
 unusedcode.easy |4 --
 vcl/inc/vcl/i18nhelp.hxx|1 
 vcl/source/app/i18nhelp.cxx |7 ---
 5 files changed, 83 deletions(-)

New commits:
commit 737a584d9a1cc29d2688871bdebbb0a7175c542c
Author: Greg Kroah-Hartman 
Date:   Wed Feb 8 08:57:45 2012 -0800

vcl: I18nHelper: delete unused GetDate() method

diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index a83afa4..32f9e16 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.hxx
@@ -86,7 +86,6 @@ public:
 sal_BoolMatchString( const String& rStr1, const String& rStr2 ) const;
 sal_BoolMatchMnemonic( const String& rString, sal_Unicode 
cMnemonicChar ) const;
 
-String  GetDate( const Date& rDate ) const;
 String  GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool 
bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const;
 
 static String filterFormattingChars( const String& );
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index f8967b2..0c1c3fa 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -175,13 +175,6 @@ sal_Bool vcl::I18nHelper::MatchMnemonic( const String& 
rString, sal_Unicode cMne
 }
 
 
-String vcl::I18nHelper::GetDate( const Date& rDate ) const
-{
-::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex );
-
-return ImplGetLocaleDataWrapper().getDate( rDate );
-}
-
 String vcl::I18nHelper::GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool 
bUseThousandSep, sal_Bool bTrailingZeros ) const
 {
 return ImplGetLocaleDataWrapper().getNum( nNumber, nDecimals, 
bUseThousandSep, bTrailingZeros );
commit d857f0938b8acd491f297d104889588bb986aa66
Author: Greg Kroah-Hartman 
Date:   Wed Feb 8 08:57:41 2012 -0800

unicode: delete unused unicode:getCharType() method

diff --git a/i18nutil/inc/i18nutil/unicode.hxx 
b/i18nutil/inc/i18nutil/unicode.hxx
index 7fce041..f9ff6e1 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -48,7 +48,6 @@ public:
 static sal_Unicode SAL_CALL 
getUnicodeScriptStart(com::sun::star::i18n::UnicodeScript type);
 static sal_Unicode SAL_CALL 
getUnicodeScriptEnd(com::sun::star::i18n::UnicodeScript type);
 static sal_uInt8 SAL_CALL getUnicodeDirection( const sal_Unicode ch );
-static sal_Int32 SAL_CALL getCharType( const sal_Unicode ch );
 static sal_Bool SAL_CALL isUpper( const sal_Unicode ch);
 static sal_Bool SAL_CALL isLower( const sal_Unicode ch);
 static sal_Bool SAL_CALL isDigit( const sal_Unicode ch);
diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 056e78a..dcc5b36 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -425,70 +425,6 @@ sal_Bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode 
ch) {
 return (ch != 0xa0 && isSpace(ch)) || (ch <= 0x1F && (bit(ch) & 
(CONTROLSPACE)));
 }
 
-sal_Int32 SAL_CALL unicode::getCharType( const sal_Unicode ch )
-{
-using namespace ::com::sun::star::i18n::KCharacterType;
-
-switch ( getUnicodeType( ch ) ) {
-// Upper
-case UnicodeType::UPPERCASE_LETTER :
-return UPPER|LETTER|PRINTABLE|BASE_FORM;
-
-// Lower
-case UnicodeType::LOWERCASE_LETTER :
-return LOWER|LETTER|PRINTABLE|BASE_FORM;
-
-// Title
-case UnicodeType::TITLECASE_LETTER :
-return TITLE_CASE|LETTER|PRINTABLE|BASE_FORM;
-
-// Letter
-case UnicodeType::MODIFIER_LETTER :
-case UnicodeType::OTHER_LETTER :
-return LETTER|PRINTABLE|BASE_FORM;
-
-// Digit
-case UnicodeType::DECIMAL_DIGIT_NUMBER:
-case UnicodeType::LETTER_NUMBER:
-case UnicodeType::OTHER_NUMBER:
-return DIGIT|PRINTABLE|BASE_FORM;
-
-// Base
-case UnicodeType::NON_SPACING_MARK:
-case UnicodeType::ENCLOSING_MARK:
-case UnicodeType::COMBINING_SPACING_MARK:
-return BASE_FORM|PRINTABLE;
-
-// Print
-case UnicodeType::SPACE_SEPARATOR:
-
-case UnicodeType::DASH_PUNCTUATION:
-case UnicodeType::INITIAL_PUNCTUATION:
-case UnicodeType::FINAL_PUNCTUATION:
-case UnicodeType::CONNECTOR_PUNCTUATION:
-case UnicodeType::OTHER_PUNCTUATION:
-
-case UnicodeType::MATH_SYMBOL:
-case UnicodeType::CURRENCY_SYMBOL:
-case UnicodeType::MODIFIER_SYMBOL:
-case UnicodeType::OTHER_SYMBOL:
-return PRINTABLE;
-
-// Control
-case UnicodeType::CONTROL:
-case UnicodeType::FORMAT:
-return CONTROL;
-
-case UnicodeType::LINE_SEPARATOR:
-case UnicodeType::PARAGRAPH_SEPARATOR:
-return CONTROL|PRINTABLE;
-
-// for all others
-default:
-return 0;
-}
-}
-
 sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
 {
 //See unicode/uscript.h
diff --git a/unusedcode.e

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source

2012-02-08 Thread Michael Stahl 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |   73 
--
 1 file changed, 31 insertions(+), 42 deletions(-)

New commits:
commit 9739e6163b2429c4f23d91183089d8a768a87faf
Author: Lionel Elie Mamane 
Date:   Wed Feb 1 16:40:13 2012 +0100

fdo#45254 getTablePrivileges: rely on information_schema

This avoids the use of aclexplode(), which is only SQL-available in 
PostgreSQL 9.0 and later.
With PostgreSQL versions known to have the 
information_schema.table_privileges bug of not filling in the default ACL in 
the absence of an ACL, fill in "owner has all rights", which is the default 
state of the default ACL.
(cherry picked from commit 8c922d832792402554cc3dfd174d6d4da50847f4)

Signed-off-by: Michael Stahl 

diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index d26b150..d2e4927 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1559,6 +1559,7 @@ static void columnMetaData2DatabaseTypeDescription(
 //  12. REMARKS string => comment describing column (may be NULL )
 //   => Don't know, there does not seem to exist something like
 //  that in postgres
+//   LEM TODO: comments exist, find how to retrieve them easily
 //  13. COLUMN_DEF string => default value (may be NULL)
 //   => pg_type.typdefault
 //  14. SQL_DATA_TYPE long => unused
@@ -1575,7 +1576,6 @@ static void columnMetaData2DatabaseTypeDescription(
 //allow NULL values. An empty string means
 //nobody knows.
 //   => pg_attribute.attnotnull
-// select objoid,description,objsubid,pg_attribute.attname from pg_attribute 
LEFT JOIN pg_description ON pg_attribute.attrelid=pg_description.objoid and 
pg_attribute.attnum = pg_description.objsubid
 
 Reference< XPreparedStatement > statement = m_origin->prepareStatement(
 ASCII_STR(
@@ -1706,49 +1706,38 @@ static void columnMetaData2DatabaseTypeDescription(
 log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
 }
 
-Reference< XPreparedStatement > statement = m_origin->prepareStatement(
-ASCII_STR(
-"  WITH RECURSIVE roles AS ("
-"  SELECT oid, rolname, rolinherit, rolsuper FROM 
pg_catalog.pg_roles"
-"UNION ALL"
-"  VALUES (0, 'PUBLIC', TRUE, FALSE)"
-"  ), direct_privs_oids AS ("
-"  SELECT c.relname, c.relnamespace, c.relowner, 
(aclexplode(c.relacl)).*"
-"  FROM pg_catalog.pg_class c"
-"  WHERE c.relkind IN ('r', 'v') AND c.relname LIKE ?"
-"UNION ALL"
-"  SELECT c.relname, c.relnamespace, c.relowner, c.relowner, 
c.relowner, p.privilege, TRUE"
-"  FROM pg_catalog.pg_class c,"
-"   (VALUES ('SELECT'), ('INSERT'), ('UPDATE'), 
('DELETE'), ('TRUNCATE'), ('REFERENCES'), ('TRIGGER')) p (privilege)"
-"  WHERE c.relkind IN ('r', 'v') AND c.relacl IS NULL AND 
c.relname LIKE ?"
-"  ), direct_privs AS ("
-"SELECT dpo.relname, pn.nspname, dpo.relowner, 
pr_grantor.rolname AS grantor, dpo.grantee, dpo.privilege_type, 
dpo.is_grantable"
-"FROM direct_privs_oids dpo INNER JOIN roles pr_grantor ON 
dpo.grantor = pr_grantor.oid"
-"   INNER JOIN pg_catalog.pg_namespace pn ON pn.oid = 
dpo.relnamespace"
-"WHERE pn.nspname LIKE ?"
-"  ), memberships(roleid, membership) AS ("
-"  SELECT pr.oid, 0"
-"  FROM pg_catalog.pg_roles pr"
-"UNION"
-"  SELECT pr.oid, pr.oid"
-"  FROM roles pr"
-"UNION"
-"  SELECT m.roleid, pam.roleid"
-"  FROM roles pr INNER JOIN pg_catalog.pg_auth_members pam ON 
pr.oid = pam.member"
-"   INNER JOIN memberships m ON pam.member = m.membership"
-"  WHERE pr.rolinherit"
-"  )"
-"  SELECT current_database() AS TABLE_CAT, dp.nspname AS 
TABLE_SCHEM, dp.relname AS TABLE_NAME,"
-" dp.grantor AS GRANTOR, pr_grantee.rolname AS GRANTEE, 
dp.privilege_type AS PRIVILEGE,"
-" CASE WHEN dp.is_grantable OR (dp.relowner = 
pr_grantee.oid) THEN 'YES' ELSE 'NO' END AS IS_GRANTABLE"
-"  FROM direct_privs dp INNER JOIN memberships m ON dp.grantee = 
m. membership"
-"   INNER JOIN roles pr_grantee ON pr_grantee.oid = m.roleid"
-"  ORDER BY dp.nspname, dp.relname, dp.privilege_type"
-));
+rtl::OUStringBuffer sSQL(260);
+sSQL.append( ASCII_STR(
+" SELECT * FROM ("
+"  SELECT table_catalog A

[Libreoffice-commits] .: 3 commits - sc/Module_sc.mk solenv/gbuild

2012-02-08 Thread Bjoern Michaelsen 
 sc/Module_sc.mk   |5 +-
 solenv/gbuild/Module.mk   |   43 +++---
 solenv/gbuild/TargetLocations.mk  |1 
 solenv/gbuild/extensions/post_DisableIosUnitchecks.mk |1 
 solenv/gbuild/extensions/post_SpeedUpTargets.mk   |1 
 solenv/gbuild/gbuild.help.txt |1 
 6 files changed, 46 insertions(+), 6 deletions(-)

New commits:
commit 17f59f3aa995dd324ec88974b6196402f8fd89f0
Author: Bjoern Michaelsen 
Date:   Wed Feb 8 15:28:09 2012 +0100

stick to three-letter length

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index f99c4cb..c46a2e8 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -69,7 +69,7 @@ $(call gb_Module_get_check_target,%) :
touch $@)
 
 $(call gb_Module_get_slowcheck_target,%) :
-   $(call gb_Output_announce,$*,$(true),SCHK,5)
+   $(call gb_Output_announce,$*,$(true),SLC,5)
$(call gb_Output_announce_title,module $* slowchecks done.)
-$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
commit 7472fe259e2cc94ddf66de29ab1d287d0775ceb3
Author: Bjoern Michaelsen 
Date:   Wed Feb 8 15:07:40 2012 +0100

remove superflous whitespace

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 2825cce..ef47326 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
 CppunitTest_sc_filters_test \
 ))
 
-$(eval $(call gb_Module_add_slowcheck_targets, sc,\
+$(eval $(call gb_Module_add_slowcheck_targets,sc,\
 CppunitTest_sc_ucalc \
 ))
 
commit 590c2400f168faa6eccf793b478d681dcdb73ca7
Author: Markus Mohrhard 
Date:   Fri Jan 13 20:51:34 2012 +0100

first try to add slowcheck build target

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 112fa40..2825cce 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -42,10 +42,13 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
-CppunitTest_sc_ucalc \
 CppunitTest_sc_filters_test \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets, sc,\
+CppunitTest_sc_ucalc \
+))
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 JunitTest_sc_complex \
 JunitTest_sc_unoapi \
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 24cc1e5..f99c4cb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -34,10 +34,12 @@
 #  excluding tests recursive Modules
 # Module/unitcheckrun unit tests   all unit tests
 #  recursive 
Module/checks
+# Module/slowcheckrun all slow unit tests
 # Module/subsequentcheck  run system tests all system tests
 #  recursive 
Module/subsequentchecks
 # build (global)  build the producttop-level Module
 # unitcheck (global)  run unit tests   top-level 
Module/unitcheck
+# slowcheck (global)  run slow unit tests  top-level 
Module/slowcheck
 # subsequentcheck (global)run system tests top-level 
Module/subsequentcheck
 # all (global)default goal build unitcheck
 
@@ -48,6 +50,7 @@ gb_Module_ALLMODULES :=
 gb_Module_MODULELOCATIONS :=
 gb_Module_TARGETSTACK :=
 gb_Module_CHECKTARGETSTACK :=
+gb_Module_SLOWCHECKTARGETSTACK :=
 gb_Module_SUBSEQUENTCHECKTARGETSTACK :=
 gb_Module_CLEANTARGETSTACK :=
 
@@ -56,7 +59,7 @@ $(call gb_Module_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),MOD,5)
$(call gb_Output_announce_title,module $* cleared.)
-$(call gb_Helper_abbreviate_dirs,\
-   rm -f $(call gb_Module_get_target,$*) $(call 
gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
+   rm -f $(call gb_Module_get_target,$*) $(call 
gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call 
gb_Module_get_subsequentcheck_target,$*))
 
 $(call gb_Module_get_check_target,%) :
$(call gb_Output_announce,$*,$(true),CHK,5)
@@ -65,6 +68,13 @@ $(call gb_Module_get_check_target,%) :
mkdir -p $(dir $@) && \
touch $@)
 
+$(call gb_Module_get_slowcheck_target,%) :
+   $(call gb_Output_announce,$*,$(true),SCHK,5)
+   $(call gb_Output_announce_title,module $* slowchecks done.)
+   -$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $@) && \
+   touch $@)
+
 $(call gb_Module_get_subsequentcheck_target,%) :
$(call gb_Output_announce,$*,$(true),SCK,5)
$(call gb_Output_announce_title,module $* subsequentchecks done.)
@@ -79,7 +89,7 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
 
-.PHONY : build all clean unitcheck

[Libreoffice-commits] .: cui/source sfx2/source svl/inc svl/source svtools/source sw/source

2012-02-08 Thread Takeshi Abe 
 cui/source/tabpages/macroass.cxx  |2 +-
 sfx2/source/config/evntconf.cxx   |2 +-
 svl/inc/svl/macitem.hxx   |   22 +++---
 svl/source/items/macitem.cxx  |   17 +++--
 svtools/source/svhtml/htmlout.cxx |2 +-
 sw/source/ui/dochdl/gloshdl.cxx   |8 
 sw/source/ui/misc/glossary.cxx|4 ++--
 sw/source/ui/misc/glshell.cxx |6 +++---
 8 files changed, 30 insertions(+), 33 deletions(-)

New commits:
commit 9b979c8bf13593175391efcab461a146d6f1331e
Author: Takeshi Abe 
Date:   Thu Feb 9 01:50:21 2012 +0900

Replaced String by rtl::OUString in SvxMacro

diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index abd7123..3128df1 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -131,7 +131,7 @@ String ConvertToUIName_Impl( SvxMacro *pMacro )
 {
 String aName( pMacro->GetMacName() );
 String aEntry;
-if ( ! pMacro->GetLanguage().EqualsAscii("JavaScript") )
+if ( ! 
pMacro->GetLanguage().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("JavaScript")) )
 {
 sal_uInt16 nCount = comphelper::string::getTokenCount(aName, '.');
 aEntry = aName.GetToken( nCount-1, '.' );
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 5ae485b..4f693a1 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -274,7 +274,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, 
rtl::OUString aEventName, const
 void SfxEventConfiguration::ConfigureEvent( rtl::OUString aName, const 
SvxMacro& rMacro, SfxObjectShell *pDoc )
 {
 boost::scoped_ptr pMacro;
-if ( rMacro.GetMacName().Len() )
+if ( rMacro.HasMacro() )
 pMacro.reset( new SvxMacro( rMacro.GetMacName(), rMacro.GetLibName(), 
rMacro.GetScriptType() ) );
 PropagateEvent_Impl( pDoc ? pDoc : 0, aName, pMacro.get() );
 }
diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx
index 2bc93a1..7261316 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -70,29 +70,29 @@ class SjJSbxObject;
 
 class SVL_DLLPUBLIC SvxMacro
 {
-String aMacName;
-String aLibName;
+::rtl::OUString aMacName;
+::rtl::OUString aLibName;
 // Fuer JavaScript muss ein Function-Objekt gehalten werden
 SjJSbxObjectBase* pFunctionObject;
 ScriptType eType;
 
 public:
 
-SvxMacro( const String &rMacName, const String &rLanguage);
+SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString 
&rLanguage);
 
-SvxMacro( const String &rMacName, const String &rLibName,
+SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLibName,
 ScriptType eType); //  = STARBASIC entfernt
 
-SvxMacro( SjJSbxObjectBase* _pFunctionObject, const String &rSource );
+SvxMacro( SjJSbxObjectBase* _pFunctionObject, const ::rtl::OUString 
&rSource );
 ~SvxMacro();// noetig fuer pFunctionObject
 
-const String &GetLibName() const{ return aLibName; }
-const String &GetMacName() const{ return aMacName; }
-String GetLanguage()const;
+const ::rtl::OUString &GetLibName() const{ return aLibName; }
+const ::rtl::OUString &GetMacName() const{ return aMacName; }
+::rtl::OUString GetLanguage()const;
 
 ScriptType GetScriptType() const{ return eType; }
 
-sal_Bool HasMacro() const   { return aMacName.Len() ? sal_True : 
sal_False; }
+bool HasMacro() const { return !aMacName.isEmpty(); }
 
 #ifdef SOLAR_JAVA
 // JavaScript-Function-Objekt holen
@@ -103,12 +103,12 @@ public:
 SvxMacro& operator=( const SvxMacro& rBase );
 };
 
-inline SvxMacro::SvxMacro( const String &rMacName, const String &rLibName,
+inline SvxMacro::SvxMacro( const ::rtl::OUString &rMacName, const 
::rtl::OUString &rLibName,
 ScriptType eTyp )
 : aMacName( rMacName ), aLibName( rLibName ), pFunctionObject(NULL), 
eType( eTyp )
 {}
 
-inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const String 
&rSource )
+inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const 
::rtl::OUString &rSource )
 : aMacName( rSource ), pFunctionObject( _pFunctionObject ), eType( 
JAVASCRIPT )
 {}
 
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 8406ca4..44abf85 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -50,13 +50,13 @@ SjJSbxObjectBase* SjJSbxObjectBase::Clone( void )
 return NULL;
 }
 
-SvxMacro::SvxMacro( const String &rMacName, const String &rLanguage)
+SvxMacro::SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString 
&rLanguage)
 : aMacName( rMacName ), aLibName( rLanguage),
   pFunctionObject(NULL), eType( EXTENDED_STYPE)
 {
-if (rLanguage.EqualsAscii(SVX_MACRO_LANGUAGE_STARBASIC))
+if 
(rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_STARBASIC)))
 eType=STARBASIC;
-

[Libreoffice-commits] .: instsetoo_native/util

2012-02-08 Thread Petr Mladek 
 instsetoo_native/util/makefile.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 62e8dfa072d78c18464db9a43ffc3f7b287032b2
Author: Petr Mladek 
Date:   Wed Feb 8 17:46:59 2012 +0100

Create test packages even when SDK is disabled

Also fixed order in the other makefile target to make it clear
that it differs in the SDK

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 017836c..04acba4 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -95,13 +95,13 @@ ALLTAR  : $(LOCALPYFILES)
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficeall ooohelppack
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack)
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
 .ENDIF
 .ELSE
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficeall ooohelppack sdkooall
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) sdkoo_en-US $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
 .ENDIF
 .ENDIF
 .ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
@@ -109,13 +109,13 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack 
$(eq,$(OS),MACOSX $(NULL)
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficedevall ooodevhelppack
 .ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack)
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US)
 .ENDIF
 .ELSE
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficedevall ooodevhelppack sdkoodevall
 .ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) sdkoodev_en-US $(eq,$(OS),MACOSX $(NULL) 
lodevtest_en-US)
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) 
sdkoodev_en-US
 .ENDIF
 .ENDIF
 .ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-02-08 Thread Lubos Lunak 
 filter/source/msfilter/msdffimp.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 38af1195a9a24af4aaff84e7be318007b82f9b47
Author: Luboš Luňák 
Date:   Wed Feb 8 17:38:57 2012 +0100

do not deserialize into long, use a type of the correct width (fdo#40768)

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 5871da9..2a91c24 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6672,7 +6672,10 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& 
rBLIPStream, Graphic& rData,
 rBLIPStream.SeekRel( nSkip + 20 );
 
 // read in size of metafile in EMUS
-rBLIPStream >> aMtfSize100.Width() >> aMtfSize100.Height();
+sal_Int32 width, height;
+rBLIPStream >> width >> height;
+aMtfSize100.Width() = width;
+aMtfSize100.Height() = height;
 
 // scale to 1/100mm
 aMtfSize100.Width() /= 360, aMtfSize100.Height() /= 360;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile solenv/gbuild

2012-02-08 Thread Norbert Thiebaud 
 Makefile  |9 
 solenv/gbuild/gbuild.help.txt |   76 +++
 solenv/gbuild/gbuild.mk   |   81 --
 3 files changed, 86 insertions(+), 80 deletions(-)

New commits:
commit d85a108a1b37b9dbaf151d4141e21674ab53f569
Author: Norbert Thiebaud 
Date:   Wed Feb 8 10:16:23 2012 -0600

re-enable make help from the top-level make

diff --git a/Makefile b/Makefile
index 45b7053..24b2a5b 100644
--- a/Makefile
+++ b/Makefile
@@ -440,4 +440,13 @@ debugrun:
 endif # not clean or distclean
 
 
+#
+# help
+#
+.PHONY: help
+help:
+   @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
+   @true
+
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
new file mode 100644
index 000..d93285f
--- /dev/null
+++ b/solenv/gbuild/gbuild.help.txt
@@ -0,0 +1,76 @@
+NAME
+   gbuild - GNU make based build system for LibreOffice
+
+SYNOPSIS
+   make [ -f makefile ] [ options ] [ variable=value ... ] [ targets ] ...
+
+IMPORTANT OPTIONS
+   -s Silent operation; do not print the commands as they are executed.
+
+   -n Print the commands that would be executed, but do not execute them.
+   -k Continue as much as possible after an error.
+
+   -j Specifies the number of jobs (commands) to run simultaneously.
+   -l Specifies that no new jobs (commands) should be started if there are
+  others jobs running and the load average is at least load.
+
+   -t Touch files (mark them up to date without really changing them)
+  instead of running their commands.
+   -W Pretend that the target file has just been modified.
+   -o Do not remake the file file even if it is older than its
+  dependencies, and do not remake anything on account of changes in 
file.
+
+   -p Print the data base (rules and variable values) that results from
+  reading the makefiles.
+   --debug=b debug make run, see GNU make man page for details
+
+   (descriptions from GNU make man page)
+
+AVAILABLE TARGETS
+   all  build product and run unit tests (default goal)
+   buildbuild product
+   unitcheckrun unit tests
+   subsequentcheck  run system tests (requires full installation)
+   checkrun unit tests and if in toplevel subsequentcheck
+   cleanremove all generated files
+   showdeliverables show the targets delivered to OUTDIR and their source
+   debugrun starts the dev-install instance and allows tests to be 
run
+against it
+build the named module
+   .clean   clean the named module
+   .all for dmake modules only, build the named module and
+the pre-requisite modules for this module
+   .deliver for dmake modules only, deliver the named module
+   cmd  execute the command contained in the variable cmd=""
+in a shell with config_host.mk or config_build.mk
+environement set. (see gb_SIDE)
+
+INTERACTIVE VARIABLES:
+   DEBUG / debug   If not empty, build with DBGLEVEL=1 (see below).
+   ENABLE_SYMBOLS / enable_symbols
+   If not empty, build with debug symbols. Automatically
+   enabled by DEBUG/debug.
+   DBGLEVEL / dbglevel
+   If not empty, force the debug level to the specified 
value. The
+   debug level is passed to the source code through 
OSL_DEBUG_LEVEL
+   macro.
+   0 = no debug
+   1 = symbols + no optimizations
+   2 = symbols + no optimizations + extra debug output. 
OSL_TRACE
+   starts being active on this level.
+   3... = symbols + no optimizations + extra debug output 
(usually
+  extremely verbose). Levels > 2 are not used very 
much.
+
+   YACCFLAGS   Add as flags for YACC parser generator invocation.
+   CPPFLAGSAdd as preprocessor flags for C/C++/ObjC/ObjC++ 
compilation.
+   CFLAGS  Add as compiler flags for plain C compilation.
+   CXXFLAGSAdd as compiler flags for C++ compilation.
+   OBJCFLAGS   Add as compiler flags for Objective C compilation.
+   OBJCXXFLAGS Add as compiler flags for Objective C++ compilation.
+   LDFLAGS Add as linker flags.
+   gb_FULLDEPS Generate and use dependencies (on by default, handle 
with care).
+   gb_COLORUse ASCII color output.
+   gb_TITLES   Show progress in terminal title.
+   gb_Side Either "host" of "build" (default to "host").
+   determine if config_host.mk or config_build.mk is used 
to
+   set the build environme

[Libreoffice-commits] .: hsqldb/makefile.mk hsqldb/patches

2012-02-08 Thread Caolán McNamara 
 hsqldb/makefile.mk|3 
 hsqldb/patches/jdbc-4.1.patch |  267 ++
 2 files changed, 269 insertions(+), 1 deletion(-)

New commits:
commit 7dbfc0012cc75e7dac9a416b53149ad8ec33f071
Author: Caolán McNamara 
Date:   Wed Feb 8 16:03:50 2012 +

make hsqldb build with java 1.7

diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index 8b3d5b1..2e9fa8a 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -56,7 +56,8 @@ CONVERTFILES=build$/build.xml \
 PATCH_FILES=patches$/i96823.patch \
 patches$/i97032.patch \
 patches$/i103528.patch \
-patches$/i104901.patch
+patches$/i104901.patch \
+patches$/jdbc-4.1.patch
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
diff --git a/hsqldb/patches/jdbc-4.1.patch b/hsqldb/patches/jdbc-4.1.patch
new file mode 100644
index 000..89149c4
--- /dev/null
+++ b/hsqldb/patches/jdbc-4.1.patch
@@ -0,0 +1,267 @@
+--- misc/hsqldb/build/build.xml2012-02-08 15:14:42.827123541 +
 misc/build/hsqldb/build/build.xml  2012-02-08 15:21:43.827722388 +
+@@ -98,7 +98,11 @@
+   
+
+ 
+-   
++   
++  
++   
++
++   
+   
+
+ 
+@@ -210,6 +214,7 @@
+ 
+ 
+ 
++
+
+ 
+ 
+@@ -244,6 +249,7 @@
+ 
+ 
+ 
++
+
+ 
+ 
+@@ -279,10 +285,47 @@
+ 
+ 
+ 
++
++  
++
++
++
++  
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+   
+ 
+ 
+-
+T getObject(String columnLabel, Class type) throws 
SQLException
++{
++throw new UnsupportedOperationException("Not supported yet.");
++}
++
++public  T getObject(int ColumnIndex, Class type) throws SQLException
++{
++throw new UnsupportedOperationException("Not supported yet.");
++}
++
++
++//#endif JAVA7
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java2012-02-08 
15:14:42.802123563 +
 misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java  2012-02-08 
15:47:35.851635628 +
+@@ -48,6 +48,12 @@
+ import java.sql.SQLXML;
+ 
+ //#endif JAVA6
++
++//#ifdef JAVA7
++import java.util.concurrent.Executor;
++
++//#endif JAVA7
++
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
+ import java.sql.SQLWarning;
+@@ -2793,4 +2799,31 @@
+ }
+ 
+ //#endif JAVA6
++
++//#ifdef JAVA7
++public int getNetworkTimeout() throws SQLException
++{
++throw new UnsupportedOperationException("Not supported yet.");
++}
++
++public void setNetworkTimeout(Executor executor, int millis) throws 
SQLException
++{
++throw new UnsupportedOperationException("Not supported yet.");
++}
++
++public void abort(Executor executor) throws SQLException
++{
++throw new UnsupportedOperationException("Not supported yet.");
++}
++
++public String getSchema() throws SQLException
++{
++throw new UnsupportedOperationException("Not supported yet.");
++}
++
++public void setSchema(String schema) throws SQLException
++{
++throw new UnsupportedOperationException("Not supported yet.");
++}
++//#endif JAVA7
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java  2012-02-08 
15:14:42.802123563 +
 misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
2012-02-08 15:47:35.835635654 +
+@@ -5693,4 +5693,21 @@
+ }
+ 
+ //#endif JAVA6
++
++
++//#ifdef JAVA7
++public boolean generatedKeyAlwaysReturned() throws SQLException
++{
++throw new UnsupportedOperationException("Not supported yet.");
++}
++
++public ResultSet getPseudoColumns(String catalog, String schemaPattern,
++  String tableNamePattern, String 
columnNamePattern) throws SQLException
++{
++throw new UnsupportedOperationException("Not supported yet.");
++}
++
++
++//#endif JAVA7
++
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java2012-02-08 
15:14:42.802123563 +
 misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java  2012-02-08 
15:47:35.836635653 +
+@@ -47,6 +47,11 @@
+ //#endif JAVA4
+ import org.hsqldb.jdbcDriver;
+ 
++//#ifdef JAVA7
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
++//#endif JAVA7
++
+ // boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final
+ 
+ /**
+@@ -323,4 +328,12 @@
+ }
+ 
+ //#endif JAVA6
++
++//#ifdef JAVA7
++public Logger getParentLogger() throws SQLFeatureNotSupportedException
++{
++throw new SQLFeatureNotSupportedException("Not supported yet.");
++

[Libreoffice-commits] .: sw/source

2012-02-08 Thread Miklos Vajna 
 sw/source/filter/ww8/rtfattributeoutput.cxx |   28 
 sw/source/filter/ww8/rtfattributeoutput.hxx |6 ++
 2 files changed, 30 insertions(+), 4 deletions(-)

New commits:
commit 1f77a5e8d5bf8a7f1b7bd7206996d2b2efc59462
Author: Miklos Vajna 
Date:   Wed Feb 8 16:49:57 2012 +0100

n#203704 fix RTF export table output for subtables

Older ODT files containing 
confused the RTF exporter. Add a few sanity checks to make sure the
output is still valid.

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 52d80fc..875edfb 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -251,13 +251,19 @@ void RtfAttributeOutput::StartParagraph( 
ww8::WW8TableNodeInfo::Pointer_t pTextN
 {
 ww8::WW8TableNodeInfoInner::Pointer_t pDeepInner( 
pTextNodeInfo->getInnerForDepth( m_nTableDepth ) );
 OSL_ENSURE( pDeepInner, "TableNodeInfoInner not found");
-if ( pDeepInner && pDeepInner->getCell() == 0 )
+// Make sure we always start a row between ending one and starting 
a cell.
+// In case of subtables, we may not get the first cell.
+if ((pDeepInner && pDeepInner->getCell() == 0) || m_bTableRowEnded)
+{
+m_bTableRowEnded = false;
 StartTableRow( pDeepInner );
+}
 
 StartTableCell( pDeepInner );
 }
 
-if ( nRow == 0 && nCell == 0 )
+// Again, if depth was incremented, start a new table even if we 
skipped the first cell.
+if ((nRow == 0 && nCell == 0) || (m_nTableDepth == 0 && 
pTextNodeInfo->getDepth()))
 {
 // Do we have to start the table?
 // [If we are at the rigth depth already, it means that we
@@ -610,7 +616,10 @@ void RtfAttributeOutput::TableDefinition( 
ww8::WW8TableNodeInfoInner::Pointer_t
 rLR.GetLeft() - rLR.GetRight();
 }
 SwTwips nTblSz = pFmt->GetFrmSize().GetWidth();
-for( sal_uInt16 i = 0; i < pRow->GetCells().Count(); i++ )
+// Not using m_nTableDepth, which is not yet incremented here.
+sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner->getDepth();
+m_aCells[nCurrentDepth] = pRow->GetCells().Count();
+for( sal_uInt16 i = 0; i < m_aCells[nCurrentDepth]; i++ )
 {
 SwWriteTableCell *pCell = pRow->GetCells( )[ i ];
 const SwFrmFmt *pCellFmt = pCell->GetBox()->GetFrmFmt();
@@ -906,6 +915,9 @@ void RtfAttributeOutput::StartTableRow( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 // We'll write the table definition for nested tables later
 if ( nCurrentDepth > 1 )
 return;
+// Empty the previous row closing buffer before starting the new one,
+// necessary for subtables.
+m_rExport.Strm() << m_aAfterRuns.makeStringAndClear().getStr();
 m_rExport.Strm() << m_aRowDefs.makeStringAndClear().getStr();
 }
 }
@@ -944,12 +956,17 @@ void RtfAttributeOutput::EndTableCell( )
 m_bTableCellOpen = false;
 m_bTblAfterCell = true;
 m_bWroteCellInfo = false;
+m_aCells[m_nTableDepth]--;
 }
 
 void RtfAttributeOutput::EndTableRow( )
 {
 SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", (depth is " << m_nTableDepth << 
")");
 
+// Trying to end the row without writing the required number of cells? 
Fill with empty ones.
+for( sal_uInt16 i = 0; i < m_aCells[m_nTableDepth]; i++ )
+m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_CELL);
+
 if ( m_nTableDepth > 1 )
 {
 m_aAfterRuns.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_NESTTABLEPROPRS);
@@ -971,6 +988,7 @@ void RtfAttributeOutput::EndTableRow( )
 }
 
m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_ROW).append(OOO_STRING_SVTOOLS_RTF_PARD);
 }
+m_bTableRowEnded = true;
 }
 
 void RtfAttributeOutput::EndTable()
@@ -2997,7 +3015,9 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport 
&rExport )
 m_bBufferSectionHeaders( false ),
 m_bLastTable( true ),
 m_bWroteCellInfo( false ),
-m_bHadFieldResult( false )
+m_bHadFieldResult( false ),
+m_bTableRowEnded( false ),
+m_aCells()
 {
 SAL_INFO("sw.rtf", OSL_THIS_FUNC);
 }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx 
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 8766c5a..eea4b8c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -533,6 +533,12 @@ private:
  * If we had a field result in the URL.
  */
 bool m_bHadFieldResult;
+
+/// If we ended a table row without starting a new one.
+bool m_bTableRowEnded;
+
+/// Number of cells from the table definition, by depth.
+std::map m_aCells;
 public:
 RtfAttributeOutput( RtfExport &rExport );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/source framework/uiconfig officecfg/registry reportdesign/uiconfig sc/uiconfig sd/uicon

2012-02-08 Thread Thorsten Behrens 
 basctl/uiconfig/basicide/menubar/menubar.xml  |
3 -
 chart2/uiconfig/menubar/menubar.xml   |
3 -
 dbaccess/uiconfig/dbapp/menubar/menubar.xml   |
3 -
 dbaccess/uiconfig/dbquery/menubar/menubar.xml |
3 -
 dbaccess/uiconfig/dbrelation/menubar/menubar.xml  |
3 -
 dbaccess/uiconfig/dbtable/menubar/menubar.xml |
3 -
 dbaccess/uiconfig/dbtdata/menubar/menubar.xml |
3 -
 extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml |
3 -
 framework/uiconfig/startmodule/menubar/menubar.xml|
3 -
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu  |
5 ++
 reportdesign/uiconfig/dbreport/menubar/menubar.xml|
3 -
 sc/uiconfig/scalc/menubar/menubar.xml |
3 -
 sd/uiconfig/sdraw/menubar/menubar.xml |
3 -
 sd/uiconfig/simpress/menubar/menubar.xml  |
3 -
 sfx2/inc/sfx2/sfxsids.hrc |
1 
 sfx2/sdi/appslots.sdi |
4 +
 sfx2/sdi/sfx.sdi  |   
25 ++
 sfx2/source/appl/appserv.cxx  |   
16 ++
 starmath/uiconfig/smath/menubar/menubar.xml   |
3 -
 sw/uiconfig/sglobal/menubar/menubar.xml   |
3 -
 sw/uiconfig/sweb/menubar/menubar.xml  |
3 -
 sw/uiconfig/swform/menubar/menubar.xml|
3 -
 sw/uiconfig/swreport/menubar/menubar.xml  |
3 -
 sw/uiconfig/swriter/menubar/menubar.xml   |
3 -
 sw/uiconfig/swxform/menubar/menubar.xml   |
3 -
 25 files changed, 91 insertions(+), 20 deletions(-)

New commits:
commit 1df566a10acf864e23f9cf85e8ef9077f35f
Author: Ivan Timofeev 
Date:   Wed Jan 18 22:47:58 2012 +0400

add the "Send Feedback..." help menu item

Signed-off-by: Thorsten Behrens 
Signed-off-by: Bjoern Michaelsen 
Signed-off-by: Michael Meeks 

diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml 
b/basctl/uiconfig/basicide/menubar/menubar.xml
index 15d4fcd..0d7ecd7 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -83,8 +83,9 @@
 
 
 
-
+
 
+
 
 
 
diff --git a/chart2/uiconfig/menubar/menubar.xml 
b/chart2/uiconfig/menubar/menubar.xml
index 3c50167..a52dff8 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -147,8 +147,9 @@
 
 
 
-
+
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml 
b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index a76fda5..0367d7e 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -133,8 +133,9 @@
 
 
 
-
+
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml 
b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index 2d6ec8d..e041079 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -74,8 +74,9 @@
 
 
 
-
+
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml 
b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index b7460a4..7dc66d0 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -57,8 +57,9 @@
 
 
 
-
+
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index ede5eed..439a735 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -58,8 +58,9 @@
 
 
 
-
+
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index 79fe68a..254f3b7 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/men

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sc/inc sc/source

2012-02-08 Thread Kohei Yoshida 
 sc/inc/compiler.hxx   |   12 ++-
 sc/inc/rangenam.hxx   |   25 +--
 sc/source/core/data/conditio.cxx  |   12 +--
 sc/source/core/data/document.cxx  |3 
 sc/source/core/data/table2.cxx|3 
 sc/source/core/tool/compiler.cxx  |   15 +---
 sc/source/core/tool/rangenam.cxx  |  131 +-
 sc/source/ui/docshell/docfunc.cxx |4 -
 sc/source/ui/view/viewfunc.cxx|2 
 9 files changed, 137 insertions(+), 70 deletions(-)

New commits:
commit e8a321db4419be43c693d5b5d06bfda25709d2f5
Author: Eike Rathke 
Date:   Wed Feb 8 10:42:04 2012 -0500

fix fdo#40590 stop abusing regular string token for XML import

During XML import formulas of defined names and conditional formatting
were remembered as regular svString tokens that then later were
retrieved without quotes for compilation. This didn't go along with the
new ScRangeData::CompileUnresolvedXML() that recreates the formula
string from an already tokenized form of the formula.

Introduced FormulaToken::AddStringXML() with ocStringXML to sort those
out and removed the IsImportingXML() hack from
FormulaCompiler::AppendString(), the ocStringXML case is handled in
FormulaCompiler::CreateStringFromToken().

Signed-off-by: Kohei Yoshida 

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 6947460..d317150 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -542,7 +542,6 @@ private:
 virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, 
formula::FormulaToken* _pTokenP);
 virtual void CreateStringFromIndex(rtl::OUStringBuffer& 
rBuffer,formula::FormulaToken* _pTokenP);
 virtual void LocalizeString( String& rName );  // modify rName - 
input: exact name
-virtual sal_Bool IsImportingXML() const;
 
 /// Access the CharTable flags
 inline sal_uLong GetCharTableFlags( sal_Unicode c, sal_Unicode cLast )
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 642c39b..f3571c5 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -316,10 +316,10 @@ void ScConditionEntry::Compile( const String& rExpr1, 
const String& rExpr2,
 aComp.SetGrammar( eGrammar1 );
 if ( pDoc->IsImportingXML() && !bTextToReal )
 {
-// temporary formula string as string tokens
-//!merge with lcl_ScDocFunc_CreateTokenArrayXML
+//  temporary formula string as string tokens
+//! merge with lcl_ScDocFunc_CreateTokenArrayXML
 pFormula1 = new ScTokenArray;
-pFormula1->AddString( rExpr1 );
+pFormula1->AddStringXML( rExpr1 );
 // bRelRef1 is set when the formula is compiled again 
(CompileXML)
 }
 else
@@ -353,10 +353,10 @@ void ScConditionEntry::Compile( const String& rExpr1, 
const String& rExpr2,
 aComp.SetGrammar( eGrammar2 );
 if ( pDoc->IsImportingXML() && !bTextToReal )
 {
-// temporary formula string as string tokens
-//!merge with lcl_ScDocFunc_CreateTokenArrayXML
+//  temporary formula string as string tokens
+//! merge with lcl_ScDocFunc_CreateTokenArrayXML
 pFormula2 = new ScTokenArray;
-pFormula2->AddString( rExpr2 );
+pFormula2->AddStringXML( rExpr2 );
 // bRelRef2 is set when the formula is compiled again 
(CompileXML)
 }
 else
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index a4938f1..542b1d0 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5123,10 +5123,6 @@ void ScCompiler::LocalizeString( String& rName )
 ScGlobal::GetAddInCollection()->LocalizeString( rName );
 }
 // 
-
-sal_Bool ScCompiler::IsImportingXML() const
-{
-return pDoc->IsImportingXML();
-}
 
 // Put quotes around string if non-alphanumeric characters are contained,
 // quote characters contained within are escaped by '\\'.
diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index c4df591..9349da8 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1008,9 +1008,9 @@ sal_Bool ScDocFunc::PutData( const ScAddress& rPos, 
ScEditEngineDefaulter& rEngi
 ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const String& rText, const 
String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
 {
 ScTokenArray* pCode = new ScTokenArray;
-pCode->AddString( rText );
+pCode->AddStringXML( rText );
 if( (eGrammar == formula::FormulaGrammar::GRAM_EXTERNAL) && 
(rFormulaNmsp.Len() > 0) )
-pCode->AddString( rFormulaNmsp );
+pCode->AddStringXML

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - formula/inc formula/source

2012-02-08 Thread Kohei Yoshida 
 formula/inc/formula/FormulaCompiler.hxx |1 -
 formula/inc/formula/compiler.hrc|   25 +
 formula/inc/formula/opcode.hxx  |9 +
 formula/inc/formula/tokenarray.hxx  |1 +
 formula/source/core/api/FormulaCompiler.cxx |   24 +++-
 formula/source/core/api/token.cxx   |7 +++
 6 files changed, 33 insertions(+), 34 deletions(-)

New commits:
commit a61057eb182d680eefaa996c0b4cd13ba4bdfcc0
Author: Eike Rathke 
Date:   Wed Feb 8 10:42:49 2012 -0500

fix fdo#40590 stop abusing regular string token for XML import

During XML import formulas of defined names and conditional formatting
were remembered as regular svString tokens that then later were
retrieved without quotes for compilation. This didn't go along with the
new ScRangeData::CompileUnresolvedXML() that recreates the formula
string from an already tokenized form of the formula.

Introduced FormulaToken::AddStringXML() with ocStringXML to sort those
out and removed the IsImportingXML() hack from
FormulaCompiler::AppendString(), the ocStringXML case is handled in
FormulaCompiler::CreateStringFromToken().

Signed-off-by: Kohei Yoshida 

diff --git a/formula/inc/formula/FormulaCompiler.hxx 
b/formula/inc/formula/FormulaCompiler.hxx
index 166d522..cc5c070 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -270,7 +270,6 @@ protected:
 virtual void CreateStringFromMatrix(rtl::OUStringBuffer& 
rBuffer,FormulaToken* pTokenP);
 virtual void CreateStringFromIndex(rtl::OUStringBuffer& 
rBuffer,FormulaToken* pTokenP);
 virtual void LocalizeString( String& rName );  // modify rName - 
input: exact name
-virtual sal_Bool IsImportingXML() const;
 
 sal_Bool   GetToken();
 OpCode NextToken();
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index c1a8117..1fef2e6 100755
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
@@ -44,18 +44,19 @@
 #define SC_OPCODE_SEP10
 #define SC_OPCODE_MISSING11 /* special OpCodes */
 #define SC_OPCODE_BAD12
-#define SC_OPCODE_SPACES 13
-#define SC_OPCODE_MAT_REF14
-#define SC_OPCODE_DB_AREA15 /* additional access operators */
-#define SC_OPCODE_MACRO  16
-#define SC_OPCODE_COL_ROW_NAME   17
-#define SC_OPCODE_COL_ROW_NAME_AUTO  18
-#define SC_OPCODE_PERCENT_SIGN   19 /* operator _follows_ value */
-#define SC_OPCODE_ARRAY_OPEN 20
-#define SC_OPCODE_ARRAY_CLOSE21
-#define SC_OPCODE_ARRAY_ROW_SEP  22
-#define SC_OPCODE_ARRAY_COL_SEP  23 /* some convs use sep != col_sep */
-#define SC_OPCODE_STOP_DIV   24
+#define SC_OPCODE_STRINGXML  13
+#define SC_OPCODE_SPACES 14
+#define SC_OPCODE_MAT_REF15
+#define SC_OPCODE_DB_AREA16 /* additional access operators */
+#define SC_OPCODE_MACRO  17
+#define SC_OPCODE_COL_ROW_NAME   18
+#define SC_OPCODE_COL_ROW_NAME_AUTO  19
+#define SC_OPCODE_PERCENT_SIGN   20 /* operator _follows_ value */
+#define SC_OPCODE_ARRAY_OPEN 21
+#define SC_OPCODE_ARRAY_CLOSE22
+#define SC_OPCODE_ARRAY_ROW_SEP  23
+#define SC_OPCODE_ARRAY_COL_SEP  24 /* some convs use sep != col_sep */
+#define SC_OPCODE_STOP_DIV   25
 
 /*** error constants #... ***/
 #define SC_OPCODE_START_ERRORS   30
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index 03e86eb..f417e11 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -53,10 +53,11 @@ enum OpCodeEnum
 ocArrayRowSep   = SC_OPCODE_ARRAY_ROW_SEP,
 ocArrayColSep   = SC_OPCODE_ARRAY_COL_SEP,
 // Special OpCodes
-ocMissing  = SC_OPCODE_MISSING,
-ocBad  = SC_OPCODE_BAD,
-ocSpaces   = SC_OPCODE_SPACES,
-ocMatRef   = SC_OPCODE_MAT_REF,
+ocMissing   = SC_OPCODE_MISSING,
+ocBad   = SC_OPCODE_BAD,
+ocStringXML = SC_OPCODE_STRINGXML,
+ocSpaces= SC_OPCODE_SPACES,
+ocMatRef= SC_OPCODE_MAT_REF,
 // Access commands
 ocDBArea   = SC_OPCODE_DB_AREA,
 ocMacro= SC_OPCODE_MACRO,
diff --git a/formula/inc/formula/tokenarray.hxx 
b/formula/inc/formula/tokenarray.hxx
index 3c870de..cbbab00 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -214,6 +214,7 @@ public:
 FormulaToken* AddExternal( const String& rStr, OpCode eOp = ocExternal );
 FormulaToken* AddBad( const sal_Unicode* pStr ); /// ocBad with String
 FormulaToken* AddBad( const String

[Libreoffice-commits] .: linguistic/inc linguistic/source unusedcode.easy

2012-02-08 Thread Michael Meeks 
 linguistic/inc/linguistic/misc.hxx |6 
 linguistic/source/misc.cxx |   51 -
 unusedcode.easy|5 ---
 3 files changed, 62 deletions(-)

New commits:
commit 7e579e6f4d6fc18d36cd29743b7343f20bda500d
Author: Alexander Bergmann 
Date:   Wed Feb 8 12:29:23 2012 +0100

unusedcode.easy: Removed unused code (linguistic)

diff --git a/linguistic/inc/linguistic/misc.hxx 
b/linguistic/inc/linguistic/misc.hxx
index da24159..ee41fe4 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -139,16 +139,10 @@ LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const 
rtl::OUString &rTxt, sal_Int3
 
 
 LNG_DLLPUBLIC sal_BoolIsUpper( const String &rText, xub_StrLen nPos, 
xub_StrLen nLen, sal_Int16 nLanguage );
-LNG_DLLPUBLIC sal_BoolIsLower( const String &rText, xub_StrLen nPos, 
xub_StrLen nLen, sal_Int16 nLanguage );
 
 inline sal_BoolIsUpper( const String &rText, sal_Int16 nLanguage ) 
{ return IsUpper( rText, 0, rText.Len(), nLanguage ); }
-inline sal_BoolIsLower( const String &rText, sal_Int16 nLanguage ) 
{ return IsLower( rText, 0, rText.Len(), nLanguage ); }
 
 String  ToLower( const String &rText, sal_Int16 nLanguage );
-String  ToUpper( const String &rText, sal_Int16 nLanguage );
-String  ToTitle( const String &rText, sal_Int16 nLanguage );
-sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage );
-sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage );
 LNG_DLLPUBLIC sal_Bool  HasDigits( const ::rtl::OUString &rText );
 LNG_DLLPUBLIC sal_Bool  IsNumeric( const String &rText );
 
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 4927b4e..59c3f37 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -635,18 +635,6 @@ sal_Bool IsUpper( const String &rText, xub_StrLen nPos, 
xub_StrLen nLen, sal_Int
 }
 
 
-sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, 
sal_Int16 nLanguage )
-{
-MutexGuard  aGuard( lcl_GetCharClassMutex() );
-
-CharClass &rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-sal_Int32 nFlags = rCC.getStringType( rText, nPos, nLen );
-return  (nFlags & KCharacterType::LOWER)
-&& !(nFlags & KCharacterType::UPPER);
-}
-
-
 String ToLower( const String &rText, sal_Int16 nLanguage )
 {
 MutexGuard  aGuard( lcl_GetCharClassMutex() );
@@ -657,45 +645,6 @@ String ToLower( const String &rText, sal_Int16 nLanguage )
 }
 
 
-String ToUpper( const String &rText, sal_Int16 nLanguage )
-{
-MutexGuard  aGuard( lcl_GetCharClassMutex() );
-
-CharClass &rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.uppercase( rText );
-}
-
-
-String ToTitle( const String &rText, sal_Int16 nLanguage )
-{
-MutexGuard  aGuard( lcl_GetCharClassMutex() );
-
-CharClass &rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.titlecase(rText);
-}
-
-
-sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage )
-{
-MutexGuard  aGuard( lcl_GetCharClassMutex() );
-
-CharClass &rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.lowercase( rtl::OUString(cChar) )[0];
-}
-
-
-sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage )
-{
-MutexGuard  aGuard( lcl_GetCharClassMutex() );
-
-CharClass &rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.uppercase( rtl::OUString(cChar) )[0];
-}
-
 // sorted(!) array of unicode ranges for code points that are exclusively(!) 
used as numbers
 // and thus may NOT not be part of names or words like the Chinese/Japanese 
number characters
 static const sal_uInt32 the_aDigitZeroes [] =
diff --git a/unusedcode.easy b/unusedcode.easy
index 5a67cee..6e6303b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1285,11 +1285,6 @@ 
libcmis::SessionFactory::getRepositories(std::__debug::maphttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source

2012-02-08 Thread Petr Mladek 
 sfx2/source/dialog/alienwarn.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit cce15c38036c5d7de1405012dc448f3fb3ab3476
Author: Josh Heidenreich 
Date:   Wed Feb 8 18:48:37 2012 +1030

Fix fdo#45117 - Alien save dialog buttons run off the edge

Adjusts the width of the dialog to be wider, if required.

Signed-off-by: Petr Mladek 

diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index e913c88..3e99575 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -174,6 +174,10 @@ void SfxAlienWarningDialog::InitSize()
 // new size of the dialog
 aNewSize = GetSizePixel();
 aNewSize.Height() -= nDelta;
+if (aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH > aNewSize.Width())
+{
+aNewSize.Width() = aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH;
+}
 SetSizePixel( aNewSize );
 
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

2012-02-08 Thread Petr Mladek 
 sfx2/source/dialog/alienwarn.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 09be8bbee6b49680dd2a16f5b4c2c2f8d9eca72c
Author: Josh Heidenreich 
Date:   Wed Feb 8 18:48:37 2012 +1030

Fix fdo#45117 - Alien save dialog buttons run off the edge

Adjusts the width of the dialog to be wider, if required.

diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index e913c88..3e99575 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -174,6 +174,10 @@ void SfxAlienWarningDialog::InitSize()
 // new size of the dialog
 aNewSize = GetSizePixel();
 aNewSize.Height() -= nDelta;
+if (aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH > aNewSize.Width())
+{
+aNewSize.Width() = aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH;
+}
 SetSizePixel( aNewSize );
 
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile

2012-02-08 Thread Norbert Thiebaud 
 Makefile |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 463f9ff03424a1de5b3d4616202f315adea7f2cd
Author: Norbert Thiebaud 
Date:   Wed Feb 8 08:10:44 2012 -0600

support make .all even for gbuild modules

diff --git a/Makefile b/Makefile
index c5c8589..45b7053 100644
--- a/Makefile
+++ b/Makefile
@@ -240,11 +240,15 @@ xsltml\
 zlib\
 
 define gbuild_module_rules
-.PHONY: $(1) $(1).clean $(1).deliver
+.PHONY: $(1) $(1).all $(1).clean $(1).deliver
 
 $(1): bootstrap fetch
cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) 
gb_PARTIALBUILD=T
 
+$(1).all: bootstrap fetch
+   cd $(1) && unset MAKEFLAGS && \
+$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- 
-P$(GMAKE_PARALLELISM)
+
 $(1).clean:
cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean 
gb_PARTIALBUILD=T
 
___
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 solenv/bin

2012-02-08 Thread Korrawit Pruegsanusak 
 basegfx/inc/basegfx/range/b2drange.hxx   |6 ++
 basegfx/inc/basegfx/tools/unopolypolygon.hxx |3 +++
 basegfx/source/range/b2drange.cxx|7 +++
 basegfx/source/tools/unopolypolygon.cxx  |5 +
 solenv/bin/build.pl  |6 +++---
 5 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 274772b5ae92f1f368f7102f1b1817a0cb106912
Author: Korrawit Pruegsanusak 
Date:   Wed Feb 8 15:42:15 2012 +0700

use $ENV{GNUMAKE} instead of constant 'make'

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 9d280d0..e85f3e6 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1514,10 +1514,10 @@ sub cancel_build {
 print STDERR 
"---\n";
 print STDERR "To rebuild a specific module:\n";
 print STDERR "\n";
-print STDERR "make $module.clean #optional\n";
-print STDERR "make $module\n";
+print STDERR "$ENV{GNUMAKE} $module.clean #optional\n";
+print STDERR "$ENV{GNUMAKE} $module\n";
 print STDERR "\n";
-print STDERR "when the problem is isolated and fixed re-run 'make'\n";
+print STDERR "when the problem is isolated and fixed, re-run 
'$ENV{GNUMAKE}'\n";
 zenity_message("LibreOffice Build Failed!");
 zenity_close();
 
commit a330f38093e2643a26239557050561afae9ff23d
Author: Korrawit Pruegsanusak 
Date:   Wed Feb 8 21:02:18 2012 +0700

Recover some methods needed by windows directx

This partially reverts b3c3e116ff0eb9b550b73d3901395c042e31d192

diff --git a/basegfx/inc/basegfx/range/b2drange.hxx 
b/basegfx/inc/basegfx/range/b2drange.hxx
index 7d7edb0..b8a51ae 100644
--- a/basegfx/inc/basegfx/range/b2drange.hxx
+++ b/basegfx/inc/basegfx/range/b2drange.hxx
@@ -292,6 +292,12 @@ namespace basegfx
 MyBasicRangemaRangeY;
 };
 
+/** Round double to nearest integer for 2D range
+
+@return the nearest integer for this range
+*/
+BASEGFX_DLLPUBLIC B2IRange fround(const B2DRange& rRange);
+
 /** Compute the set difference of the two given ranges
 
 This method calculates the symmetric difference (aka XOR)
diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx 
b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
index 558ab7e..ca04b7a 100644
--- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx
+++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
@@ -95,6 +95,9 @@ namespace unotools
  sal_Int32 nPointIndex,
  sal_Int32 nNumberOfPoints ) const;
 
+/// Get cow copy of internal polygon. not thread-safe outside this 
object.
+B2DPolyPolygon getPolyPolygonUnsafe() const;
+
 /// Called whenever internal polypolygon gets modified
 virtual void modifying() const {}
 
diff --git a/basegfx/source/range/b2drange.cxx 
b/basegfx/source/range/b2drange.cxx
index 5884b7e..2da38ce 100644
--- a/basegfx/source/range/b2drange.cxx
+++ b/basegfx/source/range/b2drange.cxx
@@ -60,6 +60,13 @@ namespace basegfx
 }
 }
 
+B2IRange fround(const B2DRange& rRange)
+{
+return rRange.isEmpty() ?
+B2IRange() :
+B2IRange(fround(rRange.getMinimum()),
+ fround(rRange.getMaximum()));
+}
 } // end of namespace basegfx
 
 // eof
diff --git a/basegfx/source/tools/unopolypolygon.cxx 
b/basegfx/source/tools/unopolypolygon.cxx
index 2ffaabd..80203c2 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -445,6 +445,11 @@ namespace unotools
 return aSubsetPoly;
 }
 
+B2DPolyPolygon UnoPolyPolygon::getPolyPolygonUnsafe() const
+{
+return maPolyPoly;
+}
+
 #define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon"
 #define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D"
 ::rtl::OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( 
uno::RuntimeException )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

2012-02-08 Thread Michael Stahl 
 sw/source/core/fields/reffld.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit cee3e301b4553095b70cf6abff15038b4aae8936
Author: Cédric Bosdonnat 
Date:   Wed Feb 8 14:06:09 2012 +0100

fdo#35669: Update the references even if nothing uses them here

Merge the references with the other document even if there is no field
using them as this may break the sequence and references in other parts
of a master document.
(cherry picked from commit 44f971506c0ed37928c48e55d8007f24b0c43a5f)

Signed-off-by: Michael Stahl 

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index eca22ba..ddf36b2 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1074,8 +1074,7 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, 
SwGetRefField& rFld,
 
 void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
 {
-if( &rDestDoc != pDoc &&
-rDestDoc.GetSysFldType( RES_GETREFFLD )->GetDepends() )
+if( &rDestDoc != pDoc )
 {
 // dann gibt es im DestDoc RefFelder, also muessen im SourceDoc
 // alle RefFelder auf einduetige Ids in beiden Docs umgestellt
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - fpicker/source

2012-02-08 Thread Petr Mladek 
 fpicker/source/unx/kde4/KDE4FilePicker.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 03ddc4da92ad715da54b8977013c4927f6bcd9a6
Author: Luboš Luňák 
Date:   Fri Jan 6 10:55:03 2012 +0100

workaround for LO namespace pollution breaking KDE4 fpicker build

Signed-off-by: Petr Mladek 

diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx 
b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index e2f43fd..4717c0c 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -56,7 +56,10 @@
 #define Region QtXRegion
 
 //kde has an enum that uses this...OO does too
+#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
 #undef SETTINGS_MOUSE
+#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
+#undef SETTINGS_LOCALE
 
 #include 
 #include 
@@ -70,6 +73,11 @@
 
 #undef Region
 
+#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
+#undef LO_SETTINGS_MOUSE
+#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
+#undef LO_SETTINGS_LOCALE
+
 using namespace ::com::sun::star;
 
 using namespace ::com::sun::star::ui::dialogs;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - connectivity/source l10ntools/inc l10ntools/source svtools/source svx/source

2012-02-08 Thread Stephan Bergmann 
 connectivity/source/resource/conn_log_res.src |1 
 l10ntools/inc/cfgmerge.hxx|   14 ++-
 l10ntools/inc/export.hxx  |9 --
 l10ntools/inc/gsicheck.hxx|8 -
 l10ntools/inc/lngmerge.hxx|   12 +-
 l10ntools/inc/xmlparse.hxx|7 -
 l10ntools/inc/xrmmerge.hxx|6 +
 l10ntools/source/cfgmerge.cxx |   45 +++---
 l10ntools/source/export.cxx   |   49 +++
 l10ntools/source/export2.cxx  |   97 --
 l10ntools/source/gsicheck.cxx |  112 +-
 l10ntools/source/helpmerge.cxx|   89 +++-
 l10ntools/source/lngmerge.cxx |   43 +
 l10ntools/source/localize.cxx |   31 +++
 l10ntools/source/merge.cxx|   22 +++--
 l10ntools/source/xmlparse.cxx |   48 +--
 l10ntools/source/xrmlex.l |2 
 l10ntools/source/xrmmerge.cxx |   54 +++-
 svtools/source/control/filectrl.src   |1 
 svtools/source/misc/undo.src  |1 
 svx/source/dialog/docrecovery.src |1 
 21 files changed, 224 insertions(+), 428 deletions(-)

New commits:
commit 344ebc80330cc4f6ff9858ab6d06735568b87bf9
Author: Stephan Bergmann 
Date:   Wed Feb 8 14:34:22 2012 +0100

Freed l10ntools from tools/stream.hxx

Removed completely cases of convoluted code to remove UTF-8 BOM from files
or translate line endings.  Hopefully none of this was actually necessary
(on Windows?).

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index bd0627e..6c82cc3 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -29,9 +29,13 @@
 #ifndef _CFG_MERGE_HXX
 #define _CFG_MERGE_HXX
 
-#include 
+#include "sal/config.h"
+
+#include 
 #include 
 
+#include "boost/unordered_map.hpp"
+
 typedef boost::unordered_map 
OStringHashMap;
 
 
@@ -68,7 +72,7 @@ public:
 // class CfgStack
 //
 
-typedef ::std::vector< CfgStackData* > CfgStackList;
+typedef std::vector< CfgStackData* > CfgStackList;
 
 class CfgStack
 {
@@ -89,9 +93,9 @@ public:
 return temp;
 }
 
-CfgStackData *GetStackData( size_t nPos = LIST_APPEND );
+CfgStackData *GetStackData();
 
-rtl::OString GetAccessPath( size_t nPos = LIST_APPEND );
+rtl::OString GetAccessPath( size_t nPos );
 
 size_t size() const { return maList.size(); }
 };
@@ -148,7 +152,7 @@ public:
 class CfgOutputParser : public CfgParser
 {
 protected:
-SvFileStream *pOutputStream;
+std::ofstream pOutputStream;
 public:
 CfgOutputParser(const rtl::OString &rOutputFile);
 virtual ~CfgOutputParser();
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index ba086b5..52efd99 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -31,6 +31,8 @@
 
 #include "sal/config.h"
 
+#include 
+
 #include 
 
 #ifndef L10NTOOLS_DIRECTORY_HXX
@@ -38,7 +40,6 @@
 #include 
 #endif
 
-#include 
 #include 
 #include 
 #include 
@@ -263,7 +264,7 @@ class Export
 private:
 WordTransformer *pWordTransformer;
 
-SvFileStream aOutput;
+std::ofstream aOutput;
 
 ResStack aResStack; // stack for parsing recursive
 
@@ -304,8 +305,6 @@ public:
 static void SetLanguages( std::vector val );
 static void RemoveUTF8ByteOrderMarker( rtl::OString &rString );
 static bool hasUTF8ByteOrderMarker( const rtl::OString &rString );
-static void RemoveUTF8ByteOrderMarkerFromFile(const rtl::OString 
&rFilename);
-static bool fileHasUTF8ByteOrderMarker(const rtl::OString &rString);
 static rtl::OString QuoteHTML( rtl::OString const &rString );
 static bool CopyFile(const rtl::OString& rSource , const rtl::OString& 
rDest);
 
@@ -321,7 +320,6 @@ public:
 static void getCurrentDir( std::string& dir );
 
 static rtl::OString GetTimeStamp();
-static sal_Bool ConvertLineEnds( rtl::OString const & sSource, 
rtl::OString const & sDestination );
 static rtl::OString GetNativeFile( rtl::OString const & sSource );
 static DirEntry GetTempFile();
 
@@ -461,7 +459,6 @@ class MergeDataFile
 private:
 sal_Bool bErrorLog;
 rtl::OString sErrorLog;
-SvFileStream aErrLog;
 MergeDataHashMap aMap;
 std::set aLanguageSet;
 
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index eaab600..46b3709 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -92,7 +92,7 @@ public:
 
 typedef ::std::vector< GSILine* > GSIBlock_Impl;
 
-class LazySvFileStream;
+class LazyStream;
 
 class GSIBlock
 {
@@ -122,9 +122,9 @@ public:
 void SetReferenceLine( GSILine* pLine );
 sal_Bool CheckSyntax( sal_uLong nLine, sal_Bool bRequireSourceLine, 
sal_Bool bFixTags );
 
-void WriteError( LazySvFileS

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source

2012-02-08 Thread Michael Stahl 
 sc/source/filter/xml/xmlstyli.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 4078a190d3b957577bc1d96c895dcdc19f4ed263
Author: Eike Rathke 
Date:   Thu Jan 26 14:03:13 2012 +0100

resolved fdo#38595 border width lost in ODF import

backported 34315e7ec4062f9521cd19951b5f7f6ad9ce0d2e

Signed-off-by: Michael Stahl 

diff --git a/sc/source/filter/xml/xmlstyli.cxx 
b/sc/source/filter/xml/xmlstyli.cxx
index f4b7d6b..08a867f 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -173,12 +173,14 @@ void 
ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
 pBorders[i]->maValue >>= aBorderLine;
 if( pBorderWidths[i] )
 {
+// Merge style:border-line-width values to fo:border values. Do
+// not override fo:border line width or line style with an
+// empty value!
 table::BorderLine2 aBorderLineWidth;
 pBorderWidths[i]->maValue >>= aBorderLineWidth;
 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
 pBorders[i]->maValue <<= aBorderLine;
 }
 }
@@ -197,7 +199,6 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< 
XMLPropertyState >&
 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
 pDiagBorders[i]->maValue <<= aBorderLine;
 if (pDiagBorderWidths[i])
 pDiagBorderWidths[i]->mnIndex = -1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-02-08 Thread Cédric Bosdonnat 
 sw/source/core/fields/reffld.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 44f971506c0ed37928c48e55d8007f24b0c43a5f
Author: Cédric Bosdonnat 
Date:   Wed Feb 8 14:06:09 2012 +0100

fdo#35669: Update the references even if nothing uses them here

Merge the references with the other document even if there is no field
using them as this may break the sequence and references in other parts
of a master document.

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 05c3eda..b01471a 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1074,8 +1074,7 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, 
SwGetRefField& rFld,
 
 void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
 {
-if( &rDestDoc != pDoc &&
-rDestDoc.GetSysFldType( RES_GETREFFLD )->GetDepends() )
+if( &rDestDoc != pDoc )
 {
 // dann gibt es im DestDoc RefFelder, also muessen im SourceDoc
 // alle RefFelder auf einduetige Ids in beiden Docs umgestellt
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - wizards/source

2012-02-08 Thread Caolán McNamara 
 wizards/source/importwizard/Main.xba |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 13ba00aa224ed4fdf6b2acbda865a2d07a548369
Author: Caolán McNamara 
Date:   Wed Feb 8 12:38:10 2012 +

Resolves: fdo#43644 survive registered but unavailable binfilter
(cherry picked from commit f3e40273b699910108007faf8a7991fe0498ad97)

Signed-off-by: Caolán McNamara 

diff --git a/wizards/source/importwizard/Main.xba 
b/wizards/source/importwizard/Main.xba
index 8084fda..7385c6b 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -44,7 +44,7 @@ Sub Main()
ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)  
ImportDialog.cmdGoOn.DefaultButton = True
ImportDialogArea.GetControl("optMSDocuments").SetFocus()
-   oBinFilterComp = createUnoService( 
"com.sun.star.comp.office.BF_MigrateFilter" )
+   oBinFilterComp = createBF_MigrateFilterIfPossible()
ToggleCheckboxesWithBoolean(True)
 
RetValue = ImportDialogArea.Execute()
@@ -186,6 +186,17 @@ Dim i as Integer
 End Sub
 
 
+Function createBF_MigrateFilterIfPossible()
+Dim oService
+On Error Goto RTError
+oService = 
createUnoService("com.sun.star.comp.office.BF_MigrateFilter")
+getBinFilterCompIfItExists = oService
+Exit Function
+RTError:
+createBF_MigrateFilterIfPossible = Nothing
+End Function
+
+
 Function CheckInstalledModule(Index as Integer) as Boolean
 Dim ModuleName as String
 Dim NameList() as String
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: wizards/source

2012-02-08 Thread Caolán McNamara 
 wizards/source/importwizard/Main.xba |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit f3e40273b699910108007faf8a7991fe0498ad97
Author: Caolán McNamara 
Date:   Wed Feb 8 12:38:10 2012 +

Resolves: fdo#43644 survive registered but unavailable binfilter

diff --git a/wizards/source/importwizard/Main.xba 
b/wizards/source/importwizard/Main.xba
index 8084fda..7385c6b 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -44,7 +44,7 @@ Sub Main()
ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)  
ImportDialog.cmdGoOn.DefaultButton = True
ImportDialogArea.GetControl("optMSDocuments").SetFocus()
-   oBinFilterComp = createUnoService( 
"com.sun.star.comp.office.BF_MigrateFilter" )
+   oBinFilterComp = createBF_MigrateFilterIfPossible()
ToggleCheckboxesWithBoolean(True)
 
RetValue = ImportDialogArea.Execute()
@@ -186,6 +186,17 @@ Dim i as Integer
 End Sub
 
 
+Function createBF_MigrateFilterIfPossible()
+Dim oService
+On Error Goto RTError
+oService = 
createUnoService("com.sun.star.comp.office.BF_MigrateFilter")
+getBinFilterCompIfItExists = oService
+Exit Function
+RTError:
+createBF_MigrateFilterIfPossible = Nothing
+End Function
+
+
 Function CheckInstalledModule(Index as Integer) as Boolean
 Dim ModuleName as String
 Dim NameList() as String
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

2012-02-08 Thread Lionel Elie Mamane 
 dbaccess/source/core/api/RowSetCache.cxx |  160 ---
 1 file changed, 87 insertions(+), 73 deletions(-)

New commits:
commit 37b5dce665a03d3404e6a710b82bef16d740d178
Author: Lionel Elie Mamane 
Date:   Wed Feb 8 12:41:54 2012 +0100

ORowSetCache: handle case total data < m_nFetchSize

As a drive-by: fillMatrix update m_nEndSize

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index acd2908..df833a2 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -762,15 +762,18 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& 
_nNewStartPos, sal_Int32 &_nNewEndP
 ORowSetMatrix::iterator aIter;
 sal_Int32 i;
 sal_Bool bCheck;
+sal_Int32 requestedStartPos;
 if ( _nNewStartPos == -1 )
 {
 aIter = m_pMatrix->begin() + (m_nEndPos - m_nStartPos);
 i = m_nEndPos + 1;
+requestedStartPos = m_nStartPos;
 }
 else
 {
 aIter = m_pMatrix->begin();
 i = _nNewStartPos + 1;
+requestedStartPos = _nNewStartPos;
 }
 bCheck = m_pCacheSet->absolute(i);
 
@@ -804,17 +807,17 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& 
_nNewStartPos, sal_Int32 &_nNewEndP
 else
 {
 nPos = 0;
-_nNewEndPos = m_nRowCount;
 }
 _nNewStartPos = nPos;
+_nNewEndPos = m_nRowCount;
 ++nPos;
 bCheck = m_pCacheSet->absolute(nPos);
 
-for(;bCheck && nPos <= m_nStartPos && aIter != aRealEnd; ++aIter)
+for(;bCheck && nPos <= requestedStartPos && aIter != aRealEnd; 
++aIter, ++nPos)
 {
 if(!aIter->is())
 *aIter = new 
ORowSetValueVector(m_xMetaData->getColumnCount());
-m_pCacheSet->fillValueRow(*aIter,nPos++);
+m_pCacheSet->fillValueRow(*aIter, nPos);
 bCheck = m_pCacheSet->next();
 }
 if(aIter != aEnd)
@@ -845,6 +848,9 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, 
sal_Int32 &_nNewEndP
 // Caller is responsible for updating m_aMatrixIter
 sal_Bool ORowSetCache::moveWindow()
 {
+OSL_ENSURE(m_nStartPos >= 0,"ORowSetCache::moveWindow: m_nStartPos is less 
than 0!");
+OSL_ENSURE(m_nEndPos > m_nStartPos,"ORowSetCache::moveWindow: m_nStartPos 
not smaller than m_nEndPos");
+OSL_ENSURE(m_nEndPos-m_nStartPos <= 
m_nFetchSize,"ORowSetCache::moveWindow: m_nStartPos and m_nEndPos too far 
apart");
 
 if ( m_nStartPos < m_nPosition && m_nPosition <= m_nEndPos )
 {
@@ -885,11 +891,16 @@ sal_Bool ORowSetCache::moveWindow()
 sal_Int32 nNewStartPos  = (m_nPosition - nDiff) - 1; //m_nPosition is 
1-based, but m_nStartPos is 0-based
 sal_Int32 nNewEndPos= nNewStartPos + m_nFetchSize;
 
-if ( nNewStartPos <= m_nStartPos )
-{   // the new window starts behind the old start pos
-if(!m_nStartPos)
-// Can't go any lower than that
-return sal_True;
+if ( nNewStartPos < 0 )
+{
+// The computed new window crashes through the floor (begins before 
first row);
+// nNew*Pos has to be shifted by -nNewStartPos
+nNewEndPos -= nNewStartPos;
+nNewStartPos = 0;
+}
+
+if ( nNewStartPos < m_nStartPos )
+{   // need to fill data *before* m_nStartPos
 if ( nNewEndPos > m_nStartPos )
 {   // The two regions are overlapping.
 // We'll first rotate the contents of m_pMatrix so that the 
overlap area
@@ -897,40 +908,41 @@ sal_Bool ORowSetCache::moveWindow()
 // it has to go to the end.
 // then we fill in the rows between new and old start pos.
 
-sal_Bool bCheck = sal_True;
-if ( nNewStartPos < 0 )
-{
-// The computed new window crashes through the floor (begins 
before first row);
-// nNew*Pos has to be shifted by -nNewStartPos
-nNewEndPos -= nNewStartPos;
-nNewStartPos = 0;
-bCheck = m_pCacheSet->first();
-}
-else
-{
-bCheck = m_pCacheSet->absolute(nNewStartPos);
-}
-const sal_Int32 nOverlapSize = nNewEndPos - m_nStartPos;
+sal_Bool bCheck;
+bCheck = m_pCacheSet->absolute(nNewStartPos);
+
+// m_nEndPos < nNewEndPos when window not filled (e.g. there are 
less rows in total than window size)
+m_nEndPos = std::min(nNewEndPos, m_nEndPos);
+const sal_Int32 nOverlapSize = m_nEndPos - m_nStartPos;
+const sal_Int32 nStartPosOffset = nNewStartPos - m_nStartPos; // 
by how much m_nStartPos moves
+m_nStartPos = nNewStartPos;
 OSL_ENSURE( static_cast(nOverlapSize) <= 
m_pMatrix->size(), "new window end is after end of cache matrix!" );
-// the first posi

[Libreoffice-commits] .: bin/README

2012-02-08 Thread Tor Lillqvist 
 bin/README |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 809fd00863026cdff4bf2de7d02956d39e867eeb
Author: Tor Lillqvist 
Date:   Wed Feb 8 14:07:36 2012 +0200

Surely these are mostly *not* used during the build

diff --git a/bin/README b/bin/README
index 72dbdcd..688d758 100644
--- a/bin/README
+++ b/bin/README
@@ -1,6 +1,6 @@
-Tools and scripts used during the build
+Tools and scripts mostly not used during the build
 
-This direction has a number of key pieces that are used during the
+This direction has a number of key pieces (?) that are used during the
 build, or are simply generally useful. One example is
 
 bin/find-german-comments 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bin/README distro-configs/README icon-themes/README icon-themes/README.txt rsc/README scaddins/README

2012-02-08 Thread Michael Meeks 
 bin/README |9 ++
 distro-configs/README  |   14 ++
 icon-themes/README |   66 +
 icon-themes/README.txt |   45 -
 rsc/README |   38 ++--
 scaddins/README|4 ++
 6 files changed, 123 insertions(+), 53 deletions(-)

New commits:
commit 1f63bd653cad40ec1d6aa111cc66959a93d120ce
Author: Michael Meeks 
Date:   Wed Feb 8 11:17:22 2012 +

Add and expand more readme files for module documentation

diff --git a/bin/README b/bin/README
new file mode 100644
index 000..72dbdcd
--- /dev/null
+++ b/bin/README
@@ -0,0 +1,9 @@
+Tools and scripts used during the build
+
+This direction has a number of key pieces that are used during the
+build, or are simply generally useful. One example is
+
+bin/find-german-comments 
+
+which will try to detect and extract all the German comments in a
+given source code hireachy / directory.
\ No newline at end of file
diff --git a/distro-configs/README b/distro-configs/README
new file mode 100644
index 000..f22328f
--- /dev/null
+++ b/distro-configs/README
@@ -0,0 +1,14 @@
+Pre-canned distribution / platform configurations
+
+When the software is configured for a platform, since we run on so
+many platforms, detecting the best sequence of configure options to
+get it building is hard.
+
+Instead we have a text file containing the recommended (often the
+distributed) version of these parameters, one per distribution or
+significant platform. These are interpreted by autogen.sh and
+eventually end up passed to configure. Thus:
+
+./autogen.sh --with-distro=LibreOfficeAndroid
+
+might build a version tweaked for Android.
diff --git a/icon-themes/README b/icon-themes/README
new file mode 100644
index 000..7655710
--- /dev/null
+++ b/icon-themes/README
@@ -0,0 +1,66 @@
+Icon repository for the applications
+
+All of the icons, separated by themes are included in this
+directory. These icons are built into .zip files, and re-ordered /
+packed for efficiency reasons based on our UI configuration by the
+packimages/ module.
+
+An icon theme does not need to contain all images, since these can be
+layered one on top of another.
+
+In general the layering is done like this:
+
+
+tango
+industrial
+galaxy
+
+The classic theme is left primarily for historical interest, rather
+than intended to be packaged.
+
+
+How to add a new image set:
+---
+
+- Create a directory for it here (let's call it e.g. new_set)
+
+- Add its images_ name to CUSTOM_IMAGE_SETS in
+  postprocess/packimages/pack/makefile.mk
+
+- Add its gid to the Files section of gid_Module_Root_Brand in
+  scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File entry
+  to scp2/source/ooo/file_ooo.scp (see for example
+  gid_Brand_File_ImagesCrystal_Zip)
+
+- Add a vcl constant for it in vcl/inc/settings.hxx, e.g.
+  #define STYLE_SYMBOLS_NEW_SET ((ULONG)5)
+
+- Map the vcl constant to its real name in
+::rtl::OUString StyleSettings::GetCurrentSymbolsStyleName() const
+  and 
+ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName 
) const
+  both in vcl/source/app/settings.cxx, e.g.
+case STYLE_SYMBOLS_NEW_SET: return ::rtl::OUString::createFromAscii( 
"new_set" );
+  and 
+else if ( rName == ::rtl::OUString::createFromAscii( "new_set" ) )
+   return STYLE_SYMBOLS_NEW_SET;
+
+- Add localized item names to 'ListBox LB_ICONSTYLE' to
+'StringList [ de ]'
+  and 'StringList [ en-US ]', e.g.
+< "New set" ; > ;
+  both in cui/source/options/optgdlg.src
+
+- Add all known localizations of the new item to 
svx/source/dialog/localize.sdf, e.g.
+svxsource\dialog\optgdlg.src   0   stringlist  
OFA_TP_VIEW.LB_ICONSTYLE6   0   cs  New set 
2002-02-02 02:02:02
+  the check box item will not be visible in the other localizations otherwise, 
see http://www.openoffice.org/issues/show_bug.cgi?id=74982
+
+- Add the new_set to 'SymbolsStyle' property
+  in officecfg/registry/schema/org/openoffice/Office/Common.xcs.
+
+- The default theme for various desktops (KDE, GNOME, ...) is defined in
+ULONG StyleSettings::GetCurrentSymbolsStyle() const in
+  vcl/source/app/settings.cxx
+
+- The fallback for particular icons is defined in
+postprocess/packimages/pack/makefile.mk
diff --git a/icon-themes/README.txt b/icon-themes/README.txt
deleted file mode 100644
index e6514d8..000
--- a/icon-themes/README.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-How to add a new image set:

-
-- Create a directory for it here (let's call it e.g. new_set)
-
-- Add its images_ name to CUSTOM_IMAGE_SETS in
-  postprocess/packimages/pack/makefile.mk
-
-- Add its gid to the Files section of gid_Module_Root_Brand in
-  scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File entry
-  to scp2/source/ooo/file_

[Libreoffice-commits] .: 3 commits - basic/source dbaccess/source l10ntools/source Makefile sax/inc sax/source sc/source sdext/source svl/inc svl/source svx/inc svx/source toolkit/source unotools/inc

2012-02-08 Thread Caolán McNamara 
 Makefile   |7 +++
 basic/source/comp/exprtree.cxx |   35 --
 basic/source/inc/expr.hxx  |2 -
 dbaccess/source/ui/app/AppView.hxx |2 -
 dbaccess/source/ui/control/FieldDescControl.cxx|   14 ---
 dbaccess/source/ui/inc/FieldDescControl.hxx|2 -
 dbaccess/source/ui/inc/TableDesignView.hxx |2 -
 dbaccess/source/ui/tabledesign/TEditControl.cxx|   13 --
 dbaccess/source/ui/tabledesign/TEditControl.hxx|2 -
 dbaccess/source/ui/tabledesign/TableDesignView.cxx |   23 
 l10ntools/source/cfgmerge.cxx  |3 -
 sax/inc/sax/tools/converter.hxx|2 -
 sax/source/tools/converter.cxx |   16 
 sc/source/filter/excel/xltools.cxx |7 ---
 sc/source/filter/inc/xltools.hxx   |3 -
 sdext/source/minimizer/unodialog.cxx   |   23 
 sdext/source/minimizer/unodialog.hxx   |2 -
 svl/inc/svl/style.hxx  |2 -
 svl/source/items/style.cxx |4 --
 svx/inc/svx/svdobj.hxx |1 
 svx/source/svdraw/svdobj.cxx   |5 --
 toolkit/source/helper/registerservices.cxx |9 
 unotools/inc/unotools/configvaluecontainer.hxx |4 --
 unotools/source/config/configvaluecontainer.cxx|5 --
 unusedcode.easy|   40 +++--
 xmloff/source/text/XMLTextFrameContext.cxx |   11 -
 xmloff/source/text/XMLTextFrameContext.hxx |1 
 xmlsecurity/source/dialogs/resourcemanager.cxx |   20 --
 xmlsecurity/source/dialogs/resourcemanager.hxx |1 
 29 files changed, 37 insertions(+), 224 deletions(-)

New commits:
commit 849a2471bd649b252648fa4e43be91dab4d9bdc5
Author: Caolán McNamara 
Date:   Wed Feb 8 09:12:05 2012 +

update unused list

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 39c629e..fabb700 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -754,24 +754,6 @@ SbiExprNode* SbiExpression::VBA_Or()
 return pNd;
 }
 
-SbiExprNode* SbiExpression::VBA_Xor()
-{
-SbiExprNode* pNd = VBA_Or();
-if( m_eMode != EXPRMODE_EMPTY_PAREN )
-{
-for( ;; )
-{
-SbiToken eTok = pParser->Peek();
-if( eTok != XOR )
-break;
-eTok = pParser->Next();
-pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Or() );
-}
-}
-return pNd;
-
-}
-
 SbiExprNode* SbiExpression::Like()
 {
 SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Not() : Comp();
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 4be12f1..33ee938 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -191,7 +191,6 @@ protected:
 SbiExprNode* VBA_Not();
 SbiExprNode* VBA_And();
 SbiExprNode* VBA_Or();
-SbiExprNode* VBA_Xor();
 SbiExprNode* Comp();
 SbiExprNode* Boolean();
 public:
diff --git a/dbaccess/source/ui/app/AppView.hxx 
b/dbaccess/source/ui/app/AppView.hxx
index d4fa76c..23c4501 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -307,8 +307,6 @@ namespace dbaui
 sal_Bool _bTable);
 
 SvLBoxEntry* getEntry( const Point& _aPosPixel ) const;
-
-DECL_LINK( SwitchHdl, Accelerator* );
 };
 }
 #endif // DBAUI_APPVIEW_HXX
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx 
b/dbaccess/source/ui/control/FieldDescControl.cxx
index c100d9d..30a0bad 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -161,7 +161,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, 
const ResId& rResId, OTab
 ,m_nOldVThumb( 0 )
 ,m_nOldHThumb( 0 )
 ,m_nWidth(50)
-,nDelayedGrabFocusEvent(0)
 ,m_bAdded(sal_False)
 ,m_bRightAligned(false)
 ,pActFieldDescr(NULL)
@@ -211,7 +210,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, 
OTableDesignHelpBar* pHel
 ,m_nOldVThumb( 0 )
 ,m_nOldHThumb( 0 )
 ,m_nWidth(50)
-,nDelayedGrabFocusEvent(0)
 ,m_bAdded(sal_False)
 ,m_bRightAligned(false)
 ,pActFieldDescr(NULL)
@@ -275,9 +273,6 @@ OFieldDescControl::~OFieldDescControl()
 DeactivateAggregate( tpColumnName );
 DeactivateAggregate( tpType );
 DeactivateAggregate( tpAutoIncrementValue );
-
-if(nDelayedGrabFocusEvent)
-Application::RemoveUserEvent(nDelayedGrabFocusEvent);
 }
 
 
//--
@@ -1560,15 +1555,6 @@ void OFieldDescControl::DisplayData(OFieldDescription* 
pFieldDescr )
 
 SetReadOnly( bRead );
 }
-//-

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/Library_rtftok.mk writerfilter/source

2012-02-08 Thread Cédric Bosdonnat 
 writerfilter/Library_rtftok.mk |1 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   25 -
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |7 +++
 3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 68e458cef973fcf568b8efa5614ee978e8ea9d55
Author: Miklos Vajna 
Date:   Tue Feb 7 16:56:27 2012 +0100

n#192129 fix RTF import of PNG images with bogus width/height

For example Apache FOP generates RTF output where the \picw and \pich
values are even negative, SvxRTFParser::ReadBmpData() used the same
trick to solve the issue.

Signed-off-by: Cédric Bosdonnat 

diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index 3835a5d..1afdd27 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,rtftok,\
cppuhelper \
oox \
sal \
+   svt \
ucbhelper \
utl \
tl \
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a96d821..e87e880 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -41,6 +41,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
 #include  // NS_sprm namespace
 #include  // NS_rtf namespace
@@ -584,6 +588,20 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 aExtHeader.yExt = m_aStates.top().aPicture.nHeight;
 OUString aGraphicUrl = m_pGraphicHelper->importGraphicObject(xInputStream, 
&aExtHeader);
 
+if (m_aStates.top().aPicture.nStyle == BMPSTYLE_PNG)
+{
+// In case of PNG, the real size is known, don't use the values
+// provided by picw and pich.
+OString aURLBS(OUStringToOString(aGraphicUrl, RTL_TEXTENCODING_UTF8));
+const char aURLBegin[] = "vnd.sun.star.GraphicObject:";
+Graphic aGraphic = 
GraphicObject(aURLBS.copy(RTL_CONSTASCII_LENGTH(aURLBegin))).GetTransformedGraphic();
+Size aSize(aGraphic.GetPrefSize());
+MapMode aMap(MAP_100TH_MM);
+aSize = Application::GetDefaultDevice()->PixelToLogic( aSize, aMap );
+m_aStates.top().aPicture.nWidth = aSize.Width();
+m_aStates.top().aPicture.nHeight = aSize.Height();
+}
+
 // Wrap it in an XShape.
 uno::Reference xShape;
 OUString 
aService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape"));
@@ -1910,6 +1928,9 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_FORMSHADE:
 // Noop, this is the default in Writer.
 break;
+case RTF_PNGBLIP:
+m_aStates.top().aPicture.nStyle = BMPSTYLE_PNG;
+break;
 case RTF_POSYT: m_aStates.top().aFrame.nVertAlign = 
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_top; break;
 case RTF_POSYB: m_aStates.top().aFrame.nVertAlign = 
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom; break;
 case RTF_POSYC: m_aStates.top().aFrame.nVertAlign = 
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center; break;
@@ -1929,6 +1950,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_POSXO: m_aStates.top().aFrame.nHoriAlign = 
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_outside; break;
 case RTF_POSXL: m_aStates.top().aFrame.nHoriAlign = 
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_left; break;
 case RTF_POSXR: m_aStates.top().aFrame.nHoriAlign = 
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_right; break;
+
 default:
 #if OSL_DEBUG_LEVEL > 1
 OSL_TRACE("%s: TODO handle flag '%s'", OSL_THIS_FUNC, 
lcl_RtfToString(nKeyword));
@@ -3313,7 +3335,8 @@ RTFPicture::RTFPicture()
 nCropB(0),
 nCropL(0),
 nCropR(0),
-eWMetafile(0)
+eWMetafile(0),
+nStyle(BMPSTYLE_NONE)
 {
 }
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 12d414c..90ecc98 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -150,6 +150,12 @@ namespace writerfilter {
 FORMFIELD_LIST
 };
 
+enum RTFBmpStyles
+{
+BMPSTYLE_NONE,
+BMPSTYLE_PNG
+};
+
 /// A buffer storing dmapper calls.
 typedef std::deque< std::pair > 
RTFBuffer_t;
 
@@ -184,6 +190,7 @@ namespace writerfilter {
 sal_uInt16 nScaleX, nScaleY;
 short nCropT, nCropB, nCropL, nCropR;
 sal_uInt16 eWMetafile;
+RTFBmpStyles nStyle;
 };
 
 /// Stores the properties of a frame
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits