date:20130906

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-09-06 Thread bugzilla-daemon

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

tommy27  changed:

   What|Removed |Added

 Depends on||35669

-- 
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

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-09-06 Thread bugzilla-daemon

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

tommy27  changed:

   What|Removed |Added

 Depends on|35669   |

-- 
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 Gerrit News 2013-09-07

2013-09-06 Thread gerrit

Moin!

* Open changes on master for project core changed in the last 25 hours:

+ Make SvtHistoryOptions only return existing files
  in https://gerrit.libreoffice.org/5841 from Krisztian Pinter
+ oox: Smart-Art DOMs stored in the InteropGrabBag
  in https://gerrit.libreoffice.org/5849 from Andres Gomez
+ drawinglayer: added dumping of InteropGrabBag prop
  in https://gerrit.libreoffice.org/5848 from Andres Gomez
+ Parsing 'presobj' properties from 'objectlist.xml': gsoc-impresslayout
  in https://gerrit.libreoffice.org/5652 from Vishv Brahmbhatt
+ Moved some hxx that were included once...
  in https://gerrit.libreoffice.org/5842 from Marcos Souza
+ fdo#44689: fix for specific case restart value 0
  in https://gerrit.libreoffice.org/5681 from Adam CloudOn
+ Windows registry configuration backend
  in https://gerrit.libreoffice.org/5770 from Janos Farago


* Merged changes on master for project core changed in the last 25 hours:

+ Keep a TempFile instead of using TempFile::CreateTempName.
  in https://gerrit.libreoffice.org/5814 from Andrzej J.R. Hunt
+ Use the user specific tmp directory for firebird.
  in https://gerrit.libreoffice.org/5797 from Andrzej J.R. Hunt
+ String::Erase(String::Search())
  in https://gerrit.libreoffice.org/5827 from Thomas Arnhold
+ Check for FT_Face_GetCharVariantIndex at build time
  in https://gerrit.libreoffice.org/5844 from Khaled Hosny
+ Simplify FreeType version check
  in https://gerrit.libreoffice.org/5843 from Khaled Hosny
+ Fix misspelled text with VoiceOver on 10.9
  in https://gerrit.libreoffice.org/5831 from Boris Dušek


* Abandoned changes on master for project core changed in the last 25 hours:

None

* Open changes needing tweaks, but being untouched for more than a week:

+ Dynamically align toolbars in LibreOffice
  in https://gerrit.libreoffice.org/5655 from Prashant Pandey
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ fdo#66401: fix for combined characters
  in https://gerrit.libreoffice.org/5018 from Adam CloudOn
+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+  fdo#66279 - MathML export: use the operator dictionary
  in https://gerrit.libreoffice.org/4671 from Frédéric Wang
+ Remove old outdated gallery images and sounds
  in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt
+ fix for text watermark
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ Don't use osl_createSuspendedThread anymore
  in https://gerrit.libreoffice.org/5565 from Arnaud Versini
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn
+ Change oslThreadIdentifier to uintptr_t and use THREAD_VALUE on Unix.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn
+ fdo#66577: non-fractional widths with Core Text
  in https://gerrit.libreoffice.org/5023 from Khaled Hosny


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-09-06 Thread Cédric Bosdonnat

 oox/source/vml/vmlshape.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 71de6914b3b34a4e9d97f92a6ec04405256fd296
Author: CÃ©dric Bosdonnat 
Date:   Wed Jun 12 16:01:00 2013 +0200

n#779642: 0 width or height in //v:shape[@style] produces weird results

(cherry picked from commit 3d5fb88cc0aa8ee6be6cec5ce0255f1412368519)

Change-Id: I37ba59dd54ac692f234f3228e442799c5a5f450b
Signed-off-by: Miklos Vajna 

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 9a5278b..d74a526 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -190,11 +190,18 @@ awt::Rectangle ShapeType::getAbsRectangle() const
 
 awt::Rectangle ShapeType::getRelRectangle() const
 {
+sal_Int32 nWidth = maTypeModel.maWidth.toInt32();
+if ( nWidth == 0 )
+nWidth = 1;
+
+sal_Int32 nHeight = maTypeModel.maHeight.toInt32();
+if ( nHeight == 0 )
+nHeight = 1;
+
 return awt::Rectangle(
 maTypeModel.maLeft.toInt32(),
 maTypeModel.maTop.toInt32(),
-maTypeModel.maWidth.toInt32(),
-maTypeModel.maHeight.toInt32() );
+nWidth, nHeight );
 }
 
 // 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/oox oox/source sw/qa

2013-09-06 Thread Miklos Vajna

 include/oox/vml/vmltextbox.hxx|1 +
 oox/source/vml/vmlshape.cxx   |9 +
 oox/source/vml/vmltextbox.cxx |   10 ++
 oox/source/vml/vmltextboxcontext.cxx  |   15 +++
 sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   16 
 6 files changed, 51 insertions(+)

New commits:
commit 4cbc41bc4eaa822829e68c1ee11eafe834bb7da7
Author: Miklos Vajna 
Date:   Fri Sep 6 15:57:03 2013 +0200

bnc#779642 VML import: handle drawinglayer rectangle char spacing

Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a

diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index fc97dc7..d31bb3b 100644
--- a/include/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
@@ -54,6 +54,7 @@ struct OOX_DLLPUBLIC TextFontModel
 OptValue< bool >mobBold;
 OptValue< bool >mobItalic;
 OptValue< bool >mobStrikeout;
+OptValue monSpacing;
 
 explicitTextFontModel();
 };
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index 553b6f0..fbd8217 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -20,6 +20,7 @@
 #include "oox/vml/vmltextbox.hxx"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -92,6 +93,15 @@ void TextBox::convert(uno::Reference 
xShape) const
 aPropertyValue.Value = uno::makeAny(double(rFont.monSize.get()) / 
2.);
 aPropVec.push_back(aPropertyValue);
 }
+if (rFont.monSpacing.has())
+{
+aPropertyValue.Name = "CharKerning";
+// Value is not converted to mm100: SvxKerningItem::PutValue() gets
+// called with nMemberId = 0, so no mm100 -> twips conversion will
+// be done there.
+aPropertyValue.Value = 
uno::makeAny(sal_Int16(rFont.monSpacing.get()));
+aPropVec.push_back(aPropertyValue);
+}
 if (rParagraph.moParaAdjust.has())
 {
 style::ParagraphAdjust eAdjust = style::ParagraphAdjust_LEFT;
diff --git a/oox/source/vml/vmltextboxcontext.cxx 
b/oox/source/vml/vmltextboxcontext.cxx
index 2720450..5c7e2f7 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -132,6 +132,16 @@ void TextPortionContext::onStartElement(const 
AttributeList& rAttribs)
 case OOX_TOKEN(doc, color):
 maFont.moColor = rAttribs.getString( OOX_TOKEN(doc, val) );
 break;
+case OOX_TOKEN(doc, spacing):
+maFont.monSpacing = rAttribs.getInteger(OOX_TOKEN(doc, val));
+break;
+case OOX_TOKEN(doc, r):
+case OOX_TOKEN(doc, rPr):
+case OOX_TOKEN(doc, t):
+break;
+default:
+SAL_INFO("oox", "unhandled: 0x" << std::hex<< getCurrentElement());
+break;
 }
 }
 
diff --git a/sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx 
b/sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx
new file mode 100755
index 000..0729847
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 08b2bfc..b933e85 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -132,6 +132,7 @@ public:
 void testTablePagebreak();
 void testFdo68607();
 void testVmlTextVerticalAdjust();
+void testGroupshapeSdt();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -230,6 +231,7 @@ void Test::run()
 {"table-pagebreak.docx", &Test::testTablePagebreak},
 {"fdo68607.docx", &Test::testFdo68607},
 {"vml-text-vertical-adjust.docx", &Test::testVmlTextVerticalAdjust},
+{"groupshape-sdt.docx", &Test::testGroupshapeSdt},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1551,6 +1553,20 @@ void Test::testVmlTextVerticalAdjust()
 CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_TOP, 
getProperty(xShape, "TextVerticalAdjust"));
 }
 
+void Test::testGroupshapeSdt()
+{
+// All problems here are due to the groupshape: we have a drawinglayer 
rectangle, not a writer textframe.
+uno::Reference xOuterGroupShape(getShape(1), 
uno::UNO_QUERY);
+uno::Reference 
xInnerGroupShape(xOuterGroupShape->getByIndex(0), uno::UNO_QUERY);
+uno::Reference xShape(xInnerGroupShape->getByIndex(0), 
uno::UNO_QUERY);
+// Border distances were not implemented, this was 0.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1905), getProperty(xShape, 
"TextUpperDistance"));
+// Sdt field result wasn't imported, this was "".
+CPPUNIT_ASSERT_EQUAL(OUString("placeholder text"), xShape->getString());
+// w:spacing was ignored in oox, this was 0.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(20), 
getProperty(getRun(getPa

[Libreoffice-commits] core.git: 5 commits - connectivity/Library_firebird_sdbc.mk connectivity/source

2013-09-06 Thread Andrzej J . R . Hunt

 connectivity/Library_firebird_sdbc.mk  |1 
 connectivity/source/drivers/firebird/Connection.cxx|   16 ++--
 connectivity/source/drivers/firebird/DatabaseMetaData.cxx  |   44 
 connectivity/source/drivers/firebird/Indexes.cxx   |   33 +
 connectivity/source/drivers/firebird/Indexes.hxx   |   45 +
 connectivity/source/drivers/firebird/PreparedStatement.cxx |7 --
 connectivity/source/drivers/firebird/ResultSet.cxx |8 --
 connectivity/source/drivers/firebird/Table.cxx |8 +-
 8 files changed, 110 insertions(+), 52 deletions(-)

New commits:
commit 0dbe580f0f4055eaf215e1fa5f1120657738eaad
Author: Andrzej J.R. Hunt 
Date:   Fri Sep 6 21:12:57 2013 +0100

Some stylistic cleanup in PreparedStatement.

Change-Id: Idaddaeff58fa9433c678e7913435ad81bd615934

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 9e05311..f23871c 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -309,10 +309,9 @@ Reference< XResultSet > SAL_CALL 
OPreparedStatement::executeQuery()
 }
 
 //- XParameters ---
-void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 nSqlType)
+void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 
/*nSqlType*/)
 throw(SQLException, RuntimeException)
 {
-(void) nSqlType;
 MutexGuard aGuard( m_pConnection->getMutex() );
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
@@ -350,11 +349,9 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T& 
nValue, ISC_SHORT nType)
 memcpy(pVar->sqldata, &nValue, sizeof(nValue));
 }
 
-void SAL_CALL OPreparedStatement::setByte(sal_Int32 nIndex, sal_Int8 nValue)
+void SAL_CALL OPreparedStatement::setByte(sal_Int32 /*nIndex*/, sal_Int8 
/*nValue*/)
 throw(SQLException, RuntimeException)
 {
-(void) nIndex;
-(void) nValue;
 ::dbtools::throwFunctionNotSupportedException("setByte not supported in 
firebird",
   *this,
   Any());
commit 1e7ce14b7f104459ee06c472fcc6af39fa4a9750
Author: Andrzej J.R. Hunt 
Date:   Fri Sep 6 21:10:05 2013 +0100

Use throwFunctionNotSupportedException as appropriate. (firebird-sdbc)

Change-Id: Ia2eb42ea2bf0f70a6d1fef29438a43a7a2f69388

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index 9f5b003..b88420f 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -565,16 +565,16 @@ sal_Bool SAL_CALL OConnection::isReadOnly() 
throw(SQLException, RuntimeException
 return m_bReadOnly;
 }
 
-void SAL_CALL OConnection::setCatalog(const OUString& catalog)
-throw(SQLException, 
RuntimeException)
+void SAL_CALL OConnection::setCatalog(const OUString& /*catalog*/)
+throw(SQLException, RuntimeException)
 {
-::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", 
*this );
-(void) catalog;
+::dbtools::throwFunctionNotSupportedException("setCatalog", *this);
 }
 
-OUString SAL_CALL OConnection::getCatalog() throw(SQLException, 
RuntimeException)
+OUString SAL_CALL OConnection::getCatalog()
+throw(SQLException, RuntimeException)
 {
-// Unsupported
+::dbtools::throwFunctionNotSupportedException("getCatalog", *this);
 return OUString();
 }
 
@@ -667,9 +667,9 @@ void SAL_CALL OConnection::documentEventOccured( const 
DocumentEvent& _Event )
 }
 }
 // XEventListener
-void SAL_CALL OConnection::disposing( const EventObject& Source ) throw 
(RuntimeException)
+void SAL_CALL OConnection::disposing(const EventObject& /*rSource*/)
+throw (RuntimeException)
 {
-(void) Source;
 }
 //
 void OConnection::buildTypeInfo() throw( SQLException)
commit 79eae295dd40a34e55c4a0a9e870183d78070655
Author: Andrzej J.R. Hunt 
Date:   Fri Sep 6 21:03:10 2013 +0100

Comment out unused parameters instead of (void) cast. (firebird-sdbc)

Firebird doesn't support catalogs or schemas hence these parameters
are unused in the various get[...] methods. Previously these were (void)
casted however commenting out the parameters seems more correct and reduces
the amount of code.

(This was omitted for as-of-yet unimplemented methods since they will still
 be looked at in detail.)

Change-Id: Ic6566ff0b3e873b802deec79d5497efdd21e577d

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 0f86ad5..19f66d5 100644
--- a/connec

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

2013-09-06 Thread Caolán McNamara

 sw/uiconfig/swriter/ui/printmonitordialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 466947504a82b4a4e6668aeb2de5c736fbd99c67
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 20:47:58 2013 +0100

saing->saving, yikes!

Change-Id: I3597a00a5330aab32165da8308177879d1f2db96

diff --git a/sw/uiconfig/swriter/ui/printmonitordialog.ui 
b/sw/uiconfig/swriter/ui/printmonitordialog.ui
index 26407d8..2924c3d 100644
--- a/sw/uiconfig/swriter/ui/printmonitordialog.ui
+++ b/sw/uiconfig/swriter/ui/printmonitordialog.ui
@@ -79,7 +79,7 @@
   
 
 
-  
+  
 False
 True
 is being saved 
to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2e/1614441cf56ed174572e2b92a451055ad626bd

2013-09-06 Thread Caolán McNamara

 2e/1614441cf56ed174572e2b92a451055ad626bd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a1e0b8c72c09a6fc08c6c0cf9fc5d9740dd765fc
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 20:39:13 2013 +0100

Notes added by 'git notes add'

diff --git a/2e/1614441cf56ed174572e2b92a451055ad626bd 
b/2e/1614441cf56ed174572e2b92a451055ad626bd
new file mode 100644
index 000..ea85c13
--- /dev/null
+++ b/2e/1614441cf56ed174572e2b92a451055ad626bd
@@ -0,0 +1 @@
+prefer: 7df4c7feacf51c141a7beaa2a8404d932d7c2e86
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Thomas Arnhold

 vcl/unx/generic/printer/ppdparser.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5c4cecb7ee3c910d739dee0701a4f54b06109cf5
Author: Thomas Arnhold 
Date:   Thu Sep 5 17:53:06 2013 +0200

String::Erase(String::Search())

One more from:

556fe4ec7339892d63cb98bc9bfd09718944bf03

Change-Id: Ia6514567e96930376c469a37c95c49e648bf5e46
Reviewed-on: https://gerrit.libreoffice.org/5827
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/unx/generic/printer/ppdparser.cxx 
b/vcl/unx/generic/printer/ppdparser.cxx
index 3cec3e7..b82e20e 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1303,7 +1303,9 @@ void PPDParser::parseConstraint( const OString& rLine )
 bool bFailed = false;
 
 OUString aLine(OStringToOUString(rLine, RTL_TEXTENCODING_MS_1252));
-aLine = aLine.replaceAt(0, rLine.indexOf(':') + 1, "");
+sal_Int32 nIdx = rLine.indexOf(':');
+if (nIdx != -1)
+aLine = aLine.replaceAt(0, nIdx + 1, "");
 PPDConstraint aConstraint;
 int nTokens = GetCommandLineTokenCount( aLine );
 for( int i = 0; i < nTokens; i++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Andrzej J . R . Hunt

 connectivity/source/drivers/firebird/Connection.cxx |   16 +---
 connectivity/source/drivers/firebird/Connection.hxx |4 
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 08ea5af067df79e7abfd87fc2a319a774aebbc80
Author: Andrzej J.R. Hunt 
Date:   Thu Sep 5 17:16:02 2013 +0100

Keep a TempFile instead of using TempFile::CreateTempName.

This ensures that the enclosing directory is kept while we work with
it.

Conflicts:
connectivity/source/drivers/firebird/Connection.cxx

Change-Id: I5c095d481414e345cf05efc3d40d314f8f40ed12
Reviewed-on: https://gerrit.libreoffice.org/5814
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: CaolÃ¡n McNamara 

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index d719b85..9f5b003 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -149,10 +149,12 @@ void OConnection::construct(const ::rtl::OUString& url, 
const Sequence< Property
 
 bIsNewDatabase = !m_xEmbeddedStorage->hasElements();
 
-m_sURL = utl::TempFile::CreateTempName();
+m_pExtractedFDBFile.reset(new ::utl::TempFile(NULL, true));
+m_pExtractedFDBFile->EnableKillingFile();
+m_sURL = m_pExtractedFDBFile->GetFileName() + "/firebird.fdb";
+
+SAL_INFO("connectivity.firebird", "Temporary .fdb location:  " << 
m_sURL);
 
-SAL_INFO("connectivity.firebird", "Temporary .fdb location:  "
-<< OUStringToOString(m_sURL,RTL_TEXTENCODING_UTF8 
).getStr());
 if (!bIsNewDatabase)
 {
 SAL_INFO("connectivity.firebird", "Extracting .fdb from .odb" );
@@ -746,14 +748,6 @@ void OConnection::disposing()
 evaluateStatusVector(status, "isc_detach_database", *this);
 }
 // TODO: write to storage again?
-if (m_bIsEmbedded)
-{
-uno::Reference< ucb::XSimpleFileAccess > xFileAccess(
-ucb::SimpleFileAccess::create( 
comphelper::getProcessComponentContext()),
-uno::UNO_QUERY);
-if (xFileAccess->exists(m_sURL))
-xFileAccess->kill(m_sURL);
-}
 
 dispose_ChildImpl();
 cppu::WeakComponentImplHelperBase::disposing();
diff --git a/connectivity/source/drivers/firebird/Connection.hxx 
b/connectivity/source/drivers/firebird/Connection.hxx
index 7a21aca..21da127 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -25,12 +25,14 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -74,6 +76,8 @@ namespace connectivity
 ::osl::Mutex&   getMutex()
 { return m_aMutex; }
 protected:
+::boost::scoped_ptr< ::utl::TempFile > m_pExtractedFDBFile;
+
 static const OUString sDBLocation; // Location within .odb 
container
 
//
 // Data attributes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Andrzej J . R . Hunt

 connectivity/source/drivers/firebird/Connection.cxx |2 +-
 connectivity/source/drivers/firebird/Driver.cxx |   18 +++---
 connectivity/source/drivers/firebird/Driver.hxx |4 
 3 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 508d1bf7dfa1be99e3fc8d57eb780150af53290e
Author: Andrzej J.R. Hunt 
Date:   Wed Sep 4 19:58:39 2013 +0100

Use the user specific tmp directory for firebird.

osl::FileBase::getTempDirURL uses the general tmp directory which
can be the system wide directory (i.e. /tmp). This can lead to conflicts
e.g. if we have multiple instances each trying to create /tmp/firebird.

Instead we use ::utl::TempFile which uses a user-specific directory (as a
subdirectory of what osl::FileBase::getTempDirURL provides), in which we
can have the FIREBIRD_TMP and FIREBIRD_LOCK directories.

Change-Id: Ic868f12b0a56900eac75f2418986193dd5fe0f10
Reviewed-on: https://gerrit.libreoffice.org/5797
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index 0d53123..d719b85 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -149,7 +149,7 @@ void OConnection::construct(const ::rtl::OUString& url, 
const Sequence< Property
 
 bIsNewDatabase = !m_xEmbeddedStorage->hasElements();
 
-m_sURL = utl::TempFile::CreateTempName() + ".fdb";
+m_sURL = utl::TempFile::CreateTempName();
 
 SAL_INFO("connectivity.firebird", "Temporary .fdb location:  "
 << OUStringToOString(m_sURL,RTL_TEXTENCODING_UTF8 
).getStr());
diff --git a/connectivity/source/drivers/firebird/Driver.cxx 
b/connectivity/source/drivers/firebird/Driver.cxx
index 5e9f04b..4480bb9 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -27,7 +27,6 @@
 
 #include 
 #include 
-#include 
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -60,16 +59,21 @@ const OUString 
FirebirdDriver::our_sFirebirdLockVar("FIREBIRD_LOCK");
 
 FirebirdDriver::FirebirdDriver()
 : ODriver_BASE(m_aMutex)
+, m_firebirdTMPDirectory(NULL, true)
+, m_firebirdLockDirectory(NULL, true)
 {
-OUString sTmpDirURL, sTmpDirPath;
-::osl::FileBase::getTempDirURL(sTmpDirURL);
-::osl::FileBase::getSystemPathFromFileURL(sTmpDirURL, sTmpDirPath);
+m_firebirdTMPDirectory.EnableKillingFile();
+m_firebirdLockDirectory.EnableKillingFile();
+
+// ::utl::TempFile uses a unique temporary directory (subdirectory of
+// /tmp or other user specific tmp directory) per instance in which
+// we can create directories for firebird at will.
 
 // Overrides firebird's default of /tmp or c:\temp
-osl_setEnvironment(our_sFirebirdTmpVar.pData, sTmpDirPath.pData);
+osl_setEnvironment(our_sFirebirdTmpVar.pData, 
m_firebirdTMPDirectory.GetFileName().pData);
+
 // Overrides firebird's default of /tmp/firebird or c:\temp\firebird
-sTmpDirPath += "/firebird";
-osl_setEnvironment(our_sFirebirdLockVar.pData, sTmpDirPath.pData);
+osl_setEnvironment(our_sFirebirdLockVar.pData, 
m_firebirdLockDirectory.GetFileName().pData);
 }
 
 void FirebirdDriver::disposing()
diff --git a/connectivity/source/drivers/firebird/Driver.hxx 
b/connectivity/source/drivers/firebird/Driver.hxx
index 0963468..31c93c6 100644
--- a/connectivity/source/drivers/firebird/Driver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace connectivity
 {
@@ -48,6 +49,9 @@ namespace connectivity
 static const ::rtl::OUString our_sFirebirdTmpVar;
 static const ::rtl::OUString our_sFirebirdLockVar;
 
+::utl::TempFile m_firebirdTMPDirectory;
+::utl::TempFile m_firebirdLockDirectory;
+
 protected:
 ::osl::Mutexm_aMutex;   // mutex is need to 
control member access
 OWeakRefArray   m_xConnections; //  vector containing 
a list
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac vcl/generic

2013-09-06 Thread Khaled Hosny

 config_host/config_features.h.in  |4 
 configure.ac  |8 
 vcl/generic/glyphs/gcach_ftyp.cxx |   29 +++--
 3 files changed, 19 insertions(+), 22 deletions(-)

New commits:
commit e4a1acd396785675bfc25c7cd5c66304ec40f38f
Author: Khaled Hosny 
Date:   Fri Sep 6 16:04:09 2013 +0200

Check for FT_Face_GetCharVariantIndex at build time

No more dlsym() hacks. The downside is that LibreOffice built on systems
with old FreeType will not be able to use FT_Face_GetCharVariantIndex()
on newer systems, but most Linux users use their distribution builds
anyway.

This only affects the use of Unicode Variation Selectors which is an
exotic feature that wasn't even supported on Linux before 4.1.

Change-Id: I674822ef5bc8d7940a821a01cc85ae7a6d39a80e
Reviewed-on: https://gerrit.libreoffice.org/5844
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 1c42ff0..100706a 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -116,5 +116,9 @@
 
 #define HAVE_FEATURE_READONLY_INSTALLSET 0
 
+/*
+ * Whether FreeType has FT_Face_GetCharVariantIndex or not.
+ */
+#define HAVE_FT_FACE_GETCHARVARIANTINDEX 0
 
 #endif
diff --git a/configure.ac b/configure.ac
index 2f20dd1..22807cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -608,6 +608,7 @@ linux-android*)
 AC_MSG_ERROR([the --with-android-sdk option does not point to an 
Android SDK])
 fi
 
+AC_DEFINE(HAVE_FT_FACE_GETCHARVARIANTINDEX)
 BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
 ;;
 
@@ -7686,6 +7687,13 @@ if test  "$test_freetype" = "yes"; then
 PKG_CHECK_MODULES(FREETYPE, freetype2 >= 9.9.3)
 FREETYPE_CFLAGS=$(printf '%s' "$FREETYPE_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 SYSTEM_FREETYPE=YES
+_save_libs="$LIBS"
+_save_cflags="$CFLAGS"
+LIBS="$LIBS $FREETYPE_LIBS"
+CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
+AC_CHECK_FUNC(FT_Face_GetCharVariantIndex, 
AC_DEFINE(HAVE_FT_FACE_GETCHARVARIANTINDEX), [])
+LIBS="$_save_libs"
+CFLAGS="$_save_cflags"
 fi
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index df56d1b..ff0a428 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -28,6 +28,7 @@
 #include "vcl/svapp.hxx"
 #include 
 #include 
+#include 
 #include 
 #if ENABLE_GRAPHITE
 #include 
@@ -67,8 +68,6 @@ typedef const FT_Vector* FT_Vector_CPtr;
 
 // TODO: move file mapping stuff to OSL
 #if defined(UNX)
-// PORTERS: dlfcn is used for getting symbols from FT versions newer than 
baseline
-#include 
 #include 
 #include 
 #include 
@@ -115,7 +114,6 @@ static FT_Library aLibFT = 0;
 
 // enable linking with old FT versions
 static int nFTVERSION = 0;
-static FT_UInt (*pFT_Face_GetCharVariantIndex)(FT_Face, FT_ULong, FT_ULong);
 
 typedef ::boost::unordered_map, 
rtl::CStringHash, rtl::CStringEqual> FontFileList;
 
@@ -468,23 +466,6 @@ FreetypeManager::FreetypeManager()
 FT_Library_Version(aLibFT, &nMajor, &nMinor, &nPatch);
 nFTVERSION = nMajor * 1000 + nMinor * 100 + nPatch;
 
-#ifdef ANDROID
-// For Android we use the bundled static libfreetype.a, and we
-// want to avoid accidentally finding the FT_* symbols in the
-// system FreeType code (which *is* present in a system library,
-// libskia.so, but is not a public API, and in fact does crash the
-// app if used).
-pFT_Face_GetCharVariantIndex = FT_Face_GetCharVariantIndex;
-#else
-#ifdef RTLD_DEFAULT // true if a good dlfcn.h header was included
-pFT_Face_GetCharVariantIndex = (FT_UInt(*)(FT_Face, FT_ULong, 
FT_ULong))(sal_IntPtr)dlsym( RTLD_DEFAULT, "FT_Face_GetCharVariantIndex" );
-
-// disable FT_Face_GetCharVariantIndex for older versions
-// https://bugzilla.mozilla.org/show_bug.cgi?id=618406#c8
-if( nFTVERSION < 2404 )
-pFT_Face_GetCharVariantIndex = NULL;
-#endif
-#endif
 // TODO: remove when the priorities are selected by UI
 char* pEnv;
 pEnv = ::getenv( "SAL_EMBEDDED_BITMAP_PRIORITY" );
@@ -1110,10 +1091,14 @@ int ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, 
sal_UCS4 aVS) const
 }
 
 int nGlyphIndex = 0;
+#if HAVE_FT_FACE_GETCHARVARIANTINDEX
 // If asked, check first for variant glyph with the given Unicode variation
 // selector. This is quite uncommon so we don't bother with caching here.
-if (aVS && pFT_Face_GetCharVariantIndex)
-nGlyphIndex = (*pFT_Face_GetCharVariantIndex)(maFaceFT, aChar, aVS);
+// Disabled for buggy FreeType versions:
+// https://bugzilla.mozilla.org/show_bug.cgi?id=618406#c8
+if (aVS && nFTVERSION >= 2404)
+nGlyphIndex = FT_Face_GetCharVariantIndex(maFaceFT, aChar, aVS);
+#endif
 
 if (nGlyphIndex == 0)
 {
__

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

2013-09-06 Thread Khaled Hosny

 vcl/generic/glyphs/gcach_ftyp.cxx |   18 --
 1 file changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 1d223fa1ec3724b291a7d46de7e38e32c03c5235
Author: Khaled Hosny 
Date:   Fri Sep 6 15:10:34 2013 +0200

Simplify FreeType version check

After 00a81233d9c2ae6b3996b744982715137fd6a626, we can rely on the
version of the runtime library.

Change-Id: I9af4a524c893d125d185da50334622007f2e44ce
Reviewed-on: https://gerrit.libreoffice.org/5843
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index b627a28..df56d1b 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -61,10 +61,6 @@
 #endif
 #include "rtl/instance.hxx"
 
-#ifdef ANDROID
-#define FTVERSION (1000*FREETYPE_MAJOR + 100*FREETYPE_MINOR + FREETYPE_PATCH)
-#endif
-
 typedef const FT_Vector* FT_Vector_CPtr;
 
 #include 
@@ -468,6 +464,10 @@ FreetypeManager::FreetypeManager()
 {
 /*FT_Error rcFT =*/ FT_Init_FreeType( &aLibFT );
 
+FT_Int nMajor = 0, nMinor = 0, nPatch = 0;
+FT_Library_Version(aLibFT, &nMajor, &nMinor, &nPatch);
+nFTVERSION = nMajor * 1000 + nMinor * 100 + nPatch;
+
 #ifdef ANDROID
 // For Android we use the bundled static libfreetype.a, and we
 // want to avoid accidentally finding the FT_* symbols in the
@@ -475,24 +475,14 @@ FreetypeManager::FreetypeManager()
 // libskia.so, but is not a public API, and in fact does crash the
 // app if used).
 pFT_Face_GetCharVariantIndex = FT_Face_GetCharVariantIndex;
-nFTVERSION = FTVERSION;
 #else
 #ifdef RTLD_DEFAULT // true if a good dlfcn.h header was included
-// Get version of freetype library to enable workarounds.
 pFT_Face_GetCharVariantIndex = (FT_UInt(*)(FT_Face, FT_ULong, 
FT_ULong))(sal_IntPtr)dlsym( RTLD_DEFAULT, "FT_Face_GetCharVariantIndex" );
 
-FT_Int nMajor = 0, nMinor = 0, nPatch = 0;
-FT_Library_Version(aLibFT, &nMajor, &nMinor, &nPatch);
-nFTVERSION = nMajor * 1000 + nMinor * 100 + nPatch;
-
 // disable FT_Face_GetCharVariantIndex for older versions
 // https://bugzilla.mozilla.org/show_bug.cgi?id=618406#c8
 if( nFTVERSION < 2404 )
 pFT_Face_GetCharVariantIndex = NULL;
-
-#else // RTLD_DEFAULT
-// assume systems where dlsym is not possible use supplied library
-nFTVERSION = FTVERSION;
 #endif
 #endif
 // TODO: remove when the priorities are selected by UI
___
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-4.0' - 8 commits - oox/inc oox/source sw/qa

2013-09-06 Thread Miklos Vajna

 oox/inc/oox/vml/vmltextbox.hxx  |   12 +-
 oox/inc/oox/vml/vmltextboxcontext.hxx   |5 
 oox/source/vml/vmlshape.cxx |9 +
 oox/source/vml/vmltextbox.cxx   |   55 ++
 oox/source/vml/vmltextboxcontext.cxx|   61 ++--
 sw/qa/extras/inc/swmodeltestbase.hxx|9 +
 sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx   |binary
 sw/qa/extras/ooxmlimport/data/vml-text-vertical-adjust.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   30 +
 9 files changed, 168 insertions(+), 13 deletions(-)

New commits:
commit 975875c97b8617c883d3f02e48def960f2419695
Author: Miklos Vajna 
Date:   Fri Sep 6 15:57:03 2013 +0200

bnc#779642 VML import: handle drawinglayer rectangle char spacing

Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a
(cherry picked from commit 4cbc41bc4eaa822829e68c1ee11eafe834bb7da7)

diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index 4ffec0b..eea12d2 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -54,6 +54,7 @@ struct OOX_DLLPUBLIC TextFontModel
 OptValue< bool >mobBold;
 OptValue< bool >mobItalic;
 OptValue< bool >mobStrikeout;
+OptValue monSpacing;
 
 explicitTextFontModel();
 };
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index 1fbed35..7878505 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -20,6 +20,7 @@
 #include "oox/vml/vmltextbox.hxx"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -90,6 +91,15 @@ void TextBox::convert(uno::Reference 
xShape) const
 aPropertyValue.Value = uno::makeAny(double(rFont.monSize.get()) / 
2.);
 aPropVec.push_back(aPropertyValue);
 }
+if (rFont.monSpacing.has())
+{
+aPropertyValue.Name = "CharKerning";
+// Value is not converted to mm100: SvxKerningItem::PutValue() gets
+// called with nMemberId = 0, so no mm100 -> twips conversion will
+// be done there.
+aPropertyValue.Value = 
uno::makeAny(sal_Int16(rFont.monSpacing.get()));
+aPropVec.push_back(aPropertyValue);
+}
 if (rParagraph.moParaAdjust.has())
 {
 style::ParagraphAdjust eAdjust = style::ParagraphAdjust_LEFT;
diff --git a/oox/source/vml/vmltextboxcontext.cxx 
b/oox/source/vml/vmltextboxcontext.cxx
index e176db4..c37d904 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -133,6 +133,16 @@ void TextPortionContext::onStartElement(const 
AttributeList& rAttribs)
 case OOX_TOKEN(doc, color):
 maFont.moColor = rAttribs.getString( OOX_TOKEN(doc, val) );
 break;
+case OOX_TOKEN(doc, spacing):
+maFont.monSpacing = rAttribs.getInteger(OOX_TOKEN(doc, val));
+break;
+case OOX_TOKEN(doc, r):
+case OOX_TOKEN(doc, rPr):
+case OOX_TOKEN(doc, t):
+break;
+default:
+SAL_INFO("oox", "unhandled: 0x" << std::hex<< getCurrentElement());
+break;
 }
 }
 
diff --git a/sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx 
b/sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx
new file mode 100755
index 000..0729847
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 9a0e08f..648baba 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -137,6 +137,7 @@ public:
 void testTablePagebreak();
 void testFdo68607();
 void testVmlTextVerticalAdjust();
+void testGroupshapeSdt();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -222,6 +223,7 @@ void Test::run()
 {"table-pagebreak.docx", &Test::testTablePagebreak},
 {"fdo68607.docx", &Test::testFdo68607},
 {"vml-text-vertical-adjust.docx", &Test::testVmlTextVerticalAdjust},
+{"groupshape-sdt.docx", &Test::testGroupshapeSdt},
 };
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1382,6 +1384,20 @@ void Test::testVmlTextVerticalAdjust()
 CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_TOP, 
getProperty(xShape, "TextVerticalAdjust"));
 }
 
+void Test::testGroupshapeSdt()
+{
+// All problems here are due to the groupshape: we have a drawinglayer 
rectangle, not a writer textframe.
+uno::Reference xOuterGroupShape(getShape(1), 
uno::UNO_QUERY);
+uno::Reference 
xInnerGroupShape(xOuterGroupShape->getByIndex(0), uno::UNO_QUERY);
+uno::Reference xShape(xInnerGroupShape->getByIndex(0), 
uno::UNO_QUERY);
+// Border distances were not implemented, this was 0.
+C

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

2013-09-06 Thread László Németh

 librelogo/source/LibreLogo/LibreLogo.py |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit cd53ac3dbf66b75ea9685121fcf6c5bb6c84feef
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Sep 6 17:30:25 2013 +0200

fdo#69041 LibreLogo: fix SVG/SMIL timing with filled polylines

Change-Id: Icebd47d57a830986c371a62ec7dab81ca8fd930a
Reviewed-on: https://gerrit.libreoffice.org/5845
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index 84e7a2b..f0b78bf 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -784,7 +784,7 @@ def __dots__(n, pos, dx, dy, r = -1, q = 0): # dots for 
dotted polyline or circl
 dots += [(__Point__(px, py), __Point__(px + 7, py + 7))]
 return dots
 
-def __draw__(d):
+def __draw__(d, count = True):
 shape = _.doc.createInstance( "com.sun.star.drawing." + d)
 shape.AnchorType = __AT_PAGE__
 shape.TextWrap = __THROUGHT__
@@ -796,7 +796,8 @@ def __draw__(d):
 _.drawpage.add(shape)
 if __group__:
 __group__.add(shape)
-_.shapecache[next(_.shapecount)] = str(_.time)
+if count:
+_.shapecache[next(_.shapecount)] = str(_.time)
 return shape
 
 def __zoom__():
@@ -892,7 +893,7 @@ def __fillit__(filled = True):
 __removeshape__(__ACTUAL__)  # FIXME close dotted polyline
 return
 if oldshape and "LineShape" in oldshape.ShapeType:
-shape = __draw__("PolyPolygonShape")
+shape = __draw__("PolyPolygonShape", False)
 shape.PolyPolygon = oldshape.PolyPolygon
 shape.setPosition(oldshape.getPosition())
 shape.LineStyle, shape.LineDash = __linestyle__(_.linestyle)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Please regenerate api.libreoffice.org from libreoffice-4-1 branch

2013-09-06 Thread Alexander Thurgood

Le 05/09/13 09:33, Andras Timar a écrit :

Hi Andras,

> It is your browser cache, force reload, and it will be fine.
> 

I gave this advice to a user on the EN mailing list, and now they can't
connect to any of the indexes at all.


Alex

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

[Libreoffice-commits] core.git: Branch 'feature/ods-edit-cell-import' - 0 commits -

2013-09-06 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cell-notes' - 0 commits -

2013-09-06 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread László Németh

 librelogo/source/LibreLogo/LibreLogo.py |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f48b387d2ca1ab9022a370c2f4e67c8e7f23021c
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Sep 6 17:30:25 2013 +0200

fdo#69041 LibreLogo: fix SVG/SMIL timing with filled polylines

Change-Id: Icebd47d57a830986c371a62ec7dab81ca8fd930a

diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index e5f3dba..a331642 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -787,7 +787,7 @@ def __dots__(n, pos, dx, dy, r = -1, q = 0): # dots for 
dotted polyline or circl
 dots += [(__Point__(px, py), __Point__(px + 7, py + 7))]
 return dots
 
-def __draw__(d):
+def __draw__(d, count = True):
 shape = _.doc.createInstance( "com.sun.star.drawing." + d)
 shape.AnchorType = __AT_PAGE__
 shape.TextWrap = __THROUGHT__
@@ -799,7 +799,8 @@ def __draw__(d):
 _.drawpage.add(shape)
 if __group__:
 __group__.add(shape)
-_.shapecache[next(_.shapecount)] = str(_.time)
+if count:
+_.shapecache[next(_.shapecount)] = str(_.time)
 return shape
 
 def __zoom__():
@@ -895,7 +896,7 @@ def __fillit__(filled = True):
 __removeshape__(__ACTUAL__)  # FIXME close dotted polyline
 return
 if oldshape and "LineShape" in oldshape.ShapeType:
-shape = __draw__("PolyPolygonShape")
+shape = __draw__("PolyPolygonShape", False)
 shape.PolyPolygon = oldshape.PolyPolygon
 shape.setPosition(oldshape.getPosition())
 shape.LineStyle, shape.LineDash = __linestyle__(_.linestyle)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cell-format-data-bar' - 0 commits -

2013-09-06 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/kohei/formula-opencl-work'

2013-09-06 Thread Kohei Yoshida

New branch 'private/kohei/formula-opencl-work' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Please regenerate api.libreoffice.org from libreoffice-4-1 branch

2013-09-06 Thread Alexander Thurgood

Le 05/09/13 09:33, Andras Timar a écrit :

Hi Andras,

I've seen two user reports of similar problems (404 not found), one
yesterday on the French list and one today on the EN user list.

Alex


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

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 0 commits -

2013-09-06 Thread Unknown

Rebased ref, commits from common ancestor:
___
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' - helpcontent2 vcl/source

2013-09-06 Thread László Németh

 helpcontent2  |2 +-
 vcl/source/glyphs/graphite_layout.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ac8df424f1ef09d78ae76f98fdbbf58c0dae24bd
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Sep 6 11:20:09 2013 +0200

fdo#68313 fix combining diacritics problem with Graphite fonts

Change-Id: I042a32cc9c025efcd25ccf95427bee5d6d4024fb

diff --git a/helpcontent2 b/helpcontent2
index e15ec69..0d8b37c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e15ec6915ca8837f68fc1b1133d6380f087f81c0
+Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e
diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 1190408..bbd7cc5 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -594,9 +594,9 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& 
rArgs)
 nSegCharLimit - rArgs.mnEndCharPos, bRtl);
 }
 }
-int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
-rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
-if (rArgs.mnMinCharPos + numchars > limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
+//int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
+//rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, 
fdo#68313, FIXME
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread László Németh

 vcl/source/glyphs/graphite_layout.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bb09c7c14bb1caf7b08b39944bda61382b158c64
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Sep 6 11:08:02 2013 +0200

fdo#68313 fix combining diacritics problem with Graphite fonts

Change-Id: Ied29f864dc5fc21fc55aaa5ddd40b02b53a564f8

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 034842a..a9cb7cc 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -589,9 +589,9 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& 
rArgs)
 nSegCharLimit - rArgs.mnEndCharPos, bRtl);
 }
 }
-int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
-rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
-if (rArgs.mnMinCharPos + numchars > limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
+//int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
+//rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, 
fdo#68313, FIXME
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
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-09-06 Thread bugzilla-daemon

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

Bug 54157 depends on bug 68313, which changed state.

Bug 68313 Summary: Diacritics problem with Graphite fonts
https://bugs.freedesktop.org/show_bug.cgi?id=68313

   What|Removed |Added

 Status|REOPENED|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: vcl/source

2013-09-06 Thread Khaled Hosny

 vcl/source/gdi/pngread.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a7403bf7c12048b8c7eefadd63b021a71cfa5de0
Author: Khaled Hosny 
Date:   Fri Sep 6 16:01:19 2013 +0200

Fix debug build without dbgutil

Change-Id: Iab6a680e67f22460b2e5c340c3967c666a28c5c5

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 2c9ad11..ad5eff0 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -123,7 +123,7 @@ private:
 boolmbpHYs; // true if pysical size of pixel 
available
 boolmbIgnoreGammaChunk;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
 // do some checks in debug mode
 sal_Int32   mnAllocSizeScanline;
 sal_Int32   mnAllocSizeScanlineAlpha;
@@ -188,7 +188,7 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream )
 mbGamma ( false ),
 mbpHYs  ( false ),
 mbIgnoreGammaChunk  ( false ),
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
 mnAllocSizeScanline(0),
 mnAllocSizeScanlineAlpha(0),
 #endif
@@ -1327,7 +1327,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, 
sal_uInt32 nXAdd )
 // allocate scanlines on demand, reused for next line
 if(!mpScanline)
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
 mnAllocSizeScanline = maOrigSize.Width() * 3;
 #endif
 mpScanline = new sal_uInt8[maOrigSize.Width() * 3];
@@ -1335,7 +1335,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, 
sal_uInt32 nXAdd )
 
 if(!mpScanlineAlpha)
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
 mnAllocSizeScanlineAlpha = maOrigSize.Width();
 #endif
 mpScanlineAlpha = new sal_uInt8[maOrigSize.Width()];
@@ -1470,7 +1470,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, 
sal_uInt32 nXAdd )
 if(bDoDirectScanline && !mpScanline)
 {
 // allocate scanlines on demand, reused for next line
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
 mnAllocSizeScanline = maOrigSize.Width() * 3;
 #endif
 mpScanline = new sal_uInt8[maOrigSize.Width() * 3];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Tomaž Vajngerl

 sfx2/source/dialog/filedlghelper.cxx |  123 ---
 1 file changed, 3 insertions(+), 120 deletions(-)

New commits:
commit 192a0b39f1eaf19341dc858f488516ae3a81a2e8
Author: TomaÅ¾ Vajngerl 
Date:   Thu Sep 5 13:58:32 2013 +0200

FileDialogHelper - remove unneeded comments

Change-Id: I4f2c4394248430aa60c5938e0a90e9de3920fae9

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 6daab91..77e2a14 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -99,8 +99,6 @@
 #include 
 #endif
 
-//-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
@@ -111,14 +109,10 @@ using namespace ::com::sun::star::beans;
 using namespace ::rtl;
 using namespace ::cppu;
 
-//-
-
 #define IODLG_CONFIGNAMEOUString("FilePicker_Save")
 #define IMPGRF_CONFIGNAME   OUString("FilePicker_Graph")
 #define USERITEM_NAME   OUString("UserItem")
 
-//-
-
 namespace sfx2
 {
 
@@ -159,50 +153,40 @@ const OUString* GetLastFilterConfigId( 
FileDialogHelper::Context _eContext )
 OUString EncodeSpaces_Impl( const OUString& rSource );
 OUString DecodeSpaces_Impl( const OUString& rSource );
 
-// 
-// ---  FileDialogHelper_Impl   ---
-// 
+// FileDialogHelper_Impl
 
-// 
 // XFilePickerListener Methods
-// 
 void SAL_CALL FileDialogHelper_Impl::fileSelectionChanged( const 
FilePickerEvent& aEvent ) throw ( RuntimeException )
 {
 SolarMutexGuard aGuard;
 mpAntiImpl->FileSelectionChanged( aEvent );
 }
 
-// 
 void SAL_CALL FileDialogHelper_Impl::directoryChanged( const FilePickerEvent& 
aEvent ) throw ( RuntimeException )
 {
 SolarMutexGuard aGuard;
 mpAntiImpl->DirectoryChanged( aEvent );
 }
 
-// 
 OUString SAL_CALL FileDialogHelper_Impl::helpRequested( const FilePickerEvent& 
aEvent ) throw ( RuntimeException )
 {
 SolarMutexGuard aGuard;
 return mpAntiImpl->HelpRequested( aEvent );
 }
 
-// 
 void SAL_CALL FileDialogHelper_Impl::controlStateChanged( const 
FilePickerEvent& aEvent ) throw ( RuntimeException )
 {
 SolarMutexGuard aGuard;
 mpAntiImpl->ControlStateChanged( aEvent );
 }
 
-// 
 void SAL_CALL FileDialogHelper_Impl::dialogSizeChanged() throw ( 
RuntimeException )
 {
 SolarMutexGuard aGuard;
 mpAntiImpl->DialogSizeChanged();
 }
 
-// 
 // XDialogClosedListener Methods
-// 
 void SAL_CALL FileDialogHelper_Impl::dialogClosed( const DialogClosedEvent& 
_rEvent ) throw ( RuntimeException )
 {
 SolarMutexGuard aGuard;
@@ -210,9 +194,7 @@ void SAL_CALL FileDialogHelper_Impl::dialogClosed( const 
DialogClosedEvent& _rEv
 postExecute( _rEvent.DialogResult );
 }
 
-// 
 // handle XFilePickerListener events
-// 
 void FileDialogHelper_Impl::handleFileSelectionChanged( const FilePickerEvent& 
)
 {
 if ( mbHasVersions )
@@ -222,14 +204,12 @@ void FileDialogHelper_Impl::handleFileSelectionChanged( 
const FilePickerEvent& )
 maPreViewTimer.Start();
 }
 
-// 
 void FileDialogHelper_Impl::handleDirectoryChanged( const FilePickerEvent& )
 {
 if ( mbShowPreview )
 TimeOutHdl_Impl( NULL );
 }
 
-// 
 OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& 
aEvent )
 {
 //!!! todo: cache the help strings (here or TRA)
@@ -296,7 +276,6 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const 
FilePickerEvent& aEve
 return aHelpText;
 }
 
-// 
 void FileDialogHelper_Impl::handleControlStateChanged( const FilePickerEvent& 
aEvent )
 {
 switch ( aEvent.ElementId )
@@ -316,24 +295,19 @@ void FileDialogHelper_Impl::handl

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

2013-09-06 Thread László Németh

 vcl/source/glyphs/graphite_layout.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit b2cec9e9313e7bf7912e4e43a80f843019924255
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Sep 6 11:08:02 2013 +0200

fdo#68313 fix combining diacritics problem with Graphite fonts

Change-Id: Ied29f864dc5fc21fc55aaa5ddd40b02b53a564f8

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 034842a..a0f02ea 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -591,7 +591,16 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& 
rArgs)
 }
 int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
-if (rArgs.mnMinCharPos + numchars > limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
+if (mnSegCharOffset + numchars > limit)
+{
+int combining_char = 0;
+for (int i = mnSegCharOffset; i < numchars; i++) {
+int ch = rArgs.mpStr[i];
+if ((ch >= 0x300 && ch <= 0x36F) || (ch >= 0x1DC0 && ch <= 
0x1DFF) ||
+(ch >= 0x20D0 && ch <= 0x20F0) || (ch >= 0xFE20 && ch 
<= 0xFE26)) combining_char++;
+}
+numchars = limit - mnSegCharOffset + combining_char; // fdo#52540, 
fdo#68313
+}
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread László Németh

 helpcontent2  |2 +-
 vcl/source/glyphs/graphite_layout.cxx |   15 +++
 2 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 58e1112a6a974b96bb8595e3ee9d08e915d4fd14
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Sep 6 15:46:58 2013 +0200

fdo#52540 fix Graphite hyphenation (ligat. + combining diac.)

Change-Id: Idc3d9c40793f6f1c1b7883ca47f04ced36cabc48

diff --git a/helpcontent2 b/helpcontent2
index dddb2f3..0d8b37c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dddb2f331c390253ae76d0be4f621d50c3f3db67
+Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e
diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index e61da7c..348c4e3 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -589,18 +589,9 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& 
rArgs)
 nSegCharLimit - rArgs.mnEndCharPos, bRtl);
 }
 }
-int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
-rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
-if (mnSegCharOffset + numchars > limit)
-{
-int combining_char = 0;
-for (int i = mnSegCharOffset; i < numchars; i++) {
-int ch = rArgs.mpStr[i];
-if ((ch >= 0x300 && ch <= 0x36F) || (ch >= 0x1DC0 && ch <= 
0x1DFF) ||
-(ch >= 0x20D0 && ch <= 0x20F0) || (ch >= 0xFE20 && ch 
<= 0xFE26)) combining_char++;
-}
-numchars = limit - mnSegCharOffset + combining_char; // fdo#52540, 
fdo#68313
-}
+//int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
+//rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+  int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, 
fdo#68313, FIXME
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSOC]Use Widget Layout for the Start Center Weekly Update 07

2013-09-06 Thread Caolán McNamara

On Wed, 2013-08-21 at 21:08 +0200, Krisztian Pinter wrote:

> I was asked if I could make the scrolling smoother (it always moves
> thumbnails 1 row at once when the scrollbar passes a treshold) in the
> RecentDocsView class I made. RecentDocsView inherits from
> ThumbnailView, which uses Window::HandleScrollCommand for scrolling.
> Is it possible to make it smoother without basically reimplementing
> Window::HandleScrollCommand?

You need to instead tweak ThumbnailView::CalculateItemPositions to set
on the scrollbar some subdivision of "rows of icons" (see
mpScrBar->SetRangeMax() rather than the current system of a range of
atomic rows and probably adjust the reset of the logic to work on terms
of those subdivisions in order to not "snap" row by row when scrolling.

> In the original Start Center, one could drag and drop files onto it,
> and they would open. I noticed that this only worked if one didn't
> drop the file on a button, but on the background. After converting
> to .ui, it only works if one drops the file on the edge of the window,
> where there aren't any widgets covering the background. 

So in 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=e7dd69d97af1e12b15fd82eaea2e2b51f9dca40b
I moved the dnd support down to the big thumbnailviewers so I guess
that's fixed now. 

> Is there a way to cover the whole window with the drag&drop
> functionality?

Now that I think about it, maybe an alternative solution was a huge
transparent window to cover the whole area which supported dnd, but
*shrug* I guess the above will do.

> I was asked to make the background of RecentDocsView transparent,
> instead of white.

What do you mean, because if you make RecentDocsView transparent then
you will see through it to see the parent instead, right?, and looking
at startcenter.ui that means all_recent wouldn't draw its background
over the "grid2" (which is transparent) so what you would see then is
"modules_notebook" as the background. But that's a tabcontrol and they
default to white, i.e. making it transparent would presumably make it
look the same as it does now.

"
EnableChildTransparentMode();
SetPaintTransparent(true);
SetBackground();
"
is the magic in vcl/source/window/layout.cxx for the transparent
container widgets

C.

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

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

2013-09-06 Thread Caolán McNamara

 sfx2/inc/backingcomp.hxx |3 --
 sfx2/source/dialog/backingcomp.cxx   |   28 
 sfx2/source/dialog/backingwindow.cxx |   48 +++
 sfx2/source/dialog/backingwindow.hxx |5 +++
 4 files changed, 53 insertions(+), 31 deletions(-)

New commits:
commit e7dd69d97af1e12b15fd82eaea2e2b51f9dca40b
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 13:55:59 2013 +0100

move backing component dnd support into the large thumbnail areas

of the backing window

Change-Id: Icf399a8834a25de43909769be08854134991885a

diff --git a/sfx2/inc/backingcomp.hxx b/sfx2/inc/backingcomp.hxx
index 16a2ae7..794e80d 100644
--- a/sfx2/inc/backingcomp.hxx
+++ b/sfx2/inc/backingcomp.hxx
@@ -73,9 +73,6 @@ class BackingComp : public  css::lang::XTypeProvider
 /** the owner frame of this component. */
 css::uno::Reference< css::frame::XFrame > m_xFrame;
 
-/** helper for drag&drop. */
-css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > 
m_xDropTargetListener;
-
 //__
 // interface
 
diff --git a/sfx2/source/dialog/backingcomp.cxx 
b/sfx2/source/dialog/backingcomp.cxx
index 906922c..0271164 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -21,8 +21,6 @@
 
 #include "backingwindow.hxx"
 
-#include 
-
 #include 
 
 #include 
@@ -31,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -453,18 +450,6 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const 
css::uno::Reference< css::f
 // safe the frame reference
 m_xFrame = xFrame;
 
-// establish drag&drop mode
-OpenFileDropTargetListener* pDropListener = new 
OpenFileDropTargetListener( m_xContext, m_xFrame);
-m_xDropTargetListener = css::uno::Reference< 
css::datatransfer::dnd::XDropTargetListener >(static_cast< ::cppu::OWeakObject* 
>(pDropListener), css::uno::UNO_QUERY);
-
-css::uno::Reference< css::awt::XToolkit2 > xToolkit = 
css::awt::Toolkit::create( m_xContext );
-css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget = 
xToolkit->getDropTarget(m_xWindow);
-if (xDropTarget.is())
-{
-xDropTarget->addDropTargetListener(m_xDropTargetListener);
-xDropTarget->setActive(sal_True);
-}
-
 // initialize the component and it's parent window
 css::uno::Reference< css::awt::XWindow > xParentWindow = 
xFrame->getContainerWindow();
 WorkWindow* pParent = (WorkWindow*)VCLUnoHelper::GetWindow(xParentWindow);
@@ -668,19 +653,6 @@ void SAL_CALL BackingComp::dispose()
 xDispatch->dispatch(aURL, css::uno::Sequence< 
css::beans::PropertyValue>());
 }
 
-// deregister drag&drop helper
-if (m_xDropTargetListener.is())
-{
-css::uno::Reference< css::awt::XToolkit2 > xToolkit = 
css::awt::Toolkit::create( m_xContext );
-css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget 
= xToolkit->getDropTarget(m_xWindow);
-if (xDropTarget.is())
-{
-xDropTarget->removeDropTargetListener(m_xDropTargetListener);
-xDropTarget->setActive(sal_False);
-}
-m_xDropTargetListener = css::uno::Reference< 
css::datatransfer::dnd::XDropTargetListener >();
-}
-
 // stop listening at the window
 if (m_xWindow.is())
 {
diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 3b66cc9..e92bdc7 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -127,6 +128,18 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 get( mpImpressTemplateThumbnails,   "impress_templates");
 get( mpDrawTemplateThumbnails,  "draw_templates");
 
+maDndWindows.push_back(mpAllRecentThumbnails);
+maDndWindows.push_back(mpWriterRecentThumbnails);
+maDndWindows.push_back(mpCalcRecentThumbnails);
+maDndWindows.push_back(mpImpressRecentThumbnails);
+maDndWindows.push_back(mpDrawRecentThumbnails);
+maDndWindows.push_back(mpDatabaseRecentThumbnails);
+maDndWindows.push_back(mpMathRecentThumbnails);
+maDndWindows.push_back(mpWriterTemplateThumbnails);
+maDndWindows.push_back(mpCalcTemplateThumbnails);
+maDndWindows.push_back(mpImpressTemplateThumbnails);
+maDndWindows.push_back(mpDrawTemplateThumbnails);
+
 try
 {
 mxContext.set( ::comphelper::getProcessComponentContext(), 
uno::UNO_SET_THROW );
@@ -188,6 +201,25 @@ BackingWindow::~BackingWindow()
 mpCalcTemplateThumbnails->setOpenTemplateHdl(Link());
 mpImpressTemplateThumbnails ->setOpenTemplateHdl(Link());
 mpDrawTemplateThumbnails->setOpenTemplateHdl(Link());
+
+// deregister drag&drop helper
+if (mxDropTargetListener.is())
+{
+for (std::vector::iterator aI = maDndWindows.begin(),
+

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

2013-09-06 Thread Caolán McNamara

 vcl/source/window/builder.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf13e4cfaa6de93b746c93d7a677224f56b0eeb4
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 12:22:50 2013 +0100

Resolves: fdo#68081 why would I want a spinner that doesn't repeat

surely WB_SPIN should imply repeat in the first place, *shrug*

Change-Id: I1e4cb5a01d473cd0f8d907d566cd26d51a81da93
(cherry picked from commit f96771165ea145a759f1bab76cd34bb70def04f6)
Reviewed-on: https://gerrit.libreoffice.org/5839
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index cd6e966..7a86c42 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1078,7 +1078,7 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
 
 WinBits nBits = WB_LEFT|WB_BORDER|WB_3DLOOK;
 if (!id.endsWith("-nospin"))
-nBits |= WB_SPIN;
+nBits |= WB_SPIN | WB_REPEAT;
 
 if (sPattern.isEmpty())
 {
___
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-09-06 Thread Caolán McNamara

 vcl/source/window/builder.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c54873c97b2bf1deee964ad05ae7206011288087
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 12:22:50 2013 +0100

Resolves: fdo#68081 why would I want a spinner that doesn't repeat

surely WB_SPIN should imply repeat in the first place, *shrug*

Change-Id: I1e4cb5a01d473cd0f8d907d566cd26d51a81da93
(cherry picked from commit f96771165ea145a759f1bab76cd34bb70def04f6)
Reviewed-on: https://gerrit.libreoffice.org/5838
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index feedbaf..a397912 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -704,7 +704,7 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
 
 WinBits nBits = WB_RIGHT|WB_BORDER|WB_3DLOOK;
 if (!id.endsWith("-nospin"))
-nBits |= WB_SPIN;
+nBits |= WB_SPIN | WB_REPEAT;
 
 if (sPattern.isEmpty())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/table-pagebreak.docx|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   11 +++
 writerfilter/source/dmapper/DomainMapper.cxx  |6 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 +++-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |9 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |   10 ++
 writerfilter/source/ooxml/model.xml   |1 +
 7 files changed, 44 insertions(+), 1 deletion(-)

New commits:
commit 869dc1a6b8a65f2bf8b3926169478ced0cf382ae
Author: Miklos Vajna 
Date:   Mon Sep 2 10:27:49 2013 +0200

bnc#816593 DOCX import: ignore page breaks in tables

(cherry picked from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx

Change-Id: Ibb250148d41d1929fa17dd993bb71c93c0e09dcf
Reviewed-on: https://gerrit.libreoffice.org/5787
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/ooxmlimport/data/table-pagebreak.docx 
b/sw/qa/extras/ooxmlimport/data/table-pagebreak.docx
new file mode 100755
index 000..06ecf95
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/table-pagebreak.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 090b5d8..5223c87 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -130,6 +130,7 @@ public:
 void testTableFloating();
 void testTableAutoNested();
 void testTableStyleParprop();
+void testTablePagebreak();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -225,6 +226,7 @@ void Test::run()
 {"table-floating.docx", &Test::testTableFloating},
 {"table-auto-nested.docx", &Test::testTableAutoNested},
 {"table-style-parprop.docx", &Test::testTableStyleParprop},
+{"table-pagebreak.docx", &Test::testTablePagebreak},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1594,6 +1596,15 @@ void Test::testTableStyleParprop()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
getProperty(getParagraphOfText(1, xCell->getText()), 
"ParaBottomMargin"));
 }
 
+void Test::testTablePagebreak()
+{
+// Page break inside table: should be ignored (was 
style::BreakType_PAGE_BEFORE before).
+CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE, 
getProperty(getParagraphOrTable(2), "BreakType"));
+
+// This one is outside the table: should not be ignored.
+CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, 
getProperty(getParagraph(3), "BreakType"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index a2b2bce..5ac4b05 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3356,6 +3356,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 }
 }
 break;
+case NS_ooxml::LN_tblStart:
+m_pImpl->m_nTableDepth++;
+break;
+case NS_ooxml::LN_tblEnd:
+m_pImpl->m_nTableDepth--;
+break;
 default:
 {
 #ifdef DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6319c79..5bd4e62 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -190,7 +190,8 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_xInsertTextRange(xInsertTextRange),
 m_bIsNewDoc(bIsNewDoc),
 m_bInTableStyleRunProps(false),
-m_pSdtHelper(0)
+m_pSdtHelper(0),
+m_nTableDepth(0)
 
 {
 appendTableManager( );
@@ -632,6 +633,11 @@ void DomainMapper_Impl::deferBreak( BreakType 
deferredBreakType)
 m_bIsColumnBreakDeferred = true;
 break;
 case PAGE_BREAK:
+// See SwWW8ImplReader::HandlePageBreakChar(), page break should be
+// ignored inside tables.
+if (m_nTableDepth > 0)
+return;
+
 m_bIsPageBreakDeferred = true;
 break;
 default:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 30cc2c7..c65d804 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -691,6 +691,15 @@ public:
 
 /// Document background color, applied to every page style.
 boost::optional m_oBackgroundColor;
+
+/**
+ * This contains the raw table depth. m_nTableDepth > 0 is the same as
+ * getTableManager().isInTable(), unless we're in the first paragraph of a
+ * table, or first paragraph after a table, as the table manager is only
+ * updat

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

2013-09-06 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/fdo68607.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   10 ++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   15 ++-
 writerfilter/source/dmapper/PropertyMap.cxx  |5 +
 writerfilter/source/dmapper/PropertyMap.hxx  |3 +++
 5 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 45ea0b563bbc3e8830c485e7d04aa98a52a1e2fc
Author: Miklos Vajna 
Date:   Tue Sep 3 11:52:51 2013 +0200

fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frame

This is a port of commit 8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de
"Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a
frame" from the WW8 filter to the DOCX one.

(regression from edc4861a68e0269b83b17e0ec57912a1ce4220ad)

(cherry picked from commit 78d1f1c2835b9fae0f91ed771fc1d594c7817502)

Change-Id: If1bb4a8a3786aacd618585cf859b57ce9be85c51
Reviewed-on: https://gerrit.libreoffice.org/5788
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/ooxmlimport/data/fdo68607.docx 
b/sw/qa/extras/ooxmlimport/data/fdo68607.docx
new file mode 100644
index 000..11f5706
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo68607.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 5223c87..af5a3f2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -131,6 +131,7 @@ public:
 void testTableAutoNested();
 void testTableStyleParprop();
 void testTablePagebreak();
+void testFdo68607();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -227,6 +228,7 @@ void Test::run()
 {"table-auto-nested.docx", &Test::testTableAutoNested},
 {"table-style-parprop.docx", &Test::testTableStyleParprop},
 {"table-pagebreak.docx", &Test::testTablePagebreak},
+{"fdo68607.docx", &Test::testFdo68607},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1605,6 +1607,14 @@ void Test::testTablePagebreak()
 CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, 
getProperty(getParagraph(3), "BreakType"));
 }
 
+void Test::testFdo68607()
+{
+// Bugdoc was 8 pages in Word, 1 in Writer due to pointlessly wrapping the
+// table in a frame. Exact layout may depend on fonts available, etc. --
+// but at least make sure that our table spans over multiple pages now.
+CPPUNIT_ASSERT(getPages() > 1);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index d7d498a..7d5c44e 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -816,7 +816,20 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 {
 uno::Reference xStart;
 uno::Reference xEnd;
-bool bFloating = aFrameProperties.hasElements();
+
+bool bNoFly = false;
+if (SectionPropertyMap* pSectionContext = 
m_rDMapper_Impl.GetSectionContext())
+{
+sal_Int32 nTextAreaWidth = pSectionContext->GetPageWidth() - 
pSectionContext->GetLeftMargin() - pSectionContext->GetRightMargin();
+sal_Int32 nTableWidth = 0;
+m_aTableProperties->getValue( TablePropertyMap::TABLE_WIDTH, 
nTableWidth );
+// If the table is wider than the text area, then don't create a 
fly
+// for the table: no wrapping will be performed anyway, but 
multi-page
+// tables will be broken.
+bNoFly = nTableWidth >= nTextAreaWidth;
+}
+
+bool bFloating = aFrameProperties.hasElements() && !bNoFly;
 // 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/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 623c20c8..21974a4 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1169,6 +1169,11 @@ void SectionPropertyMap::SetFirstPaperBin( sal_Int32 
nSet )
 }
 
 
+sal_Int32 SectionPropertyMap::GetPageWidth()
+{
+return operator[](PropertyDefinition(PROP_WIDTH, false)).get();
+}
+
 StyleSheetPropertyMap::StyleSheetPropertyMap() :
 mnCT_Spacing_line( 0 ),
 mnCT_Spacing_lineRule( 0 ),
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx 
b/writerfilter/source/dmapper/PropertyMap.hxx
index a79c2c2..fb4e4ad 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -240,11 +240,14 @@ public:
 void SetFirstPaperBin( sal_

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

2013-09-06 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/table-style-parprop.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   11 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   38 +++
 3 files changed, 49 insertions(+)

New commits:
commit 124b2e26797726851116646b478f056583213d5b
Author: Miklos Vajna 
Date:   Thu Aug 29 14:17:09 2013 +0200

bnc#816593 DOCX filter: import paragraph spacing from table style

(cherry picked from commit 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52)

Change-Id: I9dce59ecd8a2d2bfadb8c7273cd46c6c0cf17774
Reviewed-on: https://gerrit.libreoffice.org/5786
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/ooxmlimport/data/table-style-parprop.docx 
b/sw/qa/extras/ooxmlimport/data/table-style-parprop.docx
new file mode 100755
index 000..1c68c70
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/table-style-parprop.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0c066df..090b5d8 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -129,6 +129,7 @@ public:
 void testTableAutoColumnFixedSize();
 void testTableFloating();
 void testTableAutoNested();
+void testTableStyleParprop();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -223,6 +224,7 @@ void Test::run()
 {"table-auto-column-fixed-size.docx", 
&Test::testTableAutoColumnFixedSize},
 {"table-floating.docx", &Test::testTableFloating},
 {"table-auto-nested.docx", &Test::testTableAutoNested},
+{"table-style-parprop.docx", &Test::testTableStyleParprop},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1583,6 +1585,15 @@ void Test::testTableAutoNested()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(23051), 
getProperty(xTables->getByIndex(1), "Width"));
 }
 
+void Test::testTableStyleParprop()
+{
+// The problem was that w:spacing's w:after=0 (a paragraph property) 
wasn't imported from table style.
+uno::Reference xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+// This was 353, the document default, i.e. paragraph property from table 
style had no effect.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
getProperty(getParagraphOfText(1, xCell->getText()), 
"ParaBottomMargin"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 8cbf48c..d7d498a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -19,9 +19,12 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -772,6 +775,22 @@ RowPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetRowProperties()
 return aRowProperties;
 }
 
+// Apply paragraph property to each paragraph within a cell.
+static void lcl_ApplyCellParaProps(uno::Reference xCell, 
uno::Any aBottomMargin)
+{
+uno::Reference xEnumerationAccess(xCell, 
uno::UNO_QUERY);
+uno::Reference xEnumeration = 
xEnumerationAccess->createEnumeration();
+while (xEnumeration->hasMoreElements())
+{
+uno::Reference 
xParagraph(xEnumeration->nextElement(), uno::UNO_QUERY);
+uno::Reference xPropertyState(xParagraph, 
uno::UNO_QUERY);
+// Don't apply in case direct formatting is already present.
+// TODO: probably paragraph style has priority over table style here.
+if (xPropertyState.is() && 
xPropertyState->getPropertyState("ParaBottomMargin") == 
beans::PropertyState_DEFAULT_VALUE)
+xParagraph->setPropertyValue("ParaBottomMargin", aBottomMargin);
+}
+}
+
 void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
 {
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
@@ -818,6 +837,25 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 
 if (xTable.is())
 m_xTableRange = xTable->getAnchor( );
+
+// OOXML table style may container paragraph properties, apply 
these now.
+for (int i = 0; i < aTableInfo.aTableProperties.getLength(); 
++i)
+{
+if (aTableInfo.aTableProperties[i].Name == 
"ParaBottomMargin")
+{
+uno::Reference xCellRange(xTable, 
uno::UNO_QUERY);
+uno::Any aBottomMargin = 
aTableInfo.aTableProperties[i].Value;
+sal_Int32 nRows = aCellProperties.getLength();
+for (sal_Int32 nRow = 0; nRow < nRows; ++nRow)
+{
+const uno::Sequence< bean

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

2013-09-06 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx |binary
 sw/qa/extras/ooxmlimport/data/table-auto-nested.docx|binary
 sw/qa/extras/ooxmlimport/data/table-floating.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   44 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx|   30 -
 writerfilter/source/dmapper/DomainMapperTableHandler.hxx|4 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx|   55 
+-
 writerfilter/source/dmapper/DomainMapperTableManager.hxx|1 
 writerfilter/source/dmapper/TablePositionHandler.cxx|   12 +-
 writerfilter/source/dmapper/TablePositionHandler.hxx|2 
 10 files changed, 135 insertions(+), 13 deletions(-)

New commits:
commit cb5a333fdda48ec1d141d1aa9ce7ae899aea2777
Author: Miklos Vajna 
Date:   Tue Sep 3 15:23:46 2013 +0200

bnc#816593 DOCX import: fix auto table width wrt nested tables

This is a backport of the fix + 3 other commits from master, which were
needed to make the testcase pass on -4-1 as well.

(cherry picked from commits 74c5ed19f430327988194cdcd6bdff09591a93fa,
824cc4bf4ae9035d4108e8da8e81eb57284f0b54,
53d27a30ce5f2c9f7d37a4089286116854c16215 and
76d1ca523ddcf89cc269fe51c70e66066943ef5a)

Change-Id: I62a1f526cf1d4e4056daa1495d61f1b9f5c0b1b2
Reviewed-on: https://gerrit.libreoffice.org/5785
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx 
b/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx
new file mode 100644
index 000..557edcb
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/table-auto-nested.docx 
b/sw/qa/extras/ooxmlimport/data/table-auto-nested.docx
new file mode 100755
index 000..85f47db
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/table-auto-nested.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/table-floating.docx 
b/sw/qa/extras/ooxmlimport/data/table-floating.docx
new file mode 100755
index 000..1e0cb30
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/table-floating.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 9a685c4..0c066df 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -126,6 +126,9 @@ public:
 void testFdo46361();
 void testFdo65632();
 void testN816593();
+void testTableAutoColumnFixedSize();
+void testTableFloating();
+void testTableAutoNested();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -217,6 +220,9 @@ void Test::run()
 {"fdo46361.docx", &Test::testFdo46361},
 {"fdo65632.docx", &Test::testFdo65632},
 {"n816593.docx", &Test::testN816593},
+{"table-auto-column-fixed-size.docx", 
&Test::testTableAutoColumnFixedSize},
+{"table-floating.docx", &Test::testTableFloating},
+{"table-auto-nested.docx", &Test::testTableAutoNested},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1539,6 +1545,44 @@ void Test::testN816593()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables->getCount());
 }
 
+void Test::testTableAutoColumnFixedSize()
+{
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTextTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+
+// Width was not recognized during import when table size was 'auto'
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(3996)), 
getProperty(xTextTable, "Width"));
+}
+
+void Test::testTableFloating()
+{
+// Both the size and the position of the table was incorrect.
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+// Second table was too wide: 16249, i.e. as wide as the first table.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(11248), 
getProperty(xTables->getByIndex(1), "Width"));
+
+uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+uno::Reference xFrame(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+// This was 0, should be the the opposite of (left margin + half of the 
border width).
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-199), getProperty(xFrame, 
"HoriOrientPosition"));
+// Was 0 as well, should be the right margin.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(191), getProperty(xFrame, 
"RightMargin"));
+}
+
+void Test::testTableAutoNested()
+{
+// This was 176, when compat option is not enabled, the auto paragraph 
bottom margin value was incorrect.
+CPP

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

2013-09-06 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d1225696aa77afb05b6c289394dd671af8d0b8a3
Author: Miklos Vajna 
Date:   Wed Aug 28 11:43:36 2013 +0200

bnc#816593 DOCX import: let w:before not overwrite w:beforeAutospacing

And do the same for w:after / w:afterAutospacing. The spec says that if
w:beforeAutospacing is read, w:before should be ignored, this implies
that if we already had w:beforeAutospacing, w:before should not
overwrite the already existing top margin.

(cherry picked from commit de516780bf2d5f74afe643033bfc528c53013902)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx

Change-Id: I9437cb5c6fc352a360e27aa279d0a789706c5578
Reviewed-on: https://gerrit.libreoffice.org/5784
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index f2a06b9..a2b2bce 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -968,13 +968,15 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 break;
 case NS_ooxml::LN_CT_Spacing_before:
 if (m_pImpl->GetTopContext())
-m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, true, 
uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) ));
+// Don't overwrite NS_ooxml::LN_CT_Spacing_beforeAutospacing.
+m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, true, 
uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) ), false);
 break;
 case NS_ooxml::LN_CT_Spacing_beforeLines:
 break;
 case NS_ooxml::LN_CT_Spacing_after:
 if (m_pImpl->GetTopContext())
-m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, 
true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) ));
+// Don't overwrite NS_ooxml::LN_CT_Spacing_afterAutospacing.
+m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, 
true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) ), false);
 break;
 case NS_ooxml::LN_CT_Spacing_afterLines:
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit ea628d0aa2e9d1c24d4d84defc72d5cf81da
Author: Miklos Vajna 
Date:   Wed Aug 28 11:24:07 2013 +0200

bnc#816593 DOCX import: fix auto para spacing without compat option

Paragraph auto spacing (before and after) without the
w:doNotUseHTMLParagraphAutoSpacing compat option was incorrect.

(cherry picked from commit 279ff2e03371542d014bf281e73282ba8080cf6b)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx

Change-Id: I56d6153f7c489de7fceaf6fab7325c42ee8f9cae
Reviewed-on: https://gerrit.libreoffice.org/5783
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index fb4786e..f2a06b9 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1153,17 +1153,16 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
  uno::makeAny( aLocale ) );
 }
 break;
-// This is the value when the compat option is not enabled. No idea where it 
comes from, the spec doesn't mention it.
-#define AUTO_PARA_SPACING sal_Int32(49)
+// See SwWW8ImplReader::GetParagraphAutoSpace() on why these are 100 
and 280
 case NS_ooxml::LN_CT_Spacing_beforeAutospacing:
 if 
(!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing())
-m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, false, 
uno::makeAny( AUTO_PARA_SPACING ) );
+m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, false, 
uno::makeAny( ConversionHelper::convertTwipToMM100(280) ) );
 else
 m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, false, 
uno::makeAny( ConversionHelper::convertTwipToMM100(100) ) );
 break;
 case NS_ooxml::LN_CT_Spacing_afterAutospacing:
 if 
(!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing())
-m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, 
false, uno::makeAny( AUTO_PARA_SPACING ) );
+m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, 
false, uno::makeAny( ConversionHelper::convertTwipToMM100(280) ) );
 else
 m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, 
false, uno::makeAny( ConversionHelper::convertTwipToMM100(100) ) );
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-2' - vcl/aqua

2013-09-06 Thread Boris Dušek

 vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a8e0c7b874a5c14b95c97b0e6f5cf8924fe33e52
Author: Boris DuÅ¡ek 
Date:   Fri Sep 6 00:19:36 2013 +0200

Fix misspelled text with VoiceOver on 10.9

More in Apple's docs (Application Kit Release Notes for OS X v10.9,
section "New Accessibility constants").

Change-Id: I92fb6d552e86997bfc789723f32626d908d11419
Reviewed-on: https://gerrit.libreoffice.org/5834
Reviewed-by: Tor Lillqvist 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm 
b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 1c98581..751faed 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -246,6 +246,7 @@ using namespace ::rtl;
 switch(type) {
 case ::com::sun::star::text::TextMarkupType::SPELLCHECK: {
 [string 
addAttribute:NSAccessibilityMisspelledTextAttribute value:[NSNumber 
numberWithBool:YES] range:markupRange];
+[string addAttribute:@"AXMarkedMisspelled" value:[NSNumber 
numberWithBool:YES] range:markupRange];
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Caolán McNamara

 vcl/source/window/builder.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f96771165ea145a759f1bab76cd34bb70def04f6
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 12:22:50 2013 +0100

Resolves: fdo#68081 why would I want a spinner that doesn't repeat

surely WB_SPIN should imply repeat in the first place, *shrug*

Change-Id: I1e4cb5a01d473cd0f8d907d566cd26d51a81da93

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 0b41136..99e0b85 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1208,7 +1208,7 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
 
 WinBits nBits = WB_LEFT|WB_BORDER|WB_3DLOOK;
 if (!id.endsWith("-nospin"))
-nBits |= WB_SPIN;
+nBits |= WB_SPIN | WB_REPEAT;
 
 if (sPattern.isEmpty())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Thomas Arnhold

 starmath/source/mathmlimport.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e85446e587704ffa31c50ee2b8fc1b21d6a16b12
Author: Thomas Arnhold 
Date:   Fri Sep 6 10:58:08 2013 +0200

fdo#68956: Be safe and warn if there are other users of GetText()

Because GetText() now returns a value.

Change-Id: Iafee193771a56b2b3c25f8655fa35a66f31eebe8

diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index d730395..d6bea98 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -256,7 +256,7 @@ public:
 }
 
 sal_Bool GetSuccess()  { return bSuccess; }
-OUString GetText() { return aText; }
+SAL_WARN_UNUSED_RESULT OUString GetText() { return aText; }
 void SetText(const OUString &rStr) { aText = rStr; }
 
 virtual void SetViewSettings(const 
com::sun::star::uno::Sequence& 
aViewProps);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Michael Stahl

 vcl/source/gdi/pngread.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit debded3eb060bd3b0ebaaa16a5e4f47a46fa02a2
Author: Michael Stahl 
Date:   Fri Sep 6 13:13:22 2013 +0200

warning C4018: '<': signed/unsigned mismatch

Change-Id: I21b8f1037f68ede368bababa8b6b5201cd83104e

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index f8b4e95..2c9ad11 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -125,8 +125,8 @@ private:
 
 #ifdef DBG_UTIL
 // do some checks in debug mode
-sal_uInt32  mnAllocSizeScanline;
-sal_uInt32  mnAllocSizeScanlineAlpha;
+sal_Int32   mnAllocSizeScanline;
+sal_Int32   mnAllocSizeScanlineAlpha;
 #endif
 // the temporary Scanline (and alpha) for direct scanline copy to Bitmap
 sal_uInt8*  mpScanline;
@@ -1351,7 +1351,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, 
sal_uInt32 nXAdd )
 sal_uInt8* pScanline(mpScanline);
 sal_uInt8* pScanlineAlpha(mpScanlineAlpha);
 
-for(sal_uInt32 nX(0); nX < maOrigSize.Width(); nX++, pTmp 
+= 4)
+for (sal_Int32 nX(0); nX < maOrigSize.Width(); nX++, pTmp 
+= 4)
 {
 // prepare content line as BGR by reordering when 
copying
 // do not forget to invert alpha (source is alpha, 
target is opacity)
@@ -1484,7 +1484,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, 
sal_uInt32 nXAdd )
 OSL_ENSURE(mnAllocSizeScanline >= maOrigSize.Width() * 3, 
"Allocated Scanline too small (!)");
 sal_uInt8* pScanline(mpScanline);
 
-for(sal_uInt32 nX(0); nX < maOrigSize.Width(); nX++, pTmp 
+= 3)
+for (sal_Int32 nX(0); nX < maOrigSize.Width(); nX++, pTmp 
+= 3)
 {
 // prepare content line as BGR by reordering when 
copying
 if(bCustomColorTable)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Caolán McNamara

 helpers/help_hid.lst |   17 
 source/text/simpress/01/03152000.xhp |   47 +--
 2 files changed, 24 insertions(+), 40 deletions(-)

New commits:
commit dddb2f331c390253ae76d0be4f621d50c3f3db67
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 12:04:19 2013 +0100

update help ids for impress header/footer .ui conversion

Change-Id: I64c50983e2e3fee1437fd5dd2bb589333c858430

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index df827af..c85a375 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3314,8 +3314,6 @@ HID_SD_SLIDE_TRANSITIONS,59911,
 HID_SD_TABBAR_LAYERS,59892,
 HID_SD_TABBAR_PAGES,59891,
 HID_SD_TABLE_DESIGN,59968,
-HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT,59902,
-HID_SD_TABPAGE_HEADERFOOTER_SLIDE,59901,
 HID_SD_TASK_PANE,59904,
 HID_SD_TASK_PANE_PREVIEW_ALL,59944,
 HID_SD_TASK_PANE_PREVIEW_CURRENT,59942,
@@ -6381,11 +6379,6 @@ sd_CheckBox_DLG_PUBLISHING_PAGE4_CREATED,1085850700,
 sd_CheckBox_DLG_PUBLISHING_PAGE4_DOWNLOAD,1085850699,
 sd_CheckBox_DLG_PUBLISHING_PAGE5_TEXTONLY,1085850706,
 sd_CheckBox_DLG_VECTORIZE_CB_FILLHOLES,1084457985,
-sd_CheckBox_RID_SD_TABPAGE_HEADERFOOTER_CB_DATETIME,553255938,
-sd_CheckBox_RID_SD_TABPAGE_HEADERFOOTER_CB_FOOTER,553255946,
-sd_CheckBox_RID_SD_TABPAGE_HEADERFOOTER_CB_HEADER,553255958,
-sd_CheckBox_RID_SD_TABPAGE_HEADERFOOTER_CB_NOTONTITLE,553255952,
-sd_CheckBox_RID_SD_TABPAGE_HEADERFOOTER_CB_SLIDENUMBER,553255950,
 sd_Checkbox_DLG_CUSTOMANIMATION_SCHEMES_PANE_4,1415742468,
 sd_ComboBox_DLG_PUBLISHING_PAGE3_QUALITY,1085853751,
 sd_DockingWindow_FLT_LEFT_PANE_DRAW_DOCKING_WINDOW,3234217984,
@@ -6400,9 +6393,6 @@ sd_Edit_DLG_PUBLISHING_PAGE2_URL,1085851694,
 sd_Edit_DLG_PUBLISHING_PAGE4_AUTHOR,1085851716,
 sd_Edit_DLG_PUBLISHING_PAGE4_EMAIL_EDIT,1085851718,
 sd_Edit_DLG_PUBLISHING_PAGE4_WWW_EDIT,1085851720,
-sd_Edit_RID_SD_TABPAGE_HEADERFOOTER_TB_DATETIME_FIXED,553256964,
-sd_Edit_RID_SD_TABPAGE_HEADERFOOTER_TB_FOOTER_FIXED,553256972,
-sd_Edit_RID_SD_TABPAGE_HEADERFOOTER_TB_HEADER_FIXED,553256984,
 sd_Edit_TP_ANIMATION_EDT_BOOKMARK,549767170,
 sd_Edit_TP_ANIMATION_EDT_DOCUMENT,549767171,
 sd_Edit_TP_ANIMATION_EDT_MACRO,549767173,
@@ -6427,8 +6417,6 @@ sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE,1104006661,
 sd_ListBox_DLG_PUBLISHING_PAGE1_DESIGNS,1085853189,
 sd_ListBox_FLT_WIN_ANIMATION_LB_ADJUSTMENT,3231370754,
 sd_ListBox_FLT_WIN_ANIMATION_LB_LOOP_COUNT,3231370755,
-sd_ListBox_RID_SD_TABPAGE_HEADERFOOTER_CB_DATETIME_FORMAT,553258502,
-sd_ListBox_RID_SD_TABPAGE_HEADERFOOTER_CB_DATETIME_LANGUAGE,553258504,
 sd_ListBox_TP_ANIMATION_LB_ACTION,549768707,
 sd_ListBox_TP_ANIMATION_LB_OLE_ACTION,549768708,
 sd_MetricField_DLG_MORPH_MTF_STEPS,1084447233,
@@ -6462,8 +6450,6 @@ sd_PushButton_DLG_PUBLISHING_PAGE6_TEXT,1085854313,
 sd_PushButton_DLG_PUBLISHING_PAGE6_VLINK,1085854315,
 sd_PushButton_DLG_VECTORIZE_BTN_PREVIEW,1084461569,
 sd_PushButton_FLT_WIN_ANIMATION_BTN_CREATE_GROUP,3231371786,
-sd_PushButton_RID_SD_TABPAGE_HEADERFOOTER_BT_APPLY,553259538,
-sd_PushButton_RID_SD_TABPAGE_HEADERFOOTER_BT_APPLYTOALL,553259537,
 sd_PushButton_TP_ANIMATION_BTN_SEARCH,549769729,
 sd_PushButton_TP_ANIMATION_BTN_SEEK,549769730,
 sd_RadioButton_DLG_ASS_RB_PAGE1_EMPTY,1088487947,
@@ -6506,9 +6492,6 @@ sd_RadioButton_DLG_PUBLISHING_PAGE6_DOCCOLORS,1085850221,
 sd_RadioButton_DLG_PUBLISHING_PAGE6_USER,1085850215,
 sd_RadioButton_FLT_WIN_ANIMATION_RBT_BITMAP,3231367682,
 sd_RadioButton_FLT_WIN_ANIMATION_RBT_GROUP,3231367681,
-sd_RadioButton_RID_SD_TABPAGE_HEADERFOOTER_RB_DATETIME_AUTOMATIC,553255429,
-sd_RadioButton_RID_SD_TABPAGE_HEADERFOOTER_RB_DATETIME_FIXED,553255427,
-sd_TabPage_RID_SD_TABPAGE_HEADERFOOTER,553254912,
 sd_TimeField_DLG_ASS_TMF_PAGE3_BREAK,1088495668,
 sd_TimeField_DLG_ASS_TMF_PAGE3_TIME,1088495666,
 sd_TimeField_DLG_PUBLISHING_PAGE2_DURATION_TMF,1085857829,
diff --git a/source/text/simpress/01/03152000.xhp 
b/source/text/simpress/01/03152000.xhp
index 25fc402..3f17d45 100644
--- a/source/text/simpress/01/03152000.xhp
+++ b/source/text/simpress/01/03152000.xhp
@@ -36,8 +36,9 @@
 
 
 
-Header and 
Footer
-Adds or changes text in 
placeholders at the top and the bottom of slides and slide 
masters.
+
+Header and 
Footer
+Adds or changes 
text in placeholders at the top and the bottom of slides and slide 
masters.
 
 
   
@@ -62,32 +63,32 @@
 Include on slide
 Specify the elements to include on your slides.
 Footer
-Adds the text that you 
enter in the Footer text box to the bottom of the 
slide.
+Adds the text that you 
enter in the Footer text box to the bottom of the 
slide.
 Footer text
-Adds the text that 
you enter to the bottom of the slide.
+Adds the text that you 
enter to the bottom of the slide.
 Header
-Adds the text that you 
enter in the Header text box to the top of the 
slide.
+Adds the text that you 
enter in the Header text box to the top of the 
slide.
 Header text
-Adds the text that 
you enter to the top of the slide.
-
+Adds the text that you 
enter to the

[Libreoffice-commits] core.git: helpcontent2

2013-09-06 Thread Caolán McNamara

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 916830c79ec293efc8862162bbb86d98467f8e6c
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 12:04:19 2013 +0100

Updated core
Project: help  dddb2f331c390253ae76d0be4f621d50c3f3db67

diff --git a/helpcontent2 b/helpcontent2
index 0d8b37c..dddb2f3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e
+Subproject commit dddb2f331c390253ae76d0be4f621d50c3f3db67
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source sd/inc sd/source sd/uiconfig

2013-09-06 Thread Caolán McNamara

 extras/source/glade/libreoffice-catalog.xml.in |3 
 sd/inc/helpids.h   |3 
 sd/source/ui/dlg/headerfooterdlg.cxx   |   89 
 sd/uiconfig/simpress/ui/headerfooterdialog.ui  |2 
 sd/uiconfig/simpress/ui/headerfootertab.ui |  177 -
 5 files changed, 157 insertions(+), 117 deletions(-)

New commits:
commit ac5b44c087a9b5f20795875189fe1dc18a12c004
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 11:52:31 2013 +0100

tweak custom widget to give an optimal size

+ move accessibility relations into the .ui now that we can
+ drop unused hids
+ rework the format/language positions to be less weird
+ add a custom widget stub to make easy to edit with glade

Change-Id: I9607603536f9df2b7cac0074880089adad3b9860

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 1757df2..ba080bf 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -329,6 +329,9 @@
 
+
 
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index b6e1ba1..38deeac 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -109,9 +109,6 @@
 #define HID_SD_NAMEDIALOG_PAGE  
"SD_HID_SD_NAMEDIALOG_PAGE"
 #define HID_SD_NAMEDIALOG_LINEEND   
"SD_HID_SD_NAMEDIALOG_LINEEND"
 
-#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE   
"SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE"
-#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT
"SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT"
-
 #define HID_SD_TASK_PANE
"SD_HID_SD_TASK_PANE"
 #define HID_SD_SLIDE_DESIGNS
"SD_HID_SD_SLIDE_DESIGNS"
 #define HID_SD_CURRENT_MASTERS  
"SD_HID_SD_CURRENT_MASTERS"
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx 
b/sd/source/ui/dlg/headerfooterdlg.cxx
index d52b8b6..d3ebed9 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -28,10 +28,11 @@
 
 #include "sdresid.hxx"
 
-#include 
 #include 
-#include 
 #include 
+#include 
+#include 
+#include 
 
 #include "helpids.h"
 #include "Outliner.hxx"
@@ -79,6 +80,7 @@ public:
 ~PresLayoutPreview();
 
 virtual void Paint( const Rectangle& rRect );
+virtual Size GetOptimalSize() const;
 
 void init( SdPage* pMaster );
 void update( HeaderFooterSettings& rSettings );
@@ -120,7 +122,7 @@ private:
 FixedText*   mpFTIncludeOn;
 
 CheckBox*mpCBHeader;
-FixedText*   mpFTHeader;
+VclContainer* mpHeaderBox;
 Edit*mpTBHeader;
 
 CheckBox*mpCBDateTime;
@@ -132,7 +134,7 @@ private:
 SvxLanguageBox*  mpCBDateTimeLanguage;
 
 CheckBox*mpCBFooter;
-FixedText*   mpFTFooter;
+VclContainer* mpFooterBox;
 Edit*mpTBFooter;
 
 CheckBox*   mpCBSlideNumber;
@@ -182,7 +184,6 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* 
pViewShell, ::Window* pParent
 mpCurrentPage( pCurrentPage ),
 mpViewShell( pViewShell )
 {
-//FreeResource();
 get(mpTabCtrl, "tabs" );
 
 SdPage* pSlide;
@@ -207,12 +208,10 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* 
pViewShell, ::Window* pParent
 }
 
 pDoc->StopWorkStartupDelay();
-//  mpTabCtrl.SetHelpId( HID_XML_FILTER_TABPAGE_CTRL );
 mpTabCtrl->Show();
 
 mnSlidesId = mpTabCtrl->GetPageId("slides");
 mpSlideTabPage = new HeaderFooterTabPage( this, mpTabCtrl, pDoc, pSlide, 
false );
-//mpSlideTabPage->SetHelpId( HID_SD_TABPAGE_HEADERFOOTER_SLIDE );
 mpTabCtrl->SetTabPage( mnSlidesId, mpSlideTabPage );
 
 Size aSiz = mpSlideTabPage->GetSizePixel();
@@ -226,24 +225,14 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* 
pViewShell, ::Window* pParent
 
 mnNotesId = mpTabCtrl->GetPageId("notes");
 mpNotesHandoutsTabPage = new HeaderFooterTabPage( this, mpTabCtrl, pDoc, 
pNotes, true );
-//mpNotesHandoutsTabPage->SetHelpId( 
HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT );
 mpTabCtrl->SetTabPage( mnNotesId, mpNotesHandoutsTabPage );
 
 get(maPBApplyToAll, "apply_all" );
 get(maPBApply, "apply" );
 get(maPBCancel, "cancel" );
 
-/*aSiz = mpNotesHandoutsTabPage->GetSizePixel();
-if ( aCtrlSiz.Width() < aSiz.Width() || aCtrlSiz.Height() < aSiz.Height() )
-{
-mpTabCtrl.SetOutputSizePixel( aSiz );
-aCtrlSiz = aSiz;
-}*/
-
 ActivatePageHdl( mpTabCtrl );
 
-AdjustLayout();
-
 mpTabCtrl->SetActivatePageHdl( LINK( this, HeaderFooterDialog, 
ActivatePageHdl ) );
 mpTabCtrl->SetDeactivatePageHdl( LINK( this, HeaderFooterDialog, 
DeactivatePageHdl ) );
 
@@ -446,30 +435,30 @@ HeaderFooterTabPage::HeaderFooterTabPage( 
HeaderFooterDialog* pDialog, ::Window*
 mpDialog(pDialog),
 mbHandoutMode( bHandoutMode )
 {
-get(mpFTIncludeOn, "

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3 commits - 26/8268cc319c6b0e926427c208c303fdf911c3e4 8e/46b8bc28fffec586137b4b525d2e23648cceac e2/7707edb086073bb37f06cd37d40b46cfa36f2e

2013-09-06 Thread Caolán McNamara

 26/8268cc319c6b0e926427c208c303fdf911c3e4 |1 +
 8e/46b8bc28fffec586137b4b525d2e23648cceac |1 +
 e2/7707edb086073bb37f06cd37d40b46cfa36f2e |1 +
 3 files changed, 3 insertions(+)

New commits:
commit 050003f2a31545e5d88d938e93c0b21fabcf2b11
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 11:21:45 2013 +0100

Notes added by 'git notes add'

diff --git a/8e/46b8bc28fffec586137b4b525d2e23648cceac 
b/8e/46b8bc28fffec586137b4b525d2e23648cceac
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/8e/46b8bc28fffec586137b4b525d2e23648cceac
@@ -0,0 +1 @@
+ignore: fixed
commit b5f0ad8b2836c325f7532905bddc1e391f5b8d2f
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 11:21:38 2013 +0100

Notes added by 'git notes add'

diff --git a/e2/7707edb086073bb37f06cd37d40b46cfa36f2e 
b/e2/7707edb086073bb37f06cd37d40b46cfa36f2e
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/e2/7707edb086073bb37f06cd37d40b46cfa36f2e
@@ -0,0 +1 @@
+ignore: fixed
commit 2e5c577e44b082d85a0f3ea27f56f167100ba534
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 11:21:32 2013 +0100

Notes added by 'git notes add'

diff --git a/26/8268cc319c6b0e926427c208c303fdf911c3e4 
b/26/8268cc319c6b0e926427c208c303fdf911c3e4
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/26/8268cc319c6b0e926427c208c303fdf911c3e4
@@ -0,0 +1 @@
+ignore: fixed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f1/8ad6132d79540431bf04f090a7472e21a23e49

2013-09-06 Thread Caolán McNamara

 f1/8ad6132d79540431bf04f090a7472e21a23e49 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7aa5c824586fba0d35c247b6033b99c020a3616b
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 6 11:21:03 2013 +0100

Notes added by 'git notes add'

diff --git a/f1/8ad6132d79540431bf04f090a7472e21a23e49 
b/f1/8ad6132d79540431bf04f090a7472e21a23e49
new file mode 100644
index 000..28b4408
--- /dev/null
+++ b/f1/8ad6132d79540431bf04f090a7472e21a23e49
@@ -0,0 +1 @@
+merged as: c77ec4fe42c064adc507caa2760a99e096f8c016
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-06 Thread Armin Le Grand

 include/svx/svdundo.hxx   |6 
 svx/source/svdraw/svdograf.cxx|   43 +-
 svx/source/svdraw/svdundo.cxx |   37 -
 vcl/source/filter/jpeg/JpegReader.cxx |   36 -
 vcl/source/gdi/pngread.cxx|  241 +++---
 5 files changed, 306 insertions(+), 57 deletions(-)

New commits:
commit c77ec4fe42c064adc507caa2760a99e096f8c016
Author: Armin Le Grand 
Date:   Thu Sep 5 13:01:45 2013 +

Resolves: #i122985# Various speedups for graphic object swapping

(cherry picked from commit f18ad6132d79540431bf04f090a7472e21a23e49)

Conflicts:
svtools/source/filter/jpeg/jpeg.cxx
svx/inc/svx/svdundo.hxx
svx/source/svdraw/svdograf.cxx
vcl/source/gdi/pngread.cxx

Change-Id: I733551fa9447eb8f45e9163a9c0189f013b03e82

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index d3a8a83..a3766b7 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -299,9 +299,11 @@ public:
 
 class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj
 {
+private:
+void TryToFlushGraphicContent();
+
 public:
-SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false)
-:   SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); }
+SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false);
 
 virtual void Undo();
 virtual void Redo();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 277833fd..6adf75b 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -60,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -67,6 +68,40 @@ using namespace ::com::sun::star::io;
 
 #define SWAPGRAPHIC_TIMEOUT 5000
 
+// #i122985# it is not correct to set the swap-timeout to a hard-coded 5000ms 
as it was before.
+// Added code and experimented what to do as a good compromize, see description
+sal_uInt32 getCacheTimeInMs()
+{
+static bool bSetAtAll(true);
+
+if(bSetAtAll)
+{
+static bool bSetToPreferenceTime(true);
+
+if(bSetToPreferenceTime)
+{
+const sal_uInt32 nSeconds =
+
officecfg::Office::Common::Cache::GraphicManager::ObjectReleaseTime::get(
+comphelper::getProcessComponentContext());
+
+
+// the default is 10 minutes. The minimum is one minute, thus 60 
seconds. When the minimum
+// should match to the former hard-coded 5 seconds, we have a 
divisor of 12 to use. For the
+// default of 10 minutes this would mean 50 seconds. Compared to 
before this is ten times
+// more (would allow better navigation by switching through pages) 
and is controllable
+// by the user by setting the 
tools/options/memory/Remove_from_memory_after setting. Seems
+// to be a good compromize to me.
+return nSeconds * 1000 / 12;
+}
+else
+{
+return SWAPGRAPHIC_TIMEOUT;
+}
+}
+
+return 0;
+}
+
 const Graphic ImpLoadLinkedGraphic( const OUString aFileName, const OUString 
aFilterName )
 {
 Graphic aGraphic;
@@ -333,7 +368,7 @@ SdrGrafObj::SdrGrafObj()
 {
 pGraphic = new GraphicObject;
 mpReplacementGraphic = 0;
-pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 
SWAPGRAPHIC_TIMEOUT );
+pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 
getCacheTimeInMs() );
 onGraphicChanged();
 
 // #i118485# Shear allowed and possible now
@@ -357,7 +392,7 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const 
Rectangle& rRect)
 {
 pGraphic = new GraphicObject( rGrf );
 mpReplacementGraphic = 0;
-pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 
SWAPGRAPHIC_TIMEOUT );
+pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 
getCacheTimeInMs() );
 onGraphicChanged();
 
 // #i118485# Shear allowed and possible now
@@ -381,7 +416,7 @@ SdrGrafObj::SdrGrafObj( const Graphic& rGrf )
 {
 pGraphic = new GraphicObject( rGrf );
 mpReplacementGraphic = 0;
-pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 
SWAPGRAPHIC_TIMEOUT );
+pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 
getCacheTimeInMs() );
 onGraphicChanged();
 
 // #i118485# Shear allowed and possible now
@@ -410,7 +445,7 @@ void SdrGrafObj::SetGraphicObject( const GraphicObject& 
rGrfObj )
 *pGraphic = rGrfObj;
 delete mpReplacementGraphic;
 mpReplacementGraphic = 0;
-pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 
SWAPGRAPHIC_TIMEOUT );
+pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 
getCacheTimeInMs() );
 pGraphic->SetUserData();
 mbIsPreview = false;
 SetChanged();
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index fcdf5f0.

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-09-06 Thread bugzilla-daemon

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

Bug 54157 depends on bug 68313, which changed state.

Bug 68313 Summary: Diacritics problem with Graphite fonts
https://bugs.freedesktop.org/show_bug.cgi?id=68313

   What|Removed |Added

 Status|RESOLVED|REOPENED
 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] libcdr.git: src/lib

2013-09-06 Thread Fridrich Štrba

 src/lib/CDRSVGGenerator.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b279f9604bb1194e2eadf201dd5b6277e7494fea
Author: Fridrich Å trba 
Date:   Fri Sep 6 11:47:28 2013 +0200

stroke-dasharray: solid is invalid, use none

diff --git a/src/lib/CDRSVGGenerator.cpp b/src/lib/CDRSVGGenerator.cpp
index 779d57a..c92a86d 100644
--- a/src/lib/CDRSVGGenerator.cpp
+++ b/src/lib/CDRSVGGenerator.cpp
@@ -618,7 +618,7 @@ void libcdr::CDRSVGGenerator::writeStyle(bool /* isClosed 
*/)
   }
 
   if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == "solid")
-m_outputSink << "stroke-dasharray:  solid; ";
+m_outputSink << "stroke-dasharray:  none; ";
   else if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == 
"dash")
   {
 int dots1 = m_style["draw:dots1"]->getInt();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Project ...

2013-09-06 Thread Thorsten Behrens

Jakub Kościelak wrote:
> j) Preparation of materials for printing in CMYK ."
> 
Depending on the exact requirements, that might need work, too.

-- Thorsten


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

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

2013-09-06 Thread Markus Mohrhard

 editeng/source/editeng/impedit2.cxx |   32 
 oox/source/drawingml/fillproperties.cxx |2 +-
 2 files changed, 25 insertions(+), 9 deletions(-)

New commits:
commit 871cc47c5ea66d1c2f1cbff5d7564202192ea84c
Author: Markus Mohrhard 
Date:   Fri Sep 6 11:01:46 2013 +0200

use a faster standard algorithm to workaround performance problem, fdo#68089

We have here an O(n^2) algorithm. At least using std::find_if here
improves the inner loop and fixes the problem with the bug document.

Change-Id: I88dea9434df6c669f4897927a721ad1518d7ca5e

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index b9d3103..aa8c3fdb 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1739,6 +1739,24 @@ void ImpEditEngine::InitScriptTypes( sal_Int32 nPara )
 }
 }
 
+namespace {
+
+struct FindByPos
+{
+FindByPos(sal_uInt16 nPos):
+mnPos(nPos) {}
+
+bool operator()(const ScriptTypePosInfos::value_type& rValue)
+{
+return rValue.nStartPos <= mnPos && rValue.nEndPos >= mnPos;
+}
+
+private:
+sal_uInt16 mnPos;
+};
+
+}
+
 sal_uInt16 ImpEditEngine::GetScriptType( const EditPaM& rPaM, sal_uInt16* 
pEndPos ) const
 {
 sal_uInt16 nScriptType = 0;
@@ -1754,16 +1772,14 @@ sal_uInt16 ImpEditEngine::GetScriptType( const EditPaM& 
rPaM, sal_uInt16* pEndPo
 ((ImpEditEngine*)this)->InitScriptTypes( nPara );
 
 const ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
+
 sal_uInt16 nPos = rPaM.GetIndex();
-for ( size_t n = 0; n < rTypes.size(); n++ )
+ScriptTypePosInfos::const_iterator itr = std::find_if(rTypes.begin(), 
rTypes.end(), FindByPos(nPos));
+if(itr != rTypes.end())
 {
-if ( ( rTypes[n].nStartPos <= nPos ) && ( rTypes[n].nEndPos >= 
nPos ) )
-   {
-nScriptType = rTypes[n].nScriptType;
-if( pEndPos )
-*pEndPos = rTypes[n].nEndPos;
-break;
-}
+nScriptType = itr->nScriptType;
+if( pEndPos )
+*pEndPos = itr->nEndPos;
 }
 }
 return nScriptType ? nScriptType : GetI18NScriptTypeOfLanguage( 
GetDefaultLanguage() );
commit 3bc61004287e1d1a734c6046019d605742f6c629
Author: Markus Mohrhard 
Date:   Thu Sep 5 17:35:01 2013 +0200

CID#1078768: pass big parameter by reference

Change-Id: I423e6e0b3a7c16461765b5086f729cce028c4b6e

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index bb2eb57..403b816 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -52,7 +52,7 @@ namespace drawingml {
 
 namespace {
 
-Reference< XGraphic > lclCheckAndApplyDuotoneTransform( BlipFillProperties 
aBlipProps, Reference< XGraphic > xGraphic,
+Reference< XGraphic > lclCheckAndApplyDuotoneTransform( const 
BlipFillProperties& aBlipProps, Reference< XGraphic > xGraphic,
 const GraphicHelper& 
rGraphicHelper, const sal_Int32 nPhClr )
 {
 if( aBlipProps.maDuotoneColors[0].isUsed() && 
aBlipProps.maDuotoneColors[1].isUsed() )
___
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-09-06 Thread bugzilla-daemon

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

Bug 54157 depends on bug 68313, which changed state.

Bug 68313 Summary: Diacritics problem with Graphite fonts
https://bugs.freedesktop.org/show_bug.cgi?id=68313

   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: helpcontent2 vcl/source

2013-09-06 Thread László Németh

 helpcontent2  |2 +-
 vcl/source/glyphs/graphite_layout.cxx |   11 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 8fae91c67d3abed8158ada9ce1b0f79f3c10e165
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Sep 6 11:08:02 2013 +0200

fdo#68313 fix combining diacritics problem with Graphite fonts

Change-Id: Ied29f864dc5fc21fc55aaa5ddd40b02b53a564f8

diff --git a/helpcontent2 b/helpcontent2
index 32c1712..0d8b37c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 32c171278a4aa94023069fb264c9192fbe056e6e
+Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e
diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index afd8411..e61da7c 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -591,7 +591,16 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& 
rArgs)
 }
 int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
-if (rArgs.mnMinCharPos + numchars > limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
+if (mnSegCharOffset + numchars > limit)
+{
+int combining_char = 0;
+for (int i = mnSegCharOffset; i < numchars; i++) {
+int ch = rArgs.mpStr[i];
+if ((ch >= 0x300 && ch <= 0x36F) || (ch >= 0x1DC0 && ch <= 
0x1DFF) ||
+(ch >= 0x20D0 && ch <= 0x20F0) || (ch >= 0xFE20 && ch 
<= 0xFE26)) combining_char++;
+}
+numchars = limit - mnSegCharOffset + combining_char; // fdo#52540, 
fdo#68313
+}
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Mac Buildbot temporarily offline

2013-09-06 Thread Florian Effenberger


Hello,

as announced in yesterday's call, due to an electrician working at the 
venue, our Mac Buildbot is temporarily offline. We try to have it back 
online today, but chances are it will take until Monday.


In case of an emergency, Cloph has the machine at his home and could 
work on it if needed.


Sorry for the inconveniences,
Florian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-09-06 Thread Boris Dušek

 vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1bc2ecf3b8fb9c7064a21548777f1e5b92d58c8d
Author: Boris DuÅ¡ek 
Date:   Fri Sep 6 00:19:36 2013 +0200

Fix misspelled text with VoiceOver on 10.9

More in Apple's docs (Application Kit Release Notes for OS X v10.9,
section "New Accessibility constants").

Change-Id: I92fb6d552e86997bfc789723f32626d908d11419
Reviewed-on: https://gerrit.libreoffice.org/5831
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm 
b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 093f898f9..090df5e 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -294,6 +294,7 @@ using namespace ::rtl;
 switch(type) {
 case ::com::sun::star::text::TextMarkupType::SPELLCHECK: {
 [string 
addAttribute:NSAccessibilityMisspelledTextAttribute value:[NSNumber 
numberWithBool:YES] range:markupRange];
+[string addAttribute:@"AXMarkedMisspelled" value:[NSNumber 
numberWithBool:YES] range:markupRange];
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua

2013-09-06 Thread Boris Dušek

 vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3a4a931630792d226a9905d14988459ced36f74a
Author: Boris DuÅ¡ek 
Date:   Fri Sep 6 00:19:36 2013 +0200

Fix misspelled text with VoiceOver on 10.9

More in Apple's docs (Application Kit Release Notes for OS X v10.9,
section "New Accessibility constants").

Change-Id: I92fb6d552e86997bfc789723f32626d908d11419
Reviewed-on: https://gerrit.libreoffice.org/5833
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm 
b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 1c98581..751faed 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -246,6 +246,7 @@ using namespace ::rtl;
 switch(type) {
 case ::com::sun::star::text::TextMarkupType::SPELLCHECK: {
 [string 
addAttribute:NSAccessibilityMisspelledTextAttribute value:[NSNumber 
numberWithBool:YES] range:markupRange];
+[string addAttribute:@"AXMarkedMisspelled" value:[NSNumber 
numberWithBool:YES] range:markupRange];
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - filter/qa

2013-09-06 Thread Bjoern Michaelsen

 filter/qa/cppunit/filters-pict-test.cxx |4 
 filter/qa/cppunit/filters-tga-test.cxx  |4 
 filter/qa/cppunit/filters-tiff-test.cxx |4 
 3 files changed, 12 deletions(-)

New commits:
commit 2358703d161e58c9ffa23306541e0040bb4f46f2
Author: Bjoern Michaelsen 
Date:   Thu Sep 5 20:28:09 2013 +0200

tests that ensure the master to be broken arent that helpful

Change-Id: Ie59f2ba4daec0375d1d64b765be3b1484e8cba3e
Reviewed-on: https://gerrit.libreoffice.org/5830
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/filter/qa/cppunit/filters-pict-test.cxx 
b/filter/qa/cppunit/filters-pict-test.cxx
index 36d8d22..d69cf30 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -16,10 +16,6 @@
 #include 
 #include 
 
-#ifdef LIBO_MERGELIBS
-#define GraphicImport iptGraphicImport
-#endif
-
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
diff --git a/filter/qa/cppunit/filters-tga-test.cxx 
b/filter/qa/cppunit/filters-tga-test.cxx
index 365adb8..a0e0453 100644
--- a/filter/qa/cppunit/filters-tga-test.cxx
+++ b/filter/qa/cppunit/filters-tga-test.cxx
@@ -16,10 +16,6 @@
 #include 
 #include 
 
-#ifdef LIBO_MERGELIBS
-#define GraphicImport itgGraphicImport
-#endif
-
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
diff --git a/filter/qa/cppunit/filters-tiff-test.cxx 
b/filter/qa/cppunit/filters-tiff-test.cxx
index e7594e9..0089674 100644
--- a/filter/qa/cppunit/filters-tiff-test.cxx
+++ b/filter/qa/cppunit/filters-tiff-test.cxx
@@ -16,10 +16,6 @@
 #include 
 #include 
 
-#ifdef LIBO_MERGELIBS
-#define GraphicImport itiGraphicImport
-#endif
-
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Writer findBar

2013-09-06 Thread Miklos Vajna

On Thu, Sep 05, 2013 at 10:55:01PM +, rmcam...@libreoffice.org wrote:
> I've been trying to find out how the findbar works at writer. At
> this point I have an breakpoint that stops the findbar on the very
> moment that it is called, this print can show what I'm saying
> http://i.imgur.com/121AUCY.png

It's not Writer-specific, most of the related code is in
svx/source/tbxctrls/tbunosearchcontrollers.cxx.

Miklos


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

Re: minutes of ESC call ...

2013-09-06 Thread Cor Nouws


Michael Meeks wrote (05-09-13 17:03)


 + come up with a proposal on what still needs improving in sidebar land 
(Astron)


Published some thoughts on this (as promised lóng ago ;) )

http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-September/002323.html


--
 - Cor Nouws
 - http://nl.libreoffice.org
 - The Document Foundation Membership Committee Member
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-09-06 Thread Miklos Vajna

 sw/source/core/inc/swfont.hxx |3 ---
 sw/source/core/txtnode/swfont.cxx |   25 -
 unusedcode.easy   |1 -
 3 files changed, 29 deletions(-)

New commits:
commit 7753fbef1e7805f60f7d90fa2ac5a8537d7e4bb7
Author: Miklos Vajna 
Date:   Fri Sep 6 09:48:10 2013 +0200

unused SwFont ctor

Change-Id: I9bb51b279fc2d61ff5e427f9257bc3669cfdb0bd

diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 96840cf..be21ae7 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -162,9 +162,6 @@ class SwFont
 sal_Bool bGreyWave  :1;  // Fuers extended TextInput: Graue Wellenlinie
 sal_Bool bNoColReplace  :1;  // Replacement without colormanipulation
 
-protected:
-SwFont();
-
 public:
 SwFont( const SwAttrSet* pSet, const IDocumentSettingAccess* 
pIDocumentSettingAccess );
 SwFont( const SwFont& rFont );
diff --git a/sw/source/core/txtnode/swfont.cxx 
b/sw/source/core/txtnode/swfont.cxx
index be6a52e..63023a1 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -705,31 +705,6 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
 
 // SwFont
 
-SwFont::SwFont()
-: pBackColor(0)
-, m_nTopBorderDist(0)
-, m_nBottomBorderDist(0)
-, m_nRightBorderDist(0)
-, m_nLeftBorderDist(0)
-, m_aShadowColor(COL_TRANSPARENT)
-, m_nShadowWidth(0)
-, m_aShadowLocation(SVX_SHADOW_NONE)
-, nToxCnt(0)
-, nRefCnt(0)
-, m_nMetaCount(0)
-, nActual(SW_LATIN)
-, bNoHyph(false)
-, bBlink(false)
-, bPaintBlank(false)
-, bFntChg(false)
-, bOrgChg(false)
-, bURL(false)
-, bPaintWrong(false)
-, bGreyWave(false)
-, bNoColReplace(false)
-{
-}
-
 SwFont::SwFont( const SwFont &rFont )
 {
 aSub[SW_LATIN] = rFont.aSub[SW_LATIN];
diff --git a/unusedcode.easy b/unusedcode.easy
index 5b13ff3..af0d913 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -70,7 +70,6 @@ SvtAccessibilityOptions::SetListBoxMaximumLineCount(short)
 SvtAccessibilityOptions::SetPreviewUsesCheckeredBackground(unsigned char)
 SvxNumRule::Create(SvStream&)
 SvxNumberFormat::Create(SvStream&)
-SwFont::SwFont()
 Test::test1Table1Page()
 TextEngine::GetLeftMargin() const
 ThumbnailView::DeselectItem(unsigned short)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - connectivity/source

2013-09-06 Thread Andrzej J . R . Hunt

 connectivity/source/drivers/firebird/Connection.cxx|   11 ---
 connectivity/source/drivers/firebird/Connection.hxx|6 --
 connectivity/source/drivers/firebird/PreparedStatement.cxx |6 +++---
 connectivity/source/drivers/firebird/PreparedStatement.hxx |9 ++---
 connectivity/source/drivers/firebird/ResultSet.cxx |4 ++--
 connectivity/source/drivers/firebird/ResultSet.hxx |9 ++---
 6 files changed, 29 insertions(+), 16 deletions(-)

New commits:
commit b991d27d3d47d29a376cafe08f8665327170dd0a
Author: Andrzej J.R. Hunt 
Date:   Fri Sep 6 08:35:19 2013 +0100

CID#1079053 Uncaught Exception.

In this case we can just propagate the DeploymentException (is a
RuntimeException).

Change-Id: Ic807ec039af3856f90d4e798e1304a72421b4db6

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index f5fcb26..0d53123 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -112,7 +112,7 @@ void SAL_CALL OConnection::release() throw()
 }
 
 void OConnection::construct(const ::rtl::OUString& url, const Sequence< 
PropertyValue >& info)
-throw(SQLException)
+throw(SQLException, RuntimeException)
 {
 SAL_INFO("connectivity.firebird", "construct().");
 
diff --git a/connectivity/source/drivers/firebird/Connection.hxx 
b/connectivity/source/drivers/firebird/Connection.hxx
index c7fe44c..7a21aca 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -127,7 +127,8 @@ namespace connectivity
 public:
 virtual void construct( const ::rtl::OUString& url,
 const ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >& info)
-throw(::com::sun::star::sdbc::SQLException);
+throw(::com::sun::star::sdbc::SQLException,
+  ::com::sun::star::uno::RuntimeException);
 
 OConnection(FirebirdDriver* _pDriver);
 virtual ~OConnection();
commit 525bb53ab85ca2606db80edaf4ae33710921bad1
Author: Andrzej J.R. Hunt 
Date:   Fri Sep 6 08:30:56 2013 +0100

CID#1079054 Uncaught exception.

In this case we should just propagate the DisposedException to the caller.

Change-Id: I3c2699ad6c2144007d98447b133cdbb13f5d50d9

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index 1d2e8f1..f5fcb26 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -320,7 +320,7 @@ IMPLEMENT_SERVICE_INFO(OConnection, 
"com.sun.star.sdbc.drivers.firebird.OConnect
 
"com.sun.star.sdbc.Connection")
 
 Reference< XBlob> OConnection::createBlob(ISC_QUAD* pBlobId)
-throw(SQLException)
+throw(SQLException, RuntimeException)
 {
 SAL_INFO("connectivity.firebird", "createBlob()");
 MutexGuard aGuard(m_aMutex);
diff --git a/connectivity/source/drivers/firebird/Connection.hxx 
b/connectivity/source/drivers/firebird/Connection.hxx
index cdf6c44..c7fe44c 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -185,7 +185,8 @@ namespace connectivity
  */
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>
 createBlob(ISC_QUAD* pBlobID)
-throw(::com::sun::star::sdbc::SQLException);
+throw(::com::sun::star::sdbc::SQLException,
+  ::com::sun::star::uno::RuntimeException);
 
 /**
  * Create and/or connect to the sdbcx Catalog. This is completely
commit f9a7f0340e9e6dbaa9d381dd2b3ea8c1a2831857
Author: Andrzej J.R. Hunt 
Date:   Fri Sep 6 08:23:20 2013 +0100

CID#1079051 Uncaught exception. (firebird-sdbc)

In this case we can just pass the DisposedException (is a RuntimeException)
onto the calling methods.

Change-Id: I89d2421c03a5f8e81f209b94109ffde117cfb0cd

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 1317b6f..9e05311 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -64,7 +64,7 @@ OPreparedStatement::OPreparedStatement( OConnection* 
_pConnection,
 }
 
 void OPreparedStatement::ensurePrepared()
-throw (SQLException)
+throw (SQLException, RuntimeException)
 {
 MutexGuard aGuard(m_pConnection->getMutex());
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -584,7 +584,7 @@ void 
OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
 }
 
 void OPreparedStatement::checkParameterIn

LibreOffice Gerrit News 2013-09-06

2013-09-06 Thread gerrit

Moin!

* Open changes on master for project core changed in the last 25 hours:

+ Math: Remove not needed header file
  in https://gerrit.libreoffice.org/5832 from Marcos Souza
+ Fix misspelled text with VoiceOver on 10.9
  in https://gerrit.libreoffice.org/5831 from Boris Dušek
+ Performance improvements on Expert Config
  in https://gerrit.libreoffice.org/5714 from Efe Gürkan Yalaman
+ String::Erase(String::Search())
  in https://gerrit.libreoffice.org/5827 from Thomas Arnhold
+ String to OUString
  in https://gerrit.libreoffice.org/5826 from Thomas Arnhold
+ fdo#42155: Replace the only use of CAutoUnicodeBuffer end part
  in https://gerrit.libreoffice.org/5829 from Julien Nabet
+ fdo#62475 removed pointless comments
  in https://gerrit.libreoffice.org/5824 from Jelle van der Waa
+ Fix remote clients duplicates.
  in https://gerrit.libreoffice.org/5816 from Artur Dryomov
+ Normalize DISABLE_OPENSSL to USE TRUE/
  in https://gerrit.libreoffice.org/5724 from Norbert Thiebaud
+ Parsing 'presobj' properties from 'objectlist.xml': gsoc-impresslayout
  in https://gerrit.libreoffice.org/5652 from Vishv Brahmbhatt
+ Make libatomic_ops buildable and enable on non-X86.
  in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt
+ Windows registry configuration backend
  in https://gerrit.libreoffice.org/5770 from Janos Farago


* Merged changes on master for project core changed in the last 25 hours:

+ use replaceFirst
  in https://gerrit.libreoffice.org/5828 from Thomas Arnhold
+ fdo#42155: Replace the only use of CAutoUnicodeBuffer part1
  in https://gerrit.libreoffice.org/5713 from Julien Nabet
+ fdo#68552: try different build-time replacement
  in https://gerrit.libreoffice.org/5823 from Michael Stahl
+ Move building server via TCP servers finder to a separate method.
  in https://gerrit.libreoffice.org/5815 from Artur Dryomov
+ fdo#68956: fix string conversion
  in https://gerrit.libreoffice.org/5819 from Thomas Arnhold
+ String to OUString
  in https://gerrit.libreoffice.org/5817 from Thomas Arnhold
+ svx: new InteropGrabBag UNO prop in Shape service
  in https://gerrit.libreoffice.org/5769 from Andres Gomez
+ String to OUString for SmDocShell::ReplaceBadChars
  in https://gerrit.libreoffice.org/5818 from Thomas Arnhold


* Abandoned changes on master for project core changed in the last 25 hours:

+ String::Erase(String::Search())
  in https://gerrit.libreoffice.org/5825 from Thomas Arnhold
+ writerfilter: corrected define for debug output
  in https://gerrit.libreoffice.org/5800 from Andres Gomez
+ XubString to OUString
  in https://gerrit.libreoffice.org/5809 from Thomas Arnhold


* Open changes needing tweaks, but being untouched for more than a week:

+ Dynamically align toolbars in LibreOffice
  in https://gerrit.libreoffice.org/5655 from Prashant Pandey
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ fdo#66401: fix for combined characters
  in https://gerrit.libreoffice.org/5018 from Adam CloudOn
+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+  fdo#66279 - MathML export: use the operator dictionary
  in https://gerrit.libreoffice.org/4671 from Frédéric Wang
+ Remove old outdated gallery images and sounds
  in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt
+ fix for text watermark
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ Don't use osl_createSuspendedThread anymore
  in https://gerrit.libreoffice.org/5565 from Arnaud Versini
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn
+ Change oslThreadIdentifier to uintptr_t and use THREAD_VALUE on Unix.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn
+ fdo#66577: non-fractional widths with Core Text
  in https://gerrit.libreoffice.org/5023 from Khaled Hosny


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-2' - sc/inc sc/source

2013-09-06 Thread Kohei Yoshida

 sc/inc/token.hxx |7 ++
 sc/inc/types.hxx |2 
 sc/source/core/data/types.cxx|7 +-
 sc/source/core/inc/interpre.hxx  |1 
 sc/source/core/tool/interpr1.cxx |  121 ++-
 sc/source/core/tool/interpr4.cxx |   61 +--
 sc/source/core/tool/token.cxx|7 ++
 7 files changed, 85 insertions(+), 121 deletions(-)

New commits:
commit d5aaf6a40a3ca04498e35885c386f38e01f83d46
Author: Kohei Yoshida 
Date:   Fri Sep 6 01:18:26 2013 -0400

Wrong place to apply implicit intersection. Do it at the very last.

Change-Id: I4b1e9d136d45f169ad1c1efee2275bab7dfe0f49

diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 32cdf5a..a852dd8 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -36,6 +36,12 @@
 // Matrix token constants.
 #define MATRIX_TOKEN_HAS_RANGE 1
 
+namespace sc {
+
+struct RangeMatrix;
+
+}
+
 class ScJumpMatrix;
 
 typedef ::std::vector< ScComplexRefData > ScRefList;
@@ -190,6 +196,7 @@ class ScMatrixRangeToken : public ScToken
 ScComplexRefData maRef;
 public:
 ScMatrixRangeToken( const ScMatrixRef& p, const ScComplexRefData& rRef );
+ScMatrixRangeToken( const sc::RangeMatrix& rMat );
 ScMatrixRangeToken( const ScMatrixRangeToken& r );
 
 virtual sal_uInt8 GetByte() const;
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index f03ccc0..045d6b1 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -68,8 +68,10 @@ struct RangeMatrix
 ScMatrixRef mpMat;
 sal_Int32 mnCol1;
 sal_Int32 mnRow1;
+sal_Int32 mnTab1;
 sal_Int32 mnCol2;
 sal_Int32 mnRow2;
+sal_Int32 mnTab2;
 
 RangeMatrix();
 
diff --git a/sc/source/core/data/types.cxx b/sc/source/core/data/types.cxx
index 566d088..b45a0b1 100644
--- a/sc/source/core/data/types.cxx
+++ b/sc/source/core/data/types.cxx
@@ -12,11 +12,14 @@
 
 namespace sc {
 
-RangeMatrix::RangeMatrix() : mpMat(NULL), mnCol1(-1), mnRow1(-1), mnCol2(-1), 
mnRow2(-1) {}
+RangeMatrix::RangeMatrix() :
+mpMat(NULL), mnCol1(-1), mnRow1(-1), mnTab1(-1), mnCol2(-1), mnRow2(-1), 
mnTab2(-1) {}
 
 bool RangeMatrix::isRangeValid() const
 {
-return mnCol1 >= 0 && mnRow1 >= 0 && mnCol2 >= 0 && mnRow2 >= 0 && mnCol1 
<= mnCol2 && mnRow1 <= mnRow2;
+return mnCol1 >= 0 && mnRow1 >= 0 && mnTab1 >=0 &&
+mnCol2 >= 0 && mnRow2 >= 0 && mnTab2 >= 0 &&
+mnCol1 <= mnCol2 && mnRow1 <= mnRow2 && mnTab1 <= mnTab2;
 }
 
 }
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index bb9f919..b615b34 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -319,6 +319,7 @@ void PushExternalSingleRef(sal_uInt16 nFileId, const 
String& rTabName,
 void PushExternalDoubleRef(sal_uInt16 nFileId, const String& rTabName,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2);
+void PushMatrix( const sc::RangeMatrix& rMat );
 void PushMatrix(const ScMatrixRef& pMat);
 void PushError( sal_uInt16 nError );
 /// Raw stack type without default replacements.
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index fd1d224..8708e7b 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1195,8 +1195,10 @@ sc::RangeMatrix ScInterpreter::CompareMat( 
ScCompareOptions* pOptions )
 
 aRes.mnCol1 = aMat[i].mnCol1;
 aRes.mnRow1 = aMat[i].mnRow1;
+aRes.mnTab1 = aMat[i].mnTab1;
 aRes.mnCol2 = aMat[i].mnCol2;
 aRes.mnRow2 = aMat[i].mnRow2;
+aRes.mnTab2 = aMat[i].mnTab2;
 
 for (SCSIZE j = 0; j < nC; ++j)
 {
@@ -1270,29 +1272,6 @@ ScMatrixRef ScInterpreter::QueryMat( const ScMatrixRef& 
pMat, ScCompareOptions&
 return pResultMatrix;
 }
 
-namespace {
-
-double applyImplicitIntersection(const sc::RangeMatrix& rMat, const ScAddress& 
rPos)
-{
-if (rMat.mnRow1 <= rPos.Row() && rPos.Row() <= rMat.mnRow2 && rMat.mnCol1 
== rMat.mnCol2)
-{
-SCROW nOffset = rPos.Row() - rMat.mnRow1;
-return rMat.mpMat->GetDouble(0, nOffset);
-}
-
-if (rMat.mnCol1 <= rPos.Col() && rPos.Col() <= rMat.mnCol2 && rMat.mnRow1 
== rMat.mnRow2)
-{
-SCROW nOffset = rPos.Col() - rMat.mnCol1;
-return rMat.mpMat->GetDouble(nOffset, 0);
-}
-
-double fVal;
-rtl::math::setNan(&fVal);
-return fVal;
-}
-
-}
-
 void ScInterpreter::ScEqual()
 {
 if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix )
@@ -1304,22 +1283,8 @@ void ScInterpreter::ScEqual()
 return;
 }
 
-if (aMat.isRangeValid())
-{
-// This matrix represents a range reference. Apply implicit 
intersection.
-double fVal = applyImplicitIntersection(aMat, aPos);
-if (rtl::math::isNan(fVal))
-{
-PushError(errCellNoValue);
-return;
-

66 matches

Mail list logo