date:20120809

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

Bug 6 depends on bug 53252, which changed state.

Bug 53252 Summary: UI: CRASH when edit LibO File Dialog Path Pane
https://bugs.freedesktop.org/show_bug.cgi?id=53252

   What|Old Value   |New Value

 Resolution|DUPLICATE   |
 Status|RESOLVED|UNCONFIRMED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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

fdo#51004 replace mozilla address book parser -- help appreciated

2012-08-09 Thread David Ostrovsky


Hi,

i asked a couple of questions on mork driver implementation in the 
comment to that bugzilla issue:

https://bugs.freedesktop.org/show_bug.cgi?id=51004
and still didn't get any answer. So i reasking it here.

The question is basically where can i borrow the sql parser that 
delegate to the new mork parser

(before i write it from scratch ;-)

http://cgit.freedesktop.org/libreoffice/core/tree/connectivity/source/drivers/mork/MStatement.cxx?h=feature/mork#n79
http://cgit.freedesktop.org/libreoffice/core/tree/connectivity/source/drivers/mork/MStatement.cxx?h=feature/mork#n201

The code is in feature/mork branch.

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

Re: Help Locating Base Code

Hi Joel,

Joel Madero píše v St 08. 08. 2012 v 18:35 -0700:

 Thanks for the advice. Unfortunately every time I run run and get into 
 database I get a segfault in gdb.
 
 Program received signal SIGSEGV, Segmentation fault.
 [Switching to Thread 0x7fffc2d06700 (LWP 4977)]

To see where it crashed, do 'bt' in gdb - that will show you backtrace
of the crash.  If it looks unrelated, do 'thread apply all bt' which
will show backtrace of all threads.

 Not sure why. Also mine looks nothing like Lionel's did when he ran gdb. 
 Mine looks more like this:

After issuing 'bt' (Lionel's and look at the backtrace), you should
see something similar to Lionel's output :-)

All the best,
Kendy

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

Re: git review

Hi David,

David Tardon píše v Čt 09. 08. 2012 v 07:17 +0200:

  We will loose possible contributors that way. Not an option. Patch submittal
  has to work hasslefree and out of the box. This is really critical: there 
  has
  to be no extra step at all for patch submittal otherwise we failed.
 
 irony
 It has worked hasslefree and out of the box while we have been using
 email.
 /irony

It was a precondition for the gerrit work that the email submission +
direct push must still be possible, and I for one will make sure this is
still so ;-)

Regards,
Kendy

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

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

 svx/inc/tbunosearchcontrollers.hxx |5 +
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |   20 
 2 files changed, 25 insertions(+)

New commits:
commit 0d2abfdbd4a8f8ea1a46fcfd84270e30e45f967c
Author: Zolnai TamÃ¡s zolniata...@caesar.elte.hu
Date:   Wed Aug 8 20:50:35 2012 +0200

fdo#49750 Search Toolbar keeps its history

Until now, only the ToolBar's TextField stored the history, but
this is destructed when ToolBar is closed. The Manager class is alive
in case of Toolbar's invisibility, so I made this class to store history
temporarly.

Change-Id: I816dd3c8344ab4e6caaeb2cccf390d3042fd

diff --git a/svx/inc/tbunosearchcontrollers.hxx 
b/svx/inc/tbunosearchcontrollers.hxx
index 032662c..91ddec8 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -46,6 +46,7 @@
 #include vcl/window.hxx
 
 #include map
+#include vector
 
 namespace css = ::com::sun::star;
 namespace svx
@@ -86,11 +87,15 @@ public:
 void freeController ( const css::uno::Reference css::frame::XFrame  
xFrame, const css::uno::Reference css::frame::XStatusListener  
xStatusListener, const ::rtl::OUString sCommandURL );
 css::uno::Reference css::frame::XStatusListener  findController( const 
css::uno::Reference css::frame::XFrame  xFrame, const ::rtl::OUString 
sCommandURL );
 
+void saveSearchHistory(const FindTextFieldControl* 
m_pFindTextFieldControl);
+void loadSearchHistory(FindTextFieldControl* m_pFindTextFieldControl);
+
 private:
 
 typedef ::comphelper::SequenceAsVector css::beans::PropertyValue  
SearchToolbarControllersVec;
 typedef ::std::map css::uno::Reference css::frame::XFrame , 
SearchToolbarControllersVec  SearchToolbarControllersMap;
 SearchToolbarControllersMap aSearchToolbarControllersMap;
+std::vectorrtl::OUStringaSearchStrings;
 
 };
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx 
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index e58bd7f..2ad1cb1 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -246,6 +246,24 @@ SearchToolbarControllersManager 
SearchToolbarControllersManager::createControll
 return theSearchToolbarControllersManager::get();
 }
 
+void SearchToolbarControllersManager::saveSearchHistory(const 
FindTextFieldControl* m_pFindTextFieldControl)
+{
+sal_uInt16 nECount( m_pFindTextFieldControl-GetEntryCount() );
+aSearchStrings.resize( nECount );
+for( sal_uInt16 i=0; inECount; ++i )
+{
+aSearchStrings[i] = m_pFindTextFieldControl-GetEntry(i);
+}
+}
+
+void SearchToolbarControllersManager::loadSearchHistory(FindTextFieldControl* 
m_pFindTextFieldControl)
+{
+for( sal_uInt16 i=0; iaSearchStrings.size(); ++i )
+{
+   m_pFindTextFieldControl-InsertEntry(aSearchStrings[i],i);
+}
+}
+
 void SearchToolbarControllersManager::registryController( const 
css::uno::Reference css::frame::XFrame  xFrame, const css::uno::Reference 
css::frame::XStatusListener  xStatusListener, const ::rtl::OUString 
sCommandURL )
 {
 SearchToolbarControllersMap::iterator pIt = 
aSearchToolbarControllersMap.find(xFrame);
@@ -382,6 +400,7 @@ void SAL_CALL FindTextToolbarController::dispose() throw ( 
css::uno::RuntimeExce
 
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
 css::uno::Reference css::frame::XStatusListener (static_cast 
::cppu::OWeakObject* (this), css::uno::UNO_QUERY), m_aCommandURL);
 
 svt::ToolboxController::dispose();
+
SearchToolbarControllersManager::createControllersManager().saveSearchHistory(m_pFindTextFieldControl);
 delete m_pFindTextFieldControl;
 m_pFindTextFieldControl = 0;
 }
@@ -428,6 +447,7 @@ css::uno::Reference css::awt::XWindow  SAL_CALL 
FindTextToolbarController::cre
 Size aSize(250, m_pFindTextFieldControl-GetTextHeight() + 200);
 m_pFindTextFieldControl-SetSizePixel( aSize );
 m_pFindTextFieldControl-SetModifyHdl(LINK(this, 
FindTextToolbarController, EditModifyHdl));
+
SearchToolbarControllersManager::createControllersManager().loadSearchHistory(m_pFindTextFieldControl);
 }
 xItemWindow = VCLUnoHelper::GetInterface( m_pFindTextFieldControl );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] fdo#49750 Search Findbar's History

Hi Tamás,

On Wed, Aug 08, 2012 at 09:35:26PM +0200, zolniata...@caesar.elte.hu wrote:
This patch make the mentioned Toolbar to remember the searched
 strings after
 closing and reopening. Details in patch description.

Great, thanks for this!

Pushed now to master.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: svtools/source

 svtools/source/filter/wmf/winwmf.cxx |   67 +++
 1 file changed, 61 insertions(+), 6 deletions(-)

New commits:
commit 919632bd5e6ab0e7fab1fccb588e9535df64c75d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Aug 8 21:39:50 2012 +0100

validate polypolygon point counts

Change-Id: Ibf6bdf48e5855583f14cd2be36f1e4896a396d32

diff --git a/svtools/source/filter/wmf/winwmf.cxx 
b/svtools/source/filter/wmf/winwmf.cxx
index abcc09b..e2c7421 100644
--- a/svtools/source/filter/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
@@ -28,6 +28,7 @@
 
 
 #include winmtf.hxx
+#include boost/scoped_array.hpp
 #include vcl/gdimtf.hxx
 #include svtools/wmf.hxx
 #include rtl/crc.h
@@ -354,28 +355,55 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
 
 case W_META_POLYPOLYGON:
 {
+bool bRecordOk = true;
 sal_uInt16  nPoly = 0;
 Point*  pPtAry;
 // Number of polygons:
 *pWMF  nPoly;
 // Number of points of each polygon. Determine total number of 
points
-sal_uInt16* pnPoints = new sal_uInt16[ nPoly ];
+boost::scoped_arraysal_uInt16 xPolygonPointCounts(new 
sal_uInt16[nPoly]);
+sal_uInt16* pnPoints = xPolygonPointCounts.get();
 sal_uInt16 nPoints = 0;
 for(sal_uInt16 i = 0; i  nPoly; i++ )
 {
 *pWMF  pnPoints[i];
+
+if (pnPoints[i]  SAL_MAX_UINT16 - nPoints)
+{
+bRecordOk = false;
+break;
+}
+
 nPoints += pnPoints[i];
 }
+
+SAL_WARN_IF(!bRecordOk, svtools, polypolygon record has more 
polygons that we can handle);
+
+bRecordOk = pWMF-good();
+
+if (!bRecordOk)
+{
+pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
+break;
+}
+
 // Polygon points are:
-pPtAry  = new Point[nPoints];
+boost::scoped_arrayPoint xPolygonPoints(new Point[nPoints]);
+pPtAry = xPolygonPoints.get();
 for (sal_uInt16 i = 0; i  nPoints; i++ )
 pPtAry[ i ] = ReadPoint();
 
+bRecordOk = pWMF-good();
+
+if (!bRecordOk)
+{
+pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
+break;
+}
+
 // Produce PolyPolygon Actions
 PolyPolygon aPolyPoly( nPoly, pnPoints, pPtAry );
 pOut-DrawPolyPolygon( aPolyPoly );
-delete[] pPtAry;
-delete[] pnPoints;
 }
 break;
 
@@ -1329,16 +1357,43 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle 
rPlaceableBound, SvStream* pSt
 
 case W_META_POLYPOLYGON:
 {
+bool bRecordOk = true;
 sal_uInt16 nPoly, nPoints = 0;
 *pStm  nPoly;
 for(sal_uInt16 i = 0; i  nPoly; i++ )
 {
-sal_uInt16 nP;
+sal_uInt16 nP = 0;
 *pStm  nP;
-nPoints = nPoints + nP;
+if (nP  SAL_MAX_UINT16 - nPoints)
+{
+bRecordOk = false;
+break;
+}
+nPoints += nP;
 }
+
+SAL_WARN_IF(!bRecordOk, svtools, polypolygon record has 
more polygons that we can handle);
+
+bRecordOk = pStm-good();
+
+if (!bRecordOk)
+{
+pStm-SetError( SVSTREAM_FILEFORMAT_ERROR );
+bRet = sal_False;
+break;
+}
+
 for (sal_uInt16 i = 0; i  nPoints; i++ )
 GetWinExtMax( ReadPoint(), rPlaceableBound, nMapMode );
+
+bRecordOk = pStm-good();
+
+if (!bRecordOk)
+{
+pStm-SetError( SVSTREAM_FILEFORMAT_ERROR );
+bRet = sal_False;
+break;
+}
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - android/experimental

 android/experimental/DocumentLoader/build.xml  
  |1 -
 
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 |3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cc37b54230db4124212c053741a01acdea9f4c93
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 9 10:52:22 2012 +0300

Silence the annoyingly verbose vcl OSL_TRACEs

Change-Id: Ibd7c6ac56e56cf0e3e706a905603ef1a17a4579c

diff --git 
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 993a87c..97797df 100644
--- 
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ 
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -928,7 +928,8 @@ public class DocumentLoader
 
 Bootstrap.setup(this);
 
-Bootstrap.putenv(SAL_LOG=yes);
+// Avoid all the old style OSL_TRACE calls especially in vcl
+Bootstrap.putenv(SAL_LOG=+WARN+INFO-INFO.legacy.osl);
 
 // Load a lot of shlibs here explicitly in advance because that
 // makes debugging work better, sigh
commit e8533bb02800b86f143adfa6b675c1d48df1e7e8
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 9 10:22:09 2012 +0300

Fix edit mistake, the point is to not include the SDK build.xml here

Change-Id: I3cfd5819be8075869906dac3b963b4d0b2cf2890

diff --git a/android/experimental/DocumentLoader/build.xml 
b/android/experimental/DocumentLoader/build.xml
index e21b67b..a35fbcc 100644
--- a/android/experimental/DocumentLoader/build.xml
+++ b/android/experimental/DocumentLoader/build.xml
@@ -80,6 +80,5 @@
  in order to avoid having your file be overridden by tools such as 
android update project
 --
 !-- version-tag: custom --
-import file=${sdk.dir}/tools/ant/build.xml /
 import file=${android.library.reference.1}/no-resource-compress.xml /
 /project
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - configure.in

 configure.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 130a064c29f218699c0b64b50367b3ddd3a3d2db
Author: Tomas Chvatal tchva...@suse.cz
Date:   Wed Aug 8 21:10:17 2012 +0200

Use LIBS not LDFLAGS to not fail with enforced as-needed.

Change-Id: Ia27e97c12e9a8f36e106c9ae3c399cd776433387
(cherry picked from commit 0c7617a388d8e2e3a0d6c451b6412a5d32dd3d6e)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/configure.in b/configure.in
index 2dd9390..444cf82 100644
--- a/configure.in
+++ b/configure.in
@@ -6833,8 +6833,8 @@ if test $ENABLE_MYSQLC = YES; then
 [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ 
Connectivity)], [])
 AC_CHECK_LIB([mysqlcppconn], [main], [:],
 [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or 
functional)], [])
-save_LDFLAGS=$LDFLAGS
-LDFLAGS=$LDFLAGS -lmysqlcppconn
+save_LIBS=$LIBS
+LIBS=$LIBS -lmysqlcppconn
 AC_MSG_CHECKING([version])
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include mysql_driver.h
@@ -6852,7 +6852,7 @@ int main(int argc, char **argv) {
   ]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need = 
1.0.6])],[])
 
 AC_LANG_POP([C++])
-LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
 else
 AC_MSG_RESULT([internal])
 AC_MSG_CHECKING([for mysqlcppconn module])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/experimental

 
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
 |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3adeac41a0efe960baa488ec3e49cba931165029
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 9 10:57:51 2012 +0300

Reduce the legacy.osl logging verbosity here, too

BTW, do we really need/want this (outdated) fork of DocumentLoader?
Either LibreOffice4Android should use the real DocumentLoader class
(and that should then be modified as necessary, but making sure it
still works as a separate test app), or this fork should be called
something else and be radically different.

Change-Id: I8536336140ee0190d01d35dde1a4c78e7b22c6bd

diff --git 
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
 
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index 2e731a5..c470375 100644
--- 
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++ 
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -1011,7 +1011,8 @@ public class DocumentLoader
 
 Bootstrap.setup(this);
 
-Bootstrap.putenv(SAL_LOG=yes);
+// Avoid all the old style OSL_TRACE calls especially in vcl
+Bootstrap.putenv(SAL_LOG=+WARN+INFO-INFO.legacy.osl);
 
 // Load a lot of shlibs here explicitly in advance because that
 // makes debugging work better, sigh
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 3-6] OOX Crash fix.

2012-08-09 Thread Muthu Subramanian K


Hi,

It would be nice if somebody could review and cherry pick the patch
http://cgit.freedesktop.org/libreoffice/core/commit/?id=36233b158b5de6c474f06c8c8772f0012b191baa
to the 3.6 branch, please?

Thank you!
Muthu Subramanian

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/source

 oox/source/drawingml/table/tablecell.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6e91a401501ada01b3e9b814a5c9fa398b3f74bb
Author: Muthu Subramanian sumu...@suse.com
Date:   Tue Aug 7 16:14:13 2012 +0530

n#774167: Crash fix.
(cherry picked from commit 36233b158b5de6c474f06c8c8772f0012b191baa)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index f68f766..af0105c 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -367,7 +367,8 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase rFilterBase, ::oo
 aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() );
 PropertySet( xPropSet ).setProperties( aPropMap );
 
-getTextBody()-insertAt( rFilterBase, xText, xAt, aTextStyleProps, 
pMasterTextListStyle );
+if( getTextBody() )
+getTextBody()-insertAt( rFilterBase, xText, xAt, aTextStyleProps, 
pMasterTextListStyle );
 }
 
 } } }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED][3-6] Re: [REVIEW 3-6] OOX Crash fix.

On 09/08/12 10:13, Muthu Subramanian K wrote:
 Hi,
 
 It would be nice if somebody could review and cherry pick the patch
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=36233b158b5de6c474f06c8c8772f0012b191baa
 to the 3.6 branch, please?

looks fine, pushed to libreoffice-3-6


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

[REVIEW-3-6] Java com.sun.star.comp.helper.Bootstrap.cppuhelper_bootstrap fixes

For various reasons, bootstrapping UNO in a Java process (i.e., one 
started by calling the java executable) got broken (at least 
bootstrapping native, binary UNO in such a process, by calling 
com.sun.star.comp.helper.Bootstrap.cppuhelper_bootstrap).  This does not 
affect LO itself, but can affect external Java applications that use LO.


So please review the relevant fixes

http://cgit.freedesktop.org/libreoffice/core/commit/?id=e7a02843e54e1b64e2078549af110beaccf50348 
Export JNI functions from juh, juhx libs


and

http://cgit.freedesktop.org/libreoffice/core/commit/?id=9fc870fc33c2872aa93477523da4a54c841cf9b5 
ServiceManager::createInstanceWithContext needs to honor given Context


from master for cherry-picking to libreoffice-3-6.  Another useful fix 
would be


http://cgit.freedesktop.org/libreoffice/core/commit/?id=f98379816411f932ccdafede5f9b25c260c17361 
Make ure/source/uretest work again


to make the relevant (manual) tests work again, but it is not strictly 
necessary.


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

[Libreoffice-commits] .: sw/source

 sw/source/filter/inc/fltshell.hxx |2 +-
 sw/source/filter/ww1/fltshell.cxx |   15 +--
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit d64ecf4e94a81d9c1fd4be74c098eb0e58345c60
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Aug 9 10:21:17 2012 +0200

SwFltShell::QuoteStr: UniString - OUString

Change-Id: I64daedac350d5e897fa8acb79c4c2683a669725b

diff --git a/sw/source/filter/inc/fltshell.hxx 
b/sw/source/filter/inc/fltshell.hxx
index 0533799..975fef4 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -652,7 +652,7 @@ public:
 sal_Bool IsFlagSet(SwFltControlStack::Flags no) const
 { return aStack.IsFlagSet(no); }
 void ConvertUStr( String rInOut );
-String QuoteStr( const String rIn );
+OUString QuoteStr( const OUString rIn );
 
 // folgende status kann die shell verwalten:
 const SfxPoolItem GetNodeOrStyAttr(sal_uInt16 nWhich);
diff --git a/sw/source/filter/ww1/fltshell.cxx 
b/sw/source/filter/ww1/fltshell.cxx
index a1e6d01..0464d67 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -1047,24 +1047,27 @@ void SwFltShell::ConvertUStr( String rInOut )
 }
 
 // QuoteString() wandelt CRs abhaengig von nFieldIniFlags in '\n' oder \0x0d
-String SwFltShell::QuoteStr( const String rIn )
+OUString SwFltShell::QuoteStr( const OUString rIn )
 {
-String sOut( rIn );
+OUString sOut( rIn );
 sal_Bool bAllowCr = aStack.IsFlagSet( SwFltControlStack::ALLOW_FLD_CR );
 
-for( xub_StrLen n = 0; n  sOut.Len(); ++n )
+for( sal_Int32 n = 0; n  sOut.getLength(); ++n )
 {
-switch( sOut.GetChar( n ) )
+switch( sOut[ n ] )
 {
 case 0x0a:
-sOut.Erase( n, 1 ); // 0xd 0xa wird zu \n
+sOut = sOut.replaceAt( n, 1, OUString() ); // 0xd 0xa 
wird zu \n
 break;
 
 case 0x0b:
 case 0x0c:
 case 0x0d:
 if( bAllowCr )
- sOut.SetChar( n, '\n' );
+{
+sal_Unicode* pStr = (sal_Unicode*)sOut.getStr();
+pStr[n] = (sal_Unicode)'\n';
+}
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LibreOffice 3.5.6 RC2 test builds available for smoketesting

2012-08-09 Thread Thorsten Behrens

Hi *,

for 3.5.6 RC2, we're now uploading builds to a public (but
non-mirrored - so don't spread news too widely!) place, as soon as
they're available. Grab them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try  report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

The list of fixed bugs vs. 3.5.6 RC1 is available here

 
http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-5-6-release-3.5.6.2.log

, it would be nice to verify they're really fixed in the build.

Thanks a lot for your help,

-- Thorsten


pgpxTybjshFyB.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - cppuhelper/source javaunohelper/source ure/source

 cppuhelper/source/defaultbootstrap.cxx |   31 +--
 javaunohelper/source/bootstrap.cxx |2 -
 javaunohelper/source/javaunohelper.cxx |6 +--
 javaunohelper/source/javaunohelper.map |9 
 javaunohelper/source/preload.cxx   |8 ++--
 ure/source/uretest/Makefile|   15 +++
 ure/source/uretest/Makefile.pln|   65 +++--
 ure/source/uretest/cppmain.cc  |   11 ++---
 ure/source/uretest/cppserver.cc|2 -
 ure/source/uretest/cpptest.cc  |2 -
 ure/source/uretest/version.map |   40 
 11 files changed, 69 insertions(+), 122 deletions(-)

New commits:
commit 2fbfc1d8f35de91a466be5e3b71549e0696e94ff
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Aug 8 18:11:34 2012 +0200

Make ure/source/uretest work again

...at least, Makefile (to be run from within an SDK environment) works 
again; I
reflected all the relevant changes in Makefile.pln (to be run from no 
specific
environment) too, but did not actually check the latter

(cherry picked from commit f98379816411f932ccdafede5f9b25c260c17361)

Signed-off-by: Michael Stahl mst...@redhat.com

Conflicts:
ure/source/uretest/version.map

Change-Id: Ie2012d26b3bd59335a0f872bbfc1414cc4f5edc5

diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index df5f811..7b5ffa5 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -116,8 +116,7 @@ clean:
$(DELRECURSIVE) $(subst /,$(PS),out.sdk)
 
 
-out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) version.map | 
\
-out.sdk
+out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) | out.sdk
$(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $ $(LINK_LIBS) \
 $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) \
 $(link_std_libs)
@@ -129,8 +128,7 @@ out.sdk/cppmain.$(OBJ_EXT): cppmain.cc 
out.sdk/cpputypes.cppumaker.flag \
 $(CC_DEFINES) $
 
 
-out.sdk/cpptest.uno.$(SHAREDLIB_EXT): out.sdk/cpptest.$(OBJ_EXT) version.map | 
\
-out.sdk
+out.sdk/cpptest.uno.$(SHAREDLIB_EXT): out.sdk/cpptest.$(OBJ_EXT) | out.sdk
$(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $ $(LINK_LIBS) \
 $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(link_std_libs)
 
@@ -141,8 +139,7 @@ out.sdk/cpptest.$(OBJ_EXT): cpptest.cc 
out.sdk/cpputypes.cppumaker.flag \
 $(CC_DEFINES) $
 
 
-out.sdk/cppserver.uno.$(SHAREDLIB_EXT): out.sdk/cppserver.$(OBJ_EXT) \
-version.map | out.sdk
+out.sdk/cppserver.uno.$(SHAREDLIB_EXT): out.sdk/cppserver.$(OBJ_EXT) | out.sdk
$(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $ $(LINK_LIBS) \
 $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(link_std_libs)
 
@@ -156,11 +153,11 @@ out.sdk/cppserver.$(OBJ_EXT): cppserver.cc 
out.sdk/cpputypes.cppumaker.flag \
 out.sdk/cpputypes.cppumaker.flag: | out.sdk
$(CPPUMAKER) -O./out.sdk/include/cpputypes \
 
-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak
 \
--B/UCR $(URE_TYPES)
+-BUCR $(URE_TYPES)
touch $@
 
 out.sdk/types.cppumaker.flag: out.sdk/types.rdb | out.sdk
-   $(CPPUMAKER) -O./out.sdk/include/types -B/UCR $ -X$(URE_TYPES)
+   $(CPPUMAKER) -O./out.sdk/include/types -BUCR $ -X$(URE_TYPES)
touch $@
 
 
@@ -283,7 +280,7 @@ out.sdk/types.mf: types.mf.template | out.sdk
 
 out.sdk/types.javamaker.flag: out.sdk/types.rdb | out.sdk out.sdk/class
- $(DELRECURSIVE) $(subst /,$(PS),out.sdk/class/types)
-   $(JAVAMAKER) -O./out.sdk/class/types -B/UCR $ -X$(URE_TYPES)
+   $(JAVAMAKER) -O./out.sdk/class/types -BUCR $ -X$(URE_TYPES)
touch $@
 
 
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index e8ec320..1b90086 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -88,62 +88,60 @@ clean:
rm -rf out.pln
 
 
-out.pln/cppmain.uno.so: out.pln/cppmain.o version.map | out.pln \
-out.pln/lib/libuno_cppu.so out.pln/lib/libuno_cppuhelpergcc3.so \
-out.pln/lib/libuno_sal.so out.pln/lib/libuno_salhelpergcc3.so \
-out.pln/lib/libstlport_gcc.so
-   g++ -shared -o $@ -Wl,-z,defs -Wl,--fatal-warnings \
--Wl,--version-script=version.map $ -Lout.pln/lib -luno_cppu \
--luno_cppuhelpergcc3

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

Bug 37361 depends on bug 51239, which changed state.

Bug 51239 Summary: A double-plus-more extremely slow search/browse table in 
embedded HSQLDB since 3.5.5/3.6.0.beta
https://bugs.freedesktop.org/show_bug.cgi?id=51239

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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

[PUSHED][3-6] Re: [REVIEW-3-6] Java com.sun.star.comp.helper.Bootstrap.cppuhelper_bootstrap fixes

On 09/08/12 10:24, Stephan Bergmann wrote:
 For various reasons, bootstrapping UNO in a Java process (i.e., one 
 started by calling the java executable) got broken (at least 
 bootstrapping native, binary UNO in such a process, by calling 
 com.sun.star.comp.helper.Bootstrap.cppuhelper_bootstrap).  This does not 
 affect LO itself, but can affect external Java applications that use LO.
 
 So please review the relevant fixes
 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=e7a02843e54e1b64e2078549af110beaccf50348
  
 Export JNI functions from juh, juhx libs
 
 and
 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=9fc870fc33c2872aa93477523da4a54c841cf9b5
  
 ServiceManager::createInstanceWithContext needs to honor given Context
 
 from master for cherry-picking to libreoffice-3-6.  Another useful fix 
 would be
 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=f98379816411f932ccdafede5f9b25c260c17361
  
 Make ure/source/uretest work again
 
 to make the relevant (manual) tests work again, but it is not strictly 
 necessary.

pushed to libreoffice-3-6


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

[Libreoffice-commits] .: sc/source

 sc/source/filter/excel/xiescher.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b61dd408981b4dc8a3e97edd806694e43da882e4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 9 09:59:38 2012 +0100

ensure placeholder substitution on XclImpDrawObjBase::ReadObj8 failure

Change-Id: I7a72153d971aaccea937955acc77cdba128985d7

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 74ed03b..900d2e6 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -336,7 +336,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const 
XclImpRoot rRoot, XclImpStr
 
 if( rStrm.GetRecLeft() = 10 )
 {
-sal_uInt16 nSubRecId, nSubRecSize, nObjType;
+sal_uInt16 nSubRecId(0), nSubRecSize(0), nObjType(0);
 rStrm  nSubRecId  nSubRecSize  nObjType;
 OSL_ENSURE( nSubRecId == EXC_ID_OBJCMO, XclImpDrawObjBase::ReadObj8 - 
OBJCMO subrecord expected );
 if( (nSubRecId == EXC_ID_OBJCMO)  (nSubRecSize = 6) )
@@ -379,11 +379,16 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const 
XclImpRoot rRoot, XclImpStr
 default:
 OSL_TRACE( XclImpDrawObjBase::ReadObj8 - unknown object 
type 0x%04hX, nObjType );
 rRoot.GetTracer().TraceUnsupportedObjects();
-xDrawObj.reset( new XclImpPhObj( rRoot ) );
 }
 }
 }
 
+if (!xDrawObj) //ensure placeholder for unknown or broken records
+{
+SAL_WARN( sc, XclImpDrawObjBase::ReadObj8 import failed, 
substituting placeholder);
+xDrawObj.reset( new XclImpPhObj( rRoot ) );
+}
+
 xDrawObj-mnTab = rRoot.GetCurrScTab();
 xDrawObj-ImplReadObj8( rStrm );
 return xDrawObj;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values


On 08/08/2012 08:34 PM, anwen wrote:

With the TerminateListener, I successfully get the desktop termination event
by queryTermination() function. Although you told me that I could veto this
termination signal by throwing TerminationVetoException. I am not sure how
and where to handle the TerminationVetoException and re-call
XDesktop.terminate() to finally close the office. So I tried to handle
everything inside queryTermination().


I think you should execute your shutdown activies on notifyTermination, 
not queryTermination.  The latter can be veto'ed by some other listener, 
in which case Desktop would cancel the termination and continue running 
(and notify you with queryTermination eventually followed by 
notifyTermination again later on).



However, deadlock happened sometimes again. Here is my analysis: this
function is called by the main thread and is protected by the SolarMutex. If
a modified() function is called by the worker thread at the same time, the
worker thread is waiting for the SolarMutex. Then the main thread tries to
stop the worker thread by calling realtime_session-stop(). This session is
designed with thread safe strategy by a third-party. It fails to close the
worker thread because the worker thread is waiting for the Main thread to
release the SolarMutex.


That queryTermination is called with SolarMutex locked is a bug.  (Is 
notifyTermination also called with SolarMutex locked?  Would need to 
check, in framework/source/services/desktop.cxx.)  However, it might be 
a bug not easy to fix without opening any number of pandora's boxes...


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

Re: fdo#51004 replace mozilla address book parser -- help appreciated

Hi David,

On Thu, 2012-08-09 at 08:35 +0200, David Ostrovsky wrote:
 i asked a couple of questions on mork driver implementation in the 
 comment to that bugzilla issue:
 https://bugs.freedesktop.org/show_bug.cgi?id=51004
 and still didn't get any answer. So i reasking it here.

I hoped Fridrich would get back to you; but I suspect him of taking a
well-deserved vacation :-)

 The question is basically where can i borrow the sql parser that 
 delegate to the new mork parser (before i write it from scratch ;-)

Of course ! no point in re-writing OCommonStatement etc. we should
re-use that as much as possible.

IIRC, there is no real need to handle all the highly-complicated
SQL-ness that is possible here. I would look at something like:

connectivity/source/drivers/file/FStatement.cxx /::construct/

To see how the simple file case is handled - not much point in trying
to do better than that if this is only used for mail-merge IMHO :-)

Thanks !

Michael.

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

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

[Libreoffice-commits] .: sw/source

 sw/source/filter/ww1/fltshell.cxx |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 3a1c8eeb694e26835f6f9c010b5d305b57ddd0d5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 9 10:06:44 2012 +0100

rtl::OUStrings are supposed to be immutable

The cast away of constness in d64ecf4e94a81d9c1fd4be74c098eb0e58345c60 
makes me
feel icky

Change-Id: Ib977fd6bf34f11407a5957332789e1e48d98819e

diff --git a/sw/source/filter/ww1/fltshell.cxx 
b/sw/source/filter/ww1/fltshell.cxx
index 0464d67..b3e129a 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -1049,7 +1049,7 @@ void SwFltShell::ConvertUStr( String rInOut )
 // QuoteString() wandelt CRs abhaengig von nFieldIniFlags in '\n' oder \0x0d
 OUString SwFltShell::QuoteStr( const OUString rIn )
 {
-OUString sOut( rIn );
+OUStringBuffer sOut( rIn );
 sal_Bool bAllowCr = aStack.IsFlagSet( SwFltControlStack::ALLOW_FLD_CR );
 
 for( sal_Int32 n = 0; n  sOut.getLength(); ++n )
@@ -1057,21 +1057,18 @@ OUString SwFltShell::QuoteStr( const OUString rIn )
 switch( sOut[ n ] )
 {
 case 0x0a:
-sOut = sOut.replaceAt( n, 1, OUString() ); // 0xd 0xa 
wird zu \n
+sOut.remove( n, 1 ); // 0xd 0xa wird zu \n
 break;
 
 case 0x0b:
 case 0x0c:
 case 0x0d:
 if( bAllowCr )
-{
-sal_Unicode* pStr = (sal_Unicode*)sOut.getStr();
-pStr[n] = (sal_Unicode)'\n';
-}
+sOut[n] = '\n';
 break;
 }
 }
-return sOut;
+return sOut.makeStringAndClear();
 }
 
 SwFltShell SwFltShell::operator  ( const sal_Unicode c )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

Lionel Elie Mamane lio...@mamane.lu changed:

   What|Removed |Added

 Depends on||53281

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] .: svx/inc svx/source

 svx/inc/tbunosearchcontrollers.hxx |2 +-
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |   14 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 9c9cf6ed4a64fd5f26e15d87d2745309d681aa2e
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Aug 9 11:30:35 2012 +0200

Minor cleanup.

Change-Id: I087043b36d59e1a76c6fe12a5a684c4137eca2d9

diff --git a/svx/inc/tbunosearchcontrollers.hxx 
b/svx/inc/tbunosearchcontrollers.hxx
index 91ddec8..0118f51 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -95,7 +95,7 @@ private:
 typedef ::comphelper::SequenceAsVector css::beans::PropertyValue  
SearchToolbarControllersVec;
 typedef ::std::map css::uno::Reference css::frame::XFrame , 
SearchToolbarControllersVec  SearchToolbarControllersMap;
 SearchToolbarControllersMap aSearchToolbarControllersMap;
-std::vectorrtl::OUStringaSearchStrings;
+std::vectorrtl::OUString m_aSearchStrings;
 
 };
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx 
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 2ad1cb1..6752dac 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -246,21 +246,21 @@ SearchToolbarControllersManager 
SearchToolbarControllersManager::createControll
 return theSearchToolbarControllersManager::get();
 }
 
-void SearchToolbarControllersManager::saveSearchHistory(const 
FindTextFieldControl* m_pFindTextFieldControl)
+void SearchToolbarControllersManager::saveSearchHistory(const 
FindTextFieldControl* pFindTextFieldControl)
 {
-sal_uInt16 nECount( m_pFindTextFieldControl-GetEntryCount() );
-aSearchStrings.resize( nECount );
+sal_uInt16 nECount( pFindTextFieldControl-GetEntryCount() );
+m_aSearchStrings.resize( nECount );
 for( sal_uInt16 i=0; inECount; ++i )
 {
-aSearchStrings[i] = m_pFindTextFieldControl-GetEntry(i);
+m_aSearchStrings[i] = pFindTextFieldControl-GetEntry(i);
 }
 }
 
-void SearchToolbarControllersManager::loadSearchHistory(FindTextFieldControl* 
m_pFindTextFieldControl)
+void SearchToolbarControllersManager::loadSearchHistory(FindTextFieldControl* 
pFindTextFieldControl)
 {
-for( sal_uInt16 i=0; iaSearchStrings.size(); ++i )
+for( sal_uInt16 i=0; im_aSearchStrings.size(); ++i )
 {
-   m_pFindTextFieldControl-InsertEntry(aSearchStrings[i],i);
+pFindTextFieldControl-InsertEntry(m_aSearchStrings[i],i);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: .: sw/source

On 09/08/12 11:09, Caolán McNamara wrote:
  sw/source/filter/ww1/fltshell.cxx |   11 ---
  1 file changed, 4 insertions(+), 7 deletions(-)
 
 New commits:
 commit 3a1c8eeb694e26835f6f9c010b5d305b57ddd0d5
 Author: Caolán McNamara caol...@redhat.com
 Date:   Thu Aug 9 10:06:44 2012 +0100
 
 rtl::OUStrings are supposed to be immutable
 
 The cast away of constness in d64ecf4e94a81d9c1fd4be74c098eb0e58345c60 
 makes me
 feel icky

not only that, it can be a real bug as well (though isn't in this case).
the OUString, or more precisely the buffer it holds, is immutable by
design, and has a intern() method that effectively enters it into a
global hash-table; if an intern()ed string is later modified then that
hash table is going to be very unhappy (about unhappy hashtables, see
also 3ea6b1c1594fa3fdb7e13c544b3beecd369b67d0).

 -OUString sOut( rIn );
 +OUStringBuffer sOut( rIn );

  if( bAllowCr )
 -{
 -sal_Unicode* pStr = (sal_Unicode*)sOut.getStr();
 -pStr[n] = (sal_Unicode)'\n';
 -}
 +sOut[n] = '\n';

right: if you want to modify an OUString, use OUStringBuffer, that's why
it exists.


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

Re: .: sw/source

On Thu, Aug 09, 2012 at 11:36:50AM +0200, Michael Stahl mst...@redhat.com 
wrote:
  -OUString sOut( rIn );
  +OUStringBuffer sOut( rIn );
 
   if( bAllowCr )
  -{
  -sal_Unicode* pStr = (sal_Unicode*)sOut.getStr();
  -pStr[n] = (sal_Unicode)'\n';
  -}
  +sOut[n] = '\n';
 
 right: if you want to modify an OUString, use OUStringBuffer, that's why
 it exists.

Thanks for the info, I don't remember where did I saw that, but if I see
again, I'll correct it there as well. ;-)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] fdo#49750 Search Findbar's History

Hi Tamas, Miklos,

Miklos Vajna píše v Čt 09. 08. 2012 v 09:36 +0200:

 This patch make the mentioned Toolbar to remember the searched
  strings after
  closing and reopening. Details in patch description.
 
 Great, thanks for this!

Indeed, thank you!  I started integrating this, but Miklos was
faster :-)

I have small nitpicks, so I've pushed that as a minor follow-up cleanup:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=9c9cf6ed4a64fd5f26e15d87d2745309d681aa2e

m_ means member - we are using that to mark the member variables, so I
changed the naming a bit; added that to the aSearchStrings, and removed
from m_pFindTextFieldControl wherever it is used as a function
parameter.

The other, even more minor thing, was the whitespace - wrong indentation
in one case.

Otherwise your patch works perfectly, thank you again!

All the best,
Kendy

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

[Libreoffice-commits] .: editeng/source

 editeng/source/editeng/editdoc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 069caf79d716ba73d3281beb13fa2af67cac24f9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 9 10:34:50 2012 +0100

valgrind: use after free

i.e. since b35980d9b

seems remove, remove, delete was old pattern, new patterns ended up
as remove+delete, remove. Reorder to remove, remove+delete

Change-Id: I54ec8d0296e751110c516516465be2ac0615f6a1

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index b4a08e5..cb13c91 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2688,8 +2688,8 @@ void CharAttribList::OptimizeRanges( SfxItemPool 
rItemPool )
 if (*rNext.GetItem() == *rAttr.GetItem())
 {
 rAttr.GetEnd() = rNext.GetEnd();
-aAttribs.erase(aAttribs.begin()+nNext);
 rItemPool.Remove(*rNext.GetItem());
+aAttribs.erase(aAttribs.begin()+nNext);
 }
 break;  // only 1 attr with same which can start here.
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: README.cross

 README.cross |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit ab236e180c63a27c61d84ac9af738cf3cb930224
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 9 12:59:08 2012 +0300

Update sample autogen.lastrun for MacOSX - Android

Change-Id: I5f62540c368540ecf4e1aaedf9829f930f1591fa

diff --git a/README.cross b/README.cross
index c946541..3856c29 100644
--- a/README.cross
+++ b/README.cross
@@ -339,18 +339,25 @@ particular) and Mac OS X. The Android cross-buld 
tool-chain (the
 X. Sure, for Windows, too, but trying to cross-compile LO from Windows
 will probably drive you insane.
 
-Here is an autogen.lastrun for Android, when cross-compiling from Mac OS X:
+Here is an autogen.lastrun for Android, when cross-compiling from Mac
+OS X 10.8 with Xcode 4.4.1:
 
-CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4
-CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4
---with-android-ndk=/Users/tml/android-ndk-r7b
---with-android-sdk=/Users/tml/android-sdk-macosx
+CC_FOR_BUILD=xcrun clang -arch i386
+CXX_FOR_BUILD=xcrun clang++ -arch i386
 --build=x86_64-apple-darwin11
+--disable-python
 --disable-zenity
+--enable-debug
 --enable-werror
---disable-python
+--with-android-ndk=/Users/tml/android-ndk-r8b
+--with-android-ndk-toolchain-version=4.6
+--with-android-sdk=/Users/tml/android-sdk-macosx
+--with-build-platform-configure-options=--with-macosx-sdk=10.8 
--with-macosx-version-min-required=10.8 --with-macosx-version-max-allowed=10.8
 --with-distro=LibreOfficeAndroid
---with-java
+--with-external-tar=/Users/tml/lo/10.4/src
+--without-doxygen
+--without-helppack-integration
+--without-myspell-dicts
 
 And here is an autogen.lastrun for Android when cross-compiling from Linux:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: git review

On Thu, Aug 09, 2012 at 09:15:48AM +0200, Jan Holesovsky wrote:
 David Tardon píše v Čt 09. 08. 2012 v 07:17 +0200:
  irony
  It has worked hasslefree and out of the box while we have been using
  email.
  /irony
 
 It was a precondition for the gerrit work that the email submission +
 direct push must still be possible, and I for one will make sure this is
 still so ;-)

Agreed. gerrit is a platform and it should integrate all kind of workflows
whether they are email-based, web-based, CLI-based, IRC-based or whatever. That
doesnt mean the 'gerrit guys' will implement every of your pet features there,
but we have to make the basic workflow available there.

Best,

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

[Libreoffice-commits] .: sw/source

 sw/source/core/crsr/swcrsr.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5c6454f07b6f8e7b66892fda0111c02182180e92
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Aug 9 12:11:57 2012 +0200

fdo#52960 SwCursor::SelectWordWT fix text selection in commented text ranges

Change-Id: Iabb1ac89163c2aa715c7631987886245fb96101c

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index e99d948..c1e0b40 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -57,6 +57,7 @@
 #include mdiexp.hxx
 #include statstr.hrc
 #include redline.hxx
+#include xmloff/odffields.hxx
 
 using namespace ::com::sun::star::i18n;
 
@@ -1341,8 +1342,8 @@ sal_Bool SwCursor::SelectWordWT( ViewShell* pViewShell, 
sal_Int16 nWordType, con
 {
 // Should we select the whole fieldmark?
 const IDocumentMarkAccess* pMarksAccess = 
GetDoc()-getIDocumentMarkAccess( );
-sw::mark::IMark* pMark = GetPoint() ? pMarksAccess-getFieldmarkFor( 
*GetPoint( ) ) : NULL;
-if ( pMark )
+sw::mark::IFieldmark* pMark = GetPoint() ? 
pMarksAccess-getFieldmarkFor( *GetPoint( ) ) : NULL;
+if ( pMark  pMark-GetFieldname() != ODF_COMMENTRANGE )
 {
 const SwPosition rStart = pMark-GetMarkStart();
 GetPoint()-nNode = rStart.nNode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/Library_dbtools.mk

 connectivity/Library_dbtools.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea76e1a64376f9e8330dddfea60368f191784866
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 10 22:08:04 2012 +0200

warning C4530: C++ exception handler used ... specify /EHsc

Change-Id: I2a81e4d5d3a19b5537b791391d035212e8bf423e
(cherry picked from commit c24d7246ac2772f591892fc9c4a301f76129a997)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 93539de..7688ef4 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -74,7 +74,6 @@ endif
 #connectivity/source/commontools/RowFunctionParser.cxx disable optimization?
 
 $(eval $(call gb_Library_add_noexception_objects,dbtools,\
-   connectivity/source/commontools/AutoRetrievingBase \
connectivity/source/simpledbt/refbase \
 ))
 
@@ -93,6 +92,7 @@ $(call 
gb_LexTarget_get_scanner_target,connectivity/source/parse/sqlflex) : T_LE
 
 
 $(eval $(call gb_Library_add_exception_objects,dbtools,\
+   connectivity/source/commontools/AutoRetrievingBase \
connectivity/source/commontools/predicateinput \
connectivity/source/commontools/ConnectionWrapper \
connectivity/source/commontools/TConnection \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: wizards/com

 wizards/com/sun/star/wizards/common/ConfigGroup.py  |1 -
 wizards/com/sun/star/wizards/common/ConfigNode.py   |1 -
 wizards/com/sun/star/wizards/common/ConfigSet.py|1 -
 wizards/com/sun/star/wizards/common/Configuration.py|1 -
 wizards/com/sun/star/wizards/common/DebugHelper.py  |1 -
 wizards/com/sun/star/wizards/common/Desktop.py  |1 -
 wizards/com/sun/star/wizards/common/FileAccess.py   |1 -
 wizards/com/sun/star/wizards/common/Helper.py   |1 -
 wizards/com/sun/star/wizards/common/NoValidPathException.py |1 -
 wizards/com/sun/star/wizards/common/NumberFormatter.py  |1 -
 wizards/com/sun/star/wizards/common/Properties.py   |1 -
 wizards/com/sun/star/wizards/common/PropertyNames.py|1 -
 wizards/com/sun/star/wizards/common/Resource.py |1 -
 wizards/com/sun/star/wizards/common/SystemDialog.py |1 -
 14 files changed, 14 deletions(-)

New commits:
commit 28b3a290ce3dfe4156d810d73140fed9decbb12c
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Aug 9 11:50:43 2012 +0200

Others duplicated lines

Change-Id: Ief9589bd3ab0d4fd359dc18f85063dece29f4833

diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py 
b/wizards/com/sun/star/wizards/common/ConfigGroup.py
index c5d406b..bb5d95f 100644
--- a/wizards/com/sun/star/wizards/common/ConfigGroup.py
+++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import traceback
-import traceback
 import inspect
 from wizards.common.ConfigNode import *
 from wizards.common.Configuration import Configuration
diff --git a/wizards/com/sun/star/wizards/common/ConfigNode.py 
b/wizards/com/sun/star/wizards/common/ConfigNode.py
index cac0348..c2cd231 100644
--- a/wizards/com/sun/star/wizards/common/ConfigNode.py
+++ b/wizards/com/sun/star/wizards/common/ConfigNode.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 from abc import ABCMeta, abstractmethod
-from abc import ABCMeta, abstractmethod
 
 class ConfigNode(object):
 
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py 
b/wizards/com/sun/star/wizards/common/ConfigSet.py
index da6fcb4..8ba6635 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.py
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import traceback
-import traceback
 from wizards.common.ConfigNode import *
 from wizards.common.Configuration import Configuration
 
diff --git a/wizards/com/sun/star/wizards/common/Configuration.py 
b/wizards/com/sun/star/wizards/common/Configuration.py
index c5b25fa..cd8a018 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.py
+++ b/wizards/com/sun/star/wizards/common/Configuration.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import uno
-import uno
 import traceback
 from wizards.common.PropertyNames import PropertyNames
 from wizards.common.Helper import *
diff --git a/wizards/com/sun/star/wizards/common/DebugHelper.py 
b/wizards/com/sun/star/wizards/common/DebugHelper.py
index 44bc5a1..b0dba77 100644
--- a/wizards/com/sun/star/wizards/common/DebugHelper.py
+++ b/wizards/com/sun/star/wizards/common/DebugHelper.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 class DebugHelper(object):
-class DebugHelper(object):
 
 @classmethod
 def exception(self, ex):
diff --git a/wizards/com/sun/star/wizards/common/Desktop.py 
b/wizards/com/sun/star/wizards/common/Desktop.py
index 5492379..408edf1 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.py
+++ b/wizards/com/sun/star/wizards/common/Desktop.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import uno
-import uno
 import traceback
 from wizards.common.NoValidPathException import *
 
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py 
b/wizards/com/sun/star/wizards/common/FileAccess.py
index cb7bae3..2019632 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import traceback
-import traceback
 import types
 from os import path as osPath
 from wizards.common.NoValidPathException import *
diff --git a/wizards/com/sun/star/wizards/common/Helper.py 
b/wizards/com/sun/star/wizards/common/Helper.py
index a20ed7d..cd63ef8 100644
--- a/wizards/com/sun/star/wizards/common/Helper.py
+++ b/wizards/com/sun/star/wizards/common/Helper.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import uno
-import uno
 import traceback
 from datetime import date as DateTime
 from wizards.common.NumberFormatter import NumberFormatter
diff

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

2012-08-09 Thread Noel Power

 filter/source/msfilter/eschesdo.cxx |   10 +-
 oox/source/export/vmlexport.cxx |   31 +--
 sc/source/filter/oox/commentsbuffer.cxx |3 +--
 sc/source/filter/xcl97/xcl97rec.cxx |   15 ++-
 4 files changed, 53 insertions(+), 6 deletions(-)

New commits:
commit 56b0b2cbc0dc6538617e3f3b1005e4723ca227b0
Author: Noel Power noel.po...@novell.com
Date:   Thu Aug 9 11:15:43 2012 +0100

misc comment import/export fixes

a) fix vmldrawing.vml for xlsx export ( changed from frame to textbox, added
support for shadow element with attributes, shadow color, shadow obscured )
b) use proper fillcolor attribute
c) detect whether note/comment is shown on import
d) export state of note ( shown/hidden )

text position still not perfect, we still are missing some attributes to 
control
that.

Change-Id: I59b446175217479ce7960287aa540df8c6b2b1ea

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index bbd63d5..32d5680 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -208,7 +208,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject rObj,
 
 if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( IsFontwork ) ) 
 ::cppu::any2bool( rObj.GetUsrAny() ) ) ||
-rObj.GetType().EqualsAscii( drawing.Measure ) || 
rObj.GetType().EqualsAscii( drawing.Caption ) )
+rObj.GetType().EqualsAscii( drawing.Measure ) )
 {
 rObj.SetType( String( RTL_CONSTASCII_STRINGPARAM(
 drawing.dontknow ),
@@ -614,6 +614,14 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject rObj,
 if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( 
RTL_CONSTASCII_USTRINGPARAM( Bitmap ) ), sal_False ) )
 aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
 }
+else if ( rObj.GetType().EqualsAscii( drawing.Caption ))
+{
+rObj.SetAngle( 0 );
+mpEscherEx-OpenContainer( ESCHER_SpContainer );
+ADD_SHAPE( ESCHER_ShpInst_TextBox, 0xa00 );
+if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( 
RTL_CONSTASCII_USTRINGPARAM( MetaFile ) ), sal_False ) )
+aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
+}
 else if ( rObj.GetType().EqualsAscii( drawing.dontknow ))
 {
 rObj.SetAngle( 0 );
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 34f0802..17ff426 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -516,7 +516,7 @@ void VMLExport::Commit( EscherPropertyContainer rProps, 
const Rectangle rRect
 }
 
 if ( rProps.GetOpt( ESCHER_Prop_fillColor, nValue ) )
-impl_AddColor( pAttrList, XML_color, nValue );
+impl_AddColor( m_pShapeAttrList, XML_fillcolor, nValue 
);
 
 if ( rProps.GetOpt( ESCHER_Prop_fillBackColor, nValue ) )
 impl_AddColor( pAttrList, XML_color2, nValue );
@@ -634,7 +634,34 @@ void VMLExport::Commit( EscherPropertyContainer rProps, 
const Rectangle rRect
 break;
 
 case ESCHER_Prop_fHidden:
-m_pShapeStyle-append( ;visibility:hidden );
+if ( !it-nPropValue )
+m_pShapeStyle-append( ;visibility:hidden );
+break;
+case ESCHER_Prop_shadowColor:
+case ESCHER_Prop_fshadowObscured:
+{
+sal_uInt32 nValue = 0;
+bool bShadow = false;
+bool bObscured = false;
+if ( rProps.GetOpt( ESCHER_Prop_fshadowObscured, nValue ) )
+{
+bShadow = (( nValue  0x20002 ) == 0x20002 );
+bObscured = (( nValue  0x10001 ) == 0x10001 );
+}
+if ( bShadow )
+{
+sax_fastparser::FastAttributeList *pAttrList = 
m_pSerializer-createAttrList();
+impl_AddBool( pAttrList, XML_on, bShadow );
+impl_AddBool( pAttrList, XML_obscured, bObscured );
+
+if ( rProps.GetOpt( ESCHER_Prop_shadowColor, nValue ) )
+impl_AddColor( pAttrList, XML_color, nValue );
+
+m_pSerializer-singleElementNS( XML_v, XML_shadow, 
XFastAttributeListRef( pAttrList ) );
+bAlreadyWritten[ ESCHER_Prop_fshadowObscured ] = true;
+bAlreadyWritten[ ESCHER_Prop_shadowColor ] = true;
+}
+}
 break;
 default:
 #if OSL_DEBUG_LEVEL  0
diff --git

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

Hi there,

On Wed, 2012-08-08 at 11:34 -0700, anwen wrote:
 Although you told me that I could veto this termination signal by throwing
 TerminationVetoException. I am not sure how and where to handle the
 TerminationVetoException and re-call XDesktop.terminate() to finally
 close the office.

Presumably you could spawn another thread to wait until you've finished
what you're doing and call XDesktop.terminate() later ?

 Since the SolarMutex is everywhere, do you have any suggestion to clear it
 for a while and give a chance  to close the worker thread ?

In case things arn't tangled enough - you can release the SolarMutex in
your current thread and give another thread a chance to get in using
XToolkit's reschedule method. Whether that is likely to make your life
only yet more tangled is unclear to me ;-)

Hope that helps,

Michael.

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

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

[Libreoffice-commits] .: distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf README.cross

 README.cross  |1 -
 distro-configs/LibreOfficeAndroid.conf|1 -
 distro-configs/LibreOfficeAndroidX86.conf |1 -
 3 files changed, 3 deletions(-)

New commits:
commit a606fa37da7c3d2daf5b1695fdc5518b4f8bdda7
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 9 13:52:40 2012 +0300

No, we don't want any Python stuff for Android

Change-Id: I227c408e03130667760f9672f08b11cc7a9c75a8

diff --git a/README.cross b/README.cross
index 3856c29..d23dba5 100644
--- a/README.cross
+++ b/README.cross
@@ -345,7 +345,6 @@ OS X 10.8 with Xcode 4.4.1:
 CC_FOR_BUILD=xcrun clang -arch i386
 CXX_FOR_BUILD=xcrun clang++ -arch i386
 --build=x86_64-apple-darwin11
---disable-python
 --disable-zenity
 --enable-debug
 --enable-werror
diff --git a/distro-configs/LibreOfficeAndroid.conf 
b/distro-configs/LibreOfficeAndroid.conf
index 1f8b942..7d50098 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -18,7 +18,6 @@
 --disable-systray
 --disable-xmlsec
 --enable-mergelibs
---enable-python=internal
 --without-junit
 --without-ppds
 --without-stlport
diff --git a/distro-configs/LibreOfficeAndroidX86.conf 
b/distro-configs/LibreOfficeAndroidX86.conf
index ef3b73e..24907e4 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -19,7 +19,6 @@
 --disable-systray
 --disable-xmlsec
 --enable-mergelibs
---enable-python=internal
 --without-junit
 --without-ppds
 --without-stlport
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: wizards/com

 wizards/com/sun/star/wizards/agenda/AgendaTemplate.py  |1 -
 wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py |1 -
 wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py  |1 -
 wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py |1 -
 wizards/com/sun/star/wizards/agenda/CGAgenda.py|1 -
 wizards/com/sun/star/wizards/agenda/TopicsControl.py   |1 -
 wizards/com/sun/star/wizards/document/OfficeDocument.py|1 -
 wizards/com/sun/star/wizards/fax/FaxWizardDialog.py|1 -
 wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py   |1 -
 wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py   |1 -
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py |1 -
 wizards/com/sun/star/wizards/letter/LocaleCodes.py |1 -
 wizards/com/sun/star/wizards/text/TextDocument.py  |1 -
 wizards/com/sun/star/wizards/text/TextFieldHandler.py  |1 -
 wizards/com/sun/star/wizards/text/TextSectionHandler.py|1 -
 wizards/com/sun/star/wizards/text/ViewHandler.py   |1 -
 wizards/com/sun/star/wizards/ui/ControlScroller.py |1 -
 wizards/com/sun/star/wizards/ui/DocumentPreview.py |1 -
 wizards/com/sun/star/wizards/ui/ImageList.py   |1 -
 wizards/com/sun/star/wizards/ui/PathSelection.py   |1 -
 wizards/com/sun/star/wizards/ui/PeerConfig.py  |1 -
 wizards/com/sun/star/wizards/ui/UIConsts.py|1 -
 wizards/com/sun/star/wizards/ui/UnoDialog.py   |1 -
 wizards/com/sun/star/wizards/ui/WizardDialog.py|1 -
 wizards/com/sun/star/wizards/ui/XPathSelectionListener.py  |1 -
 wizards/com/sun/star/wizards/ui/event/DataAware.py |1 -
 wizards/com/sun/star/wizards/ui/event/ListModelBinder.py   |1 -
 wizards/com/sun/star/wizards/web/StylePreview.py   |1 -
 wizards/com/sun/star/wizards/web/WWD_Events.py |1 -
 wizards/com/sun/star/wizards/web/WebWizardDialogResources.py   |1 -
 wizards/com/sun/star/wizards/web/data/CGArgument.py|1 -
 wizards/com/sun/star/wizards/web/data/CGContent.py |1 -
 wizards/com/sun/star/wizards/web/data/CGDesign.py  |1 -
 wizards/com/sun/star/wizards/web/data/CGDocument.py|1 -
 wizards/com/sun/star/wizards/web/data/CGExporter.py|1 -
 wizards/com/sun/star/wizards/web/data/CGFilter.py  |1 -
 wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py |1 -
 wizards/com/sun/star/wizards/web/data/CGIconSet.py |1 -
 wizards/com/sun/star/wizards/web/data/CGImage.py   |1 -
 wizards/com/sun/star/wizards/web/data/CGLayout.py  |1 -
 wizards/com/sun/star/wizards/web/data/CGPublish.py |1 -
 wizards/com/sun/star/wizards/web/data/CGSession.py |1 -
 wizards/com/sun/star/wizards/web/data/CGSessionName.py |1 -
 wizards/com/sun/star/wizards/web/data/CGSettings.py|1 -
 wizards/com/sun/star/wizards/web/data/CGStyle.py   |1 -
 wizards/com/sun/star/wizards/web/data/TypeDetection.py |1 -
 46 files changed, 46 deletions(-)

New commits:
commit 8b13238c453f05f1d862cf570dff0110295fbe3b
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Aug 9 12:56:40 2012 +0200

Fix last duplicated lines for Python files

Change-Id: I22cbba9c574835c3e47dadb70d3c293b79e57325

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py 
b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py
index a95dfc9..56b8523 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import uno
-import uno
 from TemplateConsts import *
 from threading import RLock
 from wizards.text.TextDocument import *
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py 
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
index 2faf846..d97ddf9 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 from wizards.common.HelpIds import HelpIds
-from wizards.common.HelpIds import HelpIds
 
 TXTTITLE_TEXT_CHANGED = txtTitleTextChanged
 TXTDATE_TEXT_CHANGED = txtDateTextChanged
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py

[Libreoffice-commits] .: README.cross

 README.cross |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 97febaa3e2130b92a2eadfc20688b2a37b194f45
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 9 14:08:32 2012 +0300

Drop the --with-external-tar to avoid confusion

Change-Id: I8861a007b94b24d2482658ca7d78e200bcf890ea

diff --git a/README.cross b/README.cross
index d23dba5..891b6a5 100644
--- a/README.cross
+++ b/README.cross
@@ -353,7 +353,6 @@ CXX_FOR_BUILD=xcrun clang++ -arch i386
 --with-android-sdk=/Users/tml/android-sdk-macosx
 --with-build-platform-configure-options=--with-macosx-sdk=10.8 
--with-macosx-version-min-required=10.8 --with-macosx-version-max-allowed=10.8
 --with-distro=LibreOfficeAndroid
---with-external-tar=/Users/tml/lo/10.4/src
 --without-doxygen
 --without-helppack-integration
 --without-myspell-dicts
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/Library_file.mk

 connectivity/Library_file.mk |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 1eefb05e3f7d5be0e88aa4e31a03607322764f00
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 10 23:38:20 2012 +0200

warning C4530: C++ exception handler used ... specify /EHsc

Change-Id: Ifb23269c01dc80c328075fefe5e61b378e2d8477
(cherry picked from commit 95d0593986a659475729e4a8b50242d05503116c)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index b1757c1..900a48e 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -56,10 +56,6 @@ $(eval $(call gb_Library_use_libraries,file,\
$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_noexception_objects,file,\
-   connectivity/source/drivers/file/quotedstring \
-))
-
 $(eval $(call gb_Library_add_exception_objects,file,\
connectivity/source/drivers/file/FCatalog \
connectivity/source/drivers/file/FColumns \
@@ -79,6 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,file,\
connectivity/source/drivers/file/fanalyzer \
connectivity/source/drivers/file/fcode \
connectivity/source/drivers/file/fcomp \
+   connectivity/source/drivers/file/quotedstring \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 connectivity/source/drivers/postgresql/pq_allocator.hxx |6 --
 connectivity/source/drivers/postgresql/pq_common.hxx|   41 
 2 files changed, 2 insertions(+), 45 deletions(-)

New commits:
commit 9d38931c3b7c90d19427a45b8d23794792b14ea2
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Wed Jul 4 21:12:57 2012 +0200

use SAL_UNUSED_PARAMETER instead of local macro
(cherry picked from commit bd493f15a5d9478739368e48f598d2cd7ed4ea30)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx 
b/connectivity/source/drivers/postgresql/pq_allocator.hxx
index fad9b03..f454bb6 100644
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx
@@ -59,8 +59,6 @@
 #include cstddef
 #include sal/types.h
 
-#include pq_common.hxx
-
 /** jbu: This source has been copied from sal/inc/internal/allocator.hxx,
  because it is not a public interface. Thx a lot for figuring this
  out.
@@ -153,14 +151,14 @@ public:
are not enabled, e.g. GCC under Linux and it is
in general not desired to compile sal with exceptions
enabled. */
-pointer allocate (size_type n, const void* UNUSED(hint) = 0)
+pointer allocate (size_type n, SAL_UNUSED_PARAMETER const void* = 0)
 {
 return reinterpret_castpointer(
 rtl_allocateMemory(sal_uInt32(n * sizeof(T;
 }
 
 //-
-void deallocate (pointer p, size_type UNUSED(n))
+void deallocate (pointer p, SAL_UNUSED_PARAMETER size_type)
 {
 rtl_freeMemory(p);
 }
diff --git a/connectivity/source/drivers/postgresql/pq_common.hxx 
b/connectivity/source/drivers/postgresql/pq_common.hxx
deleted file mode 100644
index 68a973a..000
--- a/connectivity/source/drivers/postgresql/pq_common.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the License); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an AS IS basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2011 Lionel Elie Mamane lio...@mamane.lu (initial 
developer) ]
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the GPLv3+), or
- * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#ifndef _PQ_COMMON_
-#define _PQ_COMMON_
-
-#ifdef UNUSED
-#elif defined(__GNUC__)
-# define UNUSED(x) UNUSED_ ## x __attribute__((unused))
-#elif defined(__LCLINT__)
-# define UNUSED(x) /*@unused@*/ x
-#else
-# define UNUSED(x) x
-#endif
-
-#endif /* _PQ_COMMON_ */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

On 09/08/12 12:50, Michael Meeks wrote:

   In case things arn't tangled enough - you can release the SolarMutex in
 your current thread and give another thread a chance to get in using
 XToolkit's reschedule method. Whether that is likely to make your life
 only yet more tangled is unclear to me ;-)

WTF, there is an API to release SolarMutex? ... /me hides under desk


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

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

 connectivity/source/drivers/postgresql/pq_allocator.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4a5c42950822b495e3b72ef513339101220e7304
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 10 22:05:52 2012 +0200

pq_allocator.hxx: work around spurious MSVC warning

Change-Id: I6c516e4bd125c4075c195980a2fcdb58382c38dd
(cherry picked from commit 2c5cff69309937b5b06772cd021d1a6213bf2c2d)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx 
b/connectivity/source/drivers/postgresql/pq_allocator.hxx
index f454bb6..dadeb8e 100644
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx
@@ -182,6 +182,9 @@ public:
 void destroy (pointer p)
 {
 p-~T();
+#ifdef _MSC_VER
+(void) p; // spurious warning C4100: 'p': unreferenced formal parameter
+#endif
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

 solenv/gbuild/Configuration.mk  |   10 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 ++
 solenv/gbuild/platform/com_GCC_defs.mk  |2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 6292b12acf51a816fad3b3ea8073a58eb3c2
Author: Michael Stahl mst...@redhat.com
Date:   Thu Aug 9 13:08:17 2012 +0200

gbuild: add a kludge to get dictionaries to build in cygwin:

Due to the scourge of symlinked git repositories, building the
configuration files in dictionaries fails on cygwin because the native
xsltproc cannot understand cygwin symlinks; work around that with a
new gb_Helper_symlinked_native function.
Should be reverted once git sub modules liberate us from the scourge.

Change-Id: Idc48da9b60348dc66160219909479c3c83daeaf2

diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 53a11e1..61254ce 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -93,7 +93,7 @@ endef
 $(call gb_XcsTarget_get_target,%) : \
$(gb_XcsTarget_XSLT_SchemaVal) $(gb_XcsTarget_XSLT_Sanity) \
$(gb_XcsTarget_XSLT_SchemaTrim) $(gb_XcsTarget_DTD_Schema)
-   $(call gb_XcsTarget__command,$@,$*,$(filter %.xcs,$^))
+   $(call gb_XcsTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcs,$^)))
 
 $(call gb_XcsTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCS,1)
@@ -140,7 +140,7 @@ endef
 
 $(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \
$(gb_XcuTarget_XSLT_AllLang) 
$(gb_XcuDataTarget_DTD_ComponentUpdate)
-   $(call gb_XcuDataTarget__command,$@,$*,$(filter %.xcu,$^))
+   $(call gb_XcuDataTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcu,$^)))
 
 $(call gb_XcuDataTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,2)
@@ -183,7 +183,7 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 $(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
-   $(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter 
%.xcs,$^))
+   $(call gb_XcuModuleTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcu,$^)),$(filter %.xcs,$^))
 
 $(call gb_XcuModuleTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,3)
@@ -253,7 +253,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1))  \
$(gb_XcuMergeTarget_CFGEXCOMMAND) \
-p $(firstword $(subst /, ,$(2))) \
-   -i $(3) \
+   -i $(call gb_Helper_symlinked_native,$(3)) \
-o $(1) \
-m $(SDF) \
-l all)
@@ -295,7 +295,7 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 $(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
-   $(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^))
+   $(call gb_XcuResTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcu,$^)))
 
 $(call gb_XcuResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,6)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 0c0c98f..7b64e2b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -248,6 +248,12 @@ define gb_Helper_make_url
 file:///$(strip $(1))
 endef
 
+# for source files in non-core repositories, the cygwin symlink is not
+# understood by native tools, so find the real path to the file
+define gb_Helper_symlinked_native
+$(shell cygpath -m $(realpath $(1)))
+endef
+
 # YaccTarget class
 
 define gb_YaccTarget__command
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 60ae0c3..39fa02b 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -158,6 +158,8 @@ define gb_Helper_make_url
 file://$(strip $(1))
 endef
 
+gb_Helper_symlinked_native = $(1)
+
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/source

 desktop/source/deployment/dp_persmap.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 8f6ecf2c86c70835efca9537f862c56431be2f8b
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 10 23:54:33 2012 +0200

warning C4702: unreachable code

Change-Id: Icec8f9e37fa679b25d9bd44de56c98477d758abc
(cherry picked from commit e940b0f5e2b57c67b93ffadd7063ec650aa7bcbf)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/desktop/source/deployment/dp_persmap.cxx 
b/desktop/source/deployment/dp_persmap.cxx
index 6c7cd94..fb7aeca 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -144,7 +144,9 @@ bool PersistentMap::get( OString * value, OString const  
key ) const
 catch (DbException  exc) {
 throw_rtexc( exc.get_errno(), exc.what() );
 }
+#ifndef _MSC_VER
 return false; // avoiding warning
+#endif
 }
 
 
//__
@@ -192,7 +194,9 @@ bool PersistentMap::erase( OString const  key, bool 
flush_immediately )
 catch (DbException  exc) {
 throw_rtexc( exc.get_errno(), exc.what() );
 }
+#ifndef _MSC_VER
 return false; // avoiding warning
+#endif
 }
 
 
//__
@@ -231,7 +235,9 @@ t_string2string_map PersistentMap::getEntries() const
 catch (DbException  exc) {
 throw_rtexc( exc.get_errno(), exc.what() );
 }
+#ifndef _MSC_VER
 return t_string2string_map(); // avoiding warning
+#endif
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/source

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

New commits:
commit ca8f6bb28283879b1f11af0991485bbc3ae74767
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jul 23 10:28:03 2012 +0200

Bogus warning C4701: potentially uninitialized local variable

Change-Id: I51caaca911f71788940260bd63d3854526d7473f
(cherry picked from commit 6aff9717426db96f41ab04cd96da2b5d074625e1)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 5ad2f6a..58285c4 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -343,7 +343,7 @@ void StringHelper::appendHex( OUStringBuffer rStr, 
sal_Int64 nData, bool bPrefi
 static sal_uInt64
 lcl_ConvertDouble(double const f)
 {
-sal_uInt64 i;
+sal_uInt64 i = sal_uInt64();
 for (size_t j = 0; j  sizeof(double); ++j)
 {   // hopefully both endian independent and strict aliasing safe
 reinterpret_castchar *(i)[j] = reinterpret_castchar const 
*(f)[j];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - basic/inc basic/source cppcanvas/source sc/source sfx2/source unusedcode.easy xmlhelp/source

 basic/inc/basic/sbstar.hxx|2 -
 basic/source/classes/sb.cxx   |   16 -
 basic/source/classes/sbunoobj.cxx |   20 ++--
 basic/source/runtime/step0.cxx|   20 ++--
 cppcanvas/source/wrapper/implsprite.cxx   |   21 -
 cppcanvas/source/wrapper/implsprite.hxx   |5 
 sc/source/core/tool/interpr1.cxx  |   13 +++---
 sfx2/source/doc/objxtor.cxx   |   12 +-
 unusedcode.easy   |1 
 xmlhelp/source/cxxhelp/provider/databases.cxx |   31 ++
 10 files changed, 54 insertions(+), 87 deletions(-)

New commits:
commit 7e071e5383560c1a85722b134f5a8637585999e5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 9 12:40:36 2012 +0100

remove some unused methods

Change-Id: I8b89f49eff059f5650bfb531bcb568db1d97c3a3

diff --git a/cppcanvas/source/wrapper/implsprite.cxx 
b/cppcanvas/source/wrapper/implsprite.cxx
index 9e6ce32..9ff68ef 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -64,27 +64,6 @@ namespace cppcanvas
 OSL_ENSURE( mpTransformArbiter.get(), ImplSprite::ImplSprite(): 
Invalid transformation arbiter);
 }
 
-ImplSprite::ImplSprite( const uno::Reference rendering::XSpriteCanvas 
   rParentCanvas,
-const uno::Reference 
rendering::XAnimatedSprite  rSprite,
-const 
ImplSpriteCanvas::TransformationArbiterSharedPtr rTransformArbiter ) :
-mxGraphicDevice(),
-mxSprite( uno::Reference rendering::XSprite (rSprite,
-   uno::UNO_QUERY) ),
-mxAnimatedSprite( rSprite ),
-mpTransformArbiter( rTransformArbiter )
-{
-// Avoiding ternary operator in initializer list (Solaris
-// compiler bug, when function call and temporary is
-// involved)
-if( rParentCanvas.is() )
-mxGraphicDevice = rParentCanvas-getDevice();
-
-OSL_ENSURE( rParentCanvas.is() , ImplSprite::ImplSprite(): 
Invalid canvas);
-OSL_ENSURE( mxGraphicDevice.is(), ImplSprite::ImplSprite(): 
Invalid graphic device);
-OSL_ENSURE( mxSprite.is(), ImplSprite::ImplSprite(): Invalid 
sprite);
-OSL_ENSURE( mpTransformArbiter.get(), ImplSprite::ImplSprite(): 
Invalid transformation arbiter);
-}
-
 ImplSprite::~ImplSprite()
 {
 // hide the sprite on the canvas. If we don't hide the
diff --git a/cppcanvas/source/wrapper/implsprite.hxx 
b/cppcanvas/source/wrapper/implsprite.hxx
index d75cd7c..025d3e3 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -51,11 +51,6 @@ namespace cppcanvas
 const ::com::sun::star::uno::Reference
   ::com::sun::star::rendering::XSprite   
 rSprite,
 const 
ImplSpriteCanvas::TransformationArbiterSharedPtr rTransformArbiter );
-ImplSprite( const ::com::sun::star::uno::Reference
-  ::com::sun::star::rendering::XSpriteCanvas 
 rParentCanvas,
-const ::com::sun::star::uno::Reference
-  ::com::sun::star::rendering::XAnimatedSprite 
 rSprite,
-const 
ImplSpriteCanvas::TransformationArbiterSharedPtr rTransformArbiter );
 virtual ~ImplSprite();
 
 virtual void setAlpha( const double rAlpha );
diff --git a/unusedcode.easy b/unusedcode.easy
index 5188d8f..11c9818 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -112,7 +112,6 @@ connectivity::mozab::MQueryHelper::next()
 connectivity::sdbcx::OGroup::OGroup(rtl::OUString const, unsigned char)
 connectivity::sdbcx::OGroup::OGroup(unsigned char)
 connectivity::toString(com::sun::star::uno::Any const)
-cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Referencecom::sun::star::rendering::XSpriteCanvas
 const, 
com::sun::star::uno::Referencecom::sun::star::rendering::XAnimatedSprite 
const, 
boost::shared_ptrcppcanvas::internal::ImplSpriteCanvas::TransformationArbiter 
const)
 dbtools::getConnection(rtl::OUString const, rtl::OUString const, 
rtl::OUString const, 
com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory 
const)
 formula::FormulaTokenIterator::First()
 jfw_plugin::VendorBase::createInstance()
commit 16f75f1f773035df36437763588d5a3acbb70935
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 9 12:32:07 2012 +0100

reduce static_initialization_and_destruction chain

Change-Id: I9fdefd428b858fd5581412d6f8e896a0eb680fef

diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values


On Thu, 2012-08-09 at 13:21 +0200, Michael Stahl wrote:
 On 09/08/12 12:50, Michael Meeks wrote:
 
  In case things arn't tangled enough - you can release the SolarMutex in
  your current thread and give another thread a chance to get in using
  XToolkit's reschedule method. Whether that is likely to make your life
  only yet more tangled is unclear to me ;-)
 
 WTF, there is an API to release SolarMutex? ... /me hides under desk

Um right ;-) well - at least - I -assume- it instantiates the relevant
Yield class which recursively drops the SolarMutex, then spins the
mainloop and after processing an event (prolly a cursor blink would be a
fall-back timeout ;-) it comes back, or perhaps doesn't come back
because another thread got ownership of the mainloop / solar-mutex.

Just another good example of why we badly need a minimal, small,
simple, easy-to-understand, Objects-with-methods-not-meta-interfaces,
cleanish API with an ABI break from the past ;-) [ and simultaneously
IMHO to adapt UNO to target a superset of well-defined
exposing-scripting functionality ].

ATB,

Michael.

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

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

Re: git review

On Wed, Aug 08, 2012 at 11:52:03PM +0200, Bjoern Michaelsen wrote:
  Like described in link above, you have three options here:
  pypi-system-wide, pypi-user-local and distro package.
  No other options please.
 
 Most people wont even know what pypi-system-wide is and dont want to know. And
 they shouldnt need to.
 
 We will loose possible contributors that way. Not an option. Patch submittal
 has to work hasslefree and out of the box. This is really critical: there has
 to be no extra step at all for patch submittal otherwise we failed.

Thinking a bit about this, another possibility would be to do with git-review
as we do with other external stuff:
Downloading and installing a local copy in ./download. That would ensure it
to be universally available and be up to date.

Best,

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/inc oox/source

2012-08-09 Thread Petr Mladek

 oox/inc/oox/ppt/pptshapegroupcontext.hxx |1 
 oox/source/drawingml/diagram/diagram.cxx |   66 ---
 oox/source/ppt/pptshapegroupcontext.cxx  |   11 -
 3 files changed, 45 insertions(+), 33 deletions(-)

New commits:
commit dc29a85982a4b54657be3f448dd8d37d2144a020
Author: Muthu Subramanian sumu...@suse.com
Date:   Mon Jun 25 19:25:52 2012 +0530

n#759210: Certain smartart drawings weren't imported.

SmartArt info was reset, when there was a chart (e.g.)
in the same slide.

This also fixes fdo#50907.

(cherry picked from commit 11c5699dad06fb0d7fc0e458550a1dac82f8ee5f)

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx 
b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
index 7e2a6d3..841e741 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
@@ -39,6 +39,7 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 SlidePersistPtr mpSlidePersistPtr;
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
+voidimportExtDrawings();
 
 public:
 PPTShapeGroupContext(
diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index 8e6586d..002e20a 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -395,40 +395,44 @@ void loadDiagram( ShapePtr pShape,
 pShape-addExtDrawingRelId( *aIt );
 }
 
-// layout
-if( !rLayoutPath.isEmpty() )
+// extLst is present, lets bet on that and ignore the rest of the data 
from here
+if( !pData-getExtDrawings().size() )
 {
-rtl::Reference core::FragmentHandler  xRef(
-new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, pLayout ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   DiagramLayout,
-   pShape,
-   xRef);
-}
+// layout
+if( !rLayoutPath.isEmpty() )
+{
+rtl::Reference core::FragmentHandler  xRef(
+new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, 
pLayout ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+DiagramLayout,
+pShape,
+xRef);
+}
 
-// style
-if( !rQStylePath.isEmpty() )
-{
-rtl::Reference core::FragmentHandler  xRef(
-new DiagramQStylesFragmentHandler( rFilter, rQStylePath, 
pDiagram-getStyles() ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   DiagramQStyle,
-   pShape,
-   xRef);
-}
+// style
+if( !rQStylePath.isEmpty() )
+{
+rtl::Reference core::FragmentHandler  xRef(
+new DiagramQStylesFragmentHandler( rFilter, rQStylePath, 
pDiagram-getStyles() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+DiagramQStyle,
+pShape,
+xRef);
+}
 
-// colors
-if( !rColorStylePath.isEmpty() )
-{
-rtl::Reference core::FragmentHandler  xRef(
-new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram-getColors() ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   DiagramColorStyle,
-   pShape,
-   xRef);
+// colors
+if( !rColorStylePath.isEmpty() )
+{
+rtl::Reference core::FragmentHandler  xRef(
+new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram-getColors() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+DiagramColorStyle,
+pShape,
+xRef);
+}
 }
 
 // diagram loaded. now lump together  attach to shape
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index 0529ec6..3dbf067 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -128,6 +128,8 @@ Reference XFastContextHandler  
PPTShapeGroupContext::createFastChildContext( s
 break;
 case PPT_TOKEN( graphicFrame ): // CT_GraphicalObjectFrame
 {
+if( pGraphicShape )
+importExtDrawings();
 pGraphicShape = oox::drawingml::ShapePtr( new PPTShape( 
meShapeLocation, com.sun.star.drawing.OLE2Shape ) );
 xRet.set( new oox::drawingml::GraphicalObjectFrameContext( *this, 
mpGroupShapePtr, pGraphicShape, true ) );
 }
@@ -141,9 +143,9 @@ Reference XFastContextHandler

binfilter, core, dev-tools, dictionaries, help, translations are now all on gerrit

Hi,

see $subject. All of the above repositories have been created on gerrit and are
synced from fdo.

IMPORTANT NOTE: If you remove branches on fdo you break the sync, so please
either wait with it until we are on gerrit or update:
 
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/syncgerrit;h=765bccfcc99759e263ddbc782de82a1630b596f5;hb=HEAD
and then drop a note at ger...@otrs.documentfoundation.org asking to deploy the
change. Some for adding branches, they wont get synced automatically.

Best,

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

Re: [PUSHED] fdo#49750 Search Findbar's History

2012-08-09 Thread zolniatamas


Hi Kendy,

  Thanks for the correction! I'll pay attention these things in the future!


Regards,
Zolnai Tamás



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

upcoming IP change for VMs

2012-08-09 Thread Florian Effenberger


Hello,

sorry for crossposting on three lists, but I need to reach out to 
everyone affected.


Since we're running out of IPs for our virtual machines, we will migrate 
to a larger subnet in the next days. This will mean that everyone who 
runs a virtual machine and has set up rules based on the current IP 
address needs to adapt it.


We will change the IP on our side, and also the bridging to the VM as 
well as the DNS entries, whose TTL we will lower before to make the 
migration go smooth, but in case you made manual adaptions, we need your 
help, since deeply investigating every of the currently 13 VMs is a bit 
tedious. ;-)


If you have access to one or more of the TDF systems, and are not sure 
whether you are using a VM, the following might help:


- Do you have root access? If so, you most likely have VM.
- Is the hostname vmX(Y).documentfoundation.org? Then it's a VM.
- Try the host command on the command line to find out if your system is 
on a VM:

  - $ host gerrit.libreoffice.org
gerrit.libreoffice.org has address 176.9.46.25
  - $ host 176.9.46.25
25.46.9.176.in-addr.arpa domain name pointer vm2.documentfoundation.org

If you maintain a VM, *please* do ping us at 
hostmas...@documentfoundation.org directly so we can keep you in the 
loop. Do *not* reply to this list, do *not* write to me individually, 
but rather, write to hostmas...@documentfoundation.org


Plus, if you maintain a VM, please check where the IP address is stored, 
beside /etc/hosts and /etc/network/interfaces and possible firewall 
rules (ufw status resp. iptables -L -n), so you know where to change 
them when the switch happens.


Sorry for these inconveniences, and thanks for your work on LibreOffice!
Florian

--
Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender)
Tel: +49 8341 99660880 | Mobile: +49 151 14424108
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - oox/inc oox/source

2012-08-09 Thread Petr Mladek

 oox/inc/oox/ppt/pptshapegroupcontext.hxx |1 
 oox/source/drawingml/diagram/diagram.cxx |   69 ---
 oox/source/ppt/pptshapegroupcontext.cxx  |   11 
 3 files changed, 47 insertions(+), 34 deletions(-)

New commits:
commit f3826fda8ac280d20f70ae273f20a438d6040453
Author: Muthu Subramanian sumu...@suse.com
Date:   Mon Jun 25 19:25:52 2012 +0530

n#759210: Certain smartart drawings weren't imported.

SmartArt info was reset, when there was a chart (e.g.)
in the same slide.

This also fixes fdo#50907.

Conflicts:

oox/source/drawingml/diagram/diagram.cxx

(cherry picked from commit 11c5699dad06fb0d7fc0e458550a1dac82f8ee5f)

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx 
b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
index 7e2a6d3..841e741 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
@@ -39,6 +39,7 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 SlidePersistPtr mpSlidePersistPtr;
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
+voidimportExtDrawings();
 
 public:
 PPTShapeGroupContext(
diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index d262dd8..d7ad02e 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -408,40 +408,44 @@ void loadDiagram( ShapePtr pShape,
 pShape-addExtDrawingRelId( *aIt );
 }
 
-// layout
-if( rLayoutPath.getLength()  0 )
+// extLst is present, lets bet on that and ignore the rest of the data 
from here
+if( !pData-getExtDrawings().size() )
 {
-rtl::Reference core::FragmentHandler  xRef(
-new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, pLayout ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   DiagramLayout,
-   pShape,
-   xRef);
-}
+// layout
+if( !rLayoutPath.isEmpty() )
+{
+rtl::Reference core::FragmentHandler  xRef(
+new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, 
pLayout ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+DiagramLayout,
+pShape,
+xRef);
+}
 
-// style
-if( rQStylePath.getLength()  0 )
-{
-rtl::Reference core::FragmentHandler  xRef(
-new DiagramQStylesFragmentHandler( rFilter, rQStylePath, 
pDiagram-getStyles() ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   DiagramQStyle,
-   pShape,
-   xRef);
-}
+// style
+if( !rQStylePath.isEmpty() )
+{
+rtl::Reference core::FragmentHandler  xRef(
+new DiagramQStylesFragmentHandler( rFilter, rQStylePath, 
pDiagram-getStyles() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+DiagramQStyle,
+pShape,
+xRef);
+}
 
-// colors
-if( rColorStylePath.getLength()  0 )
-{
-rtl::Reference core::FragmentHandler  xRef(
-new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram-getColors() ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   DiagramColorStyle,
-   pShape,
-   xRef);
+// colors
+if( !rColorStylePath.isEmpty() )
+{
+rtl::Reference core::FragmentHandler  xRef(
+new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram-getColors() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+DiagramColorStyle,
+pShape,
+xRef);
+}
 }
 
 // diagram loaded. now lump together  attach to shape
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index cf982cf..a33951c 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -115,6 +115,8 @@ Reference XFastContextHandler  
PPTShapeGroupContext::createFastChildContext( s
 break;
 case PPT_TOKEN( graphicFrame ): // CT_GraphicalObjectFrame
 {
+if( pGraphicShape )
+importExtDrawings();
 pGraphicShape = oox::drawingml::ShapePtr( new PPTShape( 
meShapeLocation, com.sun.star.drawing.OLE2Shape ) );
 xRet.set( new oox::drawingml::GraphicalObjectFrameContext( *this, 
mpGroupShapePtr, pGraphicShape, true ) );

[Libreoffice-commits] .: 2 commits - desktop/inc desktop/source offapi/com

 desktop/inc/app.hxx|4 
 desktop/source/app/app.cxx |  154 -
 desktop/source/app/check_ext_deps.cxx  |   19 +
 desktop/source/app/cmdlineargs.cxx |   74 +++---
 desktop/source/app/cmdlineargs.hxx |   34 +-
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |2 
 desktop/source/deployment/inc/dp_misc.h|3 
 desktop/source/deployment/manager/dp_extensionmanager.cxx  |9 
 desktop/source/deployment/manager/dp_extensionmanager.hxx  |1 
 desktop/source/deployment/manager/dp_manager.cxx   |   22 -
 desktop/source/deployment/manager/dp_manager.h |2 
 desktop/source/deployment/misc/dp_misc.cxx |7 
 desktop/source/pkgchk/unopkg/unopkg_app.cxx|2 
 offapi/com/sun/star/deployment/XExtensionManager.idl   |8 
 offapi/com/sun/star/deployment/XPackageManager.idl |8 
 15 files changed, 232 insertions(+), 117 deletions(-)

New commits:
commit 5300f6f711c2167931d45248c1b72dbce3a7df38
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 9 13:29:22 2012 +0200

fdo#53006: Remove user/extensions/bundled cache after upgrade

... to clean out all sorts of inconsitencies that can have accrued there 
over
time apparently due to how the mechanism of copying share/prereg/bundled 
worked,
and to work around stale $BUNDLED_EXTENSIONS_PREREG references in a better 
way
than the previous 81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1 fdo#53006 Force
reinstall of all bundled extensions on upgrade.

See the comment on refreshBundledExtensionsDir for how, at least in theory, 
that
functionality could be removed again in the future.

This effectively reverts 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 Force
ExtensionManager resync when the implementation changes and
81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1 fdo#53006 Force reinstall of all
bundled extensions on upgrade (the latter at least on master; it had never 
been
cherry-picked to libreoffice-3-6), which it obsoletes.

Change-Id: I8f80c07a06ec9d53b03813338eeff7d7757c9d4d

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 06dc4c7..22866ef 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -126,14 +126,12 @@ class Desktop : public Application
 static sal_Bool isCrashReporterEnabled();
 
 // first-start (ever) related methods
-static bool newInstallation();
-
 static sal_Bool CheckExtensionDependencies();
 
 static void DoRestartActionsIfNecessary( sal_Bool 
bQuickStart );
 static void SetRestartState();
 
-voidSynchronizeExtensionRepositories(bool force);
+voidSynchronizeExtensionRepositories();
 voidSetSplashScreenText( const ::rtl::OUString 
rText );
 voidSetSplashScreenProgress( sal_Int32 );
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c3152ee..84f60b8 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -152,6 +152,145 @@ static sal_Bool _bCrashReporterEnabled = sal_True;
 static ::rtl::OUString getBrandSharePreregBundledPathURL();
 #endif
 
+namespace {
+
+void removeTree(OUString const  url) {
+osl::Directory dir(url);
+switch (dir.open()) {
+case osl::FileBase::E_None:
+break;
+case osl::FileBase::E_NOENT:
+return; //TODO: SAL_WARN if recursive
+default:
+throw css::uno::RuntimeException(
+cannot open directory  + url,
+css::uno::Reference css::uno::XInterface ());
+}
+for (;;) {
+osl::DirectoryItem i;
+osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
+if (rc == osl::FileBase::E_NOENT) {
+break;
+}
+if (rc != osl::FileBase::E_None) {
+throw css::uno::RuntimeException(
+cannot iterate directory  + url,
+css::uno::Reference css::uno::XInterface ());
+}
+osl::FileStatus stat(
+osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
+osl_FileStatus_Mask_FileURL);
+if (i.getFileStatus(stat) != osl::FileBase::E_None) {
+throw css::uno::RuntimeException(
+cannot stat in directory  + url,
+css::uno::Reference css::uno::XInterface ());
+}
+if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: 
symlinks
+removeTree(stat.getFileURL());
+} else {
+if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None) 
{
+throw css::uno::RuntimeException(
+cannot remove  + stat.getFileURL(),
+

[Libreoffice-commits] .: solenv/bin

 solenv/bin/make_installer.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbf9794729337dd24ee11f85e052133db50d4d56
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Aug 9 13:42:45 2012 +0100

fix typo in make_installer.pl

Change-Id: Icc0f1d1e91c704282bfd18b6218bf0659cccb63e

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 38b4793..fce4522 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -625,7 +625,7 @@ for ( my $n = 0; $n = 
$#installer::globals::languageproducts; $n++ )
 
 if (!($installer::globals::is_copy_only_project))
 {
-if ((( $installer::globals::iswindowsbuild )  ( 
$installer::globals::packageformat ne archive )  ( 
$installer::globals::packageformat ne installed ) ) || 
$insaller::globals::packageformat eq 'msi' )
+if ((( $installer::globals::iswindowsbuild )  ( 
$installer::globals::packageformat ne archive )  ( 
$installer::globals::packageformat ne installed ) ) || 
$installer::globals::packageformat eq 'msi' )
 {
 
installer::windows::msiglobal::set_global_code_variables($languagesarrayref, 
$languagestringref, $allvariableshashref, $alloldproperties);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6, 3-5] n#759210: Certain smartart drawings weren't imported

2012-08-09 Thread Petr Mladek

Hi Korrawit,

it seems that we have somehow missed this request.

Korrawit Pruegsanusak píše v Po 16. 07. 2012 v 12:08 +0700:
 Hello all,
 
 On Tue, Jul 10, 2012 at 8:59 PM, Korrawit Pruegsanusak
 detective.conan.1...@gmail.com wrote:
  The commit 11c5699dad06fb0d7fc0e458550a1dac82f8ee5f also fix fdo#50907
  on master, so I propose this review for the inclusion in both -3-6 and
  -3-5 branches.
 [snip]
  Last, sorry to say this, but I didn't have time to test if it could be
  build or even fix the problem. (I didn't test in both branches, but
  tested in master that this really fixes the problem, please see
  comment 11 in fdo bugzilla).
 
 I've tested a build in -3-6 branch, with the attached patch on top of
 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=0054c76b0f3d5bdbaef73a696ce3cf930be9c16b
 and it really fix fdo#50907.

Yup, it worked and looked fine, so pushed to 3-6, see
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=dc29a85982a4b54657be3f448dd8d37d2144a020

 I didn't test with other pptx files, nor in -3-5 branch.

It caused some crashes there. After discussion with Muthu I added one
more fix and pushed it there as well, see:
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=0a7453043f35a9a49f0482168b48d378a099a238
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=f3826fda8ac280d20f70ae273f20a438d6040453


Best Regards,
Petr

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

Re: git review

2012-08-09 Thread Norbert Thiebaud

On Thu, Aug 9, 2012 at 7:04 AM, Bjoern Michaelsen
bjoern.michael...@canonical.com wrote:
 On Wed, Aug 08, 2012 at 11:52:03PM +0200, Bjoern Michaelsen wrote:
  Like described in link above, you have three options here:
  pypi-system-wide, pypi-user-local and distro package.
  No other options please.

 Most people wont even know what pypi-system-wide is and dont want to know. 
 And
 they shouldnt need to.

 We will loose possible contributors that way. Not an option. Patch submittal
 has to work hasslefree and out of the box. This is really critical: there has
 to be no extra step at all for patch submittal otherwise we failed.

 Thinking a bit about this, another possibility would be to do with git-review
 as we do with other external stuff:
 Downloading and installing a local copy in ./download. That would ensure it
 to be universally available and be up to date.

I know that michael disagree with me on that, but I prefer dev-tools
to be in ...  dev-tools.git
one can install it as he see fit. and you get the version you
want/need regardless where you are in the source tree...

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

Re: [REVIEW 3-6] fdo#53006 Force reinstall of all bundled extensions on upgrade


On 08/03/2012 06:10 PM, Stephan Bergmann wrote:

On 08/03/2012 11:24 AM, Stephan Bergmann wrote:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1

fdo#53006 Force reinstall of all bundled extensions on upgrade are the
two commits from master to get this fixed, which I would love to see
backported to libreoffice-3-6.


Please do *not* backport that one to libreoffice-3-6 for now.  I just
got an idea that might obsolete it...


Finally got a new fix out, see 
https://bugs.freedesktop.org/show_bug.cgi?id=53006#c17 for details. 
With the one old commit from this thread still relevant, that means 
please review the three master commits


http://cgit.freedesktop.org/libreoffice/core/commit/?id=96f28626f0ac540fd0d0e129d00f3942bd64235b 
Check for ComponentPackageImpl::isRegistered_ in the current rdb


http://cgit.freedesktop.org/libreoffice/core/commit/?id=6c6358a6822d3562b9b8c7668a7d60d6c644dfe8 
Related fdo#53006: Do not instantiate service manager too early


http://cgit.freedesktop.org/libreoffice/core/commit/?id=5300f6f711c2167931d45248c1b72dbce3a7df38 
fdo#53006: Remove user/extensions/bundled cache after upgrade


for backporting to libreoffice-3-6.  (The last one needs one trivial 
tweak there, adding an rtl:: prefix to a new occurrence of OString 
at desktop/soruce/app/app.cxx:33.)


...and this time, I /did/ test on Windows 3.6, too. -- Lets keep fingers 
crossed...


Petr, Björn, Rene:  With that fixed, prereg-affected Linux distros can 
probably undo 
https://build.opensuse.org/package/view_file?file=force-refresh-of-bundled-extension-cache.diffpackage=libreofficeproject=LibreOffice%3AUnstable 
File force-refresh-of-bundled-extension-cache.diff of Package 
libreoffice or its moral equivalent (if any) again.


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

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values


On 08/09/2012 01:21 PM, Michael Stahl wrote:

WTF, there is an API to release SolarMutex? ... /me hides under desk


Yes, and its a gross, broken hack, never to be used.  (As the outer code 
that locked the SolarMutex presumably did so to be able to temporarily 
break invariants.  Now if inner code temporarily unlocks the SolarMutex, 
other code could observe broken invariants and fail, etc.)


Stephan

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

Re: git review

On Thu, Aug 09, 2012 at 07:55:45AM -0500, Norbert Thiebaud wrote:
 I know that michael disagree with me on that, but I prefer dev-tools
 to be in ...  dev-tools.git
 one can install it as he see fit. and you get the version you
 want/need regardless where you are in the source tree...

Well, putting it in ./download would be even better, as it would be living
upstream at openstack.

Best,

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

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread anwen

Thank you everyone for your kind and quick response.

Stephan, I checked the impl_sendNotifyTerminationEvent in desktop.cxx. Yes,
it is protected by TransactionGuard aTransaction( m_aTransactionManager,
E_HARDEXCEPTIONS ), the same as impl_sendQueryTerminationEvent, :-(

Stephan Bergmann-2 wrote

On 08/08/2012 08:34 PM, anwen wrote:
With the TerminateListener, I successfully get the desktop termination
event
by queryTermination() function. Although you told me that I could veto
this
termination signal by throwing TerminationVetoException. I am not sure
how
and where to handle the TerminationVetoException and re-call
XDesktop.terminate() to finally close the office. So I tried to handle
everything inside queryTermination().

I think you should execute your shutdown activies on notifyTermination,
not queryTermination. The latter can be veto'ed by some other listener,
in which case Desktop would cancel the termination and continue running
(and notify you with queryTermination eventually followed by
notifyTermination again later on).

However, deadlock happened sometimes again. Here is my analysis: this
function is called by the main thread and is protected by the SolarMutex.
If
a modified() function is called by the worker thread at the same time,
the
worker thread is waiting for the SolarMutex. Then the main thread tries
to
stop the worker thread by calling realtime_session-stop(). This session
is
designed with thread safe strategy by a third-party. It fails to close
the
worker thread because the worker thread is waiting for the Main thread to
release the SolarMutex.

That queryTermination is called with SolarMutex locked is a bug. (Is
notifyTermination also called with SolarMutex locked? Would need to
check, in framework/source/services/desktop.cxx.) However, it might be
a bug not easy to fix without opening any number of pandora's boxes...

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

--
View this message in context:
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p4000178.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: git review

2012-08-09 Thread d . ostrovsky


Quoting Norbert Thiebaud nthieb...@gmail.com:


On Thu, Aug 9, 2012 at 7:04 AM, Bjoern Michaelsen


Thinking a bit about this, another possibility would be to do with  
git-review

as we do with other external stuff:
Downloading and installing a local copy in ./download. That would  
ensure it

to be universally available and be up to date.


I know that michael disagree with me on that, but I prefer dev-tools
to be in ...  dev-tools.git
one can install it as he see fit. and you get the version you
want/need regardless where you are in the source tree...


Well to put it in dev-tool is much less painfull as to put it elsewhere.
Note this tool must be in your PATH! For all branches.
And even if you switch the branches and no matter what your current  
directory is,

you must be able to say:
git review --dry-run

that it.
But who is the person who will put it in dev-tools once and update it  
all the time?

(Last time i contributed to git-review was today morning).
But even if that person (not me) or some cron jobs continuously  
synchronize it, the user must still update it.


So the user must now periodically update dev-tool to get the fresh version
of git-review? But then what is the difference to say git pull  
dev-tools/git-review or


sudo apt-get update upgrade (place here your distro command)
or (*)
sudo pip install git-review
sudo pip install --upgrade git-review
sudo pip uninstall git-review

(*) http://www.pip-installer.org/en/latest/index.html

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

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

2012-08-09 Thread Takeshi Abe

 basic/source/comp/exprnode.cxx |   12 +---
 basic/source/comp/exprtree.cxx |1 -
 basic/source/inc/expr.hxx  |1 -
 basic/source/inc/sbjsmeth.hxx  |3 ---
 4 files changed, 1 insertion(+), 16 deletions(-)

New commits:
commit 414ecabbd56ab0ea7c041de4268e1c18187a070a
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Aug 9 22:19:37 2012 +0900

Remove useless #ifndef guard

Change-Id: Iddb11ff11db0912832a73bd8b95438985383

diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index 055c957..e53473a 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -37,10 +37,7 @@ public:
 TYPEINFO();
 };
 
-#ifndef __SB_SBJSCRIPTMETHODREF_HXX
-#define __SB_SBJSCRIPTMETHODREF_HXX
 SV_DECL_IMPL_REF(SbJScriptMethod)
-#endif
 
 #endif
 
commit 2eb40e3cecd2fa503c6717acfad59b51918b5aaf
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Aug 9 22:05:53 2012 +0900

Remove a member variable no one reads

Change-Id: Iacb037bebaf1c3d77ab61be6342b42319b8a2e7b

diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 0abb1d0..1ca35fc 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -42,7 +42,6 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, 
SbiToken t, SbiExprNode*
 nVal  = 0;
 eType = SbxVARIANT; // Nodes are always Variant
 eNodeType = SbxNODE;
-bComposite= sal_True;
 }
 
 SbiExprNode::SbiExprNode( SbiParser* p, double n, SbxDataType t )
@@ -73,9 +72,6 @@ SbiExprNode::SbiExprNode( SbiParser* p, const SbiSymDef r, 
SbxDataType t, SbiEx
 aVar.pPar = l;
 aVar.pvMorePar = NULL;
 aVar.pNext= NULL;
-
-// Results of functions are at no time fixed
-bComposite= sal_Bool( aVar.pDef-GetProcDef() != NULL );
 }
 
 // #120061 TypeOf
@@ -107,7 +103,6 @@ void SbiExprNode::BaseInit( SbiParser* p )
 pLeft   = NULL;
 pRight  = NULL;
 pWithParent = NULL;
-bComposite  = sal_False;
 bError  = sal_False;
 }
 
@@ -222,7 +217,7 @@ void SbiExprNode::Optimize()
 CollectBits();
 }
 
-// Lifting of the composite- and error-bits
+// Lifting of the error-bits
 
 void SbiExprNode::CollectBits()
 {
@@ -230,13 +225,11 @@ void SbiExprNode::CollectBits()
 {
 pLeft-CollectBits();
 bError |= pLeft-bError;
-bComposite |= pLeft-bComposite;
 }
 if( pRight )
 {
 pRight-CollectBits();
 bError |= pRight-bError;
-bComposite |= pRight-bComposite;
 }
 }
 
@@ -267,7 +260,6 @@ void SbiExprNode::FoldConstants()
 String rr( pRight-GetString() );
 delete pLeft; pLeft = NULL;
 delete pRight; pRight = NULL;
-bComposite = sal_False;
 if( eTok == PLUS || eTok == CAT )
 {
 eTok = CAT;
@@ -341,7 +333,6 @@ void SbiExprNode::FoldConstants()
 nVal = 0;
 eType = SbxDOUBLE;
 eNodeType = SbxNUMVAL;
-bComposite = sal_False;
 sal_Bool bCheckType = sal_False;
 switch( eTok )
 {
@@ -431,7 +422,6 @@ void SbiExprNode::FoldConstants()
 pLeft = NULL;
 eType = SbxDOUBLE;
 eNodeType = SbxNUMVAL;
-bComposite = sal_False;
 switch( eTok )
 {
 case NEG:
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index c36e5a4..267576a 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -512,7 +512,6 @@ SbiExprNode* SbiExpression::Operand( bool bUsedForTypeOf )
 }
 }
 nParenLevel--;
-pRes-bComposite = sal_True;
 break;
 default:
 // keywords here are OK at the moment!
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index d59f56b..8580493 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -102,7 +102,6 @@ class SbiExprNode {  // operators (and 
operands)
 SbiNodeType  eNodeType;
 SbxDataType eType;
 SbiToken eTok;
-sal_Bool  bComposite;   // sal_True: composite expression
 sal_Bool  bError;   // sal_True: error
 void  FoldConstants();
 void  CollectBits();// converting numbers to strings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ODF angle problems continued

2012-08-09 Thread Regina Henschel


Hi all,

I have written a mail to OASIS, that I think that a lot of angle 
definitions are not clear enough. It seems that the committee is willing 
to discuss the problem. I have therefore started with section 19.228 
draw:transform in spec ODF 1.2 part 1.


You find my concerns and suggestions on 
http://wiki.services.openoffice.org/wiki/User:Regina/MYDrafts4.


I plan to show that to the OASIS committee. But first I like to know 
your ideas. So please have a look.


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

ODF angle in draw:transform are in degrees

2012-08-09 Thread Regina Henschel


Hi,

there is a problem which I have not addressed in the Wiki (see other 
mail). As far as I see, the specification ODF 1.1 has no setting for the 
unit of the angles, but ODF 1.2 set it to degrees. SVG has it in 
degrees too, so this setting is reasonable.


But our implementation uses radians. So there are a lot of documents 
out, that have the angle in radians in the document.


Any idea how to proceed?

Kind regards
Regina

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

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread anwen


anwen wrote
 
 
 BTW, I am not sure how to initialize a XDocumentEventBroadcaster which you
 mentioned previously in a Calc Extension. I tried this method: 
 ReferenceXSpreadsheetDocument
 xCalc(m_xCC-getServiceManager()-createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sheet.SpreadsheetDocument)),
 m_xCC), UNO_QUERY); But it did not work.
 
 

I am also interested in XDocumentEventBroadcaster/XDocumentEventListener. I
am wondering if you could correct my following code which tries to register
a XDocumentListener with the XDocumentEventBroadcaster in a Calc Extension.
I did some research on this topic. Most of examples initialize a
EventBroadcaster following a bootstrap() method which could not be used in
Calc Extension.

void SAL_CALL BLPAPIAddIn_Impl::addDocEvtListener() throw (RuntimeException)
{
// ReferenceXModel xModel = UnoRuntime.queryInterface(XModel.class,
uno::UNO_QUERY);
ReferenceXSpreadsheetDocument
xCalc(m_xCC-getServiceManager()-createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sheet.SpreadsheetDocument)),
m_xCC), UNO_QUERY);

if (xCalc.is())
{   
Reference XDocumentEventBroadcaster  xBroadcaster(xCalc, 
UNO_QUERY);
if (xBroadcaster.is())
{
Reference XDocumentEventListener  xDocListener(

static_castXDocumentEventListener*(new CalcListener()), UNO_QUERY);
xBroadcaster-addDocumentEventListener(xDocListener);
std::cout  added an DocEvtListener  std::endl;
}
}
}

Thanks a lot.




--
View this message in context: 
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p4000189.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: git review

2012-08-09 Thread Norbert Thiebaud

On Thu, Aug 9, 2012 at 8:11 AM, Bjoern Michaelsen
bjoern.michael...@canonical.com wrote:
 On Thu, Aug 09, 2012 at 07:55:45AM -0500, Norbert Thiebaud wrote:
 I know that michael disagree with me on that, but I prefer dev-tools
 to be in ...  dev-tools.git
 one can install it as he see fit. and you get the version you
 want/need regardless where you are in the source tree...

 Well, putting it in ./download would be even better, as it would be living
 upstream at openstack.

no it would not, because if I swith to branch 3-5... what version do I
have then ?

not to mention have n-copy of it (I do have typically half-a dozen of
clone of core...)... yeah the src directory can be share... still. I
tend to do make clean a lot... so I would have to rebuild it every
time to make sure it is there when I need it ?


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

[Libreoffice-commits] .: sc/source unusedcode.easy

 sc/source/filter/xml/xmlimprt.cxx |   37 -
 sc/source/filter/xml/xmlimprt.hxx |1 -
 unusedcode.easy   |1 -
 3 files changed, 39 deletions(-)

New commits:
commit 3e65ed611f25064aa865e1559fccfeebb0e3c411
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Aug 9 16:05:37 2012 +0200

Bin ScXMLImport::GetVisibleSheet()

Change-Id: I3d5d03f1b5d357d3db1e0c1833824c154178533a

diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 55693ef..dcf37b4 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3199,43 +3199,6 @@ void ScXMLImport::ProgressBarIncrement(bool bEditCell, 
sal_Int32 nInc)
 }
 }
 
-SCTAB ScXMLImport::GetVisibleSheet()
-{
-// Get the visible sheet number from model's view data (after settings 
were loaded),
-// or 0 (default: first sheet) if no settings available.
-
-uno::Referencedocument::XViewDataSupplier xSupp(GetModel(), 
uno::UNO_QUERY);
-if (xSupp.is())
-{
-uno::Referencecontainer::XIndexAccess xIndex = xSupp-getViewData();
-if ( xIndex.is()  xIndex-getCount()  0 )
-{
-uno::Any aAny( xIndex-getByIndex(0) );
-uno::Sequencebeans::PropertyValue aViewSettings;  // settings 
for (first) view
-if ( aAny = aViewSettings )
-{
-sal_Int32 nCount = aViewSettings.getLength();
-for (sal_Int32 i = 0; i  nCount; ++i)
-{
-if ( aViewSettings[i].Name.compareToAscii(SC_ACTIVETABLE) 
== 0 )
-{
-rtl::OUString sValue;
-if(aViewSettings[i].Value = sValue)
-{
-String sTabName(sValue);
-SCTAB nTab = 0;
-if (pDoc-GetTable(sTabName, nTab))
-return nTab;
-}
-}
-}
-}
-}
-}
-
-return 0;
-}
-
 void ScXMLImport::ExtractFormulaNamespaceGrammar(
 OUString rFormula, OUString rFormulaNmsp, FormulaGrammar::Grammar 
reGrammar,
 const OUString rAttrValue, bool bRestrictToExternalNmsp ) const
diff --git a/sc/source/filter/xml/xmlimprt.hxx 
b/sc/source/filter/xml/xmlimprt.hxx
index 65f7a5e..f3706d9 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1105,7 +1105,6 @@ public:
 void SetLabelRanges();
 void AddDefaultNote( const com::sun::star::table::CellAddress aCell );
 
-SCTAB   GetVisibleSheet();
 /** Extracts the formula string, the formula grammar namespace URL, and a
 grammar enum value from the passed formula attribute value.
 
diff --git a/unusedcode.easy b/unusedcode.easy
index 11c9818..ff81200 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -19,7 +19,6 @@ ScVbaFormatooo::vba::excel::XStyle::getAddIndent()
 ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any 
const)
 
ScVbaFormatooo::vba::excel::XStyle::setNumberFormat(com::sun::star::lang::Locale,
 rtl::OUString const)
 
ScXMLExport::HasDrawPages(com::sun::star::uno::Referencecom::sun::star::sheet::XSpreadsheetDocument)
-ScXMLImport::GetVisibleSheet()
 
SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Referencecom::sun::star::uno::XInterface)
 SotStorage::GetProperty(String const, String const, 
com::sun::star::uno::Any)
 SpinButton::SpinButton(Window*, ResId const)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2012-08-09 Thread Eike Rathke

 i18npool/source/languagetag/languagetag.cxx|  129 
 i18npool/source/languagetag/simple-langtag.cxx |  401 +
 2 files changed, 408 insertions(+), 122 deletions(-)

New commits:
commit 1150a1a8eb1759160b9d88e99d95e5ad082f40be
Author: Eike Rathke er...@redhat.com
Date:   Thu Aug 9 16:06:41 2012 +0200

implemented simple liblangtag replacement for iOS and Android

diff --git a/i18npool/source/languagetag/languagetag.cxx 
b/i18npool/source/languagetag/languagetag.cxx
index 728e70a..d7c6b0f 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -15,128 +15,13 @@
 
 #if !defined(ANDROID)  !defined(IOS)
 #include liblangtag/langtag.h
-
-#elif defined(ANDROID) || defined(IOS)
-
-// Completely dummy implementation, once this actually starts getting used at
-// run-time will need to do something.
-
-// For iOS probably can use NSLocale, that should have more or less required
-// functionality. If it is good enough, it could be used for Mac OS X,
-// too. For Android, maybe java.util.Locale, although it definitely lacks in
-// functionality.
-
-typedef char gchar;
-typedef struct {
-char *message;
-} GError;
-
-static void g_free(void *p)
-{
-free(p);
-}
-
-static void g_error_free(GError *error)
-{
-(void) error;
-}
-
-typedef void lt_tag_t;
-typedef void lt_lang_t;
-typedef void lt_script_t;
-typedef void lt_region_t;
-
-static void lt_db_initialize(void)
-{
-}
-
-static void lt_db_finalize(void)
-{
-}
-
-static void lt_db_set_datadir(const char *dir)
-{
-(void) dir;
-}
-
-static lt_tag_t *lt_tag_new(void)
-{
-return NULL;
-}
-
-static lt_tag_t *lt_tag_copy(lt_tag_t *tag)
-{
-(void) tag;
-return NULL;
-}
-
-static void lt_tag_unref(lt_tag_t *tag)
-{
-(void) tag;
-}
-
-static int lt_tag_parse(lt_tag_t *tag,
-const char *tag_string,
-GError **error)
-{
-(void) tag;
-(void) tag_string;
-(void) error;
-
-return -1;
-}
-
-static char *lt_tag_canonicalize(lt_tag_t *tag,
- GError **error)
-{
-(void) tag;
-(void) error;
-
-return NULL;
-}
-
-static const lt_lang_t *lt_tag_get_language(const lt_tag_t  *tag)
-{
-(void) tag;
-
-return NULL;
-}
-
-static const lt_script_t *lt_tag_get_script(const lt_tag_t  *tag)
-{
-(void) tag;
-
-return NULL;
-}
-
-static const lt_region_t *lt_tag_get_region(const lt_tag_t  *tag)
-{
-(void) tag;
-
-return NULL;
-}
-
-static const gchar *lt_lang_get_tag(const lt_lang_t *lang)
-{
-(void) lang;
-
-return NULL;
-}
-
-static const gchar *lt_script_get_tag(const lt_script_t *script)
-{
-(void) script;
-
-return NULL;
-}
-
-static const gchar *lt_region_get_tag(const lt_region_t *region)
-{
-(void) region;
-
-return NULL;
-}
-
+#else
+/* Replacement code for LGPL phobic and Android systems.
+ * For iOS we could probably use NSLocale instead, that should have more or
+ * less required functionality. If it is good enough, it could be used for Mac
+ * OS X, too.
+ */
+#include simple-langtag.cxx
 #endif
 
 //#define erDEBUG
diff --git a/i18npool/source/languagetag/simple-langtag.cxx 
b/i18npool/source/languagetag/simple-langtag.cxx
new file mode 100644
index 000..7131749
--- /dev/null
+++ b/i18npool/source/languagetag/simple-langtag.cxx
@@ -0,0 +1,401 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/** Cheap and cheesy replacement code for liblangtag on systems that do not
+allow / want LGPL code or dependencies on glib.
+
+XXX NOTE: This code does not check language tags for validity or if they
+are registered with IANA, does not canonicalize or strip default script
+tags if included nor does it do any other fancy stuff that liblangtag is
+capable of. It just makes depending code work without.
+ */
+
+#include cstdlib
+#include cstring
+#include cstdio
+
+namespace {
+
+typedef char gchar;
+typedef void* gpointer;
+typedef int gint;
+typedef gint gboolean;
+
+struct GError {
+char *message;
+GError() : message(NULL) {}
+};
+
+static gpointer g_malloc(size_t s)
+{
+return malloc(s);
+}
+
+static void g_free(gpointer p)
+{
+if (p)
+free(p);
+}
+
+static void g_error_free(GError *error)
+{
+if (error)
+{
+g_free( error-message);
+g_free( error);
+}
+}
+
+struct my_ref
+{
+sal_uInt32 mnRef;
+explicit my_ref() : mnRef(1) {}
+virtual ~my_ref() {}
+void incRef() { ++mnRef; }
+void decRef() { if (--mnRef == 0) delete this; }
+};
+
+struct my_t_impl : public my_ref
+{
+gchar*  mpStr;
+explicit my_t_impl() : my_ref(), mpStr(NULL)

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

2012-08-09 Thread Markus Mohrhard

 sc/inc/column.hxx|2 
 sc/inc/document.hxx  |2 
 sc/inc/global.hxx|8 ++
 sc/inc/table.hxx |6 +
 sc/qa/unit/ucalc.cxx |   36 --
 sc/source/core/data/column2.cxx  |   20 ++---
 sc/source/core/data/document.cxx |4 -
 sc/source/core/data/table1.cxx   |  134 ---
 sc/source/ui/vba/vbarange.cxx|   13 +--
 sc/source/ui/view/tabview2.cxx   |8 +-
 sc/source/ui/view/viewfun2.cxx   |4 -
 11 files changed, 163 insertions(+), 74 deletions(-)

New commits:
commit 5e0672f32ea6a4d3d6cf66874d0d7c0bdb3dec1d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Aug 9 15:58:00 2012 +0200

remove useless variable

Change-Id: Ic04e11cd0768bc203188f0b5adb5f4b9725fd6d9

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index fbd84e7..d381db3 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1335,7 +1335,6 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW nRow, 
bool bForward) const
 {
 if(bForward)
 {
-bool bFound = false;
 do
 {
 nRow++;
@@ -1362,13 +1361,12 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW 
nRow, bool bForward) const
 nRow = maItems[nIndex].nRow - 1;
 }
 }
-while(!bFound  nRow  MAXROW);
+while(nRow  MAXROW);
 
 return MAXROW;
 }
 else
 {
-bool bFound = false;
 do
 {
 nRow--;
@@ -1390,7 +1388,7 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW nRow, 
bool bForward) const
 else
 nRow = maItems[nIndex-1].nRow + 1;
 }
-while(!bFound  nRow  0);
+while(nRow  0);
 
 return 0;
 }
commit a69d704dc0950ab62e260cb93eb5f37db45e2183
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Aug 9 15:56:00 2012 +0200

adapt unit test and activate all test cases

Change-Id: If5998c62709de0f95b2870327fca951cd81f2406

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index fc51b22..49beff8 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4617,27 +4617,27 @@ void Test::testFindAreaPosRowDown()
 
 SCCOL nCol = 0;
 SCROW nRow = 0;
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(1), nRow);
 CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
 
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(2), nRow);
 CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
 
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(5), nRow);
 CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
 
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(6), nRow);
 CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
 
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(MAXROW), nRow);
 CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
@@ -4645,12 +4645,12 @@ void Test::testFindAreaPosRowDown()
 nCol = 1;
 nRow = 2;
 
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(3), nRow);
 CPPUNIT_ASSERT_EQUAL(static_castSCCOL(1), nCol);
 
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(6), nRow);
 CPPUNIT_ASSERT_EQUAL(static_castSCCOL(1), nCol);
@@ -4678,29 +4678,27 @@ void Test::testFindAreaPosColRight()
 
 SCCOL nCol = 0;
 SCROW nRow = 0;
-pDoc-FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), nRow);
 CPPUNIT_ASSERT_EQUAL(static_castSCCOL(1), nCol);
 
-pDoc-FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), nRow);
 CPPUNIT_ASSERT_EQUAL(static_castSCCOL(2), nCol);
 
-pDoc-FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), nRow);
-// BUG! This returns right now 4 because FindAreaPos does
-// not yet work correctly with hidden rows
-//CPPUNIT_ASSERT_EQUAL(static_castSCCOL(5), nCol);
+CPPUNIT_ASSERT_EQUAL(static_castSCCOL(5), nCol);
 
-pDoc-FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
 
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), nRow);

[Libreoffice-commits] .: 5 commits - Library_merged.mk postprocess/packcomponents RepositoryExternal.mk scripting/Module_scripting.mk scripting/Rdb_scriptproviderforbeanshell.mk scripting/Rdb_scriptpr

2012-08-09 Thread Matus Kukan

 Library_merged.mk  |5 ---
 RepositoryExternal.mk  |4 ---
 postprocess/packcomponents/makefile.mk |   33 -
 scripting/Module_scripting.mk  |   12 ++---
 scripting/Rdb_scriptproviderforbeanshell.mk|   16 
 scripting/Rdb_scriptproviderforjavascript.mk   |   16 
 solenv/gbuild/ComponentTarget.mk   |7 +
 solenv/gbuild/CppunitTest.mk   |   25 --
 solenv/gbuild/Rdb.mk   |   16 +---
 solenv/gbuild/extensions/pre_MergedLibsList.mk |2 +
 solenv/gbuild/platform/IOS_ARM_GCC.mk  |3 --
 solenv/gbuild/platform/solaris.mk  |2 -
 solenv/gbuild/platform/unxgcc.mk   |2 -
 solenv/gbuild/platform/windows.mk  |2 -
 14 files changed, 48 insertions(+), 97 deletions(-)

New commits:
commit fe32762e119221d3738056b096a4ef054cdffa52
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Thu Aug 9 00:15:52 2012 +0200

tubes: add to libmerged to fix circular dependency

Probably it belongs in there anyway.

Change-Id: I3bf908de58e0e989e263323d2fdc432308c2cab8

diff --git a/Library_merged.mk b/Library_merged.mk
index 68874e1..cc54e95 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_externals,merged,\
icuuc \
jpeg \
libxml2 \
+   telepathy \
zlib \
 ))
 
@@ -88,8 +89,4 @@ $(eval $(call gb_Library_use_libraries,merged,\
 ))
 endif
 
-ifeq ($(ENABLE_TELEPATHY),TRUE)
-$(eval $(call gb_Library_use_libraries,merged,tubes))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 08b3aa6..a07bdff 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1166,9 +1166,7 @@ endef
 
 else # !ENABLE_TELEPATHY
 
-define gb_LinkTarget__use_telepathy
-
-endef
+gb_LinkTarget__use_telepathy :=
 
 endif # ENABLE_TELEPATHY
 
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 7bbf699..7a05039 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -58,6 +58,8 @@ gb_MERGEDLIBS := \
xmlscript \
xo \
 
+gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes)
+
 endif
 
 # vim: set noet sw=4 ts=4:
commit 772d15fb8ccdaa46fab0961712177baf915ed70d
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Wed Aug 8 21:21:48 2012 +0200

create these rdbs directly in scripting

Change-Id: I8a44de06f9a16308a5ff82ad77d059e5dde544f9

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 92139ec..4ced4c1 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -412,36 +412,3 @@ $(MISC)/services.input : makefile.mk
 'list$(my_components:^filename:+.component/filename)/list' 
\
  $@
 
-.IF $(ENABLE_SCRIPTING_BEANSHELL) == YES
-ALLTAR : $(MISC)/scriptproviderforbeanshell.rdb
-
-$(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/scriptproviderforbeanshell.input \
-
$(SOLARXMLDIR)/component/scripting/java/ScriptProviderForBeanShell.component
-$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/scriptproviderforbeanshell.input
-
-$(MISC)/scriptproviderforbeanshell.input : makefile.mk
-echo \
-
'listfilenamecomponent/scripting/java/ScriptProviderForBeanShell.component/filename/list'
 \
- $@
-.END
-
-.IF $(ENABLE_SCRIPTING_JAVASCRIPT) == YES
-ALLTAR : $(MISC)/scriptproviderforjavascript.rdb
-
-$(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/scriptproviderforjavascript.input \
-
$(SOLARXMLDIR)/component/scripting/java/ScriptProviderForJavaScript.component
-$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/scriptproviderforjavascript.input
-
-$(MISC)/scriptproviderforjavascript.input : makefile.mk
-echo \
-
'listfilenamecomponent/scripting/java/ScriptProviderForJavaScript.component/filename/list'
 \
- $@
-.END
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 7312f51..bf385cd 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -36,11 +36,15 @@ $(eval $(call gb_Module_add_targets,scripting,\
Jar_Highlight \
Jar_MemoryUsage \
Jar_ScriptFramework \
-$(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
-Jar_ScriptProviderForBeanShell) \
+   $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
+

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Roman Eisele b...@eikota.de changed:

   What|Removed |Added

 Depends on||52078

--- Comment #73 from Roman Eisele b...@eikota.de 2012-08-09 14:19:02 UTC ---
Added bug 52078 - shlxthdl_x64.dll/shlxthdl.dll causes Windows Explorer to
CRASH 
repeatedly.

This bug is especially annoying, because it causes *repeated* Windows Explorer
crashes -- under certain circumstances, you can get into a nice crash loop
which can get stopped only by complicated actions (see e.g. comment no. 15 in
that bug report and the description in the dupliacte bug 52276).

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Rainer Bielefeld libreoff...@bielefeldundbuss.de changed:

   What|Removed |Added

 Depends on||43489

--- Comment #74 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 
2012-08-09 14:22:46 UTC ---
Add: Bug 43489 - [Task] Incorrect behavior using existing User Profile for
upgrade Due to results ESC call 2012-08-09

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] .: sfx2/inc sfx2/source unusedcode.easy

 sfx2/inc/sfx2/thumbnailview.hxx   |1 -
 sfx2/source/control/thumbnailview.cxx |5 -
 unusedcode.easy   |1 -
 3 files changed, 7 deletions(-)

New commits:
commit 282917d574d6df820ddb5583b8bbf17fc7af6b7a
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Aug 9 16:23:21 2012 +0200

Bin ThumbnailView::ImplGetFirstItem()

Change-Id: I212af5f0f6d3ad4df6492c593da51eaa4b34948d

diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index a5102e3..9a9e516 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -312,7 +312,6 @@ protected:
 SFX2_DLLPRIVATE bool ImplScroll( const Point rPos );
 SFX2_DLLPRIVATE size_t   ImplGetItem( const Point rPoint, bool bMove 
= false ) const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetItem( size_t nPos );
-SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetFirstItem();
 SFX2_DLLPRIVATE sal_uInt16  ImplGetVisibleItemCount() const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetVisibleItem( sal_uInt16 
nVisiblePos );
 SFX2_DLLPRIVATE void ImplInsertItem( ThumbnailViewItem *const 
pItem, const size_t nPos );
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index c736182..ad2f5b8 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -452,11 +452,6 @@ ThumbnailViewItem* ThumbnailView::ImplGetItem( size_t nPos 
)
 return ( nPos  mItemList.size() ) ? mItemList[nPos] : NULL;
 }
 
-ThumbnailViewItem* ThumbnailView::ImplGetFirstItem()
-{
-return mItemList.empty() ? NULL : mItemList[0];
-}
-
 sal_uInt16 ThumbnailView::ImplGetVisibleItemCount() const
 {
 sal_uInt16 nRet = 0;
diff --git a/unusedcode.easy b/unusedcode.easy
index ff81200..4681351 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -29,7 +29,6 @@ SvxPositionSizeTabPage::GetRect()
 TempFile::IsValid() const
 TextEngine::GetLeftMargin() const
 ThumbnailView::GetItemCount() const
-ThumbnailView::ImplGetFirstItem()
 ThumbnailView::InsertItem(unsigned short, BitmapEx const, rtl::OUString 
const, unsigned long)
 ThumbnailView::LinkStubImplTimerHdl(void*, void*)
 ThumbnailView::SetColCount(unsigned short)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

On 09/08/12 15:56, anwen wrote:
 I am also interested in XDocumentEventBroadcaster/XDocumentEventListener. I
 am wondering if you could correct my following code which tries to register
 a XDocumentListener with the XDocumentEventBroadcaster in a Calc Extension.
 I did some research on this topic. Most of examples initialize a
 EventBroadcaster following a bootstrap() method which could not be used in
 Calc Extension.

i don't think documents implement XDocumentEventBroadcaster, but there
is a GlobalEventBroadcaster service that you can get from the service
factory:

 Object oGEB = m_xMSF.createInstance(
com.sun.star.frame.GlobalEventBroadcaster);
 m_xGEB = UnoRuntime.queryInterface(XDocumentEventBroadcaster.class, oGEB);

iirc the DocumentEvent that your listener gets then contains something
that identifies the document that the event is for.


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

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

Bug 37361 depends on bug 43932, which changed state.

Bug 43932 Summary: PRINTING: Paper tray setting not accepted from File - 
Print...
https://bugs.freedesktop.org/show_bug.cgi?id=43932

   What|Old Value   |New Value

 Resolution||FIXED
 Status|REOPENED|RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread anwen

Thank you, Michael. This will solve my doubt with XDocumentEventBroadcaster.
I will publish my experience and c++ code with XTermination,
XGlobalEventBroadcaster/XEventListener, and also mutithread at
Openoffice/Libreoffice Extension developers forums after I finish the
project. Then others can benefit from my experience.

Best,
Wendi

Michael Stahl-2 wrote

On 09/08/12 15:56, anwen wrote:
I am also interested in XDocumentEventBroadcaster/XDocumentEventListener.
I
am wondering if you could correct my following code which tries to
register
a XDocumentListener with the XDocumentEventBroadcaster in a Calc
Extension.
I did some research on this topic. Most of examples initialize a
EventBroadcaster following a bootstrap() method which could not be used
in
Calc Extension.

i don't think documents implement XDocumentEventBroadcaster, but there
is a GlobalEventBroadcaster service that you can get from the service
factory:

Object oGEB = m_xMSF.createInstance(
com.sun.star.frame.GlobalEventBroadcaster);
m_xGEB = UnoRuntime.queryInterface(XDocumentEventBroadcaster.class,
oGEB);

iirc the DocumentEvent that your listener gets then contains something
that identifies the document that the event is for.

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

--
View this message in context:
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p4000212.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/inc vcl/source vcl/unx

2012-08-09 Thread Antonio Fernandez

 vcl/inc/vcl/menu.hxx  |   12 ++--
 vcl/source/window/menu.cxx|5 +
 vcl/unx/gtk/window/gtksalmenu.cxx |   97 +++---
 3 files changed, 50 insertions(+), 64 deletions(-)

New commits:
commit 17e0471b2a2bc15a6f20a26bd26c64404451e879
Author: Antonio Fernandez antonio.fernan...@aentos.es
Date:   Thu Aug 9 15:58:03 2012 +0100

Most actions seem to work now. Enabled ImplSelectWithStart() for all builds.

Change-Id: Ib309112de07d125fbe3b61ea20d5e26d1016912b

diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index f98e87e..7538faf 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -298,11 +298,13 @@ public:
 Menu();
 Menu( sal_Bool bMenuBar );
 SAL_DLLPRIVATE Window*  ImplGetWindow() const { return pWindow; }
-#if defined(QUARTZ)
-// ImplSelectWithStart() is used in vcl/aqua/source/window/salnsmenu.mm
-SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
-#endif
-public:
+//#if defined(QUARTZ)
+//// ImplSelectWithStart() is used in vcl/aqua/source/window/salnsmenu.mm
+//SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
+//#endif
+void ImplSelectWithStart( Menu* pStartMenu = NULL );
+
+public:
 virtual ~Menu();
 
 virtual voidActivate();
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 02fbe67..2361a18 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1146,7 +1146,8 @@ void Menu::Select()
 }
 }
 
-#if defined(QUARTZ)
+// FIXME: Workaround to make GLOMenu without defining macros.
+//#if defined(QUARTZ)
 void Menu::ImplSelectWithStart( Menu* pSMenu )
 {
 Menu* pOldStartedFrom = pStartedFrom;
@@ -1157,7 +1158,7 @@ void Menu::ImplSelectWithStart( Menu* pSMenu )
 pOldStartedFrom-pStartedFrom = pOldStartedStarted;
 pStartedFrom = pOldStartedFrom;
 }
-#endif
+//#endif
 
 void Menu::RequestHelp( const HelpEvent )
 {
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index a7a3ba6..4016a08 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -4,6 +4,8 @@
 //#include gtk/gtk.h
 #include unx/gtk/glomenu.h
 #include unx/gtk/gloactiongroup.h
+#include vcl/menu.hxx
+#include unx/gtk/gtkinst.hxx
 
 #include iostream
 
@@ -18,6 +20,7 @@ dispatchAction (GSimpleAction   *action,
 gpointeruser_data)
 {
 cout  ACTION:   g_action_get_name( G_ACTION( action ) )   
triggered.  endl;
+GTK_YIELD_GRAB();
 
 if ( user_data ) {
 GtkSalMenuItem *pSalMenuItem = static_cast GtkSalMenuItem* ( 
user_data );
@@ -25,20 +28,43 @@ dispatchAction (GSimpleAction   *action,
 if ( !pSalMenuItem-mpSubMenu ) {
 const GtkSalFrame *pFrame = pSalMenuItem-mpParentMenu ? 
pSalMenuItem-mpParentMenu-getFrame() : NULL;
 
-if ( pFrame ) {
+if ( pFrame  !pFrame-GetParent() ) {
 ((PopupMenu*) pSalMenuItem-mpVCLMenu)-SetSelectedEntry( 
pSalMenuItem-mnId );
 SalMenuEvent aMenuEvt( pSalMenuItem-mnId, 
pSalMenuItem-mpVCLMenu );
 pFrame-CallCallback( SALEVENT_MENUCOMMAND, aMenuEvt );
 }
+else if ( pSalMenuItem-mpVCLMenu )
+{
+// if an item from submenu was selected. the corresponding 
Window does not exist because
+// we use native popup menus, so we have to set the selected 
menuitem directly
+// incidentally this of course works for top level popup 
menus, too
+PopupMenu * pPopupMenu = dynamic_castPopupMenu 
*(pSalMenuItem-mpVCLMenu);
+if( pPopupMenu )
+{
+// FIXME: revise this ugly code
+
+// select handlers in vcl are dispatch on the original menu
+// if not consumed by the select handler of the current 
menu
+// however since only the starting menu ever came into 
Execute
+// the hierarchy is not build up. Workaround this by 
getting
+// the menu it should have been
+
+// get started from hierarchy in vcl menus
+GtkSalMenu* pParentMenu = pSalMenuItem-mpParentMenu;
+Menu* pCurMenu = pSalMenuItem-mpVCLMenu;
+while( pParentMenu  pParentMenu-mpVCLMenu )
+{
+pCurMenu = pParentMenu-mpVCLMenu;
+pParentMenu = pParentMenu-mpParentSalMenu;
+}
+
+pPopupMenu-SetSelectedEntry( pSalMenuItem-mnId );
+pPopupMenu-ImplSelectWithStart( pCurMenu );
+}
+else
+OSL_FAIL( menubar item without frame ! );
+}
 }
-
-//if ( !pSalMenuItem-mpSubMenu ) {
-//

Will be working on generic XML import


Hi there,

This is just to let you guys know that, I'll be gearing up to work on 
generic XML import and export in the next few weeks, and probably more. 
 I mentioned this briefly in the blog I wrote yesterday:


http://kohei.us/2012/08/08/orcus-integration-into-libreoffice/

The plan is to do the implementation in the orcus library, and implement 
callbacks in LibreOffice proper.


The core of the feature involves enabling import and export of generic 
XML which relies on a separate schema file to define the structure of 
the content.  I will set up a good amount of test harness for this in 
the orcus library in order to keep the amount of filter test low in the 
libreoffice build while maintaining a healthy amount of testing for this 
new filter.


The specifics of the feature, especially on the UI side, is yet to be 
decided, and for now, I will focus on the backend loading portion of the 
work.


All the best,

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

minutes of ESC call ...

* Present
+ Kohei, Rainer, Cedric, Lionel, Eike, Astron, Andras,
  Stephan, Caolan, Michael, Thorsten, Norbert, Kendy,
  Michael S, Petr

* Completed Action Items
+ task selection for LibreOffice 4 wiki:
+ http://wiki.documentfoundation.org/Development/LibreOffice4
+ [ punted for now ]

* Pending Action Items
+ [pending] notify all committers when we have a nice simple, minimal
  statement of what is required for gerrit written (Bjoern)
+ reviews done
+ make bytemark windows box do release builds (Fridrich)
+ maildrop for Gerrit (Bjoern)
+ 3/4 done, in progress idly.
+ 4.0 issues (Everyone)
+ everyone interested in cleanups - claim your work until next 
ESC!
+ 
http://wiki.documentfoundation.org/Development/LibreOffice4
+ crediting: can we separate tempates in the credits page (Spaetz)
+ [ in progress ]

* Release Engineering update (Petr)
+ 3.6.0 update  post-mortem
+ all was quiet until the last two release candidates
+ only panicing at the last minute
+ was timing related / summertime ?
+ first-start / updating bug issue
+ underestimated
+ Stephan: bad timing, reported on Linux etc. used
  non-released builds between.
+ by chance, Michael fixed the windows build
+ prereg feature only used on Windows, fix for issues
  didn't make it into 3.6 from master.
+ systemic problem where people are encouraged to
  remove their user-installation vs. moveaside  make
  available.
AI: + update QA FAQs / challenge answers to encourage moving
  profiles away instead of deleting (Rainer)
+ user installs can have sensitive data though,
  care needed - but keep that around.
+ non-upgrades for profiles from dev / intermediate 
versions
+ removing user-profile inconsistent data hid 
issues
  and hurt testing too
+ Always create code to upgrade / never advise 
removal
  of inconsistent data.
+ Rainer happy to help with profiles.
+ suggest zero tolerance policy for upgrade issues during 
development
+ could have upgrade tinderbox (Bjoern)
+ be nice to have some unit tests too (Michael)
+ most important thing to get to better tests (Stephan)
+ standard test for how profile updates work (Rainer)
+ it ~never works, but put more focus on this
+ the problem was so frequent people got used to it.
+ adopt a near zero tolerance policy for upgrade issues during 
development
+ bibisect can cause problems (Bjoern)
+ agree - lots of ignoring of profile problems
  with WORKSFORME when profiles are removed (Rainer)
+ should not tolerate this.
+ collecting user-configuration - have a script / app to
  dump it as a .zip ?
AI: + file an easy-hack to ship a binary to dump it (Petr)
+ 2x days of performance issues on the main website
+ can cause issues
+ missing MSI signatures
+ Andras forgot; normally some RC tester checks/reports 
that
+ Thorsten added validation to upload scripts.
+ few native-lang projects deferred announce due to 
dictionaries bug
+ 3.6.1 RC1
+ pull the timeline in - do RC1 in 1 week instead
+ freeze / checkin deadline on Monday
+ RC2 in one extra week.
+ fixes the upgrade bug earlier.
+ 3.5.6 RC2
+ tagged this week / final version
+ builds being up-loaded / announce soon - on track.

* GSOC update (Cedric)
+ bit more than a week to go, make students aware it's almost over
+ pencils down / evaluations by August 20th

* UI / design update (Astron)
+ discussion about updated icons for gallery
+ ongoing options discussion
+ official git repo for artwork ?
+ should we re-use the old repository ? (no)
+ ongoing discussion around artwork licensing
+ new 'templates' repository created
+ can we push templates there ?

Re: minutes of ESC call ...


On 08/09/2012 11:13 AM, Michael Meeks wrote:

* bugzilla / gerrit integration (Bjoern)
+ concern about getting spammed a lot from calc guys.x
+ postpone discussion for next week.


Just to voice my opinion, I too would be reluctant to see this 
integration.  We core devs already receive tons of mails from bugzilla 
many of which are pretty much noise.  And I'm personally not very fond 
of this type of automatic messages cluttering bugzilla comments.


I'm also equally concerned about fragmenting our discussion platforms. 
Even without gerrit, splitting the discussion between the mailing list 
and bugzilla was (to me) hard enough.  Adding gerrit to the mix will 
make matters worse.  I would rather we encourage everyone to keep the 
discussions on the mailing list, instead of splitting it in now three 
different platforms, and adding lots of noisy automatic linking between 
them.


Just my opinion.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: cppuhelper/source

 cppuhelper/source/defaultbootstrap.cxx |  101 ++---
 1 file changed, 56 insertions(+), 45 deletions(-)

New commits:
commit 142d3ec875b446b56d0071c59d00937dea0cdd61
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 9 17:44:14 2012 +0200

Related fdo#52639: Do not destroy Implementations with mutex locked

Erasing from data_ member maps can destroy contained Implementations, which 
in
turn releases the UNO objects referenced from there, which in turn can cause
XComponents to dispose, which in turn can call arbitrary code, so must not 
be
done with rMutex locked.  Witness the backtrace at
https://bugs.freedesktop.org/attachment.cgi?id=65142 linked from fdo#52639
(where this fix appears otherwise unrelated to that issue's main topic).

Change-Id: If55a3841b761ec1d9a0ef61fe54784426c4ee442

diff --git a/cppuhelper/source/defaultbootstrap.cxx 
b/cppuhelper/source/defaultbootstrap.cxx
index 151a36e..c3bdba3 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1346,7 +1346,7 @@ void ServiceManager::disposing(css::lang::EventObject 
const  Source)
 
 void ServiceManager::disposing() {
 std::vector css::uno::Reference css::lang::XComponent   comps;
-css::uno::Reference css::lang::XEventListener  listener;
+Data clear;
 {
 osl::MutexGuard g(rBHelper.rMutex);
 for (DynamicImplementations::const_iterator i(
@@ -1358,10 +1358,10 @@ void ServiceManager::disposing() {
 comps.push_back(i-second-component);
 }
 }
-data_.namedImplementations.clear();
-data_.dynamicImplementations.clear();
-data_.services.clear();
-data_.singletons.clear();
+data_.namedImplementations.swap(clear.namedImplementations);
+data_.dynamicImplementations.swap(clear.dynamicImplementations);
+data_.services.swap(clear.services);
+data_.singletons.swap(clear.singletons);
 }
 for (std::vector
  css::uno::Reference css::lang::XComponent  ::const_iterator i(
@@ -1733,25 +1733,30 @@ void ServiceManager::removeRdbFiles(std::vector 
rtl::OUString  const  uris) {
 // The underlying data structures make this function somewhat inefficient,
 // but the assumption is that it is rarely called (and that if it is 
called,
 // it is called with a uris vector of size one):
-osl::MutexGuard g(rBHelper.rMutex);
-for (std::vector rtl::OUString ::const_iterator i(uris.begin());
- i != uris.end(); ++i)
+std::vector boost::shared_ptr Implementation   clear;
 {
-for (NamedImplementations::iterator j(
- data_.namedImplementations.begin());
- j != data_.namedImplementations.end();)
+osl::MutexGuard g(rBHelper.rMutex);
+for (std::vector rtl::OUString ::const_iterator i(uris.begin());
+ i != uris.end(); ++i)
 {
-assert(j-second.get() != 0);
-if (j-second-info-uri == *i) {
-//TODO: The below leaves data_ in an inconsistent state upon
-// exceptions:
-removeFromImplementationMap(
-data_.services, j-second-info-services, j-second);
-removeFromImplementationMap(
-data_.singletons, j-second-info-singletons, j-second);
-data_.namedImplementations.erase(j++);
-} else {
-++j;
+for (NamedImplementations::iterator j(
+ data_.namedImplementations.begin());
+ j != data_.namedImplementations.end();)
+{
+assert(j-second.get() != 0);
+if (j-second-info-uri == *i) {
+clear.push_back(j-second);
+//TODO: The below leaves data_ in an inconsistent state 
upon
+// exceptions:
+removeFromImplementationMap(
+data_.services, j-second-info-services, j-second);
+removeFromImplementationMap(
+data_.singletons, j-second-info-singletons,
+j-second);
+data_.namedImplementations.erase(j++);
+} else {
+++j;
+}
 }
 }
 }
@@ -1763,6 +1768,7 @@ bool ServiceManager::removeLegacyFactory(
 bool removeListener)
 {
 assert(factoryInfo.is());
+boost::shared_ptr Implementation  clear;
 css::uno::Reference css::lang::XComponent  comp;
 {
 osl::MutexGuard g(rBHelper.rMutex);
@@ -1772,6 +1778,7 @@ bool ServiceManager::removeLegacyFactory(
 return isDisposed();
 }
 assert(i-second.get() != 0);
+clear = i-second;
 //TODO: The below leaves data_ in an inconsistent state upon 
exceptions:
 removeFromImplementationMap(
 data_.services,

Re: [PUSHED][PATCH] cosmetic patch for conditional formatting

2012-08-09 Thread Jean-Baptiste Faure

Le 01/08/2012 12:36, Jean-Baptiste Faure a écrit :
 Le 01/08/2012 12:11, Noel Power a écrit :
 looks fine for me, pushed
 Thank you. I suggest to backport it to LO 3.6 for LO 3.6.1.

 Best regards.
 JBF
Hi,

Second try ;-)
I think this patch should be backported to LO 3.6.

Best regards.
JBF

 On 31/07/12 09:17, Jean-Baptiste Faure wrote:
 Hi,

 here is a small patch to vertically align the fields in the conditional
 formatting dialog.
 Additionnaly it give more room for several strings which is useful for
 FR translation.
 To easily understand the code, I reordered it according to the lines in
 the dialog.

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




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

[bjoern.michael...@canonical.com: [URGENT] LibreOffice freedesktop - gerrit switchover]

Hi developers,

you should all have received the mail below (with your data). If not, please
send us a email about it to:

 ger...@otrs.documentfoundation.org

Best,

Bjoern

- Forwarded message from bjoern.michael...@canonical.com -

Date: Thu,  9 Aug 2012 17:46:21 +0200 (CEST)
From: bjoern.michael...@canonical.com
To: bmichael...@kemper.freedesktop.org
Subject: [URGENT] LibreOffice freedesktop - gerrit switchover

Hi Bjoern Michaelsen,

We're contacting you because you are a core developer /
committer to LibreOffice, and it is important to us to ensure that you
keep those commit rights. Unfortunately that will take two minutes of
your time to do some book-keeping, please can you help us with that ?

We're migrating our git repository to gerrit for many good
reasons you can read here:

 http://wiki.documentfoundation.org/images/8/85/Crowdsourcing_code_reviews.odp

To ensure that your commit access is transferred we need, at a minimum you to:

1. login to https://gerrit.libreoffice.org/ with OpenID(*) once
2. set your user name, either your IRC nick, or 'bmichaelsen'
is fine in the Profile
3. add your email address 'bjoern.michael...@canonical.com'
under contact information
4. up-load your ssh public key (as for freedesktop) - usually
these are in ~/.ssh and end '.pub'
5. Reply to this email - leaving a full-quote in the reply, and
correct this data if it is wrong:

Freedesktop account: bmichaelsen
Email address used on git: bjoern.michael...@canonical.com

6. We'll enable your account as a direct committer when we get that.

See

 https://wiki.documentfoundation.org/Development/gerrit/setup

for details on how to migrate your ssh config. You might want to
continue the last steps as described there to ensure with './logerrit test'
that everything is working fine for you. 

The default push location for LibreOffice will change on
August 15th, 2012 from freedesktop.org to this new gerrit instance. There are
exciting new (optional) review flows if you choose to use them, but you
can continue committing to master as before.

If there is any trouble with the above do not hesitate to drop us an email at:
   ger...@otrs.documentfoundation.org

Finally - thank you for your contribution to LibreOffice !

Best wishes,

  Bjoern, Norbert, David, Robert 

(*) You most likely already have an OpenID. Providers include:
google, yahoo, blogger, launchpad, flickr, wordpress, myspace

P.S.: Note that the email address you add has to be the one you use for git. If
we suggest a freedesktop email here, we failed to map you to any other git
account and you likely need to send us a correction.

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

[Libreoffice-commits] .: liblangtag/makefile.mk

 liblangtag/makefile.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2b3762c577e7315a94dee0b5c94b5891e9a56dfd
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Aug 9 17:02:51 2012 +0100

disable un-needed GObject introspection pieces for liblangtag

This avoids the dumb parser trying to exec ccache gcc and failing.

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index 8320e8f..f710476 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -60,6 +60,10 @@ my_data = $(my_install)$/share$/liblangtag
 
 CONFIGURE_FLAGS+= --prefix='/$(my_prefix)' --libdir='/$(my_prefix)/lib'
 
+# g-ir-scanner is dumb enough to turn CC=ccache gcc into trying
+# to execve an app literal of ccache gcc including the space.
+CONFIGURE_FLAGS+= --disable-introspection
+
 .IF $(SYSTEM_LIBXML)!=YES
 CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)$/external'
 .IF $(GUI)==WNT  $(COM)!=GCC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 3-6] service manager dispose issue

http://cgit.freedesktop.org/libreoffice/core/commit/?id=142d3ec875b446b56d0071c59d00937dea0cdd61 
Related fdo#52639: Do not destroy Implementations with mutex locked 
addresses a crash on exit documented at 
https://bugs.freedesktop.org/show_bug.cgi?id=52639#c14 ReportBuilder: 
Creating a new report destroys .odb (but apparently unrelated to that 
issue's main topic).  It is a regression introduced with the new service 
manager in LO 3.6.0, so please review and backport to libreoffice-3-6.


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

Re: minutes of ESC call ...


On Thu, 2012-08-09 at 11:37 -0400, Kohei Yoshida wrote:
 Just to voice my opinion, I too would be reluctant to see this 
 integration.  We core devs already receive tons of mails from bugzilla 
 many of which are pretty much noise.

:-) I guess, there is no shortage of bugs to be CC'd on.

  And I'm personally not very fond of this type of automatic messages
 cluttering bugzilla comments.

I love the fixed in 3.6.1 type automated comments - they're -really-
useful for QA to see which versions a bug is fixed in and to set
expectations right I guess.

I suppose we could ask/pay Tollef to work on extending:

https://bugs.freedesktop.org/userprefs.cgi?tab=email

To add some flag magic for a new option for some the ignore fixedin
XYZ version stuff - but that's a bit of a PITA to maintain going
forward I suspect; I wonder if a mail filter could do the same.

 I'm also equally concerned about fragmenting our discussion platforms. 
 Even without gerrit, splitting the discussion between the mailing list 
 and bugzilla was (to me) hard enough.

Yep - I guess auto-spamming can go too far; OTOH, it is rather relevant
that a fix for a bug has shown up and useful for a reporter to know that
there is a build of it to try out. Also we fix on average ~6 bugs per
day though we want to raise that - so, even if they're all in calc - if
we get it right with a single new bugzilla comment that says:

a gerrit branch, with a patch that fixes this bug was built
 for the specified platform here

And then no further comments afterwards seems like it might be on the
acceptable side ?

Anyhow - thanks for raising the issue ! :-)

ATB,

Michael.

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

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

Re: minutes of ESC call ...

On Thu, Aug 09, 2012 at 11:37:10AM -0400, Kohei Yoshida wrote:
 On 08/09/2012 11:13 AM, Michael Meeks wrote:
 * bugzilla / gerrit integration (Bjoern)
  + concern about getting spammed a lot from calc guys.x
  + postpone discussion for next week.
 
 Just to voice my opinion, I too would be reluctant to see this
 integration.  We core devs already receive tons of mails from
 bugzilla many of which are pretty much noise.  And I'm personally
 not very fond of this type of automatic messages cluttering bugzilla
 comments.

The proposal is to send a comment to bugzilla for the _first_ upload of a patch
to gerrit. That is _one_ comment per bug maximum. So not much clutter there. In 
fact,
if we do not automate this, people might do it manually in 90% of the time,
leaving you with both some extra noise _and_ uncertainty if there is a patch
lurking on gerrit. Worst scenario of all.


 I'm also equally concerned about fragmenting our discussion
 platforms. Even without gerrit, splitting the discussion between the
 mailing list and bugzilla was (to me) hard enough.  Adding gerrit to
 the mix will make matters worse.  I would rather we encourage
 everyone to keep the discussions on the mailing list, instead of
 splitting it in now three different platforms, and adding lots of
 noisy automatic linking between them.

If there is anything that is cluttered its the mailing lists. The review
traffic there is largely discouraging non-core developers who just cant follow
it as is and arent invested enough to do sophisticated mail-filtering. Just
sending out the gerrit account notification, I noted that there are a lot of
volunteers using foo+libreoff...@example.com addresses. That is _not_ a good
sign about the current state of our communication.

If the target is to declutter communication, moving patch reviewal to gerrit is
the best option as it allows more targeted communication (e.g. notification on
of the interested reviewers).

Best,

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

Re: minutes of ESC call ...


On 08/09/2012 12:08 PM, Michael Meeks wrote:


On Thu, 2012-08-09 at 11:37 -0400, Kohei Yoshida wrote:

Just to voice my opinion, I too would be reluctant to see this
integration.  We core devs already receive tons of mails from bugzilla
many of which are pretty much noise.


:-) I guess, there is no shortage of bugs to be CC'd on.


  And I'm personally not very fond of this type of automatic messages
cluttering bugzilla comments.


I love the fixed in 3.6.1 type automated comments - they're -really-
useful for QA to see which versions a bug is fixed in and to set
expectations right I guess.


Yes.  That's the *only* automated messages that I like.  The rest I despise.



I suppose we could ask/pay Tollef to work on extending:

https://bugs.freedesktop.org/userprefs.cgi?tab=email

To add some flag magic for a new option for some the ignore fixedin
XYZ version stuff - but that's a bit of a PITA to maintain going
forward I suspect; I wonder if a mail filter could do the same.


I'm also equally concerned about fragmenting our discussion platforms.
Even without gerrit, splitting the discussion between the mailing list
and bugzilla was (to me) hard enough.


Yep - I guess auto-spamming can go too far; OTOH, it is rather relevant
that a fix for a bug has shown up and useful for a reporter to know that
there is a build of it to try out.


So, I'm still slightly confused about this.  What sort of automated 
messages will gerrit start sending out?  I was under the impression that 
gerrit will start notifying bugzilla about some relevant patches posted 
to gerrit  review discussions that go on there and so on.


 Also we fix on average ~6 bugs per

day though we want to raise that - so, even if they're all in calc - if
we get it right with a single new bugzilla comment that says:

a gerrit branch, with a patch that fixes this bug was built
 for the specified platform here

And then no further comments afterwards seems like it might be on the
acceptable side ?


Yes.  If we can limit the automated messages to just fixes that went 
into the repo, and available test builds, then I can personally see some 
value.  Anything else would be noise.


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

On Thu, Aug 09, 2012 at 04:13:48PM +0100, Michael Meeks wrote:
   + [pending] notify all committers when we have a nice simple, minimal
 statement of what is required for gerrit written (Bjoern)
   + reviews done

as you might have noted: done (finally).

Best,

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

Re: notice: module dictionaries converted to gbuild

2012-08-09 Thread Andras Timar

Hi David,

2012/8/7 David Tardon dtar...@redhat.com

 Hi all,

 this is just an announce that I have converted dictionaries to gbuild on
 branch feature/gbuild_dictionaries. I am not looking for testers this
 time, because there is no platform-dependent stuff there :-) I am just
 going to run a couple more rebuilds to ensure there are no missing deps
 and then push it into master.

 When testing the conversion--I wrote a script to compare the old and new
 content of all the dictionaries--I have identified several files that
 have not been packed into the extensions previously and I wonder if
 perhaps they should be. Anyone has any opinion? The list is here:


I think they were left out by mistake. On the other hand I wonder if we
could omit multiple instances GPL/LGPL text from bundled dictionary
packages, while we have a central LICENSE.odt covering for the
dictionaries, too.

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

Re: minutes of ESC call ...


On 08/09/2012 12:17 PM, Bjoern Michaelsen wrote:

On Thu, Aug 09, 2012 at 11:37:10AM -0400, Kohei Yoshida wrote:

On 08/09/2012 11:13 AM, Michael Meeks wrote:

* bugzilla / gerrit integration (Bjoern)
+ concern about getting spammed a lot from calc guys.x
+ postpone discussion for next week.


Just to voice my opinion, I too would be reluctant to see this
integration.  We core devs already receive tons of mails from
bugzilla many of which are pretty much noise.  And I'm personally
not very fond of this type of automatic messages cluttering bugzilla
comments.


The proposal is to send a comment to bugzilla for the _first_ upload of a patch
to gerrit. That is _one_ comment per bug maximum. So not much clutter there. In 
fact,
if we do not automate this, people might do it manually in 90% of the time,
leaving you with both some extra noise _and_ uncertainty if there is a patch
lurking on gerrit. Worst scenario of all.


Sure, but gerrit already spams the mailing list.  I don't see the need 
to duplicate that in bugzilla.






I'm also equally concerned about fragmenting our discussion
platforms. Even without gerrit, splitting the discussion between the
mailing list and bugzilla was (to me) hard enough.  Adding gerrit to
the mix will make matters worse.  I would rather we encourage
everyone to keep the discussions on the mailing list, instead of
splitting it in now three different platforms, and adding lots of
noisy automatic linking between them.


If there is anything that is cluttered its the mailing lists.


Yes, and I want to keep the cluttering just to the mailing list.  Why do 
we have to also clutter bugzilla in addition?


The review

traffic there is largely discouraging non-core developers who just cant follow
it as is and arent invested enough to do sophisticated mail-filtering. Just
sending out the gerrit account notification, I noted that there are a lot of
volunteers using foo+libreoff...@example.com addresses. That is _not_ a good
sign about the current state of our communication.


Yes, but this will also increase stress on core developers too.  I know 
we are in for encouraging more developers, but not at the expense of 
stressing the existing developers.  We need to balance that somehow.



If the target is to declutter communication, moving patch reviewal to gerrit is
the best option as it allows more targeted communication (e.g. notification on
of the interested reviewers).


So, I have to be honest.  I'm still not entirely sold on gerrit, and my 
passion for gerrit is not as great as some of the others who are totally 
sold.  I just try to remain neutral and want to see how this plays out 
first before making more drastic changes.  But I can't help feeling that 
we are starting to push this a little too fast too quick.


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: writerfilter/source

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   40 +
 1 file changed, 40 insertions(+)

New commits:
commit 4305bed5581d3d987353850a547a28d05026a92e
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Aug 9 18:17:49 2012 +0200

Related: fdo#51112 import RTF_CLSHDNG

Change-Id: Iaa4efa2f4f70fc09e6deb6b7c6aea6f37757f1ab

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 530554b..e2c96c0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -102,6 +102,12 @@ static void lcl_putNestedAttribute(RTFSprms rSprms, Id 
nParent, Id nId, RTFValu
 if (!pParent.get())
 {
 RTFSprms aAttributes;
+if (nParent == NS_ooxml::LN_CT_TcPrBase_shd)
+{
+// RTF default is 'auto', see 
writerfilter::dmapper::CellColorHandler
+aAttributes.set(NS_ooxml::LN_CT_Shd_color, RTFValue::Pointer_t(new 
RTFValue(0x0a)));
+aAttributes.set(NS_ooxml::LN_CT_Shd_fill, RTFValue::Pointer_t(new 
RTFValue(0x0a)));
+}
 RTFValue::Pointer_t pParentValue(new RTFValue(aAttributes));
 rSprms.set(nParent, pParentValue, bOverwrite);
 pParent = pParentValue;
@@ -3026,6 +3032,40 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 if 
(!m_aStates.top().aParagraphSprms.find(NS_sprm::LN_PDxaLeft1).get())
 m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PDxaLeft1, 
RTFValue::Pointer_t(new RTFValue(0)));
 break;
+case RTF_CLSHDNG:
+{
+int nValue = -1;
+switch (nParam)
+{
+case 500: nValue = 2; break;
+case 1000: nValue = 3; break;
+case 1200: nValue = 27; break;
+case 1500: nValue = 28; break;
+case 2000: nValue = 4; break;
+case 2500: nValue = 5; break;
+case 3000: nValue = 6; break;
+case 3500: nValue = 43; break;
+case 3700: nValue = 44; break;
+case 4000: nValue = 7; break;
+case 4500: nValue = 46; break;
+case 5000: nValue = 8; break;
+case 5500: nValue = 49; break;
+case 6000: nValue = 9; break;
+case 6200: nValue = 51; break;
+case 6500: nValue = 52; break;
+case 7000: nValue = 10; break;
+case 7500: nValue = 11; break;
+case 8000: nValue = 12; break;
+case 8500: nValue = 57; break;
+case 8700: nValue = 58; break;
+case 9000: nValue = 13; break;
+case 9500: nValue = 60; break;
+default: break;
+}
+if (nValue != -1)
+lcl_putNestedAttribute(m_aStates.top().aTableCellSprms, 
NS_ooxml::LN_CT_TcPrBase_shd, NS_ooxml::LN_CT_Shd_val, RTFValue::Pointer_t(new 
RTFValue(nValue)));
+}
+break;
 default:
 SAL_INFO(writerfilter, OSL_THIS_FUNC  : TODO handle value ' 
 lcl_RtfToString(nKeyword)  ');
 aSkip.setParsed(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] a few lines of German translation

2012-08-09 Thread Daniel Herde

Please review the translation of the german comments in some of the 
source files in dbaccess/source. More will follow.


Thanks, Daniel.
From 4b9ecc71b6d55cfae7c68ce56f8a7634197872b3 Mon Sep 17 00:00:00 2001
From: Daniel Herde dan...@dher.de
Date: Thu, 9 Aug 2012 18:25:53 +0200
Subject: [PATCH] translated the german comments in a bunch of source files in
 dbaccess/source

---
 dbaccess/source/ui/control/marktree.cxx |4 ++--
 dbaccess/source/ui/control/sqledit.cxx  |   11 -
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx |   14 ++--
 dbaccess/source/ui/dlg/adtabdlg.cxx |4 ++--
 dbaccess/source/ui/dlg/dbfindex.cxx |   28 +++
 dbaccess/source/ui/dlg/queryfilter.cxx  |   10 
 dbaccess/source/ui/dlg/queryorder.cxx   |2 +-
 7 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/dbaccess/source/ui/control/marktree.cxx 
b/dbaccess/source/ui/control/marktree.cxx
index e1b17b0..830f138 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -193,7 +193,7 @@ void OMarkableTreeListBox::CheckButtonHdl()
 void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
 {
 SvButtonState eState = GetCheckButtonState( _pEntry);
-if (GetModel()-HasChildren(_pEntry)) // Falls Kinder, dann diese auch 
checken
+if (GetModel()-HasChildren(_pEntry)) // if it has children, check those 
too
 {
 SvLBoxEntry* pChildEntry = GetModel()-Next(_pEntry);
 SvLBoxEntry* pSiblingEntry = GetModel()-NextSibling(_pEntry);
@@ -208,7 +208,7 @@ void 
OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
 while(pEntry)
 {
 SetCheckButtonState(pEntry,eState);
-if(GetModel()-HasChildren(pEntry))   // Falls Kinder, dann diese auch 
checken
+if(GetModel()-HasChildren(pEntry))   // if it has children, check 
those too
 {
 SvLBoxEntry* pChildEntry = GetModel()-Next(pEntry);
 SvLBoxEntry* pSiblingEntry = GetModel()-NextSibling(pEntry);
diff --git a/dbaccess/source/ui/control/sqledit.cxx 
b/dbaccess/source/ui/control/sqledit.cxx
index 0ce5c2b..e249fce 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -134,7 +134,7 @@ void OSqlEdit::KeyInput( const KeyEvent rKEvt )
 rController.InvalidateFeature(SID_CUT);
 rController.InvalidateFeature(SID_COPY);
 
-// Ist dies ein Cut, Copy, Paste Event?
+// Is this a cut, copy, paste event?
 KeyFuncType aKeyFunc = rKEvt.GetKeyCode().GetFunction();
 if( 
(aKeyFunc==KEYFUNC_CUT)||(aKeyFunc==KEYFUNC_COPY)||(aKeyFunc==KEYFUNC_PASTE) )
 m_bAccelAction = sal_True;
@@ -149,10 +149,9 @@ void OSqlEdit::KeyInput( const KeyEvent rKEvt )
 sal_Bool OSqlEdit::IsInAccelAct()
 {
 DBG_CHKTHIS(OSqlEdit,NULL);
-// Das Cut, Copy, Paste per Accel. fuehrt neben der Aktion im Edit im View
-// auch die entsprechenden Slots aus. Die  Aktionen finden also zweimal 
statt.
-// Um dies zu verhindern, kann im View beim SlotExec diese Funktion
-// aufgerufen werden.
+// Cut, Copy, Paste by Accel. runs the action in the Edit but also the 
+// corresponding slot in the View. Therefore, the action occurs twice.
+// To prevent this, SlotExec in View can call this function.
 
 return m_bAccelAction;
 }
@@ -220,7 +219,7 @@ void OSqlEdit::SetText(const String rNewText)
 {
 DBG_CHKTHIS(OSqlEdit,NULL);
 if (m_timerUndoActionCreation.IsActive())
-{   // die noch anstehenden Undo-Action erzeugen
+{   // create the trailing undo-actions
 m_timerUndoActionCreation.Stop();
 LINK(this, OSqlEdit, OnUndoActionTimer).Call(NULL);
 }
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index ab4b150..d057f13 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -320,47 +320,47 @@ DBG_NAME(OTextConnectionHelper)
 Control* pErrorWin = NULL;
 String aDelText(m_aFieldSeparator.GetText());
 if(!aDelText.Len())
-{   // Kein FeldTrenner
+{   // No FieldSeparator
 aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING));
 
aErrorText.SearchAndReplaceAscii(#1,m_aFieldSeparatorLabel.GetText());
 pErrorWin = m_aFieldSeparator;
 }
 else if (!m_aDecimalSeparator.GetText().Len())
-{   // kein Decimaltrenner
+{   // No DecimalSeparator
 aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING));
 
aErrorText.SearchAndReplaceAscii(#1,m_aDecimalSeparatorLabel.GetText());
 pErrorWin = m_aDecimalSeparator;
 }
 else if (m_aTextSeparator.GetText() == m_aFieldSeparator.GetText())
-{   // Feld und TextTrenner duerfen nicht gleich sein
+{   // Field and

[Libreoffice-commits] .: cpputools/Module_cpputools.mk