date:20130225

On Sat, Feb 23, 2013 at 09:39:58PM +, Peter Foley (via Code Review) 
ger...@gerrit.libreoffice.org wrote:
 Thank you for your patch!  It has been merged to LibreOffice.
 
 If you are interested in details, please visit
 
 https://gerrit.libreoffice.org/2288

This patch just caused this here:


[build PKG] l10ntools_inc
[build UPK] 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
[build UPK] f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip
[build UPK] 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
[build UPK] 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
[build UPK] 0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz
[build UPK] e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
[build UPK] 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz
[build UPK] c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz
[build UPK] 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz
[build UPK] 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz
[build UPK] ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
[build MOD] nss
[build UNZ] CustomTarget/odk/odkcommon/java_src/juh_src.done
[build UNZ] CustomTarget/odk/odkcommon/java_src/jurt_src.done
[build ZIP] ridl_src
[build ZIP] unoloader_src
checkdir error:  cannot create 
/home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/com
 File exists
 unable to process 
com/sun/star/comp/bridgefactory/BridgeFactory.java.
checkdir error:  cannot create 
/home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/com/sun/star
 File exists
 unable to process com/sun/star/comp/connections/Acceptor.java.
checkdir error:  cannot create 
/home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/com/sun/star/comp
 File exists
 unable to process com/sun/star/comp/connections/Connector.java.
[build CPY] CustomTarget/odk/odkcommon/settings/settings.mk
make[1]: *** 
[/home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/jurt_src.done]
 Error 2
make[1]: *** Waiting for unfinished jobs


This was a clean build:

git pull -r  ./autogen.sh  make clean  make

Let me know if I should share a full log. (I could work it around by
using 'make odk.clean  make odk.all  make'.)


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa writerfilter/inc writerfilter/source

2013-02-25 Thread Cédric Bosdonnat

 sw/qa/extras/ooxmlimport/data/n779642.docx|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   11 ++-
 writerfilter/inc/resourcemodel/TableManager.hxx   |   14 ++
 writerfilter/source/dmapper/DomainMapper.cxx  |3 +--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 +++-
 5 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit f0cc8071aa5e9c058f6bf1a1144d84c5252987a7
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Mon Feb 18 17:34:06 2013 +0100

n#779642: ignore framePr inside table or the table import won't work

(cherry picked from commit 874f0a1be443b8027d5aba2285866f31cf4169e5)

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I72996da79ca22a09fb490d06bcd34f741d7093ac
Reviewed-on: https://gerrit.libreoffice.org/2306
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/qa/extras/ooxmlimport/data/n779642.docx 
b/sw/qa/extras/ooxmlimport/data/n779642.docx
new file mode 100644
index 000..2fe9a17
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n779642.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 11fcd11..bb5e4e7 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -110,6 +110,7 @@ public:
 void testN773061();
 void testN780645();
 void testFineTableDash();
+void testN779642();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -171,7 +172,8 @@ void Test::run()
 {n785767.docx, Test::testN785767},
 {n773061.docx, Test::testN773061},
 {n780645.docx, Test::testN780645},
-{tableborder-finedash.docx, Test::testFineTableDash}
+{tableborder-finedash.docx, Test::testFineTableDash},
+{n779642.docx, Test::testN779642},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1061,6 +1063,13 @@ void Test::testFineTableDash()
 CPPUNIT_ASSERT_EQUAL(aBorder.RightLine.LineStyle, 
table::BorderLineStyle::FINE_DASHED);
 }
 
+void Test::testN779642()
+{
+uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables-getCount());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx 
b/writerfilter/inc/resourcemodel/TableManager.hxx
index b6555cc..a8ee39b 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -521,6 +521,11 @@ public:
 virtual void endLevel();
 
 /**
+   Tells whether a table has been started or not
+  */
+bool isInTable();
+
+/**
Handle the start of a paragraph group.
  */
 virtual void startParagraphGroup();
@@ -693,6 +698,15 @@ void TableManagerT, PropertiesPointer::handle(const T  
rHandle)
 }
 
 template typename T, typename PropertiesPointer
+bool TableManagerT, PropertiesPointer::isInTable()
+{
+bool bInTable = false;
+if ( !mTableDataStack.empty() )
+bInTable = mTableDataStack.top()-getDepth()  0;
+return bInTable;
+}
+
+template typename T, typename PropertiesPointer
 void TableManagerT, PropertiesPointer::startLevel()
 {
 #ifdef DEBUG_TABLE
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5ae8e13..8e74201 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2905,7 +2905,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 }
 break;
 case NS_ooxml::LN_CT_PPrBase_framePr:
-// Avoid frames if we're inside a structured document tag, would just 
cause outher tables fail to create.
+// Avoid frames if we're inside a structured document tag, would just 
cause outer tables fail to create.
 if (!m_pImpl-GetSdt())
 {
 PropertyMapPtr pContext = 
m_pImpl-GetTopContextOfType(CONTEXT_PARAGRAPH);
@@ -2913,7 +2913,6 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 {
 ParagraphPropertyMap* pParaContext = dynamic_cast 
ParagraphPropertyMap* ( pContext.get() );
 pParaContext-SetFrameMode();
-
 }
 else
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 88b4e42..a3cc27c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -727,7 +727,9 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
 {
 PropertyNameSupplier rPropNameSupplier =

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa sw/source writerfilter/source

2013-02-25 Thread Cédric Bosdonnat

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   17 ++
 sw/source/core/unocore/unotext.cxx   |9 +
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   46 -
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |9 -
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |4 
 writerfilter/source/dmapper/TablePositionHandler.cxx |  117 ++-
 writerfilter/source/dmapper/TablePositionHandler.hxx |   14 +
 writerfilter/source/ooxml/model.xml  |9 -
 8 files changed, 167 insertions(+), 58 deletions(-)

New commits:
commit fd155af5369e3ec782c768f54781658d210e375c
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Feb 20 11:04:16 2013 +0100

n#779642: Fixed floating tables import in writerfilter

(cherry picked from commit d0cde9640b52ccfbb28ed1f65bba0927afd7b69b)

Change-Id: Id60a08811f238db505d51b0e1381427a8f5df9cf
Reviewed-on: https://gerrit.libreoffice.org/2307
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index bb5e4e7..69dc0cb 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1066,8 +1066,23 @@ void Test::testFineTableDash()
 void Test::testN779642()
 {
 uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+
+// First problem: check that we have 2 tables, nesting caused the
+// creation of outer one to fail
 uno::Referencecontainer::XIndexAccess 
xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables-getCount());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong number of imported tables, 
sal_Int32(2), xTables-getCount());
+
+// Second problem: check that the outer table is in a frame, at the bottom 
of the page
+uno::Referencetext::XTextTable 
xTextTable(xTextTablesSupplier-getTextTables()-getByName(Table2), 
uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xAnchor(xTextTable-getAnchor(), 
uno::UNO_QUERY);
+uno::Any aFrame = xAnchor-getPropertyValue(TextFrame);
+uno::Referencebeans::XPropertySet xFrame;
+aFrame = xFrame;
+sal_Int16 nValue;
+xFrame-getPropertyValue(VertOrient) = nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong vertical orientation, nValue, 
text::VertOrientation::BOTTOM);
+xFrame-getPropertyValue(VertOrientRelation) = nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong vertical orientation relation, 
nValue, text::RelOrientation::PAGE_PRINT_AREA);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index ebc9de0..004e7af 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1623,7 +1623,14 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException)
 // remove the addtional paragraphs in the end
 if (pStartStartNode-GetStartNodeType() == SwTableBoxStartNode)
 {
-SwTableNode *const 
pStartTableNode(pStartStartNode-FindTableNode());
+SwTableNode * pStartTableNode(pStartStartNode-FindTableNode());
+// Is it the same table start node than the end?
+SwTableNode *const 
pEndStartTableNode(pEndStartNode-FindTableNode());
+while (pEndStartTableNode-GetIndex()  
pStartTableNode-GetIndex())
+{
+SwStartNode* pStartStartTableNode = 
pStartTableNode-StartOfSectionNode();
+pStartTableNode = pStartStartTableNode-FindTableNode();
+}
 const SwNodeIndex aTblIdx(  *pStartTableNode, -1 );
 SwPosition aBefore(aTblIdx);
 bParaBeforeInserted = GetDoc()-AppendTxtNode( aBefore );
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index b5c993b..3b81773 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -715,7 +715,8 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 uno::Referencetext::XTextRange xStart;
 uno::Referencetext::XTextRange xEnd;
 // If we want to make this table a floating one.
-bool bFloating = 
!m_rDMapper_Impl.getTableManager().getTableVertAnchor().isEmpty();
+uno::Sequencebeans::PropertyValue aFrameProperties = 
m_rDMapper_Impl.getTableManager().getTablePosition();
+bool bFloating = aFrameProperties.hasElements();
 // Additional checks: if we can do this.
 if (bFloating  (*m_pTableSeq)[0].getLength()  0  
(*m_pTableSeq)[0][0].getLength()  0)
 {
@@ -762,46 +763,11 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 if (xTable.is()  xStart.is()

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source

2013-02-25 Thread Cédric Bosdonnat

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |2 -
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   26 ---
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |6 ++-
 3 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 67b069cf42b990f47af0a2de4f9cb0bc5e44eeab
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Feb 21 10:27:31 2013 +0100

n#779642: table positions need to be stacked to handle nested table

(cherry picked from commit 36c64bc194714d60a5c18f63bcfc0f721c2056db)

Change-Id: I44d4f9b1547365ff1b909c15d996694d9c3c0cf4
Reviewed-on: https://gerrit.libreoffice.org/2308
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 3b81773..217c7f8 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -715,7 +715,7 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 uno::Referencetext::XTextRange xStart;
 uno::Referencetext::XTextRange xEnd;
 // If we want to make this table a floating one.
-uno::Sequencebeans::PropertyValue aFrameProperties = 
m_rDMapper_Impl.getTableManager().getTablePosition();
+uno::Sequencebeans::PropertyValue aFrameProperties = 
m_rDMapper_Impl.getTableManager().getCurrentTablePosition();
 bool bFloating = aFrameProperties.hasElements();
 // Additional checks: if we can do this.
 if (bFloating  (*m_pTableSeq)[0].getLength()  0  
(*m_pTableSeq)[0][0].getLength()  0)
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 80bd683..d81aea7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -24,7 +24,6 @@
 #include CellMarginHandler.hxx
 #include ConversionHelper.hxx
 #include MeasureHandler.hxx
-#include TablePositionHandler.hxx
 #include TDefTableHandler.hxx
 #include com/sun/star/text/HoriOrientation.hpp
 #include com/sun/star/text/SizeType.hpp
@@ -323,9 +322,14 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 writerfilter::ReferenceProperties::Pointer_t pProperties 
= rSprm.getProps();
 if (pProperties.get())
 {
-TablePositionHandlerPtr pHandler( new 
TablePositionHandler );
+TablePositionHandlerPtr pHandler = 
m_aTablePositions.back();
+if ( !pHandler )
+{
+m_aTablePositions.pop_back();
+pHandler.reset( new TablePositionHandler );
+m_aTablePositions.push_back( pHandler );
+}
 pProperties-resolve(*pHandler);
-m_aTablePosition = pHandler-getTablePosition();
 }
 }
 break;
@@ -361,6 +365,14 @@ boost::shared_ptr vector sal_Int32   
DomainMapperTableManager::getCurrentCel
 return m_aCellWidths.back( );
 }
 
+const uno::Sequencebeans::PropertyValue 
DomainMapperTableManager::getCurrentTablePosition( )
+{
+if ( !m_aTablePositions.empty( )  m_aTablePositions.back() )
+return m_aTablePositions.back( )-getTablePosition();
+else
+return uno::Sequence beans::PropertyValue ( 0 );
+}
+
 void DomainMapperTableManager::startLevel( )
 {
 DomainMapperTableManager_Base_t::startLevel( );
@@ -376,9 +388,11 @@ void DomainMapperTableManager::startLevel( )
 IntVectorPtr pNewGrid( new vectorsal_Int32 );
 IntVectorPtr pNewSpans( new vectorsal_Int32 );
 IntVectorPtr pNewCellWidths( new vectorsal_Int32 );
+TablePositionHandlerPtr pNewPositionHandler;
 m_aTableGrid.push_back( pNewGrid );
 m_aGridSpans.push_back( pNewSpans );
 m_aCellWidths.push_back( pNewCellWidths );
+m_aTablePositions.push_back( pNewPositionHandler );
 m_nCell.push_back( 0 );
 m_nTableWidth = 0;
 
@@ -395,6 +409,7 @@ void DomainMapperTableManager::endLevel( )
 m_nCell.pop_back( );
 m_nTableWidth = 0;
 
+
 DomainMapperTableManager_Base_t::endLevel( );
 #ifdef DEBUG_DOMAINMAPPER
 dmapper_logger-startElement(dmappertablemanager.endLevel);
@@ -404,6 +419,10 @@ void DomainMapperTableManager::endLevel( )
 
 dmapper_logger-endElement();
 #endif
+
+// Pop back the table position after endLevel as it's used
+// in the endTable method called in endLevel.
+m_aTablePositions.pop_back();
 }
 
 
@@ -577,7 +596,6 @@ void DomainMapperTableManager::clearData()
 m_nRow = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth = 0;
 m_sTableStyleName = OUString();

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - writerperfect/source

 writerperfect/source/filter/OdgGenerator.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 74e60b3a535b4e531c43d95dadacf716dc8aa0e0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Feb 19 16:44:51 2013 +0100

Allow specifying of page names

Allow specifying of page names
(cherry picked from commit bee8ed6772f420f9eefc57fee01da29ff466a8e9)

We need to escape special characters in slide names
(cherry picked from commit ea4581a914cb1aad29f16b73e35350f05f8adc1c)

Change-Id: I5f523642b980469afa46e1895cfd39aa08b9941d
Reviewed-on: https://gerrit.libreoffice.org/2333
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
(cherry picked from commit 4c0e53e6530c5590f7123f506a1a58bcbd04e13d)
Reviewed-on: https://gerrit.libreoffice.org/2337
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index 8661138..1caebdd 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -664,7 +664,10 @@ void OdgGenerator::startGraphics(const ::WPXPropertyList 
propList)
 TagOpenElement *pStylePageLayoutOpenElement = new 
TagOpenElement(style:page-layout);
 
 WPXString sValue;
-sValue.sprintf(page%i, mpImpl-miPageIndex);
+if (propList[draw:name])
+sValue = WPXString(propList[draw:name]-getStr(), true); // escape 
special xml characters
+else
+sValue.sprintf(page%i, mpImpl-miPageIndex);
 pDrawPageOpenElement-addAttribute(draw:name, sValue);
 #ifdef MULTIPAGE_WORKAROUND
 pStyleMasterPageOpenElement-addAttribute(style:page-layout-name, PM0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: src/lib

 src/lib/VSDContentCollector.cpp |   90 +++-
 1 file changed, 53 insertions(+), 37 deletions(-)

New commits:
commit b4a25befe6748808e2de5ec35b9b1d9169856bee
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Feb 25 10:33:18 2013 +0100

Improve the embedded binary dumping a bit

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 8901fa1..6b67ae0 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -36,7 +36,9 @@
 #include VSDParser.h
 #include VSDInternalStream.h
 
+#ifndef DUMP_BITMAP
 #define DUMP_BITMAP 0
+#endif
 
 #if DUMP_BITMAP
 static unsigned bitmapId = 0;
@@ -1122,43 +1124,6 @@ void 
libvisio::VSDContentCollector::_handleForeignData(const WPXBinaryData bina
 }
 m_currentForeignData.append(binaryData);
 
-#if DUMP_BITMAP
-if (m_foreignType == 1 || m_foreignType == 4)
-{
-  ::WPXString filename;
-  switch(m_foreignFormat)
-  {
-  case 0:
-  case 255:
-filename.sprintf(binarydump%i.bmp, bitmapId++);
-break;
-  case 1:
-filename.sprintf(binarydump%i.jpeg, bitmapId++);
-break;
-  case 2:
-filename.sprintf(binarydump%i.gif, bitmapId++);
-break;
-  case 3:
-filename.sprintf(binarydump%i.tiff, bitmapId++);
-break;
-  case 4:
-filename.sprintf(binarydump%i.png, bitmapId++);
-break;
-  default:
-filename.sprintf(binarydump%i.bin, bitmapId++);
-break;
-  }
-  FILE *f = fopen(filename.cstr(), wb);
-  if (f)
-  {
-const unsigned char *tmpBuffer = m_currentForeignData.getDataBuffer();
-for (unsigned long k = 0; k  m_currentForeignData.size(); k++)
-  fprintf(f, %c,tmpBuffer[k]);
-fclose(f);
-  }
-}
-#endif
-
 if (m_foreignType == 1)
 {
   switch(m_foreignFormat)
@@ -1200,6 +1165,57 @@ void 
libvisio::VSDContentCollector::_handleForeignData(const WPXBinaryData bina
 m_currentForeignProps.insert(libwpg:mime-type, object/ole);
 m_currentForeignData.append(binaryData);
   }
+
+#if DUMP_BITMAP
+  ::WPXString filename;
+  if (m_foreignType == 1)
+  {
+switch(m_foreignFormat)
+{
+case 0:
+case 255:
+  filename.sprintf(binarydump%i.bmp, bitmapId++);
+  break;
+case 1:
+  filename.sprintf(binarydump%i.jpeg, bitmapId++);
+  break;
+case 2:
+  filename.sprintf(binarydump%i.gif, bitmapId++);
+  break;
+case 3:
+  filename.sprintf(binarydump%i.tiff, bitmapId++);
+  break;
+case 4:
+  filename.sprintf(binarydump%i.png, bitmapId++);
+  break;
+default:
+  filename.sprintf(binarydump%i.bin, bitmapId++);
+  break;
+}
+  }
+  else if  (m_foreignType == 4)
+  {
+const unsigned char *tmpBinData = m_currentForeignData.getDataBuffer();
+// Check for EMF signature
+if (tmpBinData[0x28] == 0x20  tmpBinData[0x29] == 0x45  
tmpBinData[0x2A] == 0x4D  tmpBinData[0x2B] == 0x46)
+  filename.sprintf(binarydump%i.emf, bitmapId++);
+else
+  filename.sprintf(binarydump%i.wmf, bitmapId++);
+  }
+  else if (m_foreignType == 2)
+  {
+filename.sprintf(binarydump%i.ole, bitmapId++);
+  }
+
+  FILE *f = fopen(filename.cstr(), wb);
+  if (f)
+  {
+const unsigned char *tmpBuffer = m_currentForeignData.getDataBuffer();
+for (unsigned long k = 0; k  m_currentForeignData.size(); k++)
+  fprintf(f, %c,tmpBuffer[k]);
+fclose(f);
+  }
+#endif
 }
 
 void libvisio::VSDContentCollector::collectGeometry(unsigned /* id */, 
unsigned level, bool noFill, bool noLine, bool noShow)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Regression - LO Writer 4.0

2013-02-25 Thread Németh László

Hi Ray,

For your information, I have reported a LibO 4.0.0 regression with the
“Clear screen” Logo toolbar button, and fixed by Michael Stahl on
2012-02-18. Also slower selection/handling of drawing objects caused
by this bug, maybe this was the background of your problem, too. See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=2eef912649d277e05203bc79c26f2be5b096a292
– SwXTextView::select(): unselect drawing objects at start...
... and not before selecting each object, which leaves only the last
object selected

Best regards, László

2013/2/22 r_ouellette ray.ouelle...@sympatico.ca:
 I confirm that fluidity is back also on win32 version (winxp at the office),
 LO 4.0.1.1.

 Raymond



 --
 View this message in context: 
 http://nabble.documentfoundation.org/Regression-LO-Writer-4-0-tp4038481p4039356.html
 Sent from the Dev mailing list archive at Nabble.com.
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: configure.ac

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit efe50300c45add25b513659308cdea70f6e4668f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Feb 25 10:35:37 2013 +0100

Bump version to 0.0.25

diff --git a/configure.ac b/configure.ac
index a353639..508e034 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libvisio_version_major],[0])
 m4_define([libvisio_version_minor],[0])
-m4_define([libvisio_version_micro],[24])
+m4_define([libvisio_version_micro],[25])
 
m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

 solenv/gbuild/CppunitTest.mk|1 -
 solenv/gbuild/Executable.mk |1 -
 solenv/gbuild/InternalUnoApi.mk |   12 
 solenv/gbuild/Library.mk|1 -
 solenv/gbuild/LinkTarget.mk |5 -
 solenv/gbuild/Module.mk |2 +-
 solenv/gbuild/StaticLibrary.mk  |1 -
 solenv/gbuild/UnoApi.mk |4 
 8 files changed, 1 insertion(+), 26 deletions(-)

New commits:
commit 54a8acb3d6b4fe8078bfe074185a028f994b08a0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 25 10:39:21 2013 +0100

Last use of obsolete gb_*_add_api is long gone

Change-Id: Ia6c938ef0e45ec86c0c202e95ef28d49fccd3497

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e883ade..30a1d9f 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -330,7 +330,6 @@ gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call 
gb_CppunitTest__get_lin
 endef
 
 $(eval $(foreach method,\
-   add_api \
add_cobject \
add_cobjects \
add_cxxobject \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 403497e..7989d24 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -127,7 +127,6 @@ $(eval $(foreach method,\
use_system_darwin_frameworks \
use_system_win32_libs \
set_library_path_flags \
-   add_api \
use_api \
use_sdk_api \
use_udk_api \
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index e7c1240..2d77d0d 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -81,19 +81,11 @@ $(call 
gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(call gb_UnoApiT
 
 endef
 
-define gb_InternalUnoApi_add_api
-$$(call gb_Output_error,gb_InternalUnoApi_add_api: use 
gb_InternalUnoApi_use_api instead.)
-endef
-
 define gb_InternalUnoApi_use_api
 $(foreach rdb,$(2),$(call gb_InternalUnoApi__use_api,$(1),$(rdb)))
 
 endef
 
-define gb_InternalUnoApi_add_api_dependency
-$$(call gb_Output_error,gb_InternalUnoApi_add_api_dependency: use 
gb_InternalUnoApi_define_api_dependency instead.)
-endef
-
 # Express that the rdb $(2) depends on rdb $(3).
 #
 # This information is already available in the UnoApiTarget definition
@@ -109,10 +101,6 @@ $(call gb_UnoApiHeadersTarget_use_api,$(2),$(3))
 
 endef
 
-define gb_InternalUnoApi_add_api_dependencies
-$$(call gb_Output_error,gb_InternalUnoApi_add_api_dependencies: use 
gb_InternalUnoApi_define_api_dependencies instead.)
-endef
-
 define gb_InternalUnoApi_define_api_dependencies
 $(foreach dep,$(3),$(call 
gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(dep)))
 
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 0552c86..9309736 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -200,7 +200,6 @@ $(eval $(foreach method,\
use_system_darwin_frameworks \
use_system_win32_libs \
set_library_path_flags \
-   add_api \
use_api \
use_sdk_api \
use_udk_api \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 00efc9c..190f671 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -747,11 +747,6 @@ $(call gb_LinkTarget_get_target,$(1)) : LIBS := 
$$(filter-out $$(gb_STDLIBS),$$(
 
 endef
 
-define gb_LinkTarget_add_api
-$$(call gb_Output_error,\
- gb_LinkTarget_add_api: use gb_LinkTarget_use_api instead.)
-endef
-
 define gb_LinkTarget__use_api
 $(call gb_LinkTarget_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
 $(call gb_LinkTarget_use_package,$(1),$(2)_inc)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index d20176a..0025641 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -134,7 +134,7 @@ help :
@cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
 
 showmodules :
-   $(info $(strip $(gb_Module_ALLMODULES)))
+   $(warning $(strip $(gb_Module_ALLMODULES)))
@true 
 
 translations : $(WORKDIR)/pot.done
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 74514dc..716fbd5 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -101,7 +101,6 @@ $(eval $(foreach method,\
set_x64 \
add_libs \
set_library_path_flags \
-   add_api \
use_api \
use_sdk_api \
use_udk_api \
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 05e6524..7dd961c 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -138,10 +138,6 @@ $(call gb_UnoApiTarget_get_external_headers_target,$(1)) : 
$(call gb_UnoApiTarge
 
 endef
 
-define gb_UnoApi_add_api
-$$(call gb_Output_error,gb_UnoApi_add_api: use gb_UnoApi_use_api instead.)
-endef
-
 define gb_UnoApi_use_api
 $(foreach rdb,$(2),$(call gb_UnoApi__use_api,$(1),$(rdb)))
 
___
Libreoffice-commits mailing list

[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/source

2013-02-25 Thread Maxime de Roucy

 sw/qa/extras/rtfimport/data/fdo53594.rtf   |   42 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |   10 +++--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   41 ++--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 +-
 4 files changed, 89 insertions(+), 8 deletions(-)

New commits:
commit 50822d440519bcc95fc4e5d45844c1328e72d6b2
Author: Maxime de Roucy mdero...@linagora.com
Date:   Mon Feb 25 09:45:52 2013 +0100

testcase for fdo#53594

Change-Id: I834b3cf0b5a46627ff0b532e27a73deeaefe7c47
Reviewed-on: https://gerrit.libreoffice.org/2376
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/qa/extras/rtfimport/data/fdo53594.rtf 
b/sw/qa/extras/rtfimport/data/fdo53594.rtf
new file mode 100644
index 000..55468a6
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo53594.rtf
@@ -0,0 +1,42 @@
+{\rtf1\ansi\deff3\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New 
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 
Arial;}{\f3\froman\fprq2\fcharset0 Nimbus Roman No9 L{\*\falt Times New 
Roman};}{\f4\fswiss\fprq2\fcharset0 Nimbus Sans L{\*\falt 
Arial};}{\f5\fnil\fprq2\fcharset0 DejaVu Sans;}}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af5\langfe2052\dbch\af5\afs24\alang1081\loch\f3\fs24\lang1036
 Standard;}
+{\s15\sbasedon0\snext16\sb240\sa120\keepn\dbch\af5\dbch\af5\afs28\loch\f4\fs28 
Titre;}
+{\s16\sbasedon0\snext16\sb0\sa120 Corps de texte;}
+{\s17\sbasedon16\snext17\sb0\sa120 Liste;}
+{\s18\sbasedon0\snext18\sb120\sa120\noline\i\afs24\ai\fs24 L\u233\'e9gende;}
+{\s19\sbasedon0\snext19\noline Index;}
+{\s20\sbasedon0\snext20\noline Contenu de tableau;}
+}{\info{\author Maxime 
DE\~ROUCY}{\creatim\yr2013\mo2\dy22\hr18\min15}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}{\comment
 LibreOffice}{\vern3600}}\deftab709
+\viewscale150
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse195\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
 Standard;}}
+\formshade\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrhair\brdrw1\brdrcf1\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\cellx4819\clbrdrt\brdrhair\brdrw1\brdrcf1\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\clbrdrr\brdrhair\brdrw1\brdrcf1\cellx9638\pgndec\pard\plain
 \s20\noline\intbl\rtlch \ltrch\loch
+\cell\pard\plain \s20\noline\intbl{\rtlch \ltrch
+{\object\objemb{\*\objdata }{\result{\dn1{\*\shppict{\pict{\*\picprop{\sp{\sn 
wzDescription}{\sv }}{\sp{\sn wzName}{\sv 
}}}\picscalex99\picscaley95\piccropl0\piccropr0\piccropt0\piccropb0\picw2258\pich480\picwgoal1280\pichgoal272\wmetafile8
+01000903a8021000d401d40126060f009e03574d464301000100599901007c037c030100
+6c0054001100d108df0120454d4601007c031c000200
+55001200160004003458c01211000c0008000b0010006000
+69001000ec09ec090c001a00100014000c000d00
+12000c000100210008002100080022000c0014000c000d0052004c010100
+9ffe900100224e0069006d006200750073002000530061006e00730020004c00
+
+
+
+
+16000c00180018000c0025000c0001005400880023003601c804f7020100
+230036010a004c00020060006f006c00650020006f0062006a00
+6500630074009f0035009e0050009f009e0035009f0084007b002100080022000c00
+14000c000d002100080022000c0014000c000d002100080022000c00

[Libreoffice-commits] Changes to 'refs/tags/libvisio-0.0.25'

Tag 'libvisio-0.0.25' created by Fridrich Å trba fridrich.st...@bluewin.ch at 
2013-02-25 09:46 -0800

Tagging libvisio 0.0.25 release

Changes since libvisio-0.0.24-7:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Show module dependencies

With the need for dmake and build.pl almost gone, I assume that we will 
want to dump */prj/build.lst files and expressing inter-module 
dependencies via them, too.  That leaves the question how we want to be 
able to track inter-module dependencies in the future.  Specifically, 
what I am looking for is a command (e.g., make target) to show all the 
modules that some given module depends on, to help me decide into which 
module to put newly developed functionality.  (Even if this information 
were no longer relevant for gbuild---what is the future story of make 
module.all?---we will IMO nevertheless want to keep module 
dependencies from turning into a cyclic ball.)


(Btw, top-level make help advertises showdeliverables and 
showmodules targets, the latter of which looks relevant here, but 
neither of them works.)


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: download.lst

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 392691c91fbfa96f1805f1cd556dc115b9a486e3
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Feb 25 10:54:01 2013 +0100

Uploading libvisio-0.0.25 fixing fdo#60433

Change-Id: I854fd87a21fc63a5c274b38831589b3d76379e25

diff --git a/download.lst b/download.lst
index f4984e6..f8aafde 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
 export CDR_TARBALL := libcdr-0.0.10.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
-VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea
-export VISIO_TARBALL := libvisio-0.0.24.tar.bz2
+VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
+export VISIO_TARBALL := libvisio-0.0.25.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-accessibility] introduction

2013-02-25 Thread Tom Davies

Hi :)
If you are not sure if someone is subscribed to a list you can always include 
them in the CC or To fields to make sure they do get the message so i have put 
Jonathan in the To field so he gets to see the thread so far.  

I also found this quote from the Users List

From: Samuel Mehrbrodt s.mehrbr...@gmail.com
To: us...@global.libreoffice.org

Hi,

Do you have a favorite bug you want to get solved, but cannot do it
yourself? You would even pay some money, but cannot contract a Company
for this?

Here's a simple way how to do this, thanks to www.freedomsponsors.org
http://www.freedomsponsors.org

1. Login on www.freedomsponsors.org http://www.freedomsponsors.org
2. Copy the URL from Bugzilla and Sponsor it in FreedomSponsors!
3. Enter the amount you are willing to pay and publish the Issue
4. You'll get notified when someone solves the bug so you can pay him

Your advantage is, that you have to pay only when the Issue has been
resolved, so there is no risk with that. Payments are done via Paypal.
Others can join and add their offer to the bug.

Here
http://www.freedomsponsors.org/core/issue/?s=project_id=149project_name=LibreOffice

are some existing LibreOffice Issues, if you want to support them.

All the best,
Samuel

(thanks to Hylton)

I'm not sure if it helps but it might be a good route.  

Is it time-effective to fix bugs with the current java-based system when the 
rest of the project is moving away from Java on the grounds that Java keeps 
breaking down or having serious problems?  Is it possible to use funding to 
kick-start a re-write in Python or C++ or something?   Is there funding?  

Regards from
Tom :)  

 From: Caolán McNamara caol...@redhat.com
To: Sophie Gautier gautier.sop...@gmail.com 
Cc: accessibil...@global.libreoffice.org; libreoffice 
LibreOffice@lists.freedesktop.org 
Sent: Friday, 22 February 2013, 11:27
Subject: Re: [libreoffice-accessibility] introduction

On Fri, 2013-02-22 at 09:29 +0100, Sophie Gautier wrote:
 Hi Jonathan,

 Thanks a lot for your proposal. I'm sending your mail to the developers
 list so we are sure they are aware of it.

 Kind regards
 Sophie
 On 21/02/2013 23:33, Jonathan Nadeau wrote:
  Hello list,

  My name is Jonathan Nadeau and I'm the executive director of the
  Accessible Computing Foundation located here

  http://www.accessiblecomputingfoundation.org

  I'm looking to fund some developers to fix some accessibility bugs with
  Libreoffice and the Orca screen reader.

Nadeau isn't cc'ed on Sophie's original email and I don't know if he's
subscribed to any of these email lists, but I think it's worth
mentioning that the work in progress of moving our dialogs to the gtk
builder file format now makes it super super easy to: 
a) set that a label is the right mnemonic widget for something else,
which sets up the default a11y label for, label by relationships between
them
b) add a11y descriptions, a11y names, explicit label-for, label-by and
member-of etc relations

I'm not particularly a11y experienced, but I fired up orca a few weeks
ago and tweaked our a11y support a bit until it read out the
format-title page dialog the same way as it would read it if it was a
native gtk dialog.

Obviously there's a lot more a11y-wise to just our dialogs, but at least
for those new-format dialogs anyone with experience in tweaking gtk a11y
issues via glade can directly apply that experience to our new dialogs.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: moz module gbuildification?

2013-02-25 Thread Peter Foley


David,

I'm in the process of converting just the binary version of moz to gbuild 
right now.


Peter

-Original Message- 
From: David Ostrovsky

Sent: Saturday, February 23, 2013 5:53 AM
To: Stephan Bergmann
Cc: pefol...@verizon.net ; libreoffice
Subject: Re: moz module gbuildification?

On 02/20/2013, Stephan Bergmann wrote:


So my take is that it would be worthwhile nevertheless to get moz
converted to gbuild now, and see dmake/build.pl removed soon.


the question is *what* should be gbuildified to see dmake/build.pl removed.
My understanding is, that we have two different moz operation modes:
prebuilt and native compilation from patched seamonkey 1.8 source tree.

It seems that native compilation was broken in this commit: [1]
BUILD_MOZAB was removed in config_host.mk.in
and vc8-moztools.zip under moz/donwload is missing.

But even after fixing that and downloading and copying vc8-moztools.zip
manually to the right location
and trying to compile it with the --with-visual-studio=2008 option i am
still getting that failure:

configure: error: This version of the MSVC compiler, 15.00.30729 , is
unsupported.

which bring us to the fact [2] that we apparently need MSVC 7.1 (or
earlier?) to compile seamonkey 1.8, that we don't support anyway.

Having said that I suggest to drop native compilation mode (i. e. all
sources, patches, etc.) and only partially gbuildify moz module:
prebuilt seamonkey mode, to be able to include binaries in release build.

I checked released 4.0.0.3 installation on windows: thunderbird address
book is working,
without be able to compile it in 4.0.0 tree, so we don't need the native
compilation mode
(that is broken) to produce release build anyway. In fact no one even
mentioned it.

[1]
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a0c53a961a0af21f69f592b43799cd635c994810
[2]
https://groups.google.com/forum/?fromgroups=#!topic/mozilla.dev.apps.thunderbird/AekntesqyHQ

David 


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Gerrit bot slow?

2013-02-25 Thread Peter Foley

All,

I noticed that recently the Gerrit bot seems to take a while to pick up on a 
revision to a patch.
When it was first being used it seemed to take only a minute or two at most, 
whereas now it can take 30 minutes or a hour.
Is something messed up?

Thanks,

Peter___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

System::Beep() removal (2nd)

2013-02-25 Thread Thomas Arnhold


Hi folks,

some time ago we removed all ancient beeps in the source (fdo#48549).

It seems this was kind of too forward, because users want a beep as 
acoustic feedback for Basic macros (fdo#58807).


I want to get some opinions about bringing the vcl/sound related stuff 
back so we get beeps working for Basic again. Or are there 
alternatives?!


cons: 
http://lists.freedesktop.org/archives/libreoffice-ux-advise/2012-February/000890.html


Regards
 Thomas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

are the New Graphic Compress features accessable for API

2013-02-25 Thread Fernand Vanrie

Tomaž Vajngerl made new Graphic Compress tools, they are sinds 4.0 
available using the GUI and the new Compress Graphics Dialog in Draw, 
Calc and Impress.


1: Can this features been accessed using the API and Basic ?

2: Is the new Lanczos Interpolation also available when using The 
Graphic Profider to export a Graphic ?


Thanks for any hint

Fernand
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

helpcontent2 gbuildification

2013-02-25 Thread Peter Foley

David,

I noticed that you're listed on the wiki module_status page as working on 
gbuildifing helpcontent2.
Do you have any idea when that will be done?

Thanks,

Peter ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cppu/Library_affine_uno.mk cppu/Library_cppu.mk cppu/Library_log_uno.mk cppu/Library_purpenvhelper.mk cppu/Library_unsafe_uno.mk

 cppu/Library_affine_uno.mk|2 +-
 cppu/Library_cppu.mk  |2 +-
 cppu/Library_log_uno.mk   |2 +-
 cppu/Library_purpenvhelper.mk |2 +-
 cppu/Library_unsafe_uno.mk|2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a66bb33581dca2ffc6d73848406898a00e275b7b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 25 11:08:29 2013 +0100

cppu does not depend on any offapi .idl files

Change-Id: I22150c0247ec98bd0e764a439a15ceaa7f42b029

diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk
index 1edc287..e253c7a 100644
--- a/cppu/Library_affine_uno.mk
+++ b/cppu/Library_affine_uno.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,affine_uno))
 
-$(eval $(call gb_Library_use_sdk_api,affine_uno))
+$(eval $(call gb_Library_use_udk_api,affine_uno))
 
 $(eval $(call gb_Library_use_libraries,affine_uno,\
purpenvhelper \
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index 4ab71b8..f3b99e4 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -31,7 +31,7 @@ $(eval $(call 
gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.ma
 
 $(eval $(call gb_Library_use_package,cppu,cppu_inc))
 
-$(eval $(call gb_Library_use_sdk_api,cppu))
+$(eval $(call gb_Library_use_udk_api,cppu))
 
 $(eval $(call gb_Library_add_defs,cppu,\
-DCPPU_DLLIMPLEMENTATION \
diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk
index 53e92af..c768337 100644
--- a/cppu/Library_log_uno.mk
+++ b/cppu/Library_log_uno.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,log_uno))
 
 $(eval $(call gb_Library_use_external,log_uno,boost_headers))
 
-$(eval $(call gb_Library_use_sdk_api,log_uno))
+$(eval $(call gb_Library_use_udk_api,log_uno))
 
 $(eval $(call gb_Library_use_libraries,log_uno,\
cppu \
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
index bddf619..fe86dfd 100644
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_add_defs,purpenvhelper,\
-DPURPENV_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_sdk_api,purpenvhelper))
+$(eval $(call gb_Library_use_udk_api,purpenvhelper))
 
 $(eval $(call gb_Library_use_libraries,purpenvhelper,\
cppu \
diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk
index f71fea1..52b4159 100644
--- a/cppu/Library_unsafe_uno.mk
+++ b/cppu/Library_unsafe_uno.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,unsafe_uno))
 
-$(eval $(call gb_Library_use_sdk_api,unsafe_uno))
+$(eval $(call gb_Library_use_udk_api,unsafe_uno))
 
 $(eval $(call gb_Library_use_libraries,unsafe_uno,\
purpenvhelper \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source

2013-02-25 Thread Maxime de Roucy

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   41 +++--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 +-
 2 files changed, 41 insertions(+), 4 deletions(-)

New commits:
commit 04a761f330b6ff17a125cc5522e71aae86a862f9
Author: Maxime de Roucy mdero...@linagora.com
Date:   Wed Feb 20 14:27:47 2013 +0100

fdo#53594 RTF IMPORT : considere OLEÂ objects as pictures

If the OLE object is in a container, don't try to import it as
OLEÂ object (use the \objdata element) but use the \result element which
is the appareance of the object (it's a picture).

Change-Id: Id97b36ce89beae02885cf82383321c14b58f2ea5
Reviewed-on: https://gerrit.libreoffice.org/2243
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Miklos Vajna vmik...@suse.cz

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 366959e..cf1a1aa 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -715,6 +715,9 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 if ( xShapes.is() )
 xShapes-add( xShape );
 }
+
+// check if the picture is in an OLE object and if the \objdata element is 
used
+// (see RTF_OBJECT in RTFDocumentImpl::dispatchDestination)
 if (m_bObject)
 {
 // Set bitmap
@@ -735,6 +738,7 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 m_aObjectAttributes.set(NS_ooxml::LN_shape, pShapeValue);
 return 0;
 }
+
 if (xPropertySet.is())
 xPropertySet-setPropertyValue(GraphicURL, uno::Any(aGraphicUrl));
 
@@ -1445,11 +1449,34 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 m_aStates.top().nDestinationState = DESTINATION_COMMENT;
 break;
 case RTF_OBJECT:
-m_aStates.top().nDestinationState = DESTINATION_OBJECT;
-m_bObject = true;
+{
+// begining of an OLE Object
+m_aStates.top().nDestinationState = DESTINATION_OBJECT;
+
+// check if the object is in a special container (e.g. a table)
+if (!m_pCurrentBuffer)
+{
+// the object is in a table or another container.
+// Don't try to treate it as an OLE object (fdo#53594).
+// Use the \result (RTF_RESULT) element of the object 
instead,
+// the result element contain picture representing the OLE 
Object.
+m_bObject = true;
+}
+}
 break;
 case RTF_OBJDATA:
-m_aStates.top().nDestinationState = DESTINATION_OBJDATA;
+// check if the object is in a special container (e.g. a table)
+if (m_pCurrentBuffer)
+{
+// the object is in a table or another container.
+// Use the \result (RTF_RESULT) element of the object instead,
+// of the \objdata.
+m_aStates.top().nDestinationState = DESTINATION_SKIP;
+}
+else
+{
+m_aStates.top().nDestinationState = DESTINATION_OBJDATA;
+}
 break;
 case RTF_RESULT:
 m_aStates.top().nDestinationState = DESTINATION_RESULT;
@@ -3860,6 +3887,14 @@ int RTFDocumentImpl::popState()
 break;
 case DESTINATION_OBJECT:
 {
+if (!m_bObject)
+{
+// if the object is in a special container we will use the \result
+// element instead of the \objdata
+// (see RTF_OBJECT in RTFDocumentImpl::dispatchDestination)
+break;
+}
+
 RTFSprms aObjAttributes;
 RTFSprms aObjSprms;
 RTFValue::Pointer_t pValue(new RTFValue(m_aObjectAttributes, 
m_aObjectSprms));
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d61efef..82490eb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -561,7 +561,9 @@ namespace writerfilter {
 
 RTFSprms m_aObjectSprms;
 RTFSprms m_aObjectAttributes;
-/// If we are in an object group.
+/** If we are in an object group and if the we use its
+ *  \objdata element.
+ *  (if we don't use the \objdata we use the \result element)*/
 bool m_bObject;
 /// Contents of the objdata group.
 boost::shared_ptrSvStream m_pObjectData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: hola

2013-02-25 Thread julien2412

Hola adrivero,

Debes preguntar in inglés porque es un inglés dev mailing list.

Gracias.

(translation: you must ask in English because it's an English dev mailing
list)



--
View this message in context: 
http://nabble.documentfoundation.org/hola-tp4037870p4039915.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download.lst

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0f203c99fac3778500dbf664e34ac4cd2d6455de
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Feb 25 10:54:01 2013 +0100

Uploading libvisio-0.0.25 fixing fdo#60433

Change-Id: I854fd87a21fc63a5c274b38831589b3d76379e25
(cherry picked from commit 392691c91fbfa96f1805f1cd556dc115b9a486e3)
Reviewed-on: https://gerrit.libreoffice.org/2377
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/download.lst b/download.lst
index 1eca937..75d928c 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
 export CDR_TARBALL := libcdr-0.0.10.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
-VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea
-export VISIO_TARBALL := libvisio-0.0.24.tar.bz2
+VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
+export VISIO_TARBALL := libvisio-0.0.25.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

 configure.ac |   51 ---
 1 file changed, 4 insertions(+), 47 deletions(-)

New commits:
commit 27ff1d2eb970984ace3bff485f41b50ae66af576
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sun Feb 24 20:28:06 2013 +0100

move nss, neon, graphite to macro check too

Change-Id: Iaa8ee970042c5260eb3d1199bf31f6495c449f40
Reviewed-on: https://gerrit.libreoffice.org/2370
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/configure.ac b/configure.ac
index 3d4166d..1e390d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1286,16 +1286,6 @@ AC_ARG_WITH(system-cairo,
 [Use Cairo libraries already on system.]),,
 [with_system_cairo=$with_system_libs])
 
-AC_ARG_WITH(system-graphite,
-AS_HELP_STRING([--with-system-graphite],
-[Use graphite library already installed on system.]),,
-[with_system_graphite=$with_system_libs])
-
-AC_ARG_WITH(system-nss,
-AS_HELP_STRING([--with-system-nss],
-[Use NSS/nspr libraries already on system.]),,
-[with_system_nss=$with_system_libs])
-
 AC_ARG_WITH(myspell-dicts,
 AS_HELP_STRING([--with-myspell-dicts],
 [Adds myspell dictionaries to the LibreOffice installation set]),
@@ -1595,11 +1585,6 @@ AC_ARG_WITH(system-vigra,
 [Use vigra already on system.]),,
 [with_system_vigra=$with_system_headers])
 
-AC_ARG_WITH(system-neon,
-AS_HELP_STRING([--with-system-neon],
-[Use neon already on system.]),,
-[with_system_neon=$with_system_libs])
-
 AC_ARG_WITH(system-hunspell,
 AS_HELP_STRING([--with-system-hunspell],
 [Use libhunspell already on system.]),,
@@ -8245,11 +8230,8 @@ AC_SUBST(EXTMSV80)
 dnl ===
 dnl Check for system NSS
 dnl ===
-AC_MSG_CHECKING([which NSS to use])
+libo_CHECK_SYSTEM_MODULE([nss/nspr],[NSS],[nss = 3.9.3 nspr = 4.8])
 if test $with_system_nss = yes; then
-AC_MSG_RESULT([external])
-SYSTEM_NSS=YES
-PKG_CHECK_MODULES(NSS, nss = 3.9.3 nspr = 4.8)
 libo_MINGW_CHECK_DLL([NSPR4], [libnspr4])
 libo_MINGW_CHECK_DLL([PLC4], [libplc4])
 libo_MINGW_CHECK_DLL([PLDS4], [libplds4])
@@ -8258,19 +8240,13 @@ if test $with_system_nss = yes; then
 libo_MINGW_CHECK_DLL([SMIME3], [smime3])
 libo_MINGW_CHECK_DLL([SSL3], [ssl3])
 else
-SYSTEM_NSS=NO
 NSS_MAJOR=3
 NSS_MINOR=13
 NSS_PATCH=5
-BUILD_TYPE=$BUILD_TYPE NSS
-AC_MSG_RESULT([internal])
-fi # system nss
-AC_SUBST(SYSTEM_NSS)
+fi
 AC_SUBST(NSS_MAJOR)
 AC_SUBST(NSS_MINOR)
 AC_SUBST(NSS_PATCH)
-AC_SUBST(NSS_CFLAGS)
-AC_SUBST(NSS_LIBS)
 AC_SUBST(MINGW_SMIME3_DLL)
 
 dnl ===
@@ -8464,24 +8440,14 @@ if test $_os = WINNT -o $_os = Linux  test 
$enable_graphite =  -o
 AC_MSG_RESULT([yes])
 ENABLE_GRAPHITE=TRUE
 AC_DEFINE(ENABLE_GRAPHITE)
-AC_MSG_CHECKING([which graphite to use])
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 = 0.9.3])
 if test $with_system_graphite = yes; then
-AC_MSG_RESULT([external])
-SYSTEM_GRAPHITE=YES
-PKG_CHECK_MODULES( GRAPHITE, graphite2 = 0.9.3 )
 libo_MINGW_CHECK_DLL([GRAPHITE2], [libgraphite2])
-else
-AC_MSG_RESULT([internal])
-SYSTEM_GRAPHITE=NO
-BUILD_TYPE=$BUILD_TYPE GRAPHITE
 fi
 else
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_GRAPHITE)
-AC_SUBST(SYSTEM_GRAPHITE)
-AC_SUBST(GRAPHITE_CFLAGS)
-AC_SUBST(GRAPHITE_LIBS)
 AC_SUBST([MINGW_GRAPHITE2_DLL])
 
 dnl ===
@@ -8667,24 +8633,15 @@ else
 dnl ===
 dnl Check for system neon
 dnl ===
-AC_MSG_CHECKING([which neon to use])
+libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon = 0.26.0])
 if test $with_system_neon = yes; then
-AC_MSG_RESULT([external])
-PKG_CHECK_MODULES(NEON, neon = 0.26.0, , AC_MSG_ERROR([you need neon = 
0.26.x for system-neon]))
 NEON_VERSION=`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`
-SYSTEM_NEON=YES
 libo_MINGW_CHECK_DLL([NEON], [libneon])
 libo_MINGW_TRY_DLL([TASN1], [libtasn1])
 libo_MINGW_TRY_DLL([GNUTLS], [libgnutls])
 else
-AC_MSG_RESULT([internal])
-SYSTEM_NEON=NO
-BUILD_TYPE=$BUILD_TYPE NEON
 NEON_VERSION=0295
 fi
-AC_SUBST(SYSTEM_NEON)
-AC_SUBST(NEON_LIBS)
-AC_SUBST(NEON_CFLAGS)
 AC_SUBST(NEON_VERSION)
 AC_SUBST([MINGW_GNUTLS_DLL])
 AC_SUBST([MINGW_NEON_DLL])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] [PUSHED] move nss, neon, graphite to macro check too

2013-02-25 Thread via Code Review

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2370

Approvals:
  LibreOffice gerrit bot: Verified
  Björn Michaelsen: Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2370
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa8ee970042c5260eb3d1199bf31f6495c449f40
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

gbuild / xmlsec dependency foo ?

2013-02-25 Thread Michael Meeks

Hi guys,

I got the appended (transient I hope) failure of the build in xmlsec.

Is it possible that we're missing a dependency on openssl / nss in
there ? [ it -looks- to my uneducated eye ] as if we have only a libxml2
dependency.

HTH,

Michael.

...
checking for __FUNCTION__ or __func__... __FUNCTION__
checking size of size_t... 4
checking for xml2-config... /usr/bin/xml2-config
checking libxml2 /usr/bin/xml2-config ... yes ('2.7.8')
checking for libxslt libraries = 1.0.20... no
checking for openssl libraries = 0.9.6... no
checking for nspr libraries = 4.0... no
checking for nss libraries = 3.2... no
checking for gnutls libraries = 0.8.1... no
checking for mscrypto libraries... none
checking for crypto library... configure: error: At least one crypto
library should exist for xmlsec1
make[1]: ***
[/data/opt/libreoffice/master/workdir/unxlngi6.pro/ExternalProject/xmlsec/build]
 Error 1
make[1]: *** Waiting for unfinished jobs

---
Oh dear - something failed during the build - sorry !
  For more help with debugging build errors, please see the section in:
http://wiki.documentfoundation.org/Development

  internal build errors:

ERROR: error 512 occurred while
making /data/opt/libreoffice/master/tail_build/prj

 it seems that the error is inside 'tail_build', please re-run build
 inside this module to isolate the error and/or test your fix.


-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Gerrit bot slow?

2013-02-25 Thread Norbert Thiebaud

On Sat, Feb 23, 2013 at 5:51 PM, Peter Foley pefol...@verizon.net wrote:
 All,

 I noticed that recently the Gerrit bot seems to take a while to pick up on a
 revision to a patch.
 When it was first being used it seemed to take only a minute or two at most,
 whereas now it can take 30 minutes or a hour.
 Is something messed up?

1.  there is no automatic 'pick-up' but there was someone that
actually ran a command to 'schedule' a build
2. there is only 3 machines behind it all. one gentoo, one Mac OSX
10.8 and one windows... the later not only take typically between 50
to 75 minutes to build.. but also do regular tinderbox duty.. so even
when scheduled it can take a while before a build is started...
3. finally there is only 1 box of each platform so... if there are
more than one patch to build test.. thing queu-up

We are working at bringing more hardware online... and then to make
the build verification more general.

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - download.lst

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9381144656fa57b020490d12f27d003436db4643
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Feb 25 10:54:01 2013 +0100

Uploading libvisio-0.0.25 fixing fdo#60433

Change-Id: I854fd87a21fc63a5c274b38831589b3d76379e25
(cherry picked from commit 392691c91fbfa96f1805f1cd556dc115b9a486e3)
Reviewed-on: https://gerrit.libreoffice.org/2377
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
(cherry picked from commit 0f203c99fac3778500dbf664e34ac4cd2d6455de)
Reviewed-on: https://gerrit.libreoffice.org/2378
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/download.lst b/download.lst
index bc83a8b..cfa6de9 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
 export CDR_TARBALL := libcdr-0.0.10.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
-VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea
-export VISIO_TARBALL := libvisio-0.0.24.tar.bz2
+VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
+export VISIO_TARBALL := libvisio-0.0.25.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: help on macro (writing a testcase)

2013-02-25 Thread Maxime de Roucy

Hello,

I managed to write the testcase, thanks a lot :-)
https://gerrit.libreoffice.org/#/c/2376/

In fact I used another testcase that was already written (testFdo48033).

Regards

-- 
Maxime de Roucy
Groupe LINAGORA - OSSA
✉ : 80 rue Roque de Fillol 92800 PUTEAUX
☎ : 01.46.96.63.44 ☏ : 06.42.00.49.09


signature.asc
Description: This is a digitally signed message part
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source

2013-02-25 Thread Michael Meeks

 vcl/source/gdi/bitmapex.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0b73b1f6e3358dc484c4e684b3c8055da7071eb5
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 22 16:53:39 2013 +

perf: avoid scaling images to the same size at some cost.

Change-Id: Icae65a8bf48f76801c536607055be066be0bd49f
(cherry picked from commit cb8fcf5a169f030827b1150c50b6ed284717e485)

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index f699432..45fe0aa 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -368,7 +368,9 @@ sal_Bool BitmapEx::Scale( const Size rNewSize, sal_uLong 
nScaleFlag )
 {
 sal_Bool bRet;
 
-if( aBitmapSize.Width()  aBitmapSize.Height() )
+if( aBitmapSize.Width()  aBitmapSize.Height() 
+( rNewSize.Width()  != aBitmapSize.Width() ||
+  rNewSize.Height() != aBitmapSize.Height() ) )
 {
 bRet = Scale( (double) rNewSize.Width() / aBitmapSize.Width(),
   (double) rNewSize.Height() / aBitmapSize.Height(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/inc editeng/source

2013-02-25 Thread navin

 editeng/inc/editeng/outliner.hxx |2 -
 editeng/source/outliner/outliner.cxx |   38 ++-
 2 files changed, 4 insertions(+), 36 deletions(-)

New commits:
commit 2738fa9fdc3aec9a64f2eab1d9d48942218c199e
Author: navin pati...@kacst.edu.sa
Date:   Sat Feb 23 17:58:11 2013 +0300

fix fdo#38951, use paragraphâs writing direction.

In case of RTL, we want bullet text e.g. â1. ,1)â to be reversed
e.g. â.1,(1â, so we need to check only paragraphâs writing direction
and pass that direction to DrawingText().
and fix drawing position calculation logic.

Change-Id: I303dc1b04ae5e66b1b5d25a40794be308f36668b
Reviewed-on: https://gerrit.libreoffice.org/2348
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa

diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index fcc90bb..61e6a41 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -389,7 +389,7 @@ public:
 unsignedmbEndOfBullet : 1;
 
 sal_uInt8 GetBiDiLevel() const { return mnBiDiLevel; }
-sal_Bool IsRTL() const;
+sal_Bool IsRTL() const { return mnBiDiLevel % 2 ? sal_True : sal_False; }
 
 DrawPortionInfo(
 const Point rPos,
diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 57a21cf..6294aea 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -946,7 +946,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point 
rStartPos,
 if ( !bRightToLeftPara )
 aTextPos.X() = rStartPos.X() + aBulletArea.Left();
 else
-aTextPos.X() = rStartPos.X() + GetPaperSize().Width() 
- aBulletArea.Left();
+aTextPos.X() = rStartPos.X() + GetPaperSize().Width() 
- aBulletArea.Right();
 }
 else
 {
@@ -980,7 +980,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point 
rStartPos,
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
 nLayoutMode = 
~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
 if ( bRightToLeftPara )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL;
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT;
 pOutDev-SetLayoutMode( nLayoutMode );
 
 if(bStrippingPortions)
@@ -997,7 +997,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point 
rStartPos,
 }
 
 DrawingText(aTextPos, pPara-GetText(), 0, 
pPara-GetText().getLength(), pBuf,
-aSvxFont, nPara, 0x, 0xFF, 0, 0, false, false, 
true, 0, Color(), Color());
+aSvxFont, nPara, 0x, bRightToLeftPara, 0, 0, 
false, false, true, 0, Color(), Color());
 
 delete[] pBuf;
 }
@@ -2095,36 +2095,4 @@ bool Outliner::HasParaFlag( const Paragraph* pPara, 
sal_uInt16 nFlag ) const
 return pPara  pPara-HasFlag( nFlag );
 }
 
-
-sal_Bool DrawPortionInfo::IsRTL() const
-{
-if(0xFF == mnBiDiLevel)
-{
-// Use Bidi functions from icu 2.0 to calculate if this portion
-// is RTL or not.
-UErrorCode nError(U_ZERO_ERROR);
-UBiDi* pBidi = ubidi_openSized(mrText.Len(), 0, nError);
-nError = U_ZERO_ERROR;
-
-// I do not have this info here. Is it necessary? I'll have to ask MT.
-const sal_uInt8 nDefaultDir = UBIDI_LTR; //IsRightToLeft( nPara ) ? 
UBIDI_RTL : UBIDI_LTR;
-
-ubidi_setPara(pBidi, reinterpret_castconst UChar 
*(mrText.GetBuffer()), mrText.Len(), nDefaultDir, NULL, nError);// UChar 
!= sal_Unicode in MinGW
-nError = U_ZERO_ERROR;
-
-int32_t nStart(0);
-int32_t nEnd;
-UBiDiLevel nCurrDir;
-
-ubidi_getLogicalRun(pBidi, nStart, nEnd, nCurrDir);
-
-ubidi_close(pBidi);
-
-// remember on-demand calculated state
-((DrawPortionInfo*)this)-mnBiDiLevel = nCurrDir;
-}
-
-return (1 == (mnBiDiLevel % 2));
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autodoc/source helpcontent2 writerfilter/qa

 autodoc/source/ary/doc/makefile.mk  |   47 
 autodoc/source/ary/idl/makefile.mk  |   78 
 autodoc/source/ary/info/makefile.mk |   51 -
 autodoc/source/ary/kernel/makefile.mk   |   51 -
 autodoc/source/ary_i/kernel/makefile.mk |   51 -
 autodoc/source/display/html/makefile.mk |   45 ---
 autodoc/source/display/idl/makefile.mk  |   68 -
 autodoc/source/display/kernel/makefile.mk   |   46 ---
 autodoc/source/display/toolkit/makefile.mk  |   55 --
 autodoc/source/exes/adc_uni/makefile.mk |   93 
 autodoc/source/parser/kernel/makefile.mk|   49 
 autodoc/source/parser/tokens/makefile.mk|   50 
 autodoc/source/parser_i/idl/makefile.mk |   75 ---
 autodoc/source/parser_i/idoc/makefile.mk|   53 -
 autodoc/source/parser_i/tokens/makefile.mk  |   54 -
 autodoc/source/tools/makefile.mk|   49 
 helpcontent2|2 
 writerfilter/qa/cppunittests/doctok/makefile.mk |   61 ---
 writerfilter/qa/cppunittests/odiapi/makefile.mk |   56 --
 writerfilter/qa/cppunittests/qname/makefile.mk  |   67 -
 20 files changed, 1 insertion(+), 1100 deletions(-)

New commits:
commit 23a133dfe7f7549fbafef81f736d9a3bc0c2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 25 10:53:15 2013 +

drop various dangling makefile.mks

Change-Id: Id76b57a1ef2edbb05f1d22a624caad077275ac74

diff --git a/autodoc/source/ary/doc/makefile.mk 
b/autodoc/source/ary/doc/makefile.mk
deleted file mode 100644
index e7beb57..000
--- a/autodoc/source/ary/doc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=ary_doc
-
-
-
-# --- Settings -
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files 
-
-
-OBJFILES= \
-$(OBJ)$/d_docu.obj  \
-$(OBJ)$/d_node.obj  \
-$(OBJ)$/d_oldidldocu.obj
-
-
-# --- Targets --
-
-.INCLUDE :  target.mk
diff --git a/autodoc/source/ary/idl/makefile.mk 
b/autodoc/source/ary/idl/makefile.mk
deleted file mode 100644
index 1691a2b..000
--- a/autodoc/source/ary/idl/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=ary_idl
-
-
-# --- Settings -
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files 
-
-
-OBJFILES= \
-$(OBJ)$/i_attribute.obj \
-$(OBJ)$/i_ce.obj\
-$(OBJ)$/i_ce2s.obj  \
-$(OBJ)$/i_comrela.obj   \
-$(OBJ)$/i_constant.obj  \
-$(OBJ)$/i_constgroup.obj\
-$(OBJ)$/i_enum.obj  \
-$(OBJ)$/i_enumvalue.obj \
-$(OBJ)$/i_exception.obj \
-$(OBJ)$/i_function.obj  \
-

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-02-25 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Petr Mladek pmla...@suse.cz changed:

   What|Removed |Added

 Depends on||60945

--- Comment #6 from Petr Mladek pmla...@suse.cz ---
Add 60945:  'File - Save as' shows 'Open' dialog instead of Save As dialog
= hard to safe files

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: xmlreader/Library_xmlreader.mk

 xmlreader/Library_xmlreader.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ab58bed9370cc8b70e0b20462f2bb0095daff96
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 25 11:56:46 2013 +0100

xmlreader does not depend on any offapi .idl files

Change-Id: I5f008ba23c7f55a53d2b39cb235b27208b7743c5

diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index 63d4b5f..d7356fb 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -49,6 +49,6 @@ $(eval $(call gb_Library_add_exception_objects,xmlreader,\
xmlreader/source/xmlreader \
 ))
 
-$(eval $(call gb_Library_use_sdk_api,xmlreader))
+$(eval $(call gb_Library_use_udk_api,xmlreader))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: moz module gbuildification?

Hi,

Did you try it on Windows with --enable-win-mozab-driver? For me the
build failed, moz headers were not in place when connectivity module
needed them.

Cheers,
Andras

On Sat, Feb 23, 2013 at 3:14 PM, Peter Foley pefol...@verizon.net wrote:
David,

I'm in the process of converting just the binary version of moz to gbuild
right now.

Peter

-Original Message- From: David Ostrovsky
Sent: Saturday, February 23, 2013 5:53 AM
To: Stephan Bergmann
Cc: pefol...@verizon.net ; libreoffice
Subject: Re: moz module gbuildification?

On 02/20/2013, Stephan Bergmann wrote:

So my take is that it would be worthwhile nevertheless to get moz
converted to gbuild now, and see dmake/build.pl removed soon.

the question is *what* should be gbuildified to see dmake/build.pl removed.
My understanding is, that we have two different moz operation modes:
prebuilt and native compilation from patched seamonkey 1.8 source tree.

It seems that native compilation was broken in this commit: [1]
BUILD_MOZAB was removed in config_host.mk.in
and vc8-moztools.zip under moz/donwload is missing.

But even after fixing that and downloading and copying vc8-moztools.zip
manually to the right location
and trying to compile it with the --with-visual-studio=2008 option i am
still getting that failure:

configure: error: This version of the MSVC compiler, 15.00.30729 , is
unsupported.

which bring us to the fact [2] that we apparently need MSVC 7.1 (or
earlier?) to compile seamonkey 1.8, that we don't support anyway.

Having said that I suggest to drop native compilation mode (i. e. all
sources, patches, etc.) and only partially gbuildify moz module:
prebuilt seamonkey mode, to be able to include binaries in release build.

I checked released 4.0.0.3 installation on windows: thunderbird address
book is working,
without be able to compile it in 4.0.0 tree, so we don't need the native
compilation mode
(that is broken) to produce release build anyway. In fact no one even
mentioned it.

[1]
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a0c53a961a0af21f69f592b43799cd635c994810
[2]
https://groups.google.com/forum/?fromgroups=#!topic/mozilla.dev.apps.thunderbird/AekntesqyHQ

David
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git:

 0 files changed

New commits:
commit 3262140e29afec66def33e73587b27b12e9ceba8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 25 09:41:33 2013 +

Updated core
Project: help  6e3f40c9ca05ba234fac04074f594530f2e89e75
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text

 helpers/help_hid.lst   |   28 -
 source/text/shared/00/0208.xhp |   60 ++---
 source/text/shared/01/02230401.xhp |   30 +-
 3 files changed, 45 insertions(+), 73 deletions(-)

New commits:
commit 6e3f40c9ca05ba234fac04074f594530f2e89e75
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 25 09:41:33 2013 +

update help ids for csv .ui conversion

Change-Id: Ibafa4f7f0578eebecac828c85422da2bb076bea3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f12e23e..7f71022 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6459,12 +6459,6 @@ 
reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_BOTTOMPAGE,1577861638,
 reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_N,1577861634,
 reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_N_OF_M,1577861635,
 reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_TOPPAGE,1577861637,
-sc_CheckBox_RID_SCDLG_ASCII_CB_ASONCE,1494697050,
-sc_CheckBox_RID_SCDLG_ASCII_CKB_COMMA,1494697014,
-sc_CheckBox_RID_SCDLG_ASCII_CKB_OTHER,1494697015,
-sc_CheckBox_RID_SCDLG_ASCII_CKB_SEMICOLON,1494697013,
-sc_CheckBox_RID_SCDLG_ASCII_CKB_SPACE,1494697012,
-sc_CheckBox_RID_SCDLG_ASCII_CKB_TAB,1494697011,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ADJUST,1493533722,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ALIGNMENT,1493533721,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_BORDER,1493533717,
@@ -6603,7 +6597,6 @@ sc_CheckBox_RID_SCPAGE_TABLE_BTN_PAGENO,957039641,
 sc_CheckBox_TP_VALIDATION_VALUES_CB_SHOWLIST,548275227,
 sc_CheckBox_TP_VALIDATION_VALUES_CB_SORTLIST,548275228,
 sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203,
-sc_ComboBox_RID_SCDLG_ASCII_CB_TEXTSEP,1494700041,
 sc_ComboBox_RID_SCDLG_DAPIDATA_CB_OBJECT,1495355413,
 sc_ComboBox_RID_SCDLG_DBNAMES_ED_NAME,2567327755,
 sc_ComboBox_RID_SCDLG_FILTER_ED_VAL1,2567082016,
@@ -6622,7 +6615,6 @@ sc_DateField_RID_SCDLG_DPDATEGROUP_ED_START,1495440897,
 sc_Edit_RID_SCDLG_AREAS_ED_PRINTAREA,2568275979,
 sc_Edit_RID_SCDLG_AREAS_ED_REPEATCOL,2568275999,
 sc_Edit_RID_SCDLG_AREAS_ED_REPEATROW,2568275989,
-sc_Edit_RID_SCDLG_ASCII_ED_OTHER,1494698040,
 sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575,
 sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_AREA,2568783885,
 sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_DATA,2568783889,
@@ -6734,8 +6726,6 @@ sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
 sc_ListBox_RID_SCDLG_AREAS_LB_PRINTAREA,2568277517,
 sc_ListBox_RID_SCDLG_AREAS_LB_REPEATCOL,2568277537,
 sc_ListBox_RID_SCDLG_AREAS_LB_REPEATROW,2568277527,
-sc_ListBox_RID_SCDLG_ASCII_LB_CHARSET,1494699524,
-sc_ListBox_RID_SCDLG_ASCII_LB_TYPE1,1494699543,
 sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257,
 sc_ListBox_RID_SCDLG_COLROWNAMERANGES_LB_RANGE,2568785419,
 sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_1,2568523266,
@@ -6822,7 +6812,6 @@ sc_MetricField_RID_SCDLG_ROW_MAN_ED_VALUE,1494948353,
 sc_MetricField_RID_SCDLG_ROW_OPT_ED_VALUE,1494964737,
 sc_MetricField_RID_SCPAGE_LAYOUT_MF_TAB,958208577,
 sc_MetricField_RID_SCPAGE_TABLE_ED_SCALEALL,957045280,
-sc_ModalDialog_RID_SCDLG_ASCII,1494695936,
 sc_ModalDialog_RID_SCDLG_CHARTCOLROW,1494515712,
 sc_ModalDialog_RID_SCDLG_COLORROW,1494368256,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
@@ -6853,7 +6842,6 @@ sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137,
 sc_MultiListBox_RID_SCDLG_LINKAREA_LB_RANGES,1495370761,
 sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657,
 sc_MultiListBox_RID_SCDLG_SHOW_TAB_LB_ENTRYLIST,1494993931,
-sc_NumericField_RID_SCDLG_ASCII_NF_AT_ROW,1494702140,
 sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
 sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593,
 sc_NumericField_RID_SCDLG_LINKAREA_NF_DELAY,1495373835,
@@ -6901,8 +6889,6 @@ sc_PushButton_RID_SCPAGE_USERLISTS_BTN_COPY,956846596,
 sc_PushButton_RID_SCPAGE_USERLISTS_BTN_NEW,956846593,
 sc_PushButton_RID_SCPAGE_USERLISTS_BTN_REMOVE,956846595,
 sc_PushButton_TP_VALIDATION_ERROR_BTN_SEARCH,548311578,
-sc_RadioButton_RID_SCDLG_ASCII_RB_FIXED,1494696450,
-sc_RadioButton_RID_SCDLG_ASCII_RB_SEPARATED,1494696449,
 sc_RadioButton_RID_SCDLG_COLORROW_BTN_GROUP_COLS,1494368769,
 sc_RadioButton_RID_SCDLG_COLORROW_BTN_GROUP_ROWS,1494368771,
 sc_RadioButton_RID_SCDLG_COLROWNAMERANGES_BTN_COLHEAD,2568782351,
diff --git a/source/text/shared/00/0208.xhp 
b/source/text/shared/00/0208.xhp
index 495018e..b2a97be 100644
--- a/source/text/shared/00/0208.xhp
+++ b/source/text/shared/00/0208.xhp
@@ -29,8 +29,8 @@
 /topic
 /meta
 body
-bookmark xml-lang=en-US branch=hid/sc:ModalDialog:RID_SCDLG_ASCII 
id=bm_id3148919 localize=false/paragraph role=heading id=hd_id3150960 
xml-lang=en-US level=1 l10n=U oldref=1Text Import/paragraph
-paragraph role=paragraph id=par_id3149987 xml-lang=en-US l10n=U 
oldref=2ahelp hid=SC:MODALDIALOG:RID_SCDLG_ASCIISets the import options 
for delimited data./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/textimportcsv/TextImportCsvDialog

Re: [PUSHED] [PUSHED] instsetoo_native: convert to gbuild

Hi,

On Sun, Feb 24, 2013 at 6:26 PM, David Ostrovsky (via Code Review)
ger...@gerrit.libreoffice.org wrote:
 Hi,

 Thank you for your patch!  It has been merged to LibreOffice.

 If you are interested in details, please visit

 https://gerrit.libreoffice.org/2242

This was a bit too fast for me. It does not work neither in
incremental, nor in clean build with my build config, which is nothing
special:
--with-distro=LibreOfficeWin32
--with-ant-home=c:/lo/apache-ant-1.8.4
--with-libmysql-path=c:/lo/libmysql
--with-vendor=Andras Timar
--enable-release-build
--without-doxygen
--disable-odk
--disable-ccache
--enable-ext-numbertext
--with-lang=en-US hu ja

I think the key feauture of my config, that it uses localizations, and
tinderboxes usually don't.
I get  ERROR: ERROR: Cannot open file
C:/lo/libo-master/workdir/wntmsci12.pro/CustomTarget/instsetoo_native/install/win_ulffiles/ActionTe.ulf
for reading at C:/lo/libo-master/solenv/bin/modules/installer/files.pm
line 55, which means there are some dependency poblems.

Best regards,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - officecfg/registry

2013-02-25 Thread Petr Mladek

 officecfg/registry/data/org/openoffice/Setup.xcu |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit b3f49f41be14c79b828963d339117a2475ef0006
Author: Petr Mladek pmla...@suse.cz
Date:   Fri Feb 22 14:38:08 2013 +0100

migrate even more configuration setting (fdo#57061)

+ application windows size
+ I was afraid to migrate any /org.openoffice.Setup stuff
  because there seemed to be many hardcoded values;
  But the parts mentioned in registrymodifications.xcu
  should be configurable and thus safe to migrate
+ âEnable macro recordingâ and âEnable experimental featuresâ 
options
+ sigh, we do not want to migrate
  /org.openoffice.Office.Common/Misc/FirstRun; thus we need to
  explicitely mention all the other items which is error prone
+ Tools/Options/LibreOffice/Paths/My documents
+ ah, the paths are handled on two locations: 
/org.openoffice.Office.Paths
  and /org.openoffice.Office.Common/Path
+ Macros
+ I was afraid to copy user/basic because there were some content
  out of box. I though that it might be version specific. In fact,
  the default content is just empty templates that look the same
  even in old releases = it should be secure to copy it after all

Change-Id: Ie1c04e9df36f6b6961bbaaeb922e29d64128ade4
Reviewed-on: https://gerrit.libreoffice.org/2339
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index b4e5e7c..6bca381 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -824,6 +824,7 @@
   value
 it.*/autotext/.*/it
 it.*/autocorr/.*/it
+it.*/basic/.*/it
 it.*/config/.*\.so[bcdegh]/it
 it.*/config/soffice.cfg/modules/.*/menubar/.*\.xml/it
 it.*/config/soffice.cfg/modules/.*/statusbar/.*\.xml/it
@@ -860,16 +861,23 @@
 it/org.openoffice.Office.Common/I18N/it
 it/org.openoffice.Office.Common/InternalMSExport/it
 it/org.openoffice.Office.Common/Load/it
+it/org.openoffice.Office.Common/Misc/AlwaysAllowSave/it
+
it/org.openoffice.Office.Common/Misc/DisableUICustomization/it
+it/org.openoffice.Office.Common/Misc/ExperimentalMode/it
 
it/org.openoffice.Office.Common/Misc/FormControlPilotsEnabled/it
+it/org.openoffice.Office.Common/Misc/MacroRecorderMode/it
 it/org.openoffice.Office.Common/Misc/PluginsEnabled/it
+
it/org.openoffice.Office.Common/Misc/ShowLinkWarningDialog/it
 it/org.openoffice.Office.Common/Misc/SymbolSet/it
+it/org.openoffice.Office.Common/Misc/SymbolStyle/it
+it/org.openoffice.Office.Common/Misc/ToolboxStyle/it
 it/org.openoffice.Office.Common/Misc/UseSystemFileDialog/it
 
it/org.openoffice.Office.Common/Misc/UseSystemPrintDialog/it
-it/org.openoffice.Office.Common/Misc/SymbolStyle/it
 
it/org.openoffice.Office.Common/Misc/FilePickerPlacesNames/it
 
it/org.openoffice.Office.Common/Misc/FilePickerPlacesUrls/it
 it/org.openoffice.Office.Common/ODF/it
 it/org.openoffice.Office.Common/Passwords/it
+it/org.openoffice.Office.Common/Path/it
 
it/org.openoffice.Office.Common/Print/PrintingModifiesDocument/it
 it/org.openoffice.Office.Common/Print/Warning/it
 it/org.openoffice.Office.Common/Vectorize/it
@@ -937,6 +945,11 @@
   value/org.openoffice.Office.Security/value
 /prop
   /node
+  node oor:name=Setup oor:op=replace
+prop oor:name=IncludedNodes
+  value/org.openoffice.Setup/Office/Factories/value
+/prop
+  /node
   node oor:name=UI oor:op=replace
 prop oor:name=IncludedNodes
   value/org.openoffice.Office.UI/ColorScheme/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - framework/source

2013-02-25 Thread Ivan Timofeev

 framework/source/services/backingwindow.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0779403109cf1248a71821631d6bb44a600d88a9
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Feb 22 23:04:18 2013 +0400

Start Center: update hardcoded borders to match the new images

Change-Id: Ib3dae9b06bcd2cfe5e73b723d9ea2e5856073651
(cherry picked from commit ecd8b349015ef43bc2407f6ebf2053cb7b3b6c6f)
Reviewed-on: https://gerrit.libreoffice.org/2341
Reviewed-by: Stefan Knorr heinzless...@gmail.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/framework/source/services/backingwindow.hxx 
b/framework/source/services/backingwindow.hxx
index fdacdbf..7999dd0 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -120,10 +120,10 @@ namespace framework
 static const int nItemId_Extensions = 1;
 static const int nItemId_Info = 3;
 static const int nItemId_TplRep = 4;
-static const int nShadowTop = 37;
-static const int nShadowLeft = 38;
-static const int nShadowRight = 38;
-static const int nShadowBottom = 38;
+static const int nShadowTop = 31;
+static const int nShadowLeft = 35;
+static const int nShadowRight = 45;
+static const int nShadowBottom = 40;
 
 void loadImage( const ResId i_rId, PushButton i_rButton );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90ef7668265e7187d61842ec8950aa91770a53da
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 22 12:19:06 2013 +0100

fdo#54087 build npsoplugin on Windows, it does not depend on GTK+ there

Change-Id: I033ee2316337dab549f1beddbfb7919a35d73c8e
Reviewed-on: https://gerrit.libreoffice.org/2334
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/configure.ac b/configure.ac
index bc36fc1..e293023 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8318,7 +8318,7 @@ dnl 
===
 dnl Check for NPAPI interface to plug LibreOffice into browser windows
 dnl ===
 AC_MSG_CHECKING([whether to plug LibreOffice into browser windows])
-if test $_os != Android -a $_os != Darwin -a $_os != iOS -a \
+if test $_os == WINNT -o $_os != Android -a $_os != Darwin -a $_os != 
iOS -a \
 $enable_headless != yes -a $enable_gtk != no
 then
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

 solenv/gbuild/Module.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c68c99ec8cedd51d24b5c946a02b56f63df9ce44
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 25 12:45:58 2013 +0100

Revert inadvertent change

Change-Id: I203ad92e8a006d1f262203852f05108706a90ee4

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 0025641..d20176a 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -134,7 +134,7 @@ help :
@cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
 
 showmodules :
-   $(warning $(strip $(gb_Module_ALLMODULES)))
+   $(info $(strip $(gb_Module_ALLMODULES)))
@true 
 
 translations : $(WORKDIR)/pot.done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - librelogo/source

2013-02-25 Thread László Németh

 librelogo/source/ChangeLog  |   23 
 librelogo/source/LibreLogo/LibreLogo.py |  158 ++--
 2 files changed, 136 insertions(+), 45 deletions(-)

New commits:
commit e5439ccf15308abf73833b927443057c5979a37a
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Sun Feb 24 04:06:43 2013 +0100

fdo#61376 librelogo: fix missing Asian and CTL support, etc.

Change-Id: If2d15d7b299d0b05e9fd3171d51c1f0e947ef561
Reviewed-on: https://gerrit.libreoffice.org/2354
Reviewed-by: Andras Timar ati...@suse.com
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog
index f5112b3..6fb47c3 100644
--- a/librelogo/source/ChangeLog
+++ b/librelogo/source/ChangeLog
@@ -1,3 +1,26 @@
+2012-02-24 LÃ¡szlÃ³ NÃ©meth:
+* fix Asian and CTL language support. Language recognition depends from the
+  UI language of LibreOffice and the language(s) of the document.
+* fix turtle shape, the problem with the old arrow-like turtle shape
+  reported by teachers and other users of turtle graphics
+* better consistency with the UI based position and rotation settings of 
the
+  turtle: now Drawing Object toolbar supports also the pen color, fill
+  color and transparency, also line width settings of the turtle.
+* real dotted line works with rectangles, also with rounded corners
+* restore original cursor position and selection at the end of the running
+  (problem reported by ViktÃ³ria LakÃ³)
+* fix 'sleep' (resulted by the new default non-integer division of Python 
3,
+  reported by Prof. Gilvan Vilarim)
+* fix 1-character length variable name/casing problem (reported by
+  Prof. Gilvan Vilarim)
+* fix false leading and ending function name recognition
+* support 'translation' of the selected text
+* fix bad line width settings after command 'home'
+* fix dot shape of dotted lines (remove its 0 width 'tail') by minimal dot
+  size of dotted lines: 1pt, and shorter 'tail' size
+* fix size of the rounded corners of the rectangle shape
+* rotation doesn't modify the size of the selection frame of the turtle
+
 2012-12-26 LÃ¡szlÃ³ NÃ©meth:
 * fix turtle position and rotation at repeated hideturtle/showturtle
 * add new languages, fix Czech and Brazilian Portuguese for
diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index f797758..2fa250d 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -24,7 +24,6 @@ if vnd.sun.star.pathname in urebootstrap:
 else:
 __lngpath__ = 
unohelper.fileUrlToSystemPath(re.sub(program/(fundamental.ini|fundamentalrc)$,
 , urebootstrap))
 __lngpath__ = __lngpath__ + share/Scripts/python/LibreLogo/.replace(/, 
os.sep)
-
 __translang__ = 
am|ca|cs|de|dk|el|en|eo|es|et|fr|hu|it|ja|nl|no|pl|pt|ru|se|sl # FIXME 
supported languages for language guessing, expand this list, according to the 
localizations
 __lng__ = {}
 __docs__ = {}
@@ -122,6 +121,7 @@ from com.sun.star.awt import Size as __Size__
 from com.sun.star.awt import WindowDescriptor as __WinDesc__
 from com.sun.star.awt.WindowClass import MODALTOP as __MODALTOP__
 from com.sun.star.awt.VclWindowPeerAttribute import OK as __OK__ 
+from com.sun.star.awt.VclWindowPeerAttribute import OK_CANCEL as __OK_CANCEL__ 
 from com.sun.star.awt.VclWindowPeerAttribute import YES_NO_CANCEL as 
__YES_NO_CANCEL__ # OK_CANCEL, YES_NO, RETRY_CANCEL, DEF_OK, DEF_CANCEL, 
DEF_RETRY, DEF_YES, DEF_NO
 from com.sun.star.awt.PushButtonType import OK as __Button_OK__
 from com.sun.star.awt.PushButtonType import CANCEL as __Button_CANCEL__
@@ -133,6 +133,10 @@ def __getprop__(name, value):
 p, p.Name, p.Value = __property__(), name, value
 return p
 
+__uilocale__ = 
uno.getComponentContext().ServiceManager.createInstance(com.sun.star.configuration.ConfigurationProvider).\
+
createInstanceWithArguments(com.sun.star.configuration.ConfigurationAccess,\
+(__getprop__(nodepath, 
/org.openoffice.Setup/L10N),)).getByName(ooLocale) + '-' # handle missing 
Country of locale 'eo'
+
 def __l12n__(lng):
 try:
 return __lng__[lng]
@@ -145,17 +149,16 @@ def __l12n__(lng):
 return None
 
 # dot for dotted line (implemented as an array of dot-headed arrows, because 
PostScript dot isn't supported by Writer)
+def __gendots__(n):
+return [__Point__(round(sin(360.0/n * i * pi/180.0) * 600), 
round(cos(360.0/n * i * pi/180) * 600)) for i in range(n)]
 __bezierdot__ = __Bezier__()
-__dots__ = []
-for i in range(32):
-__dots__ += [__Point__(round(sin(360.0/32 * i * pi/180.0) * 1000), 
round(cos(360.0/32 * i * pi/180) * 1000))]
-__bezierdot__.Coordinates = (tuple(__dots__),)

[Libreoffice-commits] core.git: vcl/source

2013-02-25 Thread Radek Doulik

 vcl/source/filter/wmf/winwmf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 199f0edc93e25ff8144f16599184049573154232
Author: Radek Doulik r...@novell.com
Date:   Mon Feb 25 12:53:56 2013 +0100

allow WMF's with missing EOF record

Change-Id: Ifb38336863979890f1bc3de779d82454b4a5c185

diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index ecdf04d..97a705b 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1188,7 +1188,7 @@ void WMFReader::ReadWMF()
   || pWMF-IsEof()
   )
 {
-if( pWMF-IsEof() )
+if( pWMF-IsEof()  nPos != nEndPos)
 pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
 
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: swext/mediawiki

 
swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
 |   12 --
 1 file changed, 12 deletions(-)

New commits:
commit 6ac759dde11267c91931a645bfafab6383403f3c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Feb 25 02:50:51 2013 +0100

remove specialcasing for old internal sun wiki

Change-Id: Idb8efc3f900172dea2ded6b7aa39e0b6f8fe49b7

diff --git 
a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
 
b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
index c96e7a8..729f80b 100644
--- 
a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
+++ 
b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
@@ -18,18 +18,6 @@
  --
 oor:component-data xmlns:oor=http://openoffice.org/2001/registry; 
xmlns:xs=http://www.w3.org/2001/XMLSchema; oor:name=WikiExtension 
oor:package=org.openoffice.Office.Custom
 node oor:name=SpecialData
-node oor:name=so-wiki.germany.sun.com oor:op=fuse
-prop oor:name=AllowUnknownCertificate
-valuetrue/value
-/prop
-node oor:name=AdditionalLoginArguments
-node oor:name=wpDomain oor:op=fuse
-prop oor:name=Value
-valuesun/value
-/prop
-/node
-/node
-/node
 /node
 
 node oor:name=ConnectionList
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - extensions/source

 extensions/source/macosx/spotlight/OOoSpotlightImporter.m |   27 +++---
 1 file changed, 22 insertions(+), 5 deletions(-)

New commits:
commit f04accd329a4fdea0941b24845e3c74b59afae62
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Feb 19 17:10:50 2013 +0200

Fix scan for central directory end signature in ODF in Spotlight importer

Once this was fixed it seems to work nicely. Add keywords in
File:Properties and they show up in Finder's Properties, and Spotlight
finds text from the document contents.

(cherry picked from commit b8da61acb2bb887a7335a5db82b8b5ae1e0fab69)
(cherry picked from commit 95e6a0885e65cc57b11719cc0658be9d8b78fba9)

Change-Id: I9adc65d1821d0920ce3a39d05697557c4303ff68
Reviewed-on: https://gerrit.libreoffice.org/2266
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m 
b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index 964b627..3a72d53 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -208,21 +208,38 @@ static bool areHeadersConsistent(const LocalFileHeader 
*header, const CentralDir
 
 static bool findCentralDirectoryEnd(NSFileHandle *file)
 {
+// Assume the cdir end is in the last 1024 bytes
+// Scan backward from end of file for the end signature
+
 [file seekToEndOfFile];
 unsigned long long fileLength = [file offsetInFile];
-[file seekToFileOffset: 0];
 
-while ([file offsetInFile]  fileLength)
+if (fileLength  10)
+return false;
+
+[file seekToFileOffset: (fileLength - 4)];
+
+unsigned long long limit;
+if (fileLength  1024)
+limit = fileLength - 1024;
+else
+limit = 0;
+
+unsigned long long offset;
+while ((offset = [file offsetInFile])  limit)
 {
-unsigned long long offset = [file offsetInFile];
 unsigned signature = readInt(file);
 if (signature == CDIR_END_SIG)
 {
-[file seekToFileOffset: (offset - 4)];
+// Seek back over the CDIR_END_SIG
+[file seekToFileOffset: offset];
 return true;
 }
 else
-[file seekToFileOffset: (offset - 3)];
+{
+// Seek one byte back
+[file seekToFileOffset: (offset - 1)];
+}
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2013-02-25 Thread Chris

 vcl/source/app/svmain.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit f37335da6a87ae858ca2ff08adca92f67068988f
Author: Chris chris.sherloc...@gmail.com
Date:   Mon Feb 25 23:00:09 2013 +1100

Remove unnecessary commented code that appears to do nothing whatsoever.

Change-Id: Ic548b8b0b4a9111f24fe0036bb50abaef03f4a2f
Reviewed-on: https://gerrit.libreoffice.org/2382
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 9b83c6d..7f22828 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -259,9 +259,6 @@ sal_Bool InitVCL()
 }
 InitSalMain();
 
-/*AllSettings aAS;
-Application::SetSettings( aAS );// ???
-*/
 ImplSVData* pSVData = ImplGetSVData();
 
 // SV bei den Tools anmelden
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basebmp/test

2013-02-25 Thread Ricardo Montania

 basebmp/test/bmpdemo.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbf28e966191114860a2e60ae8ed6bf3cc064b38
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Sat Feb 23 10:10:27 2013 -0300

CreateFromAscii removal

Change-Id: I4596d78620936770f3aca3207cdc19f71197eb75
Reviewed-on: https://gerrit.libreoffice.org/2345
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index a7f39fc..1382cc5 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -1189,7 +1189,7 @@ USHORT TestApp::Exception( USHORT nError )
 switch( nError  EXC_MAJORTYPE )
 {
 case EXC_RSCNOTLOADED:
-Abort( String::CreateFromAscii( Error: could not load language 
resources.\nPlease check your installation.\n ) );
+Abort( Error: could not load language resources.\nPlease check 
your installation.\n );
 break;
 }
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - accessibility/source vcl/inc vcl/source

 accessibility/source/helper/acc_factory.cxx |8 +---
 vcl/inc/vcl/popupmenuwindow.hxx |3 +++
 vcl/source/window/popupmenuwindow.cxx   |6 ++
 vcl/source/window/window.cxx|   12 +---
 4 files changed, 23 insertions(+), 6 deletions(-)

New commits:
commit b1bc16f5b342ac9c54201cfd30de3ea87bc20538
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 15 17:12:00 2013 +

Resolves: rhbz#895196 sc filter float a11y parent of itself loop/recurse

Change-Id: I3679e7cfcd32a78b40c6a7b803c92ff0abe6f32c
(cherry picked from commit 1b13c952f50aab2b907dab13395ab23d0955c238)
Reviewed-on: https://gerrit.libreoffice.org/2261
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/accessibility/source/helper/acc_factory.cxx 
b/accessibility/source/helper/acc_factory.cxx
index dc16fe6..93f6bf5 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -382,9 +382,11 @@ inline bool hasFloatingChild(Window *pWindow)
 }
 else if ( nType == WINDOW_BORDERWINDOW  hasFloatingChild( 
pWindow ) )
 {
-PopupMenuFloatingWindow* pChild = 
dynamic_castPopupMenuFloatingWindow*(
-pWindow-GetAccessibleChildWindow(0));
-if ( pChild  pChild-IsPopupMenu() )
+// The logic here has to match that of 
Window::GetAccessibleParentWindow in
+// vcl/source/window/window.cxx to avoid 
PopupMenuFloatingWindow
+// becoming a11y parents of themselves
+Window* pChild = pWindow-GetAccessibleChildWindow(0);
+if (PopupMenuFloatingWindow::isPopupMenu(pChild))
 {
 // Get the accessible context from the child window.
 ReferenceXAccessible xAccessible = 
pChild-CreateAccessible();
diff --git a/vcl/inc/vcl/popupmenuwindow.hxx b/vcl/inc/vcl/popupmenuwindow.hxx
index 57b7747..a5856dc 100644
--- a/vcl/inc/vcl/popupmenuwindow.hxx
+++ b/vcl/inc/vcl/popupmenuwindow.hxx
@@ -34,6 +34,9 @@ public:
 sal_uInt16  GetMenuStackLevel() const;
 voidSetMenuStackLevel( sal_uInt16 nLevel );
 boolIsPopupMenu() const;
+
+//determine if a given window is an activated PopupMenuFloatingWindow
+static bool isPopupMenu(const Window *pWindow);
 };
 
 #endif
diff --git a/vcl/source/window/popupmenuwindow.cxx 
b/vcl/source/window/popupmenuwindow.cxx
index e5e773a..7a03794 100644
--- a/vcl/source/window/popupmenuwindow.cxx
+++ b/vcl/source/window/popupmenuwindow.cxx
@@ -67,4 +67,10 @@ bool PopupMenuFloatingWindow::IsPopupMenu() const
 return mpImplData-mnMenuStackLevel != 
::std::numeric_limitssal_uInt16::max();
 }
 
+bool PopupMenuFloatingWindow::isPopupMenu(const Window *pWindow)
+{
+const PopupMenuFloatingWindow* pChild = dynamic_castconst 
PopupMenuFloatingWindow*(pWindow);
+return pChild  pChild-IsPopupMenu();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bf7da99..05d979a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -47,6 +47,7 @@
 #include vcl/unowrap.hxx
 #include vcl/gdimtf.hxx
 #include vcl/pdfextoutdevdata.hxx
+#include vcl/popupmenuwindow.hxx
 #include vcl/lazydelete.hxx
 #include vcl/virdev.hxx
 
@@ -8635,10 +8636,15 @@ Window* Window::GetAccessibleParentWindow() const
 pWorkWin = pWorkWin-mpWindowImpl-mpNext;
 pParent = pWorkWin;
 }
-// If this a floating window which has a native boarder window, this one 
should be reported as
-// accessible parent
+// If this is a floating window which has a native border window, then 
that border should be reported as
+// the accessible parent, unless the floating window is a 
PopupMenuFloatingWindow
+//
+// The logic here has to match that of 
AccessibleFactory::createAccessibleContext in
+// accessibility/source/helper/acc_factory.cxx to avoid 
PopupMenuFloatingWindow
+// becoming a11y parents of themselves
 else if( GetType() == WINDOW_FLOATINGWINDOW 
-mpWindowImpl-mpBorderWindow  
mpWindowImpl-mpBorderWindow-mpWindowImpl-mbFrame)
+mpWindowImpl-mpBorderWindow  
mpWindowImpl-mpBorderWindow-mpWindowImpl-mbFrame 
+!PopupMenuFloatingWindow::isPopupMenu(this))
 {
 pParent = mpWindowImpl-mpBorderWindow;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source

 extensions/source/macosx/spotlight/OOoSpotlightImporter.m |   27 +++---
 1 file changed, 22 insertions(+), 5 deletions(-)

New commits:
commit 5cb823aa71981c1fb13872e67e74bf5027f46cd0
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Feb 19 17:10:50 2013 +0200

Fix scan for central directory end signature in ODF in Spotlight importer

Once this was fixed it seems to work nicely. Add keywords in
File:Properties and they show up in Finder's Properties, and Spotlight
finds text from the document contents.

(cherry picked from commit b8da61acb2bb887a7335a5db82b8b5ae1e0fab69)
(cherry picked from commit 95e6a0885e65cc57b11719cc0658be9d8b78fba9)

Change-Id: I9adc65d1821d0920ce3a39d05697557c4303ff68
Reviewed-on: https://gerrit.libreoffice.org/2265
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m 
b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index 964b627..3a72d53 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -208,21 +208,38 @@ static bool areHeadersConsistent(const LocalFileHeader 
*header, const CentralDir
 
 static bool findCentralDirectoryEnd(NSFileHandle *file)
 {
+// Assume the cdir end is in the last 1024 bytes
+// Scan backward from end of file for the end signature
+
 [file seekToEndOfFile];
 unsigned long long fileLength = [file offsetInFile];
-[file seekToFileOffset: 0];
 
-while ([file offsetInFile]  fileLength)
+if (fileLength  10)
+return false;
+
+[file seekToFileOffset: (fileLength - 4)];
+
+unsigned long long limit;
+if (fileLength  1024)
+limit = fileLength - 1024;
+else
+limit = 0;
+
+unsigned long long offset;
+while ((offset = [file offsetInFile])  limit)
 {
-unsigned long long offset = [file offsetInFile];
 unsigned signature = readInt(file);
 if (signature == CDIR_END_SIG)
 {
-[file seekToFileOffset: (offset - 4)];
+// Seek back over the CDIR_END_SIG
+[file seekToFileOffset: offset];
 return true;
 }
 else
-[file seekToFileOffset: (offset - 3)];
+{
+// Seek one byte back
+[file seekToFileOffset: (offset - 1)];
+}
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] also move --enable swiches to m4/ for extensions

2013-02-25 Thread via Code Review

Björn Michaelsen has uploaded a new patch set (#3).

Change subject: also move --enable swiches to m4/ for extensions
..

also move --enable swiches to m4/ for extensions

Change-Id: I72df67fae5fd78cd9d3f69d4be218c866b4b881d
---
M configure.ac
M m4/libo_check_extension.m4
2 files changed, 17 insertions(+), 68 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/2369/3
-- 
To view, visit https://gerrit.libreoffice.org/2369
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I72df67fae5fd78cd9d3f69d4be218c866b4b881d
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac

 configure.ac |   34 --
 1 file changed, 34 deletions(-)

New commits:
commit 62bf424fa84b0ccd0828a474a1351b0134f27eab
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sun Feb 24 22:13:23 2013 +0100

remove dead code

Change-Id: I1dd71baf48a0b5b62c73c9f8f071ff67520cc771
Reviewed-on: https://gerrit.libreoffice.org/2383
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/configure.ac b/configure.ac
index 1e390d7..427b908 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1241,13 +1241,6 @@ AC_ARG_WITH(afms,
  are known to be available.]),
 ,)
 
-AC_ARG_WITH(agfa-monotype-fonts,
- AS_HELP_STRING([--with-agfa-monotype-fonts],
-  [This switch should only be enabled for those who have the right
-   to use or distribute the proprietary Agfa Monotype
-   fonts.]),
-,)
-
 AC_ARG_WITH(epm,
 AS_HELP_STRING([--with-epm],
 [Decides which epm to use. Default is to use the one from the system if
@@ -6722,14 +6715,6 @@ AC_SUBST(x_JAVALIB)
 AC_SUBST(x_JDKLIB)
 
 dnl ===
-dnl Checks for specific files.
-dnl ===
-
-dnl ===
-dnl Checks for programs.
-dnl ===
-
-dnl ===
 dnl Check whether we already have dmake
 dnl ===
 AC_PATH_PROG(DMAKE, dmake, no)
@@ -10780,25 +10765,6 @@ else
 fi
 AC_SUBST(WITH_FONTS)
 
-
-# The agfa monotype fonts options seems broken
-# there is no assocaited entry in Makefile.fetch
-# so we do not fetch the dependencies
-# there is no tie-up with MORE_FONTS, but in dmake mode
-# without more_fonts that option is meaningless
-# so I suspect it is not really used anymore, commenting out for now
-#AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
-#if test $with_agfa_monotype_fonts = yes; then
-#AC_MSG_RESULT([yes])
-#WITH_AGFA_MONOTYPE_FONTS=YES
-#SCPDEFS=$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS
-#BUILD_TYPE=$BUILD_TYPE AGFA_MONOTYPE_FONTS
-#else
-#AC_MSG_RESULT([no])
-#WITH_AGFA_MONOTYPE_FONTS=NO
-#fi
-#AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
-
 dnl ===
 dnl Test whether to include ppds
 dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

 solenv/bin/gen_update_info.pl |  167 --
 1 file changed, 167 deletions(-)

New commits:
commit ff4ed8422874e1624840366b14496885c49a9dbb
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Feb 25 13:36:56 2013 +0100

gen_update_info.pl not needed, we generate the update info on the server.

Change-Id: Ib841747b10a1d0cda54b2b05a813760d1a50a3fa

diff --git a/solenv/bin/gen_update_info.pl b/solenv/bin/gen_update_info.pl
deleted file mode 100644
index fe033c6..000
--- a/solenv/bin/gen_update_info.pl
+++ /dev/null
@@ -1,167 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+$@}'
-if 0;
-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-
-#*
-#
-# main
-#
-
-my($product, $buildid, $id, $os, $arch, $lstfile, $languages, $productname, 
$productversion, $productedition);
-
-while ($_ = $ARGV[0], /^-/) {
-shift;
-last if /^--$/;
-if (/^--product/) {
-$product= $ARGV[0];
-shift;
-}
-if (/^--buildid/) {
-$buildid = $ARGV[0];
-shift;
-}
-if (/^--os/) {
-$os = $ARGV[0];
-shift;
-}
-if (/^--arch/) {
-$arch = $ARGV[0];
-shift;
-}
-if (/^--lstfile/) {
-$lstfile = $ARGV[0];
-shift;
-}
-if (/^--languages/) {
-$languages = $ARGV[0];
-shift;
-}
-}
-
-$sourcefile = $ARGV[0];
-
-if( $^O =~ /cygwin/i ) {
-# We might get paths with backslashes, fix that.
-$lstfile =~ s/\\/\//g;
-$sourcefile =~ s/\\/\//g;
-}
-
-# read openoffice.lst
-# reading Globals section
-unless(open(LSTFILE, sed -n \/^Globals\$/,/^}\$/ p\ $lstfile |)) {
-print STDERR Can't open $lstfile file: $!\n;
-return;
-}
-
-while (LSTFILE) {
-if( /\bPRODUCTNAME / ) {
-chomp;
-s/.*PRODUCTNAME //;
-$productname = $_;
-}
-if( /\bPACKAGEVERSION / ) {
-chomp;
-s/.*PACKAGEVERSION //;
-$productversion = $_;
-}
-if( /\bPRODUCTEDITION / ) {
-chomp;
-s/.*PRODUCTEDITION //;
-$productedition = $_;
-}
-}
-
-close(LSTFILE);
-
-### may be hierarchical ...
-if(open(LSTFILE, sed -n \/^$product:/,/^}\$/ p\ $lstfile |)) {
-while (LSTFILE) {
-if ( /^$product\s?:\s?(\w+)$/ ) {
-$product = $1;
-}
-if( /\bPRODUCTEDITION / ) {
-chomp;
-s/.*PRODUCTEDITION //;
-$productedition = $_;
-}
-}
-}
-close(LSTFILE);
-
-# Reading product specific settings
-
-unless(open(LSTFILE, sed -n \/^$product\$/,/^}\$/ p\ $lstfile |)) {
-print STDERR Can't open $lstfile file: $!\n;
-return;
-}
-
-while (LSTFILE) {
-if( /\bPRODUCTNAME / ) {
-chomp;
-s/.*PRODUCTNAME //;
-$productname = $_;
-}
-if( /\bPACKAGEVERSION / ) {
-chomp;
-s/.*PACKAGEVERSION //;
-$productversion = $_;
-}
-if( /\bPRODUCTEDITION / ) {
-chomp;
-s/.*PRODUCTEDITION //;
-$productedition = $_;
-}
-}
-
-close(LSTFILE);
-
-# simulate the behavior of make_installer.pl when writing versionrc
-unless( $os eq Windows ) {
-  $languages =~ s/_.*//;
-}
-
-$id = $productversion;
-$id =~ s/\..*//;
-$id = $productname . _ . $id . _ . $languages;
-
-# open input file
-unless (open(SOURCE, $sourcefile)) {
-print STDERR Can't open $sourcefile file: $!\n;
-return;
-}
-
-while (SOURCE) {
-   s/:id/:id$id/;
-   s/buildid/buildid$buildid/;
-   s/os/os$os/;
-   s/arch/arch$arch/;
-   if ( $productedition ) {
-   s/edition/edition$productedition/;
-   } else {
-   next if ( /edition/ );
-   }
-   s/version/version$productversion/;
-   s/name/name$productname/;
-   print;
-}
-
-close(SOURCE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 423932fe1849a2c9e2f4c1730a93435f39657e95
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Feb 25 13:46:37 2013 +0100

slashes in configure options are a Bad Thing(tm)

Change-Id: I92cc8be5c6359e99b57967ae54e6814d07d0e47d

diff --git a/configure.ac b/configure.ac
index 427b908..028bfa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8215,7 +8215,7 @@ AC_SUBST(EXTMSV80)
 dnl ===
 dnl Check for system NSS
 dnl ===
-libo_CHECK_SYSTEM_MODULE([nss/nspr],[NSS],[nss = 3.9.3 nspr = 4.8])
+libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss = 3.9.3 nspr = 4.8])
 if test $with_system_nss = yes; then
 libo_MINGW_CHECK_DLL([NSPR4], [libnspr4])
 libo_MINGW_CHECK_DLL([PLC4], [libplc4])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/uiconfig vcl/inc vcl/source

 sc/uiconfig/scalc/ui/sortoptionspage.ui |2 +-
 vcl/inc/vcl/outdev.hxx  |1 +
 vcl/source/control/combobox.cxx |4 +---
 vcl/source/control/lstbox.cxx   |4 +---
 vcl/source/gdi/outdev3.cxx  |5 +
 vcl/source/window/window.cxx|2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit c1d3315e8d1e4d8be4bcabcf343ef5dd76d63691
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 25 12:41:29 2013 +

Related: fdo#60764 APPFONT is 1/8 avg char *height*  1/4 avg char *width*

but *sob*, it's not really that, because there's a dialog scale factor 
which is
per-language which adds a bit to it depending on the language, 
MAP_REALAPPFONT
is the unscaled variant.

but *head in hands*, it's not really that either because if the font was
considered too narrow then the average char width is recalculated in 
terms of
the average char height.

*clenches teeth*, add a approximate_char_width and use it directly. It can 
be
considered the rough equivalent of
pango_font_metrics_get_approximate_char_width albeit that it retains the 
same
crude 1/8 of the width of aemnnxEM

Change-Id: I4c135ca03467447dddf279ac0c187b13371acadb

diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui 
b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index 0fc7eeb..f6815af 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -168,7 +168,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=margin_left20/property
-property name=max_width_chars72/property
+property name=max_width_chars65/property
 accessibility
   relation type=labelled-by target=sortuser/
 /accessibility
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 0eba3a1..1fb5f25 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -580,6 +580,7 @@ public:
   xub_StrLen nLen = STRING_LEN ) const;
 /// Height where any character of the current font fits; in logic 
coordinates.
 longGetTextHeight() const;
+float   approximate_char_width() const;
 voidDrawTextArray( const Point rStartPt, const XubString 
rStr,
const sal_Int32* pDXAry = NULL,
xub_StrLen nIndex = 0,
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 5f9de77..8356a52 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1066,9 +1066,7 @@ Size ComboBox::CalcMinimumSize() const
 aSz.Width() = mpImplLB-GetMaxEntryWidth();
 if (m_nMaxWidthChars != -1)
 {
-//MAP_APPFONT == 1/8th avg char
-long nMaxWidth = LogicToPixel(Size(m_nMaxWidthChars * 8, 0),
-MapMode(MAP_APPFONT)).Width();
+long nMaxWidth = m_nMaxWidthChars * approximate_char_width();
 aSz.Width() = std::min(aSz.Width(), nMaxWidth);
 }
 aSz.Width() += getMaxWidthScrollBarAndDownButton();
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index d87c1b3..8880818 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1348,9 +1348,7 @@ Size ListBox::CalcSubEditSize() const
 
 if (m_nMaxWidthChars != -1)
 {
-//MAP_APPFONT == 1/8th avg char
-long nMaxWidth = LogicToPixel(Size(m_nMaxWidthChars * 8, 0),
-MapMode(MAP_APPFONT)).Width();
+long nMaxWidth = m_nMaxWidthChars * approximate_char_width();
 aSz.Width() = std::min(aSz.Width(), nMaxWidth);
 }
 
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 741ddbb..44a4e96 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5759,6 +5759,11 @@ long OutputDevice::GetTextHeight() const
 return nHeight;
 }
 
+float OutputDevice::approximate_char_width() const
+{
+return GetTextWidth(rtl::OUString(aemnnxEM)) / 8.0;
+}
+
 // ---
 
 void OutputDevice::DrawTextArray( const Point rStartPt, const String rStr,
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 309c8a3..8c6ac82 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -211,7 +211,7 @@ void Window::ImplInitAppFontData( Window* pWindow )
 {
 ImplSVData* pSVData = ImplGetSVData();
 long nTextHeight = pWindow-GetTextHeight();
-long nTextWidth = pWindow-GetTextWidth(rtl::OUString(aemnnxEM));
+long nTextWidth = pWindow-approximate_char_width() * 8;
 long nSymHeight = nTextHeight*4;

Re: issue building master: new dependency ?

On Mon, Feb 25, 2013 at 06:38:16AM +0100, Jean-Baptiste Faure wrote:
 Hi,
 
 Since yesterday I have the following error message when I build the master:
  checking for gnutls libraries = 0.8.1... no
  checking for mscrypto libraries... none
  checking for crypto library... configure: error: At least one crypto
  library should exist for xmlsec1
  make[1]: ***
  [/home/jbf/LibO/master/workdir/unxlngx6.pro/ExternalProject/xmlsec/build]
  Erreur 1
 Is it possible that some recent patch introduced a new dependency? I do
 not know exactly when the problem appeared  because I did not build the
 master for several days last week.

It seems to me this is fixed with:

 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=423932fe1849a2c9e2f4c1730a93435f39657e95;hp=ff4ed8422874e1624840366b14496885c49a9dbb

in which case it was also me breaking it. Sorry for that.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: autodoc/inc editeng/inc sal/inc starmath/source sw/source unotools/inc

2013-02-25 Thread sadam36

 autodoc/inc/ary/qualiname.hxx   |2 +-
 editeng/inc/editeng/svxacorr.hxx|2 +-
 sal/inc/rtl/bootstrap.h |2 +-
 sal/inc/rtl/string.h|2 +-
 sal/inc/rtl/string.hxx  |2 +-
 sal/inc/rtl/ustring.h   |2 +-
 sal/inc/rtl/ustring.hxx |2 +-
 starmath/source/rect.cxx|2 +-
 sw/source/ui/lingu/hhcwrp.cxx   |2 +-
 unotools/inc/unotools/digitgroupingiterator.hxx |2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 93a974421208babdb4b2090f92acf4f0c14cc37d
Author: sadam36 sada...@gmail.com
Date:   Sun Feb 24 21:33:12 2013 +0100

fdo#60724 - change 'charcter' to 'character'

Changed all occurrences of 'charcter' found by git grep. All of them
were used in comments only, so it should not break anything.

Change-Id: Ief2c00d929ae7972c55a4920fc0eaa8d6b18ab82
Reviewed-on: https://gerrit.libreoffice.org/2372
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/autodoc/inc/ary/qualiname.hxx b/autodoc/inc/ary/qualiname.hxx
index 1c1e206..8625161 100644
--- a/autodoc/inc/ary/qualiname.hxx
+++ b/autodoc/inc/ary/qualiname.hxx
@@ -60,7 +60,7 @@ class QualifiedName
 booli_bAbsolute )
 { Empty(); bIsAbsolute = 
i_bAbsolute; }
 /** Reads a qualified name from a string.
-If the last two charcters are (), the inquiry IsFunction() will 
return
+If the last two characters are (), the inquiry IsFunction() will 
return
 true.
 */
 voidAssignText(
diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index f58dff1..26d1ae5 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -421,7 +421,7 @@ public:
 
 static long GetDefaultFlags();
 
-// returns sal_True for charcters where the function
+// returns sal_True for characters where the function
 // 'SvxAutoCorrect::AutoCorrect' should be called.
 // (used to avoid occasional 'collisions' with (Thai) input-sequence-checking)
 static sal_Bool IsAutoCorrectChar( sal_Unicode cChar );
diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h
index 1b53221..76795ba 100644
--- a/sal/inc/rtl/bootstrap.h
+++ b/sal/inc/rtl/bootstrap.h
@@ -71,7 +71,7 @@ extern C {
NAMING CONVENTIONS p
 
Naming conventions for names of bootstrap values :
-   Names may only include characters, that are allowed charcters for
+   Names may only include characters, that are allowed characters for
environment variables. This excludes '.', ' ', ';', ':' and any non-ascii
character. Names are case insensitive.p
 
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index b24cc52..6fc83491 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -1030,7 +1030,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_string_newConcat( 
rtl_String ** newStr, rtl_Stri
 the length of str, inclusive.
 
 @param count
-the number of charcters to remove.  Must not be negative, and the sum of
+the number of characters to remove.  Must not be negative, and the sum of
 index and count must not exceed the length of str.
 
 @param subStr
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 1e5aca0..90544ac 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -1134,7 +1134,7 @@ public:
   @param  index   the replacing index in str.
   The index must be greater or equal as 0 and
   less or equal as the length of the string.
-  @param  count   the count of charcters that will replaced
+  @param  count   the count of characters that will replaced
   The count must be greater or equal as 0 and
   less or equal as the length of the string minus index.
   @param  newStr  the new substring.
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index 35be5fe..23ea47a 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -1435,7 +1435,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uString_newConcat(
 the length of str, inclusive.
 
 @param count
-the number of charcters to remove.  Must not be negative, and the sum of
+the number of characters to remove.  Must not be negative, and the sum of
 index and count must not exceed the length of str.
 
 @param subStr
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 1742c35..1794bf4 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -1495,7 +1495,7 @@ public:
   @param  index   the replacing index in str.
   The index must be greater than or equal to 0 and

[Libreoffice-commits] core.git: 7 commits - bin/get-bugzilla-attachments-by-mimetype cppcanvas/source cppuhelper/source solenv/gbuild svtools/inc vcl/source

 bin/get-bugzilla-attachments-by-mimetype |1 
 cppcanvas/source/mtfrenderer/emfplus.cxx |   11 +++-
 cppuhelper/source/shlib.cxx  |   42 ---
 solenv/gbuild/ComponentTarget.mk |4 ++
 svtools/inc/svtools/transfer.hxx |7 +
 vcl/source/filter/wmf/emfwr.cxx  |   15 ++-
 vcl/source/gdi/gdimtf.cxx|8 -
 7 files changed, 59 insertions(+), 29 deletions(-)

New commits:
commit 6e18e1f54b7527e012f67a3b7f307be4e293
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 25 14:03:35 2013 +0100

get-bugzilla-attachments-by-mimetype: add application/vnd.visio.xml

Change-Id: I113f7bf3fd4194011efe83b1776ca42ad489f652

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index 6d5177b..ebdd2d1 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -280,6 +280,7 @@ mimetypes = {
 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': 
'docx',
 'application/vnd.openxmlformats-officedocument.wordprocessingml.template': 
'dotx',
 'application/vnd.visio': 'vsd',
+'application/vnd.visio.xml': 'vdx',
 # W3C
 'application/xhtml+xml': 'xhtml',
 'application/mathml+xml': 'mml',
commit bf8450cfa2e9e899c716fbddadd7d5485aefe520
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 25 13:22:07 2013 +0100

fdo#59405 fdo#60638: EMFWriter::ImplWrite: write EMF_PLUS comments

When editing the Visio OLE object, there is a preview file generated,
which is apparently an EMF file (strangely initially inserting the Visio
object seems to result in a totally unproblematic WMF file).
The EMF file apparently has almost its entire content stored in
MetaCommentAction of type EMF_PLUS, which is thrown away when writing
the file again.

Change-Id: I77a08454da673c1825aaa8421606737e7e8bc82c

diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index b5af460..603ca06 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -1601,12 +1601,25 @@ void EMFWriter::ImplWrite( const GDIMetaFile rMtf )
 break;
 }
 
+case( META_COMMENT_ACTION ):
+{
+MetaCommentAction const*const pCommentAction(
+static_castMetaCommentAction const*(pAction));
+if (pCommentAction-GetComment() == EMF_PLUS)
+{
+ImplBeginCommentRecord(WIN_EMR_COMMENT_EMFPLUS);
+m_rStm.Write(pCommentAction-GetData(),
+ pCommentAction-GetDataSize());
+ImplEndCommentRecord();
+}
+}
+break;
+
 case( META_MASK_ACTION ):
 case( META_MASKSCALE_ACTION ):
 case( META_MASKSCALEPART_ACTION ):
 case( META_WALLPAPER_ACTION ):
 case( META_TEXTLINE_ACTION ):
-case( META_COMMENT_ACTION ):
 case( META_GRADIENTEX_ACTION ):
 {
 // !!!  we don't want to support these actions
commit ec0d1440cf07008a220708535848567bcbb233ea
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 25 13:15:19 2013 +0100

fdo#59405: cppcanvas: fix infinite loop in processEMFPlus

This can be observed when inserting the bugdoc from fdo#59405.
Apparently the size and length do not agree; ensure that the
length does not underflow.

Change-Id: Idfc68919859b8284c724831de21208e4392af328

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f1b0eff..0c9db41 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1763,7 +1763,16 @@ namespace cppcanvas
 
 rMF.Seek (next);
 
-length -= size;
+if (size = length)
+{
+length -= size;
+}
+else
+{
+SAL_WARN(cppcanvas, ImplRenderer::processEMFPlus: 
+size   sizelength   length);
+length = 0;
+}
 }
 }
 }
commit 0cf6433117477642897fb2d874a4353eff8a1f35
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 25 13:11:04 2013 +0100

fdo#59405: initialize members of TransferableObjectDescriptor

The mnViewAspect member is otherwise only initialized if a
SOT_FORMATSTR_ID_OBJECTDESCRIPTOR thingy is in the clipboard, which only
happens if the clipboard source is OOo/LO.
When inserting an OLE object, the value MSOLE_CONTENT apparently results
in requesting the current size from the OLE object, which looks much
better than the square default.

Change-Id: I8c7fb80a8ae88272f1ecaf3a375bef5d917f2a5b

Re: REMINDER: Release 4.0.1.2 from libreoffice-4-0-1 branch

2013-02-25 Thread Petr Mladek

Petr Mladek píše v Čt 21. 02. 2013 v 15:16 +0100:
 Hi,
 
 please note that the commit deadline for 4.0.1.2, aka rc2, is
 already on Monday, February 25, 2013. It will be used as LO-4.0.1
 final if no blocker is reported.

Let's postpone the commit deadline by one day and do the tag on
Wednesday morning. The 4.0.1.1 build have been officially available only
since Thursday. There is only one week between these rcs, so rc2
deserves a bit more time.


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - android/experimental vcl/android

 
android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
 |   10 
 vcl/android/androidinst.cxx
|  166 +-
 2 files changed, 92 insertions(+), 84 deletions(-)

New commits:
commit e6cccd3df8397a07d6d5e403fa08cf0fd658b31e
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Feb 25 14:24:39 2013 +0200

Use __android_log_print() instead of fprintf(stderr)

Printing to stderr is not at all any faster or more direct in an Android app
than just using the Android standard logging API.

Note that in a normal Android app, stdout and stderr are not connected
anywhere. (Just like in GUI subsystem (as opposed to console) Windows
programs, heh.) It is our own code in sal/android/lo-bootstrap.c that
redirects stdout and stderr to pipes which we set up and which are read in a
separate thread that we start. The lines read are then, surprise, passed on 
to
__android_log_print(). Thus writes to stdout or stderr in normal 
LibreOffice
code aren't lost.

But in code that is by definition Android-specific it makes little sense to
use stdout and stderr.

(Much of the affected logging in this change is in NativeActivity-related 
#if
0'ed code, sure, so won't actually be reached.)

Change-Id: I409114f36f3e535bb144b4bde0d378110b3336a1

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 8baea41..2ed1585 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -37,6 +37,10 @@
 #include rtl/strbuf.hxx
 #include basebmp/scanlineformats.hxx
 
+#define LOGTAG LibreOffice/androidinst
+#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOGTAG, 
__VA_ARGS__))
+#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOGTAG, 
__VA_ARGS__))
+
 static bool bHitIdle = false;
 
 class AndroidSalData : public SalGenericData
@@ -185,13 +189,13 @@ static sal_uInt16 KeyToCode(AInputEvent *event)
 case AKEYCODE_BUTTON_START:
 case AKEYCODE_BUTTON_SELECT:
 case AKEYCODE_BUTTON_MODE:
-fprintf (stderr, un-mapped keycode %d\n, nCode);
+LOGI(un-mapped keycode %d\n, nCode);
 nCode = 0;
 break;
 #undef MAP_SAME
 #undef MAP
 }
-fprintf (stderr, mapped %d - %d\n, AKeyEvent_getKeyCode(event), nCode);
+LOGI(mapped %d - %d\n, AKeyEvent_getKeyCode(event), nCode);
 return nCode;
 }
 
@@ -202,7 +206,7 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer 
*pOutBuffer,
 const ARect rSrcRect,
 int nDestX, int nDestY)
 {
-fprintf (stderr, Blit frame src %d,%d-%d,%d to position %d, %d\n,
+LOGI(Blit frame src %d,%d-%d,%d to position %d, %d\n,
  rSrcRect.left, rSrcRect.top, rSrcRect.right, rSrcRect.bottom,
  nDestX, nDestY);
 
@@ -252,7 +256,7 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer 
*pOutBuffer,
 break;
 }
 default:
-fprintf (stderr, unknown pixel format %d !\n, 
pOutBuffer-format);
+LOGI(unknown pixel format %d !\n, pOutBuffer-format);
 break;
 }
 }
@@ -271,7 +275,7 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow, ANativeWindow_Buf
 ANativeWindow_Buffer aOutBuffer;
 memset ((void *)aOutBuffer, 0, sizeof (aOutBuffer));
 
-fprintf (stderr, RedrawWindows\n);
+LOGI(RedrawWindows\n);
 
 int32_t nRet = 0;
 if (pBuffer != NULL)
@@ -282,10 +286,10 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow, ANativeWindow_Buf
 return;
 
 //ARect aRect;
-fprintf (stderr, pre lock #3\n);
+LOGI(pre lock #3\n);
 nRet = ANativeWindow_lock(pWindow, aOutBuffer, NULL);
 }
-fprintf (stderr, Frame count: %d locked window %d returned  // rect:  
%d,%d-%d,%d 
+LOGI(Frame count: %d locked window %d returned  // rect:  %d,%d-%d,%d 
  buffer: %dx%d stride %d, format %d, bits %p\n,
  (int)getFrames().size(),
  nRet, // aRect.left, aRect.top, aRect.right, aRect.bottom,
@@ -311,7 +315,7 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow, ANativeWindow_Buf
 
 if (pFrame-IsVisible())
 {
-fprintf( stderr, render visible frame %d\n, i );
+LOGI(render visible frame %d\n, i );
 #ifndef REGION_RE_RENDER
 BlitFrameToWindow (aOutBuffer, pFrame-getDevice());
 #else
@@ -341,12 +345,12 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow, ANativeWindow_Buf
 }
 }
 else
-fprintf (stderr, no buffer for locked window\n);
+LOGI(no buffer for locked window\n);
 
 if (pBuffer  pWindow)
 ANativeWindow_unlockAndPost(pWindow);
 
-fprintf (stderr, done render!\n);
+LOGI(done render!\n);
 maRedrawRegion.SetEmpty();

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - configure.ac

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18144fcba27a408635ae266cd97f11cfb5a79538
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 22 12:19:06 2013 +0100

fdo#54087 build npsoplugin on Windows, it does not depend on GTK+ there

Change-Id: I033ee2316337dab549f1beddbfb7919a35d73c8e
Reviewed-on: https://gerrit.libreoffice.org/2381
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Petr Mladek pmla...@suse.cz
Reviewed-by: Petr Mladek pmla...@suse.cz

diff --git a/configure.ac b/configure.ac
index bc36fc1..e293023 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8318,7 +8318,7 @@ dnl 
===
 dnl Check for NPAPI interface to plug LibreOffice into browser windows
 dnl ===
 AC_MSG_CHECKING([whether to plug LibreOffice into browser windows])
-if test $_os != Android -a $_os != Darwin -a $_os != iOS -a \
+if test $_os == WINNT -o $_os != Android -a $_os != Darwin -a $_os != 
iOS -a \
 $enable_headless != yes -a $enable_gtk != no
 then
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source

 editeng/source/editeng/impedit3.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 804f47a893359baa0b72f1a72df3d79302225654
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Feb 25 14:46:21 2013 +0100

fdo#55931, fdo#57956: Fix both autofit and stretched width.

This rewrites commit fa694a21b806ed7837c1337ec49a4b299c478393 (fix of
fdo#55931), and fixes it a better way.

Change-Id: I9ac0c78294e6a9c510c12b22547564b736416131

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index f6f091b..48b25f7 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2643,7 +2643,13 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, 
sal_uInt16 nPos, SvxFont rF
 // ugly on the screen!
 OutputDevice* pDev = pOut ? pOut : GetRefDevice();
 rFont.SetPhysFont( pDev );
-Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() );
+FontMetric aMetric( pDev-GetFontMetric() );
+
+// Set the font as we want it to look like  reset the Propr attribute
+// so that it is not counted twice.
+Size aRealSz( aMetric.GetSize() );
+rFont.SetPropr( 100 );
+
 if ( aStatus.DoStretch() )
 {
 if ( nStretchY != 100 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - cppcanvas/source sw/source vcl/source

 cppcanvas/source/inc/implrenderer.hxx|2 +-
 cppcanvas/source/mtfrenderer/emfplus.cxx |   14 +++---
 sw/source/core/text/itrcrsr.cxx  |6 +-
 vcl/source/filter/wmf/winwmf.cxx |2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 5e992f88d9f78a062bd78ea8907fa247f1f49b5f
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Feb 25 15:00:08 2013 +0100

n#793998 SwTxtCursor::GetCharRect: respect TabOverMargin compat mode

Change-Id: I47280399bd9e0757365db8f4f1930efd0a340424

diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 501052b..ab249f3 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1211,7 +1211,9 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const 
xub_StrLen nOfst,
 pCMS-p2Lines-aPortion.Pos().Y() += aCharPos.Y();
 }
 
-if( pOrig-Left()  nTmpRight )
+const bool bTabOverMargin = 
GetTxtFrm()-GetTxtNode()-getIDocumentSettingAccess()-get(IDocumentSettingAccess::TAB_OVER_MARGIN);
+// Make sure the cursor respects the right margin, unless in compat mode, 
where the tab size has priority over the margin size.
+if( pOrig-Left()  nTmpRight  !bTabOverMargin)
 pOrig-Pos().X() = nTmpRight;
 
 if( nMax )
commit cb6d8b906347e03e3c1f279aa802bd87f463bbed
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Feb 25 14:59:27 2013 +0100

SwTxtCursor::GetCharRect: restore comment removed in 1b081132

Change-Id: I2d6cf0afad4d5237b44e21be051f6f593a12830d

diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index e33ef54..501052b 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1196,6 +1196,8 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const 
xub_StrLen nOfst,
 
 _GetCharRect( pOrig, nFindOfst, pCMS );
 
+// This actually would have to be -1 LogicToPixel, but that seems too
+// expensive, so it's a value (-12), that should hopefully be OK.
 const SwTwips nTmpRight = Right() - 12;
 
 pOrig-Pos().X() += aCharPos.X();
commit 251adf0661bcabf05bd32bbf5cd7345f42b2
Author: Radek Doulik r...@novell.com
Date:   Mon Feb 25 15:06:11 2013 +0100

Revert allow WMF's with missing EOF record

This reverts commit 199f0edc93e25ff8144f16599184049573154232.

the problematic emf+ file with embedded wmf suffered from different problem
so I reverted this fix as it is not needed

diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 97a705b..ecdf04d 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1188,7 +1188,7 @@ void WMFReader::ReadWMF()
   || pWMF-IsEof()
   )
 {
-if( pWMF-IsEof()  nPos != nEndPos)
+if( pWMF-IsEof() )
 pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
 
 break;
commit 41cfd0fd9d32b5e0a07d9f422aec2c7d97b27c01
Author: Radek Doulik r...@novell.com
Date:   Mon Feb 25 15:05:19 2013 +0100

workaround for emf+ files with broken dataSize of Image object record

Change-Id: I5005961e1b618af949dc978a7ac560fc9eca3e65

diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index 7f34ad8..7d82ea7 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -259,7 +259,7 @@ static float GetSwapFloat( SvStream rSt )
ActionVector::const_iterator o_rRangeBegin,
ActionVector::const_iterator o_rRangeEnd ) 
const;
 
-void processObjectRecord(SvMemoryStream rObjectStream, sal_uInt16 
flags, sal_Bool bUseWholeStream = sal_False);
+void processObjectRecord(SvMemoryStream rObjectStream, sal_uInt16 
flags, sal_uInt32 dataSize, sal_Bool bUseWholeStream = sal_False);
 
 /* EMF+ */
 void processEMFPlus( MetaCommentAction* pAct, const 
ActionFactoryParameters rFactoryParms, OutDevState rState, const 
CanvasSharedPtr rCanvas );
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 0c9db41..9b3d92d 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -714,7 +714,7 @@ namespace cppcanvas
 Graphic graphic;
 
 
-void Read (SvMemoryStream s, sal_Bool bUseWholeStream)
+void Read (SvMemoryStream s, sal_uInt32 dataSize, sal_Bool 
bUseWholeStream)
 {
 sal_uInt32 header, unknown;
 
@@ -736,11 +736,11 @@ namespace cppcanvas
 sal_Int32 mfType, mfSize;
 
 s  mfType  mfSize;
-EMFP_DEBUG (printf (EMF+\tmetafile type: %d dataSize: 
%d\n, mfType, mfSize));
+EMFP_DEBUG (printf (EMF+\tmetafile type: %d dataSize: %d

Re: issue building master: new dependency ?

2013-02-25 Thread Jean-Baptiste Faure

Le 25/02/2013 14:02, Bjoern Michaelsen a écrit :
 On Mon, Feb 25, 2013 at 06:38:16AM +0100, Jean-Baptiste Faure wrote:
 Hi,

 Since yesterday I have the following error message when I build the master:
 checking for gnutls libraries = 0.8.1... no
 checking for mscrypto libraries... none
 checking for crypto library... configure: error: At least one crypto
 library should exist for xmlsec1
 make[1]: ***
 [/home/jbf/LibO/master/workdir/unxlngx6.pro/ExternalProject/xmlsec/build]
 Erreur 1
 Is it possible that some recent patch introduced a new dependency? I do
 not know exactly when the problem appeared  because I did not build the
 master for several days last week.
 It seems to me this is fixed with:

  
 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=423932fe1849a2c9e2f4c1730a93435f39657e95;hp=ff4ed8422874e1624840366b14496885c49a9dbb
I do not think so: I get the same error after a ./g pull -r and a
complete build (make clean  make dev-install)

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - editeng/source

 editeng/source/editeng/impedit3.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8518173f0b8dc73eece82be959e65dba2768d33c
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Feb 25 14:46:21 2013 +0100

fdo#55931, fdo#57956: Fix both autofit and stretched width.

This rewrites commit fa694a21b806ed7837c1337ec49a4b299c478393 (fix of
fdo#55931), and fixes it a better way.

Change-Id: I9ac0c78294e6a9c510c12b22547564b736416131
Reviewed-on: https://gerrit.libreoffice.org/2388
Tested-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Thorsten Behrens tbehr...@suse.com

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 964579c..098fd92 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2643,7 +2643,13 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, 
sal_uInt16 nPos, SvxFont rF
 // ugly on the screen!
 OutputDevice* pDev = pOut ? pOut : GetRefDevice();
 rFont.SetPhysFont( pDev );
-Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() );
+FontMetric aMetric( pDev-GetFontMetric() );
+
+// Set the font as we want it to look like  reset the Propr attribute
+// so that it is not counted twice.
+Size aRealSz( aMetric.GetSize() );
+rFont.SetPropr( 100 );
+
 if ( aStatus.DoStretch() )
 {
 if ( nStretchY != 100 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: git-hooks/contrib git-hooks/README

 git-hooks/README |2 +-
 git-hooks/contrib/dev-tools.git/hooks/update |7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit ef0cbd2cc785d5a2d5927ce50a180ac2bb080115
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Feb 15 10:54:16 2013 +0100

git-hooks: update dev-tools hook

Sync From and Subject headers with core.git.

Change-Id: I3a541e941244d517e48a72066c3b3d98e559b71a
Reviewed-on: https://gerrit.libreoffice.org/2164
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/git-hooks/README b/git-hooks/README
index 1b01a42..a0d8478 100644
--- a/git-hooks/README
+++ b/git-hooks/README
@@ -3,6 +3,6 @@ fdo server after each push. They are responsible for sending 
out mails to the
 -commits list, and also prevent directly pushing changes to fdo, when the
 read-write repo is hosted on gerrit.
 
-If you review a change on gerrit, affecting a hook in this directly, please do
+If you review a change on gerrit, affecting a hook in this directory, please do
 it only in case you update the real hook on the fdo server as well. The
 'install' script should make this easy for you. Thanks!
diff --git a/git-hooks/contrib/dev-tools.git/hooks/update 
b/git-hooks/contrib/dev-tools.git/hooks/update
index 944c06b..58463dd 100755
--- a/git-hooks/contrib/dev-tools.git/hooks/update
+++ b/git-hooks/contrib/dev-tools.git/hooks/update
@@ -14,6 +14,7 @@ if [ $(id -u -n ) != logerrit ] ; then
echo *** The reference for this repo is gerrit. do not push directly 
to fdo 2
exit 1
 fi
+from=$(git show -s --pretty=format:'%an %ae' $3^{})
 
 project=$(cat $GIT_DIR/description)
 recipients=libreoffice-comm...@lists.freedesktop.org
@@ -68,7 +69,7 @@ else
if [ $branch != master ] ; then
subject=Branch '$branch' - $subject
fi
-   repo=$(basename $GIT_DIR)
+   repo=$(basename $(cd $GIT_DIR ; pwd))
subject=$repo: $subject
 fi
 
@@ -134,6 +135,6 @@ else
fi
done
 fi |
-mail -s $subject -a X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/libcdr.git \
- -a List-Post: mailto:libreoffice@lists.freedesktop.org $recipients
+mail -s $subject -a X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/dev-tools.git \
+ -a List-Post: mailto:libreoffice@lists.freedesktop.org -a From: 
$from $recipients
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] embed also system fonts when embedding fonts in a document

2013-02-25 Thread via Code Review

Luboš Luňák has abandoned this change.

Change subject: embed also system fonts when embedding fonts in a document
..


Patch Set 1: Abandoned

I take it you pushed this to gerrit by mistake.

-- 
To view, visit https://gerrit.libreoffice.org/2315
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I3b4e87b1b3ca5ae1ccfe29d9b571b0262c568dcf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: git-hooks/website.git

 git-hooks/website.git/hooks/update |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit d2188b4e70f58565f909e850428796b5462fab26
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Feb 18 09:36:51 2013 +0100

git-hooks: website.git has no obsolete tags

Change-Id: Iec48a62678a8525cdfe0b445985bb117b0008c0e
Reviewed-on: https://gerrit.libreoffice.org/2220
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/git-hooks/website.git/hooks/update 
b/git-hooks/website.git/hooks/update
index 0cd437a..9507439 100755
--- a/git-hooks/website.git/hooks/update
+++ b/git-hooks/website.git/hooks/update
@@ -21,13 +21,6 @@ recipients=libreoffice-comm...@lists.freedesktop.org
 
 ref_type=$(git cat-file -t $3)
 
-# Avoid re-introducing obsolete tags
-if grep -q ^$1$ hooks/obsolete-tags; then
-   echo *** Re-introducing an obsolete tag ($1) is not allowed in this 
repo 2
-   echo *** Use corereleasebranches/killtagslocal.sh from 
contrib/dev-tools.git to get rid of them. 2
-   exit 1
-fi
-
 # Only allow annotated tags in a shared repo
 # Remove this code to treat dumb tags the same as everything else
 case $1,$ref_type in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - sw/source

 sw/source/core/text/itrcrsr.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7f743c373b028106f5923f53399aae55a51e3e06
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Feb 25 15:00:08 2013 +0100

n#793998 SwTxtCursor::GetCharRect: respect TabOverMargin compat mode

Change-Id: I47280399bd9e0757365db8f4f1930efd0a340424
(cherry picked from commit 5e992f88d9f78a062bd78ea8907fa247f1f49b5f)

diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 5d0a154..c3a2497 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1218,7 +1218,9 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const 
xub_StrLen nOfst,
 pCMS-p2Lines-aPortion.Pos().Y() += aCharPos.Y();
 }
 
-if( pOrig-Left()  nTmpRight )
+const bool bTabOverMargin = 
GetTxtFrm()-GetTxtNode()-getIDocumentSettingAccess()-get(IDocumentSettingAccess::TAB_OVER_MARGIN);
+// Make sure the cursor respects the right margin, unless in compat mode, 
where the tab size has priority over the margin size.
+if( pOrig-Left()  nTmpRight  !bTabOverMargin)
 pOrig-Pos().X() = nTmpRight;
 
 if( nMax )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 25 commits - Repository.mk scp2/inc scp2/source

 Repository.mk|   56 +--
 scp2/inc/macros.inc  |8 ---
 scp2/source/calc/file_calc.scp   |2 
 scp2/source/graphicfilter/file_graphicfilter.scp |2 
 scp2/source/ooo/file_library_ooo.scp |   48 ---
 scp2/source/ooo/file_ooo.scp |   48 +--
 6 files changed, 58 insertions(+), 106 deletions(-)

New commits:
commit b0565809774c27b2ec72b036ced42b935b7b4be9
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Feb 25 15:49:49 2013 +0100

fdo#60924: move writerfilter from scp2 to gbuild

Change-Id: I17f68196edeb685fb8d3f95616be1199fd5f1de2

diff --git a/Repository.mk b/Repository.mk
index 199816a..5c1ca37 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -259,6 +259,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 odbcbase \
 t602filter \
 wpftwriter \
+writerfilter \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
@@ -403,7 +404,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 vclplug_kde4 \
 vclplug_svp \
 wpftdraw \
-writerfilter \
 xmlscript \
 xmlfa \
 xmlfd \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 105beaa..1da3175 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -786,8 +786,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif
 
-STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-
 STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
 STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
 
commit 38ea2837998e5f8036184c06a285ddb8bc599337
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Feb 25 15:49:01 2013 +0100

fdo#60924: move lwpft from scp2 to gbuild

Change-Id: Icb3044f1dc8b8a816cc93c9764908532a9cdcec4

diff --git a/Repository.mk b/Repository.mk
index 7bcf15d..199816a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -254,6 +254,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 fwl \
fwm \
 lng \
+lwpft \
 sdbt \
 odbcbase \
 t602filter \
@@ -330,7 +331,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
kabdrv1 \
 lnth \
 log \
-lwpft \
MacOSXSpell \
 merged \
 mork \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 4268b1c..105beaa 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -786,8 +786,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif
 
-STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
-
 STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
 
 STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
commit 3d61a90591f53f3d73764915fa8b6368ccad4eba
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Feb 25 15:48:18 2013 +0100

fdo#60924: move t602filter from scp2 to gbuild

Change-Id: Ib655b1177ffb4609bd7c50d54a818de659f284f3

diff --git a/Repository.mk b/Repository.mk
index 7339d94..7bcf15d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -256,6 +256,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 lng \
 sdbt \
 odbcbase \
+t602filter \
 wpftwriter \
 ))
 
@@ -380,7 +381,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 sw \
 swd \
 swui \
-t602filter \
tdeab1 \
tdeabdrv1 \
 textconversiondlgs \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index e8e39b4..4268b1c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -786,8 +786,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif
 
-STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
-
 STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
 
 STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
commit 6d1cc9dca3d541be9354903cf2ae77899b703987
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Feb 25 15:47:41 2013 +0100

fdo#60924: move wpftwriter from scp2 to gbuild

Change-Id: I7e12a4ddd68ffb2c2b1cd1730a8ab17c79311fb2

diff --git a/Repository.mk b/Repository.mk
index bfb143a..7339d94 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -256,6 +256,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 lng \
 sdbt \
 odbcbase \
+wpftwriter \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
@@ -402,7 +403,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 vclplug_kde4 \
 vclplug_svp \
 wpftdraw \
-wpftwriter \
 writerfilter \
 xmlscript \
 xmlfa \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 7e23e8d..e8e39b4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++

Re: issue building master: new dependency ?

2013-02-25 Thread d . ostrovsky


On Mon, Feb 25 Jean-Baptiste Faure wrote


I do not think so: I get the same error after a ./g pull -r and a
complete build (make clean  make dev-install)


i suspect this commit: 1baeaec3c98987fbedb6d02200fc4a95478adafb

MinGW seems also to suffer here:
https://ci.idaia.de/job/LO-Mingw64/154/consoleFull

with:
configure: WARNING: unrecognized options: --with-system-openssl

David
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

server downtime 15 mins on Feb 28

2013-02-25 Thread Florian Effenberger


Hello,

please see below announcement from our ISP about a small outage. It 
looks like it will affect most of our servers.


Sorry for the inconveniences,
Florian


 Original Message 
Subject: Hetzner Online Statusmeldung: Maintenance Router (firmware upgrade)
Date: Mon, 25 Feb 2013 11:18:02 +0100
From: nore...@hetzner-status.de
To: hostmas...@documentfoundation.org

Type

Maintenance work

__Category__

Network

Time

Start:  February 28, 2013 5:00:00 AM CET
End:February 28, 2013 7:00:00 AM CET (expected)

Description_

Owing to a firmware upgrade of routers ex3k1.rz10, ex3k2.rz10, ex3k3.rz10,
ex3k4.rz10, ex3k5.rz10, ex3k6.rz10, ex3k7.rz10, ex3k8.rz10, ex3k9.rz10,
ex3k10.rz10, ex3k11.rz10, ex3k12.rz10, ex3k13.rz10, ex3k14.rz10,
ex3k15.rz10, ex3k1.rz11, ex3k2.rz11, ex3k3.rz11, ex3k4.rz11, ex3k5.rz11,
ex3k6.rz11, ex3k7.rz11, ex3k8.rz11, ex3k9.rz11, ex3k1.rz12, ex3k2.rz12,
ex3k3.rz12, ex3k4.rz12, ex3k5.rz12, ex3k6.rz12, ex3k7.rz12, ex3k8.rz12,
ex3k9.rz12, ex3k10.rz12, ex3k11.rz12, ex3k12.rz12, ex3k13.rz12,
ex3k14.rz12, ex3k15.rz12, ex3k1.rz19, ex3k2.rz19, ex3k3.rz19, ex3k4.rz19,
ex3k5.rz19, ex3k6.rz19, ex3k7.rz19, ex3k8.rz19, ex3k9.rz19, ex3k10.rz19,
ex3k11.rz19, ex3k12.rz19, ex3k13.rz19 there will be a  15 minute max.
unavailability for all connected servers between 05.00 and 07.00 hours.

Please excuse this inconvenience

Thank you for your understanding.

__Affected__

To see if your server is affected by this, make a traceroute on your
server to find it out. Traceroutes you can perform on the website as
www.traceroute.org. In the trace route stans such as:

...
3. decix2-gw.hetzner.de 0.0% 15 3.9 4.0 3.8 4.4 0.1
4. hos-bb1.juniper2.fs.hetzner. 0.0% 15 17.1 14.7 8.4 26.3 5.5
5. hos-tr4.ex3k1.rz10.hetzner.d 0.0% 15 9.5 9.7 9.1 11.0 0.5
6. server ip


Your email address has been included in the administration interface
Robot for the purpose of forwarding status reports.

If you do not wish to receive status reports in future, these can be
discontinued at https://robot.your-server.de/


Yours sincerely,

Hetzner Online AG
Stuttgarter Str. 1
91710 Gunzenhausen
Tel: +49 [0] 9831 61006-1
Fax: +49 [0] 9831 61006-2
i...@hetzner.de
http://www.hetzner.de

Register Court: Registergericht Ansbach, HRB 3204
Management Board: Dipl. Ing. (FH) Martin Hetzner
Chairwoman of the Supervisory Board: Diana Rothhan




___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/unx

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   30 ++
 1 file changed, 30 insertions(+)

New commits:
commit 3094f6627f5925852a772754c067bfbb9491c94a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 25 15:09:23 2013 +

Resolves: fdo#61373 tabs too narrow under oxygen gtk theme

Change-Id: I794b34c1864f619d91f0b105ba08a4f607abd291

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e15fbfa..405fcc3 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -209,6 +209,8 @@ static void NWCalcArrowRect( const Rectangle rButton, 
Rectangle rArrow );
 static Rectangle NWGetButtonArea( SalX11Screen nScreen, ControlType nType, 
ControlPart nPart, Rectangle aAreaRect, ControlState nState,
 const ImplControlValue aValue, const 
OUString rCaption );
 
+static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect );
+
 //---
 static Rectangle NWGetEditBoxPixmapRect( SalX11Screen nScreen, ControlType 
nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
 const ImplControlValue aValue, const OUString 
rCaption );
@@ -993,6 +995,12 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 
 returnVal = sal_True;
 }
+if (nType == CTRL_TAB_ITEM  nPart == PART_ENTIRE_CONTROL)
+{
+rNativeBoundingRegion = NWGetTabItemRect(m_nXScreen, rControlRegion);
+rNativeContentRegion = rNativeBoundingRegion;
+returnVal = sal_True;
+}
 if ( (nType==CTRL_COMBOBOX)  ((nPart==PART_BUTTON_DOWN) || 
(nPart==PART_SUB_EDIT)) )
 {
 rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nXScreen, nType, 
nPart, rControlRegion, nState,
@@ -1594,6 +1602,28 @@ static Rectangle NWGetButtonArea( SalX11Screen nScreen,
 return( aRect );
 }
 
+static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect )
+{
+NWEnsureGTKNotebook( nScreen );
+
+gintx, y, w, h;
+
+x = aAreaRect.Left();
+y = aAreaRect.Top();
+w = aAreaRect.GetWidth();
+h = aAreaRect.GetHeight();
+
+gint xthickness = gWidgetData[0].gNotebookWidget-style-xthickness;
+gint ythickness = gWidgetData[0].gNotebookWidget-style-ythickness;
+
+x -= xthickness;
+y -= ythickness;
+w += xthickness*2;
+h += ythickness*2;
+
+return Rectangle( Point( x, y ), Size( w, h ) );
+}
+
 //-
 
 sal_Bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: idlc/Executable_idlc.mk

 idlc/Executable_idlc.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b324cbefb0b92dc7a4813dca88dc8dbd9641cc0b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 25 16:17:07 2013 +0100

flex output needs soltools' unistd.h on WNT

Change-Id: Id7b5e421f8ff9d6db923a1fb01b1071f75a6842d

diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk
index fc40364..57caed7 100644
--- a/idlc/Executable_idlc.mk
+++ b/idlc/Executable_idlc.mk
@@ -40,6 +40,8 @@ $(eval $(call gb_Executable_use_libraries,idlc,\
 salhelper \
 ))
 
+$(eval $(call gb_Executable_use_package,idlc,soltools_inc))
+
 $(eval $(call gb_Executable_add_grammars,idlc,\
 idlc/source/parser \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Licensing

2013-02-25 Thread Gregg King

Forgot to include this with my patch!

All of my past and future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.


Cheers,

Gregg
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - editeng/source

 editeng/source/editeng/impedit3.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 3728944078e53e8dfef08eb445e741a59979b23e
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Feb 25 14:46:21 2013 +0100

fdo#55931, fdo#57956: Fix both autofit and stretched width.

This rewrites commit fa694a21b806ed7837c1337ec49a4b299c478393 (fix of
fdo#55931), and fixes it a better way.

Change-Id: I9ac0c78294e6a9c510c12b22547564b736416131
Reviewed-on: https://gerrit.libreoffice.org/2389
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 964579c..098fd92 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2643,7 +2643,13 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, 
sal_uInt16 nPos, SvxFont rF
 // ugly on the screen!
 OutputDevice* pDev = pOut ? pOut : GetRefDevice();
 rFont.SetPhysFont( pDev );
-Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() );
+FontMetric aMetric( pDev-GetFontMetric() );
+
+// Set the font as we want it to look like  reset the Propr attribute
+// so that it is not counted twice.
+Size aRealSz( aMetric.GetSize() );
+rFont.SetPropr( 100 );
+
 if ( aStatus.DoStretch() )
 {
 if ( nStretchY != 100 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sw/source

 sw/source/filter/ww8/rtfattributeoutput.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 6b13c3f7c4281150748601e9548bfac40a4b0d9a
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Nov 29 17:12:54 2012 +0100

sw: fix RTF export of text frames anchored to empty paragraphs

Regression from d4069372484f18b242a42a1996767f57b031fff6

Reported-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 049933c035157129cc0409bb100dfc5353847a63)

Conflicts:
sw/qa/extras/rtfexport/rtfexport.cxx

Change-Id: I28e095819e0c2f1a4b110741ace366329937f863
Reviewed-on: https://gerrit.libreoffice.org/2391
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 6944bbb..0537275 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -389,7 +389,7 @@ void RtfAttributeOutput::EndParagraphProperties()
 
 void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool 
bSingleEmptyRun )
 {
-SAL_INFO(sw.rtf, OSL_THIS_FUNC);
+SAL_INFO(sw.rtf, OSL_THIS_FUNC  , bSingleEmptyRun:   
bSingleEmptyRun);
 
 m_bInRun = true;
 m_bSingleEmptyRun = bSingleEmptyRun;
@@ -427,7 +427,7 @@ void RtfAttributeOutput::EndRunProperties( const 
SwRedlineData* /*pRedlineData*/
 
 void RtfAttributeOutput::RunText( const String rText, rtl_TextEncoding 
/*eCharSet*/ )
 {
-SAL_INFO(sw.rtf, OSL_THIS_FUNC);
+SAL_INFO(sw.rtf, OSL_THIS_FUNC  , rText:   rText);
 RawText( rText, 0, m_rExport.eCurrentEncoding );
 }
 
@@ -1519,6 +1519,11 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame rFrame, const Poi
  * would be there, causing a problem later.
  */
 OString aSave = m_aRun.makeStringAndClear();
+// Also back m_bInRun and m_bSingleEmptyRun up.
+bool bInRunOrig = m_bInRun;
+m_bInRun = false;
+bool bSingleEmptyRunOrig = m_bSingleEmptyRun;
+m_bSingleEmptyRun = false;
 m_rExport.bRTFFlySyntax = true;
 
 const SwFrmFmt rFrmFmt = rFrame.GetFrmFmt( );
@@ -1534,6 +1539,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame rFrame, const Poi
 m_rExport.bRTFFlySyntax = false;
 m_aRun-append(aSave);
 m_aRunText.clear();
+m_bInRun = bInRunOrig;
+m_bSingleEmptyRun = bSingleEmptyRunOrig;
 }
 
 m_rExport.mpParentFrame = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source xmloff/inc xmloff/source

2013-02-25 Thread Markus Mohrhard

 sc/source/filter/xml/xmlcondformat.cxx |3 +++
 sc/source/filter/xml/xmlimprt.cxx  |1 +
 sc/source/filter/xml/xmlimprt.hxx  |3 ++-
 xmloff/inc/xmloff/xmltoken.hxx |1 +
 xmloff/source/core/xmltoken.cxx|1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 931198a43b2d03404a3a75eb5005ddacaa64540c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Feb 14 17:14:37 2013 +0100

support new attribute also in 3.6, fdo#60760

Change-Id: I8beab492a3b9b42b323d7d6d9cebfbda1eae0ce1
Reviewed-on: https://gerrit.libreoffice.org/2159
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sc/source/filter/xml/xmlcondformat.cxx 
b/sc/source/filter/xml/xmlcondformat.cxx
index dbb5028..83daa86 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -294,6 +294,9 @@ SvXMLImportContext* 
ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP
 case XML_TOK_DATABAR_DATABARENTRY:
 pContext = new ScXMLDataBarFormatEntryContext( GetScImport(), 
nPrefix, rLocalName, xAttrList, mpFormatData );
 break;
+case XML_TOK_DATABAR_FORMATTINGENTRY:
+pContext = new ScXMLDataBarFormatEntryContext( GetScImport(), 
nPrefix, rLocalName, xAttrList, mpFormatData );
+break;
 default:
 break;
 }
diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 204a3fa..aa925f7 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -706,6 +706,7 @@ const SvXMLTokenMap ScXMLImport::GetDataBarTokenMap()
 static SvXMLTokenMapEntry aDataBarElemTokenMap[] =
 {
 { XML_NAMESPACE_CALC_EXT, XML_DATA_BAR_ENTRY, 
XML_TOK_DATABAR_DATABARENTRY },
+{ XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, 
XML_TOK_DATABAR_FORMATTINGENTRY },
 XML_TOKEN_MAP_END
 };
 
diff --git a/sc/source/filter/xml/xmlimprt.hxx 
b/sc/source/filter/xml/xmlimprt.hxx
index c4a4412..0974491 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -189,7 +189,8 @@ enum ScXMLColorScaleEntryAttrTokens
 
 enum ScXMLDataBarFormatTokens
 {
-XML_TOK_DATABAR_DATABARENTRY
+XML_TOK_DATABAR_DATABARENTRY,
+XML_TOK_DATABAR_FORMATTINGENTRY
 };
 
 enum ScXMLDataBarAttrTokens
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 16fe5e8..dca9fcf 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -850,6 +850,7 @@ namespace xmloff { namespace token {
 XML_FOREIGN_OBJECT,
 XML_FORMAT_CHANGE,
 XML_FORMAT_SOURCE,
+XML_FORMATTING_ENTRY,
 XML_FORMS,
 XML_FORMULA,
 XML_FORMULA_HIDDEN,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index a1147aa..b21d7fa 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -854,6 +854,7 @@ namespace xmloff { namespace token {
 TOKEN( foreign-object,  XML_FOREIGN_OBJECT ),
 TOKEN( format-change,   XML_FORMAT_CHANGE ),
 TOKEN( format-source,   XML_FORMAT_SOURCE ),
+TOKEN( formatting-entry,XML_FORMATTING_ENTRY ),
 TOKEN( forms,   XML_FORMS ),
 TOKEN( formula, XML_FORMULA ),
 TOKEN( formula-hidden,  XML_FORMULA_HIDDEN ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/uiconfig vcl/inc vcl/source

 sc/uiconfig/scalc/ui/sortoptionspage.ui |1 +
 vcl/inc/vcl/combobox.hxx|4 
 vcl/inc/vcl/lstbox.hxx  |6 ++
 vcl/inc/vcl/outdev.hxx  |1 +
 vcl/source/control/combobox.cxx |   15 +++
 vcl/source/control/lstbox.cxx   |   28 
 vcl/source/gdi/outdev3.cxx  |5 +
 vcl/source/window/window.cxx|2 +-
 8 files changed, 61 insertions(+), 1 deletion(-)

New commits:
commit e43b2fa55e244db36111a7cb0548f2ff5d2ae66a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 22 15:41:00 2013 +

Resolves: fdo#60764 sort options can grow too wide to fit on screen

(cherry picked from commit 7c760f34a00462d5904d0e2eed4132761c2e51c5)

Conflicts:
sc/uiconfig/scalc/ui/sortoptionspage.ui
vcl/inc/vcl/lstbox.hxx
vcl/source/control/lstbox.cxx

Change-Id: Id3aed9ef251f61710b43ceda1a28c6895e91872f
Reviewed-on: https://gerrit.libreoffice.org/2392
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui 
b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index ded61ac..2f1eb10 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -159,6 +159,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=margin_left20/property
+property name=max_width_chars65/property
   /object
   packing
 property name=left_attach0/property
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index 72478c5..e6e2b92 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -47,6 +47,7 @@ private:
 sal_BoolmbDDAutoSize: 1;
 sal_BoolmbSyntheticModify   : 1;
 sal_BoolmbMatchCase : 1;
+sal_Int32 m_nMaxWidthChars;
 LinkmaSelectHdl;
 LinkmaDoubleClickHdl;
 
@@ -214,6 +215,9 @@ public:
  */
 using Control::GetIndexForPoint;
 long GetIndexForPoint( const Point rPoint, sal_uInt16 rPos ) const;
+
+sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; }
+void setMaxWidthChars(sal_Int32 nWidth);
 };
 
 #endif  // _COMBOBOX_HXX
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index a3a7dbb..813591d 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -44,6 +44,7 @@ private:
 sal_uInt16  mnDDHeight;
 sal_uInt16  mnSaveValue;
 sal_BoolmbDDAutoSize;
+sal_Int32 m_nMaxWidthChars;
 LinkmaSelectHdl;
 LinkmaDoubleClickHdl;
 sal_uInt16 mnLineCount;
@@ -218,6 +219,11 @@ public:
 using Control::GetIndexForPoint;
 long GetIndexForPoint( const Point rPoint, sal_uInt16 rPos ) const;
 virtual void take_properties(Window rOther);
+
+sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; }
+void setMaxWidthChars(sal_Int32 nWidth);
+
+virtual bool set_property(const rtl::OString rKey, const rtl::OString 
rValue);
 };
 
 // 
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index ce1e7ec..5ab2e3e 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -580,6 +580,7 @@ public:
   xub_StrLen nLen = STRING_LEN ) const;
 /// Height where any character of the current font fits; in logic 
coordinates.
 longGetTextHeight() const;
+float   approximate_char_width() const;
 voidDrawTextArray( const Point rStartPt, const XubString 
rStr,
const sal_Int32* pDXAry = NULL,
xub_StrLen nIndex = 0,
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 389929c3..148f492 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -110,6 +110,7 @@ void ComboBox::ImplInitComboBoxData()
 mbSyntheticModify   = sal_False;
 mbMatchCase = sal_False;
 mcMultiSep  = ';';
+m_nMaxWidthChars= -1;
 }
 
 // ---
@@ -1068,6 +1069,11 @@ Size ComboBox::CalcMinimumSize() const
 aSz.Height() = Edit::CalcMinimumSizeForText(GetText()).Height();
 
 aSz.Width() = mpImplLB-GetMaxEntryWidth();
+if (m_nMaxWidthChars != -1)
+{
+long nMaxWidth = m_nMaxWidthChars * approximate_char_width();
+aSz.Width() = std::min(aSz.Width(), nMaxWidth);
+}
 aSz.Width() +=

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - drawinglayer/inc drawinglayer/source svgio/source

2013-02-25 Thread Armin Le Grand

 drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx |9 +
 drawinglayer/source/primitive2d/svggradientprimitive2d.cxx   |   81 
+++---
 svgio/source/svgreader/svgstyleattributes.cxx|2 
 3 files changed, 69 insertions(+), 23 deletions(-)

New commits:
commit f9b5fb1ecd5c6ef1d2b90ad192c956e7d134959a
Author: Armin Le Grand a...@apache.org
Date:   Thu Feb 21 17:51:40 2013 +0100

Corrected SVG gradient primitive and it's decomposition (i#120616)

Conflicts:

drawinglayer/source/primitive2d/svggradientprimitive2d.cxx

Change-Id: I04c148303e7153a5376eae79803c540f6eba0b00
Signed-off-by: Petr Mladek pmla...@suse.cz
Reviewed-on: https://gerrit.libreoffice.org/2387
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git 
a/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx 
b/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
index 39115a7..2c9e34f 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
@@ -111,6 +111,11 @@ namespace drawinglayer
 boolmbSingleEntry : 1;
 boolmbFullyOpaque : 1;
 
+// true = interpret in unit coordinate system - object aspect 
ratio will scale result
+// false = interpret in object coordinate system - object aspect 
ratio will not scale result
+// (related to SVG's gradientUnits 
(userSpaceOnUse|objectBoundingBox)
+boolmbUseUnitCoordinates : 1;
+
 protected:
 /// local helpers
 Primitive2DSequence createSingleGradientEntryFill() const;
@@ -145,6 +150,7 @@ namespace drawinglayer
 const basegfx::B2DPolyPolygon rPolyPolygon,
 const SvgGradientEntryVector rGradientEntries,
 const basegfx::B2DPoint rStart,
+bool bUseUnitCoordinates,
 SpreadMethod aSpreadMethod = Spread_pad);
virtual ~SvgGradientHelper() {}
 
@@ -152,6 +158,7 @@ namespace drawinglayer
 const basegfx::B2DPolyPolygon getPolyPolygon() const { return 
maPolyPolygon; }
 const SvgGradientEntryVector getGradientEntries() const { return 
maGradientEntries; }
 const basegfx::B2DPoint getStart() const { return maStart; }
+bool getUseUnitCoordinates() const { return mbUseUnitCoordinates; }
 SpreadMethod getSpreadMethod() const { return maSpreadMethod; }
 
 /// compare operator
@@ -194,6 +201,7 @@ namespace drawinglayer
 const SvgGradientEntryVector rGradientEntries,
 const basegfx::B2DPoint rStart,
 const basegfx::B2DPoint rEnd,
+bool bUseUnitCoordinates,
 SpreadMethod aSpreadMethod = Spread_pad);
 virtual ~SvgLinearGradientPrimitive2D() {}
 
@@ -261,6 +269,7 @@ namespace drawinglayer
 const SvgGradientEntryVector rGradientEntries,
 const basegfx::B2DPoint rStart,
 double fRadius,
+bool bUseUnitCoordinates,
 SpreadMethod aSpreadMethod = Spread_pad,
 const basegfx::B2DPoint* pFocal = 0);
 
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx 
b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index a8c60da..ef1c7ba 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -283,6 +283,7 @@ namespace drawinglayer
 const basegfx::B2DPolyPolygon rPolyPolygon,
 const SvgGradientEntryVector rGradientEntries,
 const basegfx::B2DPoint rStart,
+bool bUseUnitCoordinates,
 SpreadMethod aSpreadMethod)
 :   maPolyPolygon(rPolyPolygon),
 maGradientEntries(rGradientEntries),
@@ -291,7 +292,8 @@ namespace drawinglayer
 mbPreconditionsChecked(false),
 mbCreatesContent(false),
 mbSingleEntry(false),
-mbFullyOpaque(true)
+mbFullyOpaque(true),
+mbUseUnitCoordinates(bUseUnitCoordinates)
 {
 }
 
@@ -302,6 +304,7 @@ namespace drawinglayer
 return (getPolyPolygon() == rCompare.getPolyPolygon()
  getGradientEntries() == rCompare.getGradientEntries()
  getStart() == rCompare.getStart()
+ getUseUnitCoordinates() == rCompare.getUseUnitCoordinates()
  getSpreadMethod() == rCompare.getSpreadMethod());
 }
 
@@ -388,20 +391,36 @@ namespace drawinglayer
 basegfx::tools::createScaleTranslateB2DHomMatrix(

[Libreoffice-commits] core.git: android/experimental vcl/android

 
android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
 |8 +++--
 vcl/android/androidinst.cxx
|   16 ++
 2 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit eb37322f14e6ed12a0db0f7fad1af81114a2ed80
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Feb 25 18:08:01 2013 +0200

Temporary (one hopes) hack to get the actual view size down to SvpSalFrame

Change-Id: I0c2a2301de1b0de71fc6724ff2af73fbf6b406ef

diff --git 
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
 
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
index 8d5b97d..58fe555 100644
--- 
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
+++ 
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
@@ -132,6 +132,7 @@ public class Desktop
 
 /* implementend by vcl */
 public static native void renderVCL(Bitmap bitmap);
+public static native void setViewSize(int width, int height);
 
 /**
  * This class contains the state that is initialized once and never changes
@@ -278,15 +279,15 @@ public class Desktop
 if (bootstrapContext == null)
 initBootstrapContext();
 
+Log.i(TAG, onCreate - set content view\n);
+setContentView(new BitmapView());
+
 spawnMain();
 }
 catch (Exception e) {
 e.printStackTrace(System.err);
 finish();
 }
-
-Log.i(TAG, onCreate - set content view\n);
-setContentView(new BitmapView());
 }
 
 class BitmapView extends android.view.View
@@ -305,6 +306,7 @@ public class Desktop
 if (mBitmap == null) {
 Log.i(TAG, calling Bitmap.createBitmap( + getWidth() + ,  
+ getHeight() + , Bitmap.Config.ARGB_));
 mBitmap = Bitmap.createBitmap(getWidth(), getHeight(), 
Bitmap.Config.ARGB_);
+setViewSize(getWidth(), getHeight());
 }
 renderVCL(mBitmap);
 canvas.drawBitmap(mBitmap, 0, 0, null);
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 2ed1585..8bd285f 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -43,6 +43,9 @@
 
 static bool bHitIdle = false;
 
+// Horrible hack
+static int viewWidth = 1, viewHeight = 1;
+
 class AndroidSalData : public SalGenericData
 {
 public:
@@ -735,6 +738,8 @@ public:
pSysParent )
 {
 enableDamageTracker();
+if (pParent == NULL  viewWidth  1  viewHeight  1)
+SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH | 
SAL_FRAME_POSSIZE_HEIGHT);
 }
 
 virtual void GetWorkArea( Rectangle rRect )
@@ -962,4 +967,15 @@ typedef struct ANativeWindow_Buffer {
 AndroidBitmap_unlockPixels(env, bitmap);
 }
 
+extern C SAL_JNI_EXPORT void JNICALL
+Java_org_libreoffice_experimental_desktop_Desktop_setViewSize(JNIEnv * /* env 
*/,
+  jobject /* 
object */,
+  jint width,
+  jint height)
+{
+// Horrible
+viewWidth = width;
+viewHeight = height;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source

 vcl/source/filter/wmf/emfwr.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 4536979e19d6a9a913f677225a122c13a51da1fa
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 25 13:22:07 2013 +0100

fdo#59405 fdo#60638: EMFWriter::ImplWrite: write EMF_PLUS comments

When editing the Visio OLE object, there is a preview file generated,
which is apparently an EMF file (strangely initially inserting the Visio
object seems to result in a totally unproblematic WMF file).
The EMF file apparently has almost its entire content stored in
MetaCommentAction of type EMF_PLUS, which is thrown away when writing
the file again.

Change-Id: I77a08454da673c1825aaa8421606737e7e8bc82c
(cherry picked from commit bf8450cfa2e9e899c716fbddadd7d5485aefe520)
Reviewed-on: https://gerrit.libreoffice.org/2396
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index c4caf02..80d4573 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -1388,12 +1388,25 @@ void EMFWriter::ImplWrite( const GDIMetaFile rMtf )
 break;
 }
 
+case( META_COMMENT_ACTION ):
+{
+MetaCommentAction const*const pCommentAction(
+static_castMetaCommentAction const*(pAction));
+if (pCommentAction-GetComment() == EMF_PLUS)
+{
+ImplBeginCommentRecord(WIN_EMR_COMMENT_EMFPLUS);
+m_rStm.Write(pCommentAction-GetData(),
+ pCommentAction-GetDataSize());
+ImplEndCommentRecord();
+}
+}
+break;
+
 case( META_MASK_ACTION ):
 case( META_MASKSCALE_ACTION ):
 case( META_MASKSCALEPART_ACTION ):
 case( META_WALLPAPER_ACTION ):
 case( META_TEXTLINE_ACTION ):
-case( META_COMMENT_ACTION ):
 case( META_GRADIENTEX_ACTION ):
 {
 // !!!  we don't want to support these actions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - officecfg/registry

2013-02-25 Thread Petr Mladek

 officecfg/registry/data/org/openoffice/Setup.xcu |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit fd8dd40d460f5513363bac7505d62f0d0383cca3
Author: Petr Mladek pmla...@suse.cz
Date:   Fri Feb 22 14:38:08 2013 +0100

migrate even more configuration setting (fdo#57061)

+ application windows size
+ I was afraid to migrate any /org.openoffice.Setup stuff
  because there seemed to be many hardcoded values;
  But the parts mentioned in registrymodifications.xcu
  should be configurable and thus safe to migrate
+ âEnable macro recordingâ and âEnable experimental featuresâ 
options
+ sigh, we do not want to migrate
  /org.openoffice.Office.Common/Misc/FirstRun; thus we need to
  explicitely mention all the other items which is error prone
+ Tools/Options/LibreOffice/Paths/My documents
+ ah, the paths are handled on two locations: 
/org.openoffice.Office.Paths
  and /org.openoffice.Office.Common/Path
+ Macros
+ I was afraid to copy user/basic because there were some content
  out of box. I though that it might be version specific. In fact,
  the default content is just empty templates that look the same
  even in old releases = it should be secure to copy it after all

Change-Id: Ie1c04e9df36f6b6961bbaaeb922e29d64128ade4
Signed-off-by: Petr Mladek pmla...@suse.cz
Reviewed-on: https://gerrit.libreoffice.org/2340
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index b4e5e7c..6bca381 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -824,6 +824,7 @@
   value
 it.*/autotext/.*/it
 it.*/autocorr/.*/it
+it.*/basic/.*/it
 it.*/config/.*\.so[bcdegh]/it
 it.*/config/soffice.cfg/modules/.*/menubar/.*\.xml/it
 it.*/config/soffice.cfg/modules/.*/statusbar/.*\.xml/it
@@ -860,16 +861,23 @@
 it/org.openoffice.Office.Common/I18N/it
 it/org.openoffice.Office.Common/InternalMSExport/it
 it/org.openoffice.Office.Common/Load/it
+it/org.openoffice.Office.Common/Misc/AlwaysAllowSave/it
+
it/org.openoffice.Office.Common/Misc/DisableUICustomization/it
+it/org.openoffice.Office.Common/Misc/ExperimentalMode/it
 
it/org.openoffice.Office.Common/Misc/FormControlPilotsEnabled/it
+it/org.openoffice.Office.Common/Misc/MacroRecorderMode/it
 it/org.openoffice.Office.Common/Misc/PluginsEnabled/it
+
it/org.openoffice.Office.Common/Misc/ShowLinkWarningDialog/it
 it/org.openoffice.Office.Common/Misc/SymbolSet/it
+it/org.openoffice.Office.Common/Misc/SymbolStyle/it
+it/org.openoffice.Office.Common/Misc/ToolboxStyle/it
 it/org.openoffice.Office.Common/Misc/UseSystemFileDialog/it
 
it/org.openoffice.Office.Common/Misc/UseSystemPrintDialog/it
-it/org.openoffice.Office.Common/Misc/SymbolStyle/it
 
it/org.openoffice.Office.Common/Misc/FilePickerPlacesNames/it
 
it/org.openoffice.Office.Common/Misc/FilePickerPlacesUrls/it
 it/org.openoffice.Office.Common/ODF/it
 it/org.openoffice.Office.Common/Passwords/it
+it/org.openoffice.Office.Common/Path/it
 
it/org.openoffice.Office.Common/Print/PrintingModifiesDocument/it
 it/org.openoffice.Office.Common/Print/Warning/it
 it/org.openoffice.Office.Common/Vectorize/it
@@ -937,6 +945,11 @@
   value/org.openoffice.Office.Security/value
 /prop
   /node
+  node oor:name=Setup oor:op=replace
+prop oor:name=IncludedNodes
+  value/org.openoffice.Setup/Office/Factories/value
+/prop
+  /node
   node oor:name=UI oor:op=replace
 prop oor:name=IncludedNodes
   value/org.openoffice.Office.UI/ColorScheme/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source

2013-02-25 Thread Muthu Subramanian

 vcl/source/filter/wmf/emfwr.cxx |  204 +++-
 vcl/source/filter/wmf/emfwr.hxx |   12 ++
 2 files changed, 215 insertions(+), 1 deletion(-)

New commits:
commit 32bc874ded4f9108a32bd76a53ecc001e6ba2a83
Author: Muthu Subramanian sumu...@suse.com
Date:   Thu Dec 6 12:21:24 2012 +0530

n#780748: Basic EMF+ implementation.

* Minimalistic implementation of EMF+ export
* Currently exports transparent polygons.
(cherry picked from commit f1fee2a65c8c1968798e1246a4b455d9160d8eb9)

Change-Id: I0c24c29b77c50f898fe1b8ce1904179292a1bb72
Reviewed-on: https://gerrit.libreoffice.org/2395
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 80d4573..cf8a748 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -130,6 +130,9 @@
 #define WIN_SRCPAINT0x00EE0086L
 #define WIN_SRCAND  0x008800C6L
 #define WIN_SRCINVERT   0x00660046L
+#define WIN_EMR_COMMENT_EMFSPOOL0xL
+#define WIN_EMR_COMMENT_EMFPLUS 0x2B464D45L
+#define WIN_EMR_COMMENT_PUBLIC  0x43494447L
 
 #define HANDLE_INVALID  0x
 #define MAXHANDLES  65000
@@ -154,10 +157,194 @@
 
 #define MM_ANISOTROPIC  8
 
+typedef enum
+{
+  EmfPlusHeader = 0x4001,
+  EmfPlusEndOfFile  = 0x4002,
+  EmfPlusComment= 0x4003,
+  EmfPlusGetDC  = 0x4004,
+  EmfPlusMultiFormatStart   = 0x4005,
+  EmfPlusMultiFormatSection = 0x4006,
+  EmfPlusMultiFormatEnd = 0x4007,
+  EmfPlusObject = 0x4008,
+  EmfPlusClear  = 0x4009,
+  EmfPlusFillRects  = 0x400A,
+  EmfPlusDrawRects  = 0x400B,
+  EmfPlusFillPolygon= 0x400C,
+  EmfPlusDrawLines  = 0x400D,
+  EmfPlusFillEllipse= 0x400E,
+  EmfPlusDrawEllipse= 0x400F,
+  EmfPlusFillPie= 0x4010,
+  EmfPlusDrawPie= 0x4011,
+  EmfPlusDrawArc= 0x4012,
+  EmfPlusFillRegion = 0x4013,
+  EmfPlusFillPath   = 0x4014,
+  EmfPlusDrawPath   = 0x4015,
+  EmfPlusFillClosedCurve= 0x4016,
+  EmfPlusDrawClosedCurve= 0x4017,
+  EmfPlusDrawCurve  = 0x4018,
+  EmfPlusDrawBeziers= 0x4019,
+  EmfPlusDrawImage  = 0x401A,
+  EmfPlusDrawImagePoints= 0x401B,
+  EmfPlusDrawstring = 0x401C,
+  EmfPlusSetRenderingOrigin = 0x401D,
+  EmfPlusSetAntiAliasMode   = 0x401E,
+  EmfPlusSetTextRenderingHint   = 0x401F,
+  EmfPlusSetTextContrast= 0x4020,
+  EmfPlusSetInterpolationMode   = 0x4021,
+  EmfPlusSetPixelOffsetMode = 0x4022,
+  EmfPlusSetCompositingMode = 0x4023,
+  EmfPlusSetCompositingQuality  = 0x4024,
+  EmfPlusSave   = 0x4025,
+  EmfPlusRestore= 0x4026,
+  EmfPlusBeginContainer = 0x4027,
+  EmfPlusBeginContainerNoParams = 0x4028,
+  EmfPlusEndContainer   = 0x4029,
+  EmfPlusSetWorldTransform  = 0x402A,
+  EmfPlusResetWorldTransform= 0x402B,
+  EmfPlusMultiplyWorldTransform = 0x402C,
+  EmfPlusTranslateWorldTransform= 0x402D,
+  EmfPlusScaleWorldTransform= 0x402E,
+  EmfPlusRotateWorldTransform   = 0x402F,
+  EmfPlusSetPageTransform   = 0x4030,
+  EmfPlusResetClip  = 0x4031,
+  EmfPlusSetClipRect= 0x4032,
+  EmfPlusSetClipPath= 0x4033,
+  EmfPlusSetClipRegion  = 0x4034,
+  EmfPlusOffsetClip = 0x4035,
+  EmfPlusDrawDriverstring   = 0x4036,
+  EmfPlusStrokeFillPath = 0x4037,
+  EmfPlusSerializableObject = 0x4038,
+  EmfPlusSetTSGraphics  = 0x4039,
+  EmfPlusSetTSClip  = 0x403A
+} EmfPlusRecordType;
+
+
 // -
 // - EMFWriter -
 // -
 
+void EMFWriter::ImplBeginCommentRecord( sal_Int32 nCommentType )
+{
+ImplBeginRecord( WIN_EMR_GDICOMMENT );
+m_rStm.SeekRel( 4 );
+m_rStm (sal_Int32) nCommentType;
+}
+
+void EMFWriter::ImplEndCommentRecord()
+{
+if( mbRecordOpen )
+{
+sal_Int32 nActPos = m_rStm.Tell();
+m_rStm.Seek( mnRecordPos + 8 );
+m_rStm  (sal_uInt32)( nActPos - mnRecordPos - 0xc );
+m_rStm.Seek( nActPos );
+}
+ImplEndRecord();
+}
+
+void EMFWriter::ImplBeginPlusRecord( sal_uInt16 nType, sal_uInt16 nFlags )
+{
+DBG_ASSERT( !mbRecordPlusOpen, Another EMF+ record is already opened! );
+
+if( !mbRecordPlusOpen )
+{
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cppcanvas/source

 cppcanvas/source/mtfrenderer/emfplus.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 6cf68eab5eb77b7e081ef5f8d59d196411e86567
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 25 13:15:19 2013 +0100

fdo#59405: cppcanvas: fix infinite loop in processEMFPlus

This can be observed when inserting the bugdoc from fdo#59405.
Apparently the size and length do not agree; ensure that the
length does not underflow.

Change-Id: Idfc68919859b8284c724831de21208e4392af328
(cherry picked from commit ec0d1440cf07008a220708535848567bcbb233ea)
Reviewed-on: https://gerrit.libreoffice.org/2394
Reviewed-by: Radek DoulÃk r...@novell.com
Tested-by: Radek DoulÃk r...@novell.com

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f1b0eff..0c9db41 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1763,7 +1763,16 @@ namespace cppcanvas
 
 rMF.Seek (next);
 
-length -= size;
+if (size = length)
+{
+length -= size;
+}
+else
+{
+SAL_WARN(cppcanvas, ImplRenderer::processEMFPlus: 
+size   sizelength   length);
+length = 0;
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svtools/inc

 svtools/inc/svtools/transfer.hxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit a724fb43d8540687e33d75c90660250e5308585d
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 25 13:11:04 2013 +0100

fdo#59405: initialize members of TransferableObjectDescriptor

The mnViewAspect member is otherwise only initialized if a
SOT_FORMATSTR_ID_OBJECTDESCRIPTOR thingy is in the clipboard, which only
happens if the clipboard source is OOo/LO.
When inserting an OLE object, the value MSOLE_CONTENT apparently results
in requesting the current size from the OLE object, which looks much
better than the square default.

Change-Id: I8c7fb80a8ae88272f1ecaf3a375bef5d917f2a5b
(cherry picked from commit 0cf6433117477642897fb2d874a4353eff8a1f35)
Reviewed-on: https://gerrit.libreoffice.org/2393
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index 25c0d52..93dab75 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -37,6 +37,7 @@
 #include com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp
 #include com/sun/star/datatransfer/dnd/XDragSourceListener.hpp
 #include com/sun/star/datatransfer/dnd/XDropTargetListener.hpp
+#include com/sun/star/embed/Aspects.hpp
 #include com/sun/star/io/XInputStream.hpp
 
 // 
@@ -82,6 +83,12 @@ struct TransferableObjectDescriptor
 String  maDisplayName;
 sal_BoolmbCanLink;
 
+TransferableObjectDescriptor()
+: mnViewAspect(::com::sun::star::embed::Aspects::MSOLE_CONTENT)
+, mnOle2Misc(0)
+, mbCanLink(false)
+{}
+
 SVT_DLLPUBLIC friend SvStream  operator( SvStream rIStm, 
TransferableObjectDescriptor rObjDesc );
 SVT_DLLPUBLIC friend SvStream  operator( SvStream rOStm, const 
TransferableObjectDescriptor rObjDesc );
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - sw/source

 sw/source/ui/docvw/edtwin.cxx |   43 +++---
 sw/source/ui/wrtsh/wrtsh2.cxx |   11 --
 2 files changed, 29 insertions(+), 25 deletions(-)

New commits:
commit 7782a3aad25e96b8a26fbb192a6b54c1269b4efd
Author: Michael Stahl mst...@redhat.com
Date:   Wed Feb 20 00:08:45 2013 +0100

fdo#59928: sw: fix mouse selection of fields differently

Unfortunately selecting the field in SwEditWin::MouseButtonDown()
prevents the click field handling code in SwEditWin::MouseButtonUp()
from running.  Instead select the field in MouseButtonUp and
SwWrtShell::ClickToField(), which seems to work better.
(regression from 94721b2aec614e0d99504138d484b2ad6cd550c7)

Conflicts:
sw/source/ui/wrtsh/wrtsh2.cxx

Change-Id: I3d769487b9d5225ffd07b384fbb0ce01e0733be5
(cherry picked from commit a4a457100a3a6e9f59113e82c9d0b12786273671)
Reviewed-on: https://gerrit.libreoffice.org/2286
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
(cherry picked from commit 7063ea7cc1eadb22ac3ca6c2d54001408b60ef95)
Reviewed-on: https://gerrit.libreoffice.org/2291
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 289aa15..27853a8 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -3557,36 +3557,17 @@ void SwEditWin::MouseButtonDown(const MouseEvent 
_rMEvt)
 // Are we clicking on a field?
 if (rSh.GetContentAtPos(aDocPos, aFieldAtPos))
 {
-bool bAddMode(false); // AdditionalMode if applicable
-if (KEY_MOD1 == rMEvt.GetModifier()  !rSh.IsAddMode())
-{
-bAddMode = true;
-rSh.EnterAddMode();
-}
 rSh.SetCursor(aDocPos, bOnlyText);
-// Select the field. Unfortunately cursor may be on field
+// Unfortunately the cursor may be on field
 // position or on position after field depending on which
 // half of the field was clicked on.
 SwTxtAttr const*const pTxtFld(aFieldAtPos.pFndTxtAttr);
 if (rSh.GetCurrentShellCursor().GetPoint()-nContent
-.GetIndex() == *pTxtFld-GetStart())
-{
-rSh.Right( CRSR_SKIP_CHARS, true, 1, false );
-rSh.NormalizePam();
-}
-else
+.GetIndex() != *pTxtFld-GetStart())
 {
 assert(rSh.GetCurrentShellCursor().GetPoint()-nContent
 .GetIndex() == (*pTxtFld-GetStart() + 1));
-rSh.Left( CRSR_SKIP_CHARS, true, 1, false );
-}
-// it's a bit of a mystery what this is good for?
-// in this case we assume it's valid since we just
-// selected a field
-bValidCrsrPos = true;
-if (bAddMode)
-{
-rSh.LeaveAddMode();
+rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
 }
 // don't go into the !bOverSelect block below - it moves
 // the cursor
@@ -4421,7 +4402,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
 if(pApplyTempl)
 bExecHyperlinks = sal_False;
 
-SwContentAtPos aCntntAtPos( 
SwContentAtPos::SW_CLICKFIELD |
+SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD |
 
SwContentAtPos::SW_INETATTR |
 
SwContentAtPos::SW_SMARTTAG  | SwContentAtPos::SW_FORMCTRL);
 
@@ -4440,7 +4421,23 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
 
 if( SwContentAtPos::SW_FIELD == 
aCntntAtPos.eCntntAtPos )
 {
+bool bAddMode(false);
+// AdditionalMode if applicable
+if (KEY_MOD1 == rMEvt.GetModifier()
+ !rSh.IsAddMode())
+{
+bAddMode = true;
+rSh.EnterAddMode();
+}
 rSh.ClickToField( *aCntntAtPos.aFnd.pFld );
+// a bit of a mystery what this is good for?
+

[Libreoffice-commits] core.git: sw/source

 sw/source/core/access/accmap.cxx |9 +
 sw/source/core/text/txtfrm.cxx   |   18 ++
 2 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 8d08ccd5b84c121867d7b3102f9d10b26005c682
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 25 16:55:07 2013 +

Resolves: fdo#56031 RSID attr changes drop content change events

So if we have an INVALID_ATTR event in the queue and receive
INVALID_CONTENT, drop the attr and replace it with invalid-content

And anyway filter out the RSID change event from hitting the
a11y queue, humans don't care that this changed, it's just noise

Change-Id: I4842f217153fc90aa1dce75c3445053004c74536

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index eb186c7..6938c01 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -885,10 +885,19 @@ void SwAccessibleMap::AppendEvent( const 
SwAccessibleEvent_Impl rEvent )
 // POS_CHANGED event.
 // Therefor, the event's type has to be adapted and the event
 // has to be put at the end.
+//
+// fdo#56031 An INVALID_CONTENT event overwrites a INVALID_ATTR
+// event and overwrites its flags
 OSL_ENSURE( aEvent.GetType() != 
SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
 invalid event combination );
 if( aEvent.GetType() == 
SwAccessibleEvent_Impl::CARET_OR_STATES )
 aEvent.SetType( SwAccessibleEvent_Impl::INVALID_CONTENT );
+else if ( aEvent.GetType() == 
SwAccessibleEvent_Impl::INVALID_ATTR )
+{
+aEvent.SetType( SwAccessibleEvent_Impl::INVALID_CONTENT );
+aEvent.SetStates( rEvent.GetAllStates() );
+}
+
 break;
 case SwAccessibleEvent_Impl::POS_CHANGED:
 // A pos changed event overwrites CARET_STATES (keeping its
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index af575c2..3eb2267 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -912,6 +912,13 @@ static void lcl_ModifyOfst( SwTxtFrm* pFrm, xub_StrLen 
nPos, xub_StrLen nLen )
 }
 }
 
+//Related: fdo#56031 filter out attribute changes that don't matter for
+//humans/a11y to stop flooding the destination mortal with useless noise
+static bool isA11yRelevantAttribute(MSHORT nWhich)
+{
+return nWhich != RES_CHRATR_RSID;
+}
+
 /*
  *  SwTxtFrm::Modify()
  */
@@ -1294,11 +1301,14 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem *pNew )
 SwCntntFrm::Modify( pOld, pNew );
 }
 
-// #i88069#
-ViewShell* pViewSh = getRootFrm() ? getRootFrm()-GetCurrShell() : 
0;
-if ( pViewSh  )
+if (isA11yRelevantAttribute(nWhich))
 {
-pViewSh-InvalidateAccessibleParaAttrs( *this );
+// #i88069#
+ViewShell* pViewSh = getRootFrm() ? 
getRootFrm()-GetCurrShell() : 0;
+if ( pViewSh  )
+{
+pViewSh-InvalidateAccessibleParaAttrs( *this );
+}
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-02-25 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 56031, which changed state.

Bug 56031 Summary: Accessible Text Interface not updating until word boundary 
at caret offset
https://bugs.freedesktop.org/show_bug.cgi?id=56031

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

 sw/source/core/access/accmap.cxx |9 +
 sw/source/core/text/txtfrm.cxx   |   18 ++
 2 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 791a060bd1031c844a9a1b283689dee6a8a7ef77
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 25 16:55:07 2013 +

Resolves: fdo#56031 RSID attr changes drop content change events

So if we have an INVALID_ATTR event in the queue and receive
INVALID_CONTENT, drop the attr and replace it with invalid-content

And anyway filter out the RSID change event from hitting the
a11y queue, humans don't care that this changed, it's just noise

Change-Id: I4842f217153fc90aa1dce75c3445053004c74536
(cherry picked from commit 8d08ccd5b84c121867d7b3102f9d10b26005c682)
Reviewed-on: https://gerrit.libreoffice.org/2401
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 4f737a8..714b37b 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -887,10 +887,19 @@ void SwAccessibleMap::AppendEvent( const 
SwAccessibleEvent_Impl rEvent )
 // POS_CHANGED event.
 // Therefor, the event's type has to be adapted and the event
 // has to be put at the end.
+//
+// fdo#56031 An INVALID_CONTENT event overwrites a INVALID_ATTR
+// event and overwrites its flags
 OSL_ENSURE( aEvent.GetType() != 
SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
 invalid event combination );
 if( aEvent.GetType() == 
SwAccessibleEvent_Impl::CARET_OR_STATES )
 aEvent.SetType( SwAccessibleEvent_Impl::INVALID_CONTENT );
+else if ( aEvent.GetType() == 
SwAccessibleEvent_Impl::INVALID_ATTR )
+{
+aEvent.SetType( SwAccessibleEvent_Impl::INVALID_CONTENT );
+aEvent.SetStates( rEvent.GetAllStates() );
+}
+
 break;
 case SwAccessibleEvent_Impl::POS_CHANGED:
 // A pos changed event overwrites CARET_STATES (keeping its
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index cebe0b5..d76c4fa 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -912,6 +912,13 @@ static void lcl_ModifyOfst( SwTxtFrm* pFrm, xub_StrLen 
nPos, xub_StrLen nLen )
 }
 }
 
+//Related: fdo#56031 filter out attribute changes that don't matter for
+//humans/a11y to stop flooding the destination mortal with useless noise
+static bool isA11yRelevantAttribute(MSHORT nWhich)
+{
+return nWhich != RES_CHRATR_RSID;
+}
+
 /*
  *  SwTxtFrm::Modify()
  */
@@ -1294,11 +1301,14 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem *pNew )
 SwCntntFrm::Modify( pOld, pNew );
 }
 
-// #i88069#
-ViewShell* pViewSh = getRootFrm() ? getRootFrm()-GetCurrShell() : 
0;
-if ( pViewSh  )
+if (isA11yRelevantAttribute(nWhich))
 {
-pViewSh-InvalidateAccessibleParaAttrs( *this );
+// #i88069#
+ViewShell* pViewSh = getRootFrm() ? 
getRootFrm()-GetCurrShell() : 0;
+if ( pViewSh  )
+{
+pViewSh-InvalidateAccessibleParaAttrs( *this );
+}
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2013-02-25 Thread David Ostrovsky

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e98077bbb327a79059177dc08e43cf83859e1de4
Author: David Ostrovsky da...@ostrovsky.org
Date:   Mon Feb 25 18:40:44 2013 +0100

fix x--with-system-openssl configure option

Change-Id: Iaf71585bb109e43e0cdb15bc572b5b86f8aee66d

diff --git a/configure.ac b/configure.ac
index 028bfa3..c1934ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8657,7 +8657,7 @@ if test $_os = Darwin -o $_os = NetBSD -o $_os 
= OpenBSD -o \
 OPENSSL_CFLAGS=
 OPENSSL_LIBS=-lssl -lcrypto
 else
-libo_CHECK_SYSTEM_MODULE([libssl],[OPENSSL],[openssl])
+libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
 fi
 if test $with_system_openssl = yes; then
 libo_MINGW_CHECK_DLL([SSL], [libssl])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Database: Add Limit in Query Desing View

2013-02-25 Thread Andras Timar (via Code Review)

Hello LibreOffice gerrit bot, Zolnai Tamás, Eike Rathke,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/1994

to look at the new patch set (#5).

Change subject: Database: Add Limit in Query Desing View
..

Database: Add Limit in Query Desing View

Levels of implementation
 - Add a new toolbar item to ui (designobjectbar.xml)
 - Make a control for this element( LimitBox: derived from NumericBox)
 - Make an own controller for this control (LimitBoxController) and
   register it
 - Add new feature to the general\central controller (OQueryController)
   and construct a communication channel between the two controller
 - Modify the view switching (SQL-Design) methods to use\set limit
   value (QueryDesignView.cxx)

Conflicts:
dbaccess/source/ui/querydesign/QueryDesignView.cxx

Change-Id: I0eb09d1d40cfdb9b8a2a57ab8911faca91d5e690
---
M dbaccess/Library_dbu.mk
M dbaccess/inc/dbaccess_slotid.hrc
M dbaccess/source/ui/inc/dbu_qry.hrc
M dbaccess/source/ui/inc/querycontroller.hxx
M dbaccess/source/ui/misc/uiservices.cxx
M dbaccess/source/ui/querydesign/QueryDesignView.cxx
A dbaccess/source/ui/querydesign/limitboxcontroller.cxx
A dbaccess/source/ui/querydesign/limitboxcontroller.hxx
M dbaccess/source/ui/querydesign/query.src
M dbaccess/source/ui/querydesign/querycontroller.cxx
M dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
M dbaccess/util/dbu.component
M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
M officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
14 files changed, 488 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/1994/5
-- 
To view, visit https://gerrit.libreoffice.org/1994
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I0eb09d1d40cfdb9b8a2a57ab8911faca91d5e690
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com
Gerrit-Reviewer: Andras Timar ati...@suse.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Zolnai Tamás zolnaitamas2...@gmail.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: odk/CustomTarget_unowinreg.mk

 odk/CustomTarget_unowinreg.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8a4f49485495155ff241e449c94f5700e3226bc6
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 25 19:11:04 2013 +0100

odk: fix typo

Change-Id: I22f01de52eef68371c57df0aad12646a6e870d26

diff --git a/odk/CustomTarget_unowinreg.mk b/odk/CustomTarget_unowinreg.mk
index ae9cad9..76fe2f9 100644
--- a/odk/CustomTarget_unowinreg.mk
+++ b/odk/CustomTarget_unowinreg.mk
@@ -16,7 +16,8 @@ ifeq ($(COM),MSC)
 $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: $(call 
gb_Library_get_target,unowinreg)
cp $ $@
 else # COM=GCC
-$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: 
$(SRCDIR)/odk/sourcd/unowinreg/win/unowinreg.cxx
+$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \
+   $(SRCDIR)/odk/source/unowinreg/win/unowinreg.cxx
$(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ \
-I$(JAVA_HOME)/include \
$(if $(filter LINUX,$(OS)),-I$(JAVA_HOME)/include/linux,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: m4/libo_externals.m4

 m4/libo_externals.m4 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5e5b7e431edc837b2be32d03fcbb1e32377e935a
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 25 19:14:10 2013 +0100

m4: improve help message of libo_CHECK_SYSTEM_MODULE

Change-Id: I784823b27108671e6bb549f60725f21abd47451e

diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4
index c4584e0..329abc7 100644
--- a/m4/libo_externals.m4
+++ b/m4/libo_externals.m4
@@ -9,7 +9,7 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; 
fill-column: 102 -*
 AC_DEFUN([libo_CHECK_SYSTEM_MODULE], [
 AC_ARG_WITH(system-$1,
 AS_HELP_STRING([--with-system-$1],
-[Use $1 already on system.]),,
+[Use $1 from operating system instead of building and bundling it.]),,
 [with_system_$1=$with_system_libs])
 AC_MSG_CHECKING([which $1 to use])
 if test $with_system_$1 = yes; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Regression - LO Writer 4.0