date:20120419

 UnoControls/source/base/basecontainercontrol.cxx |2 
 UnoControls/source/base/basecontrol.cxx  |4 -
 UnoControls/source/controls/framecontrol.cxx |   12 ++--
 UnoControls/source/controls/progressbar.cxx  |2 
 UnoControls/source/controls/progressmonitor.cxx  |   62 +++
 UnoControls/source/controls/statusindicator.cxx  |   16 ++---
 6 files changed, 49 insertions(+), 49 deletions(-)

New commits:
commit c39d96a8e986c85259d01884762bd135fa0d0f5b
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Thu Apr 19 09:05:43 2012 +0200

Removed RTL_CONSTASCII_USTRINGPARAM from UnoControls

diff --git a/UnoControls/source/base/basecontainercontrol.cxx 
b/UnoControls/source/base/basecontainercontrol.cxx
index 1105941..f219b3f 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -560,7 +560,7 @@ WindowDescriptor* 
BaseContainerControl::impl_getWindowDescriptor ( const Referen
 WindowDescriptor*   aDescriptor = new WindowDescriptor ;
 
 aDescriptor-Type   = WindowClass_CONTAINER
 ;
-aDescriptor-WindowServiceName  = 
OUString(RTL_CONSTASCII_USTRINGPARAM(window))   ;
+aDescriptor-WindowServiceName  = window 
 ;
 aDescriptor-ParentIndex= -1   
 ;
 aDescriptor-Parent = rParentPeer  
 ;
 aDescriptor-Bounds = getPosSize ()
 ;
diff --git a/UnoControls/source/base/basecontrol.cxx 
b/UnoControls/source/base/basecontrol.cxx
index 1240bb2..f3f1307 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -368,7 +368,7 @@ void SAL_CALL BaseControl::createPeer(  const   Reference 
XToolkit   xToo
 if ( xLocalToolkit.is() == sal_False )
 {
 // but first create wellknown toolkit, if it not exist
-xLocalToolkit = Reference XToolkit  ( 
m_xFactory-createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( 
SERVICE_VCLTOOLKIT )) ), UNO_QUERY );
+xLocalToolkit = Reference XToolkit  ( 
m_xFactory-createInstance( SERVICE_VCLTOOLKIT ), UNO_QUERY );
 }
 m_xPeer = xLocalToolkit-createWindow( *pDescriptor );
 m_xPeerWindow   = Reference XWindow ( m_xPeer, UNO_QUERY );
@@ -934,7 +934,7 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( 
const Reference XWindo
 WindowDescriptor* pDescriptor = new WindowDescriptor ;
 
 pDescriptor-Type   = WindowClass_SIMPLE;
-pDescriptor-WindowServiceName  = 
OUString(RTL_CONSTASCII_USTRINGPARAM(window))   ;
+pDescriptor-WindowServiceName  = window  ;
 pDescriptor-ParentIndex= -1;
 pDescriptor-Parent = xParentPeer   ;
 pDescriptor-Bounds = getPosSize () ;
diff --git a/UnoControls/source/controls/framecontrol.cxx 
b/UnoControls/source/controls/framecontrol.cxx
index 6b29190..71911a9 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -310,7 +310,7 @@ const Sequence OUString  
FrameControl::impl_getStaticSupportedServiceNames()
 {
 MutexGuard aGuard( Mutex::getGlobalMutex() );
 Sequence OUString  seqServiceNames( 1 );
-seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( 
SERVICENAME_FRAMECONTROL ));
+seqServiceNames.getArray() [0] = SERVICENAME_FRAMECONTROL;
 return seqServiceNames ;
 }
 
@@ -508,7 +508,7 @@ void FrameControl::impl_createFrame(const   Reference 
XWindowPeerxPee
 xOldFrame = m_xFrame ;
 }
 
-xNewFrame = Reference XFrame   ( 
impl_getMultiServiceFactory()-createInstance ( 
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.frame.Frame)) ), UNO_QUERY 
) ;
+xNewFrame = Reference XFrame   ( 
impl_getMultiServiceFactory()-createInstance ( com.sun.star.frame.Frame ), 
UNO_QUERY ) ;
 Reference XDispatchProvider   xDSP ( xNewFrame, UNO_QUERY ) ;
 
 if (xDSP.is())
@@ -519,7 +519,7 @@ void FrameControl::impl_createFrame(const   Reference 
XWindowPeerxPee
 //  option
 //xFrame-setName( WhatYouWant );
 
-Reference XURLTransformer   xTrans ( 
impl_getMultiServiceFactory()-createInstance ( 
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.util.URLTransformer)) ), 
UNO_QUERY ) ;
+Reference XURLTransformer   xTrans ( 
impl_getMultiServiceFactory()-createInstance ( 
com.sun.star.util.URLTransformer ), UNO_QUERY ) ;
 if(xTrans.is())
 {
 // load file
@@ -591,9 +591,9 @@ const Sequence Property  
FrameControl::impl_getStaticPropertyDescriptor()
 // All Properties of this implementation. The array must be

[Libreoffice-commits] .: configure.in filter/Configuration_filter.mk filter/source writerperfect/Library_cdrimport.mk writerperfect/source

2012-04-19 Thread Fridrich Strba

 configure.in  |
2 
 filter/Configuration_filter.mk|
2 
 filter/source/config/fragments/filters/CorelPresentationExchange.xcu  |   
13 
 filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu |   
12 
 writerperfect/Library_cdrimport.mk|
1 
 writerperfect/source/cdrimp/CDRImportFilter.cxx   |
1 
 writerperfect/source/cdrimp/CDRImportFilter.hxx   |   
13 
 writerperfect/source/cdrimp/CMXImportFilter.cxx   |  
276 ++
 writerperfect/source/cdrimp/CMXImportFilter.hxx   |  
110 +++
 writerperfect/source/cdrimp/cdrimport_genericfilter.cxx   |   
14 
 writerperfect/source/vsdimp/VisioImportFilter.cxx |
1 
 writerperfect/source/vsdimp/VisioImportFilter.hxx |
4 
 writerperfect/source/wpdimp/WordPerfectImportFilter.cxx   |
1 
 writerperfect/source/wpdimp/WordPerfectImportFilter.hxx   |
4 
 writerperfect/source/wpgimp/WPGImportFilter.cxx   |
1 
 writerperfect/source/wpgimp/WPGImportFilter.hxx   |
4 
 writerperfect/source/wpsimp/MSWorksImportFilter.cxx   |
1 
 writerperfect/source/wpsimp/MSWorksImportFilter.hxx   |
8 
 18 files changed, 435 insertions(+), 33 deletions(-)

New commits:
commit 858c8620d910055dcf37f1d82599e768da641e56
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Apr 19 11:02:31 2012 +0200

Stub CMX importer

diff --git a/configure.in b/configure.in
index 4f981fc..801199c 100644
--- a/configure.in
+++ b/configure.in
@@ -5931,7 +5931,7 @@ AC_MSG_CHECKING([which libcdr to use])
 if test $with_system_libcdr = yes; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBCDR=YES
-PKG_CHECK_MODULES( CDR, libcdr-0.0 )
+PKG_CHECK_MODULES( CDR, libcdr-0.0 = 0.0.5 )
 elif test $_os = iOS; then
 # libcdr depends on libwpd and libwpg and those are LGPL
 AC_MSG_RESULT([none])
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 8a4eba9..ef2204a 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -546,6 +546,7 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
draw_WordPerfect_Graphics \
draw_Visio_Document \
draw_CorelDraw_Document \
+   draw_Corel_Presentation_Exchange \
 )
 
 $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\
@@ -557,6 +558,7 @@ $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filt
WordPerfectGraphics \
VisioDocument \
CorelDrawDocument \
+   CorelPresentationExchange \
 )
 
 $(call 
filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
diff --git 
a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu 
b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu
new file mode 100644
index 000..09c3e15
--- /dev/null
+++ b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu
@@ -0,0 +1,13 @@
+node oor:name=Corel Presentation Exchange oor:op=replace
+prop oor:name=FlagsvalueIMPORT ALIEN USESOPTIONS 3RDPARTYFILTER 
PREFERRED/value/prop
+prop oor:name=UIComponent/
+prop 
oor:name=FilterServicevaluecom.sun.star.comp.Draw.CMXImportFilter/value/prop
+prop oor:name=UserDatavalue/value/prop
+prop oor:name=UIName
+value xml:lang=x-defaultCorel Presentation Exchange/value
+/prop
+prop oor:name=FileFormatVersionvalue0/value/prop
+prop 
oor:name=Typevaluedraw_Corel_Presentation_Exchange/value/prop
+prop oor:name=TemplateName/
+prop 
oor:name=DocumentServicevaluecom.sun.star.drawing.DrawingDocument/value/prop
+/node
diff --git 
a/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu 
b/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu
new file mode 100644
index 000..7f002b0
--- /dev/null
+++ b/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu
@@ -0,0 +1,12 @@
+node oor:name=draw_Corel_Presentation_Exchange oor:op=replace 
+prop 
oor:name=DetectServicevaluecom.sun.star.comp.Draw.CMXImportFilter/value/prop
+prop oor:name=URLPattern/
+prop oor:name=Extensionsvaluecmx/value/prop
+prop oor:name=MediaTypevalueimage/x-cmx/value/prop
+prop oor:name=Preferredvaluetrue/value/prop
+prop oor:name=PreferredFiltervalueCorel Presentation 
Exchange/value/prop
+prop oor:name=UIName
+valueCorel Presentation

[Libreoffice-commits] .: writerperfect/util

2012-04-19 Thread Fridrich Strba

 writerperfect/util/cdrfilter.component |4 
 1 file changed, 4 insertions(+)

New commits:
commit 415157afaffe31090032745516e506e104aa2108
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Apr 19 11:30:11 2012 +0200

cdrfilter.component has now two filters inside

diff --git a/writerperfect/util/cdrfilter.component 
b/writerperfect/util/cdrfilter.component
index 44beeae..be1e77c 100644
--- a/writerperfect/util/cdrfilter.component
+++ b/writerperfect/util/cdrfilter.component
@@ -5,4 +5,8 @@
 service name=com.sun.star.document.ImportFilter/
 service name=com.sun.star.document.ExtendedTypeDetection/
   /implementation
+  implementation name=com.sun.star.comp.Draw.CMXImportFilter
+service name=com.sun.star.document.ImportFilter/
+service name=com.sun.star.document.ExtendedTypeDetection/
+  /implementation
 /component
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerperfect/source writerperfect/util

2012-04-19 Thread Fridrich Strba

 writerperfect/source/cdrimp/cdrimport_genericfilter.cxx   |2 +-
 writerperfect/source/vsdimp/visioimport_genericfilter.cxx |2 +-
 writerperfect/source/wpdimp/wpft_genericfilter.cxx|2 +-
 writerperfect/source/wpgimp/wpgimport_genericfilter.cxx   |2 +-
 writerperfect/source/wpsimp/msworks_genericfilter.cxx |2 +-
 writerperfect/util/cdrfilter.component|2 +-
 writerperfect/util/msworksfilter.component|2 +-
 writerperfect/util/visiofilter.component  |2 +-
 writerperfect/util/wpft.component |2 +-
 writerperfect/util/wpgfilter.component|2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit d77b839868491d2d97081be9592e7860fcdea063
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Apr 19 12:00:15 2012 +0200

Prefix the UNO components in writerperfect

diff --git a/writerperfect/source/cdrimp/cdrimport_genericfilter.cxx 
b/writerperfect/source/cdrimp/cdrimport_genericfilter.cxx
index ced5137..5612610 100644
--- a/writerperfect/source/cdrimp/cdrimport_genericfilter.cxx
+++ b/writerperfect/source/cdrimp/cdrimport_genericfilter.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::registry;
 
 extern C
 {
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL cdrfilter_component_getFactory(
 const sal_Char *pImplName, void *pServiceManager, void * /* 
pRegistryKey */ )
 {
 void *pRet = 0;
diff --git a/writerperfect/source/vsdimp/visioimport_genericfilter.cxx 
b/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
index bfed51a..04172b0 100644
--- a/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
+++ b/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::registry;
 
 extern C
 {
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL visiofilter_component_getFactory(
 const sal_Char *pImplName, void *pServiceManager, void * /* 
pRegistryKey */ )
 {
 void *pRet = 0;
diff --git a/writerperfect/source/wpdimp/wpft_genericfilter.cxx 
b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
index 8e3534b..5e0f141 100644
--- a/writerperfect/source/wpdimp/wpft_genericfilter.cxx
+++ b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::registry;
 
 extern C
 {
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL wpft_component_getFactory(
 const sal_Char *pImplName, void *pServiceManager, void * /* 
pRegistryKey */ )
 {
 void *pRet = 0;
diff --git a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx 
b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
index 2870915..22e99d8 100644
--- a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
+++ b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::registry;
 
 extern C
 {
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL wpgfilter_component_getFactory(
 const sal_Char *pImplName, void *pServiceManager, void * /* 
pRegistryKey */ )
 {
 void *pRet = 0;
diff --git a/writerperfect/source/wpsimp/msworks_genericfilter.cxx 
b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
index b53707c..ae9c701 100644
--- a/writerperfect/source/wpsimp/msworks_genericfilter.cxx
+++ b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::registry;
 
 extern C
 {
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL msworksfilter_component_getFactory(
 const sal_Char *pImplName, void *pServiceManager, void * /* 
pRegistryKey */ )
 {
 void *pRet = 0;
diff --git a/writerperfect/util/cdrfilter.component 
b/writerperfect/util/cdrfilter.component
index be1e77c..902bf9a 100644
--- a/writerperfect/util/cdrfilter.component
+++ b/writerperfect/util/cdrfilter.component
@@ -1,5 +1,5 @@
 ?xml version=1.0 encoding=UTF-8?
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=cdrfilter
 xmlns=http://openoffice.org/2010/uno-components;
   implementation name=com.sun.star.comp.Draw.CDRImportFilter
 service name=com.sun.star.document.ImportFilter/
diff --git a/writerperfect/util/msworksfilter.component 
b/writerperfect/util/msworksfilter.component
index 769eaf3..8fc2120 100644
--- a/writerperfect/util/msworksfilter.component
+++ b/writerperfect/util/msworksfilter.component
@@ -1,5 +1,5 @@
 ?xml version=1.0 encoding=UTF-8?
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=msworksfilter

[Libreoffice-commits] .: svx/source

 svx/source/svdraw/svdview.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a763ef3c0cfdb1fd04528a393a44be508314072b
Author: Regina Henschel rb.hensc...@t-online.de
Date:   Wed Apr 18 01:00:08 2012 +0200

fdo#48473 Missing translation of local String constant

Consolidated two occurences of the same string into macro
(to prevent them to diverge again)

diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 18237ce..ecfd6f4 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1167,12 +1167,13 @@ Pointer SdrView::GetPreferedPointer(const Point 
rMousePos, const OutputDevice*
 return Pointer(POINTER_ARROW);
 }
 
+#define STR_NOTHING nothing
 XubString SdrView::GetStatusText()
 {
 XubString aStr;
 XubString aName;
 
-aStr.AppendAscii(nothing);
+aStr.AppendAscii(STR_NOTHING);
 
 if (pAktCreate!=NULL)
 {
@@ -1267,7 +1268,7 @@ XubString SdrView::GetStatusText()
 #endif
 }
 
-if(aStr.EqualsAscii(nix))
+if(aStr.EqualsAscii(STR_NOTHING))
 {
 if (AreObjectsMarked()) {
 ImpTakeDescriptionStr(STR_ViewMarked,aStr);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svx/source/form/fmexpl.cxx|5 -
 svx/source/form/fmshimp.cxx   |   17 ++---
 svx/source/form/navigatortree.cxx |  122 +-
 svx/source/inc/fmexpl.hxx |   11 +--
 svx/source/inc/fmshimp.hxx|7 +-
 5 files changed, 85 insertions(+), 77 deletions(-)

New commits:
commit 59a51999c60127bc3ad6a36679f9ea7234bbfc8e
Author: Michael Stahl mst...@redhat.com
Date:   Thu Apr 19 12:58:19 2012 +0200

svx: fix debug warnings from STL conversion

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index f76654a..648c857 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2304,7 +2304,9 @@ IMPL_LINK(FmXFormShell, OnFoundData, 
FmFoundRecordInformation*, pfriWhere)
 LoopGrids(GA_FORCE_SYNC);
 
 // und zum Feld (dazu habe ich vor dem Start des Suchens die 
XVclComponent-Interfaces eingesammelt)
-DBG_ASSERT(pfriWhere-nFieldPos  m_arrSearchedControls.Count(), 
FmXFormShell::OnFoundData : ungueltige Daten uebergeben !);
+SAL_WARN_IF(static_castsize_t(pfriWhere-nFieldPos) =
+m_arrSearchedControls.size(),
+svx.form, FmXFormShell::OnFoundData : invalid index!);
 SdrObject* pObject = m_arrSearchedControls.at(pfriWhere-nFieldPos);
 
 
m_pShell-GetFormView()-UnMarkAll(m_pShell-GetFormView()-GetSdrPageView());
diff --git a/svx/source/form/navigatortree.cxx 
b/svx/source/form/navigatortree.cxx
index c6d716f..bae1e49 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1639,7 +1639,9 @@ namespace svxform
 return;
 
 CollectSelectionData(SDI_ALL);
-DBG_ASSERT( m_nFormsSelected + m_nControlsSelected + (m_bRootSelected 
? 1 : 0) == m_arrCurrentSelection.size(),
+SAL_WARN_IF(static_castsize_t(m_nFormsSelected + m_nControlsSelected
++ (m_bRootSelected ? 1 : 0)) != m_arrCurrentSelection.size(),
+svx.form,
 NavigatorTree::ShowSelectionProperties : selection meta data 
invalid !);
 
 
commit f765f52c39e79b633bbc8f1a16567572b7bf7a1a
Author: Noel Grandin n...@peralex.com
Date:   Mon Apr 16 00:16:05 2012 +0200

Convert SV_DECL_PTRARR_DEL to boost::ptr_vector

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index dc33eb0..f76654a 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -4105,8 +4105,6 @@ sal_Bool SearchableControlIterator::ShouldStepInto(const 
Reference XInterface
 
//==
 
//==
 
-SV_IMPL_PTRARR(StatusForwarderArray, SfxStatusForwarder*)
-
 SFX_IMPL_MENU_CONTROL(ControlConversionMenuController, SfxBoolItem);
 
 
//--
@@ -4124,7 +4122,7 @@ 
ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI
 {
 _rBindings.Invalidate(m_pConversionMenu-GetItemId(i));
 SfxStatusForwarder* pForwarder = new 
SfxStatusForwarder(m_pConversionMenu-GetItemId(i), *this);
-m_aStatusForwarders.C40_INSERT(SfxStatusForwarder, pForwarder, 
m_aStatusForwarders.Count());
+m_aStatusForwarders.push_back(pForwarder);
 }
 }
 }
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 26eb304..9664b4e 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -74,6 +74,7 @@
 #include queue
 #include set
 #include vector
+#include boost/ptr_container/ptr_vector.hpp
 
 typedef std::vectorSdrObject* SdrObjArray;
 //  SV_DECL_OBJARR(FmFormArray, ::com::sun::star::uno::Reference 
::com::sun::star::form::XForm, 32, 16);
@@ -584,7 +585,7 @@ public:
 };
 
 // 
-SV_DECL_PTRARR_DEL(StatusForwarderArray, SfxStatusForwarder*, 16)
+typedef boost::ptr_vectorSfxStatusForwarder StatusForwarderArray;
 class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl
 {
 protected:
commit eb13c2c5b127910367ed2dac4fd2166a6d9c8a70
Author: Noel Grandin n...@peralex.com
Date:   Sun Apr 15 22:55:48 2012 +0200

Convert SV_DECL_PTRARR to std::vector

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 29a45c0..dc33eb0 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2305,8 +2305,7 @@ IMPL_LINK(FmXFormShell, OnFoundData, 
FmFoundRecordInformation*, pfriWhere)
 
 // und zum Feld (dazu habe ich vor dem Start des Suchens die 
XVclComponent-Interfaces eingesammelt)
 DBG_ASSERT(pfriWhere-nFieldPos  m_arrSearchedControls.Count(), 
FmXFormShell::OnFoundData : ungueltige Daten uebergeben !);
-SdrObject* pObject = m_arrSearchedControls.GetObject(pfriWhere-nFieldPos);
-DBG_ASSERT(pObject != NULL, FmXFormShell::OnFoundData : unerwartet : 
ungueltiges VclControl-Interface);
+

[Libreoffice-commits] .: solenv/gbuild

 solenv/gbuild/platform/macosx.mk  |1 +
 solenv/gbuild/platform/solaris.mk |1 +
 solenv/gbuild/platform/unxgcc.mk  |1 +
 3 files changed, 3 insertions(+)

New commits:
commit b98c960e9707d8222dd7c8fad22e84bbfb725822
Author: David Tardon dtar...@redhat.com
Date:   Thu Apr 19 14:31:40 2012 +0200

add OXT to gb_LinkTarget__RPATHS too

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a55af3a..2ab1336 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -157,6 +157,7 @@ gb_LinkTarget__RPATHS := \
UREBIN: \
OOO:@__OOO/ \
SDKBIN: \
+   OXT: \
NONE:@__VIA_LIBRARY_PATH__@ \
 
 # $(call gb_LinkTarget__get_installname,libfilename,soversion,layerprefix)
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index cc8a2a8..28de7bd 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -196,6 +196,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
+   OXT:\dORIGIN/../lib:\dORIGIN \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 31859a2..37243ad 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -204,6 +204,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
+   OXT:\dORIGIN/../lib:\dORIGIN \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8a2fc6e40fe6c33c2b8f893079e009e430450515
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Apr 19 14:37:10 2012 +0200

do not refer to a variable that has not been set yet

Especially if it will be set as a result of the code that now tries
to use it (alternatively, it comes from the Qt3 check, which is not
right either).

diff --git a/configure.in b/configure.in
index 801199c..c3847c1 100644
--- a/configure.in
+++ b/configure.in
@@ -9295,10 +9295,10 @@ if test $test_kde4 = yes -a $ENABLE_KDE4 = 
TRUE; then
 fi
 
 dnl Check for qmake
-AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname 
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname 
$qt_header_dir`/bin:$QT4DIR/bin:$PATH] )
 QMAKE4=$QMAKEQT4
 if test $QMAKE4 = no ; then
-AC_PATH_PROG( QMAKE4, qmake, no, [`dirname 
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+AC_PATH_PROG( QMAKE4, qmake, no, [`dirname 
$qt_header_dir`/bin:$QT4DIR/bin:$PATH] )
 if test $QMAKE4 = no ; then
 AC_MSG_ERROR([Qmake not found.  Please specify
 the root of your Qt installation by exporting QT4DIR before running 
configure.])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 android/experimental/eagles051387/.gitignore |1 +
 sal/osl/all/debugbase.cxx|   16 
 2 files changed, 17 insertions(+)

New commits:
commit cf557a25da78bbacf435c9aaec53c3de89dae758
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Apr 19 14:50:20 2012 +0200

.gitignore

diff --git a/android/experimental/eagles051387/.gitignore 
b/android/experimental/eagles051387/.gitignore
new file mode 100644
index 000..cddd2a3
--- /dev/null
+++ b/android/experimental/eagles051387/.gitignore
@@ -0,0 +1 @@
+.classpath
commit 18f117ae6bde53f4427c777d7bbfca2cf6afdb04
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Apr 19 14:47:09 2012 +0200

clang warning for osl_detail_ObjectRegistry_getMutex() in the .cxx file too

diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 48a9c1a..9b3021f 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -81,11 +81,27 @@ struct DebugBaseMutex : ::rtl::Staticosl::Mutex, 
DebugBaseMutex {};
 
 extern C {
 
+// These functions presumably should not be extern C, but changing
+// that would break binary compatibility.
+#if SUPD  400
+#ifdef __clang__
+#pragma clang diagnostic push
+// Guard against slightly older clang versions that don't have
+// -Wreturn-type-c-linkage...
+#pragma clang diagnostic ignored -Wunknown-pragmas
+#pragma clang diagnostic ignored -Wreturn-type-c-linkage
+#endif
+#endif
 osl::Mutex  SAL_CALL osl_detail_ObjectRegistry_getMutex()
 SAL_THROW_EXTERN_C()
 {
 return DebugBaseMutex::get();
 }
+#if SUPD  400
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+#endif
 
 bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName )
 SAL_THROW_EXTERN_C()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/unx

 desktop/unx/source/start.c |   16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit f92d22565d4d389b0c93d45a1995521431585694
Author: Michael Stahl mst...@redhat.com
Date:   Thu Apr 19 15:00:18 2012 +0200

oosplash: improve signal handlers:

- global variable should be volatile
- signal is deprecated, use sigaction instead
- exit from the handler

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 307cd88..d1a09a7 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -766,7 +766,7 @@ exec_javaldx (Args *args)
 #endif
 
 // has to be a global :(
-oslProcess * g_pProcess = 0;
+oslProcess * volatile g_pProcess = 0;
 
 void sigterm_handler(int ignored)
 {
@@ -776,8 +776,10 @@ void sigterm_handler(int ignored)
 // forward signal to soffice.bin
 osl_terminateProcess(g_pProcess);
 }
+_exit(255);
 }
 
+
 SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 {
 int fd = 0;
@@ -787,10 +789,18 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 Args *args;
 int status = 0;
 struct splash* splash = NULL;
+struct sigaction sigpipe_action;
+struct sigaction sigterm_action;
 
 /* turn SIGPIPE into an error */
-signal( SIGPIPE, SIG_IGN );
-signal( SIGTERM, sigterm_handler );
+memset(sigpipe_action, 0, sizeof(struct sigaction));
+sigpipe_action.sa_handler = SIG_IGN;
+sigemptyset(sigpipe_action.sa_mask);
+sigaction(SIGPIPE, sigpipe_action, 0);
+memset(sigterm_action, 0, sizeof(struct sigaction));
+sigterm_action.sa_handler = sigterm_handler;
+sigemptyset(sigterm_action.sa_mask);
+sigaction(SIGTERM, sigterm_action, 0);
 
 args = args_parse ();
 args-pAppPath = get_app_path( argv[0] );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - i18npool/source stoc/source unotools/source

 i18npool/source/registerservices/registerservices.cxx   |3 
 i18npool/source/transliteration/transliterationImpl.cxx |5 
 stoc/source/servicemanager/servicemanager.cxx   |  155 
 unotools/source/i18n/textsearch.cxx |4 
 4 files changed, 48 insertions(+), 119 deletions(-)

New commits:
commit 61d78aca81f08ac3a0f9eb65799d04d56fbad312
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Apr 19 15:00:34 2012 +0200

Allow OServiceManagerWrapper to wrap all service manager implementations

...not just OServiceManager.  (This is a prerequisite to replace the
defaultBootstrap_initialComponentContext() implementation with a more 
performant
component context/service manager combo.)

The only reason for the restriction to OServiceManager apparently was the
additional createContentEnumeration overload with an XComponentContext
parameter.  It /looks/ to me like this is not really necessary, that it 
should
always be OK to instantiate implementation factories with this service 
manager
and its component context, instead of a component context (and its default
service manager) passed into a method call.  This would mean that the code 
could
be simplified further, needing a component context passed into a method 
only to
pass along to a new instance created via
createInstanceWith[ArgumentsAnd]Context, but then again I'm not 100% sure 
and
better leave it at that...

This also means that XUnoTunnel is gone from OServiceManager and 
XInitialization
is gone from OServiceManagerWrapper.

diff --git a/stoc/source/servicemanager/servicemanager.cxx 
b/stoc/source/servicemanager/servicemanager.cxx
index 8cc4fba..55ee0d9 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -40,15 +40,14 @@
 #include cppuhelper/component.hxx
 #include cppuhelper/factory.hxx
 #include cppuhelper/implbase1.hxx
-#include cppuhelper/typeprovider.hxx
 #include cppuhelper/implementationentry.hxx
 #include rtl/unload.h
 #include cppuhelper/component_context.hxx
 #include cppuhelper/bootstrap.hxx
-#include cppuhelper/compbase8.hxx
+#include cppuhelper/compbase6.hxx
+#include cppuhelper/compbase7.hxx
 
 
-#include com/sun/star/lang/XUnoTunnel.hpp
 #include com/sun/star/lang/XMultiServiceFactory.hpp
 #include com/sun/star/lang/XMultiComponentFactory.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
@@ -136,21 +135,6 @@ OUString regsmgr_getImplementationName()
 
 namespace stoc_smgr
 {
-static Sequence sal_Int8  smgr_getImplementationId()
-{
-static OImplementationId * s_pId = 0;
-if (! s_pId)
-{
-MutexGuard aGuard( Mutex::getGlobalMutex() );
-if (! s_pId)
-{
-static OImplementationId s_aId;
-s_pId = s_aId;
-}
-}
-return s_pId-getImplementationId();
-}
-
 
 static Sequence OUString  retrieveAsciiValueList(
 const Reference XSimpleRegistry  xReg, const OUString keyName )
@@ -466,9 +450,9 @@ struct OServiceManagerMutex
 
 extern C void SAL_CALL smgrUnloadingListener(void* id);
 
-typedef WeakComponentImplHelper8
+typedef WeakComponentImplHelper7
 lang::XMultiServiceFactory, lang::XMultiComponentFactory, 
lang::XServiceInfo,
-lang::XInitialization, lang::XUnoTunnel,
+lang::XInitialization,
 container::XSet, container::XContentEnumerationAccess,
 beans::XPropertySet  t_OServiceManager_impl;
 
@@ -482,10 +466,6 @@ public:
 OServiceManager( Reference XComponentContext  const  xContext );
 virtual ~OServiceManager();
 
-// XUnoTunnel
-sal_Int64 SAL_CALL getSomething( Sequence sal_Int8  const  id )
-throw (RuntimeException);
-
 // XInitialization
 void SAL_CALL initialize( Sequence Any  const  args )
 throw (Exception);
@@ -533,9 +513,6 @@ public:
 // XContentEnumerationAccess
 //Sequence OUString   getAvailableServiceNames() throw( 
(Exception) );
 virtual ReferenceXEnumeration  SAL_CALL createContentEnumeration(const 
OUString aServiceName) throw(::com::sun::star::uno::RuntimeException);
-virtual ReferenceXEnumeration  SAL_CALL createContentEnumeration(
-const OUString aServiceName, Reference XComponentContext  const  
xContext )
-throw(::com::sun::star::uno::RuntimeException);
 
 // XComponent
 virtual void SAL_CALL dispose() 
throw(::com::sun::star::uno::RuntimeException);
@@ -616,13 +593,18 @@ inline void OServiceManager::check_undisposed() const
 
//##
 
//##
 
-class OServiceManagerWrapper : public OServiceManagerMutex, public 
t_OServiceManager_impl
+typedef WeakComponentImplHelper6
+lang::XMultiServiceFactory, lang::XMultiComponentFactory, 
lang::XServiceInfo,
+container::XSet,

[Libreoffice-commits] .: solenv/gbuild

 solenv/gbuild/platform/solaris.mk |   11 +++
 solenv/gbuild/platform/unxgcc.mk  |9 ++---
 2 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit fba1422900c6d1763e2792b4a798d8c840d38fb1
Author: David Tardon dtar...@redhat.com
Date:   Thu Apr 19 15:10:47 2012 +0200

extension libs should have no RPATH

diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 28de7bd..1152c68 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -196,7 +196,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
-   OXT:\dORIGIN/../lib:\dORIGIN \
+   OXT: \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
@@ -301,12 +301,15 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
-define gb_Library_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1)))' \
-'-L$(gb_Library_OUTDIRLOCATION)'
+define gb_Library__get_rpath
+$(if $(1),$(strip '-Wl,-rpath,$(1)' '-L$(gb_Library_OUTDIRLOCATION)'))
 #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
 endef
 
+define gb_Library_get_rpath
+$(call gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1
+endef
+
 define gb_Library_Library_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call 
gb_Library_get_rpath,$(1))
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 37243ad..58bc7eb 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -204,7 +204,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
-   OXT:\dORIGIN/../lib:\dORIGIN \
+   OXT: \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
@@ -312,9 +312,12 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
+define gb_Library__get_rpath
+$(if $(1),$(strip '-Wl,-rpath,$(1)' 
'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'))
+endef
+
 define gb_Library_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1)))' \
-'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
+$(call gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1
 endef
 
 define gb_Library_Library_platform
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sd/AllLangResTarget_sd.mk sd/source

2012-04-19 Thread Olivier Hallot

 sd/AllLangResTarget_sd.mk |1 
 sd/source/ui/inc/NotesChildWindow.hrc |   30 -
 sd/source/ui/inc/NotesChildWindow.hxx |   58 --
 sd/source/ui/notes/EditWindow.cxx |  792 --
 sd/source/ui/notes/EditWindow.hxx |  130 
 sd/source/ui/notes/NotesChildWindow.cxx   |   64 --
 sd/source/ui/notes/NotesChildWindow.src   |   46 -
 sd/source/ui/notes/NotesDockingWindow.cxx |  112 
 sd/source/ui/notes/NotesDockingWindow.hxx |   59 --
 sd/source/ui/notes/TextLogger.cxx |  130 
 sd/source/ui/view/ViewShellBase.cxx   |1 
 11 files changed, 1423 deletions(-)

New commits:
commit 14480ef3f659f5559d0a73dfb8a3fecb9d3cd378
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Thu Apr 19 10:26:40 2012 -0300

Remove deprecated Notes windows in Impress/Draw

This code has not been built for a long time. I suspect it got replaced by 
the slides panel on the left of simpress main window.

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 92931c5..89fc6a2 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/tpaction.src \
 sd/source/ui/dlg/tpoption.src \
 sd/source/ui/dlg/vectdlg.src \
-sd/source/ui/notes/NotesChildWindow.src \
 sd/source/ui/slideshow/slideshow.src \
 sd/source/ui/slidesorter/view/SlsResource.src \
 sd/source/ui/table/TableDesignPane.src \
diff --git a/sd/source/ui/inc/NotesChildWindow.hrc 
b/sd/source/ui/inc/NotesChildWindow.hrc
deleted file mode 100644
index c25109d..000
--- a/sd/source/ui/inc/NotesChildWindow.hrc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#define FLT_WIN_NOTES 790
-
-#define NOTES 1
diff --git a/sd/source/ui/inc/NotesChildWindow.hxx 
b/sd/source/ui/inc/NotesChildWindow.hxx
deleted file mode 100644
index 8287a2a..000
--- a/sd/source/ui/inc/NotesChildWindow.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef SD_NOTES_CHILD_WINDOW_HXX
-#define SD_NOTES_CHILD_WINDOW_HXX
-
-#include sfx2/childwin.hxx
-
-#define NOTES_CHILD_WINDOW() (  \
-static_cast ::sd::toolpanel::NotesChildWindow*(   \
-SfxViewFrame::Current()-GetChildWindow(\
-::sd::toolpanel::NotesChildWindow::GetChildWindowId()   \
-)-GetWindow()))
-
-
-namespace sd { namespace notes {
-
-class NotesChildWindow
-: public SfxChildWindow
-{
-public:
-NotesChildWindow (::Window*, sal_uInt16, SfxBindings*,

[Libreoffice-commits] .: vcl/unx

 vcl/unx/gtk/window/gtkframe.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 6d97ea37bba52b21648c91276bc9281d06cdd148
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Apr 19 14:34:35 2012 +0100

fdo#46687 - fix find toolbar X error handling

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 4137a8d..a647bf8 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2231,6 +2231,8 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
 // to do this we need to synchronize with the XServer
 GetGenericData()-ErrorTrapPush();
 XSetInputFocus( getDisplay()-GetDisplay(), 
widget_get_xid(m_pWindow), RevertToParent, CurrentTime );
+// fdo#46687 - an XSync should not be necessary - but for some 
reason it is.
+XSync( getDisplay()-GetDisplay(), False );
 GetGenericData()-ErrorTrapPop();
 }
 #endif
@@ -3239,9 +3241,11 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, 
GdkEvent*, gpointer frame )
 #if !GTK_CHECK_VERSION(3,0,0)
 if( bSetFocus )
 {
+GetGenericData()-ErrorTrapPush();
 XSetInputFocus( pThis-getDisplay()-GetDisplay(),
 widget_get_xid(pWidget),
 RevertToParent, CurrentTime );
+GetGenericData()-ErrorTrapPop();
 }
 #else
 (void)pWidget; (void)bSetFocus;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/qa/unit/data/reference/testChart.xml |  126 ++
 chart2/source/view/main/ChartView.cxx   |2 
 sc/Module_sc.mk |1 
 sc/inc/compiler.hxx |2 
 sc/inc/rangenam.hxx |4 
 sc/qa/extras/regression-test.cxx|   43 +++
 sc/qa/unit/filters-test.cxx |   21 +++
 sc/qa/unit/subsequent_filters-test.cxx  |   21 ---
 sc/source/core/data/table1.cxx  |2 
 sc/source/core/tool/compiler.cxx|7 -
 sc/source/core/tool/rangenam.cxx|8 -
 sc/source/filter/excel/xecontent.cxx|   70 +++-
 sc/source/filter/excel/xeroot.cxx   |2 
 sc/source/filter/excel/xestyle.cxx  |  156 ++--
 sc/source/filter/inc/xecontent.hxx  |4 
 sc/source/filter/inc/xeroot.hxx |5 
 sc/source/filter/inc/xestyle.hxx|   42 +++
 17 files changed, 468 insertions(+), 48 deletions(-)

New commits:
commit 126e58925be1fa76008e5eaebaa8c6893bde879a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Apr 19 15:50:09 2012 +0200

Revert move testCVE into slowcheck

This reverts commit 97fe16f4dc5582be597971b6e17431b8d353b8ba.

Make Norbert#s tinderbox happy again.

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 417b842..de17ced 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -96,6 +96,11 @@ public:
 virtual void setUp();
 virtual void tearDown();
 
+/**
+ * Ensure CVEs remain unbroken
+ */
+void testCVEs();
+
 //ods, xls, xlsx filter tests
 void testRangeNameODS(); // only test ods here, xls and xlsx in 
subsequent_filters-test
 void testContentODS();
@@ -112,6 +117,7 @@ public:
 #endif
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
+CPPUNIT_TEST(testCVEs);
 CPPUNIT_TEST(testRangeNameODS);
 CPPUNIT_TEST(testContentODS);
 CPPUNIT_TEST(testContentXLS);
@@ -183,6 +189,21 @@ void ScFiltersTest::createCSVPath(const rtl::OUString 
aFileBase, rtl::OUString
 rCSVPath = aBuffer.makeStringAndClear();
 }
 
+void ScFiltersTest::testCVEs()
+{
+testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Quattro Pro 6.0)),
+getURLFromSrc(/sc/qa/unit/data/qpro/), rtl::OUString());
+
+//warning, the current sylk filter in sc (docsh.cxx) automatically
+//chains on failure on trying as csv, rtf, etc. so success may
+//not indicate that it imported as .slk.
+testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SYLK)),
+getURLFromSrc(/sc/qa/unit/data/slk/), rtl::OUString());
+
+testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MS Excel 97)),
+getURLFromSrc(/sc/qa/unit/data/xls/), rtl::OUString());
+}
+
 #if TEST_BUG_FILES
 
 void ScFiltersTest::testDir(osl::Directory rDir, sal_uInt32 nType)
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 8476b85..87697cd 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -96,11 +96,6 @@ public:
 virtual void setUp();
 virtual void tearDown();
 
-/**
- * Ensure CVEs remain unbroken
- */
-void testCVEs();
-
 //ods, xls, xlsx filter tests
 void testRangeNameXLS();
 void testRangeNameXLSX();
@@ -127,7 +122,6 @@ public:
 
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
-CPPUNIT_TEST(testCVEs);
 CPPUNIT_TEST(testRangeNameXLS);
 CPPUNIT_TEST(testRangeNameXLSX);
 CPPUNIT_TEST(testFunctionsODS);
@@ -234,21 +228,6 @@ void ScFiltersTest::createCSVPath(const rtl::OUString 
aFileBase, rtl::OUString
 rCSVPath = aBuffer.makeStringAndClear();
 }
 
-void ScFiltersTest::testCVEs()
-{
-testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Quattro Pro 6.0)),
-getURLFromSrc(/sc/qa/unit/data/qpro/), rtl::OUString());
-
-//warning, the current sylk filter in sc (docsh.cxx) automatically
-//chains on failure on trying as csv, rtf, etc. so success may
-//not indicate that it imported as .slk.
-testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SYLK)),
-getURLFromSrc(/sc/qa/unit/data/slk/), rtl::OUString());
-
-testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MS Excel 97)),
-getURLFromSrc(/sc/qa/unit/data/xls/), rtl::OUString());
-}
-
 namespace {
 
 void testRangeNameImpl(ScDocument* pDoc)
commit 44481da569df85aa91455fdc2892a4e0c5818e6c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Apr 19 15:41:28 2012 +0200

update relative local range names, fdo#48856

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 84496b6..b83448b 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -443,7 +443,7 @@ public:
 bool UpdateNameReference( UpdateRefMode eUpdateRefMode,
   const ScRange,
   SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-

[Libreoffice-commits] .: 2 commits - shell/source TEMPLATE.SOURCECODE.HEADER

 TEMPLATE.SOURCECODE.HEADER |   30 ++---
 shell/source/backends/gconfbe/gconfbackend.cxx |4 --
 shell/source/backends/gconfbe/makefile.mk  |2 -
 shell/source/backends/gconfbe/orbit.h  |   42 -
 4 files changed, 6 insertions(+), 72 deletions(-)

New commits:
commit e40e42ffeaa56c2f66b71c58190774cc70d20343
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Apr 19 15:01:03 2012 +0100

update header template to MPLv2 cf. ESC minutes.

diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
index cae6935..1d7331c 100644
--- a/TEMPLATE.SOURCECODE.HEADER
+++ b/TEMPLATE.SOURCECODE.HEADER
@@ -1,32 +1,10 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ * Copyright 2012 LibreOffice contributors.
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the License); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an AS IS basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
-
- * [ Copyright (C) 2012 Jim Bob j...@bob.org (initial developer) ]
- * [ Copyright (C) 2012 Ted t...@bear.com ]
-
- *
- * 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.
+ * 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/.
  */
 ...
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a219edfbb65e6623dde2d52c41547d78346b7144
Author: Ross Burton ross.bur...@intel.com
Date:   Wed Apr 18 21:26:38 2012 +0100

Don't check for ORBit  2.8

ORBit 2.8 was released in 2003 so let's assume that this isn't being used.  
Also
the assumption is that it's coming in through GConf, which isn't true with 
GConf
3 onwards, released July 2011.

diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx 
b/shell/source/backends/gconfbe/gconfbackend.cxx
index 57a1a4e..82ea9fe 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -61,7 +61,6 @@
 #include uno/lbnames.h
 
 #include gconfaccess.hxx
-#include orbit.h
 
 namespace {
 
@@ -165,8 +164,7 @@ Service::Service(): enabled_(false) {
 rtl::OUString(
 RTL_CONSTASCII_USTRINGPARAM(system.desktop-environment))) =
 desktop;
-enabled_ = desktop == GNOME  ((orbit_major_version == 2  
orbit_minor_version = 8) || orbit_major_version  2);
-// ORBit-2 versions  2.8 cause a deadlock with the gtk+ VCL plugin
+enabled_ = desktop == GNOME;
 }
 }
 
diff --git a/shell/source/backends/gconfbe/makefile.mk 
b/shell/source/backends/gconfbe/makefile.mk
index 9e77a08..84ec3db 100644
--- a/shell/source/backends/gconfbe/makefile.mk
+++ b/shell/source/backends/gconfbe/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS+=-DENABLE_LOCKDOWN
 
 .IF $(ENABLE_GCONF)!=
 COMPILER_WARN_ALL=TRUE
-PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0
+PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 glib-2.0
 .INCLUDE: pkg_config.mk
 
 .IF $(OS) == SOLARIS
diff --git a/shell/source/backends/gconfbe/orbit.h 
b/shell/source/backends/gconfbe/orbit.h
deleted file mode 100644
index 82673a3..000
--- a/shell/source/backends/gconfbe/orbit.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included

[Libreoffice-commits] .: RepositoryExternal.mk

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6cd7aa59a8bc918f637a68df8002c4b58e9469f4
Author: Michael Stahl mst...@redhat.com
Date:   Thu Apr 19 16:16:07 2012 +0200

gb_LinkTarget_add_static_libs never existed

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 10dc633..d618b63 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -453,7 +453,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 )
 ifneq ($(OS),WNT)
 ifeq ($(OS),MACOSX)
-$(call gb_LinkTarget_add_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
pixman-1 \
 )
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 +---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit df2a76d988ad11b20ce7cec9cff06a1bc5c94788
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Apr 19 16:26:02 2012 +0200

RTFDocumentImpl: get rid of practically unused m_bWasInFrame

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 54fdac2..e2fa851 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -278,7 +278,6 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
 m_nCurrentStyleIndex(0),
 m_bEq(false),
 m_bFormField(false),
-m_bWasInFrame(false),
 m_bIsInFrame(false),
 m_aUnicodeBuffer(),
 m_aHexBuffer()
@@ -1408,8 +1407,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 }
 // but don't emit properties yet, since they may change till 
the first text token arrives
 m_bNeedPap = true;
-m_bWasInFrame = m_aStates.top().aFrame.inFrame();
-if (!m_bWasInFrame)
+if (!m_aStates.top().aFrame.inFrame())
 m_bNeedPar = false;
 }
 break;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 81f05c3..3a1bad4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -478,8 +478,6 @@ namespace writerfilter {
 int m_nCurrentStyleIndex;
 bool m_bEq;
 bool m_bFormField;
-/// If we were in a frame.
-bool m_bWasInFrame;
 /// If a frame start token is already sent to dmapper (nesting 
them is not OK).
 bool m_bIsInFrame;
 // Unicode characters are collected here so we don't have to 
send them one by one.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

 sc/source/filter/excel/xestyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bdb2bc1a0e5a6173ee3517fa64b9eaea46a4ca6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Apr 19 16:29:17 2012 +0200

fix ambiguous in win build

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index acb746c..01beec6 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1219,7 +1219,7 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream rStrm, const 
String rFormatCode )
 {
 sax_fastparser::FSHelperPtr rStyleSheet = rStrm.GetCurrentStream();
 rStyleSheet-singleElement( XML_numFmt,
-XML_numFmtId,   OString::valueOf( mnXclNumFmt ).getStr(),
+XML_numFmtId,   OString::valueOf( 
static_castsal_Int32(mnXclNumFmt) ).getStr(),
 XML_formatCode, XclXmlUtils::ToOString( rFormatCode ).getStr(),
 FSEND );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryExternal.mk

 RepositoryExternal.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit a34f98bdacac4bffe8cfdcd6e6459617d204cfd2
Author: Michael Stahl mst...@redhat.com
Date:   Thu Apr 19 16:51:40 2012 +0200

this pixman-1 thing wasn't even registered

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d618b63..26de781 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -437,9 +437,15 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
cairo \
 ))
 ifneq ($(OS),WNT)
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+   pixman-1 \
+))
+else
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
pixman-1 \
 ))
+endif # MACOSX
 endif # WNT
 
 define gb_LinkTarget__use_cairo
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

 sc/source/filter/xml/xmlexprt.cxx  |2 --
 sc/source/ui/drawfunc/fuconcustomshape.cxx |1 -
 sc/source/ui/drawfunc/fuconrec.cxx |1 -
 sc/source/ui/drawfunc/fuconuno.cxx |1 -
 4 files changed, 5 deletions(-)

New commits:
commit ee7dacf6f0900b3a62e489e8d7bad315711a704d
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Apr 19 17:03:39 2012 +0200

remove unused variables

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 72a1014..531a5c5 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3162,8 +3162,6 @@ void ScXMLExport::WriteShapes(const ScMyCell rMyCell)
 aPoint.X = 2 * aItr-xShape-getPosition().X + 
aItr-xShape-getSize().Width - aPoint.X;
 if ( !aItr-xShape-getShapeType().equals(sCaptionShape) )
 {
-Rectangle aEndRec(pDoc-GetMMRect(aItr-aEndAddress.Col(), 
aItr-aEndAddress.Row(),
-aItr-aEndAddress.Col(), aItr-aEndAddress.Row(), 
aItr-aEndAddress.Tab()));
 rtl::OUString sEndAddress;
 ScRangeStringConverter::GetStringFromAddress(sEndAddress, 
aItr-aEndAddress, pDoc, FormulaGrammar::CONV_OOO);
 AddAttribute(XML_NAMESPACE_TABLE, XML_END_CELL_ADDRESS, 
sEndAddress);
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx 
b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index d86507e..a518e62 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -128,7 +128,6 @@ sal_Bool FuConstCustomShape::MouseButtonUp(const 
MouseEvent rMEvt)
 
 if ( pView-IsCreateObj()  rMEvt.IsLeft() )
 {
-Point aPnt( pWindow-PixelToLogic( rMEvt.GetPosPixel() ) );
 pView-EndCreateObj(SDRCREATE_FORCEEND);
 bReturn = sal_True;
 }
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx 
b/sc/source/ui/drawfunc/fuconrec.cxx
index f50bed1..8ef1ce7 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -125,7 +125,6 @@ sal_Bool FuConstRectangle::MouseButtonUp(const MouseEvent 
rMEvt)
 
 if ( pView-IsCreateObj()  rMEvt.IsLeft() )
 {
-Point aPnt( pWindow-PixelToLogic( rMEvt.GetPosPixel() ) );
 pView-EndCreateObj(SDRCREATE_FORCEEND);
 
 if (aSfxRequest.GetSlot() == SID_DRAW_CAPTION_VERTICAL)
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx 
b/sc/source/ui/drawfunc/fuconuno.cxx
index f1098c6..924ab3e 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -109,7 +109,6 @@ sal_Bool FuConstUnoControl::MouseButtonUp(const MouseEvent 
rMEvt)
 
 if ( pView-IsCreateObj()  rMEvt.IsLeft() )
 {
-Point aPnt( pWindow-PixelToLogic( rMEvt.GetPosPixel() ) );
 pView-EndCreateObj(SDRCREATE_FORCEEND);
 bReturn = sal_True;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 basebmp/source/bitmapdevice.cxx |   13 +++--
 vcl/source/gdi/pngread.cxx  |   31 ++-
 2 files changed, 33 insertions(+), 11 deletions(-)

New commits:
commit 77c82b7415c6033230a3d9653a7bd6df6f109729
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 19 17:06:02 2012 +0100

backport chunk sanity test

diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 2cb1447..f860920 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1825,14 +1825,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const 
basegfx::B2IVectorr
 // factor in bottom-up scanline order case
 nScanlineStride *= bTopDown ? 1 : -1;
 
-const std::size_t nMemSize( 
-(nScanlineStride  0 ? -nScanlineStride : 
nScanlineStride)*rSize.getY() );
+const sal_uInt32 nWidth(nScanlineStride  0 ? -nScanlineStride : 
nScanlineStride);
+const sal_uInt32 nHeight(rSize.getY());
+
+if (nHeight  nWidth  nWidth  SAL_MAX_INT32 / nHeight)
+{
+return BitmapDeviceSharedPtr();
+}
+
+const std::size_t nMemSize(nWidth * nHeight);
 
 if( !pMem )
 {
 pMem.reset(
 reinterpret_castsal_uInt8*(rtl_allocateMemory( nMemSize )),
 rtl_freeMemory );
+if (pMem.get() == 0  nMemSize != 0)
+return BitmapDeviceSharedPtr();
 rtl_zeroMemory(pMem.get(),nMemSize);
 }
 
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 1858f76..1f3c955 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -203,6 +203,7 @@ PNGReaderImpl::PNGReaderImpl( SvStream rPNGStream )
 mpScanCurrent  ( NULL ),
 mpColorTable   ( (sal_uInt8*) mpDefaultColorTable ),
 mnPass ( 0 ),
+mbPalette( sal_False ),
 mbzCodecInUse  ( sal_False ),
 mbStatus( sal_True),
 mbIDAT( sal_False ),
@@ -306,7 +307,7 @@ bool PNGReaderImpl::ReadNextChunk()
 nCRC32 = rtl_crc32( nCRC32, rChunkData.aData[ 0 ], mnChunkLen );
 maDataIter = rChunkData.aData.begin();
 }
-sal_uInt32 nCheck;
+sal_uInt32 nCheck(0);
 mrPNGStream  nCheck;
 if( nCRC32 != nCheck )
 return false;
@@ -348,14 +349,23 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size 
rPreviewSizeHint )
 // reset to the first chunk
 maChunkIter = maChunkSeq.begin();
 
-// parse the chunks
+// first chunk must be IDHR
+if( mbStatus  ReadNextChunk() )
+{
+if (mnChunkType == PNGCHUNK_IHDR)
+mbStatus = ImplReadHeader( rPreviewSizeHint );
+else
+mbStatus = false;
+}
+
+// parse the remaining chunks
 while( mbStatus  !mbIDAT  ReadNextChunk() )
 {
 switch( mnChunkType )
 {
 case PNGCHUNK_IHDR :
 {
-mbStatus = ImplReadHeader( rPreviewSizeHint );
+mbStatus = false; //IHDR should only appear as the first chunk
 }
 break;
 
@@ -765,14 +775,17 @@ sal_Bool PNGReaderImpl::ImplReadTransparent()
 {
 if ( mnChunkLen = 256 )
 {
+mbTransparent = true;
 mpTransTab = new sal_uInt8 [ 256 ];
 rtl_fillMemory( mpTransTab, 256, 0xff );
-rtl_copyMemory( mpTransTab, (*maDataIter), mnChunkLen );
-maDataIter += mnChunkLen;
-mbTransparent = true;
-// need alpha transparency if not on/off masking
-for( int i = 0; i  mnChunkLen; ++i )
-   bNeedAlpha |= (mpTransTab[i]!=0x00)  
(mpTransTab[i]!=0xFF);
+if (mnChunkLen  0)
+{
+rtl_copyMemory( mpTransTab, (*maDataIter), mnChunkLen 
);
+maDataIter += mnChunkLen;
+// need alpha transparency if not on/off masking
+for( int i = 0; i  mnChunkLen; ++i )
+   bNeedAlpha |= (mpTransTab[i]!=0x00)  
(mpTransTab[i]!=0xFF);
+}
 }
 }
 break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/Module_sc.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 37536c84ab187b8182c5afff912a82746b08b0a8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Apr 19 17:58:54 2012 +0200

seems there is a difference of one point between clang/gcc in chart test

I need to write a xml diff with configurable tolerance for attributes

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index a40b0d8..b6a42e1 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 JunitTest_sc_complex \
 JunitTest_sc_unoapi \
 CppunitTest_sc_cellrangeobj \
-CppunitTest_sc_chart_regression_test \
 $(if $(filter-out $(OS),IOS), \
CppunitTest_sc_databaserangeobj) \
 CppunitTest_sc_datapilottableobj \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'opengrok' - patches/remote-attribute.diff patches/toadd

 patches/remote-attribute.diff   |   29 +
 patches/toadd/libreoffice/style.css |   15 +++
 2 files changed, 44 insertions(+)

New commits:
commit 35c5c6afcc0a5783d277ad6ba9417f3b9823f7b8
Author: Andrew Higginson at.higgin...@gmail.com
Date:   Thu Apr 19 18:16:20 2012 +0200

Update opengrok wrt fdo#48387

This patch to opengrok adds a 'remote' id the the body tag when
?remote=true is given in the URL (and as a result in CSS, hides some extra
chrome, like the header)

This is useful as it allows us to move closer towards
https://bugs.freedesktop.org/attachment.cgi?id=59591

diff --git a/patches/remote-attribute.diff b/patches/remote-attribute.diff
new file mode 100644
index 000..b1ae393
--- /dev/null
+++ b/patches/remote-attribute.diff
@@ -0,0 +1,29 @@
+--- a/web/search.jsp   2012-04-17 17:18:14.147097100 +0100
 b/web/search.jsp   2012-04-17 17:12:42.679094963 +0100
+@@ -46,11 +46,12 @@
+ org.apache.lucene.queryParser.*
+ %%@ page session=false %%@ page errorPage=error.jsp %%
+ Date starttime = new Date();
+-String q= request.getParameter(q);
+-String defs = request.getParameter(defs);
+-String refs = request.getParameter(refs);
+-String hist = request.getParameter(hist);
+-String path = request.getParameter(path);
++String remote   = request.getParameter(remote);
++String q= request.getParameter(q);
++String defs = request.getParameter(defs);
++String refs = request.getParameter(refs);
++String hist = request.getParameter(hist);
++String path = request.getParameter(path);
+ 
+ %%@ include file=projects.jspf %%
+ String sort = null;
+@@ -266,7 +267,7 @@
+  RuntimeEnvironment environment = RuntimeEnvironment.getInstance();
+  environment.register();
+   %%@ include file=httpheader.jspf %
+-body
++body % if( remote != null  remote.equals(true) ) { % id=remote % } 
% 
+ div id=page
+ div id=header%@ include file=pageheader.jspf %/div
+ div id=Masthead/div
diff --git a/patches/toadd/libreoffice/style.css 
b/patches/toadd/libreoffice/style.css
index 1096dc0..712c0ed 100644
--- a/patches/toadd/libreoffice/style.css
+++ b/patches/toadd/libreoffice/style.css
@@ -215,3 +215,18 @@ strike.d{background-color:#bbddbb; 
margin-right:.2em;padding-left:1em;padding-ri
 
 span.blame { }
 span.blame-hidden { display: none }
+
+
+/* Remote Styles */
+
+body#remote {
+background:transparent !important
+}
+
+body#remote #page {
+width:100% !important
+}
+
+body#remote #header, body#remote #Masthead, body#remote #menu, body#remote 
#Footer {
+display:none !important
+}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 10 commits - bin/get-bugzilla-attachments-by-mimetype oox/source sd/source svtools/qa unusedcode.easy vcl/source

 bin/get-bugzilla-attachments-by-mimetype |   39 ++-
 oox/source/drawingml/customshapeproperties.cxx   |1 
 oox/source/ppt/timenode.cxx  |2 
 sd/source/ui/slidesorter/view/SlsButtonBar.cxx   |1 
 svtools/qa/cppunit/data/gif/fail/CVE-2007-3958-1.gif |binary
 svtools/qa/cppunit/data/gif/pass/CVE-2011-2131-1.gif |binary
 svtools/qa/cppunit/filters-test.cxx  |4 +
 unusedcode.easy  |   11 -
 vcl/source/gdi/outdev3.cxx   |   13 +++---
 9 files changed, 37 insertions(+), 34 deletions(-)

New commits:
commit e0753b7424781d9145af24b653e0a9d5c01a8657
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 19 17:18:03 2012 +0100

WaE: -Werror=reorder

diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index a350c4c..42150b5 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -734,9 +734,9 @@ ButtonBar::BackgroundTheme::BackgroundTheme (
 const ::boost::shared_ptrTheme rpTheme,
 const ::std::vectorSharedButton rButtons)
 : mpTheme(rpTheme),
+  meIconSize( Button::IconSize_Large ),
   maButtonArea(),
   maBackgroundLocation(),
-  meIconSize(IconSize_Large),
   mePosition( BOTTOM )
 {
 UpdateMinimumIconSizes(rButtons);
commit 64a111d6846ee6a06a0e9cbdec98e49b9cf3de6a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 19 16:21:20 2012 +0100

rearrange order

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index c92a611..c98edd7 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -348,25 +348,25 @@ common_noncore_mimetypes = [
 ]
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(novell, mimetype, novell, extension)
+get_through_rss_query(freedesktop, mimetype, fdo, extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(kde, mimetype, kde, extension)
+get_through_rpc_query(redhatrpc, redhatbug, mimetype, rhbz, extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(gnome, mimetype, gnome, extension)
+get_through_rss_query(openoffice, mimetype, ooo, extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(abisource, mimetype, abi, extension)
+get_through_rss_query(novell, mimetype, novell, extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(freedesktop, mimetype, fdo, extension)
+get_through_rss_query(gnome, mimetype, gnome, extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rpc_query(redhatrpc, redhatbug, mimetype, rhbz, extension)
+get_through_rss_query(abisource, mimetype, abi, extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(openoffice, mimetype, ooo, extension)
+get_through_rss_query(kde, mimetype, kde, extension)
 
 try:
 get_launchpad_bugs(lp)
commit 3f62c7adfd7bc400021ba2c203b6a66982b01c3d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 19 10:51:10 2012 +0100

valgrind: Conditional jump or move depends on uninitialised value

diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 0304f25..a350c4c 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -736,6 +736,7 @@ ButtonBar::BackgroundTheme::BackgroundTheme (
 : mpTheme(rpTheme),
   maButtonArea(),
   maBackgroundLocation(),
+  meIconSize(IconSize_Large),
   mePosition( BOTTOM )
 {
 UpdateMinimumIconSizes(rButtons);
commit 293cfcdfbc20d1d2b2b56e2283f84678a102186b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 19 10:07:51 2012 +0100

valgrind: Conditional jump or move depends on uninitialised value

diff --git a/oox/source/drawingml/customshapeproperties.cxx 
b/oox/source/drawingml/customshapeproperties.cxx
index 90c0027..4271897 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -56,6 +56,7 @@ CustomShapeProperties::CustomShapeProperties()
 : mnShapePresetType ( -1 )
 , mbMirroredX   ( sal_False )
 , mbMirroredY   ( sal_False )
+, mnTextRotateAngle ( 0 )
 , mnArcNum ( 0 )
 {
 }
commit 6066637320d38700f0ac05f090494d424942932c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 19 09:01:05 2012 +0100

we're more interested in getting emf/wmf samples than pdf

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index bad7a54..c92a611 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -287,7 +287,6 @@ mimetypes = {

[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc

 binfilter/bf_svtools/source/memtools/tl_contnr.cxx |   26 -
 binfilter/inc/bf_tools/contnr.hxx  |2 -
 2 files changed, 28 deletions(-)

New commits:
commit baa2838ed4a0d1a9dd4b2ff88e5e033a37bf31cd
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 19 17:29:48 2012 +0100

callcatcher: strip Container down

diff --git a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx 
b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
index e548d00..2719d61 100644
--- a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
@@ -788,17 +788,6 @@ void Container::ImpInsert( void* p, CBlock* pBlock, 
sal_uInt16 nIndex )
 |*
 */
 
-void Container::Insert( void* p )
-{
-ImpInsert( p, pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Insert()
-|*
-*/
-
 void Container::Insert( void* p, sal_uIntPtr nIndex )
 {
 if ( nCount = nIndex )
@@ -903,21 +892,6 @@ void* Container::ImpRemove( CBlock* pBlock, sal_uInt16 
nIndex )
 |*
 */
 
-void* Container::Remove()
-{
-// Wenn kein Item vorhanden ist, NULL zurueckgeben
-if ( !nCount )
-return NULL;
-else
-return ImpRemove( pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Remove()
-|*
-*/
-
 void* Container::Remove( sal_uIntPtr nIndex )
 {
 // Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
diff --git a/binfilter/inc/bf_tools/contnr.hxx 
b/binfilter/inc/bf_tools/contnr.hxx
index 6d7e70f..9267e5e 100644
--- a/binfilter/inc/bf_tools/contnr.hxx
+++ b/binfilter/inc/bf_tools/contnr.hxx
@@ -79,10 +79,8 @@ public:
 Container( const Container rContainer );
 ~Container();
 
-voidInsert( void* p );
 voidInsert( void* p, sal_uIntPtr nIndex );
 
-void*   Remove();
 void*   Remove( sal_uIntPtr nIndex );
 void*   Remove( void* p )
 { return Remove( GetPos( p ) ); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - basctl/source cui/source svx/source

2012-04-19 Thread Takeshi Abe

 basctl/source/basicide/bastypes.cxx |2 --
 basctl/source/basicide/macrodlg.hxx |2 --
 basctl/source/dlged/propbrw.cxx |5 -
 cui/source/customize/cfgutil.cxx|6 --
 cui/source/dialogs/SpellDialog.cxx  |1 -
 cui/source/dialogs/cuigaldlg.cxx|7 ---
 cui/source/dialogs/cuiimapwnd.cxx   |2 --
 cui/source/dialogs/linkdlg.cxx  |5 -
 cui/source/inc/scriptdlg.hxx|6 --
 svx/source/form/fmPropBrw.cxx   |6 --
 svx/source/form/tabwin.cxx  |6 --
 11 files changed, 48 deletions(-)

New commits:
commit ac7f7b04627c9ee8321b1696fa609d9632763b8b
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Fri Apr 20 01:56:39 2012 +0900

removed unused defines

diff --git a/basctl/source/basicide/macrodlg.hxx 
b/basctl/source/basicide/macrodlg.hxx
index ef4f3bf..ee4ce3e 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -42,8 +42,6 @@
 #define MACRO_OK_RUN11
 #define MACRO_NEW   12
 #define MACRO_EDIT  14
-#define MACRO_ORGANIZE  15
-#define MACRO_ASSIGN16
 
 #define MACROCHOOSER_ALL1
 #define MACROCHOOSER_CHOOSEONLY 2
diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index fe1e39d..200cd39 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -79,7 +79,6 @@ using namespace ::com::sun::star::linguistic2;
 
 using ::rtl::OUString;
 
-#define C2U(cChar)  ::rtl::OUString::createFromAscii(cChar)
 // struct SpellDialog_Impl -
 
 struct SpellDialog_Impl
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index fd80ad3..9c14228 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -73,13 +73,6 @@ using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
 
-
-// ---
-// - Defines -
-// ---
-
-#define MAXPATH 1024
-
 // 
 // - SearchThread -
 // 
diff --git a/cui/source/dialogs/cuiimapwnd.cxx 
b/cui/source/dialogs/cuiimapwnd.cxx
index f04dc99..bdaef5f 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -53,8 +53,6 @@
 
 #include sot/formats.hxx
 
-#define TRANSCOL Color( COL_WHITE )
-
 /*
 |*
 |*  URLDlg
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 11c714a..b61e721 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -53,11 +53,6 @@
 
 #include svl/svstdarr.hxx
 
-#define MAX_FILENAME18
-#define MAX_LINKNAME18
-#define MAX_TYPENAME15
-#define MAX_UPDATENAME  10
-
 #define FILEOBJECT ( OBJECT_CLIENT_FILE  ~OBJECT_CLIENT_SO )
 
 using namespace sfx2;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 394f289..c347063 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -51,12 +51,6 @@
 #define OBJTYPE_SCRIPTCONTAINER 3L
 #define OBJTYPE_SFROOT  4L
 
-#define BROWSEMODE_MODULES  0x01
-#define BROWSEMODE_SUBS 0x02
-#define BROWSEMODE_OBJS 0x04
-#define BROWSEMODE_PROPS0x08
-#define BROWSEMODE_SUBOBJS  0x10
-
 #define INPUTMODE_NEWLIB1
 #define INPUTMODE_NEWMACRO  2
 #define INPUTMODE_RENAME3
commit 3f7c2623633ccce76cb5523d9dc2a268226b34ab
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Fri Apr 20 01:56:13 2012 +0900

removed unused const/static data

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index cde8bdc..eb079eb 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -52,8 +52,6 @@ using ::std::vector;
 
 DBG_NAME( IDEBaseWindow )
 
-const char* pRegName = BasicIDETabBar;
-
 TYPEINIT0( IDEBaseWindow )
 TYPEINIT1( SbxItem, SfxPoolItem );
 
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 4e1f90f..3dddfbc 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -102,12 +102,7 @@ const long STD_WIN_SIZE_Y = 350;
 const long STD_MIN_SIZE_X = 250;
 const long STD_MIN_SIZE_Y = 250;
 
-const long STD_WIN_POS_X = 50;
-const long STD_WIN_POS_Y = 50;
 const long WIN_BORDER = 2;
-const long MIN_WIN_SIZE_X = 50;
-const long MIN_WIN_SIZE_Y = 50;
-
 
 DBG_NAME(PropBrw)
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 932b1fb..bb3e085 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -87,12 +87,6 @@ void SfxStylesInfo_Impl::setModel(const 
::com::sun::star::uno::Reference ::com:
 m_xDoc = xModel;
 }
 
-static ::rtl::OUString FAMILY_CHARACTERSTYLE 
(RTL_CONSTASCII_USTRINGPARAM(CharacterStyles) );
-static ::rtl::OUString

[Libreoffice-commits] .: i18npool/inc i18npool/source svtools/source

 i18npool/inc/i18npool/lang.h|2 ++
 i18npool/source/isolang/isolang.cxx |2 ++
 svtools/source/misc/langtab.src |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 46f64f062319aff17e97ce7af9825a352b01d4e4
Author: Eike Rathke er...@redhat.com
Date:   Thu Apr 19 19:13:16 2012 +0200

fdo#48917 added Eryza [myv-RU] and Meadow Mari [mhr-RU] to language list

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 4fb9eca..311db27 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -542,6 +542,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_KOMI_PERMYAK  0x066A
 #define LANGUAGE_USER_PITJANTJATJARA0x066B
 #define LANGUAGE_USER_ENGLISH_MALAWI0x8809  /* makeLangID( 0x22, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_ERYZA 0x066C
+#define LANGUAGE_USER_MARI_MEADOW   0x066D
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
 
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index 9586b7b..c24df3b 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -487,6 +487,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_KOMI_ZYRIAN,   kpv, RU },
 { LANGUAGE_USER_KOMI_PERMYAK,  koi, RU },
 { LANGUAGE_USER_PITJANTJATJARA,pjt, AU },
+{ LANGUAGE_USER_ERYZA, myv, RU },
+{ LANGUAGE_USER_MARI_MEADOW,   mhr, RU },
 { LANGUAGE_NONE,   zxx,},   // added to ISO 
639-2 on 2006-01-11: Used to declare the absence of linguistic information
 { LANGUAGE_DONTKNOW,,  }// marks end of 
table
 };
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index d279475..b1d83de 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -348,6 +348,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Komi-Permyak ; LANGUAGE_USER_KOMI_PERMYAK ;  ;
  Pitjantjatjara ; LANGUAGE_USER_PITJANTJATJARA ;  ;
  English (Malawi) ; LANGUAGE_USER_ENGLISH_MALAWI ;  ;
+ Eryza ; LANGUAGE_USER_ERYZA ;  ;
+ Mari, Meadow ; LANGUAGE_USER_MARI_MEADOW ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - Module_tail_build.mk postprocess/prj solenv/gbuild tail_build/prj

 Module_tail_build.mk |1 +
 postprocess/prj/build.lst|2 +-
 solenv/gbuild/UnoApiTarget.mk|4 ++--
 solenv/gbuild/platform/macosx.mk |3 +--
 tail_build/prj/build.lst |2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9da0670b601c8c186b0bfbd28ea055016db376ad
Author: David Tardon dtar...@redhat.com
Date:   Thu Apr 19 19:27:19 2012 +0200

extension libs should have no RPATH

At least that is how it seems to work in the old build system:
LINFLAGSRUNPATH_OXT in solenv/inc/unxmacx.mk is empty, just like for
other platforms . On the other side, macosx-change-install-names.pl only
lists OXT in combination with URELIB... Now choose :-)

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 2ab1336..ab955cf 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -162,8 +162,7 @@ gb_LinkTarget__RPATHS := \
 
 # $(call gb_LinkTarget__get_installname,libfilename,soversion,layerprefix)
 define gb_LinkTarget__get_installname
-$(if $(3),-install_name '$(3)$(1)$(if $(2),.$(2))',
-   $(call gb_Output_error,cannot determine -install_name for $(3)))
+$(if $(3),-install_name '$(3)$(1)$(if $(2),.$(2))')
 endef
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
commit ab6e1860ba5d41b992b9695121b5a311f2cab3b3
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 16 06:22:48 2012 +0200

change announce

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 64ed831..8bc5b1f 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -109,7 +109,7 @@ $(call 
gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -
 endef
 
 define gb_UnoApiTarget__command
-$(call gb_Output_announce,$*,$(true),RDB,3)
+$(call gb_Output_announce,$*,$(true),UNO,4)
 mkdir -p $(dir $(1))  \
 $(if $(UNOAPI_FILES),\
$(call 
gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)),\
@@ -139,7 +139,7 @@ $(call gb_UnoApiTarget_get_target,%):
 
 .PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
 $(call gb_UnoApiTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(false),RDB,3)
+   $(call gb_Output_announce,$*,$(false),UNO,4)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiTarget_get_target,$*))
-rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \
commit dc4911f6cd08ee813c8172cfe3fa928dbf498755
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 16:07:25 2012 +0200

move unodevtools to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index a19f71c..cb000ca 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 toolkit \
 ucb \
 UnoControls \
+unodevtools \
 unoxml \
 uui \
 vbahelper \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 745c251..2521262 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk 
DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries 
PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport 
REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc 
NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
+po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk 
DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries 
PYUNO:pyuno JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder 
LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 
tail_build NULL
 po postprocess usr1-   all 
po_mkout NULL
 po postprocess\checkxmlnmake   -   all po_checkxml NULL
 po postprocess\packconfig  nmake   -   all po_packconfig 
po_checkxml NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 9d02e0c..a7c399a 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig 
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis 
LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt 
LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve 
MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python 
REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain 
VIGRA:vigra X11_EXTENSIONS:x11_extensions

[Libreoffice-commits] .: 2 commits - i18npool/source writerperfect/Library_wpftdraw.mk writerperfect/source

 i18npool/source/transliteration/transliterationImpl.cxx |   46 ---
 writerperfect/Library_wpftdraw.mk   |1 
 writerperfect/source/draw/CDRImportFilter.cxx   |9 -
 writerperfect/source/draw/CDRImportFilter.hxx   |9 -
 writerperfect/source/draw/CMXImportFilter.cxx   |9 -
 writerperfect/source/draw/CMXImportFilter.hxx   |9 -
 writerperfect/source/draw/VisioImportFilter.cxx |9 -
 writerperfect/source/draw/VisioImportFilter.hxx |9 -
 writerperfect/source/draw/WPGImportFilter.cxx   |9 -
 writerperfect/source/draw/WPGImportFilter.hxx   |9 -
 writerperfect/source/draw/wpftdraw_genericfilter.cxx|   97 
 11 files changed, 69 insertions(+), 147 deletions(-)

New commits:
commit 8e16c9fa498e61b00724cb44cb4470627014fc27
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Apr 19 20:54:13 2012 +0200

Cleaned up wpftdraw_component_getFactory

...which required switching service implementations from 
XMultiServiceManager-
based to XComponentContext-based (using comphelper::ComponentContext 
convenience
helper for the occasional service instantiation via the XComponentContext).

diff --git a/writerperfect/Library_wpftdraw.mk 
b/writerperfect/Library_wpftdraw.mk
index e4c3b51..15c1492 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_api,wpftdraw,\
 ))
 
 $(eval $(call gb_Library_use_libraries,wpftdraw,\
+   comphelper \
cppu \
cppuhelper \
sal \
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx 
b/writerperfect/source/draw/CDRImportFilter.cxx
index 2476a55..7a2538b 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -33,7 +33,6 @@
 #include osl/diagnose.h
 #include rtl/tencinfo.h
 
-#include com/sun/star/lang/XMultiServiceFactory.hpp
 #include com/sun/star/io/XInputStream.hpp
 #include com/sun/star/xml/sax/XAttributeList.hpp
 #include com/sun/star/xml/sax/XDocumentHandler.hpp
@@ -42,6 +41,7 @@
 #include com/sun/star/io/XSeekable.hpp
 #include com/sun/star/uno/Reference.h
 
+#include comphelper/componentcontext.hxx
 #include xmloff/attrlist.hxx
 
 #include libcdr/libcdr.h
@@ -67,7 +67,6 @@ using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Exception;
 using com::sun::star::uno::RuntimeException;
-using com::sun::star::lang::XMultiServiceFactory;
 using com::sun::star::beans::PropertyValue;
 using com::sun::star::document::XFilter;
 using com::sun::star::document::XExtendedFilterDetection;
@@ -107,7 +106,7 @@ throw (RuntimeException)
 
 // An XML import service: what we push sax messages to..
 OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( 
com.sun.star.comp.Draw.XMLOasisImporter ) );
-Reference  XDocumentHandler  xInternalHandler( mxMSF-createInstance( 
sXMLImportService ), UNO_QUERY );
+Reference  XDocumentHandler  xInternalHandler( 
comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), 
UNO_QUERY );
 
 // The XImporter sets up an empty target document for XDocumentHandler to 
write to..
 Reference  XImporter  xImporter(xInternalHandler, UNO_QUERY);
@@ -238,13 +237,13 @@ throw (RuntimeException)
 #undef SERVICE_NAME2
 #undef SERVICE_NAME1
 
-Reference XInterface  SAL_CALL CDRImportFilter_createInstance( const 
Reference XMultiServiceFactory   rSMgr)
+Reference XInterface  SAL_CALL CDRImportFilter_createInstance( const 
Reference XComponentContext   rContext)
 throw( Exception )
 {
 #ifdef DEBUG
 std::cerr  CDRImportFilter_createInstance  std::endl;
 #endif
-return (cppu::OWeakObject *) new CDRImportFilter( rSMgr );
+return (cppu::OWeakObject *) new CDRImportFilter( rContext );
 }
 
 // XServiceInfo
diff --git a/writerperfect/source/draw/CDRImportFilter.hxx 
b/writerperfect/source/draw/CDRImportFilter.hxx
index 56f124e..9dbb945 100644
--- a/writerperfect/source/draw/CDRImportFilter.hxx
+++ b/writerperfect/source/draw/CDRImportFilter.hxx
@@ -35,6 +35,7 @@
 #include com/sun/star/document/XExtendedFilterDetection.hpp
 #include com/sun/star/lang/XInitialization.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/uno/XComponentContext.hpp
 #include com/sun/star/xml/sax/XDocumentHandler.hpp
 #include cppuhelper/implbase5.hxx
 
@@ -54,14 +55,14 @@ class CDRImportFilter : public cppu::WeakImplHelper5
 {
 protected:
 // oo.org declares
-::com::sun::star::uno::Reference 
::com::sun::star::lang::XMultiServiceFactory  mxMSF;
+::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext 
 mxContext;
 ::com::sun::star::uno::Reference ::com::sun::star::lang::XComponent  
mxDoc;
 ::rtl::OUString msFilterName;
 ::com::sun::star::uno::Reference 
::com::sun::star::xml::sax::XDocumentHandler  mxHandler;
 
 public:

[Libreoffice-commits] .: sal/osl

 sal/osl/unx/mutex.c |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit d34daf7462fdf4f885fe3bb8fb7704a2ad73acfa
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Apr 19 21:45:47 2012 +0200

Removed obsolete comment

diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index f10244d..c784113 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -40,13 +40,6 @@ int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
 #define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
 #endif
 
-/*
-Implementation notes:
-oslMutex hides a pointer to the oslMutexImpl structure, which
-ist needed to manage recursive locks on a mutex.
-
-*/
-
 typedef struct _oslMutexImpl
 {
 pthread_mutex_t mutex;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/osl

2012-04-19 Thread Arnaud Versini

 sal/osl/unx/mutex.c |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 96a29fa1900a43d2a7d44eca2704f2164052d8dd
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Thu Apr 19 22:14:10 2012 +0200

Remove unnecessary hack on Linux by using pthread_mutexattr_settype

diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index c784113..0f64104 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -34,12 +34,6 @@
 #include pthread.h
 #include stdlib.h
 
-#if defined LINUX /* bad hack */
-int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
-#define pthread_mutexattr_settype pthread_mutexattr_setkind_np
-#define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
-#endif
-
 typedef struct _oslMutexImpl
 {
 pthread_mutex_t mutex;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - i18npool/inc i18npool/source vcl/source

 i18npool/inc/transliterationImpl.hxx|9 -
 i18npool/source/transliteration/transliterationImpl.cxx |   17 --
 vcl/source/gdi/pngread.cxx  |   27 +++-
 3 files changed, 33 insertions(+), 20 deletions(-)

New commits:
commit 791687613a66c13ee9f5f12b9859bc4ed0eff67e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 19 21:16:25 2012 +0100

remove static objects from static_initialization_and_destruction chain

diff --git a/i18npool/inc/transliterationImpl.hxx 
b/i18npool/inc/transliterationImpl.hxx
index 94fba96..cb06d0e 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -126,15 +126,6 @@ private:
 com::sun::star::uno::Reference XLocaleData  localedata;
 com::sun::star::uno::Reference 
com::sun::star::i18n::XExtendedTransliteration  caseignore;
 
-/** structure to cache the last transliteration body used. */
-struct TransBody
-{
-::osl::Mutex mutex;
-::rtl::OUString Name;
-::com::sun::star::uno::Reference 
::com::sun::star::i18n::XExtendedTransliteration  Body;
-};
-static TransBody lastTransBody;
-
 virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString implName,
 
com::sun::star::uno::Referencecom::sun::star::i18n::XExtendedTransliteration 
 body, const com::sun::star::lang::Locale rLocale)
 throw(com::sun::star::uno::RuntimeException);
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx 
b/i18npool/source/transliteration/transliterationImpl.cxx
index 5e9f621..009f6e3 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -34,6 +34,7 @@
 #include com/sun/star/lang/XComponent.hpp
 
 #include comphelper/processfactory.hxx
+#include rtl/instance.hxx
 #include rtl/string.h
 #include rtl/ustring.hxx
 #include rtl/ustrbuf.hxx
@@ -143,8 +144,6 @@ static struct TMlist {
   {(TransliterationModules)0, (TransliterationModulesNew)0,  NULL}
 };
 
-TransliterationImpl::TransBody TransliterationImpl::lastTransBody;
-
 // Constructor/Destructor
 TransliterationImpl::TransliterationImpl(const Reference 
XMultiServiceFactory xMSF) : xSMgr(xMSF)
 {
@@ -587,11 +586,23 @@ TransliterationImpl::clear()
 caseignoreOnly = sal_True;
 }
 
+namespace
+{
+/** structure to cache the last transliteration body used. */
+struct TransBody
+{
+::rtl::OUString Name;
+::com::sun::star::uno::Reference 
::com::sun::star::i18n::XExtendedTransliteration  Body;
+};
+class theTransBodyMutex : public rtl::Staticosl::Mutex, 
theTransBodyMutex {};
+}
+
 void TransliterationImpl::loadBody( OUString implName, 
ReferenceXExtendedTransliteration body )
 throw (RuntimeException)
 {
 assert(!implName.isEmpty());
-::osl::MutexGuard guard(lastTransBody.mutex);
+::osl::MutexGuard guard(theTransBodyMutex::get());
+static TransBody lastTransBody;
 if (implName != lastTransBody.Name)
 {
 lastTransBody.Body.set(
commit 88e0fa4aa3bea9ffeee372b6a428ca62cee41203
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 19 20:46:59 2012 +0100

fail earlier on oversized images

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index d279c01..81b9280 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -613,14 +613,6 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size 
rPreviewSizeHint )
 
 mnScansize = static_cast sal_uInt32 ( nScansize64 );
 
-// TODO: switch between both scanlines instead of copying
-mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ];
-mpScanCurrent = mpInflateInBuf;
-mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ];
-
-if ( !mpInflateInBuf || !mpScanPrior )
-return sal_False;
-
 // calculate target size from original size and the preview hint
 if( rPreviewSizeHint.Width() || rPreviewSizeHint.Height() )
 {
@@ -655,6 +647,25 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size 
rPreviewSizeHint )
 maTargetSize.Width()  = (maOrigSize.Width() + mnPreviewMask)  
mnPreviewShift;
 maTargetSize.Height() = (maOrigSize.Height() + mnPreviewMask)  
mnPreviewShift;
 
+//round bits up to nearest multiple of 8 and divide by 8 to get num of 
bytes per pixel
+int nBytesPerPixel = ((mnTargetDepth + 7)  ~7)/8;
+
+//stupidly big, forget about it
+if (maTargetSize.Width() = SAL_MAX_INT32 / nBytesPerPixel / 
maTargetSize.Height())
+{
+SAL_WARN( vcl, overlarge png dimensions:  
+maTargetSize.Width()   x   maTargetSize.Height()   depth: 
  mnTargetDepth);
+return sal_False;
+}
+
+// TODO: switch between both scanlines instead of copying
+mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ];
+mpScanCurrent = mpInflateInBuf;
+mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ];
+
+if (

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

 sc/inc/compiler.hxx  |7 ++
 sc/inc/rangenam.hxx  |2 -
 sc/source/core/data/table1.cxx   |8 ---
 sc/source/core/tool/compiler.cxx |   43 ---
 sc/source/core/tool/rangenam.cxx |2 -
 5 files changed, 32 insertions(+), 30 deletions(-)

New commits:
commit 409f11ae387c859dcf9275c08093649a676e1f9e
Author: Eike Rathke er...@redhat.com
Date:   Thu Apr 19 23:26:16 2012 +0200

fdo#48856 update sheet-local named expressions correctly

* Named expression must be updated before any formulas that would access 
them.
* Handle all ocName tokens differentiating between global and sheet-local
  names.

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index b83448b..58a3c6c 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -364,6 +364,13 @@ private:
 
 void SetRelNameReference();
 
+/** Obtain range data for ocName token, global or sheet local.
+
+Prerequisite: rToken is a FormulaIndexToken so IsGlobal() and
+GetIndex() can be called on it. We don't check with RTTI.
+ */
+ScRangeData* GetRangeData( const formula::FormulaToken pToken ) const;
+
 static void InitCharClassEnglish();
 
 public:
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 2e3c007..dfb7d9e 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -201,7 +201,7 @@ public:
 SC_DLLPUBLIC const ScRangeData* findByRange(const ScRange rRange) const;
 SC_DLLPUBLIC ScRangeData* findByUpperName(const rtl::OUString rName);
 SC_DLLPUBLIC const ScRangeData* findByUpperName(const rtl::OUString 
rName) const;
-SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i);
+SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i) const;
 void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange rRange,
  SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bLocal = 
false);
 void UpdateTabRef(SCTAB nTable, sal_uInt16 nFlag, SCTAB nNewTable = 0, 
SCTAB nNewSheets = 1);
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index acf5205..40cc82c 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1372,16 +1372,18 @@ void ScTable::UpdateReference( UpdateRefMode 
eUpdateRefMode, SCCOL nCol1, SCROW
 i = 0;
 iMax = MAXCOL;
 }
-for ( ; i=iMax; i++)
-bUpdated |= aCol[i].UpdateReference(
-eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, 
nDy, nDz, pUndoDoc );
 
+// Named expressions need to be updated before formulas acessing them.
 if (mpRangeName)
 {
 ScRange aRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );;
 mpRangeName-UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz, 
true );
 }
 
+for ( ; i=iMax; i++)
+bUpdated |= aCol[i].UpdateReference(
+eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, 
nDy, nDz, pUndoDoc );
+
 if ( bIncludeDraw )
 UpdateDrawRef( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, 
nTab2, nDx, nDy, nDz, bUpdateNoteCaptionPos );
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index be051c9..a46bd00 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3978,22 +3978,27 @@ ScTokenArray* ScCompiler::CompileString( const String 
rFormula, const String r
 }
 
 
-bool ScCompiler::HandleRange()
+ScRangeData* ScCompiler::GetRangeData( const FormulaToken rToken ) const
 {
 ScRangeData* pRangeData = NULL;
-
-bool bGlobal = pToken-IsGlobal();
+bool bGlobal = rToken.IsGlobal();
 if (bGlobal)
 // global named range.
-pRangeData = pDoc-GetRangeName()-findByIndex( pToken-GetIndex() );
+pRangeData = pDoc-GetRangeName()-findByIndex( rToken.GetIndex());
 else
 {
 // sheet local named range.
-ScRangeName* pRN = pDoc-GetRangeName(aPos.Tab());
+const ScRangeName* pRN = pDoc-GetRangeName( aPos.Tab());
 if (pRN)
-pRangeData = pRN-findByIndex( pToken-GetIndex() );
+pRangeData = pRN-findByIndex( rToken.GetIndex());
 }
+return pRangeData;
+}
+
 
+bool ScCompiler::HandleRange()
+{
+const ScRangeData* pRangeData = GetRangeData( *pToken);
 if (pRangeData)
 {
 sal_uInt16 nErr = pRangeData-GetErrCode();
@@ -4118,7 +4123,7 @@ bool ScCompiler::HasModifiedRange()
 OpCode eOpCode = t-GetOpCode();
 if ( eOpCode == ocName )
 {
-ScRangeData* pRangeData = 
pDoc-GetRangeName()-findByIndex(t-GetIndex());
+const ScRangeData* pRangeData = GetRangeData( *t);
 if (pRangeData  pRangeData-IsModified())
 return true;
 }
@@ -4239,7 +4244,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode 
eUpdateRefMode,
 {
 if( j-GetOpCode() == ocName )
 {
-ScRangeData* pName =

[Libreoffice-commits] .: sal/osl

2012-04-19 Thread Arnaud Versini

 sal/osl/unx/mutex.c |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 2bf32c53740313afe473056e55a953b23433e25d
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Thu Apr 19 23:35:24 2012 +0200

Revert Remove unnecessary hack on Linux by using pthread_mutexattr_settype

Build error on tinderboxes.

diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index 0f64104..c784113 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -34,6 +34,12 @@
 #include pthread.h
 #include stdlib.h
 
+#if defined LINUX /* bad hack */
+int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
+#define pthread_mutexattr_settype pthread_mutexattr_setkind_np
+#define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
+#endif
+
 typedef struct _oslMutexImpl
 {
 pthread_mutex_t mutex;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/inc/compiler.hxx  |9 ++-
 sc/inc/rangenam.hxx  |6 ++--
 sc/source/core/data/table1.cxx   |   10 ---
 sc/source/core/tool/compiler.cxx |   50 +++
 sc/source/core/tool/rangenam.cxx |   10 +++
 5 files changed, 42 insertions(+), 43 deletions(-)

New commits:
commit 9a9121929408e8ffc86b91606355ff5fe9514f7d
Author: Eike Rathke er...@redhat.com
Date:   Fri Apr 20 00:20:29 2012 +0200

resolved fdo#48856 update sheet-local named expressions correctly

This combines from master:

44481da569df85aa91455fdc2892a4e0c5818e6c
Author: Markus Mohrhard markus.mohrh...@googlemail.com

update relative local range names, fdo#48856

Signed-off-by: Eike Rathke er...@redhat.com


409f11ae387c859dcf9275c08093649a676e1f9e
Author: Eike Rathke er...@redhat.com

fdo#48856 update sheet-local named expressions correctly

* Named expression must be updated before any formulas that would access 
them.
* Handle all ocName tokens differentiating between global and sheet-local
  names.

Signed-off-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 371192c..765187e 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -364,6 +364,13 @@ private:
 
 void SetRelNameReference();
 
+/** Obtain range data for ocName token, global or sheet local.
+
+Prerequisite: rToken is a FormulaIndexToken so IsGlobal() and
+GetIndex() can be called on it. We don't check with RTTI.
+ */
+ScRangeData* GetRangeData( const formula::FormulaToken pToken ) const;
+
 static void InitCharClassEnglish();
 
 public:
@@ -442,7 +449,7 @@ public:
 bool UpdateNameReference( UpdateRefMode eUpdateRefMode,
   const ScRange,
   SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-  bool rChanged, bool bSharedFormula = false);
+  bool rChanged, bool bSharedFormula = false, 
bool bLocal = false);
 
 ScRangeData* UpdateReference( UpdateRefMode eUpdateRefMode,
   const ScAddress rOldPos, const ScRange,
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 53e9ec8..e2bf10b 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -140,7 +140,7 @@ public:
 const formula::FormulaGrammar::Grammar 
eGrammar = formula::FormulaGrammar::GRAM_DEFAULT );
 voidUpdateReference( UpdateRefMode eUpdateRefMode,
  const ScRange r,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bLocal = 
false );
 boolIsModified() const  { return bModified; }
 
 SC_DLLPUBLIC void   GuessPosition();
@@ -203,9 +203,9 @@ public:
 SC_DLLPUBLIC const ScRangeData* findByRange(const ScRange rRange) const;
 SC_DLLPUBLIC ScRangeData* findByUpperName(const rtl::OUString rName);
 SC_DLLPUBLIC const ScRangeData* findByUpperName(const rtl::OUString 
rName) const;
-SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i);
+SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i) const;
 void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange rRange,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz);
+ SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bLocal = 
false);
 void UpdateTabRef(SCTAB nTable, sal_uInt16 nFlag, SCTAB nNewTable = 0, 
SCTAB nNewSheets = 1);
 void UpdateTranspose(const ScRange rSource, const ScAddress rDest);
 void UpdateGrow(const ScRange rArea, SCCOL nGrowX, SCROW nGrowY);
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 31c3f46..76f371b 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1317,16 +1317,18 @@ void ScTable::UpdateReference( UpdateRefMode 
eUpdateRefMode, SCCOL nCol1, SCROW
 i = 0;
 iMax = MAXCOL;
 }
-for ( ; i=iMax; i++)
-bUpdated |= aCol[i].UpdateReference(
-eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, 
nDy, nDz, pUndoDoc );
 
+// Named expressions need to be updated before formulas acessing them.
 if (mpRangeName)
 {
 ScRange aRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );;
-mpRangeName-UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz );
+mpRangeName-UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz, 
true );
 }
 
+for ( ; i=iMax; i++)
+bUpdated |= aCol[i].UpdateReference(
+eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, 
nDy, nDz, pUndoDoc );
+
 if ( bIncludeDraw )
 UpdateDrawRef( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, 
nTab2, nDx, nDy, nDz, bUpdateNoteCaptionPos

[Libreoffice-commits] .: 3 commits - editeng/source

2012-04-19 Thread Kohei Yoshida

 editeng/source/editeng/eehtml.hxx   |3 +++
 editeng/source/editeng/eertfpar.hxx |4 
 editeng/source/editeng/impedit.hxx  |6 +++---
 editeng/source/editeng/impedit2.cxx |   26 +-
 editeng/source/editeng/impedit4.cxx |5 ++---
 5 files changed, 25 insertions(+), 19 deletions(-)

New commits:
commit 4327d4973b572ed749803007d90574919da31f04
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Apr 19 15:59:45 2012 -0400

Revert Use boost::scoped_ptr for this.

This reverts commit a4bc804627b8b21506e9b86fa54d2f7d2525e43e.

diff --git a/editeng/source/editeng/eertfpar.hxx 
b/editeng/source/editeng/eertfpar.hxx
index 5b69074..df27f20 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -120,6 +120,10 @@ public:
 EditPaM GetCurPaM() const   { return aCurSel.Max(); }
 };
 
+SV_DECL_REF( EditRTFParser )
+SV_IMPL_REF( EditRTFParser );
+
+
 #endif  //_EERTFPAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/impedit4.cxx 
b/editeng/source/editeng/impedit4.cxx
index b142a98..7316d7e 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -86,7 +86,6 @@
 #include editeng/edtdlg.hxx
 
 #include vector
-#include boost/scoped_ptr.hpp
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -179,7 +178,7 @@ EditPaM ImpEditEngine::ReadRTF( SvStream rInput, 
EditSelection aSel )
 DBG_ASSERT(pPool  
pPool-GetName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EditEngineItemPool)),
 ReadRTF: no EditEnginePool!);
 
-boost::scoped_ptrEditRTFParser xPrsr(new EditRTFParser(rInput, aSel, 
*pPool, pEditEngine));
+EditRTFParserRef xPrsr = new EditRTFParser(rInput, aSel, *pPool, 
pEditEngine);
 SvParserState eState = xPrsr-CallParser();
 if ( ( eState != SVPAR_ACCEPTED )  ( !rInput.GetError() ) )
 {
commit 81a1386656622ddb7c453e473f559103ea1f9fd9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Apr 19 15:59:08 2012 -0400

Revert Let's use boost::scoped_ptr for this.

This reverts commit e1520a9d6a9f9bcfcaa332d54892040fe54776c2.

diff --git a/editeng/source/editeng/eehtml.hxx 
b/editeng/source/editeng/eehtml.hxx
index c74f91e..71f61c8 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -92,6 +92,9 @@ public:
 const EditSelectionGetCurSelection() const { return aCurSel; }
 };
 
+SV_DECL_REF( EditHTMLParser )
+SV_IMPL_REF( EditHTMLParser );
+
 #endif // _EEHTML_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/impedit4.cxx 
b/editeng/source/editeng/impedit4.cxx
index 89dce47..b142a98 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -194,7 +194,7 @@ EditPaM ImpEditEngine::ReadHTML( SvStream rInput, const 
String rBaseURL, EditS
 if ( aSel.HasRange() )
 aSel = ImpDeleteSelection( aSel );
 
-boost::scoped_ptrEditHTMLParser xPrsr(new EditHTMLParser(rInput, 
rBaseURL, pHTTPHeaderAttrs));
+EditHTMLParserRef xPrsr = new EditHTMLParser( rInput, rBaseURL, 
pHTTPHeaderAttrs );
 SvParserState eState = xPrsr-CallParser(pEditEngine, aSel.Max());
 if ( ( eState != SVPAR_ACCEPTED )  ( !rInput.GetError() ) )
 {
commit 3fdd8667d8876a6661f1c900116e6d4681f43334
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Apr 18 16:14:39 2012 -0400

Pass const reference.

diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 4edfee5..a662dab 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -551,11 +551,11 @@ private:
 voidImpBreakLine( ParaPortion* pParaPortion, EditLine* 
pLine, TextPortion* pPortion, sal_uInt16 nPortionStart, long nRemainingWidth, 
sal_Bool bCanHyphenate );
 voidImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* 
pLine, long nRemainingSpace );
 EditPaM ImpConnectParagraphs( ContentNode* pLeft, ContentNode* 
pRight, sal_Bool bBackward = sal_False );
-EditPaM ImpDeleteSelection( EditSelection aEditSelection);
+EditPaM ImpDeleteSelection(const EditSelection rCurSel);
 EditPaM ImpInsertParaBreak( EditPaM rPaM, bool 
bKeepEndingAttribs = true );
 EditPaM ImpInsertParaBreak( const EditSelection 
rEditSelection, bool bKeepEndingAttribs = true );
 EditPaM ImpInsertText(const EditSelection aCurEditSelection, 
const String rStr);
-EditPaM ImpInsertFeature( EditSelection aEditSelection, const 
SfxPoolItem rItem );
+EditPaM ImpInsertFeature(const EditSelection rCurSel, const 
SfxPoolItem rItem);
 voidImpRemoveChars( const EditPaM rPaM, sal_uInt16 
nChars, EditUndoRemoveChars* pCurUndo = 0 );
 voidImpRemoveParagraph(

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

 sc/source/filter/excel/xecontent.cxx |   19 +++
 sc/source/filter/excel/xeroot.cxx|6 ++
 sc/source/filter/excel/xestyle.cxx   |   26 ++
 3 files changed, 43 insertions(+), 8 deletions(-)

New commits:
commit 503c8fdb1705f0b91e5181b250a6dc94e94e835d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Apr 20 02:28:55 2012 +0200

export font information into dxf

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index ca608ca..c73a08b 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -28,12 +28,14 @@
 
 #include xestyle.hxx
 
+#include iostream
 #include algorithm
 #include iterator
 #include set
 #include com/sun/star/i18n/ScriptType.hpp
 #include vcl/font.hxx
 #include svl/zformat.hxx
+#include svl/itempool.hxx
 #include svl/languageoptions.hxx
 #include sfx2/printer.hxx
 #include scitems.hxx
@@ -2878,9 +2880,16 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot rRoot )
 delete pCellArea;
 pCellArea = NULL;
 }
-//XclExpFont* pFont = new XclExpFont( GetRoot(), 
XclFontData( rFont ), EXC_COLOR_CELLTEXT );
 
-maDxf.push_back(new XclExpDxf( rRoot, pAlign, pBorder, 
NULL, NULL, pCellProt, pCellArea ));
+XclExpFont* pFont = NULL;
+// check if non default font is set and only export then
+if (rSet.GetItemState(rSet.GetPool()-GetWhich( 
SID_ATTR_CHAR_FONT ))SFX_ITEM_DEFAULT )
+{
+Font aFont = XclExpFontHelper::GetFontFromItemSet( 
GetRoot(), rSet, com::sun::star::i18n::ScriptType::WEAK );
+pFont = new XclExpFont( GetRoot(), XclFontData( aFont 
), EXC_COLOR_CELLTEXT );
+}
+
+maDxf.push_back(new XclExpDxf( rRoot, pAlign, pBorder, 
pFont, NULL, pCellProt, pCellArea ));
 ++nIndex;
 }
 
commit e878c9bba31386cbdb9caca3cbc588a25dc1ae1e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Apr 20 00:12:20 2012 +0200

allow more complex conditional formats being exported to xlsx

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index 3deb48a..8dfe1cb 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -783,7 +783,7 @@ void XclExpCFImpl::WriteBody( XclExpStream rStrm )
 
 namespace {
 
-const char* GetOperatorString(ScConditionMode eMode)
+const char* GetOperatorString(ScConditionMode eMode, bool bFrmla2)
 {
 switch(eMode)
 {
@@ -800,8 +800,10 @@ const char* GetOperatorString(ScConditionMode eMode)
 case SC_COND_NOTEQUAL:
 return notEqual;
 case SC_COND_BETWEEN:
+bFrmla2 = true;
 return between;
 case SC_COND_NOTBETWEEN:
+bFrmla2 = true;
 return notBetween;
 case SC_COND_DUPLICATE:
 case SC_COND_NOTDUPLICATE:
@@ -814,8 +816,10 @@ const char* GetOperatorString(ScConditionMode eMode)
 return ;
 }
 
-const char* GetTypeString()
+const char* GetTypeString(ScConditionMode eMode)
 {
+if (eMode == SC_COND_DIRECT)
+return expression;
 return cellIs;
 }
 
@@ -823,15 +827,18 @@ const char* GetTypeString()
 
 void XclExpCFImpl::SaveXml( XclExpXmlStream rStrm )
 {
+bool bFmla2 = false;
 sax_fastparser::FSHelperPtr rWorksheet = rStrm.GetCurrentStream();
 rWorksheet-startElement( XML_cfRule,
-XML_type, GetTypeString(),
+XML_type, GetTypeString( mrFormatEntry.GetOperation() ),
 XML_priority, OString::valueOf( mnPriority + 1 ).getStr(),
-XML_operator, GetOperatorString( mrFormatEntry.GetOperation() ),
+XML_operator, GetOperatorString( mrFormatEntry.GetOperation(), 
bFmla2 ),
 XML_dxfId, OString::valueOf( GetDxfs().GetDxfId( 
mrFormatEntry.GetStyle() ) ).getStr(),
 FSEND );
 rWorksheet-startElement( XML_formula, FSEND );
 rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(), 
mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 0 ) ));
+if (bFmla2)
+rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(), 
mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 1 ) ));
 rWorksheet-endElement( XML_formula );
 // OOXTODO: XML_extLst
 rWorksheet-endElement( XML_cfRule );
commit f6a940ad1771016021a75c41a0e9be1e86843fb9
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Apr 19 23:09:58 2012 +0200

export conditional formatting to xlsx, fdo#48360

This is not yet perfect but should export already the conditional
formatting and a great deal of the styles to xlsx

Still missing:

font export
number format export
some advanced conditional formats features

diff --git

Re: [Libreoffice-commits] .: writerfilter/source

On Wed, Apr 18, 2012 at 08:23:18AM +0300, Tor Lillqvist wrote:
  MacOSX is one of the few platform that has consistently been built
  with --enable-werror.
  removing the benefit of it just for a micro-optimization seems an overkill.
 
 I agree with Norbert here. The more tinderboxes we have that (continue
 to) use --enable-werror, the better.  (If with significantly different
 compilers, even better.)

And this is my clue to announce that, having fixed a couple more
warnings/errors, I am able to do a mingw build with --enable-werror
using this configuration:
http://dtardon.fedorapeople.org/mingw/autogen.lastrun . It would be
great if Kendy and Norbert tried to enable it on their tinderboxes :-)

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

[PATCH] Removed RTL_CONSTASCII_USTRINGPARAM from UnoControls


Hi, title says it all.
I replaced RTL_CONSTASCII_USTRINGPARAM macros with simple ... literals.

Szabolcs
  From f1c3e6877ecb2471f44221c0c9b49d55d7c04bc5 Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu, 19 Apr 2012 09:05:43 +0200
Subject: [PATCH] Removed RTL_CONSTASCII_USTRINGPARAM from UnoControls

---
 UnoControls/source/base/basecontainercontrol.cxx |2 +-
 UnoControls/source/base/basecontrol.cxx  |4 +-
 UnoControls/source/controls/framecontrol.cxx |   12 ++--
 UnoControls/source/controls/progressbar.cxx  |2 +-
 UnoControls/source/controls/progressmonitor.cxx  |   62 +++---
 UnoControls/source/controls/statusindicator.cxx  |   16 +++---
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 1105941..f219b3f 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -560,7 +560,7 @@ WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Referen
 WindowDescriptor*   aDescriptor = new WindowDescriptor ;
 
 aDescriptor-Type   = WindowClass_CONTAINER ;
-aDescriptor-WindowServiceName  = OUString(RTL_CONSTASCII_USTRINGPARAM(window))   ;
+aDescriptor-WindowServiceName  = window  ;
 aDescriptor-ParentIndex= -1;
 aDescriptor-Parent = rParentPeer   ;
 aDescriptor-Bounds = getPosSize () ;
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 1240bb2..f3f1307 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -368,7 +368,7 @@ void SAL_CALL BaseControl::createPeer(  const   Reference XToolkit   xToo
 if ( xLocalToolkit.is() == sal_False )
 {
 // but first create wellknown toolkit, if it not exist
-xLocalToolkit = Reference XToolkit  ( m_xFactory-createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_VCLTOOLKIT )) ), UNO_QUERY );
+xLocalToolkit = Reference XToolkit  ( m_xFactory-createInstance( SERVICE_VCLTOOLKIT ), UNO_QUERY );
 }
 m_xPeer = xLocalToolkit-createWindow( *pDescriptor );
 m_xPeerWindow   = Reference XWindow ( m_xPeer, UNO_QUERY );
@@ -934,7 +934,7 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference XWindo
 WindowDescriptor* pDescriptor = new WindowDescriptor ;
 
 pDescriptor-Type   = WindowClass_SIMPLE;
-pDescriptor-WindowServiceName  = OUString(RTL_CONSTASCII_USTRINGPARAM(window))   ;
+pDescriptor-WindowServiceName  = window  ;
 pDescriptor-ParentIndex= -1;
 pDescriptor-Parent = xParentPeer   ;
 pDescriptor-Bounds = getPosSize () ;
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 6b29190..71911a9 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -310,7 +310,7 @@ const Sequence OUString  FrameControl::impl_getStaticSupportedServiceNames()
 {
 MutexGuard aGuard( Mutex::getGlobalMutex() );
 Sequence OUString  seqServiceNames( 1 );
-seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_FRAMECONTROL ));
+seqServiceNames.getArray() [0] = SERVICENAME_FRAMECONTROL;
 return seqServiceNames ;
 }
 
@@ -508,7 +508,7 @@ void FrameControl::impl_createFrame(const   Reference XWindowPeerxPee
 xOldFrame = m_xFrame ;
 }
 
-xNewFrame = Reference XFrame   ( impl_getMultiServiceFactory()-createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.frame.Frame)) ), UNO_QUERY ) ;
+xNewFrame = Reference XFrame   ( impl_getMultiServiceFactory()-createInstance ( com.sun.star.frame.Frame ), UNO_QUERY ) ;
 Reference XDispatchProvider   xDSP ( xNewFrame, UNO_QUERY ) ;
 
 if (xDSP.is())
@@ -519,7 +519,7 @@ void FrameControl::impl_createFrame(const   Reference XWindowPeerxPee
 //  option
 //xFrame-setName( WhatYouWant );
 
-Reference XURLTransformer   xTrans ( impl_getMultiServiceFactory()-createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.util.URLTransformer)) ), UNO_QUERY ) ;
+Reference XURLTransformer   xTrans ( impl_getMultiServiceFactory()-createInstance ( com.sun.star.util.URLTransformer ), UNO_QUERY ) ;
 if(xTrans.is())
 {
 // load file
@@ -591,9 +591,9 @@

Re: [PUSHED] Removed RTL_CONSTASCII_USTRINGPARAM from UnoControls

On Thu, Apr 19, 2012 at 09:09:06AM +0200, Dézsi Szabolcs 
dezsisz...@hotmail.com wrote:
 I replaced RTL_CONSTASCII_USTRINGPARAM macros with simple ... literals.

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

Re: [PUSHED] Hackfest

On Tue, Apr 17, 2012 at 02:18:05PM +0200, Italo Vignoli 
italo.vign...@quorum-pr.com wrote:
 As the attachment has been stripped by the system when I have sent it
 the first time, I am resending the patch to the Impress Help file which
 adds text shortcuts. Please review it carefully, as I have added quite a
 large number of lines (for a tech illiterate).

This was already pushed, marking as such.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Removed RTL_CONSTASCII_USTRINGPARAM from animation


Hi

Same for module animation.

Szabolcs
  From be3148a6bfda58b6093b598a7ec17cc6f587b6c3 Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu, 19 Apr 2012 09:58:41 +0200
Subject: [PATCH] Removed RTL_CONSTASCII_USTRINGPARAM from animation

---
 animations/source/animcore/animcore.cxx|2 +-
 .../source/animcore/targetpropertiescreator.cxx|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index e85b806..4f3ed72 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -529,7 +529,7 @@ OUString getImplementationName_##N()\
 SequenceOUString getSupportedServiceNames_##N(void)\
 {\
 SequenceOUString aRet(1);\
-aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SN ));\
+aRet.getArray()[0] = OUString( SN );\
 return aRet;\
 }
 
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index 0f04167..9e4c04e 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -112,7 +112,7 @@ namespace animcore
 uno::Sequence ::rtl::OUString  getSupportedServiceNames_TargetPropertiesCreator(void)
 {
 uno::Sequence ::rtl::OUString  aRet(1);
-aRet.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+aRet.getArray()[0] = SERVICE_NAME;
 return aRet;
 }
 
@@ -483,7 +483,7 @@ namespace animcore
 uno::Sequence ::rtl::OUString  SAL_CALL TargetPropertiesCreator::getSupportedServiceNames()  throw( uno::RuntimeException )
 {
 uno::Sequence ::rtl::OUString  aRet(1);
-aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+aRet[0] = SERVICE_NAME;
 
 return aRet;
 }
-- 
1.7.7

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

Re: [ANDROID-UI-PATCH] [REJECTED] Empty Junity android project

2012-04-19 Thread Tor Lillqvist

I don't think it makes much sense to add such an *empty* unit test
project, which I assume was basically just created by clicking an
create unit test project (or whatever the wording might be) button
in Eclipse?

Let's get back to it when 1) there is something it would test, and 2)
it can actually be run automatically as a part of the build, as our
current unit tests. Can your UI thing be built programmatically?

When we eventually have some real Android Java-based stuff to build,
we obviously want to build it as part of a normal make (that targets
Android). Presumably that means such code would need to be built using
Ant, not Eclipse. (Although presumably one can easily start the build
of an Ant project in Eclipse, too?) My
android/experimental/DocumentLoader thing is not built as part of a
make, but it does use Ant to build, I have not used Eclipse with it at
all.

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

Re: Windows - Embed Server et al.

2012-04-19 Thread Noel Grandin

OOh, I really hope you're planning on working on:
https://bugs.freedesktop.org/show_bug.cgi?id=38808
That would make setting up windows build machines much easier.

I'm not an expert, but this is what I could find:

It looks like the ActiveX control was intended to allow embedding of LO
inside InternetExplorer.

http://www.openoffice.org/dev_docs/features/1.1/
http://help.libreoffice.org/3.3/Common/ActiveX_Control_to_Display_Documents_in_Internet_Explorer

OLE looks like it was primarily implemented to allow LO to be controlled
from external programs:

http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/Automation_Bridge

ActiveX/OLE is not compiled into LO on platforms other than Windows.

On 2012-04-19 00:54, Mat M wrote:

Hello,

I am trying to decrypt some of the Windows bits of LO, namely OLE
ActiveX parts.

If I read correctly
http://en.wikipedia.org/wiki/Object_Linking_and_Embedding, it says
that OLE is an interface, mainly used in Windows, but which could be
implemented everywhere.
When doing Insert/Object/OLE Object in LibO, we can see all our
components here.
IIUC, LibO uses it to incorporate data coming from LibO components in
another LibO component (same type or not). And it works under Windows
under Linux, which is smart.

So now, I have a full load of questions :)
1. Why the OLE components are not visible from other OLE-capable
Windows apps like Wordpad ? Is it only an internal implementation
which is only compatible to itself ?

2. When browsing the sources I found :
- extensions/source/ole : what does it do ?
- extensions/source/activex : it should provide an activex of LibO.
The README.txt states we should have a so_activex.dll we need to
register but I don't find any dll in 3.5.2 which seems related to
that. Is it still delivered ?

3. I tried to detect components in my system:
- In DCOM config, I only see a LibreOffice Service Manager 1.0, which
is related to soffice.exe.
- From VC++2008Express, no .Net or COM component is detected. Is it
normal ?
4. extensions/source/ole, extensions/source/activex embedserv all
require atl mfc from Microsoft. How do you handle that under
non-Windows OSes ?

Thanks in advance to the people who will answer :)

Best regards

Disclaimer: http://www.peralex.com/disclaimer.html

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

Re: [ANDROID-UI-PATCH] [REJECTED] Empty Junity android project

2012-04-19 Thread Jonathan Aquilina


On 4/19/12 10:02 AM, Tor Lillqvist wrote:

I don't think it makes much sense to add such an *empty* unit test
project, which I assume was basically just created by clicking an
create unit test project (or whatever the wording might be) button
in Eclipse?

Let's get back to it when 1) there is something it would test, and 2)
it can actually be run automatically as a part of the build, as our
current unit tests. Can your UI thing be built programmatically?

When we eventually have some real Android Java-based stuff to build,
we obviously want to build it as part of a normal make (that targets
Android). Presumably that means such code would need to be built using
Ant, not Eclipse. (Although presumably one can easily start the build
of an Ant project in Eclipse, too?) My
android/experimental/DocumentLoader thing is not built as part of a
make, but it does use Ant to build, I have not used Eclipse with it at
all.

--tml
What my plan was for including and creating the Unit test project, was 
to be able to do the development of the file explorer concept which is 
as follows:


You wanted me to create something where users can read files. I was 
going to do that, and take it up a level. I was going to have it search 
the memory card for instance and list all files that have formats that 
are supported by LO for reading.


For the above are there any tests that one could create where the junit 
project would come in handy?

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

[PATCH] Removed RTL_CONSTASCII_(U)STRINGPARAM from avmedia


Hi!

Replaced a few RTL_CONSTASCII... macros in avmedia.

Szabolcs
  From 116fc5e8f22f4234944dacc73b5b489ca27aa694 Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu, 19 Apr 2012 10:22:50 +0200
Subject: [PATCH] Removed RTL_CONSTASCII_(U)STRINGPARAM from avmedia

---
 avmedia/source/framework/mediacontrol.cxx  |4 ++--
 avmedia/source/framework/mediaitem.cxx |   22 --
 avmedia/source/framework/mediatoolbox.cxx  |6 +++---
 avmedia/source/framework/soundhandler.cxx  |5 ++---
 avmedia/source/gstreamer/gstframegrabber.cxx   |2 +-
 avmedia/source/gstreamer/gstmanager.cxx|2 +-
 avmedia/source/gstreamer/gstplayer.cxx |2 +-
 avmedia/source/gstreamer/gstuno.cxx|4 ++--
 avmedia/source/gstreamer/gstwindow.cxx |2 +-
 avmedia/source/quicktime/framegrabber.mm   |2 +-
 avmedia/source/quicktime/manager.mm|2 +-
 avmedia/source/quicktime/player.mm |2 +-
 avmedia/source/quicktime/quicktimeuno.mm   |4 ++--
 avmedia/source/quicktime/window.mm |2 +-
 avmedia/source/viewer/mediawindow.cxx  |6 +++---
 avmedia/source/viewer/mediawindowbase_impl.cxx |2 +-
 avmedia/source/win/framegrabber.cxx|2 +-
 avmedia/source/win/manager.cxx |2 +-
 avmedia/source/win/player.cxx  |2 +-
 avmedia/source/win/window.cxx  |2 +-
 avmedia/source/win/winuno.cxx  |4 ++--
 21 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index decf7be..1a4df7b 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -84,7 +84,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
 meControlStyle( eControlStyle ),
 mbLocked( false )
 {
-const String aTimeText( RTL_CONSTASCII_USTRINGPARAM(  00:00:00/00:00:00  ) );
+const String aTimeText(  00:00:00/00:00:00  );
 
 SetBackground();
 SetPaintTransparent( sal_True );
@@ -424,7 +424,7 @@ void MediaControl::implUpdateTimeField( double fCurTime )
 const LocaleDataWrapper rLocaleData = aSysLocale.GetLocaleData();
 
 aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast sal_uInt32 ( floor( fCurTime ) ) ) );
-aTimeString.AppendAscii( RTL_CONSTASCII_STRINGPARAM(  /  ));
+aTimeString.AppendAscii(  /  );
 aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast sal_uInt32 ( floor( maItem.getDuration() ) )) );
 
 if( maTimeEdit.GetText() != aTimeString )
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 2dda7a9..91d7f69 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -373,10 +373,7 @@ void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom )
 static ::rtl::OUString lcl_GetFilename(::rtl::OUString const rSourceURL)
 {
 uno::Referenceuri::XUriReferenceFactory const xUriFactory(
-::comphelper::createProcessComponent(
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-com.sun.star.uri.UriReferenceFactory))),
-uno::UNO_QUERY_THROW);
+::comphelper::createProcessComponent( com.sun.star.uri.UriReferenceFactory ), uno::UNO_QUERY_THROW );
 
 uno::Referenceuri::XUriReference const xSourceURI(
 xUriFactory-parse(rSourceURL), uno::UNO_SET_THROW);
@@ -392,7 +389,7 @@ static ::rtl::OUString lcl_GetFilename(::rtl::OUString const rSourceURL)
 if (!::comphelper::OStorageHelper::IsValidZipEntryFileName(
 filename, false) || !filename.getLength())
 {
-filename = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(media));
+filename = media;
 }
 return filename;
 }
@@ -430,14 +427,12 @@ lcl_CreateStream(uno::Referenceembed::XStorage const xStorage,
 uno::UNO_QUERY);
 if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage
 xStreamProps-setPropertyValue(
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MediaType)),
-uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-//FIXME how to detect real media type?
-//but currently xmloff has this one hardcoded anyway...
+MediaType, uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+//FIXME how to detect real media type?
+//but currently xmloff has this one hardcoded anyway...
 application/vnd.sun.star.media;
 xStreamProps-setPropertyValue( // turn off compression
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Compressed)),
-uno::makeAny(sal_False));
+Compressed, uno::makeAny(sal_False));
 }

Re: Windows - Embed Server et al.

2012-04-19 Thread Tor Lillqvist

 It looks like the ActiveX control was intended to allow embedding of LO
 inside InternetExplorer.

And *my* opinion is that such embedding opens up a horrible Pandora's
box of potential problems that we don't really have enough people to
solve, and thus we really should try to kill this monster of a
feature. (That's why I added the --disable-activex-component switch
years ago; however it is unclear to me if it actually has the intended
effect any more (if it ever had).)

However, if you Mat, or somebody else, feels they want to become the
expert in these ActiveX/OLE/etc matters, then I guess we should keep
the possibility;)

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

Re: [PATCH] Removed RTL_CONSTASCII_(U)STRINGPARAM from accessibility (there was two equalsAsciiL leftovers too)


On Thu, 2012-04-19 at 09:52 +0200, Dézsi Szabolcs wrote:
 Hi, I'm going to send these on a per module basis for easier
 reviewing. (Previous 1.5M sized megapatch was very difficult to
 review)

Huge code changes like this will make the re-licensing / re-basing
process much more problematic for very little win in the compiled code.

I'd really like to defer all of this until after that is done - in a
few months.

Sorry about that,

Michael.

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

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

Re: [PATCH] Opengrok remote attribute

Andrew Higginson wrote:
 This patch to opengrok adds a 'remote' id the the body tag when
 ?remote=true is given in the URL (and as a result in CSS, hides some extra
 chrome, like the header)
 
Hi Andrew,

great mockup  something we definitely want - unfortunately the
patch did cause some trouble, see bug report. For the while, I
cannot apply it.

Cheers,

-- Thorsten



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

Re: [PATCH] Removed RTL_CONSTASCII_(U)STRINGPARAM from accessibility (there was two equalsAsciiL leftovers too)

2012-04-19 Thread Noel Grandin




On 2012-04-19 10:27, Michael Meeks wrote:
Huge code changes like this will make the re-licensing / re-basing 
process much more problematic for very little win in the compiled code.


Sure the difficulty of the re-basing process is only concerned with the 
difference between state of the initial LO tree and the state of the 
initial Apache-OO tree?



Disclaimer: http://www.peralex.com/disclaimer.html


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

RE: [PATCH] Removed RTL_CONSTASCII_USTRINGPARAM from animation


 
   It'd prolly be more useful to work on other things until the
 re-licensing is done in a couple of months :-)
 
   Large scale string changes have the potential to create far more work
 for me than any win they provide :-)
 
   Thanks !

Ok, no problem. :)

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

Removed unused code formula::ArgInput::GetArgSelection

2012-04-19 Thread Jaime Navarro Santapau

Salvo indicado de otro modo más arriba / Unless stated otherwise above:
International Business Machines, S.A.
Santa Hortensia, 26-28, 28002 Madrid
Registro Mercantil de Madrid; Folio 1; Tomo 1525; Hoja M-28146
CIF A28-010791


0001-Removed-unused-code-formula-ArgInput-GetArgSelection.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [ANDROID-UI-PATCH] [REJECTED] Empty Junity android project

2012-04-19 Thread Tor Lillqvist

 What my plan was for including and creating the Unit test project, was to be
 able to do the development of the file explorer concept which is as follows:

Sure sure, but an *empty* Junit test project does not need to be in
git, does it? Once it is a bit more substantial, we can add it.

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

[Patch] [Advice] Wrapping fields in impress

2012-04-19 Thread Muthu Subramanian K


Hi,

I was trying to implement the wrapping feature for fields (specifically 
the hyperlinks) in impress. Currently, the text box containing 
hyperlinks can overflow the width of the box. This can be a problem when 
the content is on the border of the slide (or otherwise).


What this patch does/does not:
a) Wraps the field text during display (i.e. not during editing)
b) But, the subsequent text would start from the next line.
c) The link (in case of hyperlinks) is clickable only in the
   first segment

I have attached the patch for review. Is my approach correct?

Thank you so much!
Muthu Subramanian
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -361,6 +361,7 @@ struct ExtraPortionInfo
 sal_BoolbCompressed;
 
 sal_Int32*pOrgDXArray;
+::std::vector sal_Int32  lineBreaksList;
 
 
 ExtraPortionInfo();
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1007,7 +1014,31 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY )
 pPortion-GetSize() = aTmpFont.QuickGetTextSize( GetRefDevice(), aFieldValue, 0, aFieldValue.Len(), 0 );
 // So no scrolling for oversized fields
 if ( pPortion-GetSize().Width()  nXWidth )
+{
+sal_Int32 nWidthOrg = pPortion-GetSize().Width();
+sal_Int32 nChars= aFieldValue.Len();
+sal_Int32 nApproxWC = nXWidth / ( nWidthOrg / nChars );
+ExtraPortionInfo *pExtraInfo= pPortion-GetExtraInfos();
+if( !nApproxWC ) nApproxWC++;
+if( pExtraInfo == NULL )
+{
+pExtraInfo = new ExtraPortionInfo();
+pExtraInfo-nOrgWidth = nXWidth;
+pPortion-SetExtraInfos( pExtraInfo );
+}
+else
+{
+pExtraInfo-lineBreaksList.clear();
+}
+
 pPortion-GetSize().Width() = nXWidth;
+
+while( nChars  0 )
+{
+pExtraInfo-lineBreaksList.push_back( aFieldValue.Len() - nChars );
+nChars -= nApproxWC;
+}
+}
 }
 nTmpWidth += pPortion-GetSize().Width();
 pLine-GetCharPosArray().Insert( pPortion-GetSize().Width(), nTmpPos-pLine-GetStart() );
@@ -2909,6 +2942,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
 // Over the Portions of the line ...
 // --
 sal_uInt16 nIndex = pLine-GetStart();
+bool bParsingFields = false;
+::std::vector sal_Int32 ::iterator itSubLines;
 for ( sal_uInt16 y = pLine-GetStartPortion(); y = pLine-GetEndPortion(); y++ )
 {
 DBG_ASSERT( pPortion-GetTextPortions().Count(), Line without Textportion in Paint! );
@@ -3084,12 +3122,48 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
 aText = ((EditCharAttribField*)pAttr)-GetFieldValue();
 nTextStart = 0;
 nTextLen = aText.Len();
+ExtraPortionInfo *pExtraInfo = pTextPortion-GetExtraInfos();
+// Do not split the Fields into different lines while editing
+if( bStripOnly  !bParsingFields  pExtraInfo  pExtraInfo-lineBreaksList.size() )
+{
+bParsingFields = true;
+itSubLines = pExtraInfo-lineBreaksList.begin();
+}
+if( bParsingFields )
+{
+if( itSubLines != pExtraInfo-lineBreaksList.begin() )
+{
+if ( !IsVertical() )
+{
+

Re: ancient openssl bundled

2012-04-19 Thread Marc-André Laverdière

As a sidenote, the need for openssl is not direct for LO, but something
needed for dependencies. I wanted to remove openssl altogether and rely on
nss instead, and you could almost hear the grunts of pain on irc. My
feeling is that this dep is too obscure, so nobody wants to touch it...
On 2012-03-27 1:57 PM, Norbert Thiebaud nthieb...@gmail.com wrote:

 On Tue, Mar 27, 2012 at 12:33 PM, Enrico Weigelt enrico.weig...@vnc.biz
 wrote:
 
  I'll maintain my downstream fork dropping the 3rdparty packages step
  by step. (I'll contigiously rebase, to I'll be ontop of master).
 
 Again. most packager for unix based distro can do just that with the
 proper configure argument of LibreOffice out of the box.
 And MacOSX does that to for the few library that _are_ in the standard
 system...

 we maintain a copy of the external libraries for the platforms that
 don't have them.. but you _can_ use the system version for most of
 them if your system have them.

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

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

Re: [libreoffice-l10n] [ANNOUNCE] Branch libreoffice-3-5-3 created

Hi Martin,

On Wed, 2012-04-18 at 20:45 +0200, Martin Srebotnjak wrote:
 Do you plan to release 3.5.3 with this bug?
 https://bugs.freedesktop.org/show_bug.cgi?id=48356

Whichever bugs are fixed up to the date that it is released, will be
the bugs that are fixed in the release - that is the essence of a time
based release.

 It is just not acceptable for Central European users. For them the
 recommended release series is at this point 3.4.x.

Sorry about that; the RTF filters have had a ton of work done on them
to improve them in many dimensions, but there are still a dozen or so
known regression bugs there (alongside a bus-load of new improvements 
fixes).

Interestingly though, I'd expect any regressions to be in import not
export particularly vs. 3.4.x  - Miklos any ideas there ? Finally it's
best to discuss such bugs on the libreoffice-qa list.

All the best,

Michael.

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

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

Re: ancient openssl bundled


On Thu, 2012-04-19 at 05:32 -0400, Marc-André Laverdière wrote:
 As a sidenote, the need for openssl is not direct for LO, but
 something needed for dependencies. I wanted to remove openssl
 altogether and rely on nss instead, and you could almost hear the
 grunts of pain on irc. My feeling is that this dep is too obscure, so
 nobody wants to touch it...

It'd be ideal to drop openssl and use NSS instead IMHO - but of course,
doing the work, integrating the packages and testing on 3x platforms is
quite some work - but if it's done, I'd be happy :-)

HTH,

Michael.

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

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

Re: [PUSHED] fdo#48473 No object information in status bar

Regina Henschel wrote:
 I have now defined a macro for that string, so that there is only
 one place for the literal string. This way the semantic remains the
 same as it has worked for several years.
 
Thanks a lot Regina, pushed with an insignificant tweak.

-- Thorsten


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

Re: [PATCH] Removed RTL_CONSTASCII_(U)STRINGPARAM from accessibility (there was two equalsAsciiL leftovers too)


On Thu, 2012-04-19 at 10:31 +0200, Noel Grandin wrote:
 On 2012-04-19 10:27, Michael Meeks wrote:
  Huge code changes like this will make the re-licensing / re-basing 
  process much more problematic for very little win in the compiled code.
 
 Sure the difficulty of the re-basing process is only concerned with the 
 difference between state of the initial LO tree and the state of the 
 initial Apache-OO tree?

Ideally yes ;-) but the Apache tree also has a non-zero number of
changes in it. But if you want to help out with the busy work - poke me
on IRC to setup a call ;-)

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: Windows - Embed Server et al.


On Thu, 2012-04-19 at 11:26 +0300, Tor Lillqvist wrote:
  It looks like the ActiveX control was intended to allow embedding of LO
  inside InternetExplorer.

 And *my* opinion is that such embedding opens up a horrible Pandora's
 box of potential problems that we don't really have enough people to

It is also used in Groupwise for editing mail. One item in the
Pandora's box is that 'framework' insists on storing your toolbar state
and applying it to all windows. So if the user turns the gallery on in
their top-level document window, it busts the E-mail editor :-) The
E-mail editor tries to hide ~all the formatting toolbars, which busts
the top-level document editing.

It'd be really wonderful to have a fix for that - to make the ActiveX
control independent of the framework madness trying to serialize it's
settings everywhere. I don't really see removing it as an option though.

HTH,

Michael.

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

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

Re: Removed unused code formula::ArgInput::GetArgSelection

Hi Jaime,

We need a blanket license statement that all the code you contribute is
made available under the terms of the MPL/LGPLv3+ dual license so we can
link you into:

http://wiki.documentfoundation.org/Development/Developers

Can you send that to this list ?

And thanks for the patch ! :-)

Michael.

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

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

[PUSHED] Re: [PATCH] converts SV_DECL_PTRARR in SVX module

On 18/04/12 17:27, Noel Grandin wrote:
 These patches convert the usage of  SV_DECL_PTRARR in SVX module to 
 std::set, std::vector and boost::ptr_vector variously.
 
 Survived a make svx.check and a make subsequentcheck (at least up 
 until the point at which my Ubuntu box has a problem with one of the 
 smoketest checks).

great, i've pushed them now, with a minor tweak to fix some signed vs.
unsigned comparison warnings in debug assertions.

the one change that had me concerned for a while is this:

 -m_arrCurrentSelection.Remove( i - 1, 1 );
 +m_arrCurrentSelection.erase( --(it.base()) );

where it is a std::set::reverse_iterator; but it seems like this is
actually correct because the reverse_iterator is a wrapper for an
iterator that points 1 element ahead, such that the --(it.base())
expression will return an iterator that points to the same element as
the reverse_iterator, and furthermore the reverse_iterator is not
actually invalidated by the erase because internally it points one
element ahead.

googling found me this relevant mail:

http://lists.boost.org/Archives/boost/2001/07/14701.php

 License is on file.

we know you by now, no need to write that in every mail :)

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

Re: [REVIEW][3-5] misc stuff


On 04/17/2012 03:15 PM, Michael Stahl wrote:

have oosplash forward SIGTERM to soffice.bin:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=946e7180be96178937e7be1b0bd7132902709a87


The above is not a good idea.  At least with POSIX, there is no reliable 
way for a parent process to forward to a child process a signal that the 
parent receives.  There is always a window of time after fork(2) where 
the forwarding will not yet happen, and there is always a window of time 
after wait(2) where the forwarding will potentially send the signal to 
an unrelated process.  (Yes, I know, the soffice script tries to do the 
same, see 
http://compgroups.net/comp.unix.shell/sh-terminating-children-upon-sigterm/501864 
sh: Terminating children upon SIGTERM for a fruitless discussion.)


The two processes need to communicate shutdown requests with a more 
sophisticated protocol than trying to send a SIGTERM received by the 
parent on to the child.


That said:

* g_pProcess should at least be volatile (it can't be sig_atomic_t).

* New code should use sigaction(2), not signal(2).

* The sigterm_handler returns normally, effectively ignoring the 
SIGTERM.  Not sure if that is by design (as, if all goes well, 
termination of the child will lead to termination of the parent, anyway) 
or by accident.  (Though if it were by design, it would not take into 
account that a SIGTERM sent before spawning the child does not lead to 
timely termination.)



these increase reliability of JUnit based test infrastructure:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=90f7a3ada68f309a9d3201183ef552e59f9558fb
http://cgit.freedesktop.org/libreoffice/core/commit/?id=228515e7783aecdb992258765554a530d6c831f3


Not yet sure what to make of these two.  This is tricky territory, and a 
number of potential deadlocks had deliberately been left in, on the 
ground that (a) programmatically forcing termination of non-terminating 
processes does not guarantee resource clean up (i.e., spawned 
sub-processes can remain, see above), and (b) forcing termination 
prevents debugging of the underlying deadlock.


It is a fallacy that a hung build can be killed automatically and the 
machine be guaranteed to be in a clean state afterwards.


However, I will look into these two commits when I have a little more time.

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

killing soffice.bin from oosplash (was: Re: [REVIEW][3-5] misc stuff)

On 19/04/12 13:35, Stephan Bergmann wrote:
 On 04/17/2012 03:15 PM, Michael Stahl wrote:
 have oosplash forward SIGTERM to soffice.bin:

 http://cgit.freedesktop.org/libreoffice/core/commit/?id=946e7180be96178937e7be1b0bd7132902709a87
 
 The above is not a good idea.  At least with POSIX, there is no reliable 
 way for a parent process to forward to a child process a signal that the 
 parent receives.  There is always a window of time after fork(2) where 
 the forwarding will not yet happen, and there is always a window of time 
 after wait(2) where the forwarding will potentially send the signal to 
 an unrelated process.  (Yes, I know, the soffice script tries to do the 
 same, see 
 http://compgroups.net/comp.unix.shell/sh-terminating-children-upon-sigterm/501864
  
 sh: Terminating children upon SIGTERM for a fruitless discussion.)
 
 The two processes need to communicate shutdown requests with a more 
 sophisticated protocol than trying to send a SIGTERM received by the 
 parent on to the child.

the soffice.bin really should be dead by the time the JUnit test process
exits, because otherwise the next time you try to run the test it won't
run (and even worse will hang forever currently...), because the old
soffice.bin is still listening on the pipe, so the new soffice.bin
cannot listen.

is there some POSIX interface that will kill all children of a process?

 That said:
 
 * g_pProcess should at least be volatile (it can't be sig_atomic_t).
 
 * New code should use sigaction(2), not signal(2).
 
 * The sigterm_handler returns normally, effectively ignoring the 
 SIGTERM.  Not sure if that is by design (as, if all goes well, 
 termination of the child will lead to termination of the parent, anyway) 
 or by accident.  (Though if it were by design, it would not take into 
 account that a SIGTERM sent before spawning the child does not lead to 
 timely termination.)

well the last time i read a book on how to write signal handlers is
clearly many years ago :)

the returning was intentional, so the oosplash could forward the exit
status of soffice.bin, but considering the race condition you mentioned
i guess hard-coding the exit status that soffice.bin would return is better.

i've tried to fix it a bit, please review:

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

 these increase reliability of JUnit based test infrastructure:

 http://cgit.freedesktop.org/libreoffice/core/commit/?id=90f7a3ada68f309a9d3201183ef552e59f9558fb
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=228515e7783aecdb992258765554a530d6c831f3
 
 Not yet sure what to make of these two.  This is tricky territory, and a 
 number of potential deadlocks had deliberately been left in, on the 
 ground that (a) programmatically forcing termination of non-terminating 
 processes does not guarantee resource clean up (i.e., spawned 
 sub-processes can remain, see above), and (b) forcing termination 
 prevents debugging of the underlying deadlock.

these are not about deadlocks but to kill the office process in
situations where soffice.bin was not killed properly.

the first one was about a case where Desktop.terminate returned but
didn't terminate (because there was some unsaved document still open).

the second one was encountered when somebody removed an IDL type, and
the unoil.jar still contained the corresponding class file, which made
the Junit process' UNO runtime request the corresponding type over the
UNO bridge, but the other side didn't have it in its RDB so the Java UNO
bridge disposed itself, leading to an uncaught DisposedException here
and a still running soffice.bin process.

 It is a fallacy that a hung build can be killed automatically and the 
 machine be guaranteed to be in a clean state afterwards.

in case of a real deadlock these 2 commits shouldn't change anything.

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

Bug 48716: FILESAVE soffice.bin crashed with SIGABRT in os::abort()


Hi!

Actually this gives me SIGSEGV (not SIGABRT) in sw/fmtcntnt.hxx 
line 60: return (const SwFmtCntnt)Get( RES_CNTNT,bInP);

I print out '*this' and it's like this:
{SfxItemSet = {_vptr.SfxItemSet = 0x18, _pPool = 0x10001, _pParent = 
0x1757920, _aItems = 0x18, _pWhichRanges = 0x10001, _nCount = 64152}, 
pOldSet = 
0x18, pNewSet = 0x20001, static aPool = {m_pImpl = 0x7fffdc06b480, 
m_pTypeName = 0x7fffcf0418e0 SwAttrSet}}

those 0x18 and _nCount = 64152 values look very disturbing.
print *this._aItems it says Cannot access memory at address 0x18

So this must be the problem (right?)

Any idea why these values look like this?

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

Re: killing soffice.bin from oosplash (was: Re: [REVIEW][3-5] misc stuff)

On Thursday 19 of April 2012, Michael Stahl wrote:
 the soffice.bin really should be dead by the time the JUnit test process
 exits, because otherwise the next time you try to run the test it won't
 run (and even worse will hang forever currently...), because the old
 soffice.bin is still listening on the pipe, so the new soffice.bin
 cannot listen.

 is there some POSIX interface that will kill all children of a process?

 No. It is possible to kill all processes in a group, but I'm unsure on the 
exact details of what becoming a process group leaders changes.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: killing soffice.bin from oosplash


On 04/19/2012 03:11 PM, Michael Stahl wrote:

On 19/04/12 13:35, Stephan Bergmann wrote:

On 04/17/2012 03:15 PM, Michael Stahl wrote:

have oosplash forward SIGTERM to soffice.bin:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=946e7180be96178937e7be1b0bd7132902709a87


The above is not a good idea.  At least with POSIX, there is no reliable
way for a parent process to forward to a child process a signal that the
parent receives.  There is always a window of time after fork(2) where
the forwarding will not yet happen, and there is always a window of time
after wait(2) where the forwarding will potentially send the signal to
an unrelated process.  (Yes, I know, the soffice script tries to do the
same, see
http://compgroups.net/comp.unix.shell/sh-terminating-children-upon-sigterm/501864
sh: Terminating children upon SIGTERM for a fruitless discussion.)

The two processes need to communicate shutdown requests with a more
sophisticated protocol than trying to send a SIGTERM received by the
parent on to the child.


the soffice.bin really should be dead by the time the JUnit test process
exits, because otherwise the next time you try to run the test it won't
run (and even worse will hang forever currently...), because the old
soffice.bin is still listening on the pipe, so the new soffice.bin
cannot listen.


That's why I prefer the test to hang when it cannot guarantee that all 
processes it (indirectly) spawned have terminated.



the returning was intentional, so the oosplash could forward the exit
status of soffice.bin, but considering the race condition you mentioned
i guess hard-coding the exit status that soffice.bin would return is better.


The canonic(?) way of doing this is by resetting the signal's action to 
default and re-raising the signal from within the handler, so that the 
parent can observe that the process terminated due to a signal, but 
_exit should probably be just as fine.



these increase reliability of JUnit based test infrastructure:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=90f7a3ada68f309a9d3201183ef552e59f9558fb
http://cgit.freedesktop.org/libreoffice/core/commit/?id=228515e7783aecdb992258765554a530d6c831f3


Not yet sure what to make of these two.  This is tricky territory, and a
number of potential deadlocks had deliberately been left in, on the
ground that (a) programmatically forcing termination of non-terminating
processes does not guarantee resource clean up (i.e., spawned
sub-processes can remain, see above), and (b) forcing termination
prevents debugging of the underlying deadlock.


these are not about deadlocks but to kill the office process in
situations where soffice.bin was not killed properly.


My words were not very clear.  What I meant was to try producing a 
deadlock if the test cannot guarantee that the spawned soffice has 
terminated.



the first one was about a case where Desktop.terminate returned but
didn't terminate (because there was some unsaved document still open).


...causing OfficeConnection.tearDown to hang?  Yes, that was 
intentional, as explained above.



the second one was encountered when somebody removed an IDL type, and
the unoil.jar still contained the corresponding class file, which made
the Junit process' UNO runtime request the corresponding type over the
UNO bridge, but the other side didn't have it in its RDB so the Java UNO
bridge disposed itself, leading to an uncaught DisposedException here
and a still running soffice.bin process.


...and again, a hanging OfficeConnection.tearDown, right?

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

[REVIEW-3-5] fdo#46687 fix find toolbar crash ...

Hi there,

I had a poke at this heisenbug (that disappears with SAL_SYNCHRONIZE
set), and - after a bit of xtracing, discovered that (rather
un-satisfyingly) that the attached patch fixes it; it should be entirely
harmless if not entirely explained [ the error push/pop should stop this
happening anyway ].

Tripple review for libreoffice-3-5-3 and one more for libreoffice-3-5
if possible.

HTH,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot
From 6d97ea37bba52b21648c91276bc9281d06cdd148 Mon Sep 17 00:00:00 2001
From: Michael Meeks michael.me...@suse.com
Date: Thu, 19 Apr 2012 14:34:35 +0100
Subject: [PATCH] fdo#46687 - fix find toolbar X error handling

---
 vcl/unx/gtk/window/gtkframe.cxx |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 4137a8d..a647bf8 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2231,6 +2231,8 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
 // to do this we need to synchronize with the XServer
 GetGenericData()-ErrorTrapPush();
 XSetInputFocus( getDisplay()-GetDisplay(), widget_get_xid(m_pWindow), RevertToParent, CurrentTime );
+// fdo#46687 - an XSync should not be necessary - but for some reason it is.
+XSync( getDisplay()-GetDisplay(), False );
 GetGenericData()-ErrorTrapPop();
 }
 #endif
@@ -3239,9 +3241,11 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame )
 #if !GTK_CHECK_VERSION(3,0,0)
 if( bSetFocus )
 {
+GetGenericData()-ErrorTrapPush();
 XSetInputFocus( pThis-getDisplay()-GetDisplay(),
 widget_get_xid(pWidget),
 RevertToParent, CurrentTime );
+GetGenericData()-ErrorTrapPop();
 }
 #else
 (void)pWidget; (void)bSetFocus;
-- 
1.7.7

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

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-04-19 Thread bugzilla-daemon

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

Bug 37361 depends on bug 46687, which changed state.

Bug 46687 Summary: 'Find' toolbar causes writer,calc,impress, not responding
https://bugs.freedesktop.org/show_bug.cgi?id=46687

   What|Old Value   |New Value

 Resolution||FIXED
 Status|NEW |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: Weird error during build of 3.5.2 libreoffice

2012-04-19 Thread Petr Mladek

Tomáš Chvátal píše v St 18. 04. 2012 v 18:20 +0200:
 Dne 16. dubna 2012 14:30 Petr Mladek pmla...@suse.cz napsal(a):
  Tomáš Chvátal píše v Čt 12. 04. 2012 v 08:39 +0200:
  Complete log: https://401507.bugs.gentoo.org/attachment.cgi?id=300617
 
  Could you please attach solenv/inc/tg_ext.mk from your build?
  I do not see glibc-omitfp target here.

 Sure attaching link to the mk file [1], it seems ok to me...

Strange, the line 106 mentioned in the error is 

 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2

It looks correct.

I still do not understand where the glibc-omitfp comes from and how it
is related to solenv/inc/tg_ext.mk, line 106. I have two ideas how to
move forward:

1. try to modify the line, e.g. use %.unpackxxx instead of %.unpack
   I wonder if the error message will mention the new string


2. You might try to get more information using build -v


Best Regards,
Petr

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

Checksum failure involving AES encryption

2012-04-19 Thread Udo Schuermann

I've been working on an external tool to decrypt the contents of ODF 
containers, but two files in the container consistently fail their 
checksum when decrypted with AES256, even though they actually decrypt 
perfectly; the other files have no issues with their checksums. I have 
been trying to crawl the LO code for hints (esp. 
package/source/manifest/ManifestWriter), but am having some difficulty 
understanding the finer points of the code. Could someone more familiar 
with it have a look at this, please?


The problematic files in the ODF container are manifest.rdf and 
Configurations2/accelerator/current.xml.
Only their checksum fails, the data actually decrypts just fine. Other 
files in the container have no problems.
The failure happens only with AES-encryption (no issues when using the 
Blowfish cipher).


I have not counted out the possibility that I'm doing something 
tremendously stupid, but it does seem like a bug in LO to me, and it 
would seem to have appeared with the introduction of AES.


For what it's worth, source to my Java tool/library is at 
https://github.com/kuschuermann/rltodfjlib
A ready-to-run binary (for Java 1.6+) is at 
http://ringlord.com/rltodfjlib.jar
Running it with java -jar rltodfjlib.jar -v TestAES.odt will dump 
useful information to the console.


Many thanks!

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

Re: Windows - Embed Server et al.


   It is also used in Groupwise for editing mail.

Groupwise calls LO as editor ?


cu
-- 
Mit freundlichen Grüßen / Kind regards 

Enrico Weigelt 
VNC - Virtual Network Consult GmbH 
Development 

Äußere Bayreuther Str. 55, D - 90409 Nürnberg 
Tel: +49 911 72303-30 
Fax: +49 911 72303-50 

enrico.weig...@vnc.biz; www.vnc.de 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: ancient openssl bundled


 As a sidenote, the need for openssl is not direct for LO, but
 something
 needed for dependencies. I wanted to remove openssl altogether and
 rely on
 nss instead, and you could almost hear the grunts of pain on irc. My
 feeling is that this dep is too obscure, so nobody wants to touch
 it...

hmm, who exactly needs it ?


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

minutes of ESC call ...

* Present:
+ David, Stephan, Thorsten, Andras, Markus, Caolan,
  Bjoern, Norbert, Fridrich, Michael S, Eike, Kohei,
  Tor, Petr, Kendy, Lionel, Lubos

* Completed Action Items
+ review and re-close 3.4.x MAB fixed in 3.5.x (Rainer)
+ Apple Developer Enrollment (Thorsten)
+ switch doc encryption default back for 3.5 (Thorsten)
+ add a bold heading to GSOC page: LibreOffice is easy  fun to hack 
(Cedric)
+ update new file license template to MPLv2 (Michael)
+ mail the mailing list wrt. GSOC filing urgency (Fridrich)
+ help Ellie get mingw build going (Tor)
+ get bytemark access to Caolan (Norbert)
+ turn exception checking on for gcc in debug builds (Lubos)

* Pending Action Items
+ [wedged on nbg admins] firewall issues for new linux tinderbox 
(Thorsten)
+ add encryption default UI option in 3.6 (Thorsten)
+ rename VCL API to make it GetBeamerFoo  fix (Michael)
+ poke RedHat security guy wrt. keys (Caolan)
+ [pending] pull up misc. internal versions for 3.6 (Fridrich)
+ started with pixman, poked cairo

* Action Items review

* Release Engineering update (Petr)
+ 3.5.3 rc1 - tagged yesterday to get late fixes
+ builds for Linux+Mac, Win32 in progress
  Mac-PPC slow as usual.
+ expected this evening / tomorrow morning
+ may be announced at the weekend.
+ new mirror synching improved / faster box.
+ final date for rc2 deadline mailed out on Monday

* GSOC update (Fridrich)
+ 10 slots, and one cross-project conflict
+ all-night de-duplication meeting fun.

* Hack-fest roundup / suggestions for the future (Thorsten)
+ summaries on the planet / Thorsten's blog
+ 90 commits from the hack-fest attendees
+ lots of new things started
+ 
http://blog.thebehrens.net/2012/04/16/libreoffice-hamburg-hackfest-2012/
+ do it again soon
+ nice to have more of a focus, and do more outreach

* Exporting redundant symbols for unit tests (Lubos)
+ change reverted re-shrinking symbol tables
+ slower, and 1Gb larger
+ expectation that build-system changes be announced (Moggi)

* rtl / css namespace issues (Lubos/Michael)
+ should we have general 'using' statements ?
+ rtl::OUString is a bit of a pain
+ Lubos:
+ would like to use the short name everywhere,
  except for exported headers.
+ add a unit test for all exported headers.
+ Stephan
+ not eager to see it
+ but happy enough to see it go in
+ using css:: namespace instead ?
+ what is this css:: not friendly for new newcomers (Tor)
+ lo:: [!] - annoyances with aliases ...
+ replace css:: with nothing - bad (Stephan)
+ help get ready for lo4
+ prefer to push back to LibO 3.6 and a bigger cleanup (Stephan)
AA: + get headers to allow rtl:: namespace omitted in soon (Lubos)
+ but not do the big seds yet
+ concern wrt. the KDE4 experience  big bang changes (Lubos)
+ ie. fixing API changes now incrementally is a win
+ doing it sooner, not later is good of course (Stephan)
+ LibO 4.0
+ planned to be incrementally developed / migrated anyway
+ postpone until license change done (Bjoern)
+ concerns about breaking all extensions at once (Norbert)
+ better to do incremental improvement ?
+ how much will we get done for this anyway ?
+ consider longer support cycle for LibO 3.6.x etc.
+ discuss late.

* tinderboxen / status (Norbert)
+ bytemark machine #1
+ Fridrich is setting up the fast win32 machine,
  aim to get v. fast debugging snapshots
+ bytemark machine #2
+ working on *BSD in virtualbox with little
  joy help appreciated (Norbert)
+ need 3x BSD virtual-boxes (ideally)
+ Debian fixing bash-isms left  right due to dash (Lionel)

* misc. font bits
+ Google ChromeOS fonts
+ based on a renamed Liberation + added some additional glyphs
AA: + investigate (Caolan)
+ Ariel Narrow replacement / query
AA: + do we ship Liberation Narrow (Bjoern)

* QA update (Bjoern/Petr)
+ Rainer sends regrets
+ created bibisect screencast to help QA guys.
+ trained people in how to do it at hack-fest
+ now no need for 'EasyHack' prefix for bug subjects in bugzilla anymore
+ MAB re-evaluation is useful but can create more work than fixing the 
bugs

Re: ancient openssl bundled


On Thu, 2012-04-19 at 17:09 +0200, Enrico Weigelt wrote:
 hmm, who exactly needs it ?

grep openssl */prj/build.lst

HTH,

Michael.

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

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

Re: Windows - Embed Server et al.


On Thu, 2012-04-19 at 16:34 +0200, Enrico Weigelt wrote:
  It is also used in Groupwise for editing mail.
 
 Groupwise calls LO as editor ?

Or Microsoft Word - Outlook also uses MS Word as it's editor, where are
you going with that ?

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: Removed unused code formula::ArgInput::GetArgSelection

2012-04-19 Thread jaime . navarro


Hi all,

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

Thanks.


Michael Meeks michael.me...@suse.com ha escrito:


Hi Jaime,

We need a blanket license statement that all the code you contribute is
made available under the terms of the MPL/LGPLv3+ dual license so we can
link you into:

http://wiki.documentfoundation.org/Development/Developers

Can you send that to this list ?

And thanks for the patch ! :-)

Michael.

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

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




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

Re: [REVIEW-3-5] fdo#46687 fix find toolbar crash ...

2012-04-19 Thread Bjoern Michaelsen

On Thu, Apr 19, 2012 at 02:38:47PM +0100, Michael Meeks wrote:
   I had a poke at this heisenbug (that disappears with SAL_SYNCHRONIZE
 set), and - after a bit of xtracing, discovered that (rather
 un-satisfyingly) that the attached patch fixes it; it should be entirely
 harmless if not entirely explained [ the error push/pop should stop this
 happening anyway ].
 
   Tripple review for libreoffice-3-5-3 and one more for libreoffice-3-5
 if possible.
 
 From 6d97ea37bba52b21648c91276bc9281d06cdd148 Mon Sep 17 00:00:00 2001

Patch itself looks good, doing a build right now with it. Thanks so much for
this. I would love to give you a signoff right away, but gotta run now. I will
report back in the evening.

Best,

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

Re: Windows - Embed Server et al.


 On Thu, 2012-04-19 at 16:34 +0200, Enrico Weigelt wrote:
 It is also used in Groupwise for editing mail.
  
  Groupwise calls LO as editor ?
 
 Or Microsoft Word - 

And this works on other platforms, ets say, GNU/Linux, *BSD, etc, etc ?

hmm, does Groupwise client meanwhile fully work on GNU/Linux and *BSD ?
(sorry, my contact with Groupwise is practically limited to migrating
away to Zimbra ... ;-o)


cu
-- 
Mit freundlichen Grüßen / Kind regards 

Enrico Weigelt 
VNC - Virtual Network Consult GmbH 
Development 

Äußere Bayreuther Str. 55, D - 90409 Nürnberg 
Tel: +49 911 72303-30 
Fax: +49 911 72303-50 

enrico.weig...@vnc.biz; www.vnc.de 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] Opengrok remote attribute

Neat, updated patch works - committed, pushed  deployed. Thanks a
lot! :)

-- Thorsten


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

Re: Windows - Embed Server et al.

Hi Enrico,

On Thu, 2012-04-19 at 17:47 +0200, Enrico Weigelt wrote:
 And this works on other platforms, ets say, GNU/Linux, *BSD, etc, etc ?

I find it is often well worth engaging the brain before typing at the
keyboard and creating noise for others to have to read.

All the best,

Michael.

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

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

Re: unbuilded code in sd/source/ui/notes

2012-04-19 Thread Olivier Hallot

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi

Em 19-04-2012 07:43, Michael Meeks escreveu:
   Any chance you could 'git rm' the relevant code  push that
 Olivier ? :-)
 
   Thanks,
 
   Michael.
Done...

Thank you
- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Fundação responsável civilmente, de acordo com o direito civil
Detalhes Legais: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPkFvoAAoJEJp3R7nH3vLx3mkIAI2XireBO8vBtB+71EDioQFc
ELX4i4Q1A/Wc9jTrkfTIGDXbRMZAl8O+ZJulzf+AWz8XTeHnsuqbOU0k5josJ8ky
2HqGT1arildnUjli6EFRXbKWyyistDj+NTm+s5dueNnWo/CBLgLavmfinZnQIllL
hMByv6IPt4zXbVydUPAwaamP4Z+COSyL7X2vgNmNBkz8IbihVjEq/EZuWojziMhE
VHYSapwvT+pLtlA8+e5jRr1VFJpfh8ad0fl8kIeR2uiy85kzX+pgvab8Jp3fDRtL
GdmAe0jfXdIZ9htGf5RxirEkfXklJcygXmj+1d9PpzwO+Sla4CelOclS2DEPiyU=
=YtUX
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

2012-04-19 Thread Francois Tigeot

Hey,

On Thu, Apr 19, 2012 at 04:11:18PM +0100, Michael Meeks wrote:
 
 * tinderboxen / status (Norbert)
   + bytemark machine #2
   + working on *BSD in virtualbox with little
 joy help appreciated (Norbert)
   + need 3x BSD virtual-boxes (ideally)

I'd like to know a bit more about this item; Norbert, would you prefer real
boxes if possible ?

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

Re: Windows - Embed Server et al.

2012-04-19 Thread Mat M

Le Thu, 19 Apr 2012 10:03:04 +0200, Noel Grandin n...@peralex.com a  
écrit:



OOh, I really hope you're planning on working on:
https://bugs.freedesktop.org/show_bug.cgi?id=38808
That would make setting up windows build machines much easier.


Nope. I am not a so-skilled developer, alas.
shmget already found a solution for ATL, and I plan to add an option  
--with-atl-path to configure for that.



ActiveX/OLE is not compiled into LO on platforms other than Windows.



And what about EmbedServ ? It is needed for OLE Object embedding featured  
under *nix  BSD etc, no ?



Le Thu, 19 Apr 2012 12:28:46 +0200, Michael Meeks michael.me...@suse.com  
a écrit:




On Thu, 2012-04-19 at 11:26 +0300, Tor Lillqvist wrote:
 It looks like the ActiveX control was intended to allow embedding of  
LO

 inside InternetExplorer.

And *my* opinion is that such embedding opens up a horrible Pandora's
box of potential problems that we don't really have enough people to


It is also used in Groupwise for editing mail. One item in the


I was afraid of that. A real use case of the ActiveX ;)


Pandora's box is that 'framework' insists on storing your toolbar state
and applying it to all windows. So if the user turns the gallery on in
their top-level document window, it busts the E-mail editor :-) The
E-mail editor tries to hide ~all the formatting toolbars, which busts
the top-level document editing.

It'd be really wonderful to have a fix for that - to make the ActiveX
control independent of the framework madness trying to serialize it's
settings everywhere.


I am not enough skilled in C/C++ for that, and I think it is far from an  
EasyHack anyway, so ...



I don't really see removing it as an option though.


Of course.


HTH,

Yes, it helps :)


Michael.



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

Asynchronous use of SwHTMLParser - is this needed

2012-04-19 Thread Kohei Yoshida

Hi there,

I'm working on removing SvRefBase from SvParser to make its life cycle
a little more easier to understand.  I've checked the call sites of
all of its derived classes, and in most of those call sites, we could
easily replace it with scoped_ptr.  The only exception is the
SwHTMLParser, where its use involves asynchronous call to parse HTML
input.  This makes a bit non-trivial to manage its life cycle.

My question is, do we need to keep this asynchronicity of
SwHTMLParser, or is it okay to change it into a synchronous call like
the rest of SvParser uses?

Thanks,

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

[PUSHED-3-5 REVIEW-3-5-3] fdo#46687 fix find toolbar crash ...

2012-04-19 Thread Bjoern Michaelsen

On Thu, Apr 19, 2012 at 05:38:09PM +0200, Bjoern Michaelsen wrote:
 On Thu, Apr 19, 2012 at 02:38:47PM +0100, Michael Meeks wrote:
  I had a poke at this heisenbug (that disappears with SAL_SYNCHRONIZE
  set), and - after a bit of xtracing, discovered that (rather
  un-satisfyingly) that the attached patch fixes it; it should be entirely
  harmless if not entirely explained [ the error push/pop should stop this
  happening anyway ].
  
  Tripple review for libreoffice-3-5-3 and one more for libreoffice-3-5
  if possible.
  
  From 6d97ea37bba52b21648c91276bc9281d06cdd148 Mon Sep 17 00:00:00 2001
 
 Patch itself looks good, doing a build right now with it. Thanks so much for
 this. I would love to give you a signoff right away, but gotta run now. I will
 report back in the evening.

Tested (on master) -- works beautifully.

Pushed to -3-5, still needs two signoffs for 3-5-3.

Best,

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

[PATCH] Modify unusedcode.easy

2012-04-19 Thread Xavi Escriche Galindo



  

0001-Modify-unusedcode.easy.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW 3-5-3] fdo#48856 update sheet-local named expressions correctly

Hi,

Two reviews needed to cherry-pick to 3-5-3
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=9a9121929408e8ffc86b91606355ff5fe9514f7d

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

Thanks
  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


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

[Libreoffice] minor idl fixes

2012-04-19 Thread Tomas Hlavaty

Hi all,

bellow are some patches fixing minor issues with idl files.

Also I would like to ask:

1) Exceptions have message and context fields and there should be a
   constructor with arguments (java.lang.String m, java.lang.Object c)
   for those fields.  However, this doesn't seem to be applied
   consistently.  Also when an exception inherits, it should have a
   constructor with all fields for the super classes and itself.
   However, the context field is missing in such cases.  Is there some
   rule to this or is it arbitrary?

2) What is the meaning of 'published' in idl files?  It seems to be
   ignored in javamaker, or at least everything gets generated no matter
   what.  For example, there are enums or constants which are not marked
   as published but other public symbols depend on them.  Shouldn't
   those be public too then?

3) What is the meaning of simgleton referring to service referring to
   interface?  In the example bellow, the BrowseNodeFactory service
   doesn't seem to be generated from idl files.  Should this service be
   bypassed and the singleton reffer directly to the interface?

   module com { module sun { module star { module script { module browse {
   interface XBrowseNodeFactory : ::com::sun::star::uno::XInterface {
   com::sun::star::script::browse::XBrowseNode createView( [in] short 
viewType );
   };
   }; }; }; }; };
   module com { module sun { module star { module script { module browse {
   service BrowseNodeFactory
   {
   interface XBrowseNodeFactory;
   };
   singleton theBrowseNodeFactory
   {
   service BrowseNodeFactory;
   };
   }; }; }; }; };

Thank you,

Tomas

From 0f8ee80872a99fa0cf903580c00b6b0ec1bc6491 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty t...@logand.com
Date: Mon, 16 Jan 2012 19:55:42 +0100
Subject: [PATCH 1/7] idl type reference fixed

---
 offapi/com/sun/star/report/meta/XFormulaParser.idl |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/offapi/com/sun/star/report/meta/XFormulaParser.idl b/offapi/com/sun/star/report/meta/XFormulaParser.idl
index bc7575b..665f307 100644
--- a/offapi/com/sun/star/report/meta/XFormulaParser.idl
+++ b/offapi/com/sun/star/report/meta/XFormulaParser.idl
@@ -55,7 +55,7 @@ interface XFormulaParser
 
 Names and symbols not defined here lead to a parser/print error.
  */
-[attribute] sequence sheet::FormulaOpCodeMapEntry  OpCodeMap;
+[attribute] sequence com::sun::star::sheet::FormulaOpCodeMapEntry  OpCodeMap;
 
 /** return the mapper for op codes.
 */
-- 
1.7.5.4

From 518fd00501fc968872691b75a901dc718afa2ff7 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty t...@logand.com
Date: Sun, 22 Jan 2012 18:05:20 +0100
Subject: [PATCH 2/7] add missing #ifndef

---
 udkapi/com/sun/star/corba/corba.idl |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/udkapi/com/sun/star/corba/corba.idl b/udkapi/com/sun/star/corba/corba.idl
index 45c239a..8f5d62b 100644
--- a/udkapi/com/sun/star/corba/corba.idl
+++ b/udkapi/com/sun/star/corba/corba.idl
@@ -25,6 +25,9 @@
  * for a copy of the LGPLv3 License.
  *
  /
+#ifndef __com_sun_star_corba_corba_idl__
+#define __com_sun_star_corba_corba_idl__
+
 module com { module sun { module star { module corba
 {
 /**
@@ -103,4 +106,6 @@ module com { module sun { module star { module corba
 
 }; }; }; };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
1.7.5.4

From b2878038a08f3511c012451ab602d713ab0e1f1c Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty t...@logand.com
Date: Tue, 24 Jan 2012 09:45:16 +0100
Subject: [PATCH 3/7] idl fix package for CorbaString8 and CorbaUnion

---
 udkapi/com/sun/star/corba/giop/giop.idl |   10 +-
 udkapi/com/sun/star/corba/iiop/iiop.idl |6 +++---
 udkapi/com/sun/star/corba/iop/iop.idl   |2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
index 1a8da38..a5b71fd 100644
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ b/udkapi/com/sun/star/corba/giop/giop.idl
@@ -96,7 +96,7 @@ published   struct RequestHeader_1_0
 unsigned long request_id;
 boolean response_expected;
 sequence  byte  object_key;
-CorbaString8 operation;
+com::sun::star::corba::CorbaString8 operation;
 sequence  byte  requesting_principal;
 };
 
@@ -112,7 +112,7 @@ published   struct RequestHeader_1_1
 byte reserved_2;
 byte reserved_3; // Added in GIOP 1.1
 sequence byte object_key;
-CorbaString8 operation;
+com::sun::star::corba::CorbaString8 operation;
 sequence byte requesting_principal; // binary compatible
 };
 
@@ -138,7 +138,7 @@ published constants TargetAddressGroup
 /**
   @deprecated
  */
-published struct TargetAddress : CorbaUnion
+published struct TargetAddress :

[PATCH] fdo#47436: FILEOPEN: Writer crashes when it opens an odt file produced by JasperReport


Hi!

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

Hi!

editeng/source/items/frmitems.cxx:1954

1951:   for (int n(0); n != SAL_N_ELEMENTS(aBorders); ++n)
1952:   {
1953:   editeng::SvxBorderLine* pLine = const_cast editeng::SvxBorderLine*
( GetLine( aBorders[n] ) );
1954:   pLine-SetStyle( eBorderStyle );
1956:   }

Here pLine is a NULL pointer, so calling its member function (SetStyle) causes
SIGSEGV.

aBorders is just an array with 4 elements: { BOX_LINE_LEFT, BOX_LINE_RIGHT, 
BOX_LINE_BOTTOM, BOX_LINE_TOP }
GetLine returns pLeft, pTop, pRight, pBottom. All of these are NULL pointers in 
this case.
These get their values in sw/source/core/unocore/unoframe.cxx (from line 370)

370:const ::uno::Any* pLeft= 0;
371:GetProperty(RES_BOX, LEFT_BORDER  |CONVERT_TWIPS,pLeft  );

pLeft remains NULL after this (and pTop, pRight, pBottom too)

so these:
396:SvxBoxItem aBox ( static_cast  const :: SvxBoxItem   ( rFromSet.Get 
( RES_BOX ) ) );
397:if( pLeft )
398:bRet = ((SfxPoolItem)aBox).PutValue(*pLeft, 
CONVERT_TWIPS|LEFT_BORDER );
are not executed, and aBox's pLeft (etc) members remain NULLs.
but this:
415:if( pLineStyle )
416:bRet = ((SfxPoolItem)aBox).PutValue(*pLineStyle, LINE_STYLE);
gets executed, and this has a call to pLine-SetStyle (line 1954 mentioned 
earlier)

Putting 'if( pLine )' before line 1954 causes LO to load the document.

PS.: Like on bug's page. It isn't sure that the odt is valid, but it shouldn't 
crash anyway.

Szabolcs
  From 13cd12140c9b5f345c720c4aa9fb7e17885f02e9 Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Fri, 20 Apr 2012 00:45:35 +0200
Subject: [PATCH] Workaround for Bug 47436, Crash while opening odt file

---
 editeng/source/items/frmitems.cxx |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 3cca643..0098af0 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1951,7 +1951,8 @@ bool SvxBoxItem::PutValue( const uno::Any rVal, sal_uInt8 nMemberId )
 for (int n(0); n != SAL_N_ELEMENTS(aBorders); ++n)
 {
 editeng::SvxBorderLine* pLine = const_cast editeng::SvxBorderLine* ( GetLine( aBorders[n] ) );
-pLine-SetStyle( eBorderStyle );
+if( pLine )
+pLine-SetStyle( eBorderStyle );
 }
 return sal_True;
 }
-- 
1.7.7

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

Re: Windows - Embed Server et al.