date:20141218

 tools/source/debug/debug.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 146bd125a01742b2a6561a4a23735f37867d8221
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 10:19:14 2014 +0100

Work around a Clang trunk (towards 3.6) -Werror,-Wunused-value

Change-Id: I3ee32c5bd379bb851f8f255faa93d96227dcff84

diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 9e65c44..093622e 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -324,7 +324,20 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const 
css::uno::Any  caught, const c
 }
 if ( exception.Context.is() )
 {
+#if defined __clang__
+#if __has_warning(-Wunused-value)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored -Wunused-value
+// expression with side effects will be evaluated despite being used as an
+// operand to 'typeid'
+#endif
+#endif
 const char* pContext = typeid( *exception.Context.get() ).name();
+#if defined __clang__
+#if __has_warning(-Wunused-value)
+#pragma GCC diagnostic pop
+#endif
+#endif
 sMessage += \ncontext: ;
 sMessage += pContext;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-18 Thread Markus Mohrhard

 cui/source/options/optgdlg.cxx |2 +-
 vcl/source/opengl/OpenGLHelper.cxx |   19 +--
 2 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit ae177f5b9965684c1a358aa43e5957cff218210b
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Dec 18 10:13:40 2014 +0100

ifix the OpenGL UI config part

Change-Id: I931a4b618f35188e4e0cca07305ff15bbbacc20a

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 55222bc9..28e0677 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -146,7 +146,7 @@ OpenGLCfg::~OpenGLCfg()
 boost::shared_ptr comphelper::ConfigurationChanges  batch( 
comphelper::ConfigurationChanges::create() );
 officecfg::Office::Common::VCL::UseOpenGL::set(mbUseOpenGL, batch);
 officecfg::Office::Common::VCL::ForceOpenGL::set(mbForceOpenGL, batch);
-
+batch-commit();
 }
 }
 
diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index 7f4cf36..a30b9ef 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -401,6 +401,17 @@ bool OpenGLHelper::supportsVCLOpenGL()
 
 bool OpenGLHelper::isVCLOpenGLEnabled()
 {
+/**
+ * The !bSet part should only be called once! Changing the results in the 
same
+ * run will mix OpenGL and normal rendering.
+ */
+static bool bSet = false;
+static bool bEnable = false;
+static bool bForceOpenGL = false;
+if (bSet)
+{
+return bForceOpenGL || bEnable;
+}
 /*
  * There are a number of cases that these environment variables cover:
  *  * SAL_FORCEGL forces OpenGL independent of any other option
@@ -408,16 +419,20 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
  *  * SAL_ENABLEGL overrides VCL_HIDE_WINDOWS and the configuration 
variable
  *  * the configuration variable is checked if no environment variable is 
set
  */
-static bool bForceOpenGL = !!getenv(SAL_FORCEGL) || 
officecfg::Office::Common::VCL::ForceOpenGL::get();
+
+bSet = true;
+bForceOpenGL = !!getenv(SAL_FORCEGL) || 
officecfg::Office::Common::VCL::ForceOpenGL::get();
 if (bForceOpenGL)
 return true;
 
 if (!supportsVCLOpenGL())
+{
 return false;
+}
 
 static bool bEnableGLEnv = !!getenv(SAL_ENABLEGL);
 
-bool bEnable = bEnableGLEnv;
+bEnable = bEnableGLEnv;
 
 static bool bDuringBuild = getenv(VCL_HIDE_WINDOWS);
 if (bDuringBuild  !bEnable /* env. enable overrides */)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit supports inline edit feature now

Hi David,

On Thu, Dec 18, 2014 at 09:34:24AM +0100, David Ostrovsky d.ostrov...@gmx.de 
wrote:
 I am looking forward to see Gerrit @ LibreOffice upgraded to upcoming
 2.11 release that contains inline edit feature.

We expect that contributors build their changes, test it manually and
also run the unit tests before submitting. How the inline edit mode make
that possible?

Regards,

Miklos


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

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

 editeng/source/items/textitem.cxx   |   10 ++
 include/editeng/fhgtitem.hxx|2 ++
 sw/source/core/docnode/nodedump.cxx |   12 
 3 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 2a6dc39ba96648a296fcad29a7a0a44f7e749e2a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 18 10:49:35 2014 +0100

Factor out SvxFontHeightItem::dumpAsXml() from sw

Change-Id: I8dc3a0ed7bfce62b0d20c6bff143d77c0f26963f

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 3ea6bb7..16870d9 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1128,6 +1128,16 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 
nNewHeight, sal_uInt16 nNewProp,
 ePropUnit = eMetric;
 }
 
+void SvxFontHeightItem::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST(svxFontHeightItem));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST(whichId), 
BAD_CAST(OString::number(Which()).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST(height), 
BAD_CAST(OString::number(nHeight).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST(prop), 
BAD_CAST(OString::number(nProp).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST(propUnit), 
BAD_CAST(OString::number(ePropUnit).getStr()));
+xmlTextWriterEndElement(pWriter);
+}
+
 // class SvxFontWidthItem ---
 
 SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16 
nPrp, const sal_uInt16 nId ) :
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index e069f1b..7034dcf 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -91,6 +91,8 @@ public:
 sal_uInt16 GetProp() const { return nProp; }
 
 SfxMapUnit GetPropUnit() const { return ePropUnit;  }   // Percent, Twip, 
...
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 #endif
diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index a83799b..f6cd7f8 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -414,11 +414,15 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const 
SfxItemSet* pSet)
 static_castconst SwNumRuleItem*(pItem)-dumpAsXml(writer);
 break;
 case RES_CHRATR_FONT:
+case RES_CHRATR_CTL_FONT:
 static_castconst SvxFontItem*(pItem)-dumpAsXml(writer);
 break;
 case RES_CHRATR_BACKGROUND:
 static_castconst SvxBrushItem*(pItem)-dumpAsXml(writer);
 break;
+case RES_CHRATR_FONTSIZE:
+static_castconst 
SvxFontHeightItem*(pItem)-dumpAsXml(writer);
+break;
 default: bDone = false; break;
 }
 if (bDone)
@@ -433,14 +437,6 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const 
SfxItemSet* pSet)
 boost::optionalOString oValue;
 switch (pItem-Which())
 {
-case RES_CHRATR_CTL_FONT: pWhich = character ctl font; break;
-case RES_CHRATR_FONTSIZE:
-{
-pWhich = character font size;
-const SvxFontHeightItem* pFontHeightItem = static_castconst 
SvxFontHeightItem*(pItem);
-oValue = nHeight:  + 
OString::number(pFontHeightItem-GetHeight()) + , nProp:  + 
OString::number(pFontHeightItem-GetProp());
-break;
-}
 case RES_CNTNT:
 {
 pWhich = content;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/Bootstrap

2014-12-18 Thread Tomaž Vajngerl

 android/Bootstrap/no-resource-compress-24.xml |   45 ++
 1 file changed, 45 insertions(+)

New commits:
commit bcb4f01de2d6f6a9d06ca7dfd14fa80e725f5a81
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.co.uk
Date:   Thu Dec 18 18:47:26 2014 +0900

android: support building with SDK tools 24

Change-Id: I424e81b849d7e0ec5c61eddcc70279e3559885d1

diff --git a/android/Bootstrap/no-resource-compress-24.xml 
b/android/Bootstrap/no-resource-compress-24.xml
new file mode 100644
index 000..2b29782
--- /dev/null
+++ b/android/Bootstrap/no-resource-compress-24.xml
@@ -0,0 +1,45 @@
+?xml version=1.0 encoding=UTF-8?
+project name=clobber_android_rules default=debug
+
+import file=${sdk.dir}/tools/ant/build.xml /
+
+!--
+This is copy/pasted from ${sdk.dir}/tools/ant/build.xml
+and tweaked - it needs to match the same SDK version as
+your build
+--
+
+!--
+This file is auto-generated by Bootstrap/Makefile.shared from
+a versioned .xml file - please edit me there
+--
+
+target name=-package-resources depends=-crunch
+!-- only package resources if *not* a library project --
+do-only-if-not-library elseText=Library project: do not package 
resources... 
+aapt executable=${aapt}
+command=package
+versioncode=${version.code}
+versionname=${version.name}
+debug=${build.is.packaging.debug}
+manifest=${out.manifest.abs.file}
+assets=${asset.absolute.dir}
+androidjar=${project.target.android.jar}
+apkfolder=${out.absolute.dir}
+nocrunch=${build.packaging.nocrunch}
+resourcefilename=${resource.package.file.name}
+resourcefilter=${aapt.resource.filter}
+libraryResFolderPathRefid=project.library.res.folder.path
+libraryPackagesRefid=project.library.packages
+libraryRFileRefid=project.library.bin.r.file.path
+previousBuildType=${build.last.target}
+buildType=${build.target}
+ignoreAssets=${aapt.ignore.assets}
+res path=${out.res.absolute.dir} /
+res path=${resource.absolute.dir} /
+nocompress/ !-- forces no compression on any files in 
assets or res/raw --
+!-- nocompress extension=xml / forces no compression on 
specific file extensions in assets and res/raw --
+/aapt
+/do-only-if-not-library
+/target
+/project
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 offapi/com/sun/star/awt/XToolkitExperimental.idl |   11 --
 toolkit/source/awt/vclxtoolkit.cxx   |   25 ---
 2 files changed, 1 insertion(+), 35 deletions(-)

New commits:
commit 58bec49af36c3e7554bf20664ac15c45b1ce88c4
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 18 11:11:04 2014 +0200

Kill createScreenCompatibleDeviceUsingBuffer

A certain 3rd party uses processEventsToIdle() from XToolkitExperimental, 
and
their code is not C++, so it should be OK to change the ABI of
XToolkitExperimental, says mmeeks.

Change-Id: I4ba641ad98c17ae42a2ae2eff389fd3354618597

diff --git a/offapi/com/sun/star/awt/XToolkitExperimental.idl 
b/offapi/com/sun/star/awt/XToolkitExperimental.idl
index 7114446..d120290 100644
--- a/offapi/com/sun/star/awt/XToolkitExperimental.idl
+++ b/offapi/com/sun/star/awt/XToolkitExperimental.idl
@@ -19,17 +19,6 @@ module com {  module sun {  module star {  module awt {
 
 interface XToolkitExperimental : XToolkit2
 {
-  /** Don't use this.
-   */
-
-  com::sun::star::awt::XDevice createScreenCompatibleDeviceUsingBuffer( [in] 
long Width,
-[in] 
long Height,
-[in] 
long ScaleNumerator,
-[in] 
long ScaleDenominator,
-[in] 
long XOffset,
-[in] 
long YOffset,
-[in] 
hyper AddressOfMemoryBufferForSharedArrayWrapper );
-
   /** Process all pending idle events
*/
   void processEventsToIdle();
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 680fc0c..38b55027 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -64,11 +64,6 @@
 #include postmac.h
 #endif
 
-#ifdef ANDROID
-#include sal/ByteBufferWrapper.hxx
-using org::libreoffice::touch::ByteBufferWrapper;
-#endif
-
 #include vcl/sysdata.hxx
 
 #include toolkit/awt/vclxwindows.hxx
@@ -195,8 +190,6 @@ public:
 virtual ~VCLXToolkit();
 
 // css::awt::XToolkitExperimental
-css::uno::Reference css::awt::XDevice   SAL_CALL 
createScreenCompatibleDeviceUsingBuffer( sal_Int32 Width, sal_Int32 Height, 
sal_Int32 ScaleNumerator, sal_Int32 ScaleDenominator, sal_Int32 XOffset, 
sal_Int32 YOffset, sal_Int64 AddressOfMemoryBufferForSharedArrayWrapper ) throw
-(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 virtual void SAL_CALL processEventsToIdle()
 throw (::com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
 
@@ -730,11 +723,6 @@ void SAL_CALL VCLXToolkit::disposing()
 
 ::com::sun::star::uno::Reference ::com::sun::star::awt::XDevice  
VCLXToolkit::createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) 
throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-return createScreenCompatibleDeviceUsingBuffer( Width, Height, 1, 1, 0, 0, 
0 );
-}
-
-::com::sun::star::uno::Reference ::com::sun::star::awt::XDevice  
VCLXToolkit::createScreenCompatibleDeviceUsingBuffer( sal_Int32 Width, 
sal_Int32 Height, sal_Int32 ScaleNumerator, sal_Int32 ScaleDenominator, 
sal_Int32 XOffset, sal_Int32 YOffset, sal_Int64 
addressOfMemoryBufferForSharedArrayWrapper ) 
throw(::com::sun::star::uno::RuntimeException, std::exception)
-{
 ::osl::Guard ::osl::Mutex  aGuard( GetMutex() );
 
 ::com::sun::star::uno::Reference ::com::sun::star::awt::XDevice  xRef;
@@ -743,18 +731,7 @@ void SAL_CALL VCLXToolkit::disposing()
 SolarMutexGuard aSolarGuard;
 
 VirtualDevice* pV = new VirtualDevice;
-if ( addressOfMemoryBufferForSharedArrayWrapper != 0 ) {
-#if defined(ANDROID)
-ByteBufferWrapper *bbw = (ByteBufferWrapper *) (intptr_t) 
addressOfMemoryBufferForSharedArrayWrapper;
-pV-SetOutputSizePixelScaleOffsetAndBuffer( Size( Width, Height ), 
Fraction(ScaleNumerator, ScaleDenominator), Point( XOffset, YOffset), 
basebmp::RawMemorySharedArray( bbw-pointer(), *bbw ));
-#else
-pV-SetOutputSizePixelScaleOffsetAndBuffer( Size( Width, Height ),
-Fraction(ScaleNumerator, ScaleDenominator), Point( XOffset, 
YOffset),
-basebmp::RawMemorySharedArray( reinterpret_castsal_uInt8*( 
addressOfMemoryBufferForSharedArrayWrapper )));
-#endif
-} else {
-pV-SetOutputSizePixel( Size( Width, Height ) );
-}
+pV-SetOutputSizePixel( Size( Width, Height ) );
 pVDev-SetVirtualDevice( pV );
 
 xRef = pVDev;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 tools/source/debug/debug.cxx |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 47cd375d88a980f01d9ee04debf896be61d0875a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 11:00:26 2014 +0100

Revert Work around a Clang trunk (towards 3.6) -Werror,-Wunused-value

This reverts commit 146bd125a01742b2a6561a4a23735f37867d8221,
Clang's r224465 does not look really useful the way it is, so work around
that directly in Clang for now.

diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 093622e..9e65c44 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -324,20 +324,7 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const 
css::uno::Any  caught, const c
 }
 if ( exception.Context.is() )
 {
-#if defined __clang__
-#if __has_warning(-Wunused-value)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored -Wunused-value
-// expression with side effects will be evaluated despite being used as an
-// operand to 'typeid'
-#endif
-#endif
 const char* pContext = typeid( *exception.Context.get() ).name();
-#if defined __clang__
-#if __has_warning(-Wunused-value)
-#pragma GCC diagnostic pop
-#endif
-#endif
 sMessage += \ncontext: ;
 sMessage += pContext;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/uiconfig vcl/uiconfig

2014-12-18 Thread Adolfo Jayme Barrientos

 sd/uiconfig/sdraw/ui/printeroptions.ui |   19 +--
 vcl/uiconfig/ui/printdialog.ui |1 +
 vcl/uiconfig/ui/printerpaperpage.ui|1 +
 vcl/uiconfig/ui/printerpropertiesdialog.ui |4 +++-
 vcl/uiconfig/ui/printprogressdialog.ui |8 +++-
 5 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit 3aa96e9f478a7549e04658dc4db234bde63603ea
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Thu Dec 11 04:56:26 2014 -0600

Small tweaks to printing UI

Change-Id: I600e7dd96bcf1e173398a51f63efd66300853fb0
Reviewed-on: https://gerrit.libreoffice.org/12492
Reviewed-by: Katarina Behrens bu...@bubli.org
Tested-by: Katarina Behrens bu...@bubli.org

diff --git a/sd/uiconfig/sdraw/ui/printeroptions.ui 
b/sd/uiconfig/sdraw/ui/printeroptions.ui
index b318e5a..1c2f330 100644
--- a/sd/uiconfig/sdraw/ui/printeroptions.ui
+++ b/sd/uiconfig/sdraw/ui/printeroptions.ui
@@ -1,12 +1,14 @@
 ?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.18.3 --
 interface
-  !-- interface-requires gtk+ 3.0 --
+  requires lib=gtk+ version=3.0/
   object class=GtkBox id=box
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
 property name=orientationvertical/property
+property name=spacing12/property
 child
   object class=GtkFrame id=contents
 property name=visibleTrue/property
@@ -17,12 +19,14 @@
   object class=GtkAlignment id=alignment1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=top_padding6/property
 property name=left_padding12/property
 child
   object class=GtkBox id=box2
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=orientationvertical/property
+property name=spacing6/property
 child
   object class=GtkCheckButton id=printname
 property name=label translatable=yesPage 
name/property
@@ -30,7 +34,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=xalign0/property
 property name=draw_indicatorTrue/property
   /object
@@ -47,7 +50,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=xalign0/property
 property name=draw_indicatorTrue/property
   /object
@@ -88,12 +90,14 @@
   object class=GtkAlignment id=alignment2
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=top_padding6/property
 property name=left_padding12/property
 child
   object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=orientationvertical/property
+property name=spacing6/property
 child
   object class=GtkRadioButton id=originalcolors
 property name=label translatable=yesOriginal 
size/property
@@ -101,7 +105,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=xalign0/property
 property name=activeTrue/property
 property name=draw_indicatorTrue/property
@@ -120,7 +123,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=xalign0/property
 property name=activeTrue/property
 property name=draw_indicatorTrue/property
@@ -139,7 +141,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=xalign0/property
 property

Re: Gerrit supports inline edit feature now

2014-12-18 Thread Michael Meeks


On Thu, 2014-12-18 at 10:49 +0100, Miklos Vajna wrote:
 On Thu, Dec 18, 2014 at 09:34:24AM +0100, David Ostrovsky 
 d.ostrov...@gmx.de wrote:
  I am looking forward to see Gerrit @ LibreOffice upgraded to upcoming
  2.11 release that contains inline edit feature.
 
 We expect that contributors build their changes, test it manually and
 also run the unit tests before submitting. How the inline edit mode make
 that possible?

-   // that sounds like a stupid idea
+   // actually this is really cool for small changes

Also - we have various solutions to allow central compilation coming -
right.

;-)

Michael.

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

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

[Libreoffice-commits] core.git: include/comphelper

2014-12-18 Thread Takeshi Abe

 include/comphelper/servicehelper.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18621545e4b33039091283c58e340021199fefbf
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Dec 18 19:45:29 2014 +0900

fix typo

Change-Id: I3a1ae61f1d6aff3129937dbf584eaec6b7f002b8

diff --git a/include/comphelper/servicehelper.hxx 
b/include/comphelper/servicehelper.hxx
index a96285e..73064cd 100644
--- a/include/comphelper/servicehelper.hxx
+++ b/include/comphelper/servicehelper.hxx
@@ -46,7 +46,7 @@ public:
 Usage:
 Put a UNO3_GETIMPLEMENTATION_DECL( classname ) inside your class
 definitian and UNO3_GETIMPLEMENTATION_IMPL( classname ) inside
-your cxx file. Your class must inherit 
::com::sun::star::uno::XUnoTunnel
+your cxx file. Your class must inherit 
::com::sun::star::lang::XUnoTunnel
 and export it with queryInterface. Implementation of XUnoTunnel is
 done by this macro.
 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit supports inline edit feature now

2014-12-18 Thread Bjoern Michaelsen

Hi,

On Thu, Dec 18, 2014 at 10:19:08AM +, Michael Meeks wrote:
 - // that sounds like a stupid idea
 + // actually this is really cool for small changes
 
   Also - we have various solutions to allow central compilation coming -
 right.
 
   ;-)

Yes, inline editing is an important and cool thing. If our workflow cant handle
that, we need to adapt it (e.g. more, earlier CI and unittests) not the other
way around. ;)

Best,

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

Re: Gerrit supports inline edit feature now

2014-12-18 Thread Markus Mohrhard

Hey,

On Thu, Dec 18, 2014 at 11:47 AM, Bjoern Michaelsen 
bjoern.michael...@canonical.com wrote:

 Hi,

 On Thu, Dec 18, 2014 at 10:19:08AM +, Michael Meeks wrote:
  - // that sounds like a stupid idea
  + // actually this is really cool for small changes
 
Also - we have various solutions to allow central compilation
 coming -
  right.
 
;-)

 Yes, inline editing is an important and cool thing. If our workflow cant
 handle
 that, we need to adapt it (e.g. more, earlier CI and unittests) not the
 other
 way around. ;)


It is not that easy. This feature shifts some of the work from the
developer to the reviewer. IMHO our reviewers are already one of the
weakest link in our development process as reviewing is normally only done
by the people who have been working on the code for a long time and know
the code quite well.

I'd like to see solutions that shift work from these people and make it
easier for new reviewers to come in and not make their job more complex and
more demanding.

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

[Libreoffice-commits] core.git: 2 commits - include/sal odk/Package_odk_headers.mk Repository.mk RepositoryModule_host.mk toolkit/Library_tk.mk touch/Library_libotouch.mk touch/Makefile touch/Module_t

 Repository.mk  |1 
 RepositoryModule_host.mk   |1 
 include/sal/ByteBufferWrapper.hxx  |   40 -
 odk/Package_odk_headers.mk |1 
 toolkit/Library_tk.mk  |6 
 touch/Library_libotouch.mk |   28 
 touch/Makefile |7 -
 touch/Module_touch.mk  |   22 
 touch/README   |   22 
 touch/source/android/android.cxx   |   50 -
 touch/source/generic/libotouch.cxx |   11 
 11 files changed, 189 deletions(-)

New commits:
commit a2e4be6ded508030a6c2a33919cbe8cb504382e0
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 18 12:04:22 2014 +0200

The touch module, ByteBufferWrapper, and the libotouch library can go away 
now

Change-Id: I6f4a6679c263ac81d1cf5c66f18782e857da5ff8

diff --git a/Repository.mk b/Repository.mk
index 58fee03..8b4e62e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -201,7 +201,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
-   libotouch \
 ))
 
 endif
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index f6a9c6e..0a9f428 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -137,7 +137,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
testtools \
toolkit \
tools \
-   touch \
tubes \
ucb \
ucbhelper \
diff --git a/include/sal/ByteBufferWrapper.hxx 
b/include/sal/ByteBufferWrapper.hxx
deleted file mode 100644
index d90fec5..000
--- a/include/sal/ByteBufferWrapper.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_SAL_BYTEBUFFERWRAPPER_HXX
-#define INCLUDED_SAL_BYTEBUFFERWRAPPER_HXX
-
-#ifdef ANDROID
-
-#include jni.h
-
-#include sal/types.h
-
-namespace org { namespace libreoffice { namespace touch {
-
-class ByteBufferWrapper
-{
-private:
-jobject object;
-
-public:
-ByteBufferWrapper(JNIEnv *env, jobject o);
-
-sal_uInt8* pointer();
-
-void operator()(sal_uInt8 *p);
-};
-
-}; }; };
-
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk
index 0154e3a..4618fcc 100644
--- a/odk/Package_odk_headers.mk
+++ b/odk/Package_odk_headers.mk
@@ -151,7 +151,6 @@ $(eval $(call 
gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
rtl/ustring.h \
rtl/ustring.hxx \
rtl/uuid.h \
-   sal/ByteBufferWrapper.hxx \
sal/alloca.h \
sal/config.h \
sal/detail/log.h \
diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk
deleted file mode 100644
index 1d6b289..000
--- a/touch/Library_libotouch.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$(eval $(call gb_Library_Library,libotouch))
-
-$(eval $(call gb_Library_use_sdk_api,libotouch))
-$(eval $(call gb_Library_add_exception_objects,libotouch,\
-   touch/source/generic/libotouch \
-))
-
-ifeq ($(OS),ANDROID)
-
-$(eval $(call gb_Library_use_libraries,libotouch,\
-   lo-bootstrap \
-))
-
-$(eval $(call gb_Library_add_exception_objects,libotouch,\
-   touch/source/android/android \
-))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/touch/Makefile b/touch/Makefile
deleted file mode 100644
index ccb1c85..000
--- a/touch/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/touch/Module_touch.mk b/touch/Module_touch.mk
deleted file mode 100644
index 10e84fd..000
--- a/touch/Module_touch.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$(eval $(call gb_Module_Module,touch))
-
-ifneq (,$(filter IOS ANDROID,$(OS)))

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

2014-12-18 Thread Luboš Luňák

 vcl/inc/openglgdiimpl.hxx |   10 -
 vcl/opengl/gdiimpl.cxx|   78 ++
 2 files changed, 79 insertions(+), 9 deletions(-)

New commits:
commit 783ba49aa0cd068c7e3dacdd3c13e9c37cf52e22
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Thu Dec 18 11:47:58 2014 +0100

draw also opengl polygon with AA edges if AA is wanted

Especially given that lines are sometimes actually drawn using polygons.

Change-Id: I429a24faff94f8b9accc20bdee3ff66f47669bde

diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 2c911ee..4ca30b3 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -56,6 +56,9 @@ protected:
 
 SalColor mnLineColor;
 SalColor mnFillColor;
+#ifdef DBG_UTIL
+bool mProgramIsSolidLineColor;
+#endif
 
 void ImplInitClipRegion();
 void ImplSetClipBit( const vcl::Region rClip, GLuint nMask );
@@ -67,20 +70,21 @@ public:
 bool UseSolid( SalColor nColor, sal_uInt8 nTransparency );
 bool UseSolid( SalColor nColor, double fTransparency );
 bool UseSolid( SalColor nColor );
+bool UseSolidAA( SalColor nColor, double fTransparency );
 bool UseSolidAA( SalColor nColor );
 bool UseInvert();
 
 void DrawPoint( long nX, long nY );
-void DrawLine( long nX1, long nY1, long nX2, long nY2 );
+void DrawLine( double nX1, double nY1, double nX2, double nY2 );
 void DrawLines( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose );
-void DrawLineAA( long nX1, long nY1, long nX2, long nY2 );
+void DrawLineAA( double nX1, double nY1, double nX2, double nY2 );
 void DrawLinesAA( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose 
);
 void DrawConvexPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
 void DrawConvexPolygon( const Polygon rPolygon );
 void DrawRect( long nX, long nY, long nWidth, long nHeight );
 void DrawRect( const Rectangle rRect );
 void DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
-void DrawPolyPolygon( const basegfx::B2DPolyPolygon rPolyPolygon );
+void DrawPolyPolygon( const basegfx::B2DPolyPolygon rPolyPolygon, bool 
blockAA = false );
 void DrawRegionBand( const RegionBand rRegion );
 void DrawTextureRect( OpenGLTexture rTexture, const SalTwoRect rPosAry, 
bool bInverted = false );
 void DrawTexture( OpenGLTexture rTexture, const SalTwoRect rPosAry, bool 
bInverted = false );
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 69db79b..f75966f 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -47,6 +47,9 @@ OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics 
rParent, SalGeometryPr
 , mbOffscreen(false)
 , mnLineColor(SALCOLOR_NONE)
 , mnFillColor(SALCOLOR_NONE)
+#ifdef DBG_UTIL
+, mProgramIsSolidLineColor(false)
+#endif
 {
 }
 
@@ -162,6 +165,9 @@ void OpenGLSalGraphicsImpl::PostDraw()
 {
 mpProgram-Clean();
 mpProgram = NULL;
+#ifdef DBG_UTIL
+mProgramIsSolidLineColor = false;
+#endif
 }
 
 CHECK_GL_ERROR();
@@ -192,7 +198,7 @@ void OpenGLSalGraphicsImpl::ImplSetClipBit( const 
vcl::Region rClip, GLuint nMa
 if( rClip.getRegionBand() )
 DrawRegionBand( *rClip.getRegionBand() );
 else
-DrawPolyPolygon( rClip.GetAsB2DPolyPolygon() );
+DrawPolyPolygon( rClip.GetAsB2DPolyPolygon(), true );
 }
 
 glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
@@ -354,6 +360,9 @@ bool OpenGLSalGraphicsImpl::UseProgram( const OUString 
rVertexShader, const OUS
 if( mpProgram != NULL )
 mpProgram-Clean();
 mpProgram = mpContext-UseProgram( rVertexShader, rFragmentShader );
+#ifdef DBG_UTIL
+mProgramIsSolidLineColor = false; // UseSolid() will set to true if needed
+#endif
 return ( mpProgram != NULL );
 }
 
@@ -364,6 +373,9 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor, 
sal_uInt8 nTransparency )
 if( !UseProgram( dumbVertexShader, solidFragmentShader ) )
 return false;
 mpProgram-SetColor( color, nColor, nTransparency );
+#ifdef DBG_UTIL
+mProgramIsSolidLineColor = true;
+#endif
 return true;
 }
 
@@ -374,6 +386,9 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor, 
double fTransparency )
 if( !UseProgram( dumbVertexShader, solidFragmentShader ) )
 return false;
 mpProgram-SetColorf( color, nColor, fTransparency );
+#ifdef DBG_UTIL
+mProgramIsSolidLineColor = true;
+#endif
 return true;
 }
 
@@ -383,17 +398,22 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor )
 }
 
 // Like UseSolid(), but sets up for AA drawing, which uses gradients to create 
the AA.
-bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor )
+bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor, double fTransparency )
 {
 if( !mrParent.getAntiAliasB2DDraw())
 return UseSolid( nColor );
 if( !UseProgram( textureVertexShader,

Re: Gerrit supports inline edit feature now

2014-12-18 Thread Bjoern Michaelsen

Hi,

On Thu, Dec 18, 2014 at 11:55:35AM +0100, Markus Mohrhard wrote:
 IMHO our reviewers are already one of the weakest link in our development
 process as reviewing is normally only done by the people who have been
 working on the code for a long time and know the code quite well.

So, if reviewers are the bottleneck, how do we create more reviewers? Would
e.g. generating more contributors help there?

Best,

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

[Libreoffice-commits] core.git: 2 commits - dbaccess/source filter/source include/comphelper package/source reportdesign/source sc/source sd/source sfx2/source sw/qa test/source xmlhelp/source

 dbaccess/source/filter/xml/xmlfilter.cxx   |2 -
 filter/source/xsltdialog/xmlfilterjar.cxx  |4 +--
 include/comphelper/documentconstants.hxx   |   14 ++--
 include/comphelper/storagehelper.hxx   |   12 +-
 package/source/xstor/xfactory.cxx  |6 ++---
 package/source/zippackage/ZipPackage.cxx   |   10 -
 package/source/zippackage/ZipPackageStream.cxx |2 -
 reportdesign/source/core/api/ReportDefinition.cxx  |   12 +-
 reportdesign/source/ui/report/ReportController.cxx |8 +++
 sc/source/filter/xml/xmlwrap.cxx   |4 +--
 sd/source/ui/dlg/TemplateScanner.cxx   |2 -
 sfx2/source/doc/objserv.cxx|2 -
 sfx2/source/doc/objstor.cxx|4 +--
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |7 --
 test/source/xmltesttools.cxx   |   23 ++---
 xmlhelp/source/cxxhelp/provider/databases.cxx  |4 +--
 16 files changed, 60 insertions(+), 56 deletions(-)

New commits:
commit 84a7fa47a548e95892797e9f61d96ae051123121
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 12:30:30 2014 +0100

XmlTestTools: fix conversion from UTF-8 xmlChar strings to OUString

...which resolves the mystery of 0ba6360363fb73b5b200bbc486ed8eeac5f3d337
Garbage in, garbage out?

Change-Id: I51f102699d0474872c80392b27f71030b5e3fb59

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index c953ad1..e3043e6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -589,12 +589,7 @@ DECLARE_OOXMLEXPORT_TEST(testDateControl, 
date-control.docx)
 assertXPath(pXmlDoc, /w:document/w:body/w:p/w:sdt/w:sdtPr/w:date, 
fullDate, 2014-03-05T00:00:00Z);
 assertXPath(pXmlDoc, 
/w:document/w:body/w:p/w:sdt/w:sdtPr/w:date/w:dateFormat, val, , dd' 
de '' de ');
 assertXPath(pXmlDoc, /w:document/w:body/w:p/w:sdt/w:sdtPr/w:date/w:lid, 
val, es-ES);
-static sal_Unicode const Broken[] = {
-'m', 'i', static_castsal_Unicode('\xC3'),
-static_castsal_Unicode('\xA9'), 'r', 'c', 'o', 'l', 'e', 's', ',',
-' ', '0', '5', ' ', 'd', 'e', ' ', 'm', 'a', 'r', 'z', 'o', ' ', 'd',
-'e', ' ', '2', '0', '1', '4' };
-assertXPathContent(pXmlDoc, 
/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r/w:t, OUString(Broken, 
SAL_N_ELEMENTS(Broken)));
+assertXPathContent(pXmlDoc, 
/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r/w:t, 
OUString::fromUtf8(mi\xC3\xA9rcoles, 05 de marzo de 2014));
 
 // check imported control
 uno::Referencedrawing::XControlShape xControl(getShape(1), 
uno::UNO_QUERY);
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 32908a0..4694570 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -11,6 +11,23 @@
 
 #include boost/scoped_array.hpp
 
+namespace {
+
+OUString convert(xmlChar const * string) {
+OUString s;
+CPPUNIT_ASSERT_MESSAGE(
+xmlChar string is not UTF-8,
+rtl_convertStringToUString(
+s.pData, reinterpret_castchar const *(string), 
xmlStrlen(string),
+RTL_TEXTENCODING_UTF8,
+(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)));
+return s;
+}
+
+}
+
 XmlTestTools::XmlTestTools()
 {}
 
@@ -55,7 +72,7 @@ OUString XmlTestTools::getXPath(xmlDocPtr pXmlDoc, const 
OString rXPath, const
 return OUString();
 xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
 xmlChar * prop = xmlGetProp(pXmlNode, BAD_CAST(rAttribute.getStr()));
-OUString s(OUString::createFromAscii((const char*)prop));
+OUString s(convert(prop));
 xmlFree(prop);
 xmlXPathFreeObject(pXmlObj);
 return s;
@@ -70,7 +87,7 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, 
const OString rXPath)
 xmlXPathNodeSetGetLength(pXmlNodes)  0);
 
 xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
-OUString s(OUString::createFromAscii((const 
char*)((pXmlNode-children[0]).content)));
+OUString s(convert((pXmlNode-children[0]).content));
 xmlXPathFreeObject(pXmlObj);
 return s;
 }
@@ -137,7 +154,7 @@ int XmlTestTools::getXPathPosition(xmlDocPtr pXmlDoc, const 
OString rXPath, con
 int nRet = 0;
 for (xmlNodePtr pChild = pXmlNode-children; pChild; pChild = pChild-next)
 {
-if (OUString::createFromAscii((const char*)pChild-name) == rChildName)
+if (convert(pChild-name) == rChildName)
 break;
 ++nRet;
 }
commit 180f0791daa3d3f959f4f70b9f83012bcbf47a64
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 12:06:16 2014 +0100

comphelper: Use appropriate OUString functions on string constants

Change-Id:

Re: Gerrit supports inline edit feature now

2014-12-18 Thread Michael Stahl

On 18.12.2014 11:55, Markus Mohrhard wrote:
 Hey,
 
 On Thu, Dec 18, 2014 at 11:47 AM, Bjoern Michaelsen
 bjoern.michael...@canonical.com
 mailto:bjoern.michael...@canonical.com wrote:
 
 Hi,
 
 On Thu, Dec 18, 2014 at 10:19:08AM +, Michael Meeks wrote:
  - // that sounds like a stupid idea
  + // actually this is really cool for small changes
 
Also - we have various solutions to allow central compilation 
 coming -
  right.
 
;-)
 
 Yes, inline editing is an important and cool thing. If our workflow
 cant handle
 that, we need to adapt it (e.g. more, earlier CI and unittests) not
 the other
 way around. ;)
 
 
 It is not that easy. This feature shifts some of the work from the
 developer to the reviewer. IMHO our reviewers are already one of the
 weakest link in our development process as reviewing is normally only
 done by the people who have been working on the code for a long time and
 know the code quite well.
 
 I'd like to see solutions that shift work from these people and make it
 easier for new reviewers to come in and not make their job more complex
 and more demanding.

i disagree with your assessment of the feature.  it will make things
easier for reviewers,  because if you spot a trivial typo in a patch you
can just quickly fix it, you don't have to decide between downloading
the patch and editing it offline and pushing it manually, or adding a
comment and then waiting for the submitter to upload a new version of
the patch and get 4 email notifications about it and review it again.


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

Re: Gerrit supports inline edit feature now


On 12/18/2014 12:44 PM, Michael Stahl wrote:

i disagree with your assessment of the feature.  it will make things
easier for reviewers,  because if you spot a trivial typo in a patch you
can just quickly fix it, you don't have to decide between downloading
the patch and editing it offline and pushing it manually, or adding a
comment and then waiting for the submitter to upload a new version of
the patch and get 4 email notifications about it and review it again.


...and the submitter unhelpfully rebasing the patch between uploads, so 
you can't even easily find out whether indeed only the trivial typo was 
fixed.

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

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

2014-12-18 Thread Joel

 sd/source/ui/app/menuids_tmpl.src |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0b0860414cefded03fdbc0a4490aaac39236ff09
Author: Joel jmadero@gmail.com
Date:   Sun Dec 14 09:53:51 2014 -0800

fdo#86627 - Change Image Crop Behavior (4.4)

Changed behavior of right click context crop image from
bringing up dialog for crop (uno:GrafAttrCrop) to the
interactive crop (uno:Crop)

Change-Id: I98d01c39ad5baa894bb687e8adb3dced478d855c
Reviewed-on: https://gerrit.libreoffice.org/13472
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com
(cherry picked from commit fdec5e9f9a42214918290d4a329c97e98826627a)
Reviewed-on: https://gerrit.libreoffice.org/13521

diff --git a/sd/source/ui/app/menuids_tmpl.src 
b/sd/source/ui/app/menuids_tmpl.src
index dbf5ae6..2569138 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -763,9 +763,8 @@
 #define MN_CROP\
 MenuItem\
 {\
-Identifier = SID_ATTR_GRAF_CROP ; \
-HelpId = CMD_SID_ATTR_GRAF_CROP ; \
-Text [ en-US ] = Crop Image... ; \
+Identifier = SID_OBJECT_CROP ; \
+Text [ en-US ] = Crop Image ; \
 };
 
 #define MN_GLUE_INSERT_POINT\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/source/window/winproc.cxx  |4 +++-
 vcl/win/source/window/salframe.cxx |8 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 87561f10ba76de6d5453ed906ce24a052df72f18
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Dec 16 20:48:30 2014 +0200

Better (?) fix for deadlock in a situation with an IME and a URP client

This reverts commit 3e5371aba3eb29efb9574881212cba0975c168d7.

Change-Id: I9e02a3d72f66a1eabb1f25d95417c855459556cc

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 661426a..662b115 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1745,8 +1745,10 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl)
 }
 
 // TrackingMode is ended in ImplHandleLoseFocus
+#ifdef _WIN32
 // To avoid problems with the Unix IME
-// pFocusWin-EndExtTextInput( EXTTEXTINPUT_END_COMPLETE );
+pFocusWin-EndExtTextInput( EXTTEXTINPUT_END_COMPLETE );
+#endif
 
 // XXX #102010# hack for accessibility: do not close the menu,
 // even after focus lost
diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index 9bddbfc..f2a8fc6 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2294,12 +2294,8 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, 
sal_uInt16 nFlags )
 
 void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags )
 {
-
-SalData* pSalData = GetSalData();
-if ( pSalData-mnAppThreadId != GetCurrentThreadId() )
-ImplSalFrameEndExtTextInput( mhWnd, nFlags);
-else
-SendMessageW( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
+// Must be called in the main thread!
+SendMessageW( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
 }
 
 static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - 2 commits - canvas/source

2014-12-18 Thread Michael Jaumann

 canvas/source/opengl/ogl_canvascustomsprite.cxx |   47 
 canvas/source/opengl/ogl_canvashelper.cxx   |   17 +++-
 2 files changed, 39 insertions(+), 25 deletions(-)

New commits:
commit c74a5358d92e3c163da541add4682e9f24482f4c
Author: Michael Jaumann meta_...@yahoo.com
Date:   Thu Dec 18 12:17:45 2014 +

subdivide bezier curves

Change-Id: I616eefabc083d78bd259689c77908edd45788cd6

diff --git a/canvas/source/opengl/ogl_canvashelper.cxx 
b/canvas/source/opengl/ogl_canvashelper.cxx
index 992fe87..9aa92e2 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -543,14 +543,27 @@ namespace oglcanvas
 Action rAct=mpRecordedActions-back();
 
 setupGraphicsState( rAct, viewState, renderState );
+//untested code, otherways commented out should work...
+basegfx::B2DPolygon aPoly;
+aPoly.append(basegfx::B2DPoint(aBezierSegment.Px, 
aBezierSegment.Py));
+aPoly.appendBezierSegment( basegfx::B2DPoint(aBezierSegment.C1x, 
aBezierSegment.C1y),
+   basegfx::B2DPoint(aBezierSegment.C1x, 
aBezierSegment.C1y),
+   
basegfx::B2DPoint(aEndPoint.X,aEndPoint.Y));
+
+basegfx::B2DPolyPolygon aPolyPoly;
+aPolyPoly.append(aPoly);
+rAct.maPolyPolys.push_back(aPolyPoly);
+rAct.maPolyPolys.back().makeUnique(); // own copy, for thread 
safety
 
+rAct.maFunction = lcl_drawPolyPolygon;
 // TODO(F2): subdividerender whole curve
-rAct.maFunction = ::boost::bind(lcl_drawLine,
+/*rAct.maFunction = ::boost::bind(lcl_drawLine,
 _1,_2,_3,_4,_5,
 geometry::RealPoint2D(
 aBezierSegment.Px,
 aBezierSegment.Py),
-aEndPoint);
+aEndPoint);*/
+
 }
 }
 
commit 9c3a9e987bc5a7b5f8e84349fc8c39a3999011f9
Author: Michael Jaumann meta_...@yahoo.com
Date:   Thu Dec 18 12:11:17 2014 +

renderSprite

renders still to framebuffer with the wrong offset ( polygon  is
clipped, or entire out of texture bounds )

Change-Id: I485fd141c73d1e9783db7f4638bb33875e3af9be

diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx 
b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 9962eb4..ac8272e 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -25,6 +25,7 @@
 #include basegfx/polygon/b2dpolygontriangulator.hxx
 #include basegfx/polygon/b2dpolypolygontools.hxx
 #include GL/glew.h
+#include vcl/opengl/GLMHelper.hxx
 
 using namespace ::com::sun::star;
 
@@ -131,42 +132,46 @@ namespace oglcanvas
 if( ::basegfx::fTools::equalZero( mfAlpha ) )
 return true;
 
-const glm::vec2 aSpriteSizePixel(
-::canvas::tools::roundUp( maSize.Width ),
-::canvas::tools::roundUp( maSize.Height ));
-RenderHelper* pRenderHelper = 
maCanvasHelper.getDeviceHelper()-getRenderHelper();
+const glm::vec2 aSpriteSizePixel(
+::canvas::tools::roundUp( maSize.Width),
+::canvas::tools::roundUp( maSize.Height));
+
+RenderHelper* pRenderHelper = 
maCanvasHelper.getDeviceHelper()-getRenderHelper();
 IBufferContextSharedPtr pBufferContext;
-if( mfAlpha != 1.0 || mxClip.is() )
+
+if( mfAlpha != 0.0 || mxClip.is() )
 {
 // drats. need to render to temp surface before, and then
 // composite that to screen
 
 // TODO(P3): buffer texture
 pBufferContext = 
maCanvasHelper.getDeviceHelper()-createBufferContext(aSpriteSizePixel);
+//glViewport(0, 0,aSpriteSizePixel.x,aSpriteSizePixel.y);
 pBufferContext-startBufferRendering();
 }
-
 // this ends up in pBufferContext, if that one's current
 if( !maCanvasHelper.renderRecordedActions() )
 return false;
-
 const glm::mat4 translate = 
glm::translate(glm::vec3(maPosition.getX(), maPosition.getY(), 0));
 if( pBufferContext )
 {
 
+//pRenderHelper-SetModelAndMVP( aGLTransform);
+// content ended up in background buffer - compose to
+// screen now. Calls below switches us back to window
+// context, and binds to generated, dynamic texture
+
+pBufferContext-endBufferRendering();
+
 const glm::mat4 aGLTransform = glm::mat4(
 maTransformation.m00, maTransformation.m10, 0, 0,

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

 sc/source/core/data/document.cxx|4 
 sc/source/core/data/formulacell.cxx |   13 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 573f5dfba805b733dd2da62bde3cd5d9d25879d9
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 18 13:26:48 2014 +0100

Resolves: fdo#86978 append formula cells to track instead of tree

Cells in FormulaTree are assumed to be tracked already and their
dependents be notified. Also postpone tracking until all listeners are
established.

Change-Id: I7f27fba979fe231e3d3cd071fcc8a273142cb3f3

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 5ce3b1b..15c6914 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3764,6 +3764,10 @@ void ScDocument::CompileXML()
 if ( pValidationList )
 pValidationList-CompileXML();
 
+// Track all formula cells that were appended to the FormulaTrack during
+// import or CompileXML().
+TrackFormulas();
+
 SetAutoCalc( bOldAutoCalc );
 }
 
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index d8c79b9..6c6c3d4 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1330,7 +1330,9 @@ void ScFormulaCell::CompileXML( 
sc::CompileFormulaContext rCxt, ScProgress rPr
 // During load, only those cells that are marked explicitly dirty get
 // recalculated.  So we need to set it dirty here.
 SetDirtyVar();
-pDocument-PutInFormulaTree(this);
+pDocument-AppendToFormulaTrack(this);
+// Do not call TrackFormulas() here, not all listeners may have been
+// established, postponed until ScDocument::CompileXML() finishes.
 }
 else if (bWasInFormulaTree)
 pDocument-PutInFormulaTree(this);
@@ -2135,7 +2137,14 @@ void ScFormulaCell::SetDirty( bool bDirtyFlag )
 if( bDirtyFlag )
 SetDirtyVar();
 pDocument-AppendToFormulaTrack( this );
-pDocument-TrackFormulas();
+
+// While loading a document listeners have not been established yet.
+// Tracking would remove this cell from the FormulaTrack and add it to
+// the FormulaTree, once in there it would be assumed that its
+// dependents already had been tracked and it would be skipped on a
+// subsequent notify. Postpone tracking until all listeners are set.
+if (!pDocument-IsImportingXML())
+pDocument-TrackFormulas();
 }
 
 pDocument-SetStreamValid(aPos.Tab(), false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/core/data/document.cxx|4 
 sc/source/core/data/formulacell.cxx |   13 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 3c7b69f0e68cfdcc4ec45e6ee1e696b99ae4a780
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 18 13:26:48 2014 +0100

Resolves: fdo#86978 append formula cells to track instead of tree

Cells in FormulaTree are assumed to be tracked already and their
dependents be notified. Also postpone tracking until all listeners are
established.

Change-Id: I7f27fba979fe231e3d3cd071fcc8a273142cb3f3
(cherry picked from commit 573f5dfba805b733dd2da62bde3cd5d9d25879d9)

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index fdab204..252352c 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3756,6 +3756,10 @@ void ScDocument::CompileXML()
 if ( pValidationList )
 pValidationList-CompileXML();
 
+// Track all formula cells that were appended to the FormulaTrack during
+// import or CompileXML().
+TrackFormulas();
+
 SetAutoCalc( bOldAutoCalc );
 }
 
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 8f78e8b..bc9ffbe 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1330,7 +1330,9 @@ void ScFormulaCell::CompileXML( 
sc::CompileFormulaContext rCxt, ScProgress rPr
 // During load, only those cells that are marked explicitly dirty get
 // recalculated.  So we need to set it dirty here.
 SetDirtyVar();
-pDocument-PutInFormulaTree(this);
+pDocument-AppendToFormulaTrack(this);
+// Do not call TrackFormulas() here, not all listeners may have been
+// established, postponed until ScDocument::CompileXML() finishes.
 }
 else if (bWasInFormulaTree)
 pDocument-PutInFormulaTree(this);
@@ -2135,7 +2137,14 @@ void ScFormulaCell::SetDirty( bool bDirtyFlag )
 if( bDirtyFlag )
 SetDirtyVar();
 pDocument-AppendToFormulaTrack( this );
-pDocument-TrackFormulas();
+
+// While loading a document listeners have not been established yet.
+// Tracking would remove this cell from the FormulaTrack and add it to
+// the FormulaTree, once in there it would be assumed that its
+// dependents already had been tracked and it would be skipped on a
+// subsequent notify. Postpone tracking until all listeners are set.
+if (!pDocument-IsImportingXML())
+pDocument-TrackFormulas();
 }
 
 pDocument-SetStreamValid(aPos.Tab(), false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 configure.ac |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 564fe23374fa544c34875da0dd695cb8a939f0f2
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 18 14:44:18 2014 +0200

Improve documentation how to build the Win32 make

Change-Id: If47512f4a5893e21318f062301a0fd6fcf121cfc

diff --git a/configure.ac b/configure.ac
index f9bd9d0..021c7de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12839,10 +12839,11 @@ place yourself in a working directory of you choice.
  [go to Start menu, click All Programs, click Visual Studio 2013, click 
Visual Studio Tools, double-click VS2013 x86 Native Tools Command Prompt or 
VS2013 x64 Native Tools Comand Prompt]
  set PATH=%PATH%;C:\Cygwin\bin
  [or Cygwin64, if that is what you have]
- cd .../path/to/make_git
+ cd path-to-make-repor-you-cloned-above
  build_w32.bat --without-guile
 
-should result in a WinRel/gnumake.exe
+should result in a WinRel/gnumake.exe.
+Copy it to to the Cygwin /opt/lo/bin directory as make.exe
 
 Then re-run autogen.sh
 
commit ff926b84508e500fd8b1deda0a7304f0026f6c8c
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 18 14:38:45 2014 +0200

Adapt instructions to VS2013 and 64-bit Cygwin

Change-Id: Ie6b7ccd3e3a6d459cb44e4d545ceaf4eb26c06bb

diff --git a/configure.ac b/configure.ac
index c7cd156..f9bd9d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12836,8 +12836,9 @@ place yourself in a working directory of you choice.
 
  git clone git://git.savannah.gnu.org/make.git
 
- [go to Start menu, click on VS2012 x86 Native Tools Command Prompt]
+ [go to Start menu, click All Programs, click Visual Studio 2013, click 
Visual Studio Tools, double-click VS2013 x86 Native Tools Command Prompt or 
VS2013 x64 Native Tools Comand Prompt]
  set PATH=%PATH%;C:\Cygwin\bin
+ [or Cygwin64, if that is what you have]
  cd .../path/to/make_git
  build_w32.bat --without-guile
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig svx/UIConfig_svx.mk

 include/svx/bmpmask.hxx|   66 +--
 svx/UIConfig_svx.mk|1 
 svx/source/dialog/_bmpmask.cxx |  621 ++---
 svx/source/dialog/bmpmask.hrc  |   28 -
 svx/source/dialog/bmpmask.src  |  276 --
 svx/uiconfig/ui/dockingcolorreplace.ui |  400 +
 6 files changed, 703 insertions(+), 689 deletions(-)

New commits:
commit 0ef2fa807d6b984455ed531a2c4f19a644d8b2cf
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Dec 17 15:22:00 2014 +

convert RID_SVXDLG_BMPMASK dockingwindow to .ui

Change-Id: I1a160bd08d3be0356076789539d551f4dc6edfd4

diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 395f495..8ee7e7c 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -81,44 +81,38 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
 friend class MaskData;
 friend class MaskSet;
 
-ToolBox aTbxPipette;
-ColorWindow*pCtlPipette;
-PushButton  aBtnExec;
-FixedLine   aGrpQ;
-
-FixedText   aFt1;
-FixedText   aFt2;
-FixedText   aFt3;
-CheckBoxaCbx1;
-MaskSet*pQSet1;
-MetricField aSp1;
-ColorLB aLbColor1;
-
-CheckBoxaCbx2;
-MaskSet*pQSet2;
-MetricField aSp2;
-ColorLB aLbColor2;
-
-CheckBoxaCbx3;
-MaskSet*pQSet3;
-MetricField aSp3;
-ColorLB aLbColor3;
-
-CheckBoxaCbx4;
-MaskSet*pQSet4;
-MetricField aSp4;
-ColorLB aLbColor4;
+ToolBox*m_pTbxPipette;
+ColorWindow*m_pCtlPipette;
+PushButton* m_pBtnExec;
+
+CheckBox*   m_pCbx1;
+MaskSet*m_pQSet1;
+MetricField*m_pSp1;
+ColorLB*m_pLbColor1;
+
+CheckBox*   m_pCbx2;
+MaskSet*m_pQSet2;
+MetricField*m_pSp2;
+ColorLB*m_pLbColor2;
+
+CheckBox*   m_pCbx3;
+MaskSet*m_pQSet3;
+MetricField*m_pSp3;
+ColorLB*m_pLbColor3;
+
+CheckBox*   m_pCbx4;
+MaskSet*m_pQSet4;
+MetricField*m_pSp4;
+ColorLB*m_pLbColor4;
 
 MaskData*   pData;
-CheckBoxaCbxTrans;
-ColorLB aLbColorTrans;
+CheckBox*   m_pCbxTrans;
+ColorLB*m_pLbColorTrans;
 
 XColorListRef   pColLst;
 Color   aPipetteColor;
 SvxBmpMaskSelectItem aSelItem;
 
-Image   maImgPipette;
-
 virtual boolClose() SAL_OVERRIDE;
 
 #ifdef BMPMASK_PRIVATE
@@ -143,11 +137,8 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
 
 public:
 
-SvxBmpMask( SfxBindings *pBindinx,
-SfxChildWindow *pCW,
-vcl::Window* pParent,
-const ResId rResId );
-virtual ~SvxBmpMask();
+SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* 
pParent);
+virtual ~SvxBmpMask();
 
 voidSetColor( const Color rColor );
 voidPipetteClicked();
@@ -163,9 +154,6 @@ public:
 
 voidonSelect( MaskSet* pSet );
 
-virtual void DataChanged( const DataChangedEvent rDCEvt ) SAL_OVERRIDE;
-void ApplyStyle();
-
 private:
 
 /** Set names for accessible objects.  This is necessary for objects
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index ea01872..da79eb8 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/datanavigator \
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
+   svx/uiconfig/ui/dockingcolorreplace \
svx/uiconfig/ui/docrecoverybrokendialog \
svx/uiconfig/ui/docrecoveryprogressdialog \
svx/uiconfig/ui/docrecoveryrecoverdialog \
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 5570bc8..75668ce 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -34,7 +34,7 @@
 #include svx/svxids.hrc
 #include boost/scoped_array.hpp
 #include boost/scoped_ptr.hpp
-
+#include helpid.hrc
 
 #define BMP_RESID(nId)  ResId(nId, DIALOG_MGR())
 #define TRANSP_COL  (Color( 252, 252, 252 ))
@@ -56,32 +56,33 @@
 }   \
 }
 
-
-
 SFX_IMPL_DOCKINGWINDOW_WITHID( SvxBmpMaskChildWindow, SID_BMPMASK )
 
-
-
 class ColorWindow : public Control
 {
 Color   aColor;
 
 
 public:
-ColorWindow( vcl::Window* pParent, const ResId rId ) :
-Control(

cppcheck reports

2014-12-18 Thread Maarten Hoes

Hi,


Are the cppcheck reports that are used to clean up the libreoffice code
generated automatically at this point ? Would there be any interest in
someone (me) scripting that ? I was informed that Julien Nabet is
generating these reports at the moment ? Like with the lcov-reports, I
would need some assistance with the scheduling and
uploading-reports-somewhere-useful parts though (again, Jenkins integration
?). Also, it might be nice to add that to a git repo for revision control
and reviewing (again, buildbot.git ?).


Regards,


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

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

 helpers/help_hid.lst   |   19 --
 source/text/shared/01/0603.xhp |   47 ++---
 2 files changed, 24 insertions(+), 42 deletions(-)

New commits:
commit 908b90852c513400669814a73b64245a0702ec21
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 18 13:19:51 2014 +

update help ids for docking color replace window .ui conversion

Change-Id: Ib5c095382573ee7b83465d53075857d6403b1d84

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e4b843b..ea42701 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -859,9 +859,6 @@ HID_BIB_TITLE_POS,34777,
 HID_BIB_URL_POS,34799,
 HID_BIB_VOLUME_POS,34798,
 HID_BIB_YEAR_POS,34778,
-HID_BMPMASK_CTL_PIPETTE,33873,
-HID_BMPMASK_CTL_QCOL_1,33872,
-HID_BMPMASK_TBI_PIPETTE,33898,
 HID_BORDER,33783,
 HID_BORDER_CTL_PRESETS,33874,
 HID_BORDER_CTL_SHADOWS,33875,
@@ -3377,7 +3374,6 @@ SID_BEZIER_MOVE,10121,.uno:BezierMove
 SID_BEZIER_SMOOTH,10123,.uno:BezierSmooth
 SID_BEZIER_SYMMTR,27067,.uno:BezierSymmetric
 SID_BITMAP_LIST,10182,.uno:BitmapListState
-SID_BMPMASK,10350,.uno:BmpMask
 SID_BMPMASK_EXEC,10353,.uno:BmpMaskExec
 SID_BMPMASK_PIPETTE,10351,.uno:BmpMaskPipette
 SID_BORDER_OBJECT,10340,.uno:Border
@@ -5119,11 +5115,6 @@ 
svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINHEIGHTDEFAULT,1598211094,
 svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINWIDTHDEFAULT,1598211093,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_1,339194,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_2,3391947780,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_3,3391947779,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_4,3391947778,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_TRANS,3391947781,
 svx_CheckBox_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE_CB_JSCPT_DISABLE,1241269470,
 svx_CheckBox_RID_SVXDLG_RUBY_CB_AUTO_DETECT,2315371521,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_EXPAND,703775795,
@@ -5267,11 +5258,6 @@ 
svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_VERT,1238295052,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_REPLACE,1368919575,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_1,3391950337,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_2,3391950338,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_3,3391950339,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_4,3391950340,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_TRANS,3391950341,
 svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769,
 svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103,
 svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083,
@@ -5317,10 +5303,6 @@ svx_ListBox_RID_SVXPAGE_SHADOW_LB_SHADOW_COLOR,701713930,
 svx_ListBox_RID_SVXPAGE_STD_PARAGRAPH_LB_LINEDIST,700812840,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT,701009435,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME,701009432,
-svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
-svx_MetricField_RID_SVXDLG_BMPMASK_SP_2,3391953412,
-svx_MetricField_RID_SVXDLG_BMPMASK_SP_3,3391953409,
-svx_MetricField_RID_SVXDLG_BMPMASK_SP_4,3391953411,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_DISTANCE,3386595841,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_X,3386595843,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_Y,3386595844,
@@ -5392,7 +5374,6 @@ 
svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_PATH,733581837,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_STANDARD,733581838,
 svx_PushButton_RID_SVXDLG_ADD_SUBMISSION_PB_SUBMIT_REF,1368920595,
-svx_PushButton_RID_SVXDLG_BMPMASK_BTN_EXEC,3391951361,
 svx_PushButton_RID_SVXDLG_RUBY_PB_CLOSE,2315375112,
 svx_PushButton_RID_SVXDLG_RUBY_PB_STYLIST,2315375108,
 svx_PushButton_RID_SVXPAGE_BACKGROUND_BTN_BROWSE,700731924,
diff --git a/source/text/shared/01/0603.xhp 
b/source/text/shared/01/0603.xhp
index 50815e1..4162738 100644
--- a/source/text/shared/01/0603.xhp
+++ b/source/text/shared/01/0603.xhp
@@ -29,6 +29,7 @@
 body
 section id=pipette
 bookmark xml-lang=en-US branch=hid/.uno:BmpMask id=bm_id3085157 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/svx/ui/dockingcolorreplace/DockingColorReplace id=bm_id3085156 
localize=false/
 paragraph role=heading id=hd_id3156324 xml-lang=en-US level=1 
l10n=CHG oldref=1link href=text/shared/01/0603.xhp name=Color 
ReplacerColor Replacer/link/paragraph
 paragraph role=paragraph id=par_id3145138 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=.uno:BmpMaskOpens the Color Replacer dialog, where you 
can replace colors in bitmap and meta file graphics./ahelp/paragraph
 /section
@@ -55,42 +56,42 @@
 /tablerow
 /table
 
-bookmark xml-lang=en-US branch=hid/SVX_HID_BMPMASK_TBI_PIPETTE 
id=bm_id3155535 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/dockingcolorreplace/pipette 
id=bm_id3155535 localize=false/
 paragraph role=paragraph

[Libreoffice-commits] core.git: 2 commits - helpcontent2 svx/inc

 helpcontent2   |2 +-
 svx/inc/helpid.hrc |2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 09906a00584fe7106d573dd07d8f627479637214
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 18 13:19:38 2014 +

drop unused helpids

Change-Id: I878f5bfe15b72ed1b750abfd7ca26513aae1d6fb

diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 02c098e..151dd7a 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -23,9 +23,7 @@
 #include svx/svxcommands.h
 #include sfx2/sfxcommands.h
 
-#define HID_BMPMASK_CTL_PIPETTE   
SVX_HID_BMPMASK_CTL_PIPETTE
 #define HID_BMPMASK_CTL_QCOL_1
SVX_HID_BMPMASK_CTL_QCOL_1
-#define HID_BMPMASK_TBI_PIPETTE   
SVX_HID_BMPMASK_TBI_PIPETTE
 #define HID_COLOR_CTL_COLORS  
SVX_HID_COLOR_CTL_COLORS
 #define HID_CTRL3D_HSCROLL
SVX_HID_CTRL3D_HSCROLL
 #define HID_CTRL3D_SWITCHER   
SVX_HID_CTRL3D_SWITCHER
commit af720da95e87a4082f179e3844a58007e41f11a2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 18 13:19:51 2014 +

Updated core
Project: help  908b90852c513400669814a73b64245a0702ec21

diff --git a/helpcontent2 b/helpcontent2
index 52ecb7b..908b908 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 52ecb7b19fd337cad7809298849909493dff0c56
+Subproject commit 908b90852c513400669814a73b64245a0702ec21
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Failing unit test in Mac OS X Yosemite 10.10.1

Hi Renato,

On Tue, Dec 16, 2014 at 01:18:34PM +, Renato Ferreira 
renato.w...@gmail.com wrote:
 More to the point, I opened both documents on Word and they are identical,
 no invisible images at all. So maybe it is OK?

Thanks for checking. So please change the limit to suit your needs.
On my machine, the old value was 504666, the new is 19072, so as long as
your new limit is around the new value, it should be OK. Just push to
gerrit and it'll get the usual review.

Thanks,

Miklos


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

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

 vcl/inc/salframe.hxx   |3 ---
 vcl/win/source/window/salframe.cxx |2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 073d1a35903b9e276d8eb3240b34c7a74ae47d8f
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 18 15:49:05 2014 +0200

Use the same names for these flag bits as the callers do

No need for redundancy.

Change-Id: Ia68d2e57af33cdca90246de54cdff656ea6c3942

diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index cfc41b7..73c4e74 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -50,9 +50,6 @@ struct SystemEnvData;
 #define SAL_FRAME_TOTOP_GRABFOCUS   ((sal_uInt16)0x0004)
 #define SAL_FRAME_TOTOP_GRABFOCUS_ONLY   ((sal_uInt16)0x0008)
 
-#define SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE  ((sal_uInt16)0x0001)
-#define SAL_FRAME_ENDEXTTEXTINPUT_CANCEL((sal_uInt16)0x0002)
-
 // SalFrame styles
 #define SAL_FRAME_STYLE_DEFAULT ((sal_uLong)0x0001)
 #define SAL_FRAME_STYLE_MOVEABLE((sal_uLong)0x0002)
diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index f2a8fc6..5710645 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2282,7 +2282,7 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, 
sal_uInt16 nFlags )
 if ( hIMC )
 {
 DWORD nIndex;
-if ( nFlags  SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE )
+if ( nFlags  EXTTEXTINPUT_END_COMPLETE )
 nIndex = CPS_COMPLETE;
 else
 nIndex = CPS_CANCEL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 87119, which changed state.

Bug 87119 Summary: FILEOPEN Loading spreadsheet loses data
https://bugs.freedesktop.org/show_bug.cgi?id=87119

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

 bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dc8835de2a09ec9cc2a14cd0e78d0a298ca6bc4c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 14:56:47 2014 +0100

bridges: Use appropriate OUString functions on string constants

Change-Id: I72e0df381bd9525ea4fff1f4bbd57ffe84ce241f

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 7c0de0f..fc439a9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -114,7 +114,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * 
pUno2Cpp )
 if (! pTypeDescr)
 {
 throw RuntimeException(
-OUString(cannot get typedescription for type ) +
+cannot get typedescription for type  +
 *reinterpret_cast OUString const * ( pUnoExc-pType-pTypeName 
) );
 }
 
@@ -130,7 +130,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * 
pUno2Cpp )
 if (! rtti)
 {
 throw RuntimeException(
-OUString(no rtti for type ) +
+no rtti for type  +
 *reinterpret_cast OUString const * ( pUnoExc-pType-pTypeName 
) );
 }
 }
@@ -158,7 +158,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * 
pUnoExc, uno_Mapping
 typelib_typedescription_getByName( pExcTypeDescr, unoName.pData );
 if (0 == pExcTypeDescr)
 {
-RuntimeException aRE( OUString(exception type not found: ) + unoName 
);
+RuntimeException aRE( exception type not found:  + unoName );
 Type const  rType = ::getCppuType( aRE );
 uno_type_any_constructAndConvert( pUnoExc, aRE, 
rType.getTypeLibType(), pCpp2Uno );
 SAL_WARN(bridges, aRE.Message);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jvmfwk/plugins

 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 39733239d317fbfbfc1c7bfc8cc7bfb8392c6926
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 15:00:28 2014 +0100

jvmfwk: Use appropriate OUString functions on string constants

Change-Id: I5a16fdd9217f0523212842650d74f504f17848fd

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index d79ed47..2ef2429 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -1287,8 +1287,8 @@ void addJavaInfosDirScan(
 }
 
 JFW_ENSURE(errNext == File::E_None || errNext == 
File::E_NOENT,
-OUString([Java framework] sunjavaplugin: )
-+ Error while iterating over contens of 
+[Java framework] sunjavaplugin: 
+Error while iterating over contens of 
 + usDir2 + . Osl file error: 
 + OUString::number(openErr));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svx/source/fmcomp/fmgridcl.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 2315ee1852259834624fe7cddec05b43c4ae9cd8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 18 14:18:44 2014 +

fix build

Change-Id: Ide1f3da42864dd53aa0b960b8013a46b3f609025

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index b0b477c..d625b17 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -91,16 +91,16 @@ OUString FieldServiceFromId(sal_Int32 nID)
 {
 switch (nID)
 {
-case SID_FM_EDIT: return FM_COL_TEXTFIELD;
-case SID_FM_COMBOBOX: return FM_COL_COMBOBOX;
-case SID_FM_LISTBOX : return FM_COL_LISTBOX;
-case SID_FM_CHECKBOX: return FM_COL_CHECKBOX;
-case SID_FM_DATEFIELD   : return FM_COL_DATEFIELD;
-case SID_FM_TIMEFIELD   : return FM_COL_TIMEFIELD;
-case SID_FM_NUMERICFIELD: return FM_COL_NUMERICFIELD;
-case SID_FM_CURRENCYFIELD   : return FM_COL_CURRENCYFIELD;
-case SID_FM_PATTERNFIELD: return FM_COL_PATTERNFIELD;
-case SID_FM_FORMATTEDFIELD  : return FM_COL_FORMATTEDFIELD;
+case SID_FM_EDIT: return OUString(FM_COL_TEXTFIELD);
+case SID_FM_COMBOBOX: return OUString(FM_COL_COMBOBOX);
+case SID_FM_LISTBOX : return OUString(FM_COL_LISTBOX);
+case SID_FM_CHECKBOX: return OUString(FM_COL_CHECKBOX);
+case SID_FM_DATEFIELD   : return OUString(FM_COL_DATEFIELD);
+case SID_FM_TIMEFIELD   : return OUString(FM_COL_TIMEFIELD);
+case SID_FM_NUMERICFIELD: return OUString(FM_COL_NUMERICFIELD);
+case SID_FM_CURRENCYFIELD   : return OUString(FM_COL_CURRENCYFIELD);
+case SID_FM_PATTERNFIELD: return OUString(FM_COL_PATTERNFIELD);
+case SID_FM_FORMATTEDFIELD  : return OUString(FM_COL_FORMATTEDFIELD);
 }
 return OUString();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65859] version VCL plugins to avoid crashes ...

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

Caolán McNamara caol...@redhat.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

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

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

 svx/source/form/fmshimp.cxx |   44 ++--
 svx/source/inc/fmurl.hxx|   18 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

New commits:
commit 897f35006ea48b7b60b087a8f0b955c7f099af3a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 18 14:18:44 2014 +

fix build

Change-Id: Ide1f3da42864dd53aa0b960b8013a46b3f609025

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e679d18..12ad0bb 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -447,28 +447,28 @@ namespace
 {
 switch (nType)
 {
-case OBJ_FM_EDIT: return FM_COMPONENT_TEXTFIELD;
-case OBJ_FM_BUTTON  : return FM_COMPONENT_COMMANDBUTTON;
-case OBJ_FM_FIXEDTEXT   : return FM_COMPONENT_FIXEDTEXT;
-case OBJ_FM_LISTBOX : return FM_COMPONENT_LISTBOX;
-case OBJ_FM_CHECKBOX: return FM_COMPONENT_CHECKBOX;
-case OBJ_FM_RADIOBUTTON : return FM_COMPONENT_RADIOBUTTON;
-case OBJ_FM_GROUPBOX: return FM_COMPONENT_GROUPBOX;
-case OBJ_FM_COMBOBOX: return FM_COMPONENT_COMBOBOX;
-case OBJ_FM_GRID: return FM_COMPONENT_GRIDCONTROL;
-case OBJ_FM_IMAGEBUTTON : return FM_COMPONENT_IMAGEBUTTON;
-case OBJ_FM_FILECONTROL : return FM_COMPONENT_FILECONTROL;
-case OBJ_FM_DATEFIELD   : return FM_COMPONENT_DATEFIELD;
-case OBJ_FM_TIMEFIELD   : return FM_COMPONENT_TIMEFIELD;
-case OBJ_FM_NUMERICFIELD: return FM_COMPONENT_NUMERICFIELD;
-case OBJ_FM_CURRENCYFIELD   : return FM_COMPONENT_CURRENCYFIELD;
-case OBJ_FM_PATTERNFIELD: return FM_COMPONENT_PATTERNFIELD;
-case OBJ_FM_HIDDEN  : return FM_COMPONENT_HIDDENCONTROL;
-case OBJ_FM_IMAGECONTROL: return FM_COMPONENT_IMAGECONTROL;
-case OBJ_FM_FORMATTEDFIELD  : return FM_COMPONENT_FORMATTEDFIELD;
-case OBJ_FM_SCROLLBAR   : return FM_SUN_COMPONENT_SCROLLBAR;
-case OBJ_FM_SPINBUTTON  : return FM_SUN_COMPONENT_SPINBUTTON;
-case OBJ_FM_NAVIGATIONBAR   : return 
FM_SUN_COMPONENT_NAVIGATIONBAR;
+case OBJ_FM_EDIT: return 
OUString(FM_COMPONENT_TEXTFIELD);
+case OBJ_FM_BUTTON  : return 
OUString(FM_COMPONENT_COMMANDBUTTON);
+case OBJ_FM_FIXEDTEXT   : return 
OUString(FM_COMPONENT_FIXEDTEXT);
+case OBJ_FM_LISTBOX : return 
OUString(FM_COMPONENT_LISTBOX);
+case OBJ_FM_CHECKBOX: return 
OUString(FM_COMPONENT_CHECKBOX);
+case OBJ_FM_RADIOBUTTON : return 
OUString(FM_COMPONENT_RADIOBUTTON);
+case OBJ_FM_GROUPBOX: return 
OUString(FM_COMPONENT_GROUPBOX);
+case OBJ_FM_COMBOBOX: return 
OUString(FM_COMPONENT_COMBOBOX);
+case OBJ_FM_GRID: return 
OUString(FM_COMPONENT_GRIDCONTROL);
+case OBJ_FM_IMAGEBUTTON : return 
OUString(FM_COMPONENT_IMAGEBUTTON);
+case OBJ_FM_FILECONTROL : return 
OUString(FM_COMPONENT_FILECONTROL);
+case OBJ_FM_DATEFIELD   : return 
OUString(FM_COMPONENT_DATEFIELD);
+case OBJ_FM_TIMEFIELD   : return 
OUString(FM_COMPONENT_TIMEFIELD);
+case OBJ_FM_NUMERICFIELD: return 
OUString(FM_COMPONENT_NUMERICFIELD);
+case OBJ_FM_CURRENCYFIELD   : return 
OUString(FM_COMPONENT_CURRENCYFIELD);
+case OBJ_FM_PATTERNFIELD: return 
OUString(FM_COMPONENT_PATTERNFIELD);
+case OBJ_FM_HIDDEN  : return 
OUString(FM_COMPONENT_HIDDENCONTROL);
+case OBJ_FM_IMAGECONTROL: return 
OUString(FM_COMPONENT_IMAGECONTROL);
+case OBJ_FM_FORMATTEDFIELD  : return 
OUString(FM_COMPONENT_FORMATTEDFIELD);
+case OBJ_FM_SCROLLBAR   : return 
OUString(FM_SUN_COMPONENT_SCROLLBAR);
+case OBJ_FM_SPINBUTTON  : return 
OUString(FM_SUN_COMPONENT_SPINBUTTON);
+case OBJ_FM_NAVIGATIONBAR   : return 
OUString(FM_SUN_COMPONENT_NAVIGATIONBAR);
 }
 return OUString();
 }
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index 878eea6..3182e4b 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -27,7 +27,7 @@
 #define FMURL_RECORD_MOVENEXT  OUString( 
.uno:FormController/moveToNext )
 #define FMURL_RECORD_MOVELAST  OUString( 
.uno:FormController/moveToLast )
 #define FMURL_RECORD_MOVETONEW OUString( 
.uno:FormController/moveToNew )
-#define FMURL_RECORD_UNDO  .uno:FormController/undoRecord
+#define FMURL_RECORD_UNDO  OUString( 
.uno:FormController/undoRecord )
 #define FMURL_RECORD_SAVE  OUString( 
.uno:FormController/saveRecord )
 #define

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

 solenv/gbuild/Extension.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d1cf36265d25ddee11e787c4c83692163b66b06b
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Thu Dec 18 15:59:51 2014 +0100

avoid exceeding commandline limits

don't use zip -@ to read from stdin, as that expects one file per line
also zip doesn't like the dos-lineend, so strip that using tr

Change-Id: Ib5c9040a66390119aa7a46225f2d0c8f635bf39a

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index fc6e6b7..a314003 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -104,9 +104,10 @@ $(call gb_Extension_get_target,%) : \
$(if $(LICENSE),cp -f $(LICENSE) $(call 
gb_Extension_get_rootdir,$*)/registration ) \
$(if $(and $(gb_Extension_TRANS_LANGS),$(DESCRIPTION)),cp 
$(foreach lang,$(gb_Extension_TRANS_LANGS),$(call 
gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call 
gb_Extension_get_rootdir,$*) ) \
cd $(call gb_Extension_get_rootdir,$*)  \
+   ZIPFILES=$(call var2file,$(shell $(gb_MKTEMP)),500,$(sort 
$(FILES)))  \
$(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \
$(call gb_Extension_get_target,$*) \
-   $(sort $(FILES)))
+   `cat $${ZIPFILES} | tr -d '\r'`  rm $${ZIPFILES})
 
 # set file list and location of manifest and description files
 # register target and clean target
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/source/control/combobox.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 1cd9420755dc5d5435bf564a992b727c455a3d73
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 18 15:24:05 2014 +

Resolves: rhbz#1175142 nStarts ends up as an invalid -1

Change-Id: Ic67c5562d0e9936cd6a524ecd4f798aaf885a6e8

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 462c61f..5edee22 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -292,7 +292,7 @@ void ComboBox::ImplAutocompleteHandler( Edit* pEdit )
 {
 OUStringaFullText = pEdit-GetText();
 OUStringaStartText = aFullText.copy( 0, (sal_Int32)aSel.Max() );
-sal_Int32  nStart = mpImplLB-GetCurrentPos();
+sal_Int32   nStart = mpImplLB-GetCurrentPos();
 
 if ( nStart == LISTBOX_ENTRY_NOTFOUND )
 nStart = 0;
@@ -303,7 +303,10 @@ void ComboBox::ImplAutocompleteHandler( Edit* pEdit )
 else if ( eAction == AUTOCOMPLETE_TABBACKWARD )
 {
 bForward = false;
-nStart = nStart ? nStart - 1 : 
mpImplLB-GetEntryList()-GetEntryCount()-1;
+if (nStart)
+nStart = nStart - 1;
+else if (mpImplLB-GetEntryList()-GetEntryCount())
+nStart = mpImplLB-GetEntryList()-GetEntryCount()-1;
 }
 
 sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/source/control/combobox.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 4e8ae0f8187a9d3fa77d737f5de248cfd9b0ed55
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 18 15:24:05 2014 +

Resolves: rhbz#1175142 nStarts ends up as an invalid -1

Change-Id: Ic67c5562d0e9936cd6a524ecd4f798aaf885a6e8
(cherry picked from commit 1cd9420755dc5d5435bf564a992b727c455a3d73)

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 329e48a..14870a0 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -292,7 +292,7 @@ void ComboBox::ImplAutocompleteHandler( Edit* pEdit )
 {
 OUStringaFullText = pEdit-GetText();
 OUStringaStartText = aFullText.copy( 0, (sal_Int32)aSel.Max() );
-sal_Int32  nStart = mpImplLB-GetCurrentPos();
+sal_Int32   nStart = mpImplLB-GetCurrentPos();
 
 if ( nStart == LISTBOX_ENTRY_NOTFOUND )
 nStart = 0;
@@ -303,7 +303,10 @@ void ComboBox::ImplAutocompleteHandler( Edit* pEdit )
 else if ( eAction == AUTOCOMPLETE_TABBACKWARD )
 {
 bForward = false;
-nStart = nStart ? nStart - 1 : 
mpImplLB-GetEntryList()-GetEntryCount()-1;
+if (nStart)
+nStart = nStart - 1;
+else if (mpImplLB-GetEntryList()-GetEntryCount())
+nStart = mpImplLB-GetEntryList()-GetEntryCount()-1;
 }
 
 sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/extras/ooxmlexport/data/multi-page-toc.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   12 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   18 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |   18 ++
 4 files changed, 48 insertions(+)

New commits:
commit 99b3e159726b51537563790e8f73b43a88970e13
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Oct 7 17:53:29 2014 +0200

DOCX import: handle section break right after a ToC field

The symptom was that during the handling of the XE field, we tried to
access the top of the text append stack, but the stack was empty.

The situation is the following:

1) There is a multi-page TOC field.
2) The page break inside the field is described using a section break,
featuring headers, and the header contains a field that we map to a
fieldmark.
3) There is an XE field after all this.

The root cause was that during parsing of the header, some of the state
should be stashed away and restored when we're done. The new
HeaderFooterContext does exactly this, and now the number of push/pop
calls on the text append context match again.

(cherry picked from commit 153af84762f98d6c86c4c060b01402f40b2b0c24)

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

Change-Id: I10f259fd9edb8bd719ae5bc8a43ed5ef8c708071
Reviewed-on: https://gerrit.libreoffice.org/13524
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/qa/extras/ooxmlexport/data/multi-page-toc.docx 
b/sw/qa/extras/ooxmlexport/data/multi-page-toc.docx
new file mode 100644
index 000..5b5b594
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/multi-page-toc.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 2fe437b..a443d58 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3706,6 +3706,18 @@ DECLARE_OOXMLEXPORT_TEST(testMsoPosition, 
bnc884615-mso-position.docx)
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testMultiPageToc, multi-page-toc.docx)
+{
+// Import of this document triggered an STL assertion.
+
+// Document has a ToC from its second paragraph.
+uno::Referencecontainer::XNamed xTextSection = getProperty 
uno::Referencecontainer::XNamed (getParagraph(2), TextSection);
+CPPUNIT_ASSERT_EQUAL(OUString(Table of Contents1), 
xTextSection-getName());
+// There should be a field in the header as well.
+uno::Referencetext::XText xHeaderText = getProperty 
uno::Referencetext::XText 
(getStyles(PageStyles)-getByName(DEFAULT_STYLE), HeaderText);
+CPPUNIT_ASSERT_EQUAL(OUString(TextFieldStart), 
getPropertyOUString(getRun(getParagraphOfText(1, xHeaderText), 1), 
TextPortionType));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bc4ff52..3779aa3 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1496,6 +1496,9 @@ uno::Reference beans::XPropertySet  
DomainMapper_Impl::appendTextSectionAfter(
 
 void DomainMapper_Impl::PushPageHeaderFooter(bool bHeader, 
SectionPropertyMap::PageType eType)
 {
+m_aHeaderFooterStack.push(HeaderFooterContext(m_bTextInserted));
+m_bTextInserted = false;
+
 const PropertyIds ePropIsOn = bHeader? PROP_HEADER_IS_ON: 
PROP_FOOTER_IS_ON;
 const PropertyIds ePropShared = bHeader? PROP_HEADER_IS_SHARED: 
PROP_FOOTER_IS_SHARED;
 const PropertyIds ePropTextLeft = bHeader? PROP_HEADER_TEXT_LEFT: 
PROP_FOOTER_TEXT_LEFT;
@@ -1576,6 +1579,12 @@ void DomainMapper_Impl::PopPageHeaderFooter()
 m_bDiscardHeaderFooter = false;
 }
 m_bInHeaderFooterImport = false;
+
+if (!m_aHeaderFooterStack.empty())
+{
+m_bTextInserted = m_aHeaderFooterStack.top().getTextInserted();
+m_aHeaderFooterStack.pop();
+}
 }
 
 
@@ -2523,6 +2532,15 @@ bool DomainMapper_Impl::IsOpenField() const
 return !m_aFieldStack.empty();
 }
 
+HeaderFooterContext::HeaderFooterContext(bool bTextInserted)
+: m_bTextInserted(bTextInserted)
+{
+}
+
+bool HeaderFooterContext::getTextInserted()
+{
+return m_bTextInserted;
+}
 
 FieldContext::FieldContext(uno::Reference text::XTextRange  xStart) :
 m_bFieldCommandCompleted( false )
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index f72c866..68e1af7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -113,6 +113,22 @@ enum BreakType
 PAGE_BREAK,
 COLUMN_BREAK
 };
+
+/**
+ * Storage for state that is relevant outside a header/footer, but not inside 
it.
+ *
+ * In case some state of

minutes of ESC call ...

2014-12-18 Thread Michael Meeks

* Present
+ Muthu, Michael M., Kendy, Kohei, Miklos, Cloph, Eike, Ignaz, Stephan,
  Norbert, Robinson, Ptyl, Caolan, Lionel, Andras, Bjoern, Markus, Jacobo,
  Michael S
 
* Completed Action Items:
+ review libcmis branch  merge to master  4.4 (Miklos)
[ one problem was pending and Mihai fixed it - he rocks
  feature will be in RC1 ]
+ get a better / longer term certificate for signing
+ cf. https://bugs.freedesktop.org/show_bug.cgi?id=86780
[ Florian is on the job for 4.5 ]
+ mail QA list with newly up-loaded bibisect (Robinson)
+ test out  evangelise VM / X2go / QA VM scheme (Robinson)
[ working with Cloph on this, mentioned them to QA,
  people tested on Mac  Windows, they're very responsive
  even without a good connection ]
 
* Pending Action Items:
+ fix BSA login / XML-RPC issues (Cloph)
[ still WIP with Cloph ]
+ check Matus' startup performance measurement for layered images.zip 
(Kendy)
 
* Bugzilla migration update (Robinson)
+ BugZilla migration = Saturday, January 24, ~1600 UTC
+ going well
+ http://vm150.documentfoundation.org/
+ thinking about next steps etc.
  https://gerrit.libreoffice.org/#/admin/projects/bugzilla
 
* Release Engineering update (Cloph)
+ 4.3.5 status
+ released - just now.
+ 4.4.0 RC1 status
+ string  UI freeze date, but not branch-off.
 + single review - from someone other than the committer
   to push to RC1 - cf. 4.3 branch etc.
+ build failed on windows:
 + command-line limits again: packaging extensions
 + have a fix in-hand.
 [ write file lists to a temporary file etc. ]
+ other platform builds on the pre-releases server already.
+ Horribly late feature collection:
+ OneDrive / SharePoint bits
[ now in ]
+ OpenGL/CL JPEG de-compression to texture (jpeg-turbo patch)
[ punted to master/4.5 - won't make 4.4.x ]
+ New Templates ...
[ competition to be announced tomorrow ]
+ 4.4.0 RC2
+ due January 5th - week 1
+ 4.3.6 RC1
+ due January 12th
+ 4.4.0 RC3
+ due January 19th - week 4
+ Android / iOS Remote
+ Android on the Google Play
+ another build up-loaded to Google play
  null-ptr exception fixed - 7x reports of the problem
+ iOS - update translations, will be pushed too
 
* Next meeting:
+ propose skip Christmas day, and Jan 1st.
 
* Crashtest update (Caolan)
+ making good progress on import
+ currently, have unreliable results; so figures smaller than they look
+ crashers shrinking all the time.
+ validation testing (Markus)
+ have 2x fixes for officeotron - reduces numbers significantly
  for calc at least.
+ at some stage a writer dev. should look at docx validation issues
  some duplicated / mis-ordered elements - so ~nearly every doc is
  invalid
  + should be an easy fix  help a lot.
+ don't underestimate the effort (Miklos)
+ cjk etc. font size issue was pretty nasty here.
+ a few docs on writer side, validated during the build
+ grab-bag collisions suspected (Markus)
+ duplicates in there causing grief.
+ has hardware arrived ?
+ yes - the hardware has arrived
+ since we cancelled other Hertzner servers we urgently need to
  move those pieces over first before setting new services up.
 + backup / control, download / ML server needs moving.
+ desire for more memory for fuzzing  asan runs (Moggi)
+ assining more memory is no problem (Cloph)
+ other testing VM's:
 + crash-testing
 + cachegrind regression test
 + VM's for Jenkins - 2x Linux VMs
+ linked to the crash-tests from the wiki (Bjoern)
 
* FOSDEM bits
+ FOSDEM, Bruessels, Belgium -- February 2015 contact: Kendy/Cor
+ 20+ talks submitted / update - lots of good content.
+ kendy presenting the LibreOffice design team in open-source design 
dev-roomn
+ Book a room at 'Hotel Astrid' to be near the team: cheap as well ...
 
* Hackfests (Bjoern)
+ initial scheduling for 2015:
+ Las Palmas de Gran Canaria, Spain -- March, 2015 contact: Bjoern
+ setup for GSOC etc.
+ contacted them - and plan to go ahead with that.
+ Cambridge, UK -- May 2015 contact: Michael
 
* UX Update (Kendy)
+ shorter call this time
+ lots of good things ongoing
+ report about UI changes of last week to come
+ critical piece is the template competition
+ hopefully an on-going effort for 4.4.x / 4.5
 
* Certification (Stephan/Bjoern/Kendy)
 
* Jenkins update (Norbert)
+ started migrating the server that does the work into TDF

[Libreoffice-commits] core.git: desktop/Library_active_native.mk desktop/Library_passive_native.mk external/mysqlcppconn include/rtl mysqlc/Library_mysqlc.mk odk/CppunitTest_odk_checkapi.mk odk/qa sol

 desktop/Library_active_native.mk  |2 ++
 desktop/Library_passive_native.mk |2 ++
 external/mysqlcppconn/Library_mysqlcppconn.mk |2 ++
 include/rtl/stringutils.hxx   |4 
 mysqlc/Library_mysqlc.mk  |4 ++--
 odk/CppunitTest_odk_checkapi.mk   |3 ++-
 odk/qa/checkapi/checkapi.cxx  |6 --
 solenv/gbuild/CppunitTest.mk  |1 +
 solenv/gbuild/Executable.mk   |1 +
 solenv/gbuild/Library.mk  |1 +
 solenv/gbuild/LinkTarget.mk   |7 +++
 solenv/gbuild/StaticLibrary.mk|1 +
 solenv/gbuild/gbuild.mk   |   14 +++---
 solenv/gbuild/platform/com_GCC_class.mk   |5 +
 solenv/gbuild/platform/com_MSC_class.mk   |1 +
 15 files changed, 38 insertions(+), 16 deletions(-)

New commits:
commit 86ba184394094c7c043a505a20a0b1b8977f73d7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 16:34:46 2014 +0100

Introduce gb_*_set_external_code

...to harmonize the mechanisms to not define LIBO_INTERNAL_ONLY for 
extension
code and CppunitTest_odk_checkapi.  (It also needs to revert any -Wundef, 
as the
config_host/config_*.h files will not be included, so the HAVE_* macros 
will be
undefined.)

This obsoletes the need for RTL_DISABLE_FAST_STRING.

Change-Id: If5eacba80c349efb90762aade8f2ea6d2db7e314

diff --git a/desktop/Library_active_native.mk b/desktop/Library_active_native.mk
index 7c09c10..ef4815f 100644
--- a/desktop/Library_active_native.mk
+++ b/desktop/Library_active_native.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_Library_add_exception_objects,active_native, 
\
 desktop/test/deployment/active/active_native \
 ))
 
+$(eval $(call gb_Library_set_external_code,active_native))
+
 $(eval $(call gb_Library_use_externals,active_native, \
 boost_headers \
 ))
diff --git a/desktop/Library_passive_native.mk 
b/desktop/Library_passive_native.mk
index ac2c0bc..8bc14b5 100644
--- a/desktop/Library_passive_native.mk
+++ b/desktop/Library_passive_native.mk
@@ -15,6 +15,8 @@ $(eval $(call 
gb_Library_add_exception_objects,passive_native, \
 
 $(eval $(call 
gb_Library_set_componentfile,passive_native,desktop/test/deployment/passive/passive_native))
 
+$(eval $(call gb_Library_set_external_code,passive_native))
+
 $(eval $(call gb_Library_use_externals,passive_native, \
 boost_headers \
 ))
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk 
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 3a5da71..8b6202f 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_use_externals,mysqlcppconn,\
 endif
 endif
 
+$(eval $(call gb_Library_set_external_code,mysqlcppconn))
+
 $(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn))
 
 $(eval $(call gb_Library_set_generated_cxx_suffix,mysqlcppconn,cpp))
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index 52ed1d0..1f1e53b 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -13,15 +13,11 @@
 #include sal/config.h
 #include sal/types.h
 
-// Manually defining RTL_DISABLE_FAST_STRING allows to force turning fast 
string concatenation off
-// (e.g. for debugging).
-#ifndef RTL_DISABLE_FAST_STRING
 // This feature is not part of public API and is meant to be used only 
internally by LibreOffice.
 #ifdef LIBO_INTERNAL_ONLY
 // Enable fast string concatenation.
 #define RTL_FAST_STRING
 #endif
-#endif
 
 // The unittest uses slightly different code to help check that the proper
 // calls are made. The class is put into a different namespace to make
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 656b5dc..bc26eaf 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Library_Library,mysqlc))
 
-$(eval $(call gb_Library_add_cxxflags,mysqlc,-DRTL_DISABLE_FAST_STRING))
-
 $(eval $(call gb_Library_use_externals,mysqlc,\
boost_headers \
mysqlcppconn \
@@ -59,4 +57,6 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\
 
 $(eval $(call gb_Library_set_componentfile,mysqlc,mysqlc/source/mysqlc))
 
+$(eval $(call gb_Library_set_external_code,mysqlc))
+
 # vim: set noet sw=4 ts=4:
diff --git a/odk/CppunitTest_odk_checkapi.mk b/odk/CppunitTest_odk_checkapi.mk
index 8d2bf2f..3c45814 100644
--- a/odk/CppunitTest_odk_checkapi.mk
+++ b/odk/CppunitTest_odk_checkapi.mk
@@ -26,7 +26,6 @@ $(eval $(call 
gb_CppunitTest_use_internal_comprehensive_api,odk_checkapi,\
 $(eval $(call gb_CppunitTest_disable_compiler_plugins,odk_checkapi))
 
 $(eval $(call gb_CppunitTest_add_cxxflags,odk_checkapi,\
-   $(gb_CXXFLAGS_Wundef) \
$(gb_CXX03FLAGS) \
 ))
 
@@ -38,4 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,odk_checkapi,\

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

 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e17be13daa8632bb4a9f7e8703c751d2beab9e6d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 16:44:06 2014 +0100

Work around MSVC bug

Change-Id: I592eb027f4c13cf75f1f0a443696d4d4e8e50e04

diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx 
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 953b183..86be630 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -901,8 +901,8 @@ bool OSelectionBrowseBox::SaveModified()
 case BROW_VIS_ROW:
 {
 bool bOldValue = m_pVisibleCell-GetBox().GetSavedValue() 
!= TRISTATE_FALSE;
-strOldCellContents = bOldValue ? 1 : 0;
-sNewValue  = !bOldValue ? 1 : 0;
+strOldCellContents = bOldValue ? OUStringLiteral(1) : 
OUStringLiteral(0);
+sNewValue  = !bOldValue ? OUStringLiteral(1) : 
OUStringLiteral(0);
 }
 if((m_bOrderByUnRelated || pEntry-GetOrderDir() == 
ORDER_NONE) 
(m_bGroupByUnRelated || !pEntry-IsGroupBy()))
@@ -2231,7 +2231,7 @@ OUString OSelectionBrowseBox::GetCellContents(sal_Int32 
nCellIndex, sal_uInt16 n
 switch (nCellIndex)
 {
 case BROW_VIS_ROW :
-return pEntry-IsVisible() ? 1 : 0;
+return pEntry-IsVisible() ? OUStringLiteral(1) : 
OUStringLiteral(0);
 case BROW_ORDER_ROW:
 {
 sal_Int32 nIdx = m_pOrderCell-GetSelectEntryPos();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-18 Thread Michael Stahl

 sw/qa/extras/rtfimport/data/fdo84685.rtf   |7 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |   20 +++
 writerfilter/source/rtftok/rtfcontrolwords.hxx |2 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   26 +
 4 files changed, 55 insertions(+)

New commits:
commit d90c5fbf67dc76c18cf703267139e7ad6b26564b
Author: Michael Stahl mst...@redhat.com
Date:   Tue Dec 16 23:17:28 2014 +0100

fdo#84685: writerfilter: RTF import: support \xe index entry

(cherry picked from commit f14e6e06b9e3c82c267649d63512a3538e5ee2f5)

(related fdo#84685): writerfilter: RTF import: support \tc TOC entry

(cherry picked from commit 1dd1dfc152c7cbeb374fe4f38b08c6af9cef2c06)

fix Windows build
(cherry picked from commit acfd640fd8547d3275c5db714b88d52b3fe7c4d5)

Change-Id: Ia957541a5997961aa86b2eb8537ebd29d3092691
Reviewed-on: https://gerrit.libreoffice.org/13508
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/extras/rtfimport/data/fdo84685.rtf 
b/sw/qa/extras/rtfimport/data/fdo84685.rtf
new file mode 100644
index 000..af73b1a
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo84685.rtf
@@ -0,0 +1,7 @@
+{\rtf1\ansi\ansicpg1252\uc1
+\pard
+{\v {\xe {\v {\f0\fs20 Key the 1st Some text
+\par
+{\v {\tc {\v {\f0\fs20 foo Some text
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 721fd73..e2b9030 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -30,6 +30,7 @@
 #include com/sun/star/text/SizeType.hpp
 #include com/sun/star/text/TableColumnSeparator.hpp
 #include com/sun/star/text/TextContentAnchorType.hpp
+#include com/sun/star/text/XDocumentIndexMark.hpp
 #include com/sun/star/text/XFootnotesSupplier.hpp
 #include com/sun/star/text/XPageCursor.hpp
 #include com/sun/star/text/XTextGraphicObjectsSupplier.hpp
@@ -2023,6 +2024,25 @@ DECLARE_RTFIMPORT_TEST(testUnbalancedColumns, 
unbalanced-columns.rtf)
 CPPUNIT_ASSERT_EQUAL(true, getPropertybool(xTextSections-getByIndex(0), 
DontBalanceTextColumns));
 }
 
+DECLARE_RTFIMPORT_TEST(testFdo84685, fdo84685.rtf)
+{
+// index mark was not imported
+uno::Referencetext::XDocumentIndexMark xMark(
+getPropertyuno::Referencetext::XDocumentIndexMark(
+getRun(getParagraph(1), 1),
+DocumentIndexMark));
+CPPUNIT_ASSERT(xMark.is());
+CPPUNIT_ASSERT_EQUAL(OUString(Key the 1st), getPropertyOUString(xMark, 
PrimaryKey));
+// let's test toc entry too
+uno::Referencetext::XDocumentIndexMark xTOCMark(
+getPropertyuno::Referencetext::XDocumentIndexMark(
+getRun(getParagraph(2), 1),
+DocumentIndexMark));
+CPPUNIT_ASSERT(xTOCMark.is());
+uno::Referencelang::XServiceInfo xTOCSI(xTOCMark, uno::UNO_QUERY);
+
CPPUNIT_ASSERT(xTOCSI-supportsService(com.sun.star.text.ContentIndexMark));
+}
+
 DECLARE_RTFIMPORT_TEST(testFdo83204, fdo83204.rtf)
 {
 // This was Standard, \sN was ignored after \bkmkstart and \pard.
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx 
b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index f89e4cf..8f56e88 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -148,6 +148,8 @@ enum RTFDestinationState
 DESTINATION_BACKGROUND,
 DESTINATION_SHAPEGROUP,
 DESTINATION_FOOTNOTESEPARATOR,
+DESTINATION_INDEXENTRY,
+DESTINATION_TOCENTRY,
 };
 
 enum RTFKeyword
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b61f5a7..447493c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1248,6 +1248,8 @@ void RTFDocumentImpl::text(OUString rString)
 case DESTINATION_MSUPHIDE:
 case DESTINATION_MTYPE:
 case DESTINATION_MGROW:
+case DESTINATION_INDEXENTRY:
+case DESTINATION_TOCENTRY:
 m_aStates.top().pDestinationText-append(rString);
 break;
 default:
@@ -1716,6 +1718,13 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 case RTF_BKMKEND:
 m_aStates.top().nDestinationState = DESTINATION_BOOKMARKEND;
 break;
+case RTF_XE:
+m_aStates.top().nDestinationState = DESTINATION_INDEXENTRY;
+break;
+case RTF_TC:
+case RTF_TCN:
+m_aStates.top().nDestinationState = DESTINATION_TOCENTRY;
+break;
 case RTF_REVTBL:
 m_aStates.top().nDestinationState = DESTINATION_REVISIONTABLE;
 break;
@@ -5047,6 +5056,23 @@ int RTFDocumentImpl::popState()
 break; // not for nested group
 
Mapper().props(lcl_getBookmarkProperties(m_aBookmarks[m_aStates.top().pDestinationText-makeStringAndClear()]));
 break;
+case

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

 svx/source/form/formcontrolling.cxx |   38 ++--
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 3f66df98050175dfbab2026661c0cba734885e05
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 16:55:14 2014 +0100

Work around GCC bug

Change-Id: Ib53fd467cb270908846f8f613d9f085aeccdff01

diff --git a/svx/source/form/formcontrolling.cxx 
b/svx/source/form/formcontrolling.cxx
index 893c7f6..0df82ee 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -88,26 +88,26 @@ namespace svx
 if ( s_aFeatureDescriptions.empty() )
 {
 FeatureDescription aDescriptions[] = {
-{ FMURL_FORM_POSITION,SID_FM_RECORD_ABSOLUTE,  
   FormFeature::MoveAbsolute },
-{ FMURL_FORM_RECORDCOUNT, SID_FM_RECORD_TOTAL, 
   FormFeature::TotalRecords },
-{ FMURL_RECORD_MOVEFIRST, SID_FM_RECORD_FIRST, 
   FormFeature::MoveToFirst },
-{ FMURL_RECORD_MOVEPREV,  SID_FM_RECORD_PREV,  
   FormFeature::MoveToPrevious },
-{ FMURL_RECORD_MOVENEXT,  SID_FM_RECORD_NEXT,  
   FormFeature::MoveToNext },
-{ FMURL_RECORD_MOVELAST,  SID_FM_RECORD_LAST,  
   FormFeature::MoveToLast },
-{ FMURL_RECORD_MOVETONEW, SID_FM_RECORD_NEW,   
   FormFeature::MoveToInsertRow },
-{ FMURL_RECORD_SAVE,  SID_FM_RECORD_SAVE,  
   FormFeature::SaveRecordChanges },
-{ FMURL_RECORD_DELETE,SID_FM_RECORD_DELETE,
   FormFeature::DeleteRecord },
-{ FMURL_FORM_REFRESH, SID_FM_REFRESH,  
   FormFeature::ReloadForm },
-{ FMURL_FORM_REFRESH_CURRENT_CONTROL,
+{ OUString(FMURL_FORM_POSITION),
SID_FM_RECORD_ABSOLUTE, FormFeature::MoveAbsolute },
+{ OUString(FMURL_FORM_RECORDCOUNT), 
SID_FM_RECORD_TOTAL,FormFeature::TotalRecords },
+{ OUString(FMURL_RECORD_MOVEFIRST), 
SID_FM_RECORD_FIRST,FormFeature::MoveToFirst },
+{ OUString(FMURL_RECORD_MOVEPREV),  
SID_FM_RECORD_PREV, FormFeature::MoveToPrevious },
+{ OUString(FMURL_RECORD_MOVENEXT),  
SID_FM_RECORD_NEXT, FormFeature::MoveToNext },
+{ OUString(FMURL_RECORD_MOVELAST),  
SID_FM_RECORD_LAST, FormFeature::MoveToLast },
+{ OUString(FMURL_RECORD_MOVETONEW), 
SID_FM_RECORD_NEW,  FormFeature::MoveToInsertRow },
+{ OUString(FMURL_RECORD_SAVE),  
SID_FM_RECORD_SAVE, FormFeature::SaveRecordChanges },
+{ OUString(FMURL_RECORD_DELETE),
SID_FM_RECORD_DELETE,   FormFeature::DeleteRecord },
+{ OUString(FMURL_FORM_REFRESH), 
SID_FM_REFRESH, FormFeature::ReloadForm },
+{ OUString(FMURL_FORM_REFRESH_CURRENT_CONTROL),
   
SID_FM_REFRESH_FORM_CONTROL,FormFeature::RefreshCurrentControl },
-{ FMURL_RECORD_UNDO,  SID_FM_RECORD_UNDO,  
   FormFeature::UndoRecordChanges },
-{ FMURL_FORM_SORT_UP, SID_FM_SORTUP,   
   FormFeature::SortAscending },
-{ FMURL_FORM_SORT_DOWN,   SID_FM_SORTDOWN, 
   FormFeature::SortDescending },
-{ FMURL_FORM_SORT,SID_FM_ORDERCRIT,
   FormFeature::InteractiveSort },
-{ FMURL_FORM_AUTO_FILTER, SID_FM_AUTOFILTER,   
   FormFeature::AutoFilter },
-{ FMURL_FORM_FILTER,  SID_FM_FILTERCRIT,   
   FormFeature::InteractiveFilter },
-{ FMURL_FORM_APPLY_FILTER,SID_FM_FORM_FILTERED,
   FormFeature::ToggleApplyFilter },
-{ FMURL_FORM_REMOVE_FILTER,   
SID_FM_REMOVE_FILTER_SORT,  FormFeature::RemoveFilterAndSort }
+{ OUString(FMURL_RECORD_UNDO),  
SID_FM_RECORD_UNDO, FormFeature::UndoRecordChanges },
+{ OUString(FMURL_FORM_SORT_UP), SID_FM_SORTUP, 
 FormFeature::SortAscending },
+{ OUString(FMURL_FORM_SORT_DOWN),   
SID_FM_SORTDOWN,FormFeature::SortDescending },
+{ OUString(FMURL_FORM_SORT),
SID_FM_ORDERCRIT,   FormFeature::InteractiveSort },
+{ OUString(FMURL_FORM_AUTO_FILTER), 
SID_FM_AUTOFILTER,  FormFeature::AutoFilter },
+{ OUString(FMURL_FORM_FILTER),  
SID_FM_FILTERCRIT,

[Bug 45789] automatic row height in reports

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

--- Comment #31 from Lionel Elie Mamane lio...@mamane.lu ---
(In reply to Omar Syed from comment #30)
 Don't worry guys.  I got this

I look forward to reviewing your patch ! Let me knwo when it, or a draft of it,
is ready.

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

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

2014-12-18 Thread Juan Picca

 include/svx/svdtrans.hxx   |   14 +
 svx/source/svdraw/svdtrans.cxx |   44 ++---
 2 files changed, 26 insertions(+), 32 deletions(-)

New commits:
commit 82aa4dbd8330eb446cdf535794c13185f0c0ca81
Author: Juan Picca jumap...@gmail.com
Date:   Mon Nov 3 22:33:52 2014 -0200

Fraction: rewrite 'GetDenominator()==0' conditions

Change-Id: Ie42972db98da48b60b3f5314e019046b2a2ee0e7
Reviewed-on: https://gerrit.libreoffice.org/12238
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 0dca975..f2e1591 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -104,10 +104,16 @@ void CrookStretchPoly(XPolyPolygon rPoly, const Point 
rCenter, const Point rR
 
 inline void ResizePoint(Point rPnt, const Point rRef, Fraction xFact, 
Fraction yFact)
 {
-if (xFact.GetDenominator()==0) xFact=Fraction(xFact.GetNumerator(),1); // 
DivZero abfangen
-if (yFact.GetDenominator()==0) yFact=Fraction(yFact.GetNumerator(),1); // 
DivZero abfangen
-rPnt.X()=rRef.X()+ 
Round(((double)(rPnt.X()-rRef.X())*xFact.GetNumerator())/xFact.GetDenominator());
-rPnt.Y()=rRef.Y()+ 
Round(((double)(rPnt.Y()-rRef.Y())*yFact.GetNumerator())/yFact.GetDenominator());
+if (!xFact.IsValid()) {
+SAL_WARN( svx.svdraw, invalid fraction xFact, using Fraction(1,1) 
);
+xFact = Fraction(1,1);
+}
+if (!yFact.IsValid()) {
+SAL_WARN( svx.svdraw, invalid fraction yFact, using Fraction(1,1) 
);
+yFact = Fraction(1,1);
+}
+rPnt.X() = rRef.X() + Round( (rPnt.X() - rRef.X()) * double(xFact) );
+rPnt.Y() = rRef.Y() + Round( (rPnt.Y() - rRef.Y()) * double(yFact) );
 }
 
 inline void RotatePoint(Point rPnt, const Point rRef, double sn, double cs)
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index fea8637..4de3f70 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -37,36 +37,24 @@ void ResizeRect(Rectangle rRect, const Point rRef, const 
Fraction rxFact, con
 Fraction xFact(rxFact);
 Fraction yFact(ryFact);
 
-{
-if (xFact.GetDenominator()==0) {
-long nWdt=rRect.Right()-rRect.Left();
-if (xFact.GetNumerator()=0) { // catch divisions by zero
-xFact=Fraction(xFact.GetNumerator(),1);
-if (nWdt==0) rRect.Right()++;
-} else {
-xFact=Fraction(xFact.GetNumerator(),-1);
-if (nWdt==0) rRect.Left()--;
-}
-}
-rRect.Left()  =rRef.X()+Round(((double)(rRect.Left()  
-rRef.X())*xFact.GetNumerator())/xFact.GetDenominator());
-rRect.Right() =rRef.X()+Round(((double)(rRect.Right() 
-rRef.X())*xFact.GetNumerator())/xFact.GetDenominator());
+if (!xFact.IsValid()) {
+SAL_WARN( svx.svdraw, invalid fraction xFract, using Fraction(1,1) 
);
+xFact = Fraction(1,1);
+long nWdt = rRect.Right() - rRect.Left();
+if (nWdt == 0) rRect.Right()++;
 }
-{
-if (yFact.GetDenominator()==0) {
-long nHgt=rRect.Bottom()-rRect.Top();
-if (yFact.GetNumerator()=0) { // catch divisions by zero
-yFact=Fraction(yFact.GetNumerator(),1);
-if (nHgt==0) rRect.Bottom()++;
-} else {
-yFact=Fraction(yFact.GetNumerator(),-1);
-if (nHgt==0) rRect.Top()--;
-}
-
-yFact=Fraction(yFact.GetNumerator(),1); // catch divisions by zero
-}
-rRect.Top()   =rRef.Y()+Round(((double)(rRect.Top()   
-rRef.Y())*yFact.GetNumerator())/yFact.GetDenominator());
-
rRect.Bottom()=rRef.Y()+Round(((double)(rRect.Bottom()-rRef.Y())*yFact.GetNumerator())/yFact.GetDenominator());
+rRect.Left()  = rRef.X() + Round( (rRect.Left()  - rRef.X()) * 
double(xFact) );
+rRect.Right() = rRef.X() + Round( (rRect.Right() - rRef.X()) * 
double(xFact) );
+
+if (!yFact.IsValid()) {
+SAL_WARN( svx.svdraw, invalid fraction yFract, using Fraction(1,1) 
);
+yFact = Fraction(1,1);
+long nHgt = rRect.Bottom() - rRect.Top();
+if (nHgt == 0) rRect.Bottom()++;
 }
+rRect.Top()= rRef.Y() + Round( (rRect.Top()- rRef.Y()) * 
double(yFact) );
+rRect.Bottom() = rRef.Y() + Round( (rRect.Bottom() - rRef.Y()) * 
double(yFact) );
+
 if (!bNoJustify) rRect.Justify();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/model/template/AreaChartType.cxx|2 +-
 chart2/source/model/template/BarChartType.cxx |2 +-
 chart2/source/model/template/BubbleChartType.cxx  |2 +-
 chart2/source/model/template/CandleStickChartType.cxx |2 +-
 chart2/source/model/template/ColumnChartType.cxx  |2 +-
 chart2/source/model/template/FilledNetChartType.cxx   |2 +-
 chart2/source/model/template/GL3DBarChartType.cxx |2 +-
 chart2/source/model/template/LineChartType.cxx|2 +-
 chart2/source/model/template/NetChartType.cxx |2 +-
 chart2/source/model/template/PieChartType.cxx |2 +-
 chart2/source/model/template/ScatterChartType.cxx |2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit df35af41685630b70fb460a90ec47f481895ad7f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 18 15:52:10 2014 +

fix build

Change-Id: I920227cd175dace306ebb16a8e476f483cf11a7a

diff --git a/chart2/source/model/template/AreaChartType.cxx 
b/chart2/source/model/template/AreaChartType.cxx
index 7f16f17..8446109 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -50,7 +50,7 @@ uno::Reference util::XCloneable  SAL_CALL 
AreaChartType::createClone()
 OUString SAL_CALL AreaChartType::getChartType()
 throw (uno::RuntimeException, std::exception)
 {
-return CHART2_SERVICE_NAME_CHARTTYPE_AREA;
+return OUString(CHART2_SERVICE_NAME_CHARTTYPE_AREA);
 }
 
 uno::Sequence OUString  AreaChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/BarChartType.cxx 
b/chart2/source/model/template/BarChartType.cxx
index 87823c8..587fc63 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -51,7 +51,7 @@ uno::Reference util::XCloneable  SAL_CALL 
BarChartType::createClone()
 OUString SAL_CALL BarChartType::getChartType()
 throw (uno::RuntimeException, std::exception)
 {
-return CHART2_SERVICE_NAME_CHARTTYPE_BAR;
+return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BAR);
 }
 
 uno::Sequence OUString  BarChartType::getSupportedPropertyRoles()
diff --git a/chart2/source/model/template/BubbleChartType.cxx 
b/chart2/source/model/template/BubbleChartType.cxx
index a2f7549..13cc187 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -161,7 +161,7 @@ Reference chart2::XCoordinateSystem  SAL_CALL
 OUString SAL_CALL BubbleChartType::getChartType()
 throw (uno::RuntimeException, std::exception)
 {
-return CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE;
+return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE);
 }
 
 uno::Sequence OUString  SAL_CALL 
BubbleChartType::getSupportedMandatoryRoles()
diff --git a/chart2/source/model/template/CandleStickChartType.cxx 
b/chart2/source/model/template/CandleStickChartType.cxx
index eb18c80..85660ee 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -218,7 +218,7 @@ uno::Reference util::XCloneable  SAL_CALL 
CandleStickChartType::createClone()
 OUString SAL_CALL CandleStickChartType::getChartType()
 throw (uno::RuntimeException, std::exception)
 {
-return CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK;
+return OUString(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK);
 }
 
 uno::Sequence OUString  SAL_CALL 
CandleStickChartType::getSupportedMandatoryRoles()
diff --git a/chart2/source/model/template/ColumnChartType.cxx 
b/chart2/source/model/template/ColumnChartType.cxx
index eb1f1c2..6ad30b9 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -150,7 +150,7 @@ uno::Reference util::XCloneable  SAL_CALL 
ColumnChartType::createClone()
 OUString SAL_CALL ColumnChartType::getChartType()
 throw (uno::RuntimeException, std::exception)
 {
-return CHART2_SERVICE_NAME_CHARTTYPE_COLUMN;
+return OUString(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN);
 }
 
 uno::Sequence OUString  ColumnChartType::getSupportedPropertyRoles()
diff --git a/chart2/source/model/template/FilledNetChartType.cxx 
b/chart2/source/model/template/FilledNetChartType.cxx
index 35d57e2..c597f42 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -65,7 +65,7 @@ uno::Reference util::XCloneable  SAL_CALL 
FilledNetChartType::createClone()
 OUString SAL_CALL FilledNetChartType::getChartType()
 throw (uno::RuntimeException, std::exception)
 {
-return CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET;
+return OUString(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET);
 }
 
 uno::Sequence OUString  FilledNetChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/GL3DBarChartType.cxx 
b/chart2/source/model/template/GL3DBarChartType.cxx
index f22e29d..69d8bfc 100644
---

[Libreoffice-commits] core.git: compilerplugins/clang

 compilerplugins/clang/saloverride.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit a349a4763fd32177be55877a098247959a820c5a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 17:29:31 2014 +0100

loplugin:saloverride does not make sense for external code

...where SAL_OVERRIDE is not available

Change-Id: I49d447ba90516f4f744c21302607bff97ad3c4d5

diff --git a/compilerplugins/clang/saloverride.cxx 
b/compilerplugins/clang/saloverride.cxx
index 6b62fb3..bb6766b 100644
--- a/compilerplugins/clang/saloverride.cxx
+++ b/compilerplugins/clang/saloverride.cxx
@@ -25,8 +25,7 @@ class SalOverride:
 public:
 explicit SalOverride(InstantiationData const  data): RewritePlugin(data) 
{}
 
-virtual void run() override
-{ TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+virtual void run() override;
 
 bool VisitCXXMethodDecl(CXXMethodDecl const * decl);
 
@@ -34,6 +33,14 @@ private:
 std::setSourceLocation insertions_;
 };
 
+void SalOverride::run() {
+if (compiler.getLangOpts().CPlusPlus
+ compiler.getPreprocessor().getIdentifierInfo(
+LIBO_INTERNAL_ONLY)-hasMacroDefinition())
+{
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+}
+}
 bool SalOverride::VisitCXXMethodDecl(CXXMethodDecl const * decl) {
 // As a heuristic, ignore declarations where the name is spelled out in an
 // ignored location; that e.g. handles uses of the Q_OBJECT macro from
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 tools/qa/cppunit/test_urlobj.cxx |   25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 09e071fe4077d412708ba12f4561b70f6b34
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 17:36:14 2014 +0100

tools: Use appropriate OUString functions on string constants

Change-Id: Idbca92ee8d38fe5839ec0aeb8ee02af3e326549d

diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx
index 038ead7..97656e4 100644
--- a/tools/qa/cppunit/test_urlobj.cxx
+++ b/tools/qa/cppunit/test_urlobj.cxx
@@ -58,9 +58,8 @@ namespace tools_urlobj
 {
 INetURLObject aUrl( OUString( 
file://10.10.1.1/sampledir/sample.file ) );
 #ifdef LINUX
-CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ).
-equalsAscii
-( smb://10.10.1.1/sampledir/sample.file ) );
+CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
+== smb://10.10.1.1/sampledir/sample.file );
 CPPUNIT_ASSERT( aUrl.GetProtocol(  ) == INET_PROT_SMB );
 #endif
 #ifdef WIN
@@ -86,8 +85,8 @@ namespace tools_urlobj
 setFSysPath( OUString( 137.65.170.24\\c$\\Img0001.jpg ),
  INetURLObject::FSYS_DETECT );
 #ifdef LINUX
-CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ).
-equalsAscii( smb://137.65.170.24/c$/Img0001.jpg 
) );
+CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
+== smb://137.65.170.24/c$/Img0001.jpg );
 CPPUNIT_ASSERT( aUrl.GetProtocol(  ) == INET_PROT_SMB );
 #endif
 #ifdef WIN
@@ -112,8 +111,8 @@ namespace tools_urlobj
 setFSysPath( OUString( 
hive-winxp-x86\\pmladek\\test2.odt ),
  INetURLObject::FSYS_DETECT );
 #ifdef LINUX
-CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ).
-equalsAscii( 
smb://hive-winxp-x86/pmladek/test2.odt ) );
+CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
+== smb://hive-winxp-x86/pmladek/test2.odt );
 CPPUNIT_ASSERT( aUrl.GetProtocol(  ) == INET_PROT_SMB );
 #endif
 #ifdef WIN
@@ -131,8 +130,8 @@ namespace tools_urlobj
 {
 INetURLObject aUrl( OUString( 
smb://10.10.1.1/sampledir/sample.file ) );
 #ifdef LINUX
-CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ).
-equalsAscii( 
smb://10.10.1.1/sampledir/sample.file ) );
+CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
+== smb://10.10.1.1/sampledir/sample.file );
 CPPUNIT_ASSERT( aUrl.GetProtocol(  ) == INET_PROT_SMB );
 #endif
 #ifdef WIN
@@ -155,8 +154,8 @@ namespace tools_urlobj
 aUrl.setFSysPath( OUString( //137.65.170.24/c$/Img0001.jpg ),
   INetURLObject::FSYS_DETECT );
 #ifdef LINUX
-CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ).
-equalsAscii( smb://137.65.170.24/c$/Img0001.jpg 
) );
+CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
+== smb://137.65.170.24/c$/Img0001.jpg );
 CPPUNIT_ASSERT( aUrl.GetProtocol(  ) == INET_PROT_SMB );
 #endif
 #ifdef WIN
@@ -180,8 +179,8 @@ namespace tools_urlobj
 aUrl.setFSysPath( OUString( //hive-winxp-x86/pmladek/test2.odt ),
   INetURLObject::FSYS_DETECT );
 #ifdef LINUX
-CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ).
-equalsAscii( 
smb://hive-winxp-x86/pmladek/test2.odt ) );
+CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
+== smb://hive-winxp-x86/pmladek/test2.odt );
 CPPUNIT_ASSERT( aUrl.GetProtocol(  ) == INET_PROT_SMB );
 #endif
 #ifdef WIN
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 test/source/bootstrapfixture.cxx   |2 +-
 vcl/generic/fontmanager/fontmanager.cxx|4 ++--
 vcl/generic/print/printerjob.cxx   |2 +-
 vcl/generic/print/prtsetup.cxx |   10 +-
 vcl/unx/generic/app/i18n_ic.cxx|2 +-
 vcl/unx/generic/app/saldisp.cxx|4 ++--
 vcl/unx/generic/app/wmadaptor.cxx  |4 ++--
 vcl/unx/generic/dtrans/X11_selection.cxx   |   10 +-
 vcl/unx/generic/dtrans/config.cxx  |2 +-
 vcl/unx/generic/printer/ppdparser.cxx  |   20 ++--
 vcl/unx/generic/printer/printerinfomanager.cxx |2 +-
 vcl/unx/generic/window/salframe.cxx|6 +++---
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx   |2 +-
 vcl/unx/gtk/window/gtksalframe.cxx |6 +++---
 14 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 9de415945a608b8b90b648e04ad06bac2d53a9cd
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 17:58:17 2014 +0100

vcl: Use appropriate OUString functions on string constants

Change-Id: I169624820cd7d25eab18a6b90482e075ebfebcc6

diff --git a/vcl/generic/fontmanager/fontmanager.cxx 
b/vcl/generic/fontmanager/fontmanager.cxx
index 33fb4ed..4fbded7 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -364,8 +364,8 @@ bool PrintFontManager::PrintFont::readAfmMetrics( 
MultiAtomProvider* pProvider,
 // try to parse the font name and decide whether it might be a
 // japanese font. Who invented this PITA ?
 OUString aPSNameLastToken( aPSName.copy( aPSName.lastIndexOf( '-' )+1 ) );
-if( aPSNameLastToken.equalsAscii( H )||
-aPSNameLastToken.equalsAscii( V )  )
+if( aPSNameLastToken == H||
+aPSNameLastToken == V  )
 {
 static const char* pEncs[] =
 {
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 80d52b1..f9da8c9 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -857,7 +857,7 @@ void PrinterJob::writeJobPatch( osl::File* pFile, const 
JobData rJobData )
 {
 const PPDValue* pVal = pKey-getValue( i );
 patch_order.push_back( pVal-m_aOption.toInt32() );
-if( patch_order.back() == 0  ! pVal-m_aOption.equalsAscii( 0 ) )
+if( patch_order.back() == 0  pVal-m_aOption != 0 )
 {
 WritePS( pFile, % Warning: left out JobPatchFile option \ );
 OString aOption = OUStringToOString( pVal-m_aOption, 
RTL_TEXTENCODING_ASCII_US );
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 1af14cc..7118850 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -341,11 +341,11 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
 for( int i = 0; i  m_pParent-m_aJobData.m_pParser-getKeys(); i++ )
 {
 const PPDKey* pKey = m_pParent-m_aJobData.m_pParser-getKey( i );
-if( pKey-isUIKey() 
-! pKey-getKey().equalsAscii( PageSize )  
-! pKey-getKey().equalsAscii( InputSlot ) 
-! pKey-getKey().equalsAscii( PageRegion )
-! pKey-getKey().equalsAscii( Duplex )
+if( pKey-isUIKey()   
+pKey-getKey() != PageSize  
+pKey-getKey() != InputSlot 
+pKey-getKey() != PageRegion
+pKey-getKey() != Duplex
 )
 {
 OUString aEntry( 
m_pParent-m_aJobData.m_pParser-translateKey( pKey-getKey() ) );
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index bdc73c0..379243f 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -46,7 +46,7 @@ static void sendEmptyCommit( SalFrame* pFrame )
 SalExtTextInputEvent aEmptyEv;
 aEmptyEv.mnTime = 0;
 aEmptyEv.mpTextAttr = 0;
-aEmptyEv.maText = ;
+aEmptyEv.maText.clear();
 aEmptyEv.mnCursorPos= 0;
 aEmptyEv.mnCursorFlags  = 0;
 aEmptyEv.mbOnlyCursor   = False;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 643415c..908d8ce 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -970,7 +970,7 @@ OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
 aStrMap += aKeyName;
 }
 else
-aStrMap = ;
+aStrMap.clear();
 }
 else if (!aCustomKeyName.isEmpty())
 {
@@ -981,7 +981,7 @@ OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
 aStrMap += aCustomKeyName;
 }
 else
-aStrMap = ;
+aStrMap.clear();
 
 return aStrMap;
 }
diff --git a/vcl/unx/generic/app/wmadaptor.cxx

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

 include/vcl/salbtype.hxx |  131 ---
 1 file changed, 1 insertion(+), 130 deletions(-)

New commits:
commit 62e08e2230c673c4f96995fa778f533ea99acca6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 18 16:54:18 2014 +

Related: coverity#1202743 Bad bit shift operation

Change-Id: Ia2fe4abd17e09aecaef6d929dbd9b393f33c9de6

diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 1dc65fc..970d319 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -32,7 +32,6 @@
 
 // - Memory -
 
-
 typedef sal_uInt8*  HPBYTE;
 typedef HPBYTE  Scanline;
 typedef const sal_uInt8*ConstHPBYTE;
@@ -41,7 +40,6 @@ typedef ConstHPBYTE ConstScanline;
 
 // - Bitmap formats -
 
-
 #define BMP_FORMAT_BOTTOM_UP0xUL
 #define BMP_FORMAT_TOP_DOWN 0x8000UL
 
@@ -93,10 +91,8 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR  
mnROr )  mnROrShift
 ( (sal_uInt32) (d_rCol).GetBlue()  d_BS ) )  d_BM ) | \
 d_ALPHA )
 
-
 // - BitmapColor -
 
-
 class Color;
 
 class VCL_DLLPUBLIC BitmapColor
@@ -155,10 +151,7 @@ public:
 inline sal_uLongGetColorError( const BitmapColor rBitmapColor ) 
const;
 };
 
-
 // - BitmapPalette -
-
-
 class Palette;
 
 class VCL_DLLPUBLIC BitmapPalette
@@ -198,10 +191,7 @@ public:
 boolIsGreyPalette() const;
 };
 
-
 // - ColorMask -
-
-
 class VCL_DLLPUBLIC ColorMask
 {
 sal_uLong   mnRMask;
@@ -248,10 +238,7 @@ public:
 inline void SetColorFor32Bit( const BitmapColor rColor, HPBYTE 
pPixel ) const;
 };
 
-
 // - BitmapBuffer -
-
-
 struct VCL_DLLPUBLIC BitmapBuffer
 {
 sal_uLong   mnFormat;
@@ -267,7 +254,6 @@ struct VCL_DLLPUBLIC BitmapBuffer
 ~BitmapBuffer() {}
 };
 
-
 // - Access modes -
 typedef enum
 {
@@ -277,16 +263,11 @@ typedef enum
 }
 BitmapAccessMode;
 
-
 // - StretchAndConvert -
-
-
 VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert(
 const BitmapBuffer rSrcBuffer, const SalTwoRect rTwoRect,
 sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = NULL, const 
ColorMask* pDstMask = NULL );
 
-
-
 inline BitmapColor::BitmapColor() :
 mcBlueOrIndex   ( 0 ),
 mcGreen ( 0 ),
@@ -295,8 +276,6 @@ inline BitmapColor::BitmapColor() :
 {
 }
 
-
-
 inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 
cBlue ) :
 mcBlueOrIndex   ( cBlue ),
 mcGreen ( cGreen ),
@@ -305,8 +284,6 @@ inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 
cGreen, sal_uInt8 cBl
 {
 }
 
-
-
 inline BitmapColor::BitmapColor( const BitmapColor rBitmapColor ) :
 mcBlueOrIndex   ( rBitmapColor.mcBlueOrIndex ),
 mcGreen ( rBitmapColor.mcGreen ),
@@ -315,8 +292,6 @@ inline BitmapColor::BitmapColor( const BitmapColor 
rBitmapColor ) :
 {
 }
 
-
-
 inline BitmapColor::BitmapColor( const Color rColor ) :
 mcBlueOrIndex   ( rColor.GetBlue() ),
 mcGreen ( rColor.GetGreen() ),
@@ -325,8 +300,6 @@ inline BitmapColor::BitmapColor( const Color rColor ) :
 {
 }
 
-
-
 inline BitmapColor::BitmapColor( sal_uInt8 cIndex ) :
 mcBlueOrIndex   ( cIndex ),
 mcGreen ( 0 ),
@@ -335,8 +308,6 @@ inline BitmapColor::BitmapColor( sal_uInt8 cIndex ) :
 {
 }
 
-
-
 inline bool BitmapColor::operator==( const BitmapColor rBitmapColor ) const
 {
 return( ( mcBlueOrIndex == rBitmapColor.mcBlueOrIndex ) 
@@ -344,15 +315,11 @@ inline bool BitmapColor::operator==( const BitmapColor 
rBitmapColor ) const
 ( mcGreen == rBitmapColor.mcGreen  mcRed == rBitmapColor.mcRed ) 
) );
 }
 
-
-
 inline bool BitmapColor::operator!=( const BitmapColor rBitmapColor ) const
 {
 return !( *this == rBitmapColor );
 }
 
-
-
 inline BitmapColor BitmapColor::operator=( const BitmapColor rBitmapColor )
 {
 mcBlueOrIndex = rBitmapColor.mcBlueOrIndex;
@@ -363,95 +330,71 @@ inline BitmapColor BitmapColor::operator=( const 
BitmapColor rBitmapColor )
 return *this;
 }
 
-
-
 inline bool BitmapColor::IsIndex() const
 {
 return mbIndex;
 }
 
-
-
 inline sal_uInt8 BitmapColor::GetRed() const
 {
 DBG_ASSERT( !mbIndex, Pixel represents index into colortable! );
 return mcRed;
 }
 
-
-
 inline void BitmapColor::SetRed( sal_uInt8 cRed )
 {
 DBG_ASSERT( !mbIndex, Pixel represents index into colortable! );
 mcRed = cRed;
 }
 
-
-
 inline sal_uInt8 BitmapColor::GetGreen() const
 {
 DBG_ASSERT( !mbIndex, Pixel represents index into colortable! );
 return mcGreen;
 }
 
-
-
 inline void BitmapColor::SetGreen( sal_uInt8 cGreen )
 {
 DBG_ASSERT( !mbIndex, Pixel represents index into colortable! );
 mcGreen = cGreen;
 }
 
-
-
 inline sal_uInt8 BitmapColor::GetBlue() const
 {
 DBG_ASSERT( !mbIndex, Pixel represents index into colortable! );
 return mcBlueOrIndex;

[Bug 46892] Provide stacktraces for crashes

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

Caolán McNamara caol...@redhat.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #4 from Caolán McNamara caol...@redhat.com ---
Lets forget about this. Getting bt is a good idea in general that doesn't need
a specific bug for it

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

[Bug 46892] Provide stacktraces for crashes

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

Björn Michaelsen bjoern.michael...@canonical.com changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WONTFIX |---

--- Comment #5 from Björn Michaelsen bjoern.michael...@canonical.com ---
Reopening, there needs to be an open but for it to show up in the list of
EasyHacks.

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

[Libreoffice-commits] core.git: 2 commits - svx/source sw/CppunitTest_sw_uiwriter.mk sw/qa

 svx/source/customshapes/EnhancedCustomShape2d.cxx |   12 --
 sw/CppunitTest_sw_uiwriter.mk |   35 -
 sw/qa/extras/uiwriter/data/fdo87448.odt   |binary
 sw/qa/extras/uiwriter/uiwriter.cxx|   44 ++
 4 files changed, 53 insertions(+), 38 deletions(-)

New commits:
commit 20f8006e21943b08f1f152e4a0359c9ebe4786f2
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 18 19:17:25 2014 +0100

fdo#87448 EnhancedCustomShape2d: fix handling of scaled ARCANGLETO commands

Change-Id: I7daf52a60e3fac8d9f86b464e86af60e0495fcb1

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 225ec26..9a66921 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -52,6 +52,7 @@
 #include basegfx/color/bcolortools.hxx
 #include basegfx/polygon/b2dpolygon.hxx
 #include basegfx/polygon/b2dpolygontools.hxx
+#include basegfx/matrix/b2dhommatrixtools.hxx
 #include rtl/strbuf.hxx
 #include math.h
 
@@ -1770,8 +1771,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 GetParameter ( fStartAngle, seqCoordinates[ 
(sal_uInt16)( rSrcPt + 1) ].First, false, false );
 GetParameter ( fSwingAngle, seqCoordinates[ 
(sal_uInt16)( rSrcPt + 1 ) ].Second, false, false );
 
-fWR *= fXScale;
-fHR *= fYScale;
+// Convert angles to radians, but don't do any scaling 
/ translation yet.
 
 fStartAngle *= F_PI180;
 fSwingAngle *= F_PI180;
@@ -1783,7 +1783,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 if (aNewB2DPolygon.count()  0)
 {
 basegfx::B2DPoint aStartPointB2D( 
aNewB2DPolygon.getB2DPoint(aNewB2DPolygon.count() - 1 ) );
-Point aStartPoint( aStartPointB2D.getX(), 
aStartPointB2D.getY() );
+Point aStartPoint( 0, 0 );
 
 double fT = atan2((fWR*sin(fStartAngle)), 
(fHR*cos(fStartAngle)));
 double fTE = atan2((fWR*sin(fStartAngle + 
fSwingAngle)), fHR*cos(fStartAngle + fSwingAngle));
@@ -1798,7 +1798,11 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 OSL_TRACE(ARCANGLETO rect: %d, %d   x   %d, %d   
start: %d, %d end: %d, %d clockwise: %d,
   aRect.Left(), aRect.Top(), 
aRect.Right(), aRect.Bottom(),
   aStartPoint.X(), aStartPoint.Y(), 
aEndPoint.X(), aEndPoint.Y(), bClockwise);
-aNewB2DPolygon.append(CreateArc( aRect, bClockwise 
? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, bClockwise, 
aStartPoint == aEndPoint  fSwingAngle  F_PI));
+basegfx::B2DPolygon aArc = CreateArc( aRect, 
bClockwise ? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, 
bClockwise, aStartPoint == aEndPoint  fSwingAngle  F_PI);
+// Now that we have the arc, move it to 
aStartPointB2D and also scale it.
+basegfx::B2DHomMatrix aMatrix = 
basegfx::tools::createScaleTranslateB2DHomMatrix(fXScale, fYScale, 
aStartPointB2D.getX(), aStartPointB2D.getY());
+aArc.transform(aMatrix);
+aNewB2DPolygon.append(aArc);
 }
 
 rSrcPt += 2;
diff --git a/sw/qa/extras/uiwriter/data/fdo87448.odt 
b/sw/qa/extras/uiwriter/data/fdo87448.odt
new file mode 100644
index 000..3618dcd
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/fdo87448.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index c840b44..8073a43 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -8,6 +8,7 @@
  */
 
 #include com/sun/star/awt/FontWeight.hpp
+#include com/sun/star/drawing/GraphicExportFilter.hpp
 #include com/sun/star/i18n/TextConversionOption.hpp
 #include swmodeltestbase.hxx
 #include ndtxt.hxx
@@ -26,6 +27,8 @@
 #include hhcwrp.hxx
 #include swacorr.hxx
 #include editeng/acorrcfg.hxx
+#include unotools/streamwrap.hxx
+#include test/mtfxmldump.hxx
 
 #include svx/svdpage.hxx
 #include svx/svdview.hxx
@@ -72,6 +75,7 @@ public:
 void testCreatePortions();
 void testBookmarkUndo();
 void testFdo85876();
+void testFdo87448();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -101,6 +105,7 @@ public:
 CPPUNIT_TEST(testCreatePortions);
 CPPUNIT_TEST(testBookmarkUndo);
 CPPUNIT_TEST(testFdo85876);
+CPPUNIT_TEST(testFdo87448);

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

 sc/source/core/opencl/formulagroupcl.cxx |   20 
 1 file changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 64c479e9da02f724e1870649c99fac92f5f27cd3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 18 13:53:29 2014 -0500

Unmap memory object right after the buffer is read.

Change-Id: Ic7c355dc005b8071a3b5db347f51882d89d2160f

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 5a2bca4..c3ee932 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3692,6 +3692,14 @@ public:
 {
 SAL_WARN(sc.opencl, Dynamic formula compiler: OpenCL error:  
 err);
 mpResBuf = NULL;
+return;
+}
+
+err = clEnqueueUnmapMemObject(kEnv.mpkCmdQueue, mpCLResBuf, mpResBuf, 
0, NULL, NULL);
+if (err != CL_SUCCESS)
+{
+SAL_WARN(sc.opencl, Dynamic formula compiler: OpenCL error:  
 err);
+mpResBuf = NULL;
 }
 }
 
@@ -3701,18 +3709,6 @@ public:
 return false;
 
 rDoc.SetFormulaResults(rTopPos, mpResBuf, mnGroupLength);
-
-// Obtain cl context
-::opencl::KernelEnv kEnv;
-::opencl::setKernelEnv(kEnv);
-
-cl_int err = clEnqueueUnmapMemObject(kEnv.mpkCmdQueue, mpCLResBuf, 
mpResBuf, 0, NULL, NULL);
-if (err != CL_SUCCESS)
-{
-SAL_WARN(sc.opencl, Dynamic formula compiler: OpenCL error:  
 err);
-return false;
-}
-
 return true;
 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/core/data/document.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit f2ac9fab2677a6a718f251baef75d3cae96d1f01
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 18 20:07:55 2014 +0100

fdo#68385 update references only if cut originates from the same document

Change-Id: Ia7b27309251cf9e47505c58d8ed0172d134280f4

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 15c6914..1a377bb 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2548,11 +2548,16 @@ void ScDocument::CopyBlockFromClip(
 aRefCxt.mnTabDelta = nDz;
 if (rCxt.getClipDoc()-GetClipParam().mbCutMode)
 {
-bool bOldInserting = IsInsertingFromOtherDoc();
-SetInsertingFromOtherDoc( true);
-aRefCxt.meMode = URM_MOVE;
-UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
-SetInsertingFromOtherDoc( bOldInserting);
+// Update references only if cut originates from the same
+// document we are pasting into.
+if (rCxt.getClipDoc()-GetPool() == GetPool())
+{
+bool bOldInserting = IsInsertingFromOtherDoc();
+SetInsertingFromOtherDoc( true);
+aRefCxt.meMode = URM_MOVE;
+UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
+SetInsertingFromOtherDoc( bOldInserting);
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 68385, which changed state.

Bug 68385 Summary: Cut/paste from different spreadsheets corrupts cell 
references
https://bugs.freedesktop.org/show_bug.cgi?id=68385

   What|Removed |Added

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

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

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

 sc/source/core/data/document.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 9f4c743dafea9b30aa4deb2f53ac5e2cdf3b49f0
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 18 20:07:55 2014 +0100

fdo#68385 update references only if cut originates from the same document

Change-Id: Ia7b27309251cf9e47505c58d8ed0172d134280f4
(cherry picked from commit f2ac9fab2677a6a718f251baef75d3cae96d1f01)

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 252352c..58ade9c 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2548,11 +2548,16 @@ void ScDocument::CopyBlockFromClip(
 aRefCxt.mnTabDelta = nDz;
 if (rCxt.getClipDoc()-GetClipParam().mbCutMode)
 {
-bool bOldInserting = IsInsertingFromOtherDoc();
-SetInsertingFromOtherDoc( true);
-aRefCxt.meMode = URM_MOVE;
-UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
-SetInsertingFromOtherDoc( bOldInserting);
+// Update references only if cut originates from the same
+// document we are pasting into.
+if (rCxt.getClipDoc()-GetPool() == GetPool())
+{
+bool bOldInserting = IsInsertingFromOtherDoc();
+SetInsertingFromOtherDoc( true);
+aRefCxt.meMode = URM_MOVE;
+UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
+SetInsertingFromOtherDoc( bOldInserting);
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-18 Thread Julien Nabet

 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |6 +++---
 vcl/opengl/program.cxx |2 +-
 vcl/source/opengl/OpenGLContext.cxx|2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5a4c549d3252ef371656cbb5dedeb8c9c5c60994
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Dec 18 21:13:39 2014 +0100

Some cppcheck cleanings: Prefer prefix ++/-- operators for non-primitive 
types

Change-Id: I899164412ad90653b4228423283f9fbd4cb5fccc

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 2ef2429..eb43be0 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -595,7 +595,7 @@ void addJavaInfoFromWinReg(
 // create impl objects
 typedef std::vectorOUString::iterator ItHome;
 for(ItHome it_home= vecJavaHome.begin(); it_home != vecJavaHome.end();
-it_home++)
+++it_home)
 {
 getAndAddJREInfoByPath(*it_home, allInfos, addedInfos);
 }
@@ -606,7 +606,7 @@ void addJavaInfoFromWinReg(
 {
 typedef std::vectorOUString::iterator ItHome;
 for(ItHome it_home= vecJavaHome.begin(); it_home != vecJavaHome.end();
-it_home++)
+++it_home)
 {
 getAndAddJREInfoByPath(*it_home, allInfos, addedInfos);
 }
@@ -657,7 +657,7 @@ bool getJavaInfoFromRegistry(const wchar_t* szRegKey,
 //iterate over the vector with java home strings
 typedef vectorOUString::iterator ItHome;
 for(ItHome itHome= vecJavaHome.begin();
-itHome != vecJavaHome.end(); itHome++)
+itHome != vecJavaHome.end(); ++itHome)
 {
 if(usHomeUrl.equals(*itHome))
 {
diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx
index 46552fd..434b724 100644
--- a/vcl/opengl/program.cxx
+++ b/vcl/opengl/program.cxx
@@ -57,7 +57,7 @@ bool OpenGLProgram::Clean()
 {
 glActiveTexture( GL_TEXTURE0 + nIndex-- );
 it-Unbind();
-it++;
+++it;
 }
 maTextures.clear();
 }
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 04e19ba..182a2e9 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1168,7 +1168,7 @@ void OpenGLContext::reset()
 while( it != maPrograms.end() )
 {
 delete it-second;
-it++;
+++it;
 }
 maPrograms.clear();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

2014-12-18 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/7d70efaac360dbbd9bea2d51b1ae53b577fc6559/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

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

New commits:
commit 7ac1522d9edf6ac58856cdb5f8ff548dedd27a63
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 21:42:31 2014 +0100

Fix MSVC build

Change-Id: I14f9b8e7b7e2cdcbdc60de17471b1a3a381d83f0

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index bd03aad..18d4d88 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -176,7 +176,7 @@ static bool ImplNumericGetValue( const OUString rStr, 
sal_Int64 rValue,
 if ( aStr1.isEmpty() )
 aStr1 = 0;
 if ( bNegative )
-aStr1 = - + aStr1;
+aStr1.insert(0, -);
 
 // prune and round fraction
 bool bRound = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source icon-themes/galaxy icon-themes/tango officecfg/registry sw/inc sw/sdi sw/uiconfig

2014-12-18 Thread Jan Holesovsky

 cui/source/dialogs/SpellDialog.cxx  |   10 
+++---
 dev/null|binary
 icon-themes/galaxy/cmd/lc_accepttrackedchange.png   |binary
 icon-themes/galaxy/cmd/lc_rejecttrackedchange.png   |binary
 icon-themes/galaxy/cmd/sc_accepttrackedchange.png   |binary
 icon-themes/galaxy/cmd/sc_rejecttrackedchange.png   |binary
 icon-themes/tango/cmd/lc_accepttrackedchange.png|binary
 icon-themes/tango/cmd/lc_rejecttrackedchange.png|binary
 icon-themes/tango/cmd/sc_accepttrackedchange.png|binary
 icon-themes/tango/cmd/sc_rejecttrackedchange.png|binary
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 ++--
 sw/inc/swcommands.h |4 ++--
 sw/sdi/swriter.sdi  |4 ++--
 sw/uiconfig/swriter/toolbar/changes.xml |4 ++--
 14 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit 72ee6012b056c50957e160f0ebf2b828b324db3e
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 17 08:49:44 2014 +0100

Typo: .uno:*TracedChange - .uno:*TrackedChange.

Change-Id: I173728b9f800b6a9c6e81d496a268b4e42cf4db9

diff --git a/icon-themes/galaxy/cmd/lc_accepttracedchange.png 
b/icon-themes/galaxy/cmd/lc_accepttrackedchange.png
similarity index 100%
rename from icon-themes/galaxy/cmd/lc_accepttracedchange.png
rename to icon-themes/galaxy/cmd/lc_accepttrackedchange.png
diff --git a/icon-themes/galaxy/cmd/lc_rejecttracedchange.png 
b/icon-themes/galaxy/cmd/lc_rejecttrackedchange.png
similarity index 100%
rename from icon-themes/galaxy/cmd/lc_rejecttracedchange.png
rename to icon-themes/galaxy/cmd/lc_rejecttrackedchange.png
diff --git a/icon-themes/galaxy/cmd/sc_accepttracedchange.png 
b/icon-themes/galaxy/cmd/sc_accepttrackedchange.png
similarity index 100%
rename from icon-themes/galaxy/cmd/sc_accepttracedchange.png
rename to icon-themes/galaxy/cmd/sc_accepttrackedchange.png
diff --git a/icon-themes/galaxy/cmd/sc_rejecttracedchange.png 
b/icon-themes/galaxy/cmd/sc_rejecttrackedchange.png
similarity index 100%
rename from icon-themes/galaxy/cmd/sc_rejecttracedchange.png
rename to icon-themes/galaxy/cmd/sc_rejecttrackedchange.png
diff --git a/icon-themes/tango/cmd/lc_accepttracedchange.png 
b/icon-themes/tango/cmd/lc_accepttrackedchange.png
similarity index 100%
rename from icon-themes/tango/cmd/lc_accepttracedchange.png
rename to icon-themes/tango/cmd/lc_accepttrackedchange.png
diff --git a/icon-themes/tango/cmd/lc_rejecttracedchange.png 
b/icon-themes/tango/cmd/lc_rejecttrackedchange.png
similarity index 100%
rename from icon-themes/tango/cmd/lc_rejecttracedchange.png
rename to icon-themes/tango/cmd/lc_rejecttrackedchange.png
diff --git a/icon-themes/tango/cmd/sc_accepttracedchange.png 
b/icon-themes/tango/cmd/sc_accepttrackedchange.png
similarity index 100%
rename from icon-themes/tango/cmd/sc_accepttracedchange.png
rename to icon-themes/tango/cmd/sc_accepttrackedchange.png
diff --git a/icon-themes/tango/cmd/sc_rejecttracedchange.png 
b/icon-themes/tango/cmd/sc_rejecttrackedchange.png
similarity index 100%
rename from icon-themes/tango/cmd/sc_rejecttracedchange.png
rename to icon-themes/tango/cmd/sc_rejecttrackedchange.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 7cc0a7f..d49d502 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -164,7 +164,7 @@
   value1/value
 /prop
   /node
-  node oor:name=.uno:RejectTracedChange oor:op=replace
+  node oor:name=.uno:RejectTrackedChange oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USReject Change/value
 /prop
@@ -172,7 +172,7 @@
   value1/value
 /prop
   /node
-  node oor:name=.uno:AcceptTracedChange oor:op=replace
+  node oor:name=.uno:AcceptTrackedChange oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USAccept Change/value
 /prop
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 0d7aadd..5f85b51 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -122,8 +122,8 @@
 #define CMD_FN_HIDE_NOTE.uno:HideNote
 #define CMD_FN_HIDE_NOTE_AUTHOR .uno:HideAuthor
 #define CMD_FN_HIDE_ALL_NOTES   .uno:HideAllNotes
-#define CMD_FN_REDLINE_ACCEPT_DIRECT.uno:AcceptTracedChange
-#define CMD_FN_REDLINE_REJECT_DIRECT.uno:RejectTracedChange
+#define CMD_FN_REDLINE_ACCEPT_DIRECT

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

 sc/source/core/data/formulacell.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit d249282d5165a7a4e05847a6b974d5a6df2363d7
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 18 21:51:18 2014 +0100

line-break that into something slightly more readable within 120 columns

Change-Id: I3b97cc4b0f108c0cc6e0aa1397cf6243b7c734b0

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 6c6c3d4..a7f4813 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1844,12 +1844,15 @@ void ScFormulaCell::InterpretTail( 
ScInterpretTailParameter eTailParam )
 (eNew == svDouble  aResult.GetDouble() != 
aNewResult.GetDouble()) ||
 (eNew == svString  aResult.GetString() != 
aNewResult.GetString()));
 
-// #i102616# handle special cases of initial results after loading 
(only if the sheet is still marked unchanged)
+// #i102616# handle special cases of initial results after loading
+// (only if the sheet is still marked unchanged)
 if ( bChanged  !bContentChanged  
pDocument-IsStreamValid(aPos.Tab()) )
 {
-if ( ( eOld == svUnknown  ( eNew == svError || ( eNew == 
svDouble  aNewResult.GetDouble() == 0.0 ) ) ) ||
- ( (eOld == svHybridCell || eOld == svHybridValueCell)  
eNew == svString  aResult.GetString() == aNewResult.GetString() ) ||
- ( eOld == svDouble  eNew == svDouble  
rtl::math::approxEqual( aResult.GetDouble(), aNewResult.GetDouble() ) ) )
+if ((eOld == svUnknown  (eNew == svError || (eNew == 
svDouble  aNewResult.GetDouble() == 0.0))) ||
+((eOld == svHybridCell || eOld == svHybridValueCell) 
+ eNew == svString  aResult.GetString() == 
aNewResult.GetString()) ||
+(eOld == svDouble  eNew == svDouble 
+ rtl::math::approxEqual( aResult.GetDouble(), 
aNewResult.GetDouble(
 {
 // no change, see above
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-18 Thread Julien Nabet

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

New commits:
commit 24dab5d51a73375bbe8e52abb83354be78707fa7
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Dec 18 21:56:31 2014 +0100

cppcheck: Same expression on both sides of '||'

Change-Id: Ibdadac46483ca3b17a12e3d1ae31f75a869b8dbc

diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index c6859b5..6dcbf3e 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -373,7 +373,7 @@ void ConversionHelper::decodeVmlPath( ::std::vector 
::std::vector Point   r
 break;
 
 case CLOSE: // 0 param
-SAL_WARN_IF(rPointLists.back().empty() || 
rPointLists.back().empty(), oox, empty pointlists at close);
+SAL_WARN_IF(rPointLists.back().empty() || 
rFlagLists.back().empty(), oox, empty pointlists at close);
 if (!rPointLists.back().empty()  
!rFlagLists.back().empty())
 {
 rPointLists.back().push_back( rPointLists.back()[ 0 ] 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - cui/source

2014-12-18 Thread Jan Holesovsky

 cui/source/dialogs/SpellDialog.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 7d526bd5b97ce6c627f1e0d6ec540d9acb820621
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Dec 18 21:42:13 2014 +0100

spell dialog: Make [Close] work in protected documents with editable fields.

We have to call ToggleChildWindow directly; calling SfxDispatcher's 
Execute()
does not work here when we are in a document with protected section - in 
that
case, the cursor can move from the editable field to the protected area, and
the slots get disabled because of SW_DISABLE_ON_PROTECTED_CURSOR (see
FN_SPELL_GRAMMAR_DIALOG in .sdi).

(cherry picked from commit 08e0a79aeba6fd41cbb51de3be48659619f27206)

Conflicts:
cui/source/dialogs/SpellDialog.cxx

Change-Id: I1c310c028aaaf774431d0b1e6bba10e901a8166d

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 5eb92a3..0602223 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -736,16 +736,20 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
 return 1;
 }
 
-// ---
+
 
 sal_Bool SpellDialog::Close()
 {
-GetBindings().GetDispatcher()-
-Execute(rParent.GetType(),
-SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+// We have to call ToggleChildWindow directly; calling SfxDispatcher's
+// Execute() does not work here when we are in a document with protected
+// section - in that case, the cursor can move from the editable field to
+// the protected area, and the slots get disabled because of
+// SW_DISABLE_ON_PROTECTED_CURSOR (see FN_SPELL_GRAMMAR_DIALOG in .sdi).
+SfxViewFrame::Current()-ToggleChildWindow(rParent.GetType());
+
 return sal_True;
 }
-// ---
+
 
 void SpellDialog::SetSelectedLang_Impl( LanguageType nLang )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 2 commits - cui/source sw/source

2014-12-18 Thread Jan Holesovsky

 cui/source/dialogs/SpellDialog.cxx |   10 ---
 sw/source/filter/html/css1atr.cxx  |   52 -
 sw/source/filter/html/css1kywd.cxx |1 
 sw/source/filter/html/css1kywd.hxx |1 
 sw/source/filter/html/htmlatr.cxx  |   23 
 sw/source/filter/html/wrthtml.cxx  |   23 +++-
 sw/source/filter/html/wrthtml.hxx  |7 
 7 files changed, 111 insertions(+), 6 deletions(-)

New commits:
commit 6ac8551e8135628597c195aa6ae3d51c9784e6fb
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Dec 18 21:42:13 2014 +0100

spell dialog: Make [Close] work in protected documents with editable fields.

We have to call ToggleChildWindow directly; calling SfxDispatcher's 
Execute()
does not work here when we are in a document with protected section - in 
that
case, the cursor can move from the editable field to the protected area, and
the slots get disabled because of SW_DISABLE_ON_PROTECTED_CURSOR (see
FN_SPELL_GRAMMAR_DIALOG in .sdi).

(cherry picked from commit 08e0a79aeba6fd41cbb51de3be48659619f27206)

Conflicts:
cui/source/dialogs/SpellDialog.cxx

Change-Id: I1c310c028aaaf774431d0b1e6bba10e901a8166d

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 68124b5..398dd26 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -738,9 +738,13 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
 
 bool SpellDialog::Close()
 {
-GetBindings().GetDispatcher()-
-Execute(rParent.GetType(),
-SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+// We have to call ToggleChildWindow directly; calling SfxDispatcher's
+// Execute() does not work here when we are in a document with protected
+// section - in that case, the cursor can move from the editable field to
+// the protected area, and the slots get disabled because of
+// SW_DISABLE_ON_PROTECTED_CURSOR (see FN_SPELL_GRAMMAR_DIALOG in .sdi).
+SfxViewFrame::Current()-ToggleChildWindow(rParent.GetType());
+
 return true;
 }
 
commit 02ddf5a341fbca92dc0c023c4ae9a30a0868436b
Author: LÃ¡szlÃ³ NÃ©meth nem...@collabora.com
Date:   Tue Dec 16 01:34:38 2014 +0100

HTML export: optional CSS2 dot leaders in the Table of Contents

To use it, enable Print layout in Options-Load/Save-HTML Compatibility,
and select the HTML Document file type in the Writer Save As dialog.

(cherry picked from commit 3e17677f705d004ebb87d1268d640da1a1c8cdf4)

Conflicts:
sw/source/filter/html/wrthtml.cxx

Change-Id: I763ab8340a59050fd5c68677715679f41fd91fb3

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index d16582b..9f863da 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -109,6 +109,8 @@ using editeng::SvxBorderLine;
 #define CSS1_FRMSIZE_ANYHEIGHT  0x0e
 #define CSS1_FRMSIZE_PIXEL  0x10
 
+#define DOT_LEADERS_MAX_WIDTH   18
+
 extern SwAttrFnTab aCSS1AttrFnTab;
 
 static Writer OutCSS1_SwFmt( Writer rWrt, const SwFmt rFmt,
@@ -217,6 +219,48 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
 OutNewLine();
 sOut.append( + OString(OOO_STRING_SVTOOLS_HTML_style) +   +
 OString(OOO_STRING_SVTOOLS_HTML_O_type) + 
=\text/css\);
+//  Optional CSS2 code for dot leaders (dotted line between the Table of 
Contents titles and page numbers):
+//  (More inforation: http://www.w3.org/Style/Examples/007/leaders.en.html)
+//
+//  p.leaders {
+//  /* FIXME:
+// (1) dots line up vertically only in the paragraphs with the 
same alignation/level
+// (2) max-width = 18 cm instead of 80em; possible improvement 
with the new CSS3 calc() */
+//  max-width: 18cm; /* note: need to overwrite max-width with 
max-width - border-left_of_the_actual_paragraph */
+//  padding: 0;
+//  overflow-x: hidden;
+//  line-height: 120%; /* note: avoid HTML scrollbars and missing 
descenders of the letters */
+//  }
+//  p.leaders:after {
+//  float: left;
+//  width: 0;
+//  white-space: nowrap;
+//  content: . . . . . . . . . . . . . . . . . . ...;
+//  }
+//  p.leaders span:first-child {
+//  padding-right: 0.33em;
+//  background: white;
+//  }
+//  p.leaders span + span {
+//  float: right;
+//  padding-left: 0.33em;
+//  background: white;
+//  position: relative;
+//  z-index: 1
+//  }
+
+if (bCfgPrintLayout) {
+sOut.append(
+p. + OString(sCSS2_P_CLASS_leaders) + {max-width: + 
OString::number(DOT_LEADERS_MAX_WIDTH) +
+cm;padding:0;overflow-x:hidden;line-height:120%} +
+p. + OString(sCSS2_P_CLASS_leaders) + 
:after{float:left;width:0;white-space:nowrap;content:\);
+

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 4 commits - configure.ac sc/inc sc/source

2014-12-18 Thread Andras Timar

 configure.ac |2 
 sc/inc/scmatrix.hxx  |2 
 sc/source/core/data/document.cxx |   15 +++-
 sc/source/core/data/formulacell.cxx  |2 
 sc/source/core/tool/scmatrix.cxx |   96 ---
 sc/source/filter/oox/sheetdatabuffer.cxx |7 +-
 sc/source/filter/oox/unitconverter.cxx   |2 
 7 files changed, 72 insertions(+), 54 deletions(-)

New commits:
commit d3e346ef2b0c13d257afb68b7fe581ac29235b34
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Dec 18 22:53:19 2014 +0100

Bump version to 4.2-21

Change-Id: Id9a052e61b0c098ff9e843b04e738fc1daa3a7c7

diff --git a/configure.ac b/configure.ac
index 5ef7055..35c7af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.10.20],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.21],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
commit d96e5eb9d316117f3f560d77c9858737d7e58c9d
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 18 20:07:55 2014 +0100

fdo#68385 update references only if cut originates from the same document

Change-Id: Ia7b27309251cf9e47505c58d8ed0172d134280f4
(cherry picked from commit f2ac9fab2677a6a718f251baef75d3cae96d1f01)

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e7963b9..751204d 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2551,11 +2551,16 @@ void ScDocument::CopyBlockFromClip(
 aRefCxt.mnTabDelta = nDz;
 if (rCxt.getClipDoc()-GetClipParam().mbCutMode)
 {
-bool bOldInserting = IsInsertingFromOtherDoc();
-SetInsertingFromOtherDoc( true);
-aRefCxt.meMode = URM_MOVE;
-UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
-SetInsertingFromOtherDoc( bOldInserting);
+// Update references only if cut originates from the same
+// document we are pasting into.
+if (rCxt.getClipDoc()-GetPool() == GetPool())
+{
+bool bOldInserting = IsInsertingFromOtherDoc();
+SetInsertingFromOtherDoc( true);
+aRefCxt.meMode = URM_MOVE;
+UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
+SetInsertingFromOtherDoc( bOldInserting);
+}
 }
 else
 {
commit 04a9c1c90cc2e2d969b712b3b7a255d286d19b84
Author: Eike Rathke er...@redhat.com
Date:   Tue Dec 16 01:37:31 2014 +0100

fdo#79249 call formula compiler with error string

... instead of attempting to stringize a NaN coded error value.

Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb

(cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6)

construct grouped ScFormulaCell with bDirty=true, fdo#79249 related

Noticed when loading
https://bugs.freedesktop.org/attachment.cgi?id=99844
with fdo#79249 fix where oox::xls::applyCellFormulas() groups the
consecutive =#N/A formulas. Only A1 result was displayed, other cells
were displayed empty.

(cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993)

correct error string, #N/A instead of #NA

(cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac)

Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b
3a541f74d3d25e1515a1c6d47f02ec6a8e817c93
15019072b6e812b9ffe29d3ee6afacd9ab526948

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index a1ab35a..d64ed2d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -683,7 +683,7 @@ ScFormulaCell::ScFormulaCell(
 nSeenInIteration(0),
 cMatrixFlag ( cInd ),
 nFormatType(xGroup-mnFormatType),
-bDirty(false),
+bDirty(true),
 bChanged( false ),
 bRunning( false ),
 bCompile( false ),
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index b3963df..60987c9 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -209,11 +209,16 @@ void SheetDataBuffer::setBooleanCell( const CellModel 
rModel, bool bValue )
 
 void SheetDataBuffer::setErrorCell( const CellModel rModel, const OUString 
rErrorCode )
 {
-setErrorCell( rModel, getUnitConverter().calcBiffErrorCode( rErrorCode ) );
+// Using the formula compiler now we can simply pass on the error string.
+

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

 dbaccess/source/core/recovery/subcomponentrecovery.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e624c9820132544f8ea25d8ab60acba3874bd55
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 18 23:00:26 2014 +0100

Fix MSVC build

Change-Id: I64a9a2933b38e48c4531564ab4082e3c924c4959

diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx 
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 7ebb09a..59c55b7 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -198,7 +198,7 @@ namespace dbaccess
 private:
 const ReferenceXComponentContext   m_rContext;
 const StorageXMLOutputStream   m_rDelegator;
-const OUStringBuffer m_aNamespace;
+const OUString m_aNamespace;
 };
 
 void SettingsExportContext::AddAttribute( enum 
::xmloff::token::XMLTokenEnum i_eName, const OUString i_rValue )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-18 Thread Michael Stahl

 sw/source/core/access/accmap.cxx   |4 
 sw/source/core/inc/cellfrm.hxx |4 
 sw/source/core/inc/frame.hxx   |2 
 sw/source/core/inc/layfrm.hxx  |   11 +-
 sw/source/core/inc/rowfrm.hxx  |   28 +++---
 sw/source/core/inc/tabfrm.hxx  |   80 +-
 sw/source/core/layout/calcmove.cxx |4 
 sw/source/core/layout/fly.cxx  |8 -
 sw/source/core/layout/frmtool.cxx  |4 
 sw/source/core/layout/ftnfrm.cxx   |2 
 sw/source/core/layout/laycache.cxx |4 
 sw/source/core/layout/pagechg.cxx  |2 
 sw/source/core/layout/sectfrm.cxx  |4 
 sw/source/core/layout/ssfrm.cxx|   14 ---
 sw/source/core/layout/tabfrm.cxx   |  160 +++--
 sw/source/core/layout/wsfrm.cxx|   10 +-
 16 files changed, 175 insertions(+), 166 deletions(-)

New commits:
commit fc93c17a2e2186ff5e52cc2a3d8f65aadb26c44e
Author: Michael Stahl mst...@redhat.com
Date:   Thu Dec 18 23:02:54 2014 +0100

sw: prefix SwTabFrm members

Change-Id: If2de38d23c5753e703517b5ef82d0f00070c2f34

diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 5433174..54a5944 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -36,43 +36,43 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
 using SwFrm::GetLeaf;
 SwLayoutFrm *GetLeaf( MakePageType eMakePage, bool bFwd );
 
-SwTable* pTable;
+SwTable * m_pTable;
 
-bool bComplete  :1; /// Set entries for Repaint without needing to
+bool m_bComplete:1; /// Set entries for Repaint without needing to
 /// set the base class' CompletePaint
 /// With that we would want to avoid 
unnecessary
 /// table repaints
-bool bCalcLowers:1; /// For stability of the content in MakeAll
-bool bLowersFormatted   :1; /// Communication between MakeAll and Layact
-bool bLockBackMove  :1; /// The Master took care of the BackMove test
-bool bResizeHTMLTable   :1; /// Call the Resize of the HTMLTableLayout in 
the MakeAll
+bool m_bCalcLowers  :1; /// For stability of the content in MakeAll
+bool m_bLowersFormatted :1; /// Communication between MakeAll and Layact
+bool m_bLockBackMove:1; /// The Master took care of the BackMove test
+bool m_bResizeHTMLTable :1; /// Call the Resize of the HTMLTableLayout in 
the MakeAll
 /// This is an optimization, so that we don't 
have to call
 /// it in CntntFrm::Grow; there it might be 
called for
 /// _every_ Cell
 
-bool bONECalcLowers :1; /// Primarily for the StarONE SS
+bool m_bONECalcLowers   :1; /// Primarily for the StarONE SS
 /// The Cntnts are formatted via Calc() on 
MakeAll in any
 /// case. There are no further invalidations 
and that path can
 /// hardly give any guarantees
 
-bool bHasFollowFlowLine :1; /// Means that the first line in the follow
+bool m_bHasFollowFlowLine :1; /// Means that the first line in the follow
 /// is indented to contain content from a 
broken
 /// cell
-bool bIsRebuildLastLine :1; /// Means that currently the last line of the
+bool m_bIsRebuildLastLine :1; /// Means that currently the last line of the
 /// TabFrame is rebuilt. In this case we do not
 //  want any notification to the master table
 
-bool bRestrictTableGrowth :1;   // Usually, the table may grow 
infinitely,
+bool m_bRestrictTableGrowth :1; // Usually, the table may grow 
infinitely,
 // as the table can be split in 
SwTabFrm::MakeAll
 // In MakeAll, this flag is set to 
indicate that
 // the table may only grow inside its 
upper. This
 // is necessary, in order to let the 
text flow into
 // the FollowFlowLine
 
-bool bRemoveFollowFlowLinePending :1;
+bool m_bRemoveFollowFlowLinePending :1;
 
 // #i26945#
-bool bConsiderObjsForMinCellHeight :1; // Usually, the floating screen 
objects
+bool m_bConsiderObjsForMinCellHeight :1; // Usually, the floating screen 
objects
// are considered during the 
calculation
// for the minimal cell height.
// For the splitting table rows 
algorithm
@@ -81,10 +81,10 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
// of the re-calculation of the

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

2014-12-18 Thread Luboš Luňák

 vcl/inc/openglgdiimpl.hxx |   10 -
 vcl/opengl/gdiimpl.cxx|   78 ++
 2 files changed, 79 insertions(+), 9 deletions(-)

New commits:
commit 95814b1c0f9d06973fd80281023f37ed01b530fa
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Thu Dec 18 11:47:58 2014 +0100

vcl: fix AA drawing of opengl polygons if AA is enabled.

Especially given that lines are sometimes actually drawn using polygons.

Change-Id: I429a24faff94f8b9accc20bdee3ff66f47669bde
Signed-off-by: Michael Meeks michael.me...@collabora.com

diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 2c911ee..4ca30b3 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -56,6 +56,9 @@ protected:
 
 SalColor mnLineColor;
 SalColor mnFillColor;
+#ifdef DBG_UTIL
+bool mProgramIsSolidLineColor;
+#endif
 
 void ImplInitClipRegion();
 void ImplSetClipBit( const vcl::Region rClip, GLuint nMask );
@@ -67,20 +70,21 @@ public:
 bool UseSolid( SalColor nColor, sal_uInt8 nTransparency );
 bool UseSolid( SalColor nColor, double fTransparency );
 bool UseSolid( SalColor nColor );
+bool UseSolidAA( SalColor nColor, double fTransparency );
 bool UseSolidAA( SalColor nColor );
 bool UseInvert();
 
 void DrawPoint( long nX, long nY );
-void DrawLine( long nX1, long nY1, long nX2, long nY2 );
+void DrawLine( double nX1, double nY1, double nX2, double nY2 );
 void DrawLines( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose );
-void DrawLineAA( long nX1, long nY1, long nX2, long nY2 );
+void DrawLineAA( double nX1, double nY1, double nX2, double nY2 );
 void DrawLinesAA( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose 
);
 void DrawConvexPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
 void DrawConvexPolygon( const Polygon rPolygon );
 void DrawRect( long nX, long nY, long nWidth, long nHeight );
 void DrawRect( const Rectangle rRect );
 void DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
-void DrawPolyPolygon( const basegfx::B2DPolyPolygon rPolyPolygon );
+void DrawPolyPolygon( const basegfx::B2DPolyPolygon rPolyPolygon, bool 
blockAA = false );
 void DrawRegionBand( const RegionBand rRegion );
 void DrawTextureRect( OpenGLTexture rTexture, const SalTwoRect rPosAry, 
bool bInverted = false );
 void DrawTexture( OpenGLTexture rTexture, const SalTwoRect rPosAry, bool 
bInverted = false );
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index f992136..d89f072 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -47,6 +47,9 @@ OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics 
rParent, SalGeometryPr
 , mbOffscreen(false)
 , mnLineColor(SALCOLOR_NONE)
 , mnFillColor(SALCOLOR_NONE)
+#ifdef DBG_UTIL
+, mProgramIsSolidLineColor(false)
+#endif
 {
 }
 
@@ -162,6 +165,9 @@ void OpenGLSalGraphicsImpl::PostDraw()
 {
 mpProgram-Clean();
 mpProgram = NULL;
+#ifdef DBG_UTIL
+mProgramIsSolidLineColor = false;
+#endif
 }
 
 CHECK_GL_ERROR();
@@ -192,7 +198,7 @@ void OpenGLSalGraphicsImpl::ImplSetClipBit( const 
vcl::Region rClip, GLuint nMa
 if( rClip.getRegionBand() )
 DrawRegionBand( *rClip.getRegionBand() );
 else
-DrawPolyPolygon( rClip.GetAsB2DPolyPolygon() );
+DrawPolyPolygon( rClip.GetAsB2DPolyPolygon(), true );
 }
 
 glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
@@ -354,6 +360,9 @@ bool OpenGLSalGraphicsImpl::UseProgram( const OUString 
rVertexShader, const OUS
 if( mpProgram != NULL )
 mpProgram-Clean();
 mpProgram = mpContext-UseProgram( rVertexShader, rFragmentShader );
+#ifdef DBG_UTIL
+mProgramIsSolidLineColor = false; // UseSolid() will set to true if needed
+#endif
 return ( mpProgram != NULL );
 }
 
@@ -364,6 +373,9 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor, 
sal_uInt8 nTransparency )
 if( !UseProgram( dumbVertexShader, solidFragmentShader ) )
 return false;
 mpProgram-SetColor( color, nColor, nTransparency );
+#ifdef DBG_UTIL
+mProgramIsSolidLineColor = true;
+#endif
 return true;
 }
 
@@ -374,6 +386,9 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor, 
double fTransparency )
 if( !UseProgram( dumbVertexShader, solidFragmentShader ) )
 return false;
 mpProgram-SetColorf( color, nColor, fTransparency );
+#ifdef DBG_UTIL
+mProgramIsSolidLineColor = true;
+#endif
 return true;
 }
 
@@ -383,17 +398,22 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor )
 }
 
 // Like UseSolid(), but sets up for AA drawing, which uses gradients to create 
the AA.
-bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor )
+bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor, double fTransparency )
 {
 if( !mrParent.getAntiAliasB2DDraw())
 return UseSolid( nColor );

[Libreoffice-commits] core.git: 2 commits - download.lst svtools/source svx/source unotools/source

 download.lst   |2 +-
 svtools/source/config/menuoptions.cxx  |8 
 svx/source/form/fmdmod.cxx |4 ++--
 unotools/source/config/fontoptions.cxx |6 +++---
 unotools/source/config/localisationoptions.cxx |4 ++--
 unotools/source/config/syslocaleoptions.cxx|   12 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit b7e61384f135f9f513659bcfd2502a9d00acd2f9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 18 15:21:12 2014 -0500

Update mdds to 0.11.2.

Change-Id: I1c331863df2b1e560ba8a3d5b7dde67cce59b2df

diff --git a/download.lst b/download.lst
index 9afac7b..c2e5949 100644
--- a/download.lst
+++ b/download.lst
@@ -99,7 +99,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_TARBALL := 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2
+export MDDS_TARBALL := cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
 export MWAW_MD5SUM := 19b879c2a27251db6fb274d6c585d488
commit 62de3d17a10cb2fc4eb20992e9decd682eb1d7bb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 18 20:45:06 2014 -0500

Build fix for gcc 4.7.

Change-Id: I9b971928fa2737d21c225406bf2a86c088be5b9c

diff --git a/svtools/source/config/menuoptions.cxx 
b/svtools/source/config/menuoptions.cxx
index b1055eb..c7dc8fe 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -350,10 +350,10 @@ Sequence OUString  
SvtMenuOptions_Impl::impl_GetPropertyNames()
 // Build static list of configuration key names.
 static const OUString pProperties[] =
 {
-PROPERTYNAME_DONTHIDEDISABLEDENTRIES,
-PROPERTYNAME_FOLLOWMOUSE,
-PROPERTYNAME_SHOWICONSINMENUES  ,
-PROPERTYNAME_SYSTEMICONSINMENUES
+OUString(PROPERTYNAME_DONTHIDEDISABLEDENTRIES),
+OUString(PROPERTYNAME_FOLLOWMOUSE),
+OUString(PROPERTYNAME_SHOWICONSINMENUES)  ,
+OUString(PROPERTYNAME_SYSTEMICONSINMENUES)
 };
 // Initialize return sequence with these list ...
 static const Sequence OUString  seqPropertyNames( pProperties, 
PROPERTYCOUNT );
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index a9a1b5e..e9e8a8f 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -73,13 +73,13 @@ SAL_WNOUNREACHABLE_CODE_POP
 FM_SUN_COMPONENT_GROUPBOX,
 FM_SUN_COMPONENT_FIXEDTEXT,
 FM_SUN_COMPONENT_COMMANDBUTTON,
-FM_SUN_COMPONENT_CHECKBOX,
+OUString(FM_SUN_COMPONENT_CHECKBOX),
 FM_SUN_COMPONENT_GRIDCONTROL,
 FM_SUN_COMPONENT_IMAGEBUTTON,
 FM_SUN_COMPONENT_FILECONTROL,
 FM_SUN_COMPONENT_TIMEFIELD,
 FM_SUN_COMPONENT_DATEFIELD,
-FM_SUN_COMPONENT_NUMERICFIELD,
+OUString(FM_SUN_COMPONENT_NUMERICFIELD),
 FM_SUN_COMPONENT_CURRENCYFIELD,
 FM_SUN_COMPONENT_PATTERNFIELD,
 FM_SUN_COMPONENT_HIDDENCONTROL,
diff --git a/unotools/source/config/fontoptions.cxx 
b/unotools/source/config/fontoptions.cxx
index e810502..2541c27 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -254,9 +254,9 @@ Sequence OUString  
SvtFontOptions_Impl::impl_GetPropertyNames()
 // Build list of configuration key names.
 const OUString pProperties[] =
 {
-PROPERTYNAME_REPLACEMENTTABLE   ,
-PROPERTYNAME_FONTHISTORY,
-PROPERTYNAME_FONTWYSIWYG,
+OUString(PROPERTYNAME_REPLACEMENTTABLE)   ,
+OUString(PROPERTYNAME_FONTHISTORY),
+OUString(PROPERTYNAME_FONTWYSIWYG),
 };
 // Initialize return sequence with these list ...
 const Sequence OUString  seqPropertyNames( pProperties, PROPERTYCOUNT );
diff --git a/unotools/source/config/localisationoptions.cxx 
b/unotools/source/config/localisationoptions.cxx
index 244fe16..2ad2ee1 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -221,8 +221,8 @@ Sequence OUString  
SvtLocalisationOptions_Impl::GetPropertyNames()
 // Build static list of configuration key names.
 const OUString aProperties[] =
 {
-PROPERTYNAME_AUTOMNEMONIC   ,
-PROPERTYNAME_DIALOGSCALE,
+OUString(PROPERTYNAME_AUTOMNEMONIC)   ,
+OUString(PROPERTYNAME_DIALOGSCALE),
 };
 // Initialize return sequence with these list ...
 Sequence OUString

[ANN] mdds 0.11.2 on master

Hi there,

Just FYI, master branch now requires mdds 0.11.2, which I just released
today.  It fixes memory leaks in multi_type_vector which affected
ScFormulaCell storage in Calc.  Many thanks to David Tardon for
discovering this.

I'll get this also backported to the 4.4 branch shortly.

Kohei

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

[Libreoffice-commits] core.git: external/libmspub

 external/libmspub/ExternalProject_libmspub.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2116f1cfb31e5fcf829c2f101cd878a32b56c365
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Dec 19 04:15:20 2014 +0100

libmspub depends on zlib

Change-Id: I3024693698f85ef1c2bbb7fb6ee968a0d5ba6359

diff --git a/external/libmspub/ExternalProject_libmspub.mk 
b/external/libmspub/ExternalProject_libmspub.mk
index 2bc2117..644fc42 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
boost_headers \
icu \
revenge \
+   zlib \
 ))
 
 $(call gb_ExternalProject_get_state_target,libmspub,build) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - download.lst sw/qa

 download.lst   |2 +-
 sw/qa/extras/globalfilter/globalfilter.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit eb237aa4e73762569819fc10a2433f4d02a36881
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 18 22:43:35 2014 -0500

Build fix for gcc 4.7.

Change-Id: Ib2a477319f843c9da4f9fa4cb9e491bef8b3f03b

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index fbb51d7..6185bd5 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -119,10 +119,10 @@ void Test::testSwappedOutImageExport()
 void Test::testLinkedGraphicRT()
 {
 OUString aFilterNames[] = {
-writer8,
+OUString(writer8),
 //Rich Text Format,  Note: picture is there, but SwGrfNode is not 
found?
-MS Word 97,
-Office Open XML Text,
+OUString(MS Word 97),
+OUString(Office Open XML Text),
 };
 
 for( size_t nFilter = 0; nFilter  SAL_N_ELEMENTS(aFilterNames); ++nFilter 
)
commit 104a4ea1fe05ed8f0d7365b725dbbe9737b97f77
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 18 15:21:12 2014 -0500

Update mdds to 0.11.2.

Change-Id: I1c331863df2b1e560ba8a3d5b7dde67cce59b2df
(cherry picked from commit b7e61384f135f9f513659bcfd2502a9d00acd2f9)

diff --git a/download.lst b/download.lst
index 9afac7b..c2e5949 100644
--- a/download.lst
+++ b/download.lst
@@ -99,7 +99,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_TARBALL := 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2
+export MDDS_TARBALL := cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
 export MWAW_MD5SUM := 19b879c2a27251db6fb274d6c585d488
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/libmspub

 external/libmspub/ExternalProject_libmspub.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1c05c0b6ef8a96c144efd8d7d66bff39cf4619fe
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Dec 19 04:15:20 2014 +0100

libmspub depends on zlib

Change-Id: I3024693698f85ef1c2bbb7fb6ee968a0d5ba6359
(cherry picked from commit 2116f1cfb31e5fcf829c2f101cd878a32b56c365)
Reviewed-on: https://gerrit.libreoffice.org/13536
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/external/libmspub/ExternalProject_libmspub.mk 
b/external/libmspub/ExternalProject_libmspub.mk
index 2bc2117..644fc42 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
boost_headers \
icu \
revenge \
+   zlib \
 ))
 
 $(call gb_ExternalProject_get_state_target,libmspub,build) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libmspub

 external/libmspub/ExternalProject_libmspub.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dc8bd693190eca30372e6e031364a192ec81914a
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Dec 19 04:15:20 2014 +0100

libmspub depends on zlib

Change-Id: I3024693698f85ef1c2bbb7fb6ee968a0d5ba6359
(cherry picked from commit 2116f1cfb31e5fcf829c2f101cd878a32b56c365)
Reviewed-on: https://gerrit.libreoffice.org/13537
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/external/libmspub/ExternalProject_libmspub.mk 
b/external/libmspub/ExternalProject_libmspub.mk
index 8cbf9a6..921ae59 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
boost_headers \
icu \
revenge \
+   zlib \
 ))
 
 $(call gb_ExternalProject_get_state_target,libmspub,build) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 download.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7defa4d42fad580952405757b886aa0970baa3da
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 18 15:21:12 2014 -0500

Update mdds to 0.11.2.

(cherry picked from commit b7e61384f135f9f513659bcfd2502a9d00acd2f9)

Conflicts:
download.lst

Change-Id: I1c331863df2b1e560ba8a3d5b7dde67cce59b2df
Reviewed-on: https://gerrit.libreoffice.org/13538
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/download.lst b/download.lst
index c563d5a..a2a072b 100644
--- a/download.lst
+++ b/download.lst
@@ -95,7 +95,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2
+export MDDS_TARBALL := cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools

2014-12-18 Thread Michael Weghorn

 include/svtools/ruler.hxx |  314 ++
 1 file changed, 155 insertions(+), 159 deletions(-)

New commits:
commit a3181adc11bc707680424551369a24b3c65de921
Author: Michael Weghorn m.wegh...@posteo.de
Date:   Thu Dec 18 23:48:12 2014 +0100

fdo#39468 translate German comments

Change-Id: I87ba3ac7aabbb297785eff5da6a5d498fdefd80c
Reviewed-on: https://gerrit.libreoffice.org/13534
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 10a2bd0..06463cf 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -257,223 +257,219 @@ it has been dragged. There are the following query 
methods:
 relative to the set zero-offset.
 
 - GetDragAryPos()
-Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein
-Tab gedragt wird. Achtung: Es wird die Array-Position waehrend des
-gesammten Drag-Vorgangs von dem Item im Array was vor dem Drag gesetzt
-war zurueckgeben. Dadurch ist es zum Beispiel auch moeglich, einen
-Tab nicht mehr anzuzeigen, wenn die Maus nach unten/rechts aus dem
-Lineal gezogen wird.
+Returns the index in the array if a border, an indent or a tab
+is being dragged. Attention: During a drag process, the array position
+of the item that has been set before the drag is returned.
+Therefore, it is for example also possible, to no longer show a tab
+if the mouse is dragged out of the ruler in bottom/right direction.
 
 - GetDragSize()
-Wenn Borders gedragt werden, kann hierueber abgefragt werden, ob
-die Groesse bzw. welche Seite oder die Position geaendert werden soll.
+If Borders are dragged, this can be used to query whether the size
+resp. which side or the position should be changed.
 RULER_DRAGSIZE_MOVE oder 0  - Move
-RULER_DRAGSIZE_1- Linke/obere Kante
-RULER_DRAGSIZE_2- Rechte/untere Kante
+RULER_DRAGSIZE_1- left/upper border
+RULER_DRAGSIZE_2- right/bottom border
 
 - IsDragDelete()
-Mit dieser Methode kann abgefragt werden, ob beim Draggen die
-Maus unten/rechts aus dem Fenster gezogen wurde. Damit kann
-zum Beispiel festgestellt werden, ob der Benutzer einen Tab
-loeschen will.
+This method can be used to query whether the mouse has been
+moved out of the window at the bottom/right while dragging.
+By this, it can for example be determined whether the user
+wants to delete a tab.
 
 - IsDragCanceled()
-Mit dieser Methode kann im EndDrag-Handler abgefragt werden,
-ob die Aktion abgebrochen wurde, indem der Anwender die
-Maus oben/links vom Fenster losgelassen hat oder ESC gedrueckt
-hat. In diesem Fall werden die Werte nicht uebernommen. Wird
-waehrend des Draggings die Maus oben/links aus dem Fenster
-gezogen, werden automatisch die alten Werte dargestellt, ohne das
-der Drag-Handler gerufen wird.
-Falls der Benutzer jedoch den Wert auf die alte Position
-zurueckgeschoben hat, liefert die Methode trotzdem sal_False. Falls
-dies vermieden werden soll, muss sich die Applikation im StartDrag-
-Handler den alten Wert merken und im EndDrag-Handler den Wert
-vergleichen.
+Using this Handler, it can be queried in the EndDrag handler
+whether the action was canceled by the user releasing the
+mouse at the top/left of the window or by pressing ESC.
+In this case, the values are not applied. If during the
+dragging, the mouse is dragged out of the window at the
+top/left, the old values are displayed automatically without
+the Drag handler being called.
+But if the user has moved the value to the old position, the
+method returns 'false' nevertheless.
+If this should be avoided, the application must remember the
+old value in the StartDrag handler and compare the value in the
+EndDrag handler.
 
 - GetDragScroll()
-Mit dieser Methode kann abgefragt werden, ob gescrollt werden
-soll. Es wird einer der folgenden Werte zurueckgegeben:
-RULER_SCROLL_NO - Drag-Position befindet sich
-  an keinem Rand und somit
-  muss nicht gescrollt werden.
-RULER_SCROLL_1  - Drag-Position befindet sich
-  am linken/oberen Rand und
-  somit sollte das Programm evt.
-  ein Srcoll ausloesen.
-

[Bug 39468] translate German comments, removing redundant ones

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

--- Comment #159 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Michael Weghorn committed a patch related to this issue.
It has been pushed to master:

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

fdo#39468 translate German comments

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

download page says LibreOffice Fresh when downloading 4.2.8

2014-12-18 Thread Lionel Elie Mamane

We used to have a www component in bugzilla but it seems to have
disappeared?

From https://www.libreoffice.org/ click on Download Now. This goes
to https://www.libreoffice.org/download/libreoffice-fresh/
There, click on 4.2.8 because you want LibreOffice Still, not
LibreOffice Fresh. This goes to
https://www.libreoffice.org/download/libreoffice-fresh/?type=deb-x86_64version=4.2.8lang=en-GB
which still says (in big font) LibreOffice Fresh, but should say
LibreOffice Still. Or maybe Custom Download or Archive Download
or something, but not LibreOffice Fresh.

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

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

2014-12-18 Thread Noel Grandin

 include/oox/helper/binaryinputstream.hxx |   26 +--
 include/oox/helper/binaryoutputstream.hxx|8 
 include/oox/ole/axbinaryreader.hxx   |7 
 include/oox/ole/axbinarywriter.hxx   |4 
 oox/source/crypto/AgileEngine.cxx|3 
 oox/source/crypto/DocumentDecryption.cxx |3 
 oox/source/crypto/Standard2007Engine.cxx |9 -
 oox/source/ole/axbinaryreader.cxx|3 
 oox/source/ole/axbinarywriter.cxx|   16 -
 oox/source/ole/olehelper.cxx |2 
 oox/source/ole/vbamodule.cxx |2 
 oox/source/ole/vbaproject.cxx|2 
 sc/source/filter/excel/excform.cxx   |  182 +-
 sc/source/filter/excel/excform8.cxx  |  140 +++-
 sc/source/filter/excel/excimp8.cxx   |   24 +-
 sc/source/filter/excel/exctools.cxx  |   10 -
 sc/source/filter/excel/impop.cxx |  123 +-
 sc/source/filter/excel/xichart.cxx   |  218 +++---
 sc/source/filter/excel/xicontent.cxx |   59 ---
 sc/source/filter/excel/xiescher.cxx  |  223 ++-
 sc/source/filter/excel/xihelper.cxx  |6 
 sc/source/filter/excel/xilink.cxx|   23 +-
 sc/source/filter/excel/xiname.cxx|   17 +-
 sc/source/filter/excel/xipage.cxx|   27 ++-
 sc/source/filter/excel/xipivot.cxx   |   17 +-
 sc/source/filter/excel/xistream.cxx  |  129 +++
 sc/source/filter/excel/xistring.cxx  |   11 -
 sc/source/filter/excel/xistyle.cxx   |   77 ++---
 sc/source/filter/excel/xiview.cxx|   40 ++--
 sc/source/filter/excel/xladdress.cxx |9 -
 sc/source/filter/excel/xlescher.cxx  |   50 +++---
 sc/source/filter/excel/xlformula.cxx |2 
 sc/source/filter/excel/xlpivot.cxx   |  135 
 sc/source/filter/excel/xltools.cxx   |5 
 sc/source/filter/inc/XclImpChangeTrack.hxx   |7 
 sc/source/filter/inc/xistream.hxx|   15 -
 sc/source/filter/inc/xlescher.hxx|   19 +-
 sc/source/filter/oox/addressconverter.cxx|8 
 sc/source/filter/oox/autofilterbuffer.cxx|   12 -
 sc/source/filter/oox/commentsbuffer.cxx  |3 
 sc/source/filter/oox/condformatbuffer.cxx|   12 +
 sc/source/filter/oox/connectionsbuffer.cxx   |   12 +
 sc/source/filter/oox/defnamesbuffer.cxx  |5 
 sc/source/filter/oox/externallinkbuffer.cxx  |   12 -
 sc/source/filter/oox/formulabase.cxx |8 
 sc/source/filter/oox/formulaparser.cxx   |   26 +--
 sc/source/filter/oox/pagesettings.cxx|   39 +++-
 sc/source/filter/oox/pivotcachebuffer.cxx|   32 ++-
 sc/source/filter/oox/pivottablebuffer.cxx|   59 +--
 sc/source/filter/oox/querytablebuffer.cxx|5 
 sc/source/filter/oox/richstring.cxx  |7 
 sc/source/filter/oox/sheetdatacontext.cxx|   18 +-
 sc/source/filter/oox/stylesbuffer.cxx|   42 +++--
 sc/source/filter/oox/tablebuffer.cxx |6 
 sc/source/filter/oox/viewsettings.cxx|   28 ++-
 sc/source/filter/oox/workbooksettings.cxx|   14 +
 sc/source/filter/oox/worksheetbuffer.cxx |4 
 sc/source/filter/oox/worksheetfragment.cxx   |   25 ++-
 sc/source/filter/oox/worksheetsettings.cxx   |8 
 sc/source/filter/xcl97/XclImpChangeTrack.cxx |   17 +-
 60 files changed, 1260 insertions(+), 795 deletions(-)

New commits:
commit 9315ccc397647bcb4fc15fe9e0cbe19e5005
Author: Noel Grandin n...@peralex.com
Date:   Thu Dec 18 13:25:27 2014 +0200

remove operator methods

in favour of ReadXXX methods

Change-Id: I50a97c1855366dc14c6864da2fb91d1759d4d4db

diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index 630997a..79c3373 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -54,22 +54,21 @@ void ImportExcel::Formula25()
 
 if( GetBiff() == EXC_BIFF2 )
 {// BIFF2
-sal_uInt8 nDummy;
-
 aIn.Ignore( 3 );
 
-aIn  fCurVal;
+fCurVal = aIn.ReadDouble();
 aIn.Ignore( 1 );
-aIn  nDummy;
-nFormLen = nDummy;
+nFormLen = aIn.ReaduInt8();
 bShrFmla = false;
 }
 else
 {// BIFF5
-aIn  nXF  fCurVal  nFlag0;
+nXF = aIn.ReaduInt16();
+fCurVal = aIn.ReadDouble();
+nFlag0 = aIn.ReaduInt8();
 aIn.Ignore( 5 );
 
-aIn  nFormLen;
+nFormLen = aIn.ReaduInt16();
 
 bShrFmla = nFlag0  0x08;   // shared or not shared
 }
@@ -89,9 +88,12 @@ void ImportExcel::Formula4()
 double  fCurVal;
 sal_uInt8   nFlag0;
 
-aIn  aXclPos  nXF  fCurVal  nFlag0;
+aIn  aXclPos;
+nXF = aIn.ReaduInt16();
+fCurVal = aIn.ReadDouble();
+nFlag0 = aIn.ReaduInt8();
 aIn.Ignore( 1 );
-aIn

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

 svx/source/inc/fmurl.hxx |   54 +++
 1 file changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 27e76ead71e86811f9720162df3eed504e2c29ad
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Dec 19 08:35:17 2014 +0100

Consistently define plain string literals here, no OUStrings

cf. ef3fb927977681c3e5b5160e961e240063a8cb70 svx: Use appropriate OUString
functions on string constants, 897f35006ea48b7b60b087a8f0b955c7f099af3a 
fix
build, 3f66df98050175dfbab2026661c0cba734885e05 Work around GCC bug

Change-Id: Ifdfaad30cb59d54ac71bfe9347d29fb853551fd4

diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index 3182e4b..a354eae 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -20,33 +20,33 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 
-#define FMURL_FORM_POSITIONOUString( 
.uno:FormController/positionForm )
-#define FMURL_FORM_RECORDCOUNT OUString( 
.uno:FormController/RecordCount )
-#define FMURL_RECORD_MOVEFIRST OUString( 
.uno:FormController/moveToFirst )
-#define FMURL_RECORD_MOVEPREV  OUString( 
.uno:FormController/moveToPrev )
-#define FMURL_RECORD_MOVENEXT  OUString( 
.uno:FormController/moveToNext )
-#define FMURL_RECORD_MOVELAST  OUString( 
.uno:FormController/moveToLast )
-#define FMURL_RECORD_MOVETONEW OUString( 
.uno:FormController/moveToNew )
-#define FMURL_RECORD_UNDO  OUString( 
.uno:FormController/undoRecord )
-#define FMURL_RECORD_SAVE  OUString( 
.uno:FormController/saveRecord )
-#define FMURL_RECORD_DELETEOUString( 
.uno:FormController/deleteRecord )
-#define FMURL_FORM_REFRESH OUString( 
.uno:FormController/refreshForm )
-#define FMURL_FORM_REFRESH_CURRENT_CONTROL OUString( 
.uno:FormController/refreshCurrentControl )
-#define FMURL_FORM_SORT_UP OUString( 
.uno:FormController/sortUp )
-#define FMURL_FORM_SORT_DOWN   OUString( 
.uno:FormController/sortDown )
-#define FMURL_FORM_SORTOUString( 
.uno:FormController/sort )
-#define FMURL_FORM_AUTO_FILTER OUString( 
.uno:FormController/autoFilter )
-#define FMURL_FORM_FILTER  OUString( 
.uno:FormController/filter )
-#define FMURL_FORM_APPLY_FILTEROUString( 
.uno:FormController/applyFilter )
-#define FMURL_FORM_REMOVE_FILTER   OUString( 
.uno:FormController/removeFilterOrder )
-#define FMURL_CONFIRM_DELETION OUString( 
.uno:FormSlots/ConfirmDeletion )
-#define FMURL_COMPONENT_FORMGRIDVIEW   OUString( 
.component:DB/FormGridView )
-#define FMURL_GRIDVIEW_CLEARVIEW   OUString( 
.uno:FormSlots/ClearView )
-#define FMURL_GRIDVIEW_ADDCOLUMN   OUString( 
.uno:FormSlots/AddGridColumn )
-#define FMURL_GRIDVIEW_ATTACHTOFORMOUString( 
.uno:FormSlots/AttachToForm )
-#define FMARG_ATTACHTO_MASTERFORM  OUString( MasterForm )
-#define FMARG_ADDCOL_COLUMNTYPEOUString( ColumnType )
-#define FMARG_ADDCOL_COLUMNPOS OUString( ColumnPosition )
+#define FMURL_FORM_POSITION.uno:FormController/positionForm
+#define FMURL_FORM_RECORDCOUNT .uno:FormController/RecordCount
+#define FMURL_RECORD_MOVEFIRST .uno:FormController/moveToFirst
+#define FMURL_RECORD_MOVEPREV  .uno:FormController/moveToPrev
+#define FMURL_RECORD_MOVENEXT  .uno:FormController/moveToNext
+#define FMURL_RECORD_MOVELAST  .uno:FormController/moveToLast
+#define FMURL_RECORD_MOVETONEW .uno:FormController/moveToNew
+#define FMURL_RECORD_UNDO  .uno:FormController/undoRecord
+#define FMURL_RECORD_SAVE  .uno:FormController/saveRecord
+#define FMURL_RECORD_DELETE.uno:FormController/deleteRecord
+#define FMURL_FORM_REFRESH .uno:FormController/refreshForm
+#define FMURL_FORM_REFRESH_CURRENT_CONTROL 
.uno:FormController/refreshCurrentControl
+#define FMURL_FORM_SORT_UP .uno:FormController/sortUp
+#define FMURL_FORM_SORT_DOWN   .uno:FormController/sortDown
+#define FMURL_FORM_SORT.uno:FormController/sort
+#define FMURL_FORM_AUTO_FILTER .uno:FormController/autoFilter
+#define FMURL_FORM_FILTER  .uno:FormController/filter
+#define FMURL_FORM_APPLY_FILTER.uno:FormController/applyFilter
+#define FMURL_FORM_REMOVE_FILTER   
.uno:FormController/removeFilterOrder
+#define FMURL_CONFIRM_DELETION .uno:FormSlots/ConfirmDeletion
+#define FMURL_COMPONENT_FORMGRIDVIEW   .component:DB/FormGridView
+#define FMURL_GRIDVIEW_CLEARVIEW   .uno:FormSlots/ClearView
+#define FMURL_GRIDVIEW_ADDCOLUMN   .uno:FormSlots/AddGridColumn
+#define FMURL_GRIDVIEW_ATTACHTOFORM

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

 solenv/gbuild/platform/com_GCC_class.mk |1 +
 solenv/gbuild/platform/com_MSC_class.mk |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 9c928971167b6fc553f105b8141e214e6d06785f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Dec 19 08:51:55 2014 +0100

Blind attempt to fix PCH

...after 86ba184394094c7c043a505a20a0b1b8977f73d7 Introduce
gb_*_set_external_code

Change-Id: I6ed9652c6157b7cb2196f044f62c606968ef1807

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 59678bb..0ce02d6 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -171,6 +171,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(4) $(5) \
$(gb_COMPILERDEPFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
+   $(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
$(6) \
$(call gb_cxx_dep_generation_options,$(1),$(call 
gb_PrecompiledHeader_get_dep_target,$(2))) \
-c $(patsubst %.cxx,%.hxx,$(3)) \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 92b6e2b..4064527 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -79,6 +79,7 @@ $(call gb_Helper_abbreviate_dirs,\
unset INCLUDE  \
$(gb_CXX) \
$(4) $(5) -Fd$(PDBFILE) \
+   $(if $(EXTERNAL_CODE),,$(gb_DEFS_INTERNAL)) \
$(gb_LTOFLAGS) \
$(gb_COMPILERDEPFLAGS) \
-I$(dir $(3)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] How should Calc's WEBSERVICE function work?

2014-12-18 Thread m.a.riosv

They were recently incorporated by Olivier Hallot into the help.
https://bugs.freedesktop.org/show_bug.cgi?id=80441

Help link with an example:
WEBSERVICE FILTERXML help
https://help.libreoffice.org/scalc/SC_HID_FUNC_WEBSERVICE?Language=en-USSystem=WINVersion=4.4#bm_id3150028
  

Miguel Ángel.



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-How-should-Calc-s-WEBSERVICE-function-work-tp4132481p4132512.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] mab4.2 to mab4.3 migration almost over

2014-12-18 Thread Bjoern Michaelsen

Hi,

On Wed, Dec 17, 2014 at 11:09:37AM -0800, Joel Madero wrote:
 Well when we move to our own bug tracker we are hoping to abandon MAB
 completely and just use priority/importance - as these will be locked
 out to regular users so we can make sure they are objective and
 accurate. So...hopefully soon the problem is gone :-D

FWIW, I just did a run for:

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

and Fdo should be completely consistent in that all MAB are priority highest
and all non-MAB are not priority highest.

Also there seems actually little abuse by people in the priority field -- the
fear of people making bugs priority highest willy-nilly (and for some reason
not doing so with MABs) seems rather baseless. Thus I think we could kill MABs
right now and use priority proper today, if we want to.

Best,

Bjoern
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] UI enhancements filled by UX members

2014-12-18 Thread Sophie

Hi all,

I had this AI yesterday in the meeting:
http://listarchives.libreoffice.org/global/design/msg06884.html

To sum up, enhancements opened by UX members are set as NEW and assigned
to UX-advice so they are not triaged by QA members and don't appear in
the QA stats.

Cheers
Sophie
-- 
Sophie Gautier sophie.gaut...@documentfoundation.org
Tel:+33683901545
Co-founder - Release coordinator
The Document Foundation
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] minutes of ESC call ...

2014-12-18 Thread Michael Meeks

* Present
+ Muthu, Michael M., Kendy, Kohei, Miklos, Cloph, Eike, Ignaz, Stephan,
  Norbert, Robinson, Ptyl, Caolan, Lionel, Andras, Bjoern, Markus, Jacobo,
  Michael S
 
* Completed Action Items:
+ review libcmis branch  merge to master  4.4 (Miklos)
[ one problem was pending and Mihai fixed it - he rocks
  feature will be in RC1 ]
+ get a better / longer term certificate for signing
+ cf. https://bugs.freedesktop.org/show_bug.cgi?id=86780
[ Florian is on the job for 4.5 ]
+ mail QA list with newly up-loaded bibisect (Robinson)
+ test out  evangelise VM / X2go / QA VM scheme (Robinson)
[ working with Cloph on this, mentioned them to QA,
  people tested on Mac  Windows, they're very responsive
  even without a good connection ]
 
* Pending Action Items:
+ fix BSA login / XML-RPC issues (Cloph)
[ still WIP with Cloph ]
+ check Matus' startup performance measurement for layered images.zip 
(Kendy)
 
* Bugzilla migration update (Robinson)
+ BugZilla migration = Saturday, January 24, ~1600 UTC
+ going well
+ http://vm150.documentfoundation.org/
+ thinking about next steps etc.
  https://gerrit.libreoffice.org/#/admin/projects/bugzilla
 
* Release Engineering update (Cloph)
+ 4.3.5 status
+ released - just now.
+ 4.4.0 RC1 status
+ string  UI freeze date, but not branch-off.
 + single review - from someone other than the committer
   to push to RC1 - cf. 4.3 branch etc.
+ build failed on windows:
 + command-line limits again: packaging extensions
 + have a fix in-hand.
 [ write file lists to a temporary file etc. ]
+ other platform builds on the pre-releases server already.
+ Horribly late feature collection:
+ OneDrive / SharePoint bits
[ now in ]
+ OpenGL/CL JPEG de-compression to texture (jpeg-turbo patch)
[ punted to master/4.5 - won't make 4.4.x ]
+ New Templates ...
[ competition to be announced tomorrow ]
+ 4.4.0 RC2
+ due January 5th - week 1
+ 4.3.6 RC1
+ due January 12th
+ 4.4.0 RC3
+ due January 19th - week 4
+ Android / iOS Remote
+ Android on the Google Play
+ another build up-loaded to Google play
  null-ptr exception fixed - 7x reports of the problem
+ iOS - update translations, will be pushed too
 
* Next meeting:
+ propose skip Christmas day, and Jan 1st.
 
* Crashtest update (Caolan)
+ making good progress on import
+ currently, have unreliable results; so figures smaller than they look
+ crashers shrinking all the time.
+ validation testing (Markus)
+ have 2x fixes for officeotron - reduces numbers significantly
  for calc at least.
+ at some stage a writer dev. should look at docx validation issues
  some duplicated / mis-ordered elements - so ~nearly every doc is
  invalid
  + should be an easy fix  help a lot.
+ don't underestimate the effort (Miklos)
+ cjk etc. font size issue was pretty nasty here.
+ a few docs on writer side, validated during the build
+ grab-bag collisions suspected (Markus)
+ duplicates in there causing grief.
+ has hardware arrived ?
+ yes - the hardware has arrived
+ since we cancelled other Hertzner servers we urgently need to
  move those pieces over first before setting new services up.
 + backup / control, download / ML server needs moving.
+ desire for more memory for fuzzing  asan runs (Moggi)
+ assining more memory is no problem (Cloph)
+ other testing VM's:
 + crash-testing
 + cachegrind regression test
 + VM's for Jenkins - 2x Linux VMs
+ linked to the crash-tests from the wiki (Bjoern)
 
* FOSDEM bits
+ FOSDEM, Bruessels, Belgium -- February 2015 contact: Kendy/Cor
+ 20+ talks submitted / update - lots of good content.
+ kendy presenting the LibreOffice design team in open-source design 
dev-roomn
+ Book a room at 'Hotel Astrid' to be near the team: cheap as well ...
 
* Hackfests (Bjoern)
+ initial scheduling for 2015:
+ Las Palmas de Gran Canaria, Spain -- March, 2015 contact: Bjoern
+ setup for GSOC etc.
+ contacted them - and plan to go ahead with that.
+ Cambridge, UK -- May 2015 contact: Michael
 
* UX Update (Kendy)
+ shorter call this time
+ lots of good things ongoing
+ report about UI changes of last week to come
+ critical piece is the template competition
+ hopefully an on-going effort for 4.4.x / 4.5
 
* Certification (Stephan/Bjoern/Kendy)
 
* Jenkins update (Norbert)
+ started migrating the server that does the work into TDF

Re: [Libreoffice-qa] UI enhancements filled by UX members

2014-12-18 Thread Joel Madero

Hi All,
 To sum up, enhancements opened by UX members are set as NEW and assigned
 to UX-advice so they are not triaged by QA members and don't appear in
 the QA stats.
By assign - if you set the component to ux-advise then it'll auto
assign it to the UX team and they can tackle it from there.

Best,
Joel
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] UI enhancements filled by UX members

2014-12-18 Thread Robinson Tryon

On Thu, Dec 18, 2014 at 11:18 AM, Joel Madero jmadero@gmail.com wrote:
 Hi All,
 To sum up, enhancements opened by UX members are set as NEW and assigned
 to UX-advice so they are not triaged by QA members and don't appear in
 the QA stats.
 By assign - if you set the component to ux-advise then it'll auto
 assign it to the UX team and they can tackle it from there.

I drafted a section for the BugTriage page here:
https://wiki.documentfoundation.org/QA/BugTriage#UX_Enhancements

I noted an option to change Status to NEW or NEEDINFO, but we can
simplify that to just 'NEW' if there's general consensus.

Cheers,
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] UI enhancements filled by UX members

2014-12-18 Thread V Stuart Foote

Robinson Tryon wrote
On Thu, Dec 18, 2014 at 11:18 AM, Joel Madero lt;

jmadero.dev@

gt; wrote:
Hi All,
To sum up, enhancements opened by UX members are set as NEW and assigned
to UX-advice so they are not triaged by QA members and don't appear in
the QA stats.
By assign - if you set the component to ux-advise then it'll auto
assign it to the UX team and they can tackle it from there.

I drafted a section for the BugTriage page here:
https://wiki.documentfoundation.org/QA/BugTriage#UX_Enhancements

I noted an option to change Status to NEW or NEEDINFO, but we can
simplify that to just 'NEW' if there's general consensus.

Cheers,
--R

--
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald

Robinson, *,

I saw the UX Enhancements segment in the QA Wiki--looks fine.

We'll try to make this painless, and when triaging feel free to put on your
UI Design and UX hat. Mark it NEW or NEEDINFO -- it does go back to the OP,
and not inappropriate to ask if the issue is not clear.

As to routing it for UX-advice, we just want to make the UI Design and
function process deliberative, trackable and mindful of UX. Project has
not been keeping up with that. Goals are that, except for the simplest
tweaks, nothing should move forward for development/correction without
consensus on a well structured design--we all are capable of and are needed
to help with that process.

Thanks folks!

Stuart

--
View this message in context:
http://nabble.documentfoundation.org/Libreoffice-qa-UI-enhancements-filled-by-UX-members-tp4133068p4133120.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] How should Calc's WEBSERVICE function work?

2014-12-18 Thread Thomas Hackert

Hello Miguel, *,
On Sat, 13. December 2014 20:48 m.a.riosv wrote:

 They were recently incorporated by Olivier Hallot into the help.
 https://bugs.freedesktop.org/show_bug.cgi?id=80441
 
 Help link with an example:
 WEBSERVICE FILTERXML help
 
https://help.libreoffice.org/scalc/SC_HID_FUNC_WEBSERVICE?Language=en-USSystem=WINVersion=4.4#bm_id3150028

thank you for the link, but I have found it during my translation to 
German in the meantime ... ;)
Thanks again and have a nice evening
Thomas.

-- 
Love is not enough, but it sure helps.

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] QA Meeting Minutes - 2014-12-17

2014-12-18 Thread Robinson Tryon

Hi all,

A big thanks to everyone for the great meeting yesterday!

Minutes and ACTION items are all here:
https://wiki.documentfoundation.org/QA/Meetings/2014/December_17#IRC_Minutes

Our next meeting is scheduled for December 31st, which is in the
middle of holiday season! Instead of canceling the meeting entirely,
we'll be having a totally-optional, totally-relaxed QA Holiday Party.
Feel free to bring a glass or bottle of your favorite drink and just
say hi:
https://wiki.documentfoundation.org/QA/Meetings/2014/December_31

If you need an excuse to slip away from your in-laws for a while, just
mumble something about 'mandatory meeting' to them and find a quiet
place to hop on IRC. We've got your back!

For those keeping track on their calendars, our next legitimate
meeting (and the first meeting of 2015) will be on January 14th.

Have a Happy Holidays everyone!

Best,
--R

P.S. I was very happy to be able to report to the ESC today that our
UNCONFIRMED count was at 497. You guys rock!

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 87362] TOOLBAR: New image toolbar

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

Jay Philips philip...@hotmail.com changed:

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 Resolution|WONTFIX |---

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

[Libreoffice-bugs] [Bug 81475] Meta: enhancing Writer's standard and formatting toolbars

https://bugs.freedesktop.org/show_bug.cgi?id=81475
Bug 81475 depends on bug 87362, which changed state.

Bug 87362 Summary: TOOLBAR: New image toolbar
https://bugs.freedesktop.org/show_bug.cgi?id=87362

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 Resolution|WONTFIX |---

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

[Libreoffice-bugs] [Bug 87403] Cell Hatching not available in Libre Calc

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

raal r...@post.cz changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 CC||r...@post.cz
  Component|Libreoffice |Spreadsheet
Version|4.3.4.1 release |Inherited From OOo
 Ever confirmed|0   |1
 OS|Windows (All)   |All

--- Comment #1 from raal r...@post.cz ---
Valid enhancement, setting as NEW

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

[Libreoffice-bugs] [Bug 87403] Cell Hatching not available in Libre Calc