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

[Miklos Vajna]

 sw/source/filter/ww8/docxsdrexport.cxx |2 +-
 sw/source/filter/ww8/docxsdrexport.hxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2580201a89d6900fa445448d3d47b26a197cbdba
Author: Miklos Vajna 
Date:   Thu Mar 6 09:32:17 2014 +0100

DocxSdrExport: fix indentation

Change-Id: I7e3ddcf1fbda3979243f6540a806d2151a853e4c

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 835892c..8e7a4127 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1184,7 +1184,7 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame* 
pParentFrame)
 if (pObject != NULL)
 {
 OUString sAnchorId = lclGetAnchorIdFromGrabBag(pObject);
-if(!sAnchorId.isEmpty())
+if (!sAnchorId.isEmpty())
 m_pImpl->m_pFlyAttrList->addNS(XML_w14, XML_anchorId, 
OUStringToOString(sAnchorId, RTL_TEXTENCODING_UTF8));
 }
 
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx 
b/sw/source/filter/ww8/docxsdrexport.hxx
index 675d756..8833ab9 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -83,9 +83,9 @@ public:
 void writeDMLEffectLst(const SwFrmFmt& rFrmFmt);
 /// Writes a diagram (smartart).
 void writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFrmFmt, int 
nAnchorId);
-void writeDiagramRels( com::sun::star::uno::Reference< 
com::sun::star::xml::dom::XDocument> xDom,
-com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< 
com::sun::star::uno::Any > > xRelSeq,
-com::sun::star::uno::Reference< com::sun::star::io::XOutputStream 
> xOutStream, OUString sGrabBagProperyName);
+void writeDiagramRels(com::sun::star::uno::Reference< 
com::sun::star::xml::dom::XDocument> xDom,
+  com::sun::star::uno::Sequence< 
com::sun::star::uno::Sequence< com::sun::star::uno::Any > > xRelSeq,
+  com::sun::star::uno::Reference< 
com::sun::star::io::XOutputStream > xOutStream, OUString sGrabBagProperyName);
 /// Writes text frame in DML format.
 void writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId);
 /// Writes text frame in VML format.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: osx/README osx/soffice.xcodeproj

[Tor Lillqvist]

 osx/README|4 
 osx/soffice.xcodeproj/project.pbxproj |  634 ++
 2 files changed, 638 insertions(+)

New commits:
commit 686677d245806ef78762a516c44501c500dba9a7
Author: Tor Lillqvist 
Date:   Thu Mar 6 10:54:28 2014 +0200

Add an Xcode project to make it easier to debug a running soffice on OS X

Not intended for other use. The Xcode project has references to a
fairly arbitrary bunch of source files from here and there in LO that
I have happened to been debugging in Xcode on OS X.

Change-Id: I9e94c02b2a4b057e35310362c90167f7e8670bb8

diff --git a/osx/README b/osx/README
new file mode 100644
index 000..341b15b
--- /dev/null
+++ b/osx/README
@@ -0,0 +1,4 @@
+Just an Xcode project to make it easier to debug a running soffice
+instance on OS X. Not intended for other use. The Xcode project has
+references to a fairly arbitrary bunch of source files from here and
+there in LO that I have happened to been debugging in Xcode on OS X.
\ No newline at end of file
diff --git a/osx/soffice.xcodeproj/project.pbxproj 
b/osx/soffice.xcodeproj/project.pbxproj
new file mode 100644
index 000..e7fa8f5
--- /dev/null
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -0,0 +1,634 @@
+// !$*UTF8*$!
+{
+   archiveVersion = 1;
+   classes = {
+   };
+   objectVersion = 46;
+   objects = {
+
+/* Begin PBXFileReference section */
+   BE02FCE5171328D20069F37F /* javacontext.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
javacontext.cxx; path = ../svtools/source/java/javacontext.cxx; sourceTree = 
""; };
+   BE02FCE6171328D20069F37F /* javainteractionhandler.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
javainteractionhandler.cxx; path = 
../svtools/source/java/javainteractionhandler.cxx; sourceTree = ""; };
+   BE02FCE7171335B80069F37F /* otherjre.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = otherjre.cxx; 
path = ../jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx; sourceTree = 
""; };
+   BE02FCE8171335B80069F37F /* sunjre.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sunjre.cxx; 
path = ../jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx; sourceTree = ""; 
};
+   BE02FCE9171335B80069F37F /* sunversion.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
sunversion.cxx; path = ../jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx; 
sourceTree = ""; };
+   BE02FCEA171335B80069F37F /* util.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = util.cxx; path 
= ../jvmfwk/plugins/sunmajor/pluginlib/util.cxx; sourceTree = ""; };
+   BE02FCEB171335B80069F37F /* vendorbase.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
vendorbase.cxx; path = ../jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx; 
sourceTree = ""; };
+   BE02FCEC171335B80069F37F /* vendorlist.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
vendorlist.cxx; path = ../jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx; 
sourceTree = ""; };
+   BE145F5C17B24BA4004CBBBA /* sunjavaplugin.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
sunjavaplugin.cxx; path = 
../jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx; sourceTree = ""; 
};
+   BE2DACF1182D0CBB00A4D2F7 /* formulagroupcl.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
formulagroupcl.cxx; path = ../sc/source/core/opencl/formulagroupcl.cxx; 
sourceTree = ""; };
+   BE2DACF2182D0CBB00A4D2F7 /* op_database.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
op_database.cxx; path = ../sc/source/core/opencl/op_database.cxx; sourceTree = 
""; };
+   BE2DACF3182D0CBB00A4D2F7 /* op_financial.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
op_financial.cxx; path = ../sc/source/core/opencl/op_financial.cxx; sourceTree 
= ""; };
+   BE2DACF4182D0CBB00A4D2F7 /* op_math.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = op_math.cxx; 
path = ../sc/source/core/opencl/op_math.cxx; sourceTree = ""; };
+   BE2DACF5182D0CBB00A4D2F7 /* op_statistical.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
op_statistical.cxx; path = ../sc/source/core/opencl/op_statistical.cxx; 
sourceTree = ""; };
+   BE2DACF6182D0CBB00A4D2F7 /* opbase.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = opbase.cxx; 
path = ../sc/source/core/opencl/opbase.cxx; sourceTree = ""; };
+   BE2DACF7182D0CBB00A4D2F7 /* openclwrapper.cxx */ = {isa = 
PBXFileReference; lastKnownFileTy

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

[Miklos Vajna]

 sw/qa/extras/ww8import/data/cp139.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |6 ++
 sw/source/filter/ww8/ww8par6.cxx  |5 +
 3 files changed, 11 insertions(+)

New commits:
commit 8556cd881270823865662e9a7700da58d11c2785
Author: Miklos Vajna 
Date:   Thu Mar 6 09:48:54 2014 +0100

cp#139 DOC import: ignore symbol charset of the symbol font

Otherwise characters unhandled by our OpenSymbol font (like Arabic 0-9
numbers) won't be rendered using an other font, as no other font
provides the symbol charset. Do this in
SwWW8ImplReader::GetFontParams(), where we already have font name ->
font family mappings for a few well-known fonts.

The DOCX filter does the same for quite some time, and that's how Arabic
numbers in text using the Symbol font were rendered, instead of little
rectangles.

Change-Id: Ib794cac19ad7b073e39f3cbd7d4bad3994151c14

diff --git a/sw/qa/extras/ww8import/data/cp139.doc 
b/sw/qa/extras/ww8import/data/cp139.doc
new file mode 100755
index 000..70cad3c
Binary files /dev/null and b/sw/qa/extras/ww8import/data/cp139.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index cc107e0..875c039 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -243,6 +243,12 @@ DECLARE_WW8IMPORT_TEST(testBnc821208, "bnc821208.doc")
 CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, ePropertyState);
 }
 
+DECLARE_WW8IMPORT_TEST(testCp139, "cp139.doc")
+{
+// This was RTL_TEXTENCODING_SYMBOL, causing "1" rendered as a placeholder 
rectangle.
+CPPUNIT_ASSERT_EQUAL(sal_Int16(RTL_TEXTENCODING_DONTKNOW), 
getProperty(getRun(getParagraph(1), 1), "CharFontCharSet"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 7815f36..0aa98a4 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3397,6 +3397,11 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, 
FontFamily& reFamily,
 reCharSet = rtl_getTextEncodingFromWindowsCharset( pF->chs );
 }
 
+// Make sure charset is not set in case of Symbol, otherwise in case a
+// character is missing in our OpenSymbol, the character won't be replaced.
+if (reCharSet == RTL_TEXTENCODING_SYMBOL && rName == "Symbol")
+reCharSet = RTL_TEXTENCODING_DONTKNOW;
+
 // make sure Font Family Code is set correctly
 // at least for the most important fonts
 // ( might be set wrong when Doc was not created by
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 include/ucbhelper/activedatasink.hxx   |   36 -
 ucbhelper/source/client/activedatasink.cxx |   49 -
 2 files changed, 9 insertions(+), 76 deletions(-)

New commits:
commit a6e19ea7a8885dcbdb1d8b2f56586373595ba8aa
Author: Norbert Thiebaud 
Date:   Wed Mar 5 19:47:58 2014 -0600

use WeakImplHelper for ActivaDataSink

Change-Id: Ife32157ff876a0860b3920cadc24b7888200796b
Signed-off-by: Stephan Bergmann 

diff --git a/include/ucbhelper/activedatasink.hxx 
b/include/ucbhelper/activedatasink.hxx
index 5adf7be..3a8470f 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -20,51 +20,31 @@
 #ifndef INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX
 #define INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX
 
-#include 
 #include 
-#include 
-#include 
 #include 
+#include 
 
 namespace ucbhelper
 {
 
-
-
 /**
   * This class implements the interface com::sun::star::io::XActiveDataSink.
   * Instances of this class can be passed with the parameters of an
   * "open" command.
   */
 
-class UCBHELPER_DLLPUBLIC ActiveDataSink : public cppu::OWeakObject,
-   public com::sun::star::lang::XTypeProvider,
-   public com::sun::star::io::XActiveDataSink
+class UCBHELPER_DLLPUBLIC ActiveDataSink :
+public cppu::WeakImplHelper1< css::io::XActiveDataSink >
 {
-com::sun::star::uno::Reference<
-com::sun::star::io::XInputStream > m_xStream;
+css::uno::Reference< css::io::XInputStream > m_xStream;
 
 public:
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType )
+// XActiveDataSink methods.
+virtual void SAL_CALL setInputStream( const css::uno::Reference< 
css::io::XInputStream >& aStream )
 throw( css::uno::RuntimeException, std::exception );
-virtual void SAL_CALL acquire()
-throw();
-virtual void SAL_CALL release()
-throw();
 
-// XTypeProvider
-XTYPEPROVIDER_DECL()
-
-// XActiveDataSink methods.
-virtual void SAL_CALL
-setInputStream( const com::sun::star::uno::Reference<
-com::sun::star::io::XInputStream >& aStream )
-throw( com::sun::star::uno::RuntimeException, std::exception );
-virtual com::sun::star::uno::Reference<
-com::sun::star::io::XInputStream > SAL_CALL
-getInputStream()
-throw( com::sun::star::uno::RuntimeException, std::exception );
+virtual css::uno::Reference< css::io::XInputStream > SAL_CALL 
getInputStream()
+throw( css::uno::RuntimeException, std::exception );
 };
 
 } /* namespace ucbhelper */
diff --git a/ucbhelper/source/client/activedatasink.cxx 
b/ucbhelper/source/client/activedatasink.cxx
index d83643f..604801f 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.cxx
@@ -29,58 +29,11 @@ using namespace com::sun::star;
 
 namespace ucbhelper
 {
-
-
-
-
 // ActiveDataSink Implementation.
-
-
-
-
-
-
-// XInterface methods
-
-void SAL_CALL ActiveDataSink::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL ActiveDataSink::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ActiveDataSink::queryInterface( const css::uno::Type & 
rType )
-throw( css::uno::RuntimeException, std::exception )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   (static_cast< 
lang::XTypeProvider* >(this)),
-   (static_cast< 
io::XActiveDataSink* >(this))
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods
-
-
-
-XTYPEPROVIDER_IMPL_2( ActiveDataSink,
-  lang::XTypeProvider,
-  io::XActiveDataSink );
-
-
-
 // XActiveDataSink methods.
 
-
-
 // virtual
-void SAL_CALL ActiveDataSink::setInputStream(
-const uno::Reference< io::XInputStream >& aStream )
+void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< 
io::XInputStream >& aStream )
 throw( uno::RuntimeException, std::exception )
 {
 m_xStream = aStream;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sfx2/util/sfx.component   |4 ++--
 writerfilter/source/dmapper/GraphicImport.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d124ad1c6737fcf9f1024576d29cf733b99a64c1
Author: Jan Holesovsky 
Date:   Thu Mar 6 09:43:08 2014 +0100

constructors: Fix typo preventing extensions loading.

Change-Id: If40e685f622b15e055a3087c441fc0c332e7d7d3

diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
index 6f610c3..203acc8 100644
--- a/sfx2/util/sfx.component
+++ b/sfx2/util/sfx.component
@@ -57,11 +57,11 @@
 
   
   
+  
constructor="com_sun_star_comp_sfx2_ApplicationDialogLibraryContainer_get_implementation">
 
   
   
+  
constructor="com_sun_star_comp_sfx2_ApplicationScriptLibraryContainer_get_implementation">
 
   
   
Date:   Thu Mar 6 09:03:25 2014 +0100

Simplify.

Change-Id: I09e6963caeac32174d7dd19c16690b16fc81672f

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 5f6d50d..99ea05d 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -468,7 +468,7 @@ void GraphicImport::putPropertyToFrameGrabBag( const 
OUString& sPropertyName, co
 if (!xSetInfo.is())
 return;
 
-const OUString& aGrabBagPropName = OUString("FrameInteropGrabBag");
+const OUString aGrabBagPropName("FrameInteropGrabBag");
 
 if (xSetInfo->hasPropertyByName(aGrabBagPropName))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - solenv/bin vcl/inc vcl/source

[Tor Lillqvist]

 solenv/bin/native-code.py   |1 +
 vcl/inc/graphite_static.hxx |1 -
 vcl/inc/quartz/salgdicommon.hxx |2 ++
 vcl/inc/regionband.hxx  |4 ++--
 vcl/inc/salglyphid.hxx  |8 +---
 vcl/source/app/svmain.cxx   |   13 -
 6 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit 7cfb65451a2aa9b993fd4366b611b8c46e0c8b40
Author: Tor Lillqvist 
Date:   Thu Mar 6 10:31:30 2014 +0200

Fix up a few Emacs and vim mode lines

Change-Id: I813b3638d6e368e73d8733f652db553a6e1cb029

diff --git a/vcl/inc/graphite_static.hxx b/vcl/inc/graphite_static.hxx
index 4c70cf1..f7a826e 100644
--- a/vcl/inc/graphite_static.hxx
+++ b/vcl/inc/graphite_static.hxx
@@ -14,4 +14,3 @@
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
diff --git a/vcl/inc/quartz/salgdicommon.hxx b/vcl/inc/quartz/salgdicommon.hxx
index c20f991..a45a253 100644
--- a/vcl/inc/quartz/salgdicommon.hxx
+++ b/vcl/inc/quartz/salgdicommon.hxx
@@ -90,3 +90,5 @@ private:
 };
 
 #endif // INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index d8e29ac..199e174 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -80,5 +81,4 @@ public:
 
 #endif // INCLUDED_VCL_INC_REGIONBAND_HXX
 
-
-//eof
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salglyphid.hxx b/vcl/inc/salglyphid.hxx
index d7d7d7c..fa9f593 100644
--- a/vcl/inc/salglyphid.hxx
+++ b/vcl/inc/salglyphid.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -15,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SV_SALGLYPHID_HXX
-#define _SV_SALGLYPHID_HXX
+#ifndef INCLUDED_VCL_INC_SALGLYPHID_HXX
+#define INCLUDED_VCL_INC_SALGLYPHID_HXX
 
 // TODO: sal_GlyphId should become a class...
 typedef sal_uInt32 sal_GlyphId;
@@ -41,5 +42,6 @@ typedef sal_uInt32 sal_GlyphId;
 
 #define GF_DROPPED  0x
 
-#endif // _SV_SALGLYPHID_HXX
+#endif // INCLUDED_VCL_INC_SALGLYPHID_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 485163703b22318e1aabc903bd0261851d677a9d
Author: Tor Lillqvist 
Date:   Thu Mar 6 10:02:01 2014 +0200

Cosmetics and bin some pointless SAL_INFOs

Change-Id: I444cfdafce5cbd4d6f0ca12b05e477c48237a889

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 65ca649..029f051 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "rtl/logfile.hxx"
 
 #include 
@@ -140,8 +139,6 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* 
/*pData*/, oslSignalInfo
 int ImplSVMain()
 {
 // The 'real' SVMain()
-SAL_INFO( "vcl.app", "vcl (ss112471) ::SVMain" );
-
 ImplSVData* pSVData = ImplGetSVData();
 
 DBG_ASSERT( pSVData->mpApp, "no instance of class Application" );
@@ -192,9 +189,11 @@ int SVMain()
 else
 return ImplSVMain();
 }
+
 // This variable is set, when no Application object is instantiated
 // before SVInit is called
 static Application *pOwnSvApp = NULL;
+
 // Exception handler. pExceptionHandler != NULL => VCL already inited
 oslSignalHandler   pExceptionHandler = NULL;
 
@@ -236,8 +235,6 @@ uno::Any SAL_CALL 
DesktopEnvironmentContext::getValueByName( const OUString& Nam
 
 bool InitVCL()
 {
-SAL_INFO( "vcl.app", "vcl (ss112471) ::InitVCL" );
-
 if( pExceptionHandler != NULL )
 return false;
 
@@ -261,11 +258,9 @@ bool InitVCL()
 pSVData->mnMainThreadId = ::osl::Thread::getCurrentIdentifier();
 
 // Initialize Sal
-SAL_INFO( "vcl.app", "{ ::CreateSalInstance" );
 pSVData->mpDefInst = CreateSalInstance();
 if ( !pSVData->mpDefInst )
 return false;
-SAL_INFO( "vcl.app", "} ::CreateSalInstance" );
 
 // Desktop Environment context (to be able to get value of 
"system.desktop-environment" as soon as possible)
 com::sun::star::uno::setCurrentContext(
@@ -357,7 +352,7 @@ void DeInitVCL()
 delete pSVData->mpImeStatus;
 pSVData->mpImeStatus = NULL;
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0
 OStringBuffer aBuf( 256 );
 aBuf.append( "DeInitVCL: some top Windows are still alive\n" );
 long nTopWindowCount = Application::GetTopWindowCount();
@@ -381,7 +376,7 @@ void DeInitVCL()
 }
 }
 DBG_ASSERT( nBadTopWindows==0, aBuf.getStr() );
-#endif
+#endif
 
 ImplImageTreeSingletonRef()->shutDown();
 
commit 856066bb2c56a918ba0f9176a48974746614c206
Author: Tor Lillqvist 
Date:   Wed Mar 5 17:32:41 20

[Libreoffice-commits] core.git: icon-themes/crystal icon-themes/galaxy icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango

[Andrew]

 dev/null |binary
 1 file changed

New commits:
commit a083fb6ba2d1e39ab7e38b3695f350c955540f89
Author: Andrew 
Date:   Wed Feb 26 14:06:27 2014 +

Icon redux 01: Remove old draft view icons

i#87898 Porting old icon fixes from AOO Bugzilla.
Remove outdated icons for old display options (aw053).
Checked via git grep core and help source. No instances.

QA - Low risk; visual inspection of icons in general use. Originally icons 
appeared in optionsbar.xml for Draw and Impress, circa 2007. See i#80528.

Change-Id: I324f94fd6b03b6dbe483667d3cf197f95f7284c0
Signed-off-by: Andrew 
Reviewed-on: https://gerrit.libreoffice.org/8363
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/icon-themes/crystal/cmd/lc_graphicdraft.png 
b/icon-themes/crystal/cmd/lc_graphicdraft.png
deleted file mode 100644
index 6f86850..000
Binary files a/icon-themes/crystal/cmd/lc_graphicdraft.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/sc_graphicdraft.png 
b/icon-themes/crystal/cmd/sc_graphicdraft.png
deleted file mode 100644
index 5e49d0f..000
Binary files a/icon-themes/crystal/cmd/sc_graphicdraft.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/bg/lc_textdraft.png 
b/icon-themes/galaxy/cmd/bg/lc_textdraft.png
deleted file mode 100644
index 8adfd6c..000
Binary files a/icon-themes/galaxy/cmd/bg/lc_textdraft.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/bg/sc_textdraft.png 
b/icon-themes/galaxy/cmd/bg/sc_textdraft.png
deleted file mode 100644
index 1b4fb83..000
Binary files a/icon-themes/galaxy/cmd/bg/sc_textdraft.png and /dev/null differ
diff --git a/icon-themes/human/cmd/lc_filldraft.png 
b/icon-themes/human/cmd/lc_filldraft.png
deleted file mode 100644
index 1124f2d..000
Binary files a/icon-themes/human/cmd/lc_filldraft.png and /dev/null differ
diff --git a/icon-themes/human/cmd/lc_graphicdraft.png 
b/icon-themes/human/cmd/lc_graphicdraft.png
deleted file mode 100644
index fdc51e3..000
Binary files a/icon-themes/human/cmd/lc_graphicdraft.png and /dev/null differ
diff --git a/icon-themes/human/cmd/sc_graphicdraft.png 
b/icon-themes/human/cmd/sc_graphicdraft.png
deleted file mode 100644
index 9fc49f1..000
Binary files a/icon-themes/human/cmd/sc_graphicdraft.png and /dev/null differ
diff --git a/icon-themes/industrial/cmd/lc_filldraft.png 
b/icon-themes/industrial/cmd/lc_filldraft.png
deleted file mode 100644
index e27a4e2..000
Binary files a/icon-themes/industrial/cmd/lc_filldraft.png and /dev/null differ
diff --git a/icon-themes/industrial/cmd/lc_graphicdraft.png 
b/icon-themes/industrial/cmd/lc_graphicdraft.png
deleted file mode 100644
index e1655c7..000
Binary files a/icon-themes/industrial/cmd/lc_graphicdraft.png and /dev/null 
differ
diff --git a/icon-themes/industrial/cmd/lc_linedraft.png 
b/icon-themes/industrial/cmd/lc_linedraft.png
deleted file mode 100644
index dd29e1a..000
Binary files a/icon-themes/industrial/cmd/lc_linedraft.png and /dev/null differ
diff --git a/icon-themes/industrial/cmd/lc_textdraft.png 
b/icon-themes/industrial/cmd/lc_textdraft.png
deleted file mode 100644
index 94f8f33..000
Binary files a/icon-themes/industrial/cmd/lc_textdraft.png and /dev/null differ
diff --git a/icon-themes/industrial/cmd/sc_filldraft.png 
b/icon-themes/industrial/cmd/sc_filldraft.png
deleted file mode 100644
index bafefd1..000
Binary files a/icon-themes/industrial/cmd/sc_filldraft.png and /dev/null differ
diff --git a/icon-themes/industrial/cmd/sc_graphicdraft.png 
b/icon-themes/industrial/cmd/sc_graphicdraft.png
deleted file mode 100644
index 8af9238..000
Binary files a/icon-themes/industrial/cmd/sc_graphicdraft.png and /dev/null 
differ
diff --git a/icon-themes/industrial/cmd/sc_linedraft.png 
b/icon-themes/industrial/cmd/sc_linedraft.png
deleted file mode 100644
index 1fb36bf..000
Binary files a/icon-themes/industrial/cmd/sc_linedraft.png and /dev/null differ
diff --git a/icon-themes/industrial/cmd/sc_textdraft.png 
b/icon-themes/industrial/cmd/sc_textdraft.png
deleted file mode 100644
index 69f9d0e..000
Binary files a/icon-themes/industrial/cmd/sc_textdraft.png and /dev/null differ
diff --git a/icon-themes/oxygen/cmd/lc_filldraft.png 
b/icon-themes/oxygen/cmd/lc_filldraft.png
deleted file mode 100644
index e27a4e2..000
Binary files a/icon-themes/oxygen/cmd/lc_filldraft.png and /dev/null differ
diff --git a/icon-themes/oxygen/cmd/lc_graphicdraft.png 
b/icon-themes/oxygen/cmd/lc_graphicdraft.png
deleted file mode 100644
index 6f86850..000
Binary files a/icon-themes/oxygen/cmd/lc_graphicdraft.png and /dev/null differ
diff --git a/icon-themes/oxygen/cmd/lc_linedraft.png 
b/icon-themes/oxygen/cmd/lc_linedraft.png
deleted file mode 100644
index dd29e1a..000
Binary files a/icon-themes/oxygen/cmd/lc_linedraft.png and /dev/null differ
diff --git a/icon-themes/oxygen/cmd/lc_textdraft.png 
b/icon-themes/oxygen/cmd/lc_textdraft.png
deleted file mode 10064

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

[Tor Lillqvist]

 vcl/inc/quartz/salgdicommon.hxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 4a24bc465a1d0d00fa5a57b93453dce6bb3cf463
Author: Tor Lillqvist 
Date:   Thu Mar 6 12:08:16 2014 +0200

Point to "documentation" for XOR emulation

Change-Id: I947daf20692bf0504146523e93fed56c418676db

diff --git a/vcl/inc/quartz/salgdicommon.hxx b/vcl/inc/quartz/salgdicommon.hxx
index a45a253..4250103 100644
--- a/vcl/inc/quartz/salgdicommon.hxx
+++ b/vcl/inc/quartz/salgdicommon.hxx
@@ -64,6 +64,10 @@ inline RGBAColor::RGBAColor( float fRed, float fGreen, float 
fBlue, float fAlpha
 m_fRGBA[3] = fAlpha;
 }
 
+// XOR emulation suckage.
+// See 
http://www.openoffice.org/marketing/ooocon2008/programme/wednesday_1401.pdf
+// and https://bugs.freedesktop.org/show_bug.cgi?id=38844 .
+
 class XorEmulation
 {
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 40469] Modifed Frame Style Options Not Preserved, "Keep Ratio" Option Unavailable

[bugzilla-daemon]

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

Andrei Furtuna  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |furtunas...@gmail.com
   |desktop.org |
 CC||furtunas...@gmail.com

-- 
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: 4 commits - include/oox oox/source sc/qa sc/source

[Markus Mohrhard]

 include/oox/drawingml/shape.hxx  |2 +-
 oox/source/drawingml/diagram/diagram.cxx |4 ++--
 oox/source/drawingml/shape.cxx   |4 ++--
 oox/source/export/vmlexport.cxx  |2 +-
 oox/source/shape/ShapeContextHandler.cxx |4 ++--
 sc/qa/unit/subsequent_filters-test.cxx   |7 ---
 sc/source/filter/oox/sheetdatabuffer.cxx |2 +-
 sc/source/filter/xcl97/xcl97rec.cxx  |1 +
 8 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit 291c3ae79c45bc470f8a903a2541b10e9784fac5
Author: Markus Mohrhard 
Date:   Thu Mar 6 11:22:47 2014 +0100

fix OOXML strict import

fix the problem introduced by 6536826f2f4c747582d60ed40b0418c6a67a9829

Change-Id: I6c499f8490d92badda0f086d48c2347fa112bb4e

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 7f3ba65..911298f 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -178,7 +178,7 @@ public:
 const com::sun::star::uno::Sequence &
 getDiagramDoms() { return maDiagramDoms; }
 voidsetDiagramDoms(const 
com::sun::star::uno::Sequence& 
rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
-com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< 
com::sun::star::uno::Any > >resolveRelationshipsOfType(
+com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< 
com::sun::star::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
   
core::XmlFilterBase& rFilter, OUString sFragment, OUString sType );
 protected:
 
diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index 4672a28..70d938a 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -421,8 +421,8 @@ void loadDiagram( ShapePtr& pShape,
pDiagram,
xRefDataModel);
 
-pDiagram->getDataRelsMap() = pShape->resolveRelationshipsOfType( 
rFilter, xRefDataModel->getFragmentPath(),
-   
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"; );
+pDiagram->getDataRelsMap() = 
pShape->resolveRelationshipsOfTypeFromOfficeDoc( rFilter,
+xRefDataModel->getFragmentPath(), "image" );
 
 
 // Pass the info to pShape
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 3a2ebae..883d76f 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1200,7 +1200,7 @@ void Shape::putPropertiesToGrabBag( const Sequence< 
PropertyValue >& aProperties
 }
 }
 
-uno::Sequence< uno::Sequence< uno::Any > >  
Shape::resolveRelationshipsOfType(core::XmlFilterBase& rFilter, OUString 
sFragment, OUString sType )
+uno::Sequence< uno::Sequence< uno::Any > >  
Shape::resolveRelationshipsOfTypeFromOfficeDoc(core::XmlFilterBase& rFilter, 
OUString sFragment, OUString sType )
 {
 uno::Sequence< uno::Sequence< uno::Any > > xRelListTemp;
 sal_Int32 counter = 0;
@@ -1208,7 +1208,7 @@ uno::Sequence< uno::Sequence< uno::Any > >  
Shape::resolveRelationshipsOfType(co
 core::RelationsRef xRels = rFilter.importRelations( sFragment );
 if ( xRels )
 {
-core::RelationsRef xImageRels = xRels->getRelationsFromType( sType );
+core::RelationsRef xImageRels = 
xRels->getRelationsFromTypeFromOfficeDoc( sType );
 if ( xImageRels )
 {
 xRelListTemp.realloc( xImageRels->size() );
diff --git a/oox/source/shape/ShapeContextHandler.cxx 
b/oox/source/shape/ShapeContextHandler.cxx
index dc20747..7e6a217 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -433,8 +433,8 @@ ShapeContextHandler::getShape() throw 
(uno::RuntimeException, std::exception)
 aValue.realloc(length+1);
 
 diagramDrawing[0] = uno::makeAny( 
mxFilterBase->importFragment( aFragmentPath ) );
-diagramDrawing[1] = uno::makeAny( 
pShapePtr->resolveRelationshipsOfType( *mxFilterBase, aFragmentPath,
-
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"; )  
);
+diagramDrawing[1] = uno::makeAny( 
pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc(
+*mxFilterBase, aFragmentPath, "image" )  );
 
 beans::PropertyValue* pValue = aValue.getArray();
 pValue[length].Name = "OOXDrawing";
commit b09957e616f569ebf56e2b09b04e64fee9e0e298
Author: Markus Mohrhard 
Date:   Thu Mar 6 10:50:37 2014 +0100

coverity#1190367: uninitialized scalar variable

Change-Id: Iee8658ce33d7ba1f9a52778898fc42f15da853ad

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index b7db26d..7422e1a 

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

[Muthu Subramanian]

 include/oox/drawingml/shapepropertymap.hxx |3 +++
 oox/source/drawingml/fillproperties.cxx|4 +++-
 oox/source/drawingml/shapepropertymap.cxx  |   14 ++
 sd/qa/unit/data/pptx/n821567.pptx  |binary
 sd/qa/unit/import-tests.cxx|   29 +
 svx/source/xoutdev/xattrbmp.cxx|4 +++-
 6 files changed, 52 insertions(+), 2 deletions(-)

New commits:
commit e8c00c409123e1d99f71c8e6cf8d672e96fb0c91
Author: Muthu Subramanian 
Date:   Thu Mar 6 15:57:43 2014 +0530

n#821567: Add unit test case.

diff --git a/sd/qa/unit/data/pptx/n821567.pptx 
b/sd/qa/unit/data/pptx/n821567.pptx
new file mode 100644
index 000..9f365ad
Binary files /dev/null and b/sd/qa/unit/data/pptx/n821567.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 486f7f3..0f5732c 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -57,6 +57,7 @@ public:
 void testN828390_3();
 void testN828390_4();
 void testN828390_5();
+void testN821567();
 void testFdo68594();
 void testFdo72998();
 
@@ -72,6 +73,7 @@ public:
 CPPUNIT_TEST(testN828390_3);
 CPPUNIT_TEST(testN828390_4);
 CPPUNIT_TEST(testN828390_5);
+CPPUNIT_TEST(testN821567);
 CPPUNIT_TEST(testFdo68594);
 CPPUNIT_TEST(testFdo72998);
 
@@ -204,6 +206,33 @@ void SdFiltersTest::testN759180()
 }
 }
 
+void SdFiltersTest::testN821567()
+{
+OUString bgImage;
+::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n821567.pptx") );
+CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() );
+
+xDocShRef = saveAndReload( xDocShRef, ODP );
+CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() );
+CPPUNIT_ASSERT_MESSAGE( "in destruction", !xDocShRef->IsInDestruction() );
+uno::Reference< drawing::XDrawPagesSupplier > xDoc(
+xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+CPPUNIT_ASSERT_MESSAGE( "not exactly one page", 
xDoc->getDrawPages()->getCount() == 1 );
+uno::Reference< drawing::XDrawPage > xPage(
+xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+
+uno::Reference< beans::XPropertySet > xPropSet( xPage, uno::UNO_QUERY );
+uno::Any aAny = xPropSet->getPropertyValue( OUString("Background") );
+if(aAny.hasValue())
+{
+uno::Reference< beans::XPropertySet > aXBackgroundPropSet;
+aAny >>= aXBackgroundPropSet;
+aAny = aXBackgroundPropSet->getPropertyValue( 
OUString("FillBitmapName"));
+aAny >>= bgImage;
+}
+CPPUNIT_ASSERT_MESSAGE("Slide Background is not exported properly", 
!bgImage.isEmpty());
+}
+
 void SdFiltersTest::testN828390()
 {
 bool bPassed = false;
commit bf2ff0468e06770f9320c652a2332f7ec137d061
Author: Muthu Subramanian 
Date:   Thu Mar 6 15:53:07 2014 +0530

n#821567: Use BitmapURL only if its valid.

diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 797e089..674f8f6 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -513,7 +513,9 @@ bool XFillBitmapItem::PutValue( const 
::com::sun::star::uno::Any& rVal, sal_uInt
 }
 if( bSetURL )
 {
-maGraphicObject  = GraphicObject::CreateGraphicObjectFromURL(aURL);
+GraphicObject aGraphicObject  = 
GraphicObject::CreateGraphicObjectFromURL(aURL);
+if( aGraphicObject.GetType() != GRAPHIC_NONE )
+maGraphicObject = aGraphicObject;
 
 // #121194# Prefer GraphicObject over bitmap object if both are 
provided
 if(bSetBitmap && GRAPHIC_NONE != maGraphicObject.GetType())
commit 2ec4d410de5bd98527336a9dc49abb76656373df
Author: Muthu Subramanian 
Date:   Thu Mar 6 15:52:24 2014 +0530

n#821567: Import PPTX background images with table-name.

Seems like using the URL directly causes ODP export
to ignore the background image.
Probaby ODP Export requires updation as well?

diff --git a/include/oox/drawingml/shapepropertymap.hxx 
b/include/oox/drawingml/shapepropertymap.hxx
index 29b0ba2..f451cc0 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -65,6 +65,7 @@ enum ShapePropertyId
 SHAPEPROP_FillBitmapRectanglePoint,
 SHAPEPROP_FillHatch,
 SHAPEPROP_ShadowXDistance,
+SHAPEPROP_FillBitmapNameFromUrl,
 SHAPEPROP_END
 };
 
@@ -129,6 +130,8 @@ private:
 boolsetGradientTrans( sal_Int32 nPropId, const 
::com::sun::star::uno::Any& rValue );
 /** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. 
*/
 boolsetFillBitmapUrl( sal_Int32 nPropId, const 
::com::sun::star::uno::Any& rValue );
+/** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName 
*/
+boolsetFillBitmapNameFromUrl( sal_Int32 nPropId, const 
::com::sun::star::uno::Any& rValue );
 
 // not implemented, to prevent im

[Bug 40469] Modifed Frame Style Options Not Preserved, "Keep Ratio" Option Unavailable

[bugzilla-daemon]

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

Andrei Furtuna  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED

-- 
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] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst   |   10 --
 source/text/scalc/01/0511.xhp  |   37 +
 source/text/shared/00/0001.xhp |2 +-
 3 files changed, 18 insertions(+), 31 deletions(-)

New commits:
commit d3f2d4de7630cf42bb6328c9da22e1c9f552d742
Author: Caolán McNamara 
Date:   Thu Mar 6 11:20:48 2014 +

update help ids for autoformat table dialog .ui conversion

Change-Id: I8f197c728eec19654b58c230712663fac29d0c3c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f557f87..592a65c 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5723,12 +5723,6 @@ 
reportdesign_ListBox_RID_GROUPS_SORTING_LST_HEADERLST,2114719234,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_KEEPTOGETHERLST,2114719242,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_ORDER,2114719249,
 reportdesign_NumericField_RID_GROUPS_SORTING_ED_GROUPINTERVALLST,2114721800,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ADJUST,1493533722,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ALIGNMENT,1493533721,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_BORDER,1493533717,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_FONT,1493533719,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_NUMFORMAT,1493533716,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_PATTERN,1493533720,
 sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_CASE,1493746690,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_REGEXP,1493746691,
@@ -5759,7 +5753,6 @@ sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304,
 sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
 sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291,
 sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
-sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257,
 sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
 sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS,1495453194,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
@@ -5779,13 +5772,10 @@ sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762,
 sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
-sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
-sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_ADD,1493537385,
-sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_REMOVE,1493537386,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
diff --git a/source/text/scalc/01/0511.xhp 
b/source/text/scalc/01/0511.xhp
index 71f1544..d5e4b87 100644
--- a/source/text/scalc/01/0511.xhp
+++ b/source/text/scalc/01/0511.xhp
@@ -28,7 +28,7 @@
 
 
 
-
+
 AutoFormat
 
 Use this command to 
apply an AutoFormat to a selected sheet area or to define your own 
AutoFormats.
@@ -36,39 +36,36 @@
 
 
 
-
+
 Format
-Choose a 
predefined AutoFormat to apply to a selected area in your 
sheet.
+Choose a 
predefined AutoFormat to apply to a selected area in your 
sheet.
 
-
+
 Add
-Allows you 
to add the current formatting of a range of at least 4 x 4 cells to the list of 
predefined AutoFormats. The Add AutoFormat dialog then appears.
+Allows you to add 
the current formatting of a range of at least 4 x 4 cells to the list of 
predefined AutoFormats. The Add AutoFormat dialog then appears.
 
 Enter a name and click 
OK. 
 
-
-More
-Opens the 
Formatting section, which displays the formatting overrides that 
can be applied to the spreadsheet. Deselecting an option keeps the format of 
the current spreadsheet for that format type.
 Formatting
 In this section you can select or deselect the available formatting 
options. If you want to keep any of the settings currently in your spreadsheet, 
deselect the corresponding option.
-
+
 Number format
-When 
marked, specifies that you want to retain the number format of the selected 
format.
-
+When 
marked, specifies that you want to retain the number format of the selected 
format.
+
 Borders
-When 
marked, specifies that you want to retain the border of the selected 
format.
-
+When marked, 
specifies that you want to retain the border of the selected 
format.
+
 Font
-When marked, 
specifies that you want to retain the font of the selected 
format.
-
+When marked, 
specifies that you want to retain the font of the selected 
format.
+
 Pattern
-When 
marked, specifies that you want to retain the pattern of the selected 
format.
-
+When 
marked, specifies that you want to retain the pattern of the selected 
format.
+
 Alignment
-When 
marked, specifies that you want to retain the alignment of the selected 
format.
-
+When 
marked, specifies that you want to retain the alignment of the selected 
format.
+
 AutoFit width and height
-When 
marked, specifies that you want to

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 17285a7ded6dccc01d51dd4110e130cab023e301
Author: Caolán McNamara 
Date:   Thu Mar 6 11:20:48 2014 +

Updated core
Project: help  d3f2d4de7630cf42bb6328c9da22e1c9f552d742

diff --git a/helpcontent2 b/helpcontent2
index 8942a6a..d3f2d4d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8942a6afa77f5f9304e566041a0ccf28613c15ec
+Subproject commit d3f2d4de7630cf42bb6328c9da22e1c9f552d742
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/qa sw/source

[Miklos Vajna]

 sw/qa/extras/ww8import/data/cp139.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |8 
 sw/source/filter/ww8/ww8par6.cxx  |5 +
 3 files changed, 13 insertions(+)

New commits:
commit b9f545fc6d8ec93d2e2ce597c1f7b373e9e5b342
Author: Miklos Vajna 
Date:   Thu Mar 6 09:48:54 2014 +0100

cp#139 DOC import: ignore symbol charset of the symbol font

Otherwise characters unhandled by our OpenSymbol font (like Arabic 0-9
numbers) won't be rendered using an other font, as no other font
provides the symbol charset. Do this in
SwWW8ImplReader::GetFontParams(), where we already have font name ->
font family mappings for a few well-known fonts.

The DOCX filter does the same for quite some time, and that's how Arabic
numbers in text using the Symbol font were rendered, instead of little
rectangles.

(cherry picked from commit 8556cd881270823865662e9a7700da58d11c2785)

Conflicts:
sw/qa/extras/ww8import/ww8import.cxx
sw/source/filter/ww8/ww8par6.cxx

Change-Id: Ib794cac19ad7b073e39f3cbd7d4bad3994151c14

diff --git a/sw/qa/extras/ww8import/data/cp139.doc 
b/sw/qa/extras/ww8import/data/cp139.doc
new file mode 100755
index 000..70cad3c
Binary files /dev/null and b/sw/qa/extras/ww8import/data/cp139.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index e98055a..97655bb 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -37,6 +37,7 @@ public:
 void testN823651();
 void testFdo36868();
 void testListNolevel();
+void testCp139();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -65,6 +66,7 @@ void Test::run()
 {"n823651.doc", &Test::testN823651},
 {"fdo36868.doc", &Test::testFdo36868},
 {"list-nolevel.doc", &Test::testListNolevel},
+{"cp139.doc", &Test::testCp139},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -284,6 +286,12 @@ void Test::testListNolevel()
 CPPUNIT_ASSERT_EQUAL(OUString("1."), aText);
 }
 
+void Test::testCp139()
+{
+// This was RTL_TEXTENCODING_SYMBOL, causing "1" rendered as a placeholder 
rectangle.
+CPPUNIT_ASSERT_EQUAL(sal_Int16(RTL_TEXTENCODING_DONTKNOW), 
getProperty(getRun(getParagraph(1), 1), "CharFontCharSet"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 49fd40e..8b399d1 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3350,6 +3350,11 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, 
FontFamily& reFamily,
 // pF->ff : Family
 sal_uInt8 b = pF->ff;
 
+// Make sure charset is not set in case of Symbol, otherwise in case a
+// character is missing in our OpenSymbol, the character won't be replaced.
+if (reCharSet == RTL_TEXTENCODING_SYMBOL && rName == "Symbol")
+reCharSet = RTL_TEXTENCODING_DONTKNOW;
+
 // make sure Font Family Code is set correctly
 // at least for the most important fonts
 // ( might be set wrong when Doc was not created by
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac download.lst external/apr external/Module_external.mk external/serf Makefile.fetch postprocess/CustomTarget_registry.mk postp

[Matúš Kukan]

 Makefile.fetch |3 
 Repository.mk  |2 
 RepositoryExternal.mk  |   52 +++
 config_host.mk.in  |8 ++
 configure.ac   |   83 -
 download.lst   |6 +
 external/Module_external.mk|2 
 external/apr/ExternalProject_apr.mk|   37 +++
 external/apr/ExternalProject_apr_util.mk   |   40 
 external/apr/Makefile  |7 ++
 external/apr/Module_apr.mk |   19 +
 external/apr/README|5 +
 external/apr/UnpackedTarball_apr.mk|   14 
 external/apr/UnpackedTarball_apr_util.mk   |   22 ++
 external/apr/windows.build.patch.1 |   53 +++
 external/serf/ExternalProject_serf.mk  |   48 ++
 external/serf/Makefile |7 ++
 external/serf/Module_serf.mk   |   17 +
 external/serf/README   |4 +
 external/serf/UnpackedTarball_serf.mk  |   22 ++
 external/serf/windows.build.patch.1|   29 
 postprocess/CustomTarget_registry.mk   |2 
 postprocess/Rdb_services.mk|2 
 solenv/gbuild/ExternalProject.mk   |1 
 solenv/gbuild/platform/com_GCC_class.mk|1 
 solenv/gbuild/platform/com_MSC_class.mk|   10 +++
 ucb/Library_ucpdav1.mk |   55 
 ucb/Module_ucb.mk  |7 --
 ucb/source/ucp/webdav/ContentProperties.hxx|4 -
 ucb/source/ucp/webdav/PropertyMap.hxx  |4 -
 ucb/source/ucp/webdav/webdavcontent.cxx|4 -
 ucb/source/ucp/webdav/webdavresponseparser.cxx |4 -
 ucb/source/ucp/webdav/webdavservices.cxx   |   10 ---
 33 files changed, 529 insertions(+), 55 deletions(-)

New commits:
commit dcae0509135c2067635ae3cf84b05dc9fb3d2d02
Author: Matúš Kukan 
Date:   Tue Feb 25 21:47:33 2014 +0100

Build webdav based on serf if neon is disabled.

Change-Id: I0cbb89c8d5ac65eda8bb21aaf0d07996a015d281

diff --git a/Repository.mk b/Repository.mk
index 79d7089..5072b70 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -533,7 +533,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
textconv_dict \
ucb1 \
ucbhelper \
-   $(if $(DISABLE_NEON),,ucpdav1) \
+   $(if $(WITH_WEBDAV),ucpdav1) \
ucpfile1 \
ucpftp1 \
ucpchelp1 \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index eec50bd..a4daea7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1000,7 +1000,9 @@ gb_LinkTarget__use_liblangtag :=
 
 endif # ENABLE_LIBLANGTAG
 
-ifneq ($(DISABLE_NEON),)
+gb_ExternalProject__use_apr :=
+
+ifeq ($(WITH_WEBDAV),serf)
 
 define gb_LinkTarget__use_apr
 $(call gb_LinkTarget_set_include,$(1),\
@@ -1048,9 +1050,7 @@ endif
 
 endef
 
-else
-
-gb_ExternalProject__use_apr :=
+else ifeq ($(WITH_WEBDAV),neon)
 
 ifneq ($(SYSTEM_NEON),)
 
@@ -1088,7 +1088,7 @@ endef
 
 endif # SYSTEM_NEON
 
-endif # DISABLE_NEON
+endif # WITH_WEBDAV
 
 ifneq ($(SYSTEM_REDLAND),)
 
diff --git a/config_host.mk.in b/config_host.mk.in
index cbe2978..1c2d25b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -95,7 +95,6 @@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_EXPORT=@DISABLE_EXPORT@
-export DISABLE_NEON=@DISABLE_NEON@
 export DISABLE_OPENSSL=@DISABLE_OPENSSL@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
 export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@
@@ -607,6 +606,7 @@ export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
 export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
 export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
 export WITH_THEMES=@WITH_THEMES@
+export WITH_WEBDAV=@WITH_WEBDAV@
 export WORKDIR=@WORKDIR@
 export WORKDIR_FOR_BUILD=@WORKDIR_FOR_BUILD@
 export WORK_STAMP=@SOURCEVERSION@
diff --git a/configure.ac b/configure.ac
index 6c78067..cdae8b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -652,7 +652,6 @@ linux-android*)
 build_gstreamer=no
 build_gstreamer_0_10=no
 enable_lotuswordpro=no
-enable_neon=no
 enable_mpl_subset=yes
 enable_opengl=no
 enable_report_builder=no
@@ -1777,6 +1776,14 @@ AC_ARG_WITH(lpsolver,
 WITH_LPSOLVER=$withval,
 WITH_LPSOLVER="lpsolve")
 
+AC_ARG_WITH(webdav,
+AS_HELP_STRING([--with-webdav],
+[Specify which library to use for webdav implementation.
+ Possible values: "neon", "serf", "no". The default value is "neon".
+ Example: --with-webdav="serf"]),
+WITH_WEBDAV=$withval,
+WITH_WEBDAV="neon")
+
 AC_ARG_WITH(linker-hash-style,
 AS_HELP_S

Re: Current Build from Git: Writer-Wizards don't run

[Stephan Bergmann]

On 03/05/2014 08:28 AM, Jean-Baptiste Faure wrote:

It almost works for me this morning with Version: 4.3.0.0.alpha0+
Build ID: 0b2637dda47690da69f748119081151f41fe4133

Only the "documents converter" wizard does not start, all others start
as expected. It starts as expected in LO 4.2.3.0.0+.


..."does not start" meaning that "File - Wizards - Document 
Converter..." does nothing, not even open the "Document Converter" 
dialog?  Works at least for me we a fresh master build, Linux x86_64.


Stephan

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

Re: Current Build from Git: Writer-Wizards don't run

[Jean-Baptiste Faure]

Hi Stephan,

Le 06/03/2014 12:39, Stephan Bergmann a écrit :
> On 03/05/2014 08:28 AM, Jean-Baptiste Faure wrote:
>> It almost works for me this morning with Version: 4.3.0.0.alpha0+
>> Build ID: 0b2637dda47690da69f748119081151f41fe4133
>>
>> Only the "documents converter" wizard does not start, all others start
>> as expected. It starts as expected in LO 4.2.3.0.0+.
> 
> ..."does not start" meaning that "File - Wizards - Document
> Converter..." does nothing, not even open the "Document Converter"
> dialog?  

Yes. Even with a clean new user profile "File - Wizards - Document
Converter..." does nothing for me.
No error message in the terminal.
Will try a very complete rebuild next night (make distclean instead of
make clean).

Best regards.
JBF
-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Muthu Subramanian]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f8062328bc9c455b8e0cb406455b3af8f5ca6d11
Author: Muthu Subramanian 
Date:   Thu Mar 6 17:59:26 2014 +0530

Disable unit-test BackGraphicURL test temporarily.

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c51b58a..28a8bfd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2116,7 +2116,7 @@ DECLARE_OOXMLEXPORT_TEST(testTextBoxPictureFill, 
"textbox_picturefill.docx")
 {
 uno::Reference xFrame(getShape(1), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, 
getProperty(xFrame, "FillStyle"));
-
CPPUNIT_ASSERT(!(getProperty(xFrame,"BackGraphicURL")).isEmpty());
+
//CPPUNIT_ASSERT(!(getProperty(xFrame,"BackGraphicURL")).isEmpty());
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFDO73034, "FDO73034.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/qa

[Tor Lillqvist]

 ios/qa/sc/Makefile|  104 --
 ios/qa/sc/filters-test.m  |  177 ---
 ios/qa/sc/lo-qa-sc-filters-test-Info.plist|   45 --
 ios/qa/sc/lo-qa-sc-filters-test.xcodeproj/project.pbxproj |  216 --
 4 files changed, 542 deletions(-)

New commits:
commit f52dbb2d1de1135f6ef4adeb9703989d03d9775f
Author: Tor Lillqvist 
Date:   Thu Mar 6 14:31:27 2014 +0200

Bin ios/qa/sc, hasn't been tested for ages and surely doesn't build or work

Change-Id: Id4f527f7645544b32fbee33c7f3b275492a3c5f4

diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
deleted file mode 100644
index c493ae8..000
--- a/ios/qa/sc/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-include ../../../config_host.mk
-
-APP=lo-qa-sc-filters-test
-
-# If run from Xcode, check the CURRENT_ARCH env var for which platform we are
-# building, device or simulator
-
-ifneq (,$(filter i386,$(CC)))
-PLATFORM=iphonesimulator
-else
-PLATFORM=iphoneos
-endif
-
-APPDIR=build/Debug-$(PLATFORM)/$(APP).app
-
-# Stuff lifted from solenv/gbuild/platform/IOS_ARM_GCC.mk
-
-gb_OSDEFS := \
-   -D$(OS) \
-   -D_PTHREADS \
-   -DUNIX \
-   -DUNX \
-   -D_REENTRANT \
-   -DNO_PTHREAD_PRIORITY \
-   $(EXTRA_CDEFS) \
-
-gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch 
-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 -g
-gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
-gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
-
-gb_Library__FRAMEWORKS := \
-Foundation \
-CoreFoundation \
-CoreGraphics \
-CoreText \
-UIKit \
-
-SRCS = filters-test.m
-
-CFLAGS = $(SOLARINC)
-
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a 
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno 
lib/expwrap.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno 
lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, 
-lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data 
-lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh 
-ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo 
-lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 
-li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo 
-llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others 
-lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo 
-lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo 
-ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 
-lunoxmllo -luno_cp
 puhelper
 gcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo 
-lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , 
$(gb_Library__FRAMEWORKS)) -liconv -lobjc
-
-all: $(APPDIR)/$(APP) stuff
-
-$(APPDIR)/$(APP): $(SRCS)
-   mkdir -p $(APPDIR)
-   $(CXX) -Wl,-map,$(APP).map.mangled -o $@ $(gb_OSDEFS) $(CFLAGS) 
$(gb_OBJCXXFLAGS) $(SRCS) $(LIBS)
-   c++filt <$(APP).map.mangled >$(APP).map && rm $(APP).map.mangled
-
-stuff:
-# inifile:
-   echo 'URE_BOOTSTRAP=$${ORIGIN}/fundamentalrc' >$(APPDIR)/rc
-#
-# URE_BOOTSTRAP file, fundamentalrc:
-   ( \
-echo '[Bootstrap]'; \
-echo 'BRAND_BASE_DIR=$${ORIGIN}'; \
-echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry 
module:$${BRAND_BASE_DIR}/registry/modules res:$${BRAND_BASE_DIR}/registry' \
-   ) >$(APPDIR)/fundamentalrc
-
-#
-# An unorc is *mandatory*, sigh. We leave it empty except for the
-# [Bootstrap} section header, though, and set all the stuff using
-# -env: options in filters-test.m. Whether that makes sense or not,
-# no idea. The ideal would clearly be if *none* of the various rc
-# files was mandatory, and the code would automatically use sane
-# defaults. (Sane for the particular platform, that is.)
-   ( \
-echo '[Bootstrap]' \
-   ) >$(APPDIR)/unorc
-#
-# hmm, once again, a hodgepodge of stuff, I don't really know which
-# files of which are actually needed...
-   mkdir -p $(APPDIR)/registry/res
-   mv $(APPDIR)/registry/fcfg_langpack_en-US.xcd $(APPDIR)/registry/res
-#
-# .rdb files
-   cp $(INSTDIR)/ure/share/misc/types.rdb 
$(INSTDIR)/program/types/offapi.rdb $(INSTDIR)/program/services/services.rdb 
$(APPDIR)
-   mkdir -p $(APPDIR)/ure
-   cp $(INSTDIR)/ure/share/misc/types.rdb $(APPDIR)/ure
-#
-# a bunch of .component files
-   for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx 
ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml 
configmgr/source/configmgr basic/util/sb 
chart2/source/controller/chartcontroller chart2/source/chartcore 
comphelper/util/comphelp eventattacher/source/evtatt 
filter/source/config/cache/filterconfig1 oox/util/oox 
package/source/xstor/xstor package/util/pac

[Bug 45789] automatic row height in reports

[bugzilla-daemon]

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

Michal Strnad  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |high...@gmail.com
   |desktop.org |

-- 
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 38884] Improve Up/Down movement in writer

[bugzilla-daemon]

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

Michal Strnad  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |high...@gmail.com
   |desktop.org |

-- 
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: sal/osl

[Stephan Bergmann]

 sal/osl/unx/profile.cxx |   16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

New commits:
commit ebb4ac785f9d5278bc22405c0a3dc1c419af690d
Author: Stephan Bergmann 
Date:   Thu Mar 6 14:31:10 2014 +0100

coverity#1190347 check rename(3) return value

Change-Id: Iebd3b0e1b52a01e14e01c6db1ca158ada91e8613

diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 2ee461e..952e5e2 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -130,7 +130,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile);
 
 static sal_Bool writeProfileImpl (osl_TFile* pFile);
 static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl*);
-static sal_Bool osl_ProfileSwapProfileNames(osl_TProfileImpl*);
+static bool osl_ProfileSwapProfileNames(osl_TProfileImpl*);
 static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const 
sal_Char* pszExtension, sal_Char* pszTmpName, int BufferMaxLen);
 static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, 
oslProfileOption Flags);
 
@@ -2014,10 +2014,8 @@ static osl_TFile* 
osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
 return pFile;
 }
 
-static sal_Bool osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
+static bool osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
 {
-sal_Bool bRet = sal_False;
-
 sal_Char pszBakFile[PATH_MAX];
 sal_Char pszTmpFile[PATH_MAX];
 
@@ -2030,13 +2028,9 @@ static sal_Bool 
osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
 /* unlink bak */
 unlink( pszBakFile );
 
-/* rename ini bak */
-rename( pProfile->m_FileName, pszBakFile );
-
-/* rename tmp ini */
-rename( pszTmpFile, pProfile->m_FileName );
-
-return bRet;
+// Rename ini -> bak, then tmp -> ini:
+return rename( pProfile->m_FileName, pszBakFile ) == 0
+&& rename( pszTmpFile, pProfile->m_FileName ) == 0;
 }
 
 static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const 
sal_Char* pszExtension, sal_Char* pszTmpName, int BufferMaxLen)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl

[Stephan Bergmann]

 sal/osl/unx/profile.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 535b1dadc202ecb65510e846fe21652a84f3c07d
Author: Stephan Bergmann 
Date:   Thu Mar 6 14:46:29 2014 +0100

coverity#1190345 log failure to set CLOEXEC flag

Change-Id: Ia1678200393db0165711d4027f92a8be6b7f4ca5

diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 952e5e2..402bf9c 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define LINES_INI   32
 #define LINES_ADD   10
@@ -1221,7 +1222,10 @@ static osl_TFile* openFileImpl(const sal_Char* 
pszFilename, oslProfileOption Pro
 if ((Flags = fcntl(pFile->m_Handle, F_GETFD, 0)) != -1)
 {
 Flags |= FD_CLOEXEC;
-fcntl(pFile->m_Handle, F_SETFD, Flags);
+int e = fcntl(pFile->m_Handle, F_SETFD, Flags);
+SAL_INFO_IF(
+e != 0, "sal.osl",
+"fcntl to set FD_CLOEXEC failed for " << pszFilename);
 }
 
 pFile->m_pWriteBuf=0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sfx2/source/appl/appinit.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 2e29a518b04250b5f9cc9d0d77da3df076834d60
Author: Michael Stahl 
Date:   Thu Mar 6 13:43:21 2014 +0100

sfx2: ensure that no timers are running after SfxApplication dies

Timers may access global data that's tied to SfxApplication, and that
seems difficult to fix or prevent; the SfxApplication is deleted
before the main thread gets around to handling the PostUserEvent
sent by Application::Quit().

log from xmloff_unoapi:

==32095== Invalid read of size 8
==32095==at 0x934D245: Font::Font(Font const&) (font.cxx:239)
==32095==by 0x1FCEABDF: ImpEditEngine::FormatDoc() (impedit3.cxx:381)
[...]
==32095==by 0x1ED0F894: 
SdDrawDocument::LinkStubOnlineSpellingHdl(void*, void*) (drawdoc4.cxx:826)
==32095==by 0x911FECD: Link::Call(void*) const (link.hxx:123)
==32095==by 0x914F700: Timer::Timeout() (timer.cxx:224)
==32095==by 0x914F394: Timer::ImplTimerCallbackProc() (timer.cxx:121)
==32095==by 0x170B350A: SalTimer::CallCallback() (saltimer.hxx:53)
==32095==by 0x170B26C6: SvpSalInstance::CheckTimeout(bool) 
(svpinst.cxx:188)
==32095==by 0x170B2D25: SvpSalInstance::Yield(bool, bool) 
(svpinst.cxx:317)
==32095==by 0x91460DF: ImplYield(bool, bool) (svapp.cxx:363)
==32095==by 0x9142814: Application::Yield() (svapp.cxx:395)
==32095==by 0x91427C2: Application::Execute() (svapp.cxx:344)
==32095==by 0x4EC7589: desktop::Desktop::Main() (app.cxx:1680)
==32095==  Address 0x1d498b28 is 408 bytes inside a block of size 520 free'd
==32095==at 0x4A078DE: operator delete(void*) (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==32095==by 0x954CFE5: VirtualDevice::~VirtualDevice() (virdev.cxx:202)
==32095==by 0x1EE26F7D: SdModule::~SdModule() (sdmod.cxx:128)
==32095==by 0x1EE26FFD: SdModule::~SdModule() (sdmod.cxx:129)
==32095==by 0x65C9E47: SfxModule::DestroyModules_Impl() (module.cxx:327)
==32095==by 0x654116A: SfxApplication::~SfxApplication() (app.cxx:226)
==32095==by 0x6541249: SfxApplication::~SfxApplication() (app.cxx:244)
==32095==by 0x655E452: 
SfxTerminateListener_Impl::notifyTermination(com::sun::star::lang::EventObject 
const&) (appinit.cxx:121)
==32095==by 0x1B8A67A1: framework::Desktop::terminate() 
(desktop.cxx:343)

Change-Id: Ib70444c2b0fc60daa094323510d20b146a416087

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 3d9a8c3..5cbf85c 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -45,6 +45,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include "app.hrc"
@@ -106,6 +107,10 @@ void SAL_CALL 
SfxTerminateListener_Impl::notifyTermination( const EventObject& a
 SolarMutexGuard aGuard;
 utl::ConfigManager::storeConfigItems();
 
+// Timers may access the SfxApplication and are only deleted in
+// Application::Quit(), which is asynchronous (PostUserEvent) - disable!
+Timer::ImplDeInitTimer();
+
 SfxApplication* pApp = SFX_APP();
 pApp->Broadcast( SfxSimpleHint( SFX_HINT_DEINITIALIZING ) );
 pApp->Get_Impl()->pAppDispatch->ReleaseAll();
___
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/opencl-kernel-crash'

[Kohei Yoshida]

New branch 'private/kohei/opencl-kernel-crash' available with the following 
commits:
commit 4a2beb05f9e1bed4d34bd4a99191a6c95d962f66
Author: Kohei Yoshida 
Date:   Thu Mar 6 09:22:56 2014 -0500

This ScTokenArray is stored but not used. Remove it.

Not only that, it attempts to delete a non-cloned copy in the dtor, which
would lead to double deletion.

Change-Id: I3ce5266e894354a8cac5dffb5f350b942f463159

commit 30f31ef433490fd0f0e095972796638430c2c374
Author: Kohei Yoshida 
Date:   Wed Mar 5 21:39:10 2014 -0500

Separate the OpenCL kernel state flag to get it to function correctly.

It's better this way.

Change-Id: I293a51f0d180e21c35b0d310b9a6bda496ad7f45

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/formulagroup.hxx  |3 ++
 sc/source/core/data/formulacell.cxx  |   44 ---
 sc/source/core/tool/formulagroup.cxx |4 +++
 3 files changed, 23 insertions(+), 28 deletions(-)

New commits:
commit f62b4b6e45aa20b1b97d2ec0a0da5f9beb738d46
Author: Kohei Yoshida 
Date:   Wed Mar 5 18:47:07 2014 -0500

Fix incorrect group calc state check.

And the code in the else block is pretty dangerous as it passes an empty
token array to the group interpreter whose effect is entirely unpredictable.

Also, declare the destructor of CompiledFormula class to be virtual as it
serves as a base class for DynamicKernel.

Change-Id: I4e191550a4437ad6ebac55fcdeee4f3654722ff1
(cherry picked from commit 95637452609260c97d8e5aaa7500531bb458a8bc)
Reviewed-on: https://gerrit.libreoffice.org/8468
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 602c4a4..a3f1891 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -81,6 +81,9 @@ struct FormulaGroupContext : boost::noncopyable
  */
 class SC_DLLPUBLIC CompiledFormula
 {
+public:
+CompiledFormula();
+virtual ~CompiledFormula();
 };
 
 /**
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index d733525..71d55f7 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3678,38 +3678,26 @@ bool ScFormulaCell::InterpretFormulaGroup()
 if (mxGroup->mbInvariant && false)
 return InterpretInvariantFormulaGroup();
 
-if (mxGroup->meCalcState == sc::GroupCalcEnabled)
-{
-ScTokenArray aCode;
-ScAddress aTopPos = aPos;
-aTopPos.SetRow(mxGroup->mpTopCell->aPos.Row());
-ScGroupTokenConverter aConverter(aCode, *pDocument, *this, 
mxGroup->mpTopCell->aPos);
-if (!aConverter.convert(*pCode))
-{
-SAL_INFO("sc.opencl", "conversion of group " << this << " failed, 
disabling");
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
-mxGroup->meCalcState = sc::GroupCalcRunning;
-if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aCode))
-{
-SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state 
" << mxGroup->meCalcState << ") failed, disabling");
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
-mxGroup->meCalcState = sc::GroupCalcEnabled;
+ScTokenArray aCode;
+ScAddress aTopPos = aPos;
+aTopPos.SetRow(mxGroup->mpTopCell->aPos.Row());
+ScGroupTokenConverter aConverter(aCode, *pDocument, *this, 
mxGroup->mpTopCell->aPos);
+if (!aConverter.convert(*pCode))
+{
+SAL_INFO("sc.opencl", "conversion of group " << this << " failed, 
disabling");
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
 }
-else
+
+mxGroup->meCalcState = sc::GroupCalcRunning;
+if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aCode))
 {
-ScTokenArray aDummy;
-if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aDummy))
-{
-SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state 
" << mxGroup->meCalcState << ") failed, disabling");
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
+SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state " 
<< mxGroup->meCalcState << ") failed, disabling");
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
 }
 
+mxGroup->meCalcState = sc::GroupCalcEnabled;
 return true;
 }
 
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index f58f7dc..a611298 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -277,6 +277,10 @@ void fillMatrix( ScMatrix& rMat, size_t nCol, const 
double* pNums, rtl_uString**
 
 }
 
+CompiledFormula::CompiledFormula() {}
+
+CompiledFormula::~CompiledFormula() {}
+
 FormulaGroupInterpreterSoftware::FormulaGroupInterpreterSoftware() : 
FormulaGroupInterpreter()
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 38890] Remove hard-coded project URLs

[bugzilla-daemon]

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

--- Comment #3 from Petr Basl  ---
I would like to take this bug, if possible.

-- 
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: 3 commits - android/experimental ios/CustomTarget_MobileLibreOffice_app.mk ios/CustomTarget_TiledLibreOffice_app.mk ios/Executable_LibreOffice.mk solenv/bin

[Matúš Kukan]

 android/experimental/DocumentLoader/Makefile  |2 
 android/experimental/LibreOffice4Android/Makefile |2 
 android/experimental/desktop/Makefile |2 
 ios/CustomTarget_MobileLibreOffice_app.mk |2 
 ios/CustomTarget_TiledLibreOffice_app.mk  |2 
 ios/Executable_LibreOffice.mk |2 
 solenv/bin/native-code.py |   92 --
 7 files changed, 23 insertions(+), 81 deletions(-)

New commits:
commit 18ea4fea4f4843c64e05827443f76122c1aed90e
Author: Matúš Kukan 
Date:   Thu Mar 6 14:23:57 2014 +0100

Add components needed for editing a document in android/desktop app.

As new 'edit' group because they are not needed in view-only
TiledLibreOffice_app. Although, probably there are more components
in 'core' which should be in 'edit' too, who knows, sigh.

Change-Id: I1efebc9884662a5d25744a3414717aa410350ef4

diff --git a/android/experimental/desktop/Makefile 
b/android/experimental/desktop/Makefile
index 3419eb1..df9a24f 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< -j \
-   -g core -g writer \
+   -g core -g edit -g writer \
> $@
 
 # The name of the Bootstrap activity class
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 56c0c71..4bd729b 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -108,6 +108,16 @@ core_constructor_list = [
 "XMLVersionListPersistence_get_implementation",
 ]
 
+# edit group for apps, where you can edit documents
+edit_factory_list = [
+]
+
+edit_constructor_list = [
+
"com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation",
+"com_sun_star_i18n_InputSequenceChecker_get_implementation",
+"com_sun_star_i18n_OrdinalSuffix_get_implementation",
+]
+
 calc_factory_list = [
 ("libscdlo.a", "scd_component_getFactory"),
 ("libscfiltlo.a", "scfilt_component_getFactory"),
@@ -138,6 +148,7 @@ writer_constructor_list = [
 
 factory_map = {
 'core' : core_factory_list,
+'edit' : edit_factory_list,
 'calc' : calc_factory_list,
 'draw' : draw_factory_list,
 'writer' : writer_factory_list,
@@ -145,6 +156,7 @@ factory_map = {
 
 constructor_map = {
 'core' : core_constructor_list,
+'edit' : edit_constructor_list,
 'calc' : calc_constructor_list,
 'draw' : draw_constructor_list,
 'writer' : writer_constructor_list,
commit b0ac763d13369f41b90d789287b375f57c744eff
Author: Matúš Kukan 
Date:   Thu Mar 6 13:46:02 2014 +0100

native-code: Remove foo_core groups, now only 'core' and 'writer' are used.

Also remove extended_core group. If something from there will be
needed, we will add it another way.
Currently only android/experimental/desktop/Makefile and
ios/CustomTarget_TiledLibreOffice_app.mk are known to do something.

Change-Id: I99936075e35ce98d684581838c0a19dccd83f942

diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index c928664..14de6fe 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< \
-   -g extended_core -g writer \
+   -g core -g writer \
> $@
 
 copy-stuff:
diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index 3a66f71..9bcfc18 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -14,7 +14,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< \
-   -g extended_core -g writer \
+   -g core -g writer \
> $@
 
 copy-stuff:
diff --git a/android/experimental/desktop/Makefile 
b/android/experimental/desktop/Makefile
index d75b8f7..3419eb1 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< -j \
-   -g core -g writer_core \
+   -g core -g writer \
> $@
 
 # The name of the Bootstrap activity class
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk 
b/ios/CustomTarget_MobileLibreOffice_app.mk
index ec59df0..2e4b6db 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,ios/MobileLibreOffice): 
$(call gb_CustomTarget
 #

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

[Kohei Yoshida]

 sc/source/filter/xml/xmlexprt.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit b6df2950db8394e6bd73fe708dbc20f3d8f4e5c2
Author: Kohei Yoshida 
Date:   Fri Feb 14 11:41:02 2014 -0500

fdo#72390: Let's not skip auto styles from unmodified sheets.

We do re-use sheet XML stream for unmodified sheets on re-save, which
is okay.  But skipping auto style population from unmodified sheets
is not okay because autostyles are shared across all sheets and written
outside the sheet XML streams. Skipping styles from unmodified sheets
could potentially fail to export used styles, not to mention could
cause a crash as reported in the bug.

Change-Id: I73e439f7354e341c2c07e28ecca5452193985860
(cherry picked from commit 5000e64ecc55efd47d92714cf6db375ff37aac4b)
(cherry picked from commit 47e540d8323e8ea2db5e7aae455503b32f306ca3)
Reviewed-on: https://gerrit.libreoffice.org/8051
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 09dc864..4b09c3b 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2322,10 +2322,6 @@ void ScXMLExport::_ExportAutoStyles()
 CollectShapesAutoStyles(nTableCount);
 for (sal_Int32 nTable = 0; nTable < nTableCount; ++nTable, 
IncrementProgressBar(false))
 {
-bool bUseStream = pSheetData && pDoc && 
pDoc->IsStreamValid((SCTAB)nTable) &&
-  pSheetData->HasStreamPos(nTable) && 
xSourceStream.is() &&
-  !pDoc->GetChangeTrack();
-
 Reference  xTable(xIndex->getByIndex(nTable), 
uno::UNO_QUERY);
 if (!xTable.is())
 continue;
@@ -2344,9 +2340,6 @@ void ScXMLExport::_ExportAutoStyles()
 }
 }
 
-if (bUseStream)
-continue;
-
 // collect other auto-styles only for non-copied sheets
 Reference 
xCellFormatRanges ( xTable, uno::UNO_QUERY );
 if ( xCellFormatRanges.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/inc/DummyXShape.hxx |   14 --
 chart2/source/view/main/DummyXShape.cxx|   15 ++-
 chart2/source/view/main/OpenGLRender.cxx   |   14 ++
 chart2/source/view/main/OpenglShapeFactory.cxx |   51 ++---
 4 files changed, 50 insertions(+), 44 deletions(-)

New commits:
commit 95d70e56c7ed7f1308cee97290c8cf262cd015b2
Author: Markus Mohrhard 
Date:   Thu Mar 6 15:55:36 2014 +0100

initial work on rotation for text shapes

Change-Id: I5752884efd32711f9ac2257a9223eb79c04e8335

diff --git a/chart2/source/view/inc/DummyXShape.hxx 
b/chart2/source/view/inc/DummyXShape.hxx
index 4769a3a..1d2eba6 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -333,7 +333,7 @@ class DummyText : public DummyXShape
 public:
 DummyText(const OUString& rText, const tNameSequence& rNames,
 const tAnySequence& rValues, const uno::Any& rTrans, 
com::sun::star::uno::Reference<
-com::sun::star::drawing::XShapes > xTarget);
+com::sun::star::drawing::XShapes > xTarget, double nRotation);
 
 virtual void render() SAL_OVERRIDE;
 
diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index c359595..9f8db07 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -784,9 +784,10 @@ private:
 }
 
 DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
-const tAnySequence& rValues, const uno::Any& rTrans, uno::Reference< 
drawing::XShapes > xTarget ):
+const tAnySequence& rValues, const uno::Any& rTrans, uno::Reference< 
drawing::XShapes > xTarget, double nRotation ):
 maText(rText),
-maTrans(rTrans)
+maTrans(rTrans),
+mnRotation(nRotation)
 {
 setProperties(rNames, rValues, maProperties);
 
@@ -857,8 +858,8 @@ void DummyText::render()
 {
 aTransformation = maTrans.get();
 }
-pChart->m_GLRender.CreateTextTexture(maBitmap, maPosition, maSize, 0,
-aTransformation);
+pChart->m_GLRender.CreateTextTexture(maBitmap, maPosition, maSize,
+mnRotation, aTransformation);
 pChart->m_GLRender.RenderTextShape();
 }
 
diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 24277b7..dff7ff9 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1318,12 +1318,6 @@ int OpenGLRender::CreateTextTexture(const BitmapEx& 
rBitmapEx, const awt::Point&
 aTextInfo.bmpWidth = bmpWidth;
 aTextInfo.bmpHeight = bmpHeight;
 
-//if has ratotion, we must re caculate the central pos
-if (!rtl::math::approxEqual(0, rotation))
-{
-// handle rotation
-}
-
 CHECK_GL_ERROR();
 glGenTextures(1, &aTextInfo.texture);
 CHECK_GL_ERROR();
@@ -1353,7 +1347,11 @@ int OpenGLRender::RenderTextShape()
 {
 TextInfo &textInfo = m_TextInfoList.front();
 PosVecf3 trans = { (float)-textInfo.bmpWidth/2.0f, 
(float)-textInfo.bmpHeight/2.0f, 0};
-PosVecf3 angle = {0.0f, 0.0f, float(textInfo.rotation)};
+if(0.0 != textInfo.rotation)
+{
+SAL_WARN("chart2.opengl", "rotation: " << textInfo.rotation);
+}
+PosVecf3 angle = {0.0f, float(textInfo.rotation), 
float(textInfo.rotation)};
 PosVecf3 scale = {1.0, 1.0, 1.0f};
 MoveModelf(trans, angle, scale);
 m_MVP = m_Projection * m_View * m_Model;
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx 
b/chart2/source/view/main/OpenglShapeFactory.cxx
index 4843fe3..93e4084 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -403,7 +403,7 @@ uno::Reference< drawing::XShape >
 , const uno::Any& rATransformation )
 {
 dummy::DummyText* pText = new dummy::DummyText( rText, rPropNames, 
rPropValues,
-rATransformation, xTarget );
+rATransformation, xTarget, 0 );
 xTarget->add(pText);
 return pText;
 }
@@ -451,7 +451,7 @@ uno::Reference< drawing::XShape >
 aM.translate( nXPos, nYPos );
 
 dummy::DummyText* pText = new dummy::DummyText(aString, aPropNames, 
aPropValues,
-uno::makeAny(B2DHomMatrixToHomogenMatrix3(aM)), xTarget);
+uno::makeAny(B2DHomMatrixToHomogenMatrix3(aM)), xTarget, 
nRotation);
 pText->setName(rName);
 xTarget->add(pText);
 return pText;
commit ceb284f51fc9b26db2cdda1e01e21824317ffc50
Author: Markus Mohrhard 
Date:   Thu Mar 6 15:50:47 2014 +0100

fix OpenGL error when line width is 0

Change-Id: Ifc70c632b1f26f77c253edb17cd0b29715389614

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 55ce9d5..24277b7 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -675,7 +675,7 @@ OpenGLRend

export validation testing in unit tests

[Markus Mohrhard]

Hey,

so this is mostly for our tinderbox maintainers and people working on ODF
and OOXML export filters.

I recently added OOXML export validation to calc's export test and plan to
do the same for ODF soon. If you build with --with-export-validation the
code for this feature will be enabled.

Additionally you need officeotron [1] and a script similar to the one that
I attach in your path. The script should just forward the parameter to
officeotron and deal with the java parts.

It would be nice to enable this feature on some tinderboxes to prevent
validation errors in the future.

I plan to add the same support for odf validator during the weekend and
enable it in writer.

Regards,
Markus

[1] https://code.google.com/p/officeotron/


officeotron
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Muthu Subramanian]

 include/oox/helper/modelobjecthelper.hxx |4 
 oox/source/drawingml/shape.cxx   |7 +++
 oox/source/helper/modelobjecthelper.cxx  |   15 +++
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 4 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit f1d1c9a6529d575ba3f65872e5ae9e7ac381c6b7
Author: Muthu Subramanian 
Date:   Thu Mar 6 21:21:43 2014 +0530

n#821567: Fix TextFrame background import for sw.

TextFrame in sw unfortunately doesn't seem to
support nametable!

diff --git a/include/oox/helper/modelobjecthelper.hxx 
b/include/oox/helper/modelobjecthelper.hxx
index e57e014..2ced973 100644
--- a/include/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
@@ -48,6 +48,8 @@ public:
 /** Returns true, if the object with the passed name exists in the 
container. */
 boolhasObject( const OUString& rObjName ) const;
 
+::com::sun::star::uno::Any getObject( const OUString& rObjName ) const;
+
 /** Inserts the passed object into the container, returns its final name. 
*/
 OUString insertObject(
 const OUString& rObjName,
@@ -104,6 +106,8 @@ public:
 an internal constant name with a new unused index appended. */
 OUString insertFillBitmapUrl( const OUString& rGraphicUrl );
 
+OUString getFillBitmapUrl( const OUString& rGraphicName );
+
 private:
 ObjectContainer maMarkerContainer;  ///< Contains all named line 
markers (line end polygons).
 ObjectContainer maDashContainer;///< Contains all named line 
dsahes.
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 883d76f..7d3b0dc 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -35,6 +35,7 @@
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/helper/graphichelper.hxx"
 #include "oox/helper/propertyset.hxx"
+#include "oox/helper/modelobjecthelper.hxx"
 
 #include 
 #include 
@@ -691,6 +692,12 @@ Reference< XShape > Shape::createAndInsert(
 aShapeProps.setProperty(PROP_BackGraphicURL, 
aShapeProps.getProperty(PROP_FillBitmapURL));
 aShapeProps.erase(PROP_FillBitmapURL);
 }
+if (aShapeProps.hasProperty(PROP_FillBitmapName))
+{
+uno::Any aAny = aShapeProps[PROP_FillBitmapName];
+aShapeProps.setProperty(PROP_BackGraphicURL, 
rFilterBase.getModelObjectHelper().getFillBitmapUrl( aAny.get() ));
+// aShapeProps.erase(PROP_FillBitmapName);  // Maybe, 
leave the name as well
+}
 // And no LineColor property; individual borders can have 
colors
 if (aShapeProps.hasProperty(PROP_LineColor))
 {
diff --git a/oox/source/helper/modelobjecthelper.cxx 
b/oox/source/helper/modelobjecthelper.cxx
index 5a966fe..1ec45af 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -56,6 +56,13 @@ bool ObjectContainer::hasObject( const OUString& rObjName ) 
const
 return mxContainer.is() && mxContainer->hasByName( rObjName );
 }
 
+Any ObjectContainer::getObject( const OUString& rObjName ) const
+{
+if( hasObject( rObjName ) )
+return mxContainer->getByName( rObjName );
+return Any();
+}
+
 OUString ObjectContainer::insertObject( const OUString& rObjName, const Any& 
rObj, bool bInsertByUnusedName )
 {
 createContainer();
@@ -132,6 +139,14 @@ OUString ModelObjectHelper::insertFillBitmapUrl( const 
OUString& rGraphicUrl )
 return OUString();
 }
 
+OUString ModelObjectHelper::getFillBitmapUrl( const OUString &rGraphicName )
+{
+Any aAny = maBitmapUrlContainer.getObject( rGraphicName );
+if( aAny.hasValue() )
+return aAny.get();
+return OUString();
+}
+
 
 
 } // namespace oox
commit ad737e7ff4bf12d8b66ceb2001aebf54ff5badba
Author: Muthu Subramanian 
Date:   Thu Mar 6 18:16:46 2014 +0530

Re-enable the unit test (BackGraphicURL).

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 28a8bfd..c51b58a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2116,7 +2116,7 @@ DECLARE_OOXMLEXPORT_TEST(testTextBoxPictureFill, 
"textbox_picturefill.docx")
 {
 uno::Reference xFrame(getShape(1), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, 
getProperty(xFrame, "FillStyle"));
-
//CPPUNIT_ASSERT(!(getProperty(xFrame,"BackGraphicURL")).isEmpty());
+
CPPUNIT_ASSERT(!(getProperty(xFrame,"BackGraphicURL")).isEmpty());
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFDO73034, "FDO73034.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Bjoern, Eike, Christian, Norbert, Kendy, Jacobo, Kohei, Markus,
  David, Andras, Michael M, Miklos, Stephan, Stefan, Caolan
 
* Completed Action Items
+ fixup spell-checking in master (Norbert)
+ replace 'ProposedEasyHack' with 'NeedsDevEval' (Robinson?)
+ upgrade crashtest box to F20 (Cloph)
+ This did not fix the problem unfortunately
 
* Pending Action Items:
+ crashtest box - more research (Moggi/Cloph)
+ run certification script (Kendy)
+ will try filing a lot of small string changes as easy hacks (Astron)
+ review HiDPI branch for 4.2 (Kendy, Michael, Caolan)
[ in progress, squashing work into a smaller set, and pending branch ]
+ talk with Thorsten wrt. ODF TC representation (Michael S / Andras)
[ to schedule a call next week ]
 
* Release Engineering update (Christian)
+ 4.2.2 status
+ RC done, to be announced after CeBIT
+ 4.2.3 deadline: Monday / March 10th
+ RC1 next Monday - 10th March
+ Android / iOS remote
+ new releases to be released soon
+ including new laser-pointer and Gallic translation
+ will make a new public Android / beta-testing build
  available soon; will publishe when iOS ver is approved
 
* UX update (Astron)
+ Bjoern initiated a contact with MPT
+ conference logo discussion
 
* GSoC update (Cedric)
+ applications from March 10th -> 21st.
+ next week!
+ please consider what you are able to mentor:
+ https://wiki.documentfoundation.org/Development/GSoC/Ideas
+ mentors registered on melange
 
* OOXML Strict namespaces (Markus)
+ import issues caused by namespace handling bits
+ most of the import issues solved now
+ Calc works mostly fine now
+ Miklos will have a look at Writer
+ export
+ would be good to get rid of the URL handling
+ and only use tokens
+ URLs to be moved to a shared code
+ not to be done soon
 
* Crashtest update (Markus)
+ no new crash-test / data etc.
+ kernel bug on the crash-testing VM
+ still pending on this :-(
+ we have incomplete result - 16k docs
+ 
http://dev-builds.libreoffice.org/crashtest/2f4db1cf6eaf28fc5907dca4870368ea4b67fbc0/
 
* Certification update (Kendy/Bjoern/Stephan)
+ we should start a new round; need to run the script etc.
 
* sal ABI & mem / align fix back-port (Kohei)
+ Kohei found a solution without sal patch
+ we want a stable ABI that is forward moving (Stephan)
   + in this case, we could add these symbols.
   + but we want a linear ordering of increase in section
 numbering and consistency.
   + don't want to increase maintenance cost by un-necessarily
 increasing it; worth thinking twice before adding stuff.
+ but sensible change always possible, of course.
 
* https://bugs.freedesktop.org/show_bug.cgi?id=70422 (Kendy)
+ Easy Hack to move huge amount of files in Writer
+ we've got a patch for that in gerrit, but I think this shouldn't be 
handled via gerrit
+ error prone - this should be an atomic git mv
+ and do we want / need to do this at all?
+ confusion wrt. what belongs to ui part, what to core (Miklos)
+ include files have moved, and no problem for cherry-picking (Caolan)
+ Kendy to CC Miklos in the gerrit to have a look / do it
 
* Gran Canaria hack-fest (Bjoern)
+ April 24-25, 2014 (Thu-Fri)
+ announce / start booking flights now
+ Bjoern will send a mail to the ML
+ ~16 developers
 
* OOXML export validation
+ tinderebox maintainer need to enable validation, at least on few boxes
+ Markus will write a mail
 
* Certification update (Kendy/Bjoern/Stephan)
+ we should start a new round; need to run the script etc.
 
* QA (Robinson/Bjoern)
+ Bugzilla Migration update
+ did get briefly in touch with Tollef.
+ hope to make progress wrt. migration
+ preparatory VM status >
+ Confusion over whiteboard status 'ProposedEasyHack'
   + confusing it with EasyHack
   => will replace with 'NeedsDevEval'
 
* QA stats:
 
  + https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html
+167-239(-72 overall)
many thanks to the top bug squashers:
QA Administrators   119
Joel Madero 19
sophie  13
Foss 8
Maxim Monastirsky7
m.a.riosv7
Jean-Baptiste Faure  5
Xisco Faulí  5
Eike Rathke  5
Kohei Yoshida5
 
* Open 4.3 MAB
  + 1/1
  + https://bugs.freedesktop.org/showdependencytree.cgi?id=75025&hide_resolved=1
 
* Open 4.2 MAB
  + 18/104 17/102 17/99 18/97 19/95 18/85 17/70 17/65 17/59 21/58 15/45 14/38
 17%16%17%   18%   20%   21%   24%   26%   28%   36%   33%   37%
  + https://bugs.freedesktop.org/showdependencytree.cgi?id=65675&hide_resolved=1
 

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

[Muthu Subramanian]

 oox/source/drawingml/shape.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 72a029dd2e6aad242ed53c56b891aa593e2db33f
Author: Muthu Subramanian 
Date:   Thu Mar 6 21:38:44 2014 +0530

Replace [] with getProperty()

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 7d3b0dc..3487b31 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -694,7 +694,7 @@ Reference< XShape > Shape::createAndInsert(
 }
 if (aShapeProps.hasProperty(PROP_FillBitmapName))
 {
-uno::Any aAny = aShapeProps[PROP_FillBitmapName];
+uno::Any aAny = 
aShapeProps.getProperty(PROP_FillBitmapName);
 aShapeProps.setProperty(PROP_BackGraphicURL, 
rFilterBase.getModelObjectHelper().getFillBitmapUrl( aAny.get() ));
 // aShapeProps.erase(PROP_FillBitmapName);  // Maybe, 
leave the name as well
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 vcl/source/control/ilstbox.cxx |8 +---
 vcl/source/control/lstbox.cxx  |   14 --
 2 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit e4d8bf74267ef8bf618f3e88d74f8b8c5e580cb1
Author: Eike Rathke 
Date:   Thu Mar 6 17:14:14 2014 +0100

ReadShortRes() actually reads a wannabe unsigned here

Insert Hyperlink dialog crashed, for example.
Plus some more sanity checks to guard against negative listbox positions
passed.

Change-Id: I6458df6aab3abebfaf64d767013b57db76872eec

diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index d57c54f..4c0ba9d 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -326,12 +326,14 @@ long ImplEntryList::GetAddedHeight( sal_Int32 
i_nEndIndex, sal_Int32 i_nBeginInd
 sal_Int32 nStart = i_nEndIndex > i_nBeginIndex ? i_nBeginIndex : 
i_nEndIndex;
 sal_Int32 nStop  = i_nEndIndex > i_nBeginIndex ? i_nEndIndex : 
i_nBeginIndex;
 sal_Int32 nEntryCount = GetEntryCount();
-if( nStop != LISTBOX_ENTRY_NOTFOUND && nEntryCount != 0 )
+if( 0 <= nStop && nStop != LISTBOX_ENTRY_NOTFOUND && nEntryCount != 0 )
 {
 // sanity check
 if( nStop > nEntryCount-1 )
 nStop = nEntryCount-1;
-if( nStart > nEntryCount-1 )
+if (nStart < 0)
+nStart = 0;
+else if( nStart > nEntryCount-1 )
 nStart = nEntryCount-1;
 
 sal_Int32 nIndex = nStart;
@@ -1735,7 +1737,7 @@ void ImplListBoxWindow::ImplPaint( sal_Int32 nPos, bool 
bErase, bool bLayout )
 aRect.Left() -= mnLeft;
 if ( nPos < GetEntryList()->GetMRUCount() )
 nPos = GetEntryList()->FindEntry( GetEntryList()->GetEntryText( 
nPos ) );
-nPos = sal::static_int_cast(nPos - 
GetEntryList()->GetMRUCount());
+nPos = nPos - GetEntryList()->GetMRUCount();
 sal_Int32 nCurr = mnCurrentPos;
 if ( mnCurrentPos < GetEntryList()->GetMRUCount() )
 nCurr = GetEntryList()->FindEntry( GetEntryList()->GetEntryText( 
nCurr ) );
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 7c802d9..bf6c15b 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -195,8 +195,10 @@ void ListBox::ImplLoadRes( const ResId& rResId )
 {
 Control::ImplLoadRes( rResId );
 
-sal_Int32 nSelPos = ReadShortRes();
-sal_Int32 nNumber = sal::static_int_cast(ReadLongRes());
+// The resource short is actually to be treated as unsigned short.
+sal_uInt16 nResPos = static_cast(ReadShortRes());
+sal_Int32 nSelPos = (nResPos == SAL_MAX_UINT16) ? LISTBOX_ENTRY_NOTFOUND : 
nResPos;
+sal_Int32 nNumber = ReadLongRes();
 
 for( sal_Int32 i = 0; i < nNumber; i++ )
 {
@@ -1044,7 +1046,7 @@ sal_Int32 ListBox::GetEntryPos( const OUString& rStr ) 
const
 {
 sal_Int32 nPos = mpImplLB->GetEntryList()->FindEntry( rStr );
 if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-nPos = sal::static_int_cast(nPos - 
mpImplLB->GetEntryList()->GetMRUCount());
+nPos = nPos - mpImplLB->GetEntryList()->GetMRUCount();
 return nPos;
 }
 
@@ -1052,7 +1054,7 @@ sal_Int32 ListBox::GetEntryPos( const void* pData ) const
 {
 sal_Int32 nPos = mpImplLB->GetEntryList()->FindEntry( pData );
 if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-nPos = sal::static_int_cast(nPos - 
mpImplLB->GetEntryList()->GetMRUCount());
+nPos = nPos - mpImplLB->GetEntryList()->GetMRUCount();
 return nPos;
 }
 
@@ -1083,7 +1085,7 @@ sal_Int32 ListBox::GetSelectEntryPos( sal_Int32 nIndex ) 
const
 {
 if ( nPos < mpImplLB->GetEntryList()->GetMRUCount() )
 nPos = mpImplLB->GetEntryList()->FindEntry( 
mpImplLB->GetEntryList()->GetEntryText( nPos ) );
-nPos = sal::static_int_cast(nPos - 
mpImplLB->GetEntryList()->GetMRUCount());
+nPos = nPos - mpImplLB->GetEntryList()->GetMRUCount();
 }
 return nPos;
 }
@@ -1105,7 +1107,7 @@ void ListBox::SelectEntry( const OUString& rStr, bool 
bSelect )
 
 void ListBox::SelectEntryPos( sal_Int32 nPos, bool bSelect )
 {
-if ( nPos < mpImplLB->GetEntryList()->GetEntryCount() )
+if ( 0 <= nPos && nPos < mpImplLB->GetEntryList()->GetEntryCount() )
 {
 sal_Int32 oldSelectCount = GetSelectEntryCount(), newSelectCount = 0, 
nCurrentPos = mpImplLB->GetCurrentPos();
 mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), 
bSelect );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst|4 
 source/text/shared/01/password_dlg.xhp  |8 
 source/text/shared/01/password_main.xhp |9 +++--
 3 files changed, 7 insertions(+), 14 deletions(-)

New commits:
commit 70414f0a347073ad19f0fa6b73b5ff0573fd45cf
Author: Caolán McNamara 
Date:   Thu Mar 6 15:37:55 2014 +

update helpids for open password dialog .ui conversion

Change-Id: Ia04bf7951a1b0ec71bee37d92912eec179843283

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 592a65c..441c098 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1434,7 +1434,6 @@ HID_DLG_NAME,33818,
 HID_DLG_NEWERVERSIONWARNING,35848,
 HID_DLG_PASSWD_SECTION,53440,
 HID_DLG_PASSWORD,38964,
-HID_DLG_PASSWORD_UUI,35843,
 HID_DLG_QRY_HELPTEXT,38860,
 HID_DLG_QRY_JOIN,38855,
 HID_DLG_QRY_JOINTYPE,38856,
@@ -6720,9 +6719,6 @@ uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PASSWORD,1311344669,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PATH,1311344662,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_USERNAME,1311344666,
 uui_Edit_DLG_UUI_MASTERPASSWORD_ED_MASTERPASSWORD,1311508501,
-uui_Edit_DLG_UUI_PASSWORD_CRT_ED_PASSWORD_CRT,1311688706,
-uui_Edit_DLG_UUI_PASSWORD_CRT_ED_PASSWORD_REPEAT,1311688709,
-uui_Edit_DLG_UUI_PASSWORD_ED_PASSWORD,1311672322,
 uui_ListBox_DLG_FILTER_SELECT_LB_FILTERS,1311477279,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_CANCEL,1311363614,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_OK,1311363615,
diff --git a/source/text/shared/01/password_dlg.xhp 
b/source/text/shared/01/password_dlg.xhp
index f5d47dd..6151689 100644
--- a/source/text/shared/01/password_dlg.xhp
+++ b/source/text/shared/01/password_dlg.xhp
@@ -41,16 +41,16 @@
 
 
 
-
+
 
-
+
 Password
  Type a password. A 
password is case sensitive.
 
 
 
-
+
 
 Confirm
diff --git a/source/text/shared/01/password_main.xhp 
b/source/text/shared/01/password_main.xhp
index 85c48a1..7042429 100644
--- a/source/text/shared/01/password_main.xhp
+++ b/source/text/shared/01/password_main.xhp
@@ -52,16 +52,13 @@

 
  
-
-
 Master password
- Type a master password to 
prevent unauthorized users from accessing stored passwords.
-
+ Type a 
master password to prevent unauthorized users from accessing stored 
passwords.
 Confirm master password
- Re-enter the 
master password.
+ Re-enter the master 
password.
   
   
  
   

-
\ No newline at end of file
+
commit b4f6cd5e44fc4ec8b2ade32605874d944ec0b003
Author: Caolán McNamara 
Date:   Thu Mar 6 14:42:14 2014 +

update help ids for password dialog .ui conversion

Change-Id: I6cf027d748605b57c2c8997334902ea21c5d6ae3

diff --git a/source/text/shared/01/password_dlg.xhp 
b/source/text/shared/01/password_dlg.xhp
index 474c576..f5d47dd 100644
--- a/source/text/shared/01/password_dlg.xhp
+++ b/source/text/shared/01/password_dlg.xhp
@@ -58,7 +58,7 @@
  Undoing password protection
  To remove a password, open the document, then save 
without password.
-
+
  Click to show or hide the file 
sharing password options.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit bb369166bc602dcc2824d2fc3d75e00bcf8388d6
Author: Caolán McNamara 
Date:   Thu Mar 6 15:37:55 2014 +

Updated core
Project: help  70414f0a347073ad19f0fa6b73b5ff0573fd45cf

diff --git a/helpcontent2 b/helpcontent2
index d3f2d4d..70414f0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d3f2d4de7630cf42bb6328c9da22e1c9f552d742
+Subproject commit 70414f0a347073ad19f0fa6b73b5ff0573fd45cf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Current Build from Git: Writer-Wizards don't run

[Caolán McNamara]

On Thu, 2014-03-06 at 13:24 +0100, Jean-Baptiste Faure wrote:
> Hi Stephan,
> 
> Le 06/03/2014 12:39, Stephan Bergmann a écrit :
> > On 03/05/2014 08:28 AM, Jean-Baptiste Faure wrote:
> >> It almost works for me this morning with Version: 4.3.0.0.alpha0+
> >> Build ID: 0b2637dda47690da69f748119081151f41fe4133
> >>
> >> Only the "documents converter" wizard does not start, all others start
> >> as expected. It starts as expected in LO 4.2.3.0.0+.
> > 
> > ..."does not start" meaning that "File - Wizards - Document
> > Converter..." does nothing, not even open the "Document Converter"
> > dialog?  

Do you have a ~/Templates dir ? I bet you don't.

caolanm->sberg: Try removing your own ~/Templates dir and see if that
reproduces it for you. This might be related to the nagging worry I had
about 768ea2924680fc4beb75a782cb0faf26695fee53 

C.

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

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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx   |1 
 writerfilter/source/doctok/resources.xmi   |   31 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 -
 3 files changed, 1 insertion(+), 33 deletions(-)

New commits:
commit 61238e11837c6a25666a1edbf4914c27b53a310b
Author: Miklos Vajna 
Date:   Thu Mar 6 18:07:49 2014 +0100

writerfilter: convert sprm:PFWidowControl

Change-Id: I4ec9cfc07030ef83a44d6a2fdf7c9743242be602

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index e30f83a..aae1066 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1196,7 +1196,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 break;  // sprmPDxaFromText
 case NS_ooxml::LN_CT_FramePr_anchorLock:
 break;
-case NS_sprm::LN_PFWidowControl:
 case NS_ooxml::LN_CT_PPrBase_widowControl:
 {
 uno::Any aVal( uno::makeAny( sal_Int8(nIntValue ? 2 : 0 )));
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 5f2b4d8..4990be8 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -7,37 +7,6 @@
 
   
 
-
-
-  
-
-  
-  
-
-  0x2431
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPFWidowControl
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
 
 
   
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a60d1a5..e9d43c0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2546,7 +2546,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_NOWIDCTLPAR:
 {
 RTFValue::Pointer_t pValue(new RTFValue(int(nKeyword == 
RTF_WIDCTLPAR)));
-
m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PFWidowControl, pValue);
+
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_widowControl, 
pValue);
 }
 break;
 case RTF_BOX:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl

[Tor Lillqvist]

 sal/osl/unx/osxlocale.cxx |   20 
 1 file changed, 20 deletions(-)

New commits:
commit 8488775513825114d6d78c3ac2e925000f85c8fa
Author: Tor Lillqvist 
Date:   Thu Mar 6 18:22:40 2014 +0200

Bin unused macxp_OSXConvertCFEncodingToIANACharSetName()

Change-Id: I506940fd1b101d2c3f334e8d6608602c259b0a56

diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index 0d9397c..969c467 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -96,24 +96,4 @@ int macosx_getLocale(char *locale, sal_uInt32 bufferLen)
 }
 }
 
-
-
-/*
- * macxp_OSXConvertCFEncodingToIANACharSetName
- *
- * Convert a CoreFoundation text encoding to an IANA charset name.
- */
-extern "C" int macxp_OSXConvertCFEncodingToIANACharSetName( char *buffer, 
unsigned int bufferLen, CFStringEncoding cfEncoding )
-{
-CFStringRef sCFEncodingName;
-
-sCFEncodingName = CFStringConvertEncodingToIANACharSetName( cfEncoding );
-CFStringGetCString( sCFEncodingName, buffer, bufferLen, cfEncoding );
-
-if ( sCFEncodingName )
-CFRelease( sCFEncodingName );
-
-return( noErr );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Current Build from Git: Writer-Wizards don't run

[Stephan Bergmann]

On 03/06/2014 05:47 PM, Caolán McNamara wrote:

On Thu, 2014-03-06 at 13:24 +0100, Jean-Baptiste Faure wrote:

Hi Stephan,

Le 06/03/2014 12:39, Stephan Bergmann a écrit :

On 03/05/2014 08:28 AM, Jean-Baptiste Faure wrote:

It almost works for me this morning with Version: 4.3.0.0.alpha0+
Build ID: 0b2637dda47690da69f748119081151f41fe4133

Only the "documents converter" wizard does not start, all others start
as expected. It starts as expected in LO 4.2.3.0.0+.


..."does not start" meaning that "File - Wizards - Document
Converter..." does nothing, not even open the "Document Converter"
dialog?


Do you have a ~/Templates dir ? I bet you don't.

caolanm->sberg: Try removing your own ~/Templates dir and see if that
reproduces it for you. This might be related to the nagging worry I had
about 768ea2924680fc4beb75a782cb0faf26695fee53


Right, gconfbe1 will return nil for "TemplatePathVariable" when 
~/Templates doesn't exist, because of 
shell/source/backends/gconfbe/gconfaccess.cxx:579



SETTING_TEMPLATE_DIRECTORY, // so that the existence of the dir can be 
checked


triggering the call to isDependencySatisfied 
(shell/source/backends/gconfbe/gconfaccess.cxx) which checks for 
existing ~/Templates.  (And this detail had escaped me when I had a 
quick look the other day, assuming a request for "TemplatePathVariable" 
would always return non-nil, at least for gconfbe1.)


Now, "File - Wizards - Document Converter" runs Main from 
wizards/source/importwizard/Main.xba, which in GetImportWizardPaths 
expects to obtain a non-empty "Template_writable" from 
css.util.PathSettings, and otherwise silently exits early.  (Which is a 
consequence of 
 
"Resolves: rhbz#1065807 use xdg ~/Templates for default Template 
location," not 
 
"install:module s must be mutually exclusive.")


The configmgr's oor:external mechanism is not an "overlay" 
feature---when the external backend provides nil, configmgr dutifully 
returns nil to the client.  That means, the nil 
/org.openoffice.Office.Paths/Paths/Template/WritePath value must be 
addressed either in (all the install:module="unixdesktop"-relevant) 
external backends, or on the client end, either in 
framework/source/services/pathsettings.cxx (shudder) or 
wizards/source/importwizard/Main.xba.  None of this sounds attractive.


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

[Libreoffice-commits] core.git: 3 commits - chart2/source oox/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx  |   38 ++-
 chart2/source/view/main/OpenGLRender.cxx |4 +--
 oox/source/token/namespaces.pl   |1 
 3 files changed, 21 insertions(+), 22 deletions(-)

New commits:
commit 3871223bee2fcf7968d522a56e4062098a1e5633
Author: Markus Mohrhard 
Date:   Thu Mar 6 19:11:02 2014 +0100

add the xml strict namespaces to misc/namespaces.txt

Change-Id: Ie83b5c94f1f002851bff3b39b1d9b676a3e44aa1

diff --git a/oox/source/token/namespaces.pl b/oox/source/token/namespaces.pl
index b7f6083..faeaad9 100644
--- a/oox/source/token/namespaces.pl
+++ b/oox/source/token/namespaces.pl
@@ -89,6 +89,7 @@ foreach( keys( %namespaces ) )
 print( NAMEFILE "{ $id, \"$namespaces{$_}\" },\n" );
 print( NAMEFILE_STRICT "{ $id, \"$namespaces_strict{$_}\" },\n" );
 print( TXTFILE "$id $_ $namespaces{$_}\n" );
+print( TXTFILE "$id $_ $namespaces_strict{$_}\n" );
 ++$i;
 }
 
commit 1ba322b968c4060a40c44e2f6dd910ad3e2e8419
Author: Markus Mohrhard 
Date:   Thu Mar 6 16:59:38 2014 +0100

fix the translation angle calculation

Change-Id: If4b392f5f8dc4e67d00c6000dcf48a6c1f30db36

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index dff7ff9..7c8932d 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1298,7 +1298,7 @@ int OpenGLRender::CreateTextTexture(const BitmapEx& 
rBitmapEx, const awt::Point&
 }
 
 TextInfo aTextInfo;
-aTextInfo.rotation = -(double)rotation * GL_PI / 18000.0f;
+aTextInfo.rotation = -(double)rotation / 360.0 * 2* GL_PI;
 aTextInfo.vertex[0] = rTrans.Line1.Column3 / OPENGL_SCALE_VALUE;
 aTextInfo.vertex[1] = rTrans.Line2.Column3 / OPENGL_SCALE_VALUE;
 aTextInfo.vertex[2] = m_fZStep;
@@ -1351,7 +1351,7 @@ int OpenGLRender::RenderTextShape()
 {
 SAL_WARN("chart2.opengl", "rotation: " << textInfo.rotation);
 }
-PosVecf3 angle = {0.0f, float(textInfo.rotation), 
float(textInfo.rotation)};
+PosVecf3 angle = {0.0f, 0.0f, float(textInfo.rotation)};
 PosVecf3 scale = {1.0, 1.0, 1.0f};
 MoveModelf(trans, angle, scale);
 m_MVP = m_Projection * m_View * m_Model;
commit 58274bb9c1d231c804319ef337fc412ece2f9f8c
Author: Markus Mohrhard 
Date:   Thu Mar 6 16:58:48 2014 +0100

make many SAL_WARN in chart2.opengl simple SAL_INFO

Change-Id: I786361b2adaec2c4c156162ff8c3f6b743275961

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 9f8db07..02bafff 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -113,7 +113,7 @@ struct PrintProperties
 #if ENABLE_DEBUG_PROPERTIES
 void operator()(const std::pair& rProp)
 {
-SAL_WARN("chart2.opengl", "Property: " << rProp.first);
+SAL_INFO("chart2.opengl.properties", "Property: " << rProp.first);
 }
 #else
 void operator()(const std::pair&)
@@ -186,18 +186,18 @@ void SAL_CALL DummyXShape::setPropertyValue( const 
OUString& rName, const uno::A
 lang::IllegalArgumentException, lang::WrappedTargetException,
 uno::RuntimeException, std::exception)
 {
-SAL_WARN("chart2", "DummyXShape::setProperty: " << rName << " " << "Any");
+SAL_INFO("chart2", "DummyXShape::setProperty: " << rName << " " << "Any");
 maProperties[rName] = rValue;
 if(rName == "Transformation")
 {
-SAL_WARN("chart2.opengl", "Transformation");
+SAL_INFO("chart2.opengl", "Transformation");
 }
 }
 
 uno::Any SAL_CALL DummyXShape::getPropertyValue( const OUString& rName )
 throw(beans::UnknownPropertyException, lang::WrappedTargetException, 
uno::RuntimeException, std::exception)
 {
-SAL_WARN("chart2.opengl", "DummyXShape::getPropertyValue: " << rName);
+SAL_INFO("chart2.opengl", "DummyXShape::getPropertyValue: " << rName);
 std::map::iterator itr = maProperties.find(rName);
 if(itr != maProperties.end())
 return itr->second;
@@ -393,7 +393,7 @@ DummyPieSegment2D::DummyPieSegment2D(double 
fUnitCircleStartAngleDegree, double
 
 void DummyPieSegment2D::render()
 {
-SAL_WARN("chart2.opengl", "render DummyPieSegment2D");
+SAL_INFO("chart2.opengl", "render DummyPieSegment2D");
 DummyChart* pChart = getRootShape();
 
 while(mfUnitCircleWidthAngleDegree>360)
@@ -450,7 +450,7 @@ DummyArea2D::DummyArea2D(const 
drawing::PointSequenceSequence& rShape):
 
 void DummyArea2D::render()
 {
-SAL_WARN("chart2.opengl", "render DummyArea2D");
+SAL_INFO("chart2.opengl", "render DummyArea2D");
 DummyChart* pChart = getRootShape();
 sal_Int32 nPointssCount = maShapes.getLength();
 for(sal_Int32 i = 0; i < nPointssCount; i++)
@@ -502,7 +502,7 @@ DummyCircle::DummyCircle(const awt::Point& rPos, const 
awt::Size& rSize)
 
 void DummyCircle::render()
 {
-SAL_WARN("chart2.opengl", "

Re: Current Build from Git: Writer-Wizards don't run

[Jean-Baptiste Faure]

Hi,

Le 06/03/2014 17:47, Caolán McNamara a écrit :
> Do you have a ~/Templates dir ? I bet you don't.

Yes, I have a ~/Modèles directory (French localized Ubuntu).

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Zolnai Tamás]

 offapi/com/sun/star/text/BaseFrameProperties.idl |7 ---
 offapi/com/sun/star/text/TextFrame.idl   |6 ++
 sw/source/core/layout/calcmove.cxx   |   16 
 sw/source/core/layout/fly.cxx|   14 --
 sw/source/core/layout/flyincnt.cxx   |8 +++-
 5 files changed, 33 insertions(+), 18 deletions(-)

New commits:
commit d9b4a8f5933fd4e7110717b0cdf5f3935203cc00
Author: Zolnai Tamás 
Date:   Thu Mar 6 20:00:17 2014 +0100

Vertical content alignment of frames anchored as character

Change-Id: Idf05edd102475675c8f0781af1f966043f342bb7

diff --git a/sw/source/core/layout/flyincnt.cxx 
b/sw/source/core/layout/flyincnt.cxx
index ba7f5c5..0fa9b59 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -220,7 +220,7 @@ void SwFlyInCntFrm::MakeAll()
 if ( IsClipped() )
 mbValidSize = bHeightClipped = bWidthClipped = sal_False;
 
-while ( !mbValidPos || !mbValidSize || !mbValidPrtArea )
+while ( !mbValidPos || !mbValidSize || !mbValidPrtArea || 
!m_bValidContentPos )
 {
 //Only stop, if the flag is set!!
 if ( !mbValidSize )
@@ -229,7 +229,10 @@ void SwFlyInCntFrm::MakeAll()
 }
 
 if ( !mbValidPrtArea )
+{
 MakePrtArea( rAttrs );
+m_bValidContentPos = false;
+}
 
 if ( !mbValidSize )
 Format( &rAttrs );
@@ -239,6 +242,9 @@ void SwFlyInCntFrm::MakeAll()
 MakeObjPos();
 }
 
+if ( !m_bValidContentPos )
+MakeContentPos( rAttrs );
+
 // re-activate clipping of as-character anchored Writer fly frames
 // depending on compatibility option 

 if ( mbValidPos && mbValidSize &&
commit 66882c88a26a1fb82f536f153b36e6a5049bda34
Author: Zolnai Tamás 
Date:   Thu Mar 6 20:02:17 2014 +0100

Fix UNO API of vertical content alignment.

This property can applied just for text frames, not others
which can have base frame properties.

Change-Id: I551a2e17bb42855d3e948c7fc672ec5e3a451c55

diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl 
b/offapi/com/sun/star/text/BaseFrameProperties.idl
index 2a1f25c..c441343 100644
--- a/offapi/com/sun/star/text/BaseFrameProperties.idl
+++ b/offapi/com/sun/star/text/BaseFrameProperties.idl
@@ -352,13 +352,6 @@ published service BaseFrameProperties
 @since LibreOffice 4.3
  */
 [optional, property] short RelativeWidthRelation;
-
-/** adjusts the vertical position of the text inside of the frame.
-
-@see com::sun::star::drawing::TextVerticalAdjust
-@since LibreOffice 4.3
- */
-[optional, property] com::sun::star::drawing::TextVerticalAdjust 
TextVerticalAdjust;
 };
 
 
diff --git a/offapi/com/sun/star/text/TextFrame.idl 
b/offapi/com/sun/star/text/TextFrame.idl
index 676703d..68a7314 100644
--- a/offapi/com/sun/star/text/TextFrame.idl
+++ b/offapi/com/sun/star/text/TextFrame.idl
@@ -136,6 +136,12 @@ published service TextFrame
  */
 [optional, property] boolean IsFollowingTextFlow;
 
+/** adjusts the vertical position of the text inside of the frame.
+
+@see com::sun::star::drawing::TextVerticalAdjust
+@since LibreOffice 4.3
+*/
+[optional, property] com::sun::star::drawing::TextVerticalAdjust 
TextVerticalAdjust;
 };
 
 
commit 41ad6531c75a53262933aecb0685f5c876de7251
Author: Zolnai Tamás 
Date:   Thu Mar 6 14:59:31 2014 +0100

Vertical content alignment of vertical text frames

Change-Id: If365684f8fec5c560e948e3428681462e227dc00

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 38db766..48ab36b 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1711,11 +1711,21 @@ void SwFlyFrm::MakeContentPos( const SwBorderAttrs 
&rAttrs )
 {
 if( nAdjust == SDRTEXTVERTADJUST_CENTER )
 {
-aNewContentPos.setY(aNewContentPos.getY() + nDiff/2);
+if( bVertL2R )
+aNewContentPos.setX(aNewContentPos.getX() + nDiff/2);
+else if( bVert )
+aNewContentPos.setX(aNewContentPos.getX() - nDiff/2);
+else
+aNewContentPos.setY(aNewContentPos.getY() + nDiff/2);
 }
 else if( nAdjust == SDRTEXTVERTADJUST_BOTTOM )
 {
-aNewContentPos.setY(aNewContentPos.getY() + nDiff);
+if( bVertL2R )
+aNewContentPos.setX(aNewContentPos.getX() + nDiff);
+else if( bVert )
+aNewContentPos.setX(aNewContentPos.getX() - nDiff);
+else
+aNewContentPos.setY(aNewContentPos.getY() + nDiff);
 }
 }
 }
comm

[Libreoffice-commits] core.git: officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk

[Stephan Bergmann]

 officecfg/Configuration_officecfg.mk|1 -
 officecfg/registry/data/org/openoffice/Office/Paths.xcu |6 +++---
 postprocess/CustomTarget_registry.mk|4 
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 71ed01e2edb27d09104a412425d5b99247efa4d4
Author: Stephan Bergmann 
Date:   Thu Mar 6 20:17:48 2014 +0100

Revert "install:module s must be mutually exclusive"

This reverts commit 768ea2924680fc4beb75a782cb0faf26695fee53, which was
completely misguided---configmgr allows oor:external values to let a "lower"
value shine through when the backend says it cannot produce a value, even 
when
that "lower" value comes from the same layer (as is e.g. already used in
officecfg/registry/data/org/openoffice/VCL.xcu).

Conflicts:
postprocess/CustomTarget_registry.mk

Change-Id: Ic8f0c9c931e2c73c9bfb8fbe5a57f60ad6aebde1

diff --git a/officecfg/Configuration_officecfg.mk 
b/officecfg/Configuration_officecfg.mk
index 497fc27..d0a7239 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -101,7 +101,6 @@ $(eval $(call 
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Paths-macosx.xcu \
org/openoffice/Office/Paths-unxwnt.xcu \
org/openoffice/Office/Paths-unixdesktop.xcu \
-   org/openoffice/Office/Paths-notunixdesktop.xcu \
org/openoffice/Office/Paths-internallibexttextcatdata.xcu \
org/openoffice/Office/Paths-externallibexttextcatdata.xcu \
org/openoffice/Office/Writer-cjk.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu 
b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index e8c44d1..7568f4d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -171,11 +171,11 @@
in that dir.
   -->
   
-$(userurl)/template
+$(userurl)/template
 
   
-  
-$(userurl)/template
+  
+$(userurl)/template
   
 
 
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 76f722c..092f3ed 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -331,10 +331,6 @@ postprocess_FILES_main += \
# Inet-wnt.xcu must come after Inet.xcu
 postprocess_DRIVERS += ado
 endif
-ifneq (unx,$(GUIBASE))
-postprocess_FILES_main += \
-   $(postprocess_MOD)/org/openoffice/Office/Paths-notunixdesktop.xcu
-endif
 ifneq ($(WITH_WEBDAV),)
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 ucb/source/core/ucbstore.cxx |  189 +--
 ucb/source/core/ucbstore.hxx |   76 -
 2 files changed, 26 insertions(+), 239 deletions(-)

New commits:
commit 7ef43f1e2f3a36d19f2727d4a0da7b99bc834a1d
Author: Norbert Thiebaud 
Date:   Thu Mar 6 13:30:48 2014 -0600

use WeakImplHelper on udbstore's classes

Change-Id: I1b38d9708e9298ad3f164d6d8838c88e08d0efeb

diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 8b2d2be..00721b7 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "ucbstore.hxx"
 
 using namespace com::sun::star::beans;
@@ -120,8 +121,7 @@ PropertySetMap_Impl;
 
 
 
-class PropertySetInfo_Impl :
-public OWeakObject, public XTypeProvider, public XPropertySetInfo
+class PropertySetInfo_Impl : public cppu::WeakImplHelper1 < XPropertySetInfo >
 {
 Reference< XComponentContext >m_xContext;
 Sequence< Property >* m_pProps;
@@ -132,17 +132,6 @@ public:
   PersistentPropertySet* pOwner );
 virtual ~PropertySetInfo_Impl();
 
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType )
-throw( css::uno::RuntimeException, std::exception );
-virtual void SAL_CALL acquire()
-throw();
-virtual void SAL_CALL release()
-throw();
-
-// XTypeProvider
-XTYPEPROVIDER_DECL()
-
 // XPropertySetInfo
 virtual Sequence< Property > SAL_CALL getProperties()
 throw( RuntimeException, std::exception );
@@ -192,48 +181,6 @@ UcbStore::~UcbStore()
 }
 
 
-
-// XInterface methods.
-void SAL_CALL UcbStore::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL UcbStore::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL UcbStore::queryInterface( const css::uno::Type & rType )
-throw( css::uno::RuntimeException, std::exception )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   (static_cast< XTypeProvider* 
>(this)),
-   (static_cast< XServiceInfo* 
>(this)),
-   (static_cast< 
XPropertySetRegistryFactory* >(this)),
-   (static_cast< XInitialization* 
>(this))
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-
-XTYPEPROVIDER_IMPL_4( UcbStore,
- XTypeProvider,
- XServiceInfo,
-  XPropertySetRegistryFactory,
-  XInitialization );
-
-
-
-// XServiceInfo methods.
-
-
-
 XSERVICEINFO_IMPL_1_CTX( UcbStore,
  OUString( "com.sun.star.comp.ucb.UcbStore" ),
  OUString( STORE_SERVICE_NAME ) );
@@ -342,44 +289,6 @@ PropertySetRegistry::~PropertySetRegistry()
 
 
 
-// XInterface methods.
-
-void SAL_CALL PropertySetRegistry::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL PropertySetRegistry::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL PropertySetRegistry::queryInterface( const 
css::uno::Type & rType )
-throw( css::uno::RuntimeException, std::exception )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   (static_cast< XTypeProvider* 
>(this)),
-   (static_cast< XServiceInfo* 
>(this)),
-   (static_cast< 
XPropertySetRegistry* >(this)),
-   (static_cast< XElementAccess* 
>(this)),
-   (static_cast< XNameAccess* 
>(this))
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_4( PropertySetRegistry,
- XTypeProvider,
-  XServiceInfo,
-  XPropertySetRegistry,
-  XNameAccess );
-
-
-
 // XServiceInfo methods.
 
 
@@ -1292,54 +1201,6 @@ PersistentPropertySet::~PersistentPropertySet()
 delete m_pImpl;
 }
 
-
-
-// XInterface methods.
-void SAL_CALL PersistentPropertySet::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL PersistentPropertySet::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL PersistentPropertySet::queryInterface( const 
css::uno::Type & rType )
-throw( css::uno::RuntimeException, std::exception )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   (static_cast< XTypeProvider* 
>(this)),
-

Re: Current Build from Git: Writer-Wizards don't run

[Stephan Bergmann]

On Mar 6, 2014, at 7:19 PM, Stephan Bergmann wrote:
> Now, "File - Wizards - Document Converter" runs Main from 
> wizards/source/importwizard/Main.xba, which in GetImportWizardPaths expects 
> to obtain a non-empty "Template_writable" from css.util.PathSettings, and 
> otherwise silently exits early.  (Which is a consequence of 
> 
>  "Resolves: rhbz#1065807 use xdg ~/Templates for default Template location," 
> not 
> 
>  "install:module s must be mutually exclusive.")
> 
> The configmgr's oor:external mechanism is not an "overlay" feature

…except that it is, in that it allows the backend to report back a 
css::beans::Optional with !IsPresent to let configmgr use an already present 
value---even one from the same layer (which had confused me, but for which we 
already have prior art, e.g., in 
officecfg/registry/data/org/openoffice/VCL.xcu).

So it was indeed 768ea2924680fc4beb75a782cb0faf26695fee53 which broke things, 
reverted now as 71ed01e2edb27d09104a412425d5b99247efa4d4. Sorry for the noise 
and trouble.

Jean-Baptiste, does that fix it for you?

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

[Libreoffice-commits] core.git: Branch 'private/kohei/opencl-kernel-crash' - formula/source include/formula

[Kohei Yoshida]

 formula/source/core/api/token.cxx |   11 +++
 include/formula/token.hxx |6 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit a37c8cdde981551b8c679fa59a7055c072ce164e
Author: Kohei Yoshida 
Date:   Thu Mar 6 15:01:39 2014 -0500

Make these non inline.

Change-Id: Ib139850380b039382565e3de3666eebb5750f32d

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 9ea95f9..4f8b8aa 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -60,6 +60,17 @@ inline bool lcl_IsReference( OpCode eOp, StackVar eType )
 }
 
 // --- class FormulaToken 

+
+FormulaToken::FormulaToken( StackVar eTypeP, OpCode e ) :
+eOp(e), eType( eTypeP ), mnRefCnt(0)
+{
+}
+
+FormulaToken::FormulaToken( const FormulaToken& r ) :
+IFormulaToken(), eOp(r.eOp), eType( r.eType ), mnRefCnt(0)
+{
+}
+
 FormulaToken::~FormulaToken()
 {
 }
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index baf050a..f65220b 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -94,10 +94,8 @@ protected:
 mutable oslInterlockedCount mnRefCnt;// reference count
 
 public:
-FormulaToken( StackVar eTypeP,OpCode e = 
ocPush ) :
-eOp(e), eType( eTypeP ), mnRefCnt(0) {}
-FormulaToken( const FormulaToken& r ) : 
IFormulaToken(),
-eOp(r.eOp), eType( r.eType ), mnRefCnt(0) 
{}
+FormulaToken( StackVar eTypeP,OpCode e = ocPush );
+FormulaToken( const FormulaToken& r );
 
 virtual ~FormulaToken();
 
___
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' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/token.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ebdf24c6731ccffb6dbd6e3487cd919890c844b3
Author: Kohei Yoshida 
Date:   Fri Feb 14 20:39:18 2014 -0500

fdo#72691: Allow overwriting of string value with numeric one.

This can legitimately happen when you have a matrix with a reference to
another cell inside, and the referenced cell originally contained a
string value then later overwritten by a numeric value.

Example.  Put a "Text" in A1, and in B1 put a 1x1 matrix {=A1}.  It
displays "Text" in B1.  Then put 11 in A1.  Prior to this change, B1
would become blank.  With this change, B1 will display 11.

Change-Id: I3feba3a8658e1a5ebf6f9e5ac34de2d579464ddb
(cherry picked from commit 9bf907a8278cecd816368db7b8c4ab745a914a59)
Reviewed-on: https://gerrit.libreoffice.org/8066
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 3dff6a9..cd14c4c 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1084,6 +1084,9 @@ void ScMatrixFormulaCellToken::SetUpperLeftDouble( double 
f )
 case svDouble:
 
const_cast(xUpperLeft.get())->GetDoubleAsReference() = f;
 break;
+case svString:
+xUpperLeft = new FormulaDoubleToken( f);
+break;
 case svUnknown:
 if (!xUpperLeft)
 {
___
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' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column3.cxx |   25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 016a231ef0a6bfb3c4b74a0e6d6d7431f42755c1
Author: Kohei Yoshida 
Date:   Tue Feb 18 22:57:39 2014 -0500

fdo#72491: Always set input as text when that's requested.

Even when the text begins with '='.

(cherry picked from commit ca50752c34de4477c696471b707e1b8136e27661)

Conflicts:
sc/source/core/data/column3.cxx

Change-Id: I6e0a995f3042240b9f78068b5d0b9b758eb253ed
Reviewed-on: https://gerrit.libreoffice.org/8123
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c19662e..4bd6a5a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1185,6 +1185,19 @@ void ScColumn::StartListeningInArea( 
sc::StartListeningContext& rCxt, SCROW nRow
 }
 }
 
+namespace {
+
+void applyTextNumFormat( ScColumn& rCol, ScDocument& rDoc, SCROW nRow, 
SvNumberFormatter* pFormatter )
+{
+sal_uInt32 nFormat = pFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
+ScPatternAttr aNewAttrs(rDoc.GetPool());
+SfxItemSet& rSet = aNewAttrs.GetItemSet();
+rSet.Put(SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat));
+rCol.ApplyPattern(nRow, aNewAttrs);
+}
+
+}
+
 bool ScColumn::ParseString(
 ScCellValue& rCell, SCROW nRow, SCTAB nTabP, const String& rString,
 formula::FormulaGrammar::AddressConvention eConv,
@@ -1217,6 +1230,12 @@ bool ScColumn::ParseString(
 {
 if ( rString.Len() == 1 ) // = Text
 rCell.set(rString);
+else if (aParam.meSetTextNumFormat == ScSetStringParam::Always)
+{
+// Set the cell format type to Text.
+applyTextNumFormat(*this, *pDocument, nRow, aParam.mpNumFormatter);
+rCell.set(rString);
+}
 else // = Formula
 rCell.set(
 new ScFormulaCell(
@@ -1325,11 +1344,7 @@ bool ScColumn::ParseString(
 if (aParam.meSetTextNumFormat != ScSetStringParam::Never && 
aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
 {
 // Set the cell format type to Text.
-sal_uInt32 nFormat = 
aParam.mpNumFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
-ScPatternAttr aNewAttrs(pDocument->GetPool());
-SfxItemSet& rSet = aNewAttrs.GetItemSet();
-rSet.Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat) );
-ApplyPattern(nRow, aNewAttrs);
+applyTextNumFormat(*this, *pDocument, nRow, 
aParam.mpNumFormatter);
 }
 
 rCell.set(rString);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/opencl-kernel-crash' - sc/source

[Kohei Yoshida]

 sc/source/core/opencl/formulagroupcl.cxx |   45 ++-
 sc/source/core/opencl/opbase.hxx |6 ++--
 2 files changed, 24 insertions(+), 27 deletions(-)

New commits:
commit 65fb0f3877a3e176a1ec0bde37814247365c19c5
Author: Kohei Yoshida 
Date:   Thu Mar 6 15:58:25 2014 -0500

Let's not leak ScTokenArray when compiling formula & some naming convention.

Names that begin with m_ are NOT to be used as local variables, and let's 
not
use a name that's identical to the name of a STL container.

Change-Id: I142cc76e9eb34a19a2346cbb67774d60b801a649

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index ec727a8..bd8c5eb 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3358,45 +3358,44 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* 
rDoc */,
  ScTokenArray& rCode)
 {
 // Constructing "AST"
-FormulaTokenIterator aCode = rCode;
-std::list list;
-std::map m_hash_map;
+FormulaTokenIterator aCode(rCode);
+std::list aTokenList;
+std::map aHashMap;
 FormulaToken*  pCur;
 while( (pCur = (FormulaToken*)(aCode.Next()) ) != NULL)
 {
 OpCode eOp = pCur->GetOpCode();
 if ( eOp != ocPush )
 {
-FormulaTreeNodeRef m_currNode =
- FormulaTreeNodeRef(new FormulaTreeNode(pCur));
-sal_uInt8 m_ParamCount =  pCur->GetParamCount();
-for(int i=0; iGetParamCount();
+for (sal_uInt8 i = 0; i < nParamCount; i++)
 {
-FormulaToken* m_TempFormula = list.back();
-list.pop_back();
+FormulaToken* m_TempFormula = aTokenList.back();
+aTokenList.pop_back();
 if(m_TempFormula->GetOpCode()!=ocPush)
 {
-if(m_hash_map.find(m_TempFormula)==m_hash_map.end())
+if (aHashMap.find(m_TempFormula)==aHashMap.end())
 return NULL;
-m_currNode->Children.push_back(m_hash_map[m_TempFormula]);
+pCurNode->Children.push_back(aHashMap[m_TempFormula]);
 }
 else
 {
 FormulaTreeNodeRef m_ChildTreeNode =
   FormulaTreeNodeRef(
new FormulaTreeNode(m_TempFormula));
-m_currNode->Children.push_back(m_ChildTreeNode);
+pCurNode->Children.push_back(m_ChildTreeNode);
 }
 }
-std::reverse(m_currNode->Children.begin(),
-m_currNode->Children.end());
-m_hash_map[pCur] = m_currNode;
+std::reverse(pCurNode->Children.begin(),
+pCurNode->Children.end());
+aHashMap[pCur] = pCurNode;
 }
-list.push_back(pCur);
+aTokenList.push_back(pCur);
 }
 
 FormulaTreeNodeRef Root = FormulaTreeNodeRef(new FormulaTreeNode(NULL));
-Root->Children.push_back(m_hash_map[list.back()]);
+Root->Children.push_back(aHashMap[aTokenList.back()]);
 
 DynamicKernel* pDynamicKernel = new DynamicKernel(Root);
 
@@ -3431,16 +3430,14 @@ CompiledFormula* 
FormulaGroupInterpreterOpenCL::createCompiledFormula(ScDocument
   
ScFormulaCellGroupRef& xGroup,
   
ScTokenArray& rCode)
 {
-ScTokenArray *pCode = new ScTokenArray();
-ScGroupTokenConverter aConverter(*pCode, rDoc, *xGroup->mpTopCell, 
rTopPos);
-if (!aConverter.convert(rCode) || pCode->GetLen() == 0)
-{
-delete pCode;
+ScTokenArray aConvertedCode;
+ScGroupTokenConverter aConverter(aConvertedCode, rDoc, *xGroup->mpTopCell, 
rTopPos);
+if (!aConverter.convert(rCode) || aConvertedCode.GetLen() == 0)
 return NULL;
-}
+
 SymbolTable::nR = xGroup->mnLength;
 
-return DynamicKernel::create(rDoc, rTopPos, *pCode);
+return DynamicKernel::create(rDoc, rTopPos, aConvertedCode);
 }
 
 bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index f5ceac5..a75e160 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -128,17 +128,17 @@ typedef boost::shared_ptr 
FormulaTreeNodeRef;
 class FormulaTreeNode
 {
 public:
-FormulaTreeNode(formula::FormulaToken *ft): mpCurrentFormula(ft)
+FormulaTreeNode(const formula::FormulaToken* ft): mpCurrentFormula(ft)
 {
 Children.reserve(8);
 }
 std::vector Children;
 formula::FormulaToken *GetFormulaToken(void) const
 {
-return mpCurrentFormula;
+return const_cast(mpCurrentFormula.get());
 }
 private:
-fo

[Libreoffice-commits] core.git: Branch 'private/kohei/opencl-kernel-crash' - sc/source

[Kohei Yoshida]

 sc/source/core/opencl/formulagroupcl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88e60fd3e664dd5b7a08b7a9a37a9279083c98c3
Author: Kohei Yoshida 
Date:   Thu Mar 6 16:00:34 2014 -0500

Method declared but never defined nor used.

Change-Id: I3990822cfe202b8537a7c9ad58a61c55bc2e3e82

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index bd8c5eb..ea1a7e0 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3183,7 +3183,7 @@ public:
 cl_mem GetResultBuffer(void) const { return mpResClmem; }
 
 private:
-void TraverseAST(FormulaTreeNodeRef);
+
 FormulaTreeNodeRef mpRoot;
 SymbolTable mSyms;
 std::string mKernelSignature, mKernelHash;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 ucb/source/core/provprox.cxx |   37 -
 ucb/source/core/provprox.hxx |   20 
 ucb/source/core/ucbprops.cxx |   35 ---
 ucb/source/core/ucbprops.hxx |   25 ++---
 4 files changed, 10 insertions(+), 107 deletions(-)

New commits:
commit 1b2b8f8d5aa1e402c31ee9853dd0ec229d3a32b7
Author: Norbert Thiebaud 
Date:   Thu Mar 6 15:31:10 2014 -0600

use WeakImplHelper2 for UcbPropertiesManager

Change-Id: I9b3c9afcf6d63f1a1e9c973c7498dcdc938f589d

diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 3a20cc0..6bb31ff 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -308,41 +308,6 @@ UcbPropertiesManager::~UcbPropertiesManager()
 
 
 
-// XInterface methods.
-void SAL_CALL UcbPropertiesManager::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL UcbPropertiesManager::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL UcbPropertiesManager::queryInterface( const 
css::uno::Type & rType )
-throw( css::uno::RuntimeException, std::exception )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   (static_cast< XTypeProvider* 
>(this)),
-   (static_cast< XServiceInfo* 
>(this)),
-   (static_cast< XPropertySetInfo* 
>(this))
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-
-XTYPEPROVIDER_IMPL_3( UcbPropertiesManager,
-  XTypeProvider,
-  XServiceInfo,
-  XPropertySetInfo );
-
-
-
 // XServiceInfo methods.
 
 
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 2723d9e..1201d29 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 
@@ -38,15 +39,12 @@
 
 
 
-class UcbPropertiesManager :
-public cppu::OWeakObject,
-public com::sun::star::lang::XTypeProvider,
-public com::sun::star::lang::XServiceInfo,
-public com::sun::star::beans::XPropertySetInfo
+class UcbPropertiesManager : public cppu::WeakImplHelper2 <
+css::lang::XServiceInfo,
+css::beans::XPropertySetInfo >
 {
-com::sun::star::uno::Sequence< com::sun::star::beans::Property >*
-m_pProps;
-osl::Mutex  m_aMutex;
+css::uno::Sequence< css::beans::Property >* m_pProps;
+osl::Mutex m_aMutex;
 
 private:
 sal_Bool queryProperty( const OUString& rName,
@@ -58,17 +56,6 @@ public:
 rxSMgr );
 virtual ~UcbPropertiesManager();
 
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType )
-throw( css::uno::RuntimeException, std::exception );
-virtual void SAL_CALL acquire()
-throw();
-virtual void SAL_CALL release()
-throw();
-
-// XTypeProvider
-XTYPEPROVIDER_DECL()
-
 // XServiceInfo
 XSERVICEINFO_DECL()
 
commit dba5cd13f7339426d1c8b6eab7a8621def80fea5
Author: Norbert Thiebaud 
Date:   Thu Mar 6 15:30:48 2014 -0600

use WeakImplHelper2 for UcbContentProviderProxyFactory

Change-Id: I211eb7f14914df88b488d48d2d6a8c204595c7e4

diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index a28ae6c..746b52f 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -48,43 +48,6 @@ 
UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory()
 {
 }
 
-
-
-// XInterface methods.
-void SAL_CALL UcbContentProviderProxyFactory::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL UcbContentProviderProxyFactory::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL UcbContentProviderProxyFactory::queryInterface( const 
css::uno::Type & rType )
-throw( css::uno::RuntimeException, std::exception )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   (static_cast< XTypeProvider* 
>(this)),
-   (static_cast< XServiceInfo* 
>(this)),
-   (static_cast< 
XContentProviderFactory* >(this))
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-
-XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory,
-  XTypeProvider,
-  XServiceInfo,
-  XContentProviderFactory );
-
-
-
 // XServiceInfo methods.
 
 
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 Depends on||74087

-- 
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 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Jorendc  changed:

   What|Removed |Added

 Depends on||64490

--- Comment #149 from Jorendc  ---
Hereby I nominate "Bug 64490 - LibreOffice Writer text highligthing is not
compatible with Microsoft Word DOC and DOCX (highlighting transforms to
background color)"

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

Alex Henrie license statement

[Alex Henrie]

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

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

--- Comment #150 from Romano Giannetti  ---
(In reply to comment #149)
> Hereby I nominate "Bug 64490 - LibreOffice Writer text highligthing is not
> compatible with Microsoft Word DOC and DOCX (highlighting transforms to
> background color)"

Seconded. It's the most important problem in exchanging document with my
collegues at work.

-- 
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: 2 commits - sfx2/source svx/source

[Michael Stahl]

 sfx2/source/doc/templatedlg.cxx |7 +--
 svx/source/dialog/svxruler.cxx  |3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 6b6ec280f3d7f35fb9c8c8ba92a31d51ab4dca16
Author: Michael Stahl 
Date:   Fri Mar 7 00:24:52 2014 +0100

fdo#74787, rhbz#1072553: fix Template Mananger import crash

File dialog causes call to ThumbnailView::LoseFocus() and clears
selected folders.

(regression from 0314034d8b23d5b69399cfcdf6b2f2add73f9f47)

Change-Id: Ic5f2602e9dd1d12aad8c68c48f6bbb119ee6492c

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index a853a33..2741d71 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -901,6 +901,9 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
 aFileDlg.AddFilter( sFilterName, sFilterExt );
 aFileDlg.SetCurrentFilter( sFilterName );
 
+// fdo#74787 file dialog causes ThumbnailView::LoseFocus() - save selection
+std::set 
selFolders(maSelFolders);
+
 ErrCode nCode = aFileDlg.Execute();
 
 if ( nCode == ERRCODE_NONE )
@@ -909,11 +912,11 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
 
 if (aFiles.hasElements())
 {
-if (!maSelFolders.empty())
+if (!selFolders.empty())
 {
 //Import to the selected regions
 std::set::const_iterator pIter;
-for (pIter = maSelFolders.begin(); pIter != 
maSelFolders.end(); ++pIter)
+for (pIter = selFolders.begin(); pIter != selFolders.end(); 
++pIter)
 {
 OUString aTemplateList;
 TemplateContainerItem *pFolder = 
(TemplateContainerItem*)(*pIter);
commit 958616a323b7fe6b42cd642394cd90a9cd82e7f9
Author: Michael Stahl 
Date:   Thu Mar 6 22:25:55 2014 +0100

rhbz#1072607: (hopefully) fix crash in SvxRuler::MouseMove()

Not sure why mpParaItem is 0 here, add a check like in every other
SvxRuler method.

(regression from 47a77d7dbc427e51421e2df8d59695834cb74980)

Change-Id: Ic11a4d0c9b6ca217cd59d1d3f6789592996d2c1d

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 9a51bcb..80e3b4d 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -581,6 +581,9 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
 {
 case RULER_TYPE_INDENT:
 {
+if (!mpParaItem.get())
+break;
+
 long nIndex = aSelection.nAryPos + INDENT_GAP;
 
 long nIndentValue = 0.0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 Depends on||75510

-- 
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 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

--- Comment #108 from Joel Madero  ---
Nominated bug 75510 - 4.2 regression where settings are not being read
correctly for error bars in x/y charts. Appears like data loss to users but the
data is saved, just not called on correctly

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

[Libreoffice-commits] core.git: Branch 'private/kohei/opencl-kernel-crash' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/formulacell.hxx   |1 +
 sc/inc/formulagroup.hxx  |4 ++--
 sc/source/core/data/formulacell.cxx  |   15 +++
 sc/source/core/opencl/formulagroupcl.cxx |   10 +-
 sc/source/core/tool/clkernelthread.cxx   |   10 +-
 sc/source/core/tool/formulagroup.cxx |4 ++--
 6 files changed, 26 insertions(+), 18 deletions(-)

New commits:
commit 995bc14e932f8dc9ee4a40619fa2b0db647a2c37
Author: Kohei Yoshida 
Date:   Thu Mar 6 20:45:25 2014 -0500

Allow easy toggling of threaded OpenCL kernel compilation.

Via compiler defined macro.

Change-Id: Ic20e6564d99e8ae80c15eda5d12b4dbb76ffbd36

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 67b0fb6..6f3c555 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -76,6 +76,7 @@ struct SC_DLLPUBLIC ScFormulaCellGroup : boost::noncopyable
 void setCode( const ScTokenArray& rCode );
 void compileCode(
 ScDocument& rDoc, const ScAddress& rPos, 
formula::FormulaGrammar::Grammar eGram );
+void compileOpenCLKernel();
 
 static int snCount;
 static rtl::Reference sxCompilationThread;
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index a3f1891..bb0e0b4 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -107,7 +107,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
 virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) = 0;
 virtual CompiledFormula* createCompiledFormula(ScDocument& rDoc,
const ScAddress& rTopPos,
-   ScFormulaCellGroupRef& 
xGroup,
+   ScFormulaCellGroup& rGroup,
ScTokenArray& rCode) = 0;
 virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, 
ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) = 0;
 };
@@ -122,7 +122,7 @@ public:
 virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat);
 virtual CompiledFormula* createCompiledFormula(ScDocument& rDoc,
const ScAddress& rTopPos,
-   ScFormulaCellGroupRef& 
xGroup,
+   ScFormulaCellGroup& rGroup,
ScTokenArray& rCode) 
SAL_OVERRIDE;
 virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, 
ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) SAL_OVERRIDE;
 };
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 9a328ed..821bc67 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -54,6 +54,8 @@
 
 #include 
 
+#define ENABLE_THREADED_OPENCL_KERNEL_COMPILATION 1
+
 using namespace formula;
 
 #ifdef USE_MEMPOOL
@@ -482,7 +484,16 @@ void ScFormulaCellGroup::compileCode(
 }
 }
 
+void ScFormulaCellGroup::compileOpenCLKernel()
+{
+if (meCalcState == sc::GroupCalcDisabled)
+return;
+
+mpCompiledFormula = 
sc::FormulaGroupInterpreter::getStatic()->createCompiledFormula(
+*mpTopCell->GetDocument(), mpTopCell->aPos, *this, *mpCode);
 
+meKernelState = sc::OpenCLKernelBinaryCreated;
+}
 
 ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos ) :
 eTempGrammar(formula::FormulaGrammar::GRAM_DEFAULT),
@@ -3492,8 +3503,12 @@ ScFormulaCellGroupRef ScFormulaCell::CreateCellGroup( 
SCROW nLen, bool bInvarian
 mxGroup->mbInvariant = bInvariant;
 mxGroup->mnLength = nLen;
 mxGroup->mpCode = pCode; // Move this to the shared location.
+#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION
 if (mxGroup->sxCompilationThread.is())
 mxGroup->scheduleCompilation();
+#else
+mxGroup->compileOpenCLKernel();
+#endif
 return mxGroup;
 }
 
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index ea1a7e0..3cf52f5 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3342,7 +3342,7 @@ public:
 virtual ScMatrixRef inverseMatrix( const ScMatrix& rMat ) SAL_OVERRIDE;
 virtual CompiledFormula* createCompiledFormula(ScDocument& rDoc,
const ScAddress& rTopPos,
-   ScFormulaCellGroupRef& 
xGroup,
+   ScFormulaCellGroup& rGroup,
ScTokenArray& rCode) 
SAL_OVERRIDE;
 virtual bool interpret( ScDocument& rDoc, const ScAddress& rTopPos,
 ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode 
) SAL_OVERRIDE;
@@ -3427,15 +3427,15 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* 
rDoc */,
 
 CompiledFormula* 
FormulaGroupInterpreterOpenCL::createCom

[Libreoffice-commits] core.git: 5 commits - formula/source include/formula sc/inc sc/source

[Kohei Yoshida]

 formula/source/core/api/token.cxx|   11 +
 include/formula/token.hxx|6 --
 sc/inc/formulacell.hxx   |1 
 sc/inc/formulagroup.hxx  |4 -
 sc/source/core/data/formulacell.cxx  |   15 +++
 sc/source/core/opencl/formulagroupcl.cxx |   64 +--
 sc/source/core/opencl/opbase.hxx |6 +-
 sc/source/core/tool/clkernelthread.cxx   |   10 
 sc/source/core/tool/formulagroup.cxx |4 -
 9 files changed, 64 insertions(+), 57 deletions(-)

New commits:
commit 20ed6886ade81ee015a22b2eb3aeff64691971bf
Author: Kohei Yoshida 
Date:   Thu Mar 6 20:45:25 2014 -0500

Allow easy toggling of threaded OpenCL kernel compilation.

Via compiler defined macro.

Change-Id: Ic20e6564d99e8ae80c15eda5d12b4dbb76ffbd36

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 67b0fb6..6f3c555 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -76,6 +76,7 @@ struct SC_DLLPUBLIC ScFormulaCellGroup : boost::noncopyable
 void setCode( const ScTokenArray& rCode );
 void compileCode(
 ScDocument& rDoc, const ScAddress& rPos, 
formula::FormulaGrammar::Grammar eGram );
+void compileOpenCLKernel();
 
 static int snCount;
 static rtl::Reference sxCompilationThread;
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index a3f1891..bb0e0b4 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -107,7 +107,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
 virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) = 0;
 virtual CompiledFormula* createCompiledFormula(ScDocument& rDoc,
const ScAddress& rTopPos,
-   ScFormulaCellGroupRef& 
xGroup,
+   ScFormulaCellGroup& rGroup,
ScTokenArray& rCode) = 0;
 virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, 
ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) = 0;
 };
@@ -122,7 +122,7 @@ public:
 virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat);
 virtual CompiledFormula* createCompiledFormula(ScDocument& rDoc,
const ScAddress& rTopPos,
-   ScFormulaCellGroupRef& 
xGroup,
+   ScFormulaCellGroup& rGroup,
ScTokenArray& rCode) 
SAL_OVERRIDE;
 virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, 
ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) SAL_OVERRIDE;
 };
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 9a328ed..821bc67 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -54,6 +54,8 @@
 
 #include 
 
+#define ENABLE_THREADED_OPENCL_KERNEL_COMPILATION 1
+
 using namespace formula;
 
 #ifdef USE_MEMPOOL
@@ -482,7 +484,16 @@ void ScFormulaCellGroup::compileCode(
 }
 }
 
+void ScFormulaCellGroup::compileOpenCLKernel()
+{
+if (meCalcState == sc::GroupCalcDisabled)
+return;
+
+mpCompiledFormula = 
sc::FormulaGroupInterpreter::getStatic()->createCompiledFormula(
+*mpTopCell->GetDocument(), mpTopCell->aPos, *this, *mpCode);
 
+meKernelState = sc::OpenCLKernelBinaryCreated;
+}
 
 ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos ) :
 eTempGrammar(formula::FormulaGrammar::GRAM_DEFAULT),
@@ -3492,8 +3503,12 @@ ScFormulaCellGroupRef ScFormulaCell::CreateCellGroup( 
SCROW nLen, bool bInvarian
 mxGroup->mbInvariant = bInvariant;
 mxGroup->mnLength = nLen;
 mxGroup->mpCode = pCode; // Move this to the shared location.
+#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION
 if (mxGroup->sxCompilationThread.is())
 mxGroup->scheduleCompilation();
+#else
+mxGroup->compileOpenCLKernel();
+#endif
 return mxGroup;
 }
 
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index ea1a7e0..3cf52f5 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3342,7 +3342,7 @@ public:
 virtual ScMatrixRef inverseMatrix( const ScMatrix& rMat ) SAL_OVERRIDE;
 virtual CompiledFormula* createCompiledFormula(ScDocument& rDoc,
const ScAddress& rTopPos,
-   ScFormulaCellGroupRef& 
xGroup,
+   ScFormulaCellGroup& rGroup,
ScTokenArray& rCode) 
SAL_OVERRIDE;
 virtual bool interpret( ScDocument& rDoc, const ScAddress& rTopPos,
 ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode 
) SA

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 Depends on||75815

-- 
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 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 OS|Windows (All)   |All

--- Comment #109 from Joel Madero  ---
Nominated bug 75815 - formulas are changing for links to external sheets which
could be a nightmare if working on complex sheets. This is a regression in 4.2

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

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

[Eike Rathke]

 sc/source/core/data/validat.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit b1119c7b80b70672f86c3415725bc0806be14981
Author: Eike Rathke 
Date:   Thu Mar 6 01:23:37 2014 +0100

resolved fdo#61520 do not add multiple empty strings to the validation list

Change-Id: I4f6180b2f8c914a965965ca362e1670e8b434d37
(cherry picked from commit 7122ef19847b26529ed1d5bad40df869e91a8495)
Reviewed-on: https://gerrit.libreoffice.org/8469
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index b7e51ba..cbd3a94 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -713,6 +713,8 @@ bool ScValidationData::GetSelectionFromFormula(
 }
 }
 
+bool bHaveEmpty = false;
+
 /* XL artificially limits things to a single col or row in the UI but does
  * not list the constraint in MOOXml. If a defined name or INDIRECT
  * resulting in 1D is entered in the UI and the definition later modified
@@ -733,6 +735,16 @@ bool ScValidationData::GetSelectionFromFormula(
 {
 aValStr = nMatVal.GetString().getString();
 
+// Do not add multiple empty strings to the validation list,
+// especially not if they'd bloat the tail with a million empty
+// entries for a column range, fdo#61520
+if (aValStr.isEmpty())
+{
+if (bHaveEmpty)
+continue;
+bHaveEmpty = true;
+}
+
 if( NULL != pStrings )
 pEntry = new ScTypedStrData( aValStr, 0.0, 
ScTypedStrData::Standard);
 
___
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' - sc/source

[Eike Rathke]

 sc/source/core/data/validat.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 3ce626c81ac4a9b4b70c61d9fa576f6ae2c85c8f
Author: Eike Rathke 
Date:   Thu Mar 6 01:23:37 2014 +0100

resolved fdo#61520 do not add multiple empty strings to the validation list

(cherry picked from commit 7122ef19847b26529ed1d5bad40df869e91a8495)

Backported.

Change-Id: I4f6180b2f8c914a965965ca362e1670e8b434d37
Reviewed-on: https://gerrit.libreoffice.org/8470
Tested-by: Kohei Yoshida 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 56902f8..b9d4260 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -710,6 +710,8 @@ bool ScValidationData::GetSelectionFromFormula(
 }
 }
 
+bool bHaveEmpty = false;
+
 /* XL artificially limits things to a single col or row in the UI but does
  * not list the constraint in MOOXml. If a defined name or INDIRECT
  * resulting in 1D is entered in the UI and the definition later modified
@@ -730,6 +732,16 @@ bool ScValidationData::GetSelectionFromFormula(
 {
 aValStr = nMatVal.GetString();
 
+// Do not add multiple empty strings to the validation list,
+// especially not if they'd bloat the tail with a million empty
+// entries for a column range, fdo#61520
+if (!aValStr.Len())
+{
+if (bHaveEmpty)
+continue;
+bHaveEmpty = true;
+}
+
 if( NULL != pStrings )
 pEntry = new ScTypedStrData( aValStr, 0.0, 
ScTypedStrData::Standard);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

4.2.2.1 FDO Reporting Data Corruption

[Joel Madero]

Hi All,

So the Sergio Callegari (reported quite a bit) has seen some data
corruption with 4.2.2.1. Unfortunately he didn't have any reproducible
steps or a file so I closed the bug but he said it was more to "raise
awareness early" which I agree with. FWIW I haven't seen any data
corruption with 4.2.2.1 but I mostly use Writer/Spreadsheet so wouldn't
necessarily notice something wrong in Presentation.

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

Like I said - not a ton to go on but maybe if someone is "on the
lookout" they'll notice and be able to provide repro steps + a test case.


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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 Depends on||75741

-- 
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 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

--- Comment #110 from Joel Madero  ---
Nomintated bug 75741 - changing named ranges is causing crashes and the crashes
can be silent (no crash but when you try to save it then crashes). It's fixed
in 4.3 but I wanted to put it here so it's backported (hopefully)

-- 
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: 2 commits - ucb/source

[Norbert Thiebaud]

 ucb/source/core/identify.cxx |   49 --
 ucb/source/core/identify.hxx |   27 +
 ucb/source/sorter/sortdynres.cxx |  180 +--
 ucb/source/sorter/sortdynres.hxx |  119 -
 4 files changed, 107 insertions(+), 268 deletions(-)

New commits:
commit edb2dcffaa94ae9949e6f76e409b9ee47a602629
Author: Norbert Thiebaud 
Date:   Thu Mar 6 23:34:18 2014 -0600

de-macroize ucb sortdynres

Change-Id: I292875fde0be3f838ad838233df11d765e4affd1

diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index f174a96..07cbfd1 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include 
 #include 
 #include 
@@ -27,7 +26,6 @@
 #include 
 #include 
 
-
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
@@ -36,8 +34,6 @@ using namespace com::sun::star::uno;
 using namespace cppu;
 
 
-
-
 //  The mutex to synchronize access to containers.
 static osl::Mutex& getContainerMutex()
 {
@@ -56,11 +52,8 @@ static osl::Mutex& getContainerMutex()
 }
 
 
-
 // SortedDynamicResultSet
 
-
-
 SortedDynamicResultSet::SortedDynamicResultSet(
 const Reference < XDynamicResultSet > &xOriginal,
 const Sequence < NumberedSortingInfo > &aOptions,
@@ -101,48 +94,37 @@ SortedDynamicResultSet::~SortedDynamicResultSet()
 mpTwo = NULL;
 }
 
+// XServiceInfo methods.
 
-// XInterface methods.
-void SAL_CALL SortedDynamicResultSet::acquire()
-throw()
+OUString SAL_CALL SortedDynamicResultSet::getImplementationName()
+throw( css::uno::RuntimeException, std::exception )
 {
-OWeakObject::acquire();
+return getImplementationName_Static();
 }
 
-void SAL_CALL SortedDynamicResultSet::release()
-throw()
+OUString SortedDynamicResultSet::getImplementationName_Static()
 {
-OWeakObject::release();
+return OUString( "com.sun.star.comp.ucb.SortedDynamicResultSet" );
 }
 
-css::uno::Any SAL_CALL SortedDynamicResultSet::queryInterface( const 
css::uno::Type & rType )
+sal_Bool SAL_CALL SortedDynamicResultSet::supportsService( const OUString& 
ServiceName )
 throw( css::uno::RuntimeException, std::exception )
 {
-css::uno::Any aRet = cppu::queryInterface( rType,
-   (static_cast< XTypeProvider* 
>(this)),
-   (static_cast< XServiceInfo* 
>(this)),
-   (static_cast< XComponent* 
>(this)),
-   (static_cast< 
XDynamicResultSet* >(this))
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+return cppu::supportsService( this, ServiceName );
 }
 
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_3( SortedDynamicResultSet,
-  XTypeProvider,
- XServiceInfo,
-  XDynamicResultSet );
-
-
-// XServiceInfo methods.
-
-
-XSERVICEINFO_NOFACTORY_IMPL_1( SortedDynamicResultSet,
-   OUString( 
"com.sun.star.comp.ucb.SortedDynamicResultSet" ),
-   OUString( DYNAMIC_RESULTSET_SERVICE_NAME ) 
);
+css::uno::Sequence< OUString > SAL_CALL 
SortedDynamicResultSet::getSupportedServiceNames()
+throw( css::uno::RuntimeException, std::exception )
+{
+return getSupportedServiceNames_Static();
+}
 
+css::uno::Sequence< OUString > 
SortedDynamicResultSet::getSupportedServiceNames_Static()
+{
+css::uno::Sequence< OUString > aSNS( 1 );
+aSNS.getArray()[ 0 ] = OUString( DYNAMIC_RESULTSET_SERVICE_NAME );
+return aSNS;
+}
 
 // XComponent methods.
 
@@ -167,7 +149,6 @@ void SAL_CALL SortedDynamicResultSet::dispose()
 mbUseOne = sal_True;
 }
 
-
 void SAL_CALL SortedDynamicResultSet::addEventListener(
 const Reference< XEventListener >& Listener )
 throw( RuntimeException, std::exception )
@@ -181,7 +162,6 @@ void SAL_CALL SortedDynamicResultSet::addEventListener(
 mpDisposeEventListeners->addInterface( Listener );
 }
 
-
 void SAL_CALL SortedDynamicResultSet::removeEventListener(
 const Reference< XEventListener >& Listener )
 throw( RuntimeException, std::exception )
@@ -236,8 +216,7 @@ SortedDynamicResultSet::setListener( const Reference< 
XDynamicResultSetListener
 
 
 void SAL_CALL
-SortedDynamicResultSet::connectToCache(
-const Reference< XDynamicResultSet > & xCache )
+SortedDynamicResultSet::connectToCache( const Reference< XDynamicResultSet > & 
xCache )
 throw( ListenerAlreadySetException,
AlreadyInitializedException,
ServiceNotFoundException,
@@ -272,8 +251,7 @@ SortedDynamicResultSet::connectT

LibreOffice Gerrit News for core on 2014-03-07

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ fdo#75158 : Handled unsupported fields for docx file.
  in https://gerrit.libreoffice.org/8391 from Sushil Shinde
  about module odk, offapi, sw, writerfilter
+ fdo#63154 Remove old solar.h references
  in https://gerrit.libreoffice.org/8480 from Alexandre Vicenzi
  about module filter, include
+ Do not convert SVGs to JPEGs when editing with external tool
  in https://gerrit.libreoffice.org/8479 from Alex Henrie
  about module svx
+ Moved the linked files from sw/source/ui to a new sw/source/core/uibase d
  in https://gerrit.libreoffice.org/8447 from Roopak T J
  about module sw
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
  about module sw
 End of freshness 

+ RFC: Find places where OUString and OString are passed by value.
  in https://gerrit.libreoffice.org/8478 from Noel Grandin
  about module accessibility, comphelper, compilerplugins, cppcanvas, 
cppuhelper, desktop, drawinglayer, include, jvmfwk, sot, svl, svtools, unoidl, 
unotools, vcl
+ fdo#74775: Preseved Citation after round trip.
  in https://gerrit.libreoffice.org/8473 from Rohit Deshmukh
  about module sw, writerfilter


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

+ Build webdav based on serf if neon is disabled.
  in https://gerrit.libreoffice.org/8465 from Matúš Kukan
+ Add apr and serf externals for alternative webdav implementation.
  in https://gerrit.libreoffice.org/8353 from Matúš Kukan
+ Icon redux 01: Remove old draft view icons
  in https://gerrit.libreoffice.org/8363 from Andrew Dent
+ Icon redux 01: Optimised help images
  in https://gerrit.libreoffice.org/8404 from Andrew Dent
+ use WeakImplHelper for ActivaDataSink
  in https://gerrit.libreoffice.org/8471 from Norbert Thiebaud


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

+ fdo#71984 fix first line indentation in footnotes for MS Word documents
  in https://gerrit.libreoffice.org/8160 from Andras Timar
+ fd0#74150:Numbered list getting display after RT -table-within-table-1.do
  in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji
+ fdo#74111 3D Rotation is wrong after Round trip for pie chart
  in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ fdo#51525 Fix duplicate "Paste Special" entries in Calc.
  in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ fdo#72661: Check ‘Hyphenation active’ automatically
  in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ sa/l add release_assert() and assert that stay even in release code
  in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud
+ fdo#69407: On transparent frames, shadows are painted in foreground.
  in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
+ WIP fdo#72987 Use firebird backup format for .odb
  in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ fix for exporting of text watermark to DOCX
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
+ startcenter: Make SC open faster by timeouting thumbnails
  in https://gerrit.libreoffice.org/6102 from Krisztian Pinter
+ Simplify oslThreadIdentifier on Linux 32.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn


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

Re: Current Build from Git: Writer-Wizards don't run

[Jean-Baptiste Faure]

Hi Stephan,

Le 06/03/2014 20:33, Stephan Bergmann a écrit :
> On Mar 6, 2014, at 7:19 PM, Stephan Bergmann wrote:
>> Now, "File - Wizards - Document Converter" runs Main from 
>> wizards/source/importwizard/Main.xba, which in GetImportWizardPaths expects 
>> to obtain a non-empty "Template_writable" from css.util.PathSettings, and 
>> otherwise silently exits early.  (Which is a consequence of 
>> 
>>  "Resolves: rhbz#1065807 use xdg ~/Templates for default Template location," 
>> not 
>> 
>>  "install:module s must be mutually exclusive.")
>>
>> The configmgr's oor:external mechanism is not an "overlay" feature
> 
> …except that it is, in that it allows the backend to report back a 
> css::beans::Optional with !IsPresent to let configmgr use an already present 
> value---even one from the same layer (which had confused me, but for which we 
> already have prior art, e.g., in 
> officecfg/registry/data/org/openoffice/VCL.xcu).
> 
> So it was indeed 768ea2924680fc4beb75a782cb0faf26695fee53 which broke things, 
> reverted now as 71ed01e2edb27d09104a412425d5b99247efa4d4. Sorry for the noise 
> and trouble.
> 
> Jean-Baptiste, does that fix it for you?

Yes, it is fixed for me at build ID
1b2b8f8d5aa1e402c31ee9853dd0ec229d3a32b7
Now the wizard Document Converter starts as expected. :-)

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Norbert Thiebaud]

 ucb/source/sorter/sortdynres.cxx |2 
 ucb/source/sorter/sortdynres.hxx |1 
 ucb/source/sorter/sortresult.cxx |  114 ---
 ucb/source/sorter/sortresult.hxx |   53 --
 4 files changed, 51 insertions(+), 119 deletions(-)

New commits:
commit 50de43d6b40096747655c291ed4266e07680e679
Author: Norbert Thiebaud 
Date:   Fri Mar 7 00:36:17 2014 -0600

de-macroize ucb sortresult

Change-Id: Ib522fde5e453560b23c0189a29b50f5dfddb4482

diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 07cbfd1..07f7dc6 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -20,11 +20,13 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index 0f70026..eb5bbb6 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "sortresult.hxx"
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 22577ca..035f7ec 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -20,16 +20,17 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 
-
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 using namespace com::sun::star::io;
@@ -90,10 +91,8 @@ struct SortListData
 
 
 
-class SRSPropertySetInfo :
-public OWeakObject,
-public XTypeProvider,
-public XPropertySetInfo
+class SRSPropertySetInfo : public cppu::WeakImplHelper1 <
+XPropertySetInfo >
 {
 PropertymaProps[2];
 
@@ -103,17 +102,6 @@ public:
 SRSPropertySetInfo();
 virtual ~SRSPropertySetInfo();
 
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType )
-throw( css::uno::RuntimeException, std::exception );
-virtual void SAL_CALL acquire()
-throw();
-virtual void SAL_CALL release()
-throw();
-
-// XTypeProvider
-XTYPEPROVIDER_DECL()
-
 // XPropertySetInfo
 virtual Sequence< Property > SAL_CALL getProperties()
 throw( RuntimeException, std::exception );
@@ -208,58 +196,37 @@ SortedResultSet::~SortedResultSet()
 }
 
 
-// XInterface methods.
+// XServiceInfo methods.
 
-void SAL_CALL SortedResultSet::acquire()
-throw()
+OUString SAL_CALL SortedResultSet::getImplementationName()
+throw( css::uno::RuntimeException, std::exception )
 {
-OWeakObject::acquire();
+return getImplementationName_Static();
 }
 
-void SAL_CALL SortedResultSet::release()
-throw()
+OUString SortedResultSet::getImplementationName_Static()
 {
-OWeakObject::release();
+return OUString( "com.sun.star.comp.ucb.SortedResultSet" );
 }
 
-css::uno::Any SAL_CALL SortedResultSet::queryInterface( const css::uno::Type & 
rType )
+sal_Bool SAL_CALL SortedResultSet::supportsService( const OUString& 
ServiceName )
 throw( css::uno::RuntimeException, std::exception )
 {
-css::uno::Any aRet = cppu::queryInterface( rType,
-   (static_cast< XTypeProvider* 
>(this)),
-   (static_cast< XServiceInfo* 
>(this)),
-   (static_cast< XComponent* 
>(this)),
-   (static_cast< XContentAccess* 
>(this)),
-   (static_cast< XResultSet* 
>(this)),
-   (static_cast< XRow* >(this)),
-   (static_cast< XCloseable* 
>(this)),
-   (static_cast< 
XResultSetMetaDataSupplier* >(this)),
-   (static_cast< XPropertySet* 
>(this))
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+return cppu::supportsService( this, ServiceName );
 }
 
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_9( SortedResultSet,
-  XTypeProvider,
-  XServiceInfo,
-  XComponent,
-  XContentAccess,
-  XResultSet,
-  XRow,
-  XCloseable,
-  XResultSetMetaDataSupplier,
-  XPropertySet );
-
-
-// XServiceInfo methods.
-
+css::uno::Sequence< OUString > SAL_CALL 
SortedResultSet::getSupportedServiceNames()
+throw( css::uno::RuntimeException, std::exception )
+{
+retur

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

[Takeshi Abe]

 vcl/generic/print/bitmap_gfx.cxx|   36 +++-
 vcl/source/app/dbggui.cxx   |4 ++--
 vcl/source/edit/texteng.cxx |5 +++--
 vcl/source/filter/graphicfilter.cxx |   15 ++-
 vcl/source/gdi/bitmapex.cxx |   19 ++-
 5 files changed, 32 insertions(+), 47 deletions(-)

New commits:
commit e0e2f4c988af9dc73c7b3ce086efddc0a918406d
Author: Takeshi Abe 
Date:   Fri Mar 7 16:34:17 2014 +0900

Avoid possible resource leaks with boost::scoped_ptr

Change-Id: I835bec5c43b7b4a8638d5032b720661fc2f1397f

diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx
index 6ea8e33..f929944 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/generic/print/bitmap_gfx.cxx
@@ -23,6 +23,8 @@
 #include "generic/printergfx.hxx"
 #include "vcl/strhelper.hxx"
 
+#include 
+
 namespace psp {
 
 const sal_uInt32 nLineLength = 80;
@@ -489,7 +491,7 @@ PrinterGfx::DrawPS1GrayImage (const PrinterBmp& rBitmap, 
const Rectangle& rArea)
 WritePS (mpPageBody, pGrayImage);
 
 // image body
-HexEncoder* pEncoder = new HexEncoder (mpPageBody);
+boost::scoped_ptr pEncoder(new HexEncoder (mpPageBody));
 
 for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++)
 {
@@ -500,7 +502,7 @@ PrinterGfx::DrawPS1GrayImage (const PrinterBmp& rBitmap, 
const Rectangle& rArea)
 }
 }
 
-delete pEncoder;
+pEncoder.reset();
 
 WritePS (mpPageBody, "\n");
 }
@@ -572,8 +574,8 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap, 
psp::ImageType nType)
 nChar += psp::appendStr ("\npsp_ascii85string\n", pImage + 
nChar);
 WritePS (mpPageBody, pImage);
 
-ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody)
-  : new 
Ascii85Encoder(mpPageBody);
+boost::scoped_ptr pEncoder(mbCompressBmp ? new 
LZWEncoder(mpPageBody)
+: new 
Ascii85Encoder(mpPageBody));
 for (sal_uInt32 i = 0; i < nSize; i++)
 {
 PrinterColor aColor = rBitmap.GetPaletteColor(i);
@@ -582,7 +584,7 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap, 
psp::ImageType nType)
 pEncoder->EncodeByte (aColor.GetGreen());
 pEncoder->EncodeByte (aColor.GetBlue());
 }
-delete pEncoder;
+pEncoder.reset();
 
 WritePS (mpPageBody, "pop ] setcolorspace\n");
 }
@@ -597,8 +599,8 @@ PrinterGfx::DrawPS2GrayImage (const PrinterBmp& rBitmap, 
const Rectangle& rArea)
 writePS2Colorspace(rBitmap, psp::GrayScaleImage);
 writePS2ImageHeader(rArea, psp::GrayScaleImage);
 
-ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody)
-  : new Ascii85Encoder(mpPageBody);
+boost::scoped_ptr pEncoder(mbCompressBmp ? new 
LZWEncoder(mpPageBody)
+: new Ascii85Encoder(mpPageBody));
 
 for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++)
 {
@@ -608,8 +610,6 @@ PrinterGfx::DrawPS2GrayImage (const PrinterBmp& rBitmap, 
const Rectangle& rArea)
 pEncoder->EncodeByte (nByte);
 }
 }
-
-delete pEncoder;
 }
 
 void
@@ -618,8 +618,8 @@ PrinterGfx::DrawPS2MonoImage (const PrinterBmp& rBitmap, 
const Rectangle& rArea)
 writePS2Colorspace(rBitmap, psp::MonochromeImage);
 writePS2ImageHeader(rArea, psp::MonochromeImage);
 
-ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody)
-  : new Ascii85Encoder(mpPageBody);
+boost::scoped_ptr pEncoder(mbCompressBmp ? new 
LZWEncoder(mpPageBody)
+: new Ascii85Encoder(mpPageBody));
 
 for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++)
 {
@@ -643,8 +643,6 @@ PrinterGfx::DrawPS2MonoImage (const PrinterBmp& rBitmap, 
const Rectangle& rArea)
 if (nBitPos != 0)
 pEncoder->EncodeByte (nByte);
 }
-
-delete pEncoder;
 }
 
 void
@@ -653,8 +651,8 @@ PrinterGfx::DrawPS2PaletteImage (const PrinterBmp& rBitmap, 
const Rectangle& rAr
 writePS2Colorspace(rBitmap, psp::PaletteImage);
 writePS2ImageHeader(rArea, psp::PaletteImage);
 
-ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody)
-  : new Ascii85Encoder(mpPageBody);
+boost::scoped_ptr pEncoder(mbCompressBmp ? new 
LZWEncoder(mpPageBody)
+: new Ascii85Encoder(mpPageBody));
 
 for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++)
 {
@@ -664,8 +662,6 @@ PrinterGfx::DrawPS2PaletteImage (const PrinterBmp& rBitmap, 
const Rectangle& rAr
 pEncoder->EncodeByte (nByte);
 }
 }
-
-delete pEncoder;
 }
 
 void
@@ -674,8 +670,8 @@ PrinterGfx::Draw

Sujay License Statement

[Sujay m]

All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - include/oox oox/source svx/source

[Muthu Subramanian]

 include/oox/drawingml/shapepropertymap.hxx |3 +++
 oox/source/drawingml/fillproperties.cxx|4 +++-
 oox/source/drawingml/shapepropertymap.cxx  |   16 +++-
 svx/source/xoutdev/xattrbmp.cxx|4 +++-
 4 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit a678e5d76af54eaefb883c5ef95d3b8adf3c943a
Author: Muthu Subramanian 
Date:   Fri Mar 7 13:03:46 2014 +0530

n#821567: Use BitmapURL only if its valid.

Ported bf2ff0468e06770f9320c652a2332f7ec137d061

diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index d2a5566..a24fce6 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -605,7 +605,9 @@ bool XFillBitmapItem::PutValue( const 
::com::sun::star::uno::Any& rVal, sal_uInt
 }
 if( bSetURL )
 {
-maGraphicObject  = GraphicObject::CreateGraphicObjectFromURL(aURL);
+GraphicObject aGraphicObject  = 
GraphicObject::CreateGraphicObjectFromURL(aURL);
+if( aGraphicObject.GetType() != GRAPHIC_NONE )
+maGraphicObject = aGraphicObject;
 }
 if( bSetBitmap )
 {
commit 56ca700e8304dd78a1b1dcbd9f3440d7247dd955
Author: Muthu Subramanian 
Date:   Fri Mar 7 13:00:06 2014 +0530

n#821567: Import PPTX background images with table-name.

Ported 2ec4d410de5bd98527336a9dc49abb76656373df

diff --git a/include/oox/drawingml/shapepropertymap.hxx 
b/include/oox/drawingml/shapepropertymap.hxx
index 8018752..a18276d 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -63,6 +63,7 @@ enum ShapePropertyId
 SHAPEPROP_FillBitmapRectanglePoint,
 SHAPEPROP_FillHatch,
 SHAPEPROP_ShadowXDistance,
+SHAPEPROP_FillBitmapNameFromUrl,
 SHAPEPROP_END
 };
 
@@ -128,6 +129,8 @@ private:
 boolsetGradientTrans( sal_Int32 nPropId, const 
::com::sun::star::uno::Any& rValue );
 /** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. 
*/
 boolsetFillBitmapUrl( sal_Int32 nPropId, const 
::com::sun::star::uno::Any& rValue );
+/** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName 
*/
+boolsetFillBitmapNameFromUrl( sal_Int32 nPropId, const 
::com::sun::star::uno::Any& rValue );
 
 // not implemented, to prevent implicit conversion from enum to int
 ::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId );
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index bdc2c2f..d64c195 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -421,7 +421,9 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 
 OUString aGraphicUrl = rGraphicHelper.createGraphicObject( 
xGraphic );
 // push bitmap or named bitmap to property map
-if( !aGraphicUrl.isEmpty() && rPropMap.setProperty( 
SHAPEPROP_FillBitmapUrl, aGraphicUrl ) )
+if( !aGraphicUrl.isEmpty() && rPropMap.supportsProperty( 
SHAPEPROP_FillBitmapNameFromUrl ) && rPropMap.setProperty( 
SHAPEPROP_FillBitmapNameFromUrl, aGraphicUrl ) )
+eFillStyle = FillStyle_BITMAP;
+else if( !aGraphicUrl.isEmpty() && rPropMap.setProperty( 
SHAPEPROP_FillBitmapUrl, aGraphicUrl ) )
 eFillStyle = FillStyle_BITMAP;
 
 // set other bitmap properties, if bitmap has been 
inserted into the map
diff --git a/oox/source/drawingml/shapepropertymap.cxx 
b/oox/source/drawingml/shapepropertymap.cxx
index ff02dd5..fe985db 100644
--- a/oox/source/drawingml/shapepropertymap.cxx
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -47,7 +47,8 @@ static const sal_Int32 spnDefaultShapeIds[ SHAPEPROP_END ] =
 PROP_FillBitmapURL, PROP_FillBitmapMode, PROP_FillBitmapSizeX, 
PROP_FillBitmapSizeY,
 PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, 
PROP_FillBitmapRectanglePoint,
 PROP_FillHatch,
-PROP_ShadowXDistance
+PROP_ShadowXDistance,
+PROP_FillBitmapName
 };
 
 } // namespace
@@ -108,6 +109,9 @@ bool ShapePropertyMap::setAnyProperty( ShapePropertyId 
ePropId, const Any& rValu
 case SHAPEPROP_FillBitmapUrl:
 return setFillBitmapUrl( nPropId, rValue );
 
+case SHAPEPROP_FillBitmapNameFromUrl:
+return setFillBitmapNameFromUrl( nPropId, rValue );
+
 default:;   // suppress compiler warnings
 }
 
@@ -195,6 +199,16 @@ bool ShapePropertyMap::setFillBitmapUrl( sal_Int32 
nPropId, const Any& rValue )
 return false;
 }
 
+bool ShapePropertyMap::setFillBitmapNameFromUrl( sal_Int32 /*nPropId*/, const 
Any& rValue )
+{
+if( rValue.has< OUString >() )
+{
+OUString aBitmapUrlName = mrModelObjHelper.insertFillBitmapUrl( 
rValue.get< OUString >() );
+return !aBitmapUrlName.isEmpty() && setProperty( P