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

2014-12-02 Thread Miklos Vajna 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |9 -
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |3 +--
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|3 +--
 3 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 021089d8ee76baa13f09bbeccf2bdbedc4e9efed
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Dec 2 09:01:51 2014 +0100

DomainMapperTableManager::m_bOOXML was always true

Change-Id: Icfbd0d779fac949484b37ee861e083a449b225c2

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 58771ca..4f11192 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
 using namespace ::std;
 
 
-DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
+DomainMapperTableManager::DomainMapperTableManager() :
 m_nRow(0),
 m_nCell(),
 m_nGridSpan(1),
@@ -52,7 +52,6 @@ DomainMapperTableManager::DomainMapperTableManager(bool 
bOOXML) :
 m_nCellBorderIndex(0),
 m_nHeaderRepeat(0),
 m_nTableWidth(0),
-m_bOOXML( bOOXML ),
 m_bIsInShape(false),
 m_aTmpPosition(),
 m_aTmpTableProperties(),
@@ -62,7 +61,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool 
bOOXML) :
 m_bTableSizeTypeInserted(false),
 m_nLayoutType(0),
 m_nMaxFixedWidth(0),
-m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
+m_pTablePropsHandler( new TablePropertiesHandler( true ) )
 {
 m_pTablePropsHandler-SetTableManager( this );
 
@@ -246,7 +245,7 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 writerfilter::ReferenceProperties::Pointer_t pProperties = 
rSprm.getProps();
 if( pProperties.get())
 {
-TDefTableHandlerPtr pTDefTableHandler( new 
TDefTableHandler(m_bOOXML) );
+TDefTableHandlerPtr pTDefTableHandler( new 
TDefTableHandler(true) );
 pProperties-resolve( *pTDefTableHandler );
 
 TablePropertyMapPtr pRowPropMap( new TablePropertyMap );
@@ -276,7 +275,7 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 writerfilter::ReferenceProperties::Pointer_t pProperties = 
rSprm.getProps();
 if( pProperties.get())
 {
-BorderHandlerPtr pBorderHandler( new 
BorderHandler(m_bOOXML) );
+BorderHandlerPtr pBorderHandler(new BorderHandler(true));
 pProperties-resolve(*pBorderHandler);
 TablePropertyMapPtr pCellPropMap( new TablePropertyMap() );
 pCellPropMap-InsertProps(pBorderHandler-getProperties());
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 6333c3b..661b130 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -46,7 +46,6 @@ class DomainMapperTableManager : public TableManager
 sal_uInt32  m_nCellBorderIndex; //borders are provided for all cells 
and need counting
 sal_Int32   m_nHeaderRepeat; //counter of repeated headers - if == -1 
then the repeating stops
 sal_Int32   m_nTableWidth; //might be set directly or has to be 
calculated from the column positions
-boolm_bOOXML;
 /// Are we in a shape (text append stack is not empty) or in the body 
document?
 bool m_bIsInShape;
 OUString m_sTableStyleName;
@@ -80,7 +79,7 @@ class DomainMapperTableManager : public TableManager
 
 public:
 
-DomainMapperTableManager(bool bOOXML);
+DomainMapperTableManager();
 virtual ~DomainMapperTableManager();
 
 // use this method to avoid adding the properties for the table
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index bdebc23..01e7577 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -683,8 +683,7 @@ public:
 
 void appendTableManager( )
 {
-boost::shared_ptr DomainMapperTableManager  pMngr(
-new DomainMapperTableManager( m_eDocumentType == 
DOCUMENT_OOXML || m_eDocumentType == DOCUMENT_RTF ));
+boost::shared_ptrDomainMapperTableManager pMngr(new 
DomainMapperTableManager());
 m_aTableManagers.push( pMngr );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Markus Mohrhard 
 vcl/inc/quartz/salvd.h |3 +++
 vcl/quartz/salvd.cxx   |   12 
 2 files changed, 15 insertions(+)

New commits:
commit 3cc833098a090b5ff611051e9da2af94d53d1017
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Nov 30 18:48:33 2014 +0100

implement virtual methods for OSX vcl backend

Change-Id: Ifd7e06529cbf2e20bdd1560586420cda39c5a50c

diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index e1d1d51..e3c68ab 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -61,6 +61,9 @@ public:
 virtual SalGraphics*AcquireGraphics() SAL_OVERRIDE;
 virtual voidReleaseGraphics( SalGraphics* pGraphics ) 
SAL_OVERRIDE;
 virtual boolSetSize( long nNewDX, long nNewDY ) 
SAL_OVERRIDE;
+
+virtual long GetWidth() const SAL_OVERRIDE;
+virtual long GetHeight() const SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_VCL_INC_QUARTZ_SALVD_H
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index a524c1e..ceb7e9b 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -277,4 +277,16 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 return (mxLayer != NULL);
 }
 
+long AquaSalVirtualDevice::GetWidth() const
+{
+const CGSize aSize = CGLayerGetSize( mxLayer );
+return aSize.width;
+}
+
+long AquaSalVirtualDevice::GetHeight() const
+{
+const CGSize aSize = CGLayerGetSize( mxLayer );
+return aSize.height;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Michael Meeks 
 vcl/win/source/gdi/salvd.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 29daf8efdf1beb5972a8cd3d2572c374e831b136
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Dec 1 09:27:35 2014 +

vcl: re-init windows graphics impl after virtualdevice size change.

Change-Id: I6188617aa2cf2e237ec0724d1442564fbf3fe297

diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 6758b09..07d9ce8 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -26,6 +26,7 @@
 #include win/salinst.h
 #include win/salgdi.h
 #include win/salvd.h
+#include opengl/win/gdiimpl.hxx
 
 HBITMAP WinSalVirtualDevice::ImplCreateVirDevBitmap(HDC hDC, long nDX, long 
nDY, sal_uInt16 nBitCount, void **ppData)
 {
@@ -213,6 +214,14 @@ bool WinSalVirtualDevice::SetSize( long nDX, long nDY )
 SelectBitmap( getHDC(), hNewBmp );
 DeleteBitmap( mhBmp );
 mhBmp = hNewBmp;
+
+if (mpGraphics)
+{
+WinOpenGLSalGraphicsImpl *pImpl;
+pImpl = dynamic_cast WinOpenGLSalGraphicsImpl * 
(mpGraphics-getImpl());
+if (pImpl)
+pImpl-Init();
+}
 return TRUE;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: uno/uno_exception_offset

2014-12-02 Thread David Ostrovsky 
 uno/uno_exception_offset/compute_exception_offset.cpp |   42 
 uno/uno_exception_offset/uno_exception_offset.sln |   28 +
 uno/uno_exception_offset/uno_exception_offset.vcxproj |   92 ++
 3 files changed, 162 insertions(+)

New commits:
commit ecd8c257a3660d3c90faa8a349fdbaea3d88
Author: David Ostrovsky da...@ostrovsky.org
Date:   Sun Nov 30 12:25:20 2014 +0100

Add uno exception offset computation project

Change-Id: I2f77ff88ddefba3ebcc8314ce2636451a99b46a8
Reviewed-on: https://gerrit.libreoffice.org/13208
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Tested-by: David Ostrovsky da...@ostrovsky.org

diff --git a/uno/uno_exception_offset/compute_exception_offset.cpp 
b/uno/uno_exception_offset/compute_exception_offset.cpp
new file mode 100755
index 000..2cfa33a
--- /dev/null
+++ b/uno/uno_exception_offset/compute_exception_offset.cpp
@@ -0,0 +1,42 @@
+/* -*- 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/.
+*/
+
+#include iostream /* cout */
+#include stddef.h /* offsetof */
+#include mtdll.h  /* _tiddata */
+
+using namespace std;
+
+int main()
+{
+int offset_curexception = (int)offsetof(struct _tiddata, _curexception);
+int offset_tpxcptinfoptrs = (int)offsetof(struct _tiddata, 
_tpxcptinfoptrs);
+
+cout  Computing uno exception offset on platform:  
+#if defined (_M_X64)
+X86-64
+#elif defined (_M_IX86)
+intel
+#else
+error: unknown prltform
+#endif
+ endl;
+cout  offsetof(struct _tiddata,_curexception) is: 0x  std::hex
+ offset_curexception  endl;
+cout  offsetof(struct _tiddata,_tpxcptinfoptrs) is: 0x  std::hex
+  offset_tpxcptinfoptrs  endl;
+cout  offsetof(_curexception) - offsetof(_tpxcptinfoptrs): 0x  
std::hex
+ offset_curexception - offset_tpxcptinfoptrs  endl;
+
+cout  Enter any key to continue...;
+cin.get();
+return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uno/uno_exception_offset/uno_exception_offset.sln 
b/uno/uno_exception_offset/uno_exception_offset.sln
new file mode 100755
index 000..66eb528
--- /dev/null
+++ b/uno/uno_exception_offset/uno_exception_offset.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30501.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = uno_exception_offset, 
uno_exception_offset.vcxproj, {E7D4FBFD-732A-4FD7-99F4-053893A64E16}
+EndProject
+Global
+   GlobalSection(SolutionConfigurationPlatforms) = preSolution
+   Debug|Win32 = Debug|Win32
+   Debug|x64 = Debug|x64
+   Release|Win32 = Release|Win32
+   Release|x64 = Release|x64
+   EndGlobalSection
+   GlobalSection(ProjectConfigurationPlatforms) = postSolution
+   {E7D4FBFD-732A-4FD7-99F4-053893A64E16}.Debug|Win32.ActiveCfg = 
Debug|Win32
+   {E7D4FBFD-732A-4FD7-99F4-053893A64E16}.Debug|Win32.Build.0 = 
Debug|Win32
+   {E7D4FBFD-732A-4FD7-99F4-053893A64E16}.Debug|x64.ActiveCfg = 
Debug|x64
+   {E7D4FBFD-732A-4FD7-99F4-053893A64E16}.Debug|x64.Build.0 = 
Debug|x64
+   {E7D4FBFD-732A-4FD7-99F4-053893A64E16}.Release|Win32.ActiveCfg 
= Release|Win32
+   {E7D4FBFD-732A-4FD7-99F4-053893A64E16}.Release|Win32.Build.0 = 
Release|Win32
+   {E7D4FBFD-732A-4FD7-99F4-053893A64E16}.Release|x64.ActiveCfg = 
Release|x64
+   {E7D4FBFD-732A-4FD7-99F4-053893A64E16}.Release|x64.Build.0 = 
Release|x64
+   EndGlobalSection
+   GlobalSection(SolutionProperties) = preSolution
+   HideSolutionNode = FALSE
+   EndGlobalSection
+EndGlobal
diff --git a/uno/uno_exception_offset/uno_exception_offset.vcxproj 
b/uno/uno_exception_offset/uno_exception_offset.vcxproj
new file mode 100755
index 000..350eba8
--- /dev/null
+++ b/uno/uno_exception_offset/uno_exception_offset.vcxproj
@@ -0,0 +1,92 @@
+?xml version=1.0 encoding=utf-8?
+Project DefaultTargets=Build ToolsVersion=12.0 
xmlns=http://schemas.microsoft.com/developer/msbuild/2003;
+  ItemGroup Label=ProjectConfigurations
+ProjectConfiguration Include=Debug|Win32
+  ConfigurationDebug/Configuration
+  PlatformWin32/Platform
+/ProjectConfiguration
+ProjectConfiguration Include=Debug|x64
+  ConfigurationDebug/Configuration
+  Platformx64/Platform
+/ProjectConfiguration
+ProjectConfiguration Include=Release|Win32
+  ConfigurationRelease/Configuration
+  PlatformWin32/Platform
+/ProjectConfiguration
+ProjectConfiguration Include=Release|x64
+

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=75025

--- Comment #88 from deligeo deli...@physics.uoc.gr ---
Migrating from 4.2 which reached EOL:
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=42346
Cross reference handling broken when exporting to doc / docx
Same bug still exists in 4.3 (
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=84637)

-- 
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 75025] LibreOffice 4.3 most annoying bugs

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=75025

deligeo deli...@physics.uoc.gr changed:

   What|Removed |Added

 Depends on||42346

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|75209   |

-- 
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 75025] LibreOffice 4.3 most annoying bugs

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=75025

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||75209

-- 
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: odk/config odk/docs odk/Package_config.mk odk/util

2014-12-02 Thread Stephan Bergmann 
 odk/Package_config.mk |1 
 odk/config/setsdkenv_windows.template |  214 --
 odk/docs/install.html |5 
 odk/util/check.pl |4 
 4 files changed, 224 deletions(-)

New commits:
commit d30caae7e76c580f30cdcc06516cb647c13a19c2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 09:55:33 2014 +0100

Remove obsolete setsdkenv_windows.template

Change-Id: I3a79830c5538e12fc6370ae30168266c0f1c533e

diff --git a/odk/Package_config.mk b/odk/Package_config.mk
index e9c495e..f378621 100644
--- a/odk/Package_config.mk
+++ b/odk/Package_config.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_Package_set_outdir,odk_config,$(INSTDIR)))
 ifeq ($(OS),WNT)
 $(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\
odk/config/cfgWin.js \
-   odk/config/setsdkenv_windows.template \
odk/config/setsdkname.bat \
 ))
 else
diff --git a/odk/config/setsdkenv_windows.template 
b/odk/config/setsdkenv_windows.template
deleted file mode 100644
index b7e5c04..000
--- a/odk/config/setsdkenv_windows.template
+++ /dev/null
@@ -1,214 +0,0 @@
-rem
-rem This file is part of the LibreOffice project.
-rem
-rem This Source Code Form is subject to the terms of the Mozilla Public
-rem License, v. 2.0. If a copy of the MPL was not distributed with this
-rem file, You can obtain one at http://mozilla.org/MPL/2.0/.
-rem
-rem This file incorporates work covered by the following license notice:
-rem
-rem   Licensed to the Apache Software Foundation (ASF) under one or more
-rem   contributor license agreements. See the NOTICE file distributed
-rem   with this work for additional information regarding copyright
-rem   ownership. The ASF licenses this file to you under the Apache
-rem   License, Version 2.0 (the License); you may not use this file
-rem   except in compliance with the License. You may obtain a copy of
-rem   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-rem
-
-@echo off
-REM This script sets all environment variables, which
-REM are necessary for building the examples of the Office Development Kit.
-REM The Script was developed for the operating systems Windows.
-REM The SDK name
-REM Example: set OO_SDK_NAME=libreoffice3.4_sdk
-set OO_SDK_NAME=libreoffice3.4_sdk
-
-REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\sdk
-set OO_SDK_HOME=
-
-REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3
-set OFFICE_HOME=
-
-REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\LibreOffice 3\URE
-set OO_SDK_URE_HOME=
-
-REM Directory of the make command.
-REM Example: set OO_SDK_MAKE_HOME=D:\NextGenerationMake\make
-set OO_SDK_MAKE_HOME=
-
-REM Directory of the zip tool.
-REM Example: set OO_SDK_ZIP_HOME=D:\infozip\bin
-set OO_SDK_ZIP_HOME=
-
-REM Directory of the cat tool.
-REM Example: set OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin\
-set OO_SDK_CAT_HOME=
-
-REM Directory of the sed tool.
-REM Example: set OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin\
-set OO_SDK_SED_HOME=
-
-REM Directory of the C++ compiler.
-REM Example:set OO_SDK_CPP_HOME=C:\Program Files\Microsoft Visual Studio 
9.0\VC\bin
-REM Example:set CPP_WINDOWS_SDK=C:\Program Files\\Microsoft SDKs\Windows\v6.0A\
-set OO_SDK_CPP_HOME=
-set CPP_VC8=
-set CPP_WINDOWS_SDK=
-
-REM Directory of the C# and VB.NET compilers.
-REM Example:set OO_SDK_CLI_HOME=C:\WINXP\Microsoft.NET\Framework\v1.0.3705
-set OO_SDK_CLI_HOME=
-
-REM Java SDK installation directory.
-REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
-set OO_SDK_JAVA_HOME=
-
-REM Special output directory
-REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\sdk
-set OO_SDK_OUT=
-
-REM Automatic deployment
-REM Example: set SDK_AUTO_DEPLOYMENT=YES
-set SDK_AUTO_DEPLOYMENT=YES
-
-REM Check installation path for the StarOffice Development Kit.
-if not defined OO_SDK_HOME (
-   echo Error: the variable OO_SDK_HOME is missing!
-   goto :error
- )
-
-REM Check installation path for the office.
-REM if not defined OFFICE_HOME (
-REM if not defined OO_SDK_URE_HOME (
-REMecho Error: either of the variables OFFICE_HOME and
-REMecho OO_SDK_URE_HOME is missing!
-REMgoto :error
-REM  )
-REM  )
-
-REM Check installation path for GNU make.
-if not defined OO_SDK_MAKE_HOME (
-   echo Error: the variable OO_SDK_MAKE_HOME is missing!
-   goto :error
- )
-
-REM Check installation path for the zip tool.
-if not defined OO_SDK_ZIP_HOME (
-   echo Error: the variable OO_SDK_ZIP_HOME is missing!
-   goto :error
- )
-
-REM Check installation path for the cat tool.
-if not defined OO_SDK_CAT_HOME (
-   echo Error: the variable OO_SDK_CAT_HOME is missing!
-   goto :error
- )
-
-REM Check installation path for the sed tool.
-if not defined OO_SDK_SED_HOME (
-   echo Error: the variable OO_SDK_SED_HOME is missing!
-   goto :error
- )
-
-REM

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

2014-12-02 Thread Maxim Monastirsky 
 sw/uiconfig/swriter/toolbar/textobjectbar.xml |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 503379fa0b06b66ab6f2bbedc73cdcb056545330
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Tue Dec 2 00:20:29 2014 +0200

fdo#81475 Writer doesn't have ParaspaceIncrease/Decrease commands

Change-Id: I963b57728e25daf77c78cc046afaade092422e41

diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 77bc1ef..7f4f048 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -53,9 +53,6 @@
  toolbar:toolbaritem xlink:href=.uno:SpacePara15 toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SpacePara2 toolbar:visible=false/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:ParaspaceIncrease 
toolbar:helpid=27346 toolbar:visible=false/
- toolbar:toolbaritem xlink:href=.uno:ParaspaceDecrease 
toolbar:helpid=27347 toolbar:visible=false/
- toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:DefaultBullet/
  toolbar:toolbaritem xlink:href=.uno:DefaultNumbering/
  toolbar:toolbaritem xlink:href=.uno:IncrementIndent/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread David Ostrovsky 
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 684facf115df0f06bc3cf405b4429f97b0891370
Author: David Ostrovsky da...@ostrovsky.org
Date:   Sun Nov 30 12:35:37 2014 +0100

MSVC 2013: Compute uno bridge exception offset for X64

Change-Id: I34b308db422d861098fdf93cff8fea63128ba47a
Reviewed-on: https://gerrit.libreoffice.org/13211
Tested-by: David Ostrovsky da...@ostrovsky.org
Reviewed-by: Stephan Bergmann sberg...@redhat.com

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index a1c27c6..b6727ea 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -722,7 +722,9 @@ int mscx_filterCppException(
 // MSVS9/crt/src/mtdll.h:
 // offsetof (_tiddata, _curexception) -
 // offsetof (_tiddata, _tpxcptinfoptrs):
-#if _MSC_VER  1600
+#if _MSC_VER = 1800 // VC 2013
+//
+// See dev-tools/uno/uno_exception_offset
 0x48 // msvcr90.dll
 #else
 error, please find value for this compiler version
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Stephan Bergmann 
 include/vcl/opengl/OpenGLContext.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3b0db84516503ce72b803bf04b0432b36c1ac70c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 10:14:03 2014 +0100

-Werror,-Wunused-private-field

Change-Id: Id34e28a76cd686496e7d5e65fff89d7a8d3d2d08

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index 6d99488..7ddcdf3 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -236,7 +236,6 @@ private:
 bool mbPixmap; // is a pixmap instead of a window
 #endif
 
-int mnFramebufferCount;
 OpenGLFramebuffer* mpCurrentFramebuffer;
 OpenGLFramebuffer* mpFirstFramebuffer;
 OpenGLFramebuffer* mpLastFramebuffer;
___
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' - sw/uiconfig

2014-12-02 Thread Maxim Monastirsky 
 sw/uiconfig/swriter/toolbar/textobjectbar.xml |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit a3363248d97d74f077579a4a9b8891b7fe0e2c9c
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Tue Dec 2 00:20:29 2014 +0200

fdo#81475 Writer doesn't have ParaspaceIncrease/Decrease commands

Change-Id: I963b57728e25daf77c78cc046afaade092422e41
(cherry picked from commit 503379fa0b06b66ab6f2bbedc73cdcb056545330)

diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 77bc1ef..7f4f048 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -53,9 +53,6 @@
  toolbar:toolbaritem xlink:href=.uno:SpacePara15 toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SpacePara2 toolbar:visible=false/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:ParaspaceIncrease 
toolbar:helpid=27346 toolbar:visible=false/
- toolbar:toolbaritem xlink:href=.uno:ParaspaceDecrease 
toolbar:helpid=27347 toolbar:visible=false/
- toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:DefaultBullet/
  toolbar:toolbaritem xlink:href=.uno:DefaultNumbering/
  toolbar:toolbaritem xlink:href=.uno:IncrementIndent/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk

2014-12-02 Thread Matúš Kukan 
 Library_merged.mk |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit bb6774a2bd894cbd1a4fb2c936de342b41c92909
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Tue Dec 2 10:29:26 2014 +0100

fix typo and libmerged build

Change-Id: I76541a960d3b81d1bc44efa323c6f1349a4cb858

diff --git a/Library_merged.mk b/Library_merged.mk
index d3c5e75..90f30a1 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,19 +30,10 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_use_static_libraries,gengal,\
-   glxtest \
-   $(if $(filter unx,$(GUIBASE)),headless) \
-))
-endif
-
-ifneq ($(OS),LINUX)
 $(eval $(call gb_Library_use_static_libraries,merged,\
+   $(if $(filter LINUX,$(OS)),glxtest) \
$(if $(filter unx,$(GUIBASE)),headless) \
 ))
-endif
-
 
 $(eval $(call gb_Library_use_externals,merged,\
icu_headers \
___
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' - editeng/qa editeng/source

2014-12-02 Thread Michael Stahl 
 editeng/qa/unit/core-test.cxx  |   39 +
 editeng/source/editeng/editobj.cxx |   15 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

New commits:
commit d8ae4e4a74cfd3b7e997c2132fdc41a812be8069
Author: Michael Stahl mst...@redhat.com
Date:   Mon Dec 1 19:25:13 2014 +0100

fdo#85496: editeng: avoid exporting duplicate attributes

Since commit 0d57434180db6c8eda8c5b9b704f8a1c18b371df multiple 0-length
attributes will be exported by the ODF filter as duplicate attributes.

(cherry picked from commit 7a242b463132d67a4a2d6e69319e0da367145cc0)
(cherry picked from commit 846b56b6b99e334dfa44f1a24640aa3158509854)

This backport takes a different approach from the master fix and simply
detects duplicates in EditTextObjectImpl::GetAllSections() which should
be safe enough for 4.2.8.2.

Change-Id: Iff787c8d2a71bc3082192cc98e3d916badee65dd

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 4e3da9b..3d5bd81 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -573,6 +573,45 @@ void Test::testSectionAttributes()
 CPPUNIT_ASSERT_EQUAL(static_castsize_t(0), pSecAttr-mnEnd);
 CPPUNIT_ASSERT_MESSAGE(Attribute array should be empty., 
pSecAttr-maAttributes.empty());
 }
+
+
+{
+aEngine.Clear();
+aEngine.SetText(one\ntwo);
+CPPUNIT_ASSERT_EQUAL(2, aEngine.GetParagraphCount());
+
+// embolden 2nd paragraph
+pSet.reset(new SfxItemSet(aEngine.GetEmptyItemSet()));
+pSet-Put(aBold);
+aEngine.QuickSetAttribs(*pSet, ESelection(1,0,1,3));
+// disboldify 1st paragraph
+SvxWeightItem aNotSoBold(WEIGHT_NORMAL, EE_CHAR_WEIGHT);
+pSet-Put(aNotSoBold);
+aEngine.QuickSetAttribs(*pSet, ESelection(0,0,0,3));
+
+// now delete  join the paragraphs - this is fdo#85496 scenario
+aEngine.QuickDelete(ESelection(0,0,1,3));
+CPPUNIT_ASSERT_EQUAL(1, aEngine.GetParagraphCount());
+
+boost::scoped_ptrEditTextObject 
pEditText(aEngine.CreateTextObject());
+CPPUNIT_ASSERT_MESSAGE(Failed to create text object., 
pEditText.get());
+std::vectorediteng::Section aAttrs;
+pEditText-GetAllSections(aAttrs);
+
+CPPUNIT_ASSERT_EQUAL(static_castsize_t(1), aAttrs.size());
+
+const editeng::Section* pSecAttr = aAttrs[0];
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnParagraph);
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnStart);
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnEnd);
+std::setsal_uInt16 whiches;
+for (size_t i = 0; i  pSecAttr-maAttributes.size(); ++i)
+{
+sal_uInt16 const nWhich(pSecAttr-maAttributes[i]-Which());
+CPPUNIT_ASSERT_MESSAGE(duplicate item in text portion attributes,
+whiches.insert(nWhich).second);
+}
+}
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index e85448e..691256e 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1014,7 +1014,20 @@ void EditTextObjectImpl::GetAllSections( 
std::vectorediteng::Section rAttrs )
 for (; itCurAttr != aAttrs.end()  itCurAttr-mnParagraph == 
nPara  itCurAttr-mnEnd = nEnd; ++itCurAttr)
 {
 editeng::Section rSecAttr = *itCurAttr;
-rSecAttr.maAttributes.push_back(pItem);
+bool bInsert(true);
+for (size_t j = 0; j  rSecAttr.maAttributes.size(); ++j)
+{
+if (rSecAttr.maAttributes[j]-Which() == pItem-Which())
+{
+SAL_WARN(editeng, GetAllSections(): duplicate 
attribute suppressed);
+bInsert = false;
+break;
+}
+}
+if (bInsert)
+{
+rSecAttr.maAttributes.push_back(pItem);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Takeshi Abe 
 sw/qa/extras/globalfilter/globalfilter.cxx |2 ++
 sw/qa/extras/htmlimport/htmlimport.cxx |1 +
 sw/qa/extras/inc/bordertest.hxx|2 ++
 sw/qa/extras/mailmerge/mailmerge.cxx   |1 +
 sw/qa/extras/odfimport/odfimport.cxx   |1 +
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |1 +
 sw/qa/extras/rtfexport/rtfexport.cxx   |1 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |1 +
 sw/qa/extras/uiwriter/uiwriter.cxx |1 +
 sw/qa/extras/ww8export/ww8export.cxx   |1 +
 sw/qa/extras/ww8import/ww8import.cxx   |1 +
 11 files changed, 13 insertions(+)

New commits:
commit cbbe0e5051fc36edc14347e27af71dc15e27a1df
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Tue Dec 2 18:27:48 2014 +0900

add mode lines

Change-Id: Id7825ecd076a5d8cbe926a26bc74fc7d0da1d621

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index a08c916..38fdb88 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -117,3 +117,5 @@ void Test::testSwappedOutImageExport()
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 1b1459f..5ac63de 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx
index 07ad11c..dfd41ad 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/extras/inc/bordertest.hxx
@@ -197,3 +197,5 @@ public:
 
 };
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index c4ca5b5..94d084b 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 2b24dc5..df84332 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0c095e3..a9f0d24 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 221618d..2925605 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 0e916d3..e0b5100 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 5cb5764..8496e30 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index f55967e..8a4596a 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 5f4e0bc..b40ef14 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Stephan Bergmann 
 vcl/opengl/win/WinDeviceInfo.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5f7261651647e0d3de70c8cab99ef9b5a26de557
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 10:37:16 2014 +0100

Missing include

Change-Id: I6f05d7a507e7d1cf6a9b6ebb0315baac3258f1b0

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 3b3902c..a3d4d67 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -11,6 +11,7 @@
 
 #include windows.h
 #include setupapi.h
+#include algorithm
 #include cstdint
 #include rtl/ustrbuf.hxx
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Stephan Bergmann 
 vcl/win/source/gdi/salvd.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 98ee936a114bdd78c304aac824508cd4fd9ce59a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 10:46:19 2014 +0100

Blind Windows build fix attempt

Change-Id: If0090978882c9333ad9c66af4df698914d3127ab

diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 07d9ce8..2b00464 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -218,7 +218,7 @@ bool WinSalVirtualDevice::SetSize( long nDX, long nDY )
 if (mpGraphics)
 {
 WinOpenGLSalGraphicsImpl *pImpl;
-pImpl = dynamic_cast WinOpenGLSalGraphicsImpl * 
(mpGraphics-getImpl());
+pImpl = dynamic_cast WinOpenGLSalGraphicsImpl * 
(mpGraphics-GetImpl());
 if (pImpl)
 pImpl-Init();
 }
___
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' - sc/source xmloff/source xmlscript/source

2014-12-02 Thread Michael Stahl 
 sc/source/filter/excel/xiescher.cxx|3 ++-
 xmloff/source/forms/elementexport.cxx  |4 
 xmloff/source/forms/layerimport.cxx|6 --
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |1 -
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |8 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit e252913157146928f64d8594f8f142dd5966126c
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 18 18:08:37 2014 +0200

ODF export: don't write invalid group-name attribute

Radio buttons are grouped via their form:name attribute already.

Change-Id: I9f8b27a2904d947c3d4665495d36961e3e41d2c6

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 29897285..55df51e 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2287,7 +2287,8 @@ void XclImpOptionButtonObj::DoProcessControl( 
ScfPropertySet rPropSet ) const
 ScfPropertySet aProps( xCtrlModel );
 OUString sGroupName = OUString::number( 
pLeader-GetDffShapeId() );
 
-aProps.SetStringProperty( GroupName, sGroupName );
+// for radio buttons, Name is the group name
+aProps.SetStringProperty( Name, sGroupName );
 aProps.SetStringProperty( RefValue, OUString::number( 
nRefVal++ ) );
 if ( pLeader-HasCellLink()  !pTbxObj-HasCellLink() )
 {
diff --git a/xmloff/source/forms/elementexport.cxx 
b/xmloff/source/forms/elementexport.cxx
index 6a94b34..228e1d22 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1158,11 +1158,9 @@ namespace xmloff
 {
 static const sal_Int32 nStringPropertyAttributeIds[] =
 {   // attribute flags
-SCA_GROUP_NAME
 };
 static const OUString pStringPropertyNames[] =
 {   // property names
-OUString(PROPERTY_GROUP_NAME)
 };
 
 static const sal_Int32 nIdCount = sizeof( 
nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
@@ -1658,8 +1656,6 @@ namespace xmloff
 }
 if ( m_xPropertyInfo-hasPropertyByName( 
PROPERTY_IMAGE_POSITION ) )
 m_nIncludeSpecial |= SCA_IMAGE_POSITION;
-if ( m_xPropertyInfo-hasPropertyByName( PROPERTY_GROUP_NAME ) 
)
-m_nIncludeSpecial |= SCA_GROUP_NAME;
 m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
 m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
 break;
diff --git a/xmloff/source/forms/layerimport.cxx 
b/xmloff/source/forms/layerimport.cxx
index fa1ff91..ce6c4e2 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -76,9 +76,11 @@ 
OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport _rImporter)
 // string properties which are exported as attributes
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), 
PROPERTY_NAME);
+// map invalid group-name attribute to name
+// (since radio buttons are grouped by name)
+m_aAttributeMetaData.addStringProperty(
+OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_NAME);
 m_aAttributeMetaData.addStringProperty(
-OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_GROUP_NAME);
-m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), 
PROPERTY_IMAGEURL);
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), 
PROPERTY_LABEL);
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index e20fc17..531217d 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -424,7 +424,6 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * 
all_styles  )
 readImageURLAttr( ImageURL, XMLNS_DIALOGS_PREFIX :image-src );
 readImagePositionAttr( ImagePosition, XMLNS_DIALOGS_PREFIX 
:image-position );
 readBoolAttr( MultiLine, XMLNS_DIALOGS_PREFIX :multiline );
-readStringAttr( GroupName, XMLNS_DIALOGS_PREFIX :group-name );
 
 sal_Int16 nState = 0;
 if (readProp( State ) = nState)
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 214b17e..a6a1a87 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1174,7 +1174,9 @@ void TitledBoxElement::endElement()
 ctx.importImageURLProperty( ImageURL ,  image-src , _xAttributes );

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

2014-12-02 Thread Michael Stahl 
 sc/source/filter/excel/xiescher.cxx|3 ++-
 xmloff/source/forms/elementexport.cxx  |4 
 xmloff/source/forms/layerimport.cxx|6 --
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |1 -
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |8 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 53824b05f99ac7c68e6d48b53e2bd98c0fe274c7
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 18 18:08:37 2014 +0200

ODF export: don't write invalid group-name attribute

Radio buttons are grouped via their form:name attribute already.

Change-Id: I9f8b27a2904d947c3d4665495d36961e3e41d2c6

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index a739409..8d86040 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2321,7 +2321,8 @@ void XclImpOptionButtonObj::DoProcessControl( 
ScfPropertySet rPropSet ) const
 ScfPropertySet aProps( xCtrlModel );
 OUString sGroupName = OUString::number( 
pLeader-GetDffShapeId() );
 
-aProps.SetStringProperty( GroupName, sGroupName );
+// for radio buttons, Name is the group name
+aProps.SetStringProperty( Name, sGroupName );
 aProps.SetStringProperty( RefValue, OUString::number( 
nRefVal++ ) );
 if ( pLeader-HasCellLink()  !pTbxObj-HasCellLink() )
 {
diff --git a/xmloff/source/forms/elementexport.cxx 
b/xmloff/source/forms/elementexport.cxx
index 5d4e635..3118b19 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1158,11 +1158,9 @@ namespace xmloff
 {
 static const sal_Int32 nStringPropertyAttributeIds[] =
 {   // attribute flags
-SCA_GROUP_NAME
 };
 static const OUString pStringPropertyNames[] =
 {   // property names
-OUString(PROPERTY_GROUP_NAME)
 };
 
 static const sal_Int32 nIdCount = sizeof( 
nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
@@ -1658,8 +1656,6 @@ namespace xmloff
 }
 if ( m_xPropertyInfo-hasPropertyByName( 
PROPERTY_IMAGE_POSITION ) )
 m_nIncludeSpecial |= SCA_IMAGE_POSITION;
-if ( m_xPropertyInfo-hasPropertyByName( PROPERTY_GROUP_NAME ) 
)
-m_nIncludeSpecial |= SCA_GROUP_NAME;
 m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
 m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
 break;
diff --git a/xmloff/source/forms/layerimport.cxx 
b/xmloff/source/forms/layerimport.cxx
index adc7998..39c5b4c 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -78,9 +78,11 @@ 
OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport _rImporter)
 // string properties which are exported as attributes
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), 
PROPERTY_NAME);
+// map invalid group-name attribute to name
+// (since radio buttons are grouped by name)
+m_aAttributeMetaData.addStringProperty(
+OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_NAME);
 m_aAttributeMetaData.addStringProperty(
-OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_GROUP_NAME);
-m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), 
PROPERTY_IMAGEURL);
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), 
PROPERTY_LABEL);
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 00d575e..e71389b 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -427,7 +427,6 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * 
all_styles  )
 readImageURLAttr( ImageURL, XMLNS_DIALOGS_PREFIX :image-src );
 readImagePositionAttr( ImagePosition, XMLNS_DIALOGS_PREFIX 
:image-position );
 readBoolAttr( MultiLine, XMLNS_DIALOGS_PREFIX :multiline );
-readStringAttr( GroupName, XMLNS_DIALOGS_PREFIX :group-name );
 
 sal_Int16 nState = 0;
 if (readProp( State ) = nState)
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 47ee825a..3963e59 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1177,7 +1177,9 @@ void TitledBoxElement::endElement()
 ctx.importImageURLProperty( ImageURL ,  image-src , _xAttributes );

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - include/xmloff xmloff/source

2014-12-02 Thread Markus Mohrhard 
 include/xmloff/xmlnumfe.hxx  |3 ++-
 xmloff/source/style/xmlnumfe.cxx |8 
 xmloff/source/style/xmlnumfi.cxx |1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit f810aa9d9945b52831378b4a7cd148853d2f2bb2
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sat Aug 16 07:14:28 2014 +0200

prevent invalid ods files with loext:fill-character

ODF specifies that extension elements in a document are removed before
the validation. With our old implementation of the number format export
this could result in two number:text elements following each other.

According to the spec a number:text element may not follow another
number:text element.

The number:text element before loext:fill is actually not that
interesting so it makes more sense to make this one an extension
element.

Possible documents showing issues:

fdo45268-1.xlsx
fdo49150-1.xlsx
and many more

Change-Id: I3ad92b8a61a246b3dbc0132d9a2c367488a766d0

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 86f4351..cfcfaa3 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -26,6 +26,7 @@
 #include com/sun/star/util/XNumberFormatsSupplier.hpp
 #include com/sun/star/uno/Sequence.h
 #include rtl/ustrbuf.hxx
+#include boost/ptr_container/ptr_vector.hpp
 
 #define XML_WRITTENNUMBERSTYLES WrittenNumberStyles
 
@@ -57,7 +58,7 @@ private:
 SAL_DLLPRIVATE void AddLanguageAttr_Impl( sal_Int32 nLang );
 
 SAL_DLLPRIVATE void AddToTextElement_Impl( const OUString rString );
-SAL_DLLPRIVATE void FinishTextElement_Impl();
+SAL_DLLPRIVATE void FinishTextElement_Impl(bool bUseExtensionNS = false);
 
 SAL_DLLPRIVATE void WriteColorElement_Impl( const Color rColor );
 SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nInteger,
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 0cfb0cd..a5262f0 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -46,7 +46,6 @@
 #include xmloff/xmlexp.hxx
 
 #include set
-#include boost/ptr_container/ptr_vector.hpp
 
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
@@ -338,11 +337,12 @@ void SvXMLNumFmtExport::AddToTextElement_Impl( const 
OUString rString )
 sTextContent.append( rString );
 }
 
-void SvXMLNumFmtExport::FinishTextElement_Impl()
+void SvXMLNumFmtExport::FinishTextElement_Impl(bool bUseExtensionNS)
 {
 if ( !sTextContent.isEmpty() )
 {
-SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT,
+sal_uInt16 nNS = bUseExtensionNS ? XML_NAMESPACE_LO_EXT : 
XML_NAMESPACE_NUMBER;
+SvXMLElementExport aElem( rExport, nNS, XML_TEXT,
   true, false );
 rExport.Characters( sTextContent.makeStringAndClear() );
 }
@@ -502,7 +502,7 @@ void SvXMLNumFmtExport::WriteMinutesElement_Impl( bool 
bLong )
 
 void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar )
 {
-FinishTextElement_Impl();
+FinishTextElement_Impl(true);
 SvXMLElementExport aElem( rExport, XML_NAMESPACE_LO_EXT, 
XML_FILL_CHARACTER,
   true, false );
 rExport.Characters( OUString( nChar ) );
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 676cd822..35778d4 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -494,6 +494,7 @@ const SvXMLTokenMap SvXMLNumImpData::GetStyleElemTokenMap()
 static const SvXMLTokenMapEntry aStyleElemMap[] =
 {
 //  elements in a style
+{ XML_NAMESPACE_LO_EXT, XML_TEXT,   XML_TOK_STYLE_TEXT 
 },
 { XML_NAMESPACE_NUMBER, XML_TEXT,   XML_TOK_STYLE_TEXT 
 },
 { XML_NAMESPACE_LO_EXT, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
 { XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
___
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' - 8 commits - canvas/opengl canvas/Package_opengl.mk canvas/source include/vcl

2014-12-02 Thread Michael Jaumann 
 canvas/Package_opengl.mk|1 
 canvas/opengl/transformationFragmentShader.glsl |   24 
 canvas/source/opengl/ogl_canvashelper.cxx   |   42 +++---
 canvas/source/opengl/ogl_canvastools.cxx|   64 --
 canvas/source/opengl/ogl_canvastools.hxx|2 
 canvas/source/opengl/ogl_renderHelper.cxx   |   68 +++-
 canvas/source/opengl/ogl_renderHelper.hxx   |   10 +++
 canvas/source/opengl/ogl_spritedevicehelper.cxx |   26 ++---
 include/vcl/opengl/OpenGLContext.hxx|3 +
 9 files changed, 170 insertions(+), 70 deletions(-)

New commits:
commit d81798535aba8c3f4686cb89eb2238d1df322c35
Author: Michael Jaumann meta_...@yahoo.com
Date:   Tue Dec 2 10:06:36 2014 +

texture transformation shader

New texture transformation shader.
Renderhelper uses it.
Draw texturedPolygon with it.

Change-Id: I285bf9cce0f216fd382a933d53b786238005f74f

diff --git a/canvas/Package_opengl.mk b/canvas/Package_opengl.mk
index 13c6cb3..7948fda 100644
--- a/canvas/Package_opengl.mk
+++ b/canvas/Package_opengl.mk
@@ -22,6 +22,7 @@ $(eval $(call 
gb_Package_add_files,canvas_opengl_shader,$(LIBO_ETC_FOLDER)/openg
 textFragmentShader.glsl \
 textManipulatingVertexShader.glsl \
 texVertexShader.glsl \
+   transformationFragmentShader.glsl \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/canvas/opengl/transformationFragmentShader.glsl 
b/canvas/opengl/transformationFragmentShader.glsl
new file mode 100644
index 000..1a72b10
--- /dev/null
+++ b/canvas/opengl/transformationFragmentShader.glsl
@@ -0,0 +1,24 @@
+/* -*- 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/.
+ */
+
+#version 120
+
+uniform sampler2D TextTex; 
+uniform vec4 colorTex;
+uniform mat4 texTrans;
+//Texture Coordinates
+varying vec2 textCoords;
+
+void main()
+{
+   vec2 texCoord = (texTrans * vec4(textCoords, 0, 1)).xy;
+gl_FragColor = texture2D( TextTex, texCoord )*colorTex;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx 
b/canvas/source/opengl/ogl_canvashelper.cxx
index 5c9e916..34d1342 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -35,6 +35,7 @@
 #include ogl_tools.hxx
 
 #include GL/glew.h
+#include glm/gtc/type_ptr.hpp
 
 #include boost/scoped_array.hpp
 
@@ -336,14 +337,11 @@ namespace oglcanvas
 RenderHelper* pRenderHelper = 
rHelper.getDeviceHelper()-getRenderHelper();
 pRenderHelper-SetModelAndMVP(setupState(rTransform, eSrcBlend, 
eDstBlend));
 
-glm::vec4 color  = glm::vec4( (float) rendering::ARGBColor().Red,
-(float) rendering::ARGBColor().Green,
-(float) rendering::ARGBColor().Blue,
-(float) rendering::ARGBColor().Alpha);
-
+//blend against fixed color
+glm::vec4 color  = glm::vec4(1,1,1,1);
 const unsigned int 
nTexId=rHelper.getDeviceHelper()-getTextureCache().getTexture(
 rPixelSize, rPixelData.getConstArray(), nPixelCrc32);
-
+glActiveTexture(GL_TEXTURE0);
 glBindTexture(GL_TEXTURE_2D, nTexId);
 glEnable(GL_TEXTURE_2D);
 glTexParameteri(GL_TEXTURE_2D,
@@ -364,24 +362,24 @@ namespace oglcanvas
 ::basegfx::B2DRange aBounds;
 ::basegfx::B2DPolyPolygonVector::const_iterator 
aCurr=rPolyPolygons.begin();
 const ::basegfx::B2DPolyPolygonVector::const_iterator 
aEnd=rPolyPolygons.end();
- /*   while( aCurr != aEnd )
+while( aCurr != aEnd )
 aBounds.expand(::basegfx::tools::getRange(*aCurr++));
 aTextureTransform.translate(-aBounds.getMinX(), 
-aBounds.getMinY());
 aTextureTransform.scale(1/aBounds.getWidth(), 
1/aBounds.getHeight());
 aTextureTransform.invert();
 
-double aTexTransform[] =
+float aTexTransform[] =
 {
-aTextureTransform.get(0,0), aTextureTransform.get(1,0), 0, 
0,
-aTextureTransform.get(0,1), aTextureTransform.get(1,1), 0, 
0,
+(float) aTextureTransform.get(0,0), (float) 
aTextureTransform.get(1,0), 0, 0,
+(float) aTextureTransform.get(0,1), (float) 
aTextureTransform.get(1,1), 0, 0,
 0,  0,  1, 
0,
-aTextureTransform.get(0,2), aTextureTransform.get(1,2), 0, 
1
-};*/
+

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

2014-12-02 Thread Bjoern Michaelsen 
 sw/inc/edimp.hxx  |2 
 sw/inc/ring.hxx   |   70 ++
 sw/qa/core/uwriter.cxx|   20 ++---
 sw/source/core/crsr/viscrs.cxx|6 +-
 sw/source/core/doc/doccorr.cxx|6 +-
 sw/source/core/frmedt/fecopy.cxx  |2 
 sw/source/uibase/docvw/SidebarWin.cxx |6 +-
 7 files changed, 87 insertions(+), 25 deletions(-)

New commits:
commit 2dd7cc5b925d0b4c62553eeba9f6524ce7b6217b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Dec 2 11:14:24 2014 +0100

simplify

Change-Id: I8cd66f270526880f6ad7fb083aaa65c87079dfc1

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 8fd104c..55a9390 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1317,7 +1317,7 @@ void SwDocTest::testIntrusiveRing()
 CPPUNIT_ASSERT_EQUAL((*ppRing)-GetNext(), *ppNext);
 CPPUNIT_ASSERT_EQUAL((*ppNext)-GetPrev(), *ppRing);
 }
-BOOST_FOREACH(TestRing r, std::make_pair(aRing1.beginRing(), 
aRing1.endRing()))
+BOOST_FOREACH(TestRing r, aRing1.rangeRing())
 {
 TestRing* pRing = r;
 CPPUNIT_ASSERT(pRing);
commit 55a509616614cc4e50acbb9f257f7334db6667f9
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Dec 2 11:11:55 2014 +0100

test constness

Change-Id: I74523d0264f2fe78353c8f61d98295c65cd23ee1

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index f667542..8fd104c 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1323,6 +1323,12 @@ void SwDocTest::testIntrusiveRing()
 CPPUNIT_ASSERT(pRing);
 //pRing-debug();
 }
+const TestRing* pConstRing = aRing1;
+BOOST_FOREACH(const TestRing r, pConstRing-rangeRing()) // this should 
fail without r being const
+{
+const TestRing* pRing = r;
+CPPUNIT_ASSERT(pRing);
+}
 }
 
 void SwDocTest::setUp()
commit 2277558d01c168feec10c6340f919e7847ab2dbe
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Dec 2 11:04:15 2014 +0100

rename numberOf() to STL-like size()

Change-Id: I82332e91ed152e42b55ae921b3b61c5144253c39

diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index e587ad3..d58733f 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -124,7 +124,7 @@ namespace sw
 { return std::make_pair(beginRing(), endRing()); }
 
 /** @return the number of elements in the container */
-sal_uInt32 numberOf() const
+size_t size() const
 { return algo::count(static_cast const T* (this)); }
 };
 
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 45e0cf6..f667542 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1296,18 +1296,18 @@ void SwDocTest::testIntrusiveRing()
 vRings.push_back(aRing3);
 vRings.push_back(aRing4);
 vRings.push_back(aRing5);
-CPPUNIT_ASSERT_EQUAL(aRing1.numberOf(), static_castsal_uInt32(1));
+CPPUNIT_ASSERT_EQUAL(aRing1.size(), static_castsize_t(1));
 aRing2.MoveTo(aRing1);
 aRing3.MoveTo(aRing1);
-CPPUNIT_ASSERT_EQUAL(aRing1.numberOf(), static_castsal_uInt32(3));
-CPPUNIT_ASSERT_EQUAL(aRing2.numberOf(), static_castsal_uInt32(3));
-CPPUNIT_ASSERT_EQUAL(aRing3.numberOf(), static_castsal_uInt32(3));
+CPPUNIT_ASSERT_EQUAL(aRing1.size(), static_castsize_t(3));
+CPPUNIT_ASSERT_EQUAL(aRing2.size(), static_castsize_t(3));
+CPPUNIT_ASSERT_EQUAL(aRing3.size(), static_castsize_t(3));
 aRing5.MoveTo(aRing4);
-CPPUNIT_ASSERT_EQUAL(aRing4.numberOf(), static_castsal_uInt32(2));
+CPPUNIT_ASSERT_EQUAL(aRing4.size(), static_castsize_t(2));
 aRing4.MoveRingTo(aRing1);
 BOOST_FOREACH(TestRing* pRing, vRings)
 {
-CPPUNIT_ASSERT_EQUAL(pRing-numberOf(), static_castsal_uInt32(5));
+CPPUNIT_ASSERT_EQUAL(pRing-size(), static_castsize_t(5));
 }
 for(std::vectorTestRing*::iterator ppRing = vRings.begin(); ppRing != 
vRings.end(); ++ppRing)
 {
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index b305c19..8c1b5d1 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -369,10 +369,10 @@ void SwSelPaintRects::HighlightInputFld()
 pCrsrForInputTxtFld-GetMark()-nContent.Assign( pTxtNode, 
*(pCurTxtInputFldAtCrsr-End()) );
 
 pCrsrForInputTxtFld-FillRects();
-
-for (size_t a(0); a  pCrsrForInputTxtFld-size(); ++a)
+SwRects* pRects = static_castSwRects*(pCrsrForInputTxtFld.get());
+for (size_t a(0); a  pRects-size(); ++a)
 {
-const SwRect aNextRect((*pCrsrForInputTxtFld)[a]);
+const SwRect aNextRect((*pRects)[a]);
 const Rectangle aPntRect(aNextRect.SVRect());
 
 aInputFldRanges.push_back(basegfx::B2DRange(
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index

[Libreoffice-commits] mso-dumper.git: Makefile test/vsd-test.py

2014-12-02 Thread Miklos Vajna 
 Makefile |2 
 test/vsd-test.py |  141 +++
 2 files changed, 142 insertions(+), 1 deletion(-)

New commits:
commit cd32bf2b088b693d6fd98e792161cce8bd5f64e5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Dec 2 11:33:10 2014 +0100

VSD: add script that shows root directory timestamp

diff --git a/Makefile b/Makefile
index 47b42c9..ef91870 100644
--- a/Makefile
+++ b/Makefile
@@ -2,4 +2,4 @@ check:
cd test/doc  ./test.py
pep8 --ignore=E501 doc-dump.py 
msodumper/doc{dirstream,record,sprm,stream}.py test/doc/test.py
pep8 --ignore=E501 emf-dump.py msodumper/{emf,wmf}record.py
-   pep8 --ignore=E501 vsd-dump.py msodumper/vsdstream.py
+   pep8 --ignore=E501 vsd-dump.py msodumper/vsdstream.py test/vsd-test.py
diff --git a/test/vsd-test.py b/test/vsd-test.py
new file mode 100755
index 000..b08f141
--- /dev/null
+++ b/test/vsd-test.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python2
+#
+# 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/.
+#
+
+# Simple test to show the timestamp of the root node, which is ideally empty,
+# but e.g. https://bugs.freedesktop.org/show_bug.cgi?id=86729 bugdocs have it
+# set.
+
+import sys
+sys = reload(sys)
+sys.setdefaultencoding(utf-8)
+sys.path.append(sys.path[0] + /..)
+
+import msodumper.docdirstream
+import msodumper.globals
+import msodumper.vsdstream
+import time
+
+
+class OLEStream(msodumper.docdirstream.DOCDirStream):
+def __init__(self, bytes):
+msodumper.docdirstream.DOCDirStream.__init__(self, bytes)
+
+def dump(self):
+print 'stream type=OLE size=%d' % self.size
+header = Header(self)
+header.dump()
+
+# Seek to the Root Directory Entry
+sectorSize = 2 ** header.SectorShift
+self.pos = (header.FirstDirSectorLocation + 1) * sectorSize
+
+DirectoryEntryName = 
msodumper.globals.getUTF8FromUTF16(self.readBytes(64))
+print 'DirectoryEntryName value=%s/' % DirectoryEntryName
+DirectoryEntryNameLength = self.readuInt16()
+print 'DirectoryEntryNameLength value=%s/' % 
DirectoryEntryNameLength
+ObjectType = self.readuInt8()
+print 'ObjectType value=%s/' % ObjectType
+ColorFlag = self.readuInt8()
+print 'ColorFlag value=%s/' % ColorFlag
+LeftSiblingID = self.readuInt32()
+print 'LeftSiblingID value=0x%x/' % LeftSiblingID
+RightSiblingID = self.readuInt32()
+print 'RightSiblingID value=0x%x/' % RightSiblingID
+ChildID = self.readuInt32()
+print 'ChildID value=0x%x/' % ChildID
+msodumper.vsdstream.GUID(self, CLSID).dump()
+StateBits = self.readuInt32()
+print 'StateBits value=0x%x/' % StateBits
+FILETIME(self, CreationTime).dump()
+FILETIME(self, ModifiedTime).dump()
+print '/stream'
+
+
+class OLERecord(msodumper.docdirstream.DOCDirStream):
+def __init__(self, parent):
+msodumper.docdirstream.DOCDirStream.__init__(self, parent.bytes)
+self.parent = parent
+self.pos = parent.pos
+
+
+class Header(OLERecord):
+def __init__(self, parent):
+OLERecord.__init__(self, parent)
+
+def dump(self):
+print 'CFHeader'
+self.printAndSet(HeaderSignature, self.readuInt64())
+self.printAndSet(HeaderCLSID0, self.readuInt64())
+self.printAndSet(HeaderCLSID1, self.readuInt64())
+self.printAndSet(MinorVersion, self.readuInt16())
+self.printAndSet(MajorVersion, self.readuInt16())
+self.printAndSet(ByteOrder, self.readuInt16())
+self.printAndSet(SectorShift, self.readuInt16())
+self.printAndSet(MiniSectorShift, self.readuInt16())
+self.printAndSet(Reserved0, self.readuInt16())
+self.printAndSet(Reserved1, self.readuInt16())
+self.printAndSet(Reserved2, self.readuInt16())
+self.printAndSet(NumDirectorySectors, self.readuInt32())
+self.printAndSet(NumFATSectors, self.readuInt32())
+self.printAndSet(FirstDirSectorLocation, self.readuInt32())
+self.printAndSet(TransactionSignatureNumber, self.readuInt32())
+self.printAndSet(MiniStreamCutoffSize, self.readuInt32())
+self.printAndSet(FirstMiniFATSectorLocation, self.readuInt32())
+self.printAndSet(NumMiniFATSectors, self.readuInt32())
+self.printAndSet(FirstDIFATSectorLocation, self.readuInt32())
+self.printAndSet(NumDIFATSectors, self.readuInt32())
+print 'DIFAT'
+self.DIFAT = []
+for i in range(109):
+n = self.readuInt32()
+if n == 0x:
+break
+print 'DIFAT index=%d value=%x/' % (i, n)
+self.DIFAT.append(n)
+print '/DIFAT'
+print '/CFHeader'
+
+
+class

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

2014-12-02 Thread Yousuf Philips 
 sw/source/ui/app/mn.src |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b46f781440130e6a629bf9ae14a62310d2a31021
Author: Yousuf Philips philip...@hotmail.com
Date:   Tue Dec 2 05:33:23 2014 +0400

fdo#62947 add paste special to table and text box context menus

Change-Id: Ib60920d2628526a27d40445dad26fef6997899f7
Reviewed-on: https://gerrit.libreoffice.org/13262
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index a3b2f20..6e293a7 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -765,9 +765,10 @@ Menu MN_TAB_POPUPMENU
 {
 ItemList =
 {
-MN_RESET
+MENU_PASTE_SPECIAL
 _NUMBERING_RELATED_MENU
 SEPARATOR ;
+MN_RESET
 MN_TEXT_ATTR
 SEPARATOR ;
 MenuItem
@@ -1082,8 +1083,9 @@ Menu MN_DRWTXT_POPUPMENU
 {
 ItemList =
 {
-MN_RESET
+MENU_PASTE_SPECIAL
 SEPARATOR ;
+MN_RESET
 MN_TEXT_ATTR
 SEPARATOR ;
 ITEM_TRANSLITERATE_MENU
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Yousuf Philips 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |3 +++
 sw/uiconfig/swriter/menubar/menubar.xml |1 +
 2 files changed, 4 insertions(+)

New commits:
commit f8001effbdb9c0f09fe544b7bdbae9c15c82006f
Author: Yousuf Philips philip...@hotmail.com
Date:   Tue Dec 2 06:21:52 2014 +0400

fdo#86184 addition of .uno:Graphic to writer's view menu

Change-Id: I08e259173f3cb3f214e478f57e5c0a27e6baabb9
Reviewed-on: https://gerrit.libreoffice.org/13263
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index f4473f2..6a99e7a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2061,6 +2061,9 @@
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USImages On/Off/value
 /prop
+prop oor:name=ContextLabel oor:type=xs:string
+  value xml:lang=en-USImages/value
+/prop
 prop oor:name=Properties oor:type=xs:int
   value1/value
 /prop
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 6739a0b..1a5f2ec 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -147,6 +147,7 @@
   menu:menuitem menu:id=.uno:ControlCodes/
   menu:menuitem menu:id=.uno:ShowHiddenParagraphs/
   menu:menuitem menu:id=.uno:ShowAnnotations/
+  menu:menuitem menu:id=.uno:Graphic/
   menu:menuseparator/
   menu:menuitem menu:id=.uno:ViewDataSourceBrowser/
   menu:menuitem menu:id=.uno:Navigator/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/README.GDIMetaFile

2014-12-02 Thread Chris Sherlock 
 vcl/README.GDIMetaFile |  208 +
 1 file changed, 208 insertions(+)

New commits:
commit d1a47da4a0dcaab5edbb3e40e6ef48de1060ee85
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Tue Dec 2 21:35:03 2014 +1100

vcl: document GDIMetaFile class

Change-Id: I4947726957d95586615537eb6cbcf6ed0dcb5091

diff --git a/vcl/README.GDIMetaFile b/vcl/README.GDIMetaFile
new file mode 100644
index 000..f25ca9a
--- /dev/null
+++ b/vcl/README.GDIMetaFile
@@ -0,0 +1,208 @@
+GDIMetaFile class
+=
+
+The GDIMetaFile class reads, writes, manipulates and replays metafiles via the 
VCL module. 
+
+A typical usecase is to intialize a new GDIMetaFile, open the actual stored 
metafile and
+read it in via GDIMetaFile::Read( aIStream ). This reads in the metafile into 
the GDIMetafile
+object - it can read in an old-style VCLMTF metafile (back in the days that 
Microsoft didn't
+document the metafile format this was used), as well as EMF+ files - and adds 
them to a list
+(vector) of MetaActions. You can also populate your own GDIMetaFile via 
AddAction(),
+RemoveAction(), ReplaceAction(), etc. 
+
+Once the GDIMetafile object is read to be used, you can play the metafile, 
pause it, wind
+forward or rewind the metafile. The metafile can be moved, scaled, rotated and 
clipped, as
+well have the colours adjusted or replaced, or even made monochrome. 
+
+The GDIMetafile can be used to get an OutputDevice's metafile via the Linker() 
and Record()
+functions. 
+
+
+Using GDIMetafile
+-
+
+First, create a new GDIMetafile, this can be done via the default constructor. 
It can then
+be constructed manually, or you can use Record() on an OutputDevice to 
populate the
+GDIMetaFile, or of course you can read it from file with Read(). From here you 
can then
+elect to manipulate the metafile, or play it back to another GDIMetafile or to 
an
+OutputDevice via Play(). To store the file, use Write().
+
+CONSTRUCTORS AND DESTRUCTORS
+
+- GDIMetaFile
+- GDIMetaFile( cosnt GDIMetaFile rMtf ) - copy constructor
+- ~GDIMetaFile
+
+
+OPERATORS
+
+- operator =
+- operator ==
+- operator !=
+
+
+RECORDING AND PLAYBACK FUNCTIONS
+
+- Play(GDIMetaFile, size_t)   - play back metafile into another 
metafile up
+ to position
+- Play(OutputDevice*, size_t)  - play back metafile into 
OutputDevice up to
+ position
+- Play(OutputDevice*, Point, Size, size_t) - play back metafile into 
OutputDevice at a
+ particular location on the 
OutputDevice, up
+ to the position in the metafile
+- Pause- pauses or continues the playback
+- IsPause
+- Stop - stop playback fully
+- WindStart- windback to start of the metafile
+- windPrev - windback one record
+- GetActionSize- get the number of records in the 
metafile
+
+
+METAFILE RECORD FUNCTIONS
+
+- FirstAction  - get the first metafile record
+- NextAction   - get the next metafile record from 
the
+ current position
+- GetAction(size_t)- get the metafile record at 
location in file
+- GetCurAction - get the current metafile record
+- AddAction(MetaAction*)   - appends a metafile record
+- AddAction(MetaAction*, size_t)   - adds a metafile record to a 
particular
+ location in the file
+- RemoveAction - removes record at file location
+- Clear- first stops if recording, then 
removes all
+ metafile records
+- push_back- pushes back, basically a thin 
wrapper to the
+ metafile record list
+
+
+READ AND WRITING
+
+- Read
+- Write
+- GetChecksum
+- GetSizeBytes
+
+
+DISPLACEMENT FUNCTIONS
+
+- Move( long nX, long nX)
+- Move( long nX, long nX, long nDPIX, long nDPIY ) - Move method getting 
specifics how to
+ handle MapMode( MAP_PIXEL )
+
+
+TRANSFORMATION FUNCTIONS
+
+- Scale( double fScaleX, double fScaleY )
+- Scale( const Fraction rScaleX, const Fraction rScaleY )
+- Mirror
+- Rotate( long nAngle10 )
+- Clip( const Rectangle )
+
+
+COLOR ADJUSTMENT FUNCTIONS
+
+- Adjust- change luminance, contrast, 
gamma and RGB via a
+  percentage
+- Convert   - colour conversion
+- ReplaceColors
+- GetMonochromeMtf
+
+
+SPECIAL

[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry

2014-12-02 Thread Yousuf Philips 
 icon-themes/galaxy/cmd/lc_deletetable.png   |binary
 icon-themes/galaxy/links.txt|3 +++
 icon-themes/tango/cmd/lc_deletetable.png|binary
 icon-themes/tango/cmd/lc_inserttable-alt.png|binary
 icon-themes/tango/cmd/lc_inserttable.png|binary
 icon-themes/tango/cmd/lc_tabledialog-alt.png|binary
 icon-themes/tango/cmd/lc_tabledialog.png|binary
 icon-themes/tango/cmd/sc_tabledialog.png|binary
 icon-themes/tango/links.txt |3 +++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |6 
++
 10 files changed, 12 insertions(+)

New commits:
commit 081306b10499c7ace83a6cf69fd31bcc3bfeeb02
Author: Yousuf Philips philip...@hotmail.com
Date:   Tue Dec 2 13:24:10 2014 +0400

TANGO: addition and modification of table related icons

Change-Id: Ic37e402a21303914ab104cb9dbdaf3441417ca62
Reviewed-on: https://gerrit.libreoffice.org/13264
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git a/icon-themes/galaxy/cmd/lc_deletetable.png 
b/icon-themes/galaxy/cmd/lc_deletetable.png
new file mode 100644
index 000..bc82016
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_deletetable.png differ
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 37bbd64..e1a5720 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -15,6 +15,9 @@ cmd/lc_closepreview.png cmd/lc_closedoc.png
 cmd/sc_closepreview.png cmd/sc_closedoc.png
 cmd/sc_numberformattime.png cmd/sc_timefield.png
 
+cmd/sc_insertrowdialog.png cmd/sc_insertrows.png
+cmd/sc_insertcolumndialog.png cmd/sc_insertcolumns.png
+
 # paragraph line spacing
 cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
diff --git a/icon-themes/tango/cmd/lc_deletetable.png 
b/icon-themes/tango/cmd/lc_deletetable.png
new file mode 100644
index 000..79f5864
Binary files /dev/null and b/icon-themes/tango/cmd/lc_deletetable.png differ
diff --git a/icon-themes/tango/cmd/lc_inserttable-alt.png 
b/icon-themes/tango/cmd/lc_inserttable-alt.png
new file mode 100644
index 000..a275042
Binary files /dev/null and b/icon-themes/tango/cmd/lc_inserttable-alt.png differ
diff --git a/icon-themes/tango/cmd/lc_inserttable.png 
b/icon-themes/tango/cmd/lc_inserttable.png
index a275042..bda0d96 100644
Binary files a/icon-themes/tango/cmd/lc_inserttable.png and 
b/icon-themes/tango/cmd/lc_inserttable.png differ
diff --git a/icon-themes/tango/cmd/lc_tabledialog-alt.png 
b/icon-themes/tango/cmd/lc_tabledialog-alt.png
new file mode 100644
index 000..1f6231a
Binary files /dev/null and b/icon-themes/tango/cmd/lc_tabledialog-alt.png differ
diff --git a/icon-themes/tango/cmd/lc_tabledialog.png 
b/icon-themes/tango/cmd/lc_tabledialog.png
index b790217..16c1af5 100644
Binary files a/icon-themes/tango/cmd/lc_tabledialog.png and 
b/icon-themes/tango/cmd/lc_tabledialog.png differ
diff --git a/icon-themes/tango/cmd/sc_tabledialog.png 
b/icon-themes/tango/cmd/sc_tabledialog.png
new file mode 100644
index 000..25e6ef1
Binary files /dev/null and b/icon-themes/tango/cmd/sc_tabledialog.png differ
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 5222f7b..a04ffa1 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -415,6 +415,9 @@ xmlsecurity/res/signet_11x16.png svx/res/signet_11x16.png
 sc/res/sf02.png sw/imglst/sf04.png
 svx/res/symphony/spacing3.png cmd/sc_spacepara2.png
 
+cmd/sc_insertrowdialog.png cmd/sc_insertrows.png
+cmd/sc_insertcolumndialog.png cmd/sc_insertcolumns.png
+
 # RTL
 cmd/ar/sc_undo.png cmd/fa/sc_undo.png
 cmd/ar/lc_undo.png cmd/fa/lc_undo.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 6a99e7a..a417ddc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1131,8 +1131,14 @@
   /node
   node oor:name=.uno:DeleteTable oor:op=replace
 prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USDelete Table/value
+/prop
+prop oor:name=ContextLabel oor:type=xs:string
   value xml:lang=en-US~Table/value
 /prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
   /node
   node oor:name=.uno:SplitCell oor:op=replace
 prop oor:name=Label oor:type=xs:string
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Bjoern Michaelsen 
 sw/source/core/edit/autofmt.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 2b433d87525918bf8d51fe164ffea9c9099b52ce
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Dec 2 11:38:34 2014 +0100

kill FOREACHPAM_START/FOREACHPAM_END

Change-Id: I8dd98e92ac01735446d8b8f0f4f168108e1481d9

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index b639009..93beffdb 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -67,6 +67,7 @@
 #include numrule.hxx
 
 #include boost/scoped_ptr.hpp
+#include boost/foreach.hpp
 
 using namespace ::com::sun::star;
 
@@ -2537,13 +2538,14 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* 
pAFlags )
 // There are more than one or a selection is open
 if( pCrsr-GetNext() != pCrsr || pCrsr-HasMark() )
 {
-FOREACHPAM_START(GetCrsr())
-if( PCURCRSR-HasMark() )
+BOOST_FOREACH(SwPaM rPaM, GetCrsr()-rangeRing())
+{
+if( rPaM.HasMark() )
 {
-SwAutoFormat aFmt( this, aAFFlags, PCURCRSR-Start()-nNode,
- PCURCRSR-End()-nNode );
+SwAutoFormat aFmt( this, aAFFlags, (rPaM.Start()-nNode),
+ (rPaM.End()-nNode) );
 }
-FOREACHPAM_END()
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 83546] SIDEBAR: content panels in tray don't open with accelerators when sidebar is enabled but fully hidden

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=83546

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

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #7 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

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

Re: EMF inspector

2014-12-02 Thread Miklos Vajna 
Hi Chris,

On Tue, Dec 02, 2014 at 11:43:44AM +1100, Chris Sherlock 
chris.sherloc...@gmail.com wrote:
 I believe that there is some sort of Linux python-based app that allows
 folks to inspect all sorts of files in a GUI interface (I've used it
 before).
 
 I can't for the life of me remember it's name, but I've used it for
 inspecting EMFs when chasing down EMF bugs.
 
 I'm currently chasing down fdo#8053, where it appears we aren't handling an
 EMF properly, this tool would be really useful!

There is at least oletoy[1] and mso-dumper[2], possibly others as well.
;-)

Regards,

Miklos

[1] git://gitorious.org/re-lab/tools.git
[2] ssh://logerrit/mso-dumper


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

[Bug 79167] UI: Opening the new navigate by for choosing the object to go backforth opens the big navigation window, too

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=79167

--- Comment #7 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 53236] Make shadow design updates easier

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=53236

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

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #1 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 32364] Add a filter to Insert Field Other Cross reference tab

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=32364

--- Comment #7 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 83958] TRACK CHANGES: Automatic activation of the changes toolbar when a track changes document opens

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=83958

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

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #2 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 42788] FORMATTING - Numbering/ordered list results in misaligned text after a certain level: default indent does not match with the width of numbers/bullets

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=42788

--- Comment #18 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 75019] FILESAVE: Failed to cover Bookmark and Bookmark Link-Export to MediaWiki

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=75019

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

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #3 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 80907] avoid unnecessary allocations in OpenXML import filter

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=80907

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

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #9 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 86929] Kill FOREACHPAM_START for good

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=86929

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

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #1 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 67208] Horizontal rules in old documents are broken: only links in the files

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=67208

--- Comment #3 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 60739] cut/paste coding redux

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=60739

--- Comment #9 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 63436] Support for ODF fields as written by KWord

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=63436

--- Comment #2 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 76291] FILESAVE: Chinese hyperlinks modified upon Saving

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=76291

--- Comment #5 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 33831] Media wiki export pictures as files

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=33831

--- Comment #6 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 32531] Incorrect cursor key movement between table cells of different directionality

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=32531

--- Comment #15 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 80798] cleanup debug methods

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=80798

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

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #2 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 51741] EDIITING: Deleting bookmark is not seen as a modification of document

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=51741

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

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #7 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 50050] Make LE (Link End) Index/Table Entry component character style match LS (Link Start) by default

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=50050

--- Comment #4 from Björn Michaelsen bjoern.michael...@canonical.com ---
adding LibreOffice developer list as CC to unresolved Writer EasyHacks for
better visibility.

see e.g.
http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for
details

-- 
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 86929] Kill FOREACHPAM_START for good

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=86929

--- Comment #2 from Miklos Vajna vmik...@collabora.co.uk ---
FWIW, C++11 range-based for-loops are OK on libreoffice-4-4 and master, best to
not use BOOST_FOREACH in new code, I guess.

-- 
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: 7 commits - include/vcl vcl/inc vcl/Library_vcl.mk vcl/opengl vcl/Package_opengl.mk vcl/qa vcl/source vcl/workben

2014-12-02 Thread Michael Meeks 
 include/vcl/opengl/OpenGLContext.hxx  |   34 +
 vcl/Library_vcl.mk|1 
 vcl/Package_opengl.mk |4 
 vcl/inc/opengl/program.hxx|   72 ++
 vcl/inc/opengl/salbmp.hxx |   11 
 vcl/inc/opengl/texture.hxx|1 
 vcl/inc/openglgdiimpl.hxx |   67 --
 vcl/opengl/dumbVertexShader.glsl  |   16 
 vcl/opengl/gdiimpl.cxx|  775 +-
 vcl/opengl/maskVertexShader.glsl  |   19 
 vcl/opengl/maskedTextureVertexShader.glsl |   19 
 vcl/opengl/program.cxx|  238 +
 vcl/opengl/salbmp.cxx |7 
 vcl/opengl/scale.cxx  |   96 ---
 vcl/opengl/solidVertexShader.glsl |   16 
 vcl/opengl/texture.cxx|   38 +
 vcl/qa/cppunit/outdev.cxx |   27 -
 vcl/source/opengl/OpenGLContext.cxx   |   54 ++
 vcl/workben/vcldemo.cxx   |   66 ++
 19 files changed, 709 insertions(+), 852 deletions(-)

New commits:
commit aefeef36fdd536bfc8b1038e14d552db8c60c70d
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue Dec 2 06:54:27 2014 +

vcl: use resetToReInitialize to avoid context problems on Windows.

It appears that we have to do this for VirtualDevices, where we have
freed / re-allocated the underlying resource, or we fail to switch the
current context, and render to the wrong place, before blatting a
blank texture over the top of it.

Change-Id: I0253f216ea7dc9786374dc83ca38f4f6295e3035

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 462a479..46d72dc6 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -105,6 +105,15 @@ void OpenGLSalGraphicsImpl::Init()
 maOffscreenTex.GetHeight() != GetHeight() )
 {
 maOffscreenTex = OpenGLTexture();
+#if defined(WNT)
+// URGH ... VirtualDevice may have destroyed the underlying resource
+// our context is associated with - FIXME: can we do better here ?
+if (mpContext)
+{
+mpContext-resetToReInitialize();
+ReleaseContext();
+}
+#endif
 }
 }
 
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 95b3940..41eae3b 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -621,6 +621,17 @@ bool OpenGLContext::init(SystemChildWindow* pChildWindow)
 return ImplInit();
 }
 
+#if defined( WNT )
+// FIXME share resetToReInitialize() across platforms...
+void OpenGLContext::resetToReInitialize()
+{
+if( !mbInitialized )
+return;
+resetCurrent();
+mbInitialized = false;
+}
+#endif
+
 #if defined( UNX )  !defined MACOSX  !defined IOS  !defined ANDROID
 bool OpenGLContext::init(Display* dpy, Window win, int screen)
 {
commit 44b6f1cbdc821765ef4f889f0e6a558b44100407
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue Dec 2 06:30:38 2014 +

vcl: OpenGL texture creation debug.

Change-Id: I6a21c89329d9e9396ed16ce58b184339719adab7

diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index 0c45d77..cc5be78 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -41,6 +41,8 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int 
nHeight, bool bAllocate )
 glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, nWidth, nHeight, 0, GL_RGBA, 
GL_UNSIGNED_BYTE, NULL );
 glBindTexture( GL_TEXTURE_2D, 0 );
 
+SAL_INFO( vcl.opengl, OpenGLTexture   mnTexture nWidth  
x  nHeight   allocate );
+
 CHECK_GL_ERROR();
 }
 
@@ -65,6 +67,8 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nX, int nY, int 
nWidth, int nHeight )
 CHECK_GL_ERROR();
 glBindTexture( GL_TEXTURE_2D, 0 );
 
+SAL_INFO( vcl.opengl, OpenGLTexture   mnTexture nWidth  
x  nHeight   from x  nX  , y  nY );
+
 CHECK_GL_ERROR();
 }
 
@@ -87,6 +91,8 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int 
nHeight, int nFormat, int
 glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, mnWidth, mnHeight, 0, nFormat, 
nType, pData );
 glBindTexture( GL_TEXTURE_2D, 0 );
 
+SAL_INFO( vcl.opengl, OpenGLTexture   mnTexture nWidth  
x  nHeight   from data );
+
 CHECK_GL_ERROR();
 }
 
commit b8a9f58ca414c33e95f1d543d2b33cf1920e9612
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Dec 2 00:47:10 2014 +0100

request a stencil on windows

Change-Id: Ib8f337d80c5576380344893c49c4fa0284f1dc4b

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 5812034..95b3940 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -838,7 +838,7 @@ bool OpenGLContext::ImplInit()
 0,  // No Accumulation Buffer
 0, 0, 0, 0, // Accumulation Bits Ignored
 64,

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

2014-12-02 Thread Andras Timar 
 sw/source/filter/html/htmlnumwriter.cxx |   18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

New commits:
commit c3d913724380eb76410dc0c792e9a307bbb24ca7
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Dec 2 11:54:43 2014 +0100

fdo#68684 export more numbering types correctly into HTML

Change-Id: I6f1df02764f271143749ffbaeb4fc988b2f72f26

diff --git a/sw/source/filter/html/htmlnumwriter.cxx 
b/sw/source/filter/html/htmlnumwriter.cxx
index 34f4528..de24464 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -228,10 +228,20 @@ Writer OutHTML_NumBulListStart( SwHTMLWriter rWrt,
 sal_Char cType = 0;
 switch( eType )
 {
-case SVX_NUM_CHARS_UPPER_LETTER:cType = 'A'; break;
-case SVX_NUM_CHARS_LOWER_LETTER:cType = 'a'; break;
-case SVX_NUM_ROMAN_UPPER:   cType = 'I'; break;
-case SVX_NUM_ROMAN_LOWER:   cType = 'i'; break;
+case SVX_NUM_CHARS_UPPER_LETTER:
+case SVX_NUM_CHARS_UPPER_LETTER_N:
+cType = 'A';
+break;
+case SVX_NUM_CHARS_LOWER_LETTER:
+case SVX_NUM_CHARS_LOWER_LETTER_N:
+cType = 'a';
+break;
+case SVX_NUM_ROMAN_UPPER:
+cType = 'I';
+break;
+case SVX_NUM_ROMAN_LOWER:
+cType = 'i';
+break;
 }
 if( cType )
 {
___
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' - sw/source

2014-12-02 Thread Andras Timar 
 sw/source/filter/html/htmlnumwriter.cxx |   18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 37fd0802e73c991a7dcbb101fef9f12a045a5b42
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Dec 2 11:54:43 2014 +0100

fdo#68684 export more numbering types correctly into HTML

Change-Id: I6f1df02764f271143749ffbaeb4fc988b2f72f26
(cherry picked from commit c3d913724380eb76410dc0c792e9a307bbb24ca7)

diff --git a/sw/source/filter/html/htmlnumwriter.cxx 
b/sw/source/filter/html/htmlnumwriter.cxx
index 34f4528..de24464 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -228,10 +228,20 @@ Writer OutHTML_NumBulListStart( SwHTMLWriter rWrt,
 sal_Char cType = 0;
 switch( eType )
 {
-case SVX_NUM_CHARS_UPPER_LETTER:cType = 'A'; break;
-case SVX_NUM_CHARS_LOWER_LETTER:cType = 'a'; break;
-case SVX_NUM_ROMAN_UPPER:   cType = 'I'; break;
-case SVX_NUM_ROMAN_LOWER:   cType = 'i'; break;
+case SVX_NUM_CHARS_UPPER_LETTER:
+case SVX_NUM_CHARS_UPPER_LETTER_N:
+cType = 'A';
+break;
+case SVX_NUM_CHARS_LOWER_LETTER:
+case SVX_NUM_CHARS_LOWER_LETTER_N:
+cType = 'a';
+break;
+case SVX_NUM_ROMAN_UPPER:
+cType = 'I';
+break;
+case SVX_NUM_ROMAN_LOWER:
+cType = 'i';
+break;
 }
 if( cType )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Tor Lillqvist 
 vcl/inc/opengl/program.hxx |1 -
 vcl/opengl/program.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 724bc1ac11bd9a07d3391a8535d308353003e3b9
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Dec 2 13:23:47 2014 +0200

WaE: private field 'mnAttribIndex' is not used

Change-Id: I939e184f6706fc0135f6906f0c183e5166aba5bb

diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 4b2b26f..2aeb2fd 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -29,7 +29,6 @@ private:
 GLuint  mnId;
 UniformCachemaUniformLocations;
 sal_uInt32  mnEnabledAttribs;
-GLuint  mnAttribIndex;
 GLuint  mnPositionAttrib;
 GLuint  mnTexCoordAttrib;
 GLuint  mnAlphaCoordAttrib;
diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx
index c9542c7..320b06f 100644
--- a/vcl/opengl/program.cxx
+++ b/vcl/opengl/program.cxx
@@ -17,7 +17,6 @@
 OpenGLProgram::OpenGLProgram() :
 mnId( 0 ),
 mnEnabledAttribs( 0 ),
-mnAttribIndex( 0 ),
 mnPositionAttrib( SAL_MAX_UINT32 ),
 mnTexCoordAttrib( SAL_MAX_UINT32 ),
 mnAlphaCoordAttrib( SAL_MAX_UINT32 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: EMF inspector

2014-12-02 Thread Michael Stahl 
On 02.12.2014 01:43, Chris Sherlock wrote:
 I believe that there is some sort of Linux python-based app that allows
 folks to inspect all sorts of files in a GUI interface (I've used it
 before).
 
 I can't for the life of me remember it's name, but I've used it for
 inspecting EMFs when chasing down EMF bugs.

maybe it was this one, called MetaFileExplorer:

http://www.flounder.com/metafileexplorer.htm


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

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

2014-12-02 Thread Markus Mohrhard 
 include/xmloff/xmlnumfe.hxx  |3 ++-
 xmloff/source/style/xmlnumfe.cxx |8 
 xmloff/source/style/xmlnumfi.cxx |1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 2af6880c44cd9d4083c1258d5ad46238f53a6c4f
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sat Aug 16 07:14:28 2014 +0200

prevent invalid ods files with loext:fill-character

ODF specifies that extension elements in a document are removed before
the validation. With our old implementation of the number format export
this could result in two number:text elements following each other.

According to the spec a number:text element may not follow another
number:text element.

The number:text element before loext:fill is actually not that
interesting so it makes more sense to make this one an extension
element.

Possible documents showing issues:

fdo45268-1.xlsx
fdo49150-1.xlsx
and many more

Conflicts:
xmloff/source/style/xmlnumfe.cxx

Change-Id: I3ad92b8a61a246b3dbc0132d9a2c367488a766d0

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index e047de3..bc2517d 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -26,6 +26,7 @@
 #include com/sun/star/util/XNumberFormatsSupplier.hpp
 #include com/sun/star/uno/Sequence.h
 #include rtl/ustrbuf.hxx
+#include boost/ptr_container/ptr_vector.hpp
 
 #define XML_WRITTENNUMBERSTYLES WrittenNumberStyles
 
@@ -57,7 +58,7 @@ private:
 SAL_DLLPRIVATE void AddLanguageAttr_Impl( sal_Int32 nLang );
 
 SAL_DLLPRIVATE void AddToTextElement_Impl( const OUString rString );
-SAL_DLLPRIVATE void FinishTextElement_Impl();
+SAL_DLLPRIVATE void FinishTextElement_Impl(bool bUseExtensionNS = false);
 
 SAL_DLLPRIVATE void WriteColorElement_Impl( const Color rColor );
 SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nInteger,
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 6658a3e..e6d0fae 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -46,7 +46,6 @@
 #include xmloff/xmlexp.hxx
 
 #include set
-#include boost/ptr_container/ptr_vector.hpp
 
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
@@ -338,11 +337,12 @@ void SvXMLNumFmtExport::AddToTextElement_Impl( const 
OUString rString )
 sTextContent.append( rString );
 }
 
-void SvXMLNumFmtExport::FinishTextElement_Impl()
+void SvXMLNumFmtExport::FinishTextElement_Impl(bool bUseExtensionNS)
 {
 if ( !sTextContent.isEmpty() )
 {
-SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT,
+sal_uInt16 nNS = bUseExtensionNS ? XML_NAMESPACE_LO_EXT : 
XML_NAMESPACE_NUMBER;
+SvXMLElementExport aElem( rExport, nNS, XML_TEXT,
   sal_True, sal_False );
 rExport.Characters( sTextContent.makeStringAndClear() );
 }
@@ -502,7 +502,7 @@ void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool 
bLong )
 
 void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar )
 {
-FinishTextElement_Impl();
+FinishTextElement_Impl(sal_True);
 SvXMLElementExport aElem( rExport, XML_NAMESPACE_LO_EXT, 
XML_FILL_CHARACTER,
   sal_True, sal_False );
 rExport.Characters( OUString( nChar ) );
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 8773f3a..9a108cd 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -496,6 +496,7 @@ const SvXMLTokenMap SvXMLNumImpData::GetStyleElemTokenMap()
 static const SvXMLTokenMapEntry aStyleElemMap[] =
 {
 //  elements in a style
+{ XML_NAMESPACE_LO_EXT, XML_TEXT,   XML_TOK_STYLE_TEXT 
 },
 { XML_NAMESPACE_NUMBER, XML_TEXT,   XML_TOK_STYLE_TEXT 
 },
 { XML_NAMESPACE_LO_EXT, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
 { XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Caolán McNamara 
 external/icu/UnpackedTarball_icu.mk |1 
 external/icu/icu4c-scriptrun.patch  |   58 
 2 files changed, 59 insertions(+)

New commits:
commit 4c30e379abe0ebe1cbf302c553120b1be966ec3e
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Nov 30 20:38:42 2014 +

mirror fixes for fdo#78906 and deb#766788 into icu

(cherry picked from commit a66451887425ddd9387e2b25d5125916f4a35f83)
(cherry picked from commit bff0fe902686d8c126a73e1d2c914f5d65c6ffaf)

Conflicts:
external/icu/UnpackedTarball_icu.mk

Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9
Reviewed-on: https://gerrit.libreoffice.org/13220
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 77cd38a..8c73b48 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-mkdir.patch \
external/icu/icu4c-buffer-overflow.patch \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
+   external/icu/icu4c-scriptrun.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-scriptrun.patch 
b/external/icu/icu4c-scriptrun.patch
new file mode 100644
index 000..e307811
--- /dev/null
+++ b/external/icu/icu4c-scriptrun.patch
@@ -0,0 +1,58 @@
+--- misc/icu/source/extra/scrptrun/scrptrun.cpp
 misc/build/icu/source/extra/scrptrun/scrptrun.cpp
+@@ -150,7 +150,11 @@
+ // characters above it on the stack will be poped.
+ if (pairIndex = 0) {
+ if ((pairIndex  1) == 0) {
+-parenStack[++parenSP].pairIndex = pairIndex;
++++parenSP;
++int32_t nVecSize = parenStack.size();
++if (parenSP == nVecSize)
++parenStack.resize(nVecSize + 128);
++parenStack[parenSP].pairIndex = pairIndex;
+ parenStack[parenSP].scriptCode  = scriptCode;
+ } else if (parenSP = 0) {
+ int32_t pi = pairIndex  ~1;
+@@ -184,7 +188,14 @@
+ // pop it from the stack
+ if (pairIndex = 0  (pairIndex  1) != 0  parenSP = 0) {
+ parenSP -= 1;
+-startSP -= 1;
++/* decrement startSP only if it is = 0,
++   decrementing it unnecessarily will lead to memory 
corruption
++   while processing the above while block.
++   e.g. startSP = -4 , parenSP = -1
++*/
++if (startSP = 0) {
++startSP -= 1;
++}
+ }
+ } else {
+ // if the run broke on a surrogate pair,
+--- misc/icu/source/extra/scrptrun/scrptrun.h
 misc/build/icu/source/extra/scrptrun/scrptrun.h
+@@ -17,6 +17,7 @@
+ #include unicode/utypes.h
+ #include unicode/uobject.h
+ #include unicode/uscript.h
++#include vector
+ 
+ struct ScriptRecord
+ {
+@@ -79,7 +80,7 @@
+ int32_t scriptEnd;
+ UScriptCode scriptCode;
+ 
+-ParenStackEntry parenStack[128];
++std::vectorParenStackEntry parenStack;
+ int32_t parenSP;
+ 
+ static int8_t highBit(int32_t value);
+@@ -133,6 +134,7 @@
+ scriptEnd   = charStart;
+ scriptCode  = USCRIPT_INVALID_CODE;
+ parenSP = -1;
++parenStack.resize(128);
+ }
+ 
+ inline void ScriptRun::reset(int32_t start, int32_t length)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 86929] Kill FOREACHPAM_START for good

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=86929

--- Comment #3 from Björn Michaelsen bjoern.michael...@canonical.com ---
We cant for now have sw::Ring implement STL-like begin()/end() functions,
see:

https://gerrit.libreoffice.org/gitweb?p=core.git;a=blob;f=sw/inc/ring.hxx;h=d58733f1459fda302a99d1ea9d56da82c55f9ca9;hb=2dd7cc5b925d0b4c62553eeba9f6524ce7b6217b#l105

So for now, BOOST_FOREACH should still be an improvement over the old
const-eating homegrown macros. Once none of the derived classes of sw::Ring
are deriving from any other STL-container, we should be able to trivially
replace BOOST_FOREACH with a proper C++11 style for() iteration.

-- 
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' - sw/source

2014-12-02 Thread Stanislav Horacek 
 sw/source/uibase/utlui/initui.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33a088fbc46409fa2963613e3ac28b181164e647
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Dec 1 20:03:52 2014 +0100

capitalize e-mail in list of publication types

Change-Id: I4a93e272d18ffdce20ded4a3e0a6f48a49b4b01a
Reviewed-on: https://gerrit.libreoffice.org/13255
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com

diff --git a/sw/source/uibase/utlui/initui.src 
b/sw/source/uibase/utlui/initui.src
index 999b27b..faf9681 100644
--- a/sw/source/uibase/utlui/initui.src
+++ b/sw/source/uibase/utlui/initui.src
@@ -263,7 +263,7 @@ String STR_AUTH_TYPE_UNPUBLISHED
 };
 String STR_AUTH_TYPE_EMAIL
 {
-Text [ en-US ] = e-mail;
+Text [ en-US ] = E-mail;
 };
 String STR_AUTH_TYPE_WWW
 {
___
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' - accessibility/source

2014-12-02 Thread Maxim Monastirsky 
 accessibility/source/standard/vclxaccessibletoolbox.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 13f5ccd98ee7c623d5d4a53da56df668f98f7353
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Fri Nov 28 13:59:38 2014 +0200

fdo#86117 a11y: Exception when closing popup from ToolBox w/o separator

For some reason PopupWindowControllerImpl::WindowEventListener is getting
the VCLEVENT_WINDOW_HIDE event twice, and while processing the second one
the ToolBox no longer has an active down item, which results in a
IndexOutOfBoundsException in VCLXAccessibleToolBox::getAccessibleChild,
because ToolBox::GetItemPos(0) correctly returns TOOLBOX_ITEM_NOTFOUND.
But when a ToolBox has at least one separator, ToolBox::GetItemPos(0)
detects its position as the current down item, and no exception is
thrown.

Probably it just hides the bug, because it seems to me that getting
the hide event twice is the real bug here.

Change-Id: If018350dd91cd959c0c8f7d6859474f95fb8cd1e
Reviewed-on: https://gerrit.libreoffice.org/13173
Reviewed-by: Maxim Monastirsky momonas...@gmail.com
Tested-by: Maxim Monastirsky momonas...@gmail.com
(cherry picked from commit ef8e38266b13800518830917a71dde4d3ee8f7ef)

diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx 
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 188e777..c3042fb 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -430,10 +430,16 @@ void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( 
vcl::Window* pWindow, b
 ToolBox* pToolBox = static_cast ToolBox* ( GetWindow() );
 if( pWindow  pToolBox )
 {
+const sal_uInt16 nDownItem = pToolBox-GetDownItemId();
+if ( !nDownItem )
+// Items with ItemId == 0 are not allowed in ToolBox, which means 
that currently no item is in down state.
+// Moreover, running GetItemPos with 0 could find a separator item 
if there is any.
+return;
+
 Reference XAccessible  xChild( pWindow-GetAccessible() );
 if( xChild.is() )
 {
-Reference XAccessible  xChildItem( getAccessibleChild( 
static_cast sal_Int32 ( pToolBox-GetItemPos( pToolBox-GetDownItemId() ) ) ) 
);
+Reference XAccessible  xChildItem( getAccessibleChild( 
static_cast sal_Int32 ( pToolBox-GetItemPos( nDownItem ) ) ) );
 VCLXAccessibleToolBoxItem* pItem = static_cast 
VCLXAccessibleToolBoxItem* ( xChildItem.get() );
 
 pItem-SetChild( xChild );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Noel Grandin 
 sw/qa/core/uwriter.cxx |2 
 sw/qa/extras/uiwriter/uiwriter.cxx |2 
 sw/source/ui/dbui/dbinsdlg.cxx |6 -
 sw/source/ui/dbui/mmoutputpage.cxx |8 -
 sw/source/ui/frmdlg/column.cxx |   52 -
 sw/source/ui/frmdlg/cption.cxx |   20 +--
 sw/source/ui/frmdlg/frmdlg.cxx |4 
 sw/source/ui/frmdlg/frmpage.cxx|  100 +-
 sw/source/ui/frmdlg/wrap.cxx   |   36 +++---
 sw/source/ui/index/cnttab.cxx  |  200 ++---
 sw/source/ui/index/swuiidxmrk.cxx  |   24 ++--
 sw/source/ui/misc/docfnote.cxx |2 
 sw/source/ui/misc/glossary.cxx |8 -
 sw/source/ui/misc/insfnote.cxx |6 -
 sw/source/ui/misc/linenum.cxx  |4 
 sw/source/ui/misc/num.cxx  |2 
 sw/source/ui/misc/pggrid.cxx   |   18 +--
 sw/source/ui/misc/titlepage.cxx|2 
 sw/source/ui/table/tabledlg.cxx|   16 +-
 sw/source/ui/vba/vbawindow.cxx |4 
 20 files changed, 258 insertions(+), 258 deletions(-)

New commits:
commit 8dba4716d2e7fcaf00cc347d4989c24539ea0fe6
Author: Noel Grandin n...@peralex.com
Date:   Tue Dec 2 14:33:47 2014 +0200

loplugin: cstylecast

Change-Id: I922fe2b4177687863d9749c2f46aab9ddd86621a

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 55a9390..3a4af6d 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -699,7 +699,7 @@ void SwDocTest::testSwScanner()
 
 DateTime aDate(DateTime::SYSTEM);
 SwPostItField aPostIt(
-
(SwPostItFieldType*)m_pDoc-getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD),
 OUString(An Author),
+
static_castSwPostItFieldType*(m_pDoc-getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)),
 OUString(An Author),
 OUString(Some Text), OUString(Initials), OUString(Name), 
aDate );
 m_pDoc-getIDocumentContentOperations().InsertPoolItem(aPaM, 
SwFmtFld(aPostIt), 0);
 
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8496e30..6fe83c2 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -293,7 +293,7 @@ void SwUiWriterTest::testFdo74981()
 // create a document with an input field
 SwDoc* pDoc = createDoc();
 SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell();
-SwInputField aField((SwInputFieldType*)pWrtShell-GetFldType(0, 
RES_INPUTFLD), OUString(foo), OUString(bar), 0, 0);
+SwInputField 
aField(static_castSwInputFieldType*(pWrtShell-GetFldType(0, RES_INPUTFLD)), 
OUString(foo), OUString(bar), 0, 0);
 pWrtShell-Insert(aField);
 
 // expect hints
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 04cc190..e565f8a 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -913,7 +913,7 @@ bool SwInsertDBColAutoPilot::SplitTextToColArr( const 
OUString rTxt,
 SwDBFieldType aFldType( rSh.GetDoc(), aSrch.sColumn,
 aDBData );
 pNew = new _DB_Column( rFndCol, *new SwDBField(
-(SwDBFieldType*)rSh.InsertFldType( aFldType ),
+static_castSwDBFieldType*(rSh.InsertFldType( 
aFldType )),
 nFormat ) );
 if( nSubType )
 pNew-DB_ColumnData.pField-SetSubType( nSubType );
@@ -1226,8 +1226,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const 
SequenceAny rSelection,
   }
 }
 aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang() 
).getLocale();
-SwDBNextSetField aNxtDBFld( (SwDBNextSetFieldType*)rSh.
-GetFldType( 0, RES_DBNEXTSETFLD ),
+SwDBNextSetField aNxtDBFld( static_castSwDBNextSetFieldType*(rSh.
+GetFldType( 0, RES_DBNEXTSETFLD )),
 1, , aDBData );
 
 bool bSetCrsr = true;
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx 
b/sw/source/ui/dbui/mmoutputpage.cxx
index 51c5af6..01a4d1f 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -445,7 +445,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, 
RadioButton*, pButton)
 OUString sAttach( m_sDefaultAttachmentST );
 sAttach += .;
 sAttach += lcl_GetExtensionForDocType(
-
(sal_uLong)m_pSendAsLB-GetEntryData(m_pSendAsLB-GetSelectEntryPos()));
+
reinterpret_castsal_uLong(m_pSendAsLB-GetEntryData(m_pSendAsLB-GetSelectEntryPos(;
 m_pAttachmentED-SetText( sAttach );
 
 }
@@ -890,7 +890,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl, 
PushButton*, pButton)
 
 IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
 {
-sal_uLong nDocType =

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

2014-12-02 Thread Caolán McNamara 
 external/icu/UnpackedTarball_icu.mk |2 +
 external/icu/icu4c-icu11131.patch.1 |   68 
 external/icu/icu4c-scriptrun.patch  |   58 ++
 3 files changed, 128 insertions(+)

New commits:
commit 66dbae0932041d10a8662d388f1fb003b5b35bd8
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Nov 30 20:38:42 2014 +

mirror fixes for fdo#78906 and deb#766788 into icu

(cherry picked from commit a66451887425ddd9387e2b25d5125916f4a35f83)
(cherry picked from commit bff0fe902686d8c126a73e1d2c914f5d65c6ffaf)

Conflicts:
external/icu/UnpackedTarball_icu.mk

Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9
Reviewed-on: https://gerrit.libreoffice.org/13221
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index f8b5dd8..aefc159 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
external/icu/icu4c-icu11054.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
+   external/icu/icu4c-icu11131.patch.1 \
+   external/icu/icu4c-scriptrun.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-icu11131.patch.1 
b/external/icu/icu4c-icu11131.patch.1
new file mode 100644
index 000..e9978ab
--- /dev/null
+++ b/external/icu/icu4c-icu11131.patch.1
@@ -0,0 +1,68 @@
+--- icu/source/i18n/smpdtfmt.cpp.orig  2014-08-27 10:29:29.849821672 +0530
 icu/source/i18n/smpdtfmt.cpp   2014-08-27 10:29:49.323821401 +0530
+@@ -1082,6 +1082,7 @@
+ }
+ } else {
+ status = U_MEMORY_ALLOCATION_ERROR;
++return;
+ }
+ }
+ umtx_unlock(LOCK);
+--- icu/source/common/usprep.cpp.orig  2014-08-27 10:38:24.360821077 +0530
 icu/source/common/usprep.cpp   2014-08-27 10:38:38.696821312 +0530
+@@ -796,16 +796,23 @@ usprep_prepare(   const UStringPrepProfi
+ }
+ 
+ CLEANUP:
+-if(b1!=b1Stack){
+-uprv_free(b1);
+-b1=NULL;
+-}
+-
+-if(b2!=b1Stack  b2!=b2Stack  b2!=b1 /* b1 should not be freed twice 
*/){
+-uprv_free(b2);
+-b2=NULL;
+-}
+-return u_terminateUChars(dest, destCapacity, b2Len, status);
++  if(b2==b1  b1!=b1Stack){
++  uprv_free(b1);
++  b1=NULL;
++  b2=NULL;
++  }
++  else
++  {
++  if(b1!=b1Stack){
++  uprv_free(b1);
++  b1=NULL;
++  }
++  if(b2!=b1Stack  b2!=b2Stack  b2!=b1 /* b1 should not be 
freed twice */){
++  uprv_free(b2);
++  b2=NULL;
++  }
++  }
++  return u_terminateUChars(dest, destCapacity, b2Len, status);
+ }
+
+
+--- icu/source/common/ubidi.c.orig 2014-08-29 14:32:24.007259924 +0100
 icu/source/common/ubidi.c  2014-08-29 14:33:21.555833532 +0100
+@@ -2521,11 +2521,18 @@
+ pBiDi-trailingWSStart=saveTrailingWSStart;
+ /* free memory for mapping table and visual text */
+ uprv_free(runsOnlyMemory);
++runsOnlyMemory=NULL;
+ if(pBiDi-runCount1) {
+ pBiDi-direction=UBIDI_MIXED;
+ }
+   cleanup3:
+-pBiDi-reorderingMode=UBIDI_REORDER_RUNS_ONLY;
++if(runsOnlyMemory != NULL)
++{
++  pBiDi-reorderingMode=UBIDI_REORDER_RUNS_ONLY;
++  uprv_free(runsOnlyMemory);
++}
++else
++  pBiDi-reorderingMode=UBIDI_REORDER_RUNS_ONLY;
+ }
+ 
+ /* ubidi_setPara  
*/
diff --git a/external/icu/icu4c-scriptrun.patch 
b/external/icu/icu4c-scriptrun.patch
new file mode 100644
index 000..e307811
--- /dev/null
+++ b/external/icu/icu4c-scriptrun.patch
@@ -0,0 +1,58 @@
+--- misc/icu/source/extra/scrptrun/scrptrun.cpp
 misc/build/icu/source/extra/scrptrun/scrptrun.cpp
+@@ -150,7 +150,11 @@
+ // characters above it on the stack will be poped.
+ if (pairIndex = 0) {
+ if ((pairIndex  1) == 0) {
+-parenStack[++parenSP].pairIndex = pairIndex;
++++parenSP;
++int32_t nVecSize = parenStack.size();
++if (parenSP == nVecSize)
++parenStack.resize(nVecSize + 128);
++parenStack[parenSP].pairIndex = pairIndex;
+ parenStack[parenSP].scriptCode  = scriptCode;
+ } else if (parenSP = 0) {
+ int32_t pi = pairIndex  ~1;
+@@ -184,7 +188,14 @@
+ // pop it from the stack
+ if (pairIndex = 0  (pairIndex  1) != 0  parenSP = 0) {
+ parenSP -= 1;
+-startSP -= 1;
++/* decrement startSP only if it is = 0,
++   decrementing it

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

2014-12-02 Thread Caolán McNamara 
 vcl/generic/glyphs/scrptrun.cxx |6 +-
 vcl/generic/glyphs/scrptrun.h   |4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit a4025724d5885c3f9032247d82930711ce56ccd0
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Nov 29 16:44:12 2014 +

give us a parenStack which can grow to fit any input

Change-Id: Ic464184fe367da33bf8c4790b82656b140e3cbd0
(cherry picked from commit cced2f6b866877c39afe86f4af18622cb4022bef)
Reviewed-on: https://gerrit.libreoffice.org/13217
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index f72d296..6df7659 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -173,7 +173,11 @@ UBool ScriptRun::next()
 // characters above it on the stack will be poped.
 if (pairIndex = 0) {
 if ((pairIndex  1) == 0) {
-parenStack[++parenSP].pairIndex = pairIndex;
+++parenSP;
+int32_t nVecSize = parenStack.size();
+if (parenSP == nVecSize)
+parenStack.resize(nVecSize + 128);
+parenStack[parenSP].pairIndex = pairIndex;
 parenStack[parenSP].scriptCode  = scriptCode;
 } else if (parenSP = 0) {
 int32_t pi = pairIndex  ~1;
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
index 6e9bbd6..1c4d0fa 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/generic/glyphs/scrptrun.h
@@ -43,6 +43,7 @@
 #include unicode/utypes.h
 #include unicode/uobject.h
 #include unicode/uscript.h
+#include vector
 
 struct ScriptRecord
 {
@@ -110,7 +111,7 @@ private:
 int32_t scriptEnd;
 UScriptCode scriptCode;
 
-ParenStackEntry parenStack[128];
+std::vectorParenStackEntry parenStack;
 int32_t parenSP;
 
 static int8_t highBit(int32_t value);
@@ -164,6 +165,7 @@ inline void ScriptRun::reset()
 scriptEnd   = charStart;
 scriptCode  = USCRIPT_INVALID_CODE;
 parenSP = -1;
+parenStack.resize(128);
 }
 
 inline void ScriptRun::reset(int32_t start, int32_t length)
___
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' - dbaccess/source

2014-12-02 Thread Lionel Elie Mamane 
 dbaccess/source/ui/dlg/paramdialog.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 7436ce2e156f37a490edf7e8164138aeed2856e2
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Dec 1 18:54:34 2014 +0100

Don't accept invalid value just because user insists

Change-Id: I0693f0e00226148faff2038cea320a506aabaea9
Reviewed-on: https://gerrit.libreoffice.org/13249
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx 
b/dbaccess/source/ui/dlg/paramdialog.cxx
index d21d742..f4fdc07 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -182,8 +182,6 @@ namespace dbaui
 if (!m_bNeedErrorOnCurrent)
 return 1L;
 
-m_bNeedErrorOnCurrent = false;  // will be reset in 
OnValueModified
-
 OUString sName;
 try
 {
___
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' - dbaccess/source

2014-12-02 Thread Lionel Elie Mamane 
 dbaccess/source/ui/dlg/paramdialog.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4edbf35b18c5ecdd99ccc432788a2f9ce38a74f
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Dec 1 18:55:34 2014 +0100

Correct error message: the name is the parameter's, not the column's

Change-Id: Ia26fb2dcd443f5c5b5cc48dff209d022388c7519
Reviewed-on: https://gerrit.libreoffice.org/13250
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/dbaccess/source/ui/dlg/paramdialog.src 
b/dbaccess/source/ui/dlg/paramdialog.src
index 23b1c55..bd0bf0b 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -21,7 +21,7 @@
 
 String STR_COULD_NOT_CONVERT_PARAM
 {
-Text [ en-US ] = The entry could not be converted to a valid value for 
the \$name$\ column;
+Text [ en-US ] = The entry could not be converted to a valid value for 
the \$name$\ parameter;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Stephan Bergmann 
 vcl/qa/cppunit/outdev.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 74659d0174a516d4ed5095e386f925de51121e76
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 13:47:19 2014 +0100

CPPUNIT_ASSERT_EQUAL

Change-Id: I846ff9cc1bc1e4e449542ebe04a4dc322cee821e

diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index de02ffc..4ae3470 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -56,10 +56,10 @@ void VclOutdevTest::testVirtualDevice()
 }
 #endif
 
-CPPUNIT_ASSERT(aVDev.GetPixel(Point(0,0)) == COL_WHITE);
-CPPUNIT_ASSERT(aVDev.GetPixel(Point(1,2)) == COL_GREEN);
-CPPUNIT_ASSERT(aVDev.GetPixel(Point(31,30)) == COL_RED);
-CPPUNIT_ASSERT(aVDev.GetPixel(Point(30,31)) == COL_WHITE);
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(0,0)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_GREEN, aVDev.GetPixel(Point(1,2)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_RED, aVDev.GetPixel(Point(31,30)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(30,31)).GetColor());
 
 // Gotcha: y and x swap for BitmapReadAccess: deep joy.
 Bitmap::ScopedReadAccess pAcc(aBmp);
___
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' - connectivity/source dbaccess/source include/connectivity

2014-12-02 Thread Lionel Elie Mamane 
 connectivity/source/commontools/predicateinput.cxx |  129 -
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |4 
 dbaccess/source/ui/dlg/paramdialog.cxx |8 -
 dbaccess/source/ui/dlg/queryfilter.cxx |3 
 include/connectivity/predicateinput.hxx|   35 +++-
 5 files changed, 129 insertions(+), 50 deletions(-)

New commits:
commit 6254fa3ee4310f2fc421d95294d1f1e902196463
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Dec 1 18:59:06 2014 +0100

fdo#86852 correctly recognise NULL values in query parameter values dialog

Change-Id: I3c0cf976e0a9fbafe6eee768799a2f48c2ee0ea9
Reviewed-on: https://gerrit.libreoffice.org/13251
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu

diff --git a/connectivity/source/commontools/predicateinput.cxx 
b/connectivity/source/commontools/predicateinput.cxx
index 5d0cc9d..94a4d3d 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -54,6 +54,7 @@ namespace dbtools
 using ::com::sun::star::i18n::LocaleData;
 using ::com::sun::star::i18n::XLocaleData;
 using ::com::sun::star::i18n::LocaleDataItem;
+using ::com::sun::star::uno::Any;
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::connectivity;
@@ -283,9 +284,9 @@ namespace dbtools
 }
 
 
-OUString OPredicateInputController::getPredicateValue(
+OUString OPredicateInputController::getPredicateValueStr(
 const OUString _rPredicateValue, const Reference XPropertySet   
_rxField,
-bool _bForStatementUse, OUString* _pErrorMessage ) const
+OUString* _pErrorMessage ) const
 {
 OSL_ENSURE( _rxField.is(), 
OPredicateInputController::getPredicateValue: invalid params! );
 OUString sReturn;
@@ -293,28 +294,84 @@ namespace dbtools
 {
 OUString sValue( _rPredicateValue );
 
-// a little problem : if the field is a text field, the 
normalizePredicateString added two
-// '-characters to the text. If we would give this to 
predicateTree this would add
-// two  additional '-characters which we don't want. So check the 
field format.
-// FS - 06.01.00 - 71532
-bool bValidQuotedText = sValue.startsWith(')  
sValue.endsWith(');
-// again : as normalizePredicateString always did a conversion 
on the value text,
-// bValidQuotedText == sal_True implies that we have a text 
field, as no other field
-// values will be formatted with the quote characters
-if ( bValidQuotedText )
-{
-sValue = sValue.copy( 1, sValue.getLength() - 2 );
-static const char sSingleQuote[] = ';
-static const char sDoubleQuote[] = '';
+// The following is mostly stolen from the former implementation 
in the parameter dialog
+// (dbaccess/source/ui/dlg/paramdialog.cxx). I do not fully 
understand this .
+
+OUString sError;
+OSQLParseNode* pParseNode = implPredicateTree( sError, sValue, 
_rxField );
+if ( _pErrorMessage )
+*_pErrorMessage = sError;
+
+implParseNode(pParseNode, true) = sReturn;
+}
 
-sal_Int32 nIndex = -1;
-sal_Int32 nTemp = 0;
-while ( -1 != ( nIndex = sValue.indexOf( sDoubleQuote,nTemp ) 
) )
+return sReturn;
+}
+
+OUString OPredicateInputController::getPredicateValueStr(
+const OUString _sField, const OUString _rPredicateValue, OUString* 
_pErrorMessage ) const
+{
+OUString sReturn = _rPredicateValue;
+OUString sError;
+OUString sField = _sField;
+sal_Int32 nIndex = 0;
+sField = sField.getToken(0,'(',nIndex);
+if(nIndex == -1)
+sField = _sField;
+sal_Int32 nType = 
::connectivity::OSQLParser::getFunctionReturnType(sField,m_aParser.getContext());
+if ( nType == DataType::OTHER || sField.isEmpty() )
+{
+// first try the international version
+OUString sSql = SELECT * FROM x WHERE  + sField + 
_rPredicateValue;
+boost::scoped_ptrOSQLParseNode pParseNode( const_cast 
OSQLParser ( m_aParser ).parseTree( sError, sSql, true ) );
+nType = DataType::DOUBLE;
+if ( pParseNode.get() )
+{
+OSQLParseNode* pColumnRef = 
pParseNode-getByRule(OSQLParseNode::column_ref);
+if ( pColumnRef )
 {
-sValue = sValue.replaceAt( nIndex, 2, sSingleQuote );
-nTemp = nIndex+2;
 }
 }
+}
+
+ReferenceXDatabaseMetaData xMeta = m_xConnection-getMetaData();
+parse::OParseColumn* pColumn = new parse::OParseColumn(

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

2014-12-02 Thread Stephan Bergmann 
 vcl/qa/cppunit/outdev.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 005748cb83554d4459b0f2d93bb39aa87c96c53d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 13:56:56 2014 +0100

CPPUNIT_ASSERT_EQUAL

Change-Id: I42f9d5532da031d6d979b874a3efc49529418d4c

diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 4ae3470..992ceea 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -63,10 +63,10 @@ void VclOutdevTest::testVirtualDevice()
 
 // Gotcha: y and x swap for BitmapReadAccess: deep joy.
 Bitmap::ScopedReadAccess pAcc(aBmp);
-CPPUNIT_ASSERT(pAcc-GetPixel(0,0) == Color(COL_WHITE));
-CPPUNIT_ASSERT(pAcc-GetPixel(2,1) == Color(COL_GREEN));
-CPPUNIT_ASSERT(pAcc-GetPixel(30,31) == Color(COL_RED));
-CPPUNIT_ASSERT(pAcc-GetPixel(31,30) == Color(COL_WHITE));
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc-GetPixel(0,0)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_GREEN, Color(pAcc-GetPixel(2,1)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_RED, Color(pAcc-GetPixel(30,31)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc-GetPixel(31,30)).GetColor());
 
 #if 0
 vcl::Window* pWin = new WorkWindow( (vcl::Window *)NULL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Noel Grandin 
 vcl/workben/vcldemo.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63fbe59d054a99224dac5fa25ff1a16890365746
Author: Noel Grandin n...@peralex.com
Date:   Tue Dec 2 14:54:44 2014 +0200

loplugin:saloverride

Change-Id: I62e8c07faf1fb38b39dfb41e0ba408d5c534312f

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index d65ea20..95329f3 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1275,7 +1275,7 @@ public:
 virtual ~DemoWidgets()
 {
 }
-virtual void Paint(const Rectangle)
+virtual void Paint(const Rectangle) SAL_OVERRIDE
 {
 Rectangle aWholeSize(Point(0, 0),GetOutputSizePixel());
 vcl::Region aClip(aWholeSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Stephan Bergmann 
 vcl/qa/cppunit/outdev.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c7bc12848a63f917a2f783f346284bd376ab4479
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 13:58:16 2014 +0100

Blue works better on Mac than green

...for whatever reason, the CPPUNIT_ASSERT_EQUALs failed with 0x057F00 !=
0x008000 for COL_GREEN, but appear to work fine for COL_BLUE.

Change-Id: I1a5817fc89feff66ceb352d0cf44f9ce2be7908a

diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 992ceea..a22f8dc 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -36,7 +36,7 @@ void VclOutdevTest::testVirtualDevice()
 aVDev.SetOutputSizePixel(Size(32,32));
 aVDev.SetBackground(Wallpaper(COL_WHITE));
 aVDev.Erase();
-aVDev.DrawPixel(Point(1,2),COL_GREEN);
+aVDev.DrawPixel(Point(1,2),COL_BLUE);
 aVDev.DrawPixel(Point(31,30),COL_RED);
 
 Size aSize = aVDev.GetOutputSizePixel();
@@ -57,14 +57,14 @@ void VclOutdevTest::testVirtualDevice()
 #endif
 
 CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(0,0)).GetColor());
-CPPUNIT_ASSERT_EQUAL(COL_GREEN, aVDev.GetPixel(Point(1,2)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_BLUE, aVDev.GetPixel(Point(1,2)).GetColor());
 CPPUNIT_ASSERT_EQUAL(COL_RED, aVDev.GetPixel(Point(31,30)).GetColor());
 CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(30,31)).GetColor());
 
 // Gotcha: y and x swap for BitmapReadAccess: deep joy.
 Bitmap::ScopedReadAccess pAcc(aBmp);
 CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc-GetPixel(0,0)).GetColor());
-CPPUNIT_ASSERT_EQUAL(COL_GREEN, Color(pAcc-GetPixel(2,1)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_BLUE, Color(pAcc-GetPixel(2,1)).GetColor());
 CPPUNIT_ASSERT_EQUAL(COL_RED, Color(pAcc-GetPixel(30,31)).GetColor());
 CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc-GetPixel(31,30)).GetColor());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75280] [Easyhack] Convert inappropriate use of sal_uIntPtr to better integer types

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=75280

Michael Stahl mst...@redhat.com changed:

   What|Removed |Added

 Status|ASSIGNED|NEW
   Assignee|vicenzi.alexan...@gmail.com |libreoffice-b...@lists.free
   ||desktop.org

--- Comment #3 from Michael Stahl mst...@redhat.com ---
looks like Alexandre isn't actually working on this; un-assigning...

actually the clean-up here should parallelize easily so multiple people can
work on it anyway.

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

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

2014-12-02 Thread Stephan Bergmann 
 vcl/inc/opengl/program.hxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 0edcbd68529c54834ca85c2dc4abd8e4e69d39b4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 14:16:10 2014 +0100

Missing include

Change-Id: I4df2b0bb114b8a375d3557c8e33487af737957f4

diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 2aeb2fd..49d3175 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -10,6 +10,10 @@
 #ifndef INCLUDED_VCL_INC_OPENGL_PROGRAM_H
 #define INCLUDED_VCL_INC_OPENGL_PROGRAM_H
 
+#include sal/config.h
+
+#include list
+
 #include GL/glew.h
 #include vcl/dllapi.h
 
___
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' - connectivity/source

2014-12-02 Thread Caolán McNamara 
 connectivity/source/drivers/hsqldb/HView.cxx |   81 +--
 connectivity/source/inc/hsqldb/HView.hxx |   11 +++
 2 files changed, 63 insertions(+), 29 deletions(-)

New commits:
commit 11b4de26833558b482e28619afe09c2c0acd7bb2
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 1 10:57:05 2014 +

Resolves: fdo#80938 fix SQL view to be editable

regression from

commit d60392fb5b387175dbd2e575848993c02c56922f
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 6 12:05:24 2014 +
coverity#706316 help out coverity re tortured logic

Change-Id: I2ee7bd3b7421ae46878d1b565ef14dd7b0bbd10e
(cherry picked from commit 6269b62b525ec22471db56015ac2daed813ec5ff)
Reviewed-on: https://gerrit.libreoffice.org/13244
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/connectivity/source/drivers/hsqldb/HView.cxx 
b/connectivity/source/drivers/hsqldb/HView.cxx
index 6cf719a..0030032 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -101,7 +101,7 @@ namespace connectivity { namespace hsqldb
 aRestoreCommand.appendAscii( CREATE VIEW  );
 aRestoreCommand.append ( sQualifiedName );
 aRestoreCommand.appendAscii(  AS  );
-aRestoreCommand.append ( impl_getCommand_throw() );
+aRestoreCommand.append ( impl_getCommand_throwSQLException() );
 OUString sRestoreCommand( aRestoreCommand.makeStringAndClear() );
 
 bool bDropSucceeded( false );
@@ -150,45 +150,47 @@ namespace connectivity { namespace hsqldb
 {
 // retrieve the very current command, don't rely on the base 
classes cached value
 // (which we initialized empty, anyway)
-try
-{
-_rValue = impl_getCommand_throw();
-}
-catch (const SQLException e)
-{
-throw WrappedTargetException(e.Message,
-static_cast XAlterView* ( const_cast HView* ( this ) ),
-::cppu::getCaughtException() );
-}
+_rValue = impl_getCommand_wrapSQLException();
+return;
 }
 
 HView_Base::getFastPropertyValue( _rValue, _nHandle );
 }
 
+OUString HView::impl_getCommand() const
+{
+OUStringBuffer aCommand;
+aCommand.appendAscii( SELECT VIEW_DEFINITION FROM 
INFORMATION_SCHEMA.SYSTEM_VIEWS  );
+HTools::appendTableFilterCrit( aCommand, m_CatalogName, m_SchemaName, 
m_Name, false );
+::utl::SharedUNOComponent XStatement  xStatement; xStatement.set( 
m_xConnection-createStatement(), UNO_QUERY_THROW );
+Reference XResultSet  xResult( xStatement-executeQuery( 
aCommand.makeStringAndClear() ), UNO_QUERY_THROW );
+if ( !xResult-next() )
+{
+// hmm. There is no view view the name as we know it. Can only 
mean some other instance
+// dropped this view meanwhile ...
+throw DisposedException();
+}
 
-OUString HView::impl_getCommand_throw() const
+Reference XRow  xRow( xResult, UNO_QUERY_THROW );
+return xRow-getString( 1 );
+}
+
+OUString HView::impl_getCommand_wrapSQLException() const
 {
 OUString sCommand;
 
 try
 {
-OUStringBuffer aCommand;
-aCommand.appendAscii( SELECT VIEW_DEFINITION FROM 
INFORMATION_SCHEMA.SYSTEM_VIEWS  );
-HTools::appendTableFilterCrit( aCommand, m_CatalogName, 
m_SchemaName, m_Name, false );
-::utl::SharedUNOComponent XStatement  xStatement; 
xStatement.set( m_xConnection-createStatement(), UNO_QUERY_THROW );
-Reference XResultSet  xResult( xStatement-executeQuery( 
aCommand.makeStringAndClear() ), UNO_QUERY_THROW );
-if ( !xResult-next() )
-{
-// hmm. There is no view view the name as we know it. Can only 
mean some other instance
-// dropped this view meanwhile ...
-throw DisposedException();
-}
-
-Reference XRow  xRow( xResult, UNO_QUERY_THROW );
-sCommand = xRow-getString( 1 );
+sCommand = impl_getCommand();
+}
+catch( const RuntimeException )
+{
+throw;
+}
+catch( const SQLException e )
+{
+throw WrappedTargetException( e.Message, static_cast XAlterView* 
( const_cast HView* ( this ) ), ::cppu::getCaughtException() );
 }
-catch( const RuntimeException ) { throw; }
-catch( const SQLException ) { throw; }
 catch( const Exception )
 {
 DBG_UNHANDLED_EXCEPTION();
@@ -197,6 +199,29 @@ namespace connectivity { namespace hsqldb
 return sCommand;
 }
 
+OUString HView::impl_getCommand_throwSQLException() const
+{
+

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

2014-12-02 Thread Michaël Lefèvre 
 sw/source/core/layout/paintfrm.cxx |   60 +++--
 1 file changed, 31 insertions(+), 29 deletions(-)

New commits:
commit 4edba25561758bf4302279bd24385cc2a66d4bcf
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date:   Mon Dec 1 17:15:36 2014 +0100

Use parameter instead of static access for inner module call

Change-Id: Ied49fd892d6de8bb105816a1759e4a349b98a72a
Reviewed-on: https://gerrit.libreoffice.org/13247
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 7bbeed8..d59e907 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -107,6 +107,8 @@ using ::drawinglayer::primitive2d::BorderLinePrimitive2D;
 using ::std::pair;
 using ::std::make_pair;
 
+struct SwPaintProperties;
+
 //other subsidiary lines enabled?
 #define IS_SUBS (!gProp.pSGlobalShell-GetViewOptions()-IsPagePreview()  \
 !gProp.pSGlobalShell-GetViewOptions()-IsReadonly()  \
@@ -155,7 +157,7 @@ public:
 bool  IsLocked()const { return nLock != 0;  }
 sal_uInt8  GetSubColor()const { return nSubColor;}
 
-bool MakeUnion( const SwRect rRect );
+bool MakeUnion( const SwRect rRect, SwPaintProperties properties );
 };
 
 #ifdef IOS
@@ -187,9 +189,9 @@ public:
 #endif
 }
 void AddLineRect( const SwRect rRect,  const Color *pColor, const 
SvxBorderStyle nStyle,
-  const SwTabFrm *pTab, const sal_uInt8 nSCol );
-void ConnectEdges( OutputDevice *pOut );
-void PaintLines  ( OutputDevice *pOut );
+  const SwTabFrm *pTab, const sal_uInt8 nSCol, 
SwPaintProperties properties );
+void ConnectEdges( OutputDevice *pOut, SwPaintProperties properties );
+void PaintLines  ( OutputDevice *pOut, SwPaintProperties properties );
 void LockLines( bool bLock );
 
 //Limit lines to 100
@@ -209,7 +211,7 @@ class BorderLines
 ::rtl::ReferenceBorderLinePrimitive2D  Lines_t;
 Lines_t m_Lines;
 public:
-void AddBorderLine(::rtl::ReferenceBorderLinePrimitive2D const xLine);
+void AddBorderLine(::rtl::ReferenceBorderLinePrimitive2D const xLine, 
SwPaintProperties properties);
 drawinglayer::primitive2d::Primitive2DSequence GetBorderLines_Clear()
 {
 ::comphelper::SequenceAsVector
@@ -597,13 +599,13 @@ lcl_TryMergeBorderLine(BorderLinePrimitive2D const rThis,
 }
 
 void BorderLines::AddBorderLine(
-rtl::ReferenceBorderLinePrimitive2D const xLine)
+rtl::ReferenceBorderLinePrimitive2D const xLine, SwPaintProperties 
properties)
 {
 for (Lines_t::reverse_iterator it = m_Lines.rbegin(); it != m_Lines.rend();
  ++it)
 {
 ::rtl::ReferenceBorderLinePrimitive2D const xMerged =
-lcl_TryMergeBorderLine(**it, *xLine, gProp);
+lcl_TryMergeBorderLine(**it, *xLine, properties);
 if (xMerged.is())
 {
 *it = xMerged; // replace existing line with merged
@@ -626,7 +628,7 @@ SwLineRect::SwLineRect( const SwRect rRect, const Color 
*pCol, const SvxBorderS
 aColor = *pCol;
 }
 
-bool SwLineRect::MakeUnion( const SwRect rRect )
+bool SwLineRect::MakeUnion( const SwRect rRect, SwPaintProperties properties)
 {
 // It has already been tested outside, whether the rectangles have
 // the same orientation (horizontal or vertical), color, etc.
@@ -635,7 +637,7 @@ bool SwLineRect::MakeUnion( const SwRect rRect )
 if ( Left()  == rRect.Left()  Width() == rRect.Width() )
 {
 // Merge when there is no gap between the lines
-const long nAdd = gProp.nSPixelSzW + gProp.nSHalfPixelSzW;
+const long nAdd = properties.nSPixelSzW + 
properties.nSHalfPixelSzW;
 if ( Bottom() + nAdd = rRect.Top() 
  Top()- nAdd = rRect.Bottom()  )
 {
@@ -650,7 +652,7 @@ bool SwLineRect::MakeUnion( const SwRect rRect )
 if ( Top()  == rRect.Top()  Height() == rRect.Height() )
 {
 // Merge when there is no gap between the lines
-const long nAdd = gProp.nSPixelSzW + gProp.nSHalfPixelSzW;
+const long nAdd = properties.nSPixelSzW + 
properties.nSHalfPixelSzW;
 if ( Right() + nAdd = rRect.Left() 
  Left()  - nAdd = rRect.Right() )
 {
@@ -664,7 +666,7 @@ bool SwLineRect::MakeUnion( const SwRect rRect )
 }
 
 void SwLineRects::AddLineRect( const SwRect rRect, const Color *pCol, const 
SvxBorderStyle nStyle,
-   const SwTabFrm *pTab, const sal_uInt8 nSCol )
+   const SwTabFrm *pTab, const sal_uInt8 nSCol, 
SwPaintProperties properties )
 {
 // Loop backwards because lines which can be combined, can usually be 
painted
 // in the same context
@@ -678,19 +680,19 @@ void SwLineRects::AddLineRect( const

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

2014-12-02 Thread Michaël Lefèvre 
 sw/source/core/layout/paintfrm.cxx |   43 ++---
 1 file changed, 22 insertions(+), 21 deletions(-)

New commits:
commit ababde703007557c59595d551efb118cf84a3911
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date:   Mon Dec 1 23:20:11 2014 +0100

Use parameter instead of static global access inside the module.

SwPaintProperties is now just use by SwFrm and derivated classes, plus two 
globales functions.

Change-Id: Icfe299163a4a8f1232a3d5076aceb949f97a4787
Reviewed-on: https://gerrit.libreoffice.org/13258
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index d59e907..6107635 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -200,9 +200,9 @@ public:
 
 class SwSubsRects : public SwLineRects
 {
-void RemoveSuperfluousSubsidiaryLines( const SwLineRects rRects );
+void RemoveSuperfluousSubsidiaryLines( const SwLineRects rRects, 
SwPaintProperties properties );
 public:
-void PaintSubsidiary( OutputDevice *pOut, const SwLineRects *pRects );
+void PaintSubsidiary( OutputDevice *pOut, const SwLineRects *pRects, 
SwPaintProperties properties );
 };
 
 class BorderLines
@@ -856,7 +856,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut, 
SwPaintProperties propertie
 }
 }
 
-void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects rRects )
+void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects rRects, 
SwPaintProperties properties )
 {
 // All help lines that are covered by any border will be removed or split
 for (size_t i = 0; i  aLineRects.size(); ++i)
@@ -875,13 +875,13 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const 
SwLineRects rRects )
 SwRect aSubsRect( aSubsLineRect );
 if ( bVerticalSubs )
 {
-aSubsRect.Left  ( aSubsRect.Left()  - 
(gProp.nSPixelSzW+gProp.nSHalfPixelSzW) );
-aSubsRect.Right ( aSubsRect.Right() + 
(gProp.nSPixelSzW+gProp.nSHalfPixelSzW) );
+aSubsRect.Left  ( aSubsRect.Left()  - 
(properties.nSPixelSzW+properties.nSHalfPixelSzW) );
+aSubsRect.Right ( aSubsRect.Right() + 
(properties.nSPixelSzW+properties.nSHalfPixelSzW) );
 }
 else
 {
-aSubsRect.Top   ( aSubsRect.Top()- 
(gProp.nSPixelSzH+gProp.nSHalfPixelSzH) );
-aSubsRect.Bottom( aSubsRect.Bottom() + 
(gProp.nSPixelSzH+gProp.nSHalfPixelSzH) );
+aSubsRect.Top   ( aSubsRect.Top()- 
(properties.nSPixelSzH+properties.nSHalfPixelSzH) );
+aSubsRect.Bottom( aSubsRect.Bottom() + 
(properties.nSPixelSzH+properties.nSHalfPixelSzH) );
 }
 for (const_iterator itK = rRects.aLineRects.begin(); itK != 
rRects.aLineRects.end(); ++itK)
 {
@@ -902,7 +902,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const 
SwLineRects rRects )
 if ( aSubsRect.Left()  = rLine.Right() 
  aSubsRect.Right() = rLine.Left() )
 {
-long nTmp = rLine.Top()-(gProp.nSPixelSzH+1);
+long nTmp = rLine.Top()-(properties.nSPixelSzH+1);
 if ( aSubsLineRect.Top()  nTmp )
 {
 SwRect aNewSubsRect( aSubsLineRect );
@@ -910,7 +910,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const 
SwLineRects rRects )
 aLineRects.push_back( SwLineRect( aNewSubsRect, 0, 
aSubsLineRect.GetStyle(), 0,
 aSubsLineRect.GetSubColor() ) 
);
 }
-nTmp = rLine.Bottom()+gProp.nSPixelSzH+1;
+nTmp = rLine.Bottom()+properties.nSPixelSzH+1;
 if ( aSubsLineRect.Bottom()  nTmp )
 {
 SwRect aNewSubsRect( aSubsLineRect );
@@ -928,7 +928,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const 
SwLineRects rRects )
 if ( aSubsRect.Top() = rLine.Bottom() 
  aSubsRect.Bottom() = rLine.Top() )
 {
-long nTmp = rLine.Left()-(gProp.nSPixelSzW+1);
+long nTmp = rLine.Left()-(properties.nSPixelSzW+1);
 if ( aSubsLineRect.Left()  nTmp )
 {
 SwRect aNewSubsRect( aSubsLineRect );
@@ -936,7 +936,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const 
SwLineRects rRects )
 aLineRects.push_back( SwLineRect( aNewSubsRect, 0, 
aSubsLineRect.GetStyle(), 0,
 aSubsLineRect.GetSubColor() ) 
);
 }
-nTmp =

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

2014-12-02 Thread Daniel Sikeler 
 sw/inc/editsh.hxx   |   13 --
 sw/source/core/edit/edattr.cxx  |  214 +++-
 sw/source/uibase/shells/txtattr.cxx |   46 ---
 3 files changed, 99 insertions(+), 174 deletions(-)

New commits:
commit a143d7d14db9b12064391879822120260eda2702
Author: Daniel Sikeler d.sikele...@gmail.com
Date:   Wed Nov 5 13:06:46 2014 +

De-/Increase fontsize when multi-sized text

I did the changes proposed in https://gerrit.libreoffice.org/#/c/11857/
I also tested it with a mixture of CJK and CTL text

Change-Id: Ic75f557b8c0a68f43abbd8c28b945e9361b7
Reviewed-on: https://gerrit.libreoffice.org/13152
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index b59cc50..a8b4d70 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -235,16 +235,11 @@ public:
 void SetAttrItem( const SfxPoolItem, sal_uInt16 nFlags = 0 );
 void SetAttrSet( const SfxItemSet, sal_uInt16 nFlags = 0, SwPaM* pCrsr = 
NULL );
 
-/** Get all items of one type in the current selection.
+/** Get RES_CHRATR_* items of one type in the current selection.
  * @param nWhich WhichId of the collected items.
- * @return Vector with the items.*/
-std::vectorconst SfxPoolItem* GetCurItem( sal_uInt16 nWhich );
-
-/** Splits the current SwPaM in smaller ones.
- * The borders of an itemtype are used as separator. The SwPaMs must be 
deleted after use.
- * @param nWhich WhichId of the item to separate at.
- * @return Vector with the smaller SwPaMs*/
-std::vectorSwPaM* GetSplitPaM( sal_uInt16 nWhich );
+ * If parts of the selection have different scripttypes, the items with 
corresponding WhichIds are also collected.
+ * @return a vector of pairs. The pair contains a SfxPoolItem and a SwPaM, 
in which the item is valid and can be changed. */
+std::vectorstd::pair const SfxPoolItem*, std::unique_ptrSwPaM 
GetItemWithPaM( sal_uInt16 nWhich );
 
 /**
  * Get the paragraph format attribute(s) of the current selection.
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 3832048..bc4651b 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -21,7 +21,6 @@
 #include editeng/tstpitem.hxx
 #include editeng/lrspitem.hxx
 #include editeng/scripttypeitem.hxx
-#include editeng/fhgtitem.hxx
 #include com/sun/star/i18n/ScriptType.hpp
 #include txatbase.hxx
 #include txtftn.hxx
@@ -283,178 +282,107 @@ SwTxtFmtColl* SwEditShell::GetPaMTxtFmtColl( SwPaM* 
pPaM ) const
 return NULL;
 }
 
-std::vectorconst SfxPoolItem* SwEditShell::GetCurItem( sal_uInt16 nWhich )
+std::vectorstd::pair const SfxPoolItem*, std::unique_ptrSwPaM  
SwEditShell::GetItemWithPaM( sal_uInt16 nWhich )
 {
-std::vectorconst SfxPoolItem* vItem;
+std::vectorstd::pair const SfxPoolItem*, std::unique_ptrSwPaM  vItem;
 SwPaM* pPaM = GetCrsr();
 SwPaM* pStartPaM = pPaM;
 do { // for all the point and mark (selections)
 
 // get the start and the end node of the current selection
-sal_uLong nSttNd = pPaM-GetMark()-nNode.GetIndex(),
-  nEndNd = pPaM-GetPoint()-nNode.GetIndex();
-sal_Int32 nSttCnt = pPaM-GetMark()-nContent.GetIndex();
-sal_Int32 nEndCnt = pPaM-GetPoint()-nContent.GetIndex();
+sal_uLong nSttNd = pPaM-Start()-nNode.GetIndex(),
+  nEndNd = pPaM-End()-nNode.GetIndex();
+sal_Int32 nSttCnt = pPaM-Start()-nContent.GetIndex();
+sal_Int32 nEndCnt = pPaM-End()-nContent.GetIndex();
 
-// reverse start and end if there number aren't sorted correctly
-if( nSttNd  nEndNd || ( nSttNd == nEndNd  nSttCnt  nEndCnt ))
-{
-std::swap(nSttNd, nEndNd);
-std::swap(nSttCnt, nEndCnt);
-}
+SwPaM* pNewPaM = 0;
+const SfxPoolItem* pItem = 0;
 
 // for all the nodes in the current selection
 for( sal_uLong n = nSttNd; n = nEndNd; ++n )
 {
 SwNode* pNd = GetDoc()-GetNodes()[ n ];
-switch( pNd-GetNodeType() )
+if( pNd-IsTxtNode() )
 {
-case ND_TEXTNODE:
+SwTxtNode* pTxtNd = static_cast SwTxtNode* ( pNd );
+const sal_Int32 nStt = (n == nSttNd) ? nSttCnt : 0;
+const sal_Int32 nEnd = (n == nEndNd)
+? nEndCnt : pTxtNd-GetTxt().getLength();
+const SwScriptInfo* pScriptInfo = SwScriptInfo::GetScriptInfo( 
*pTxtNd );
+sal_uInt8 nScript = pScriptInfo ? pScriptInfo-ScriptType( 
nStt ) : css::i18n::ScriptType::WEAK;
+nWhich = GetWhichOfScript( nWhich, nScript );
+
+// item from attribute set
+if( pTxtNd-HasSwAttrSet() )
 {
-SwTxtNode* pTxtNd = static_castSwTxtNode*(pNd);
-const

[Libreoffice-commits] core.git: pyuno/Package_python_scripts.mk pyuno/source scripting/Pyuno_mailmerge.mk scripting/source

2014-12-02 Thread Michael Stahl 
 pyuno/Package_python_scripts.mk |1 
 pyuno/source/officehelper.py|   84 
 scripting/Pyuno_mailmerge.mk|1 
 scripting/source/pyprov/officehelper.py |   84 
 4 files changed, 85 insertions(+), 85 deletions(-)

New commits:
commit 8eb37e74fff1806608563ee49489b8a1f71fc6b0
Author: Michael Stahl mst...@redhat.com
Date:   Wed Nov 19 16:26:50 2014 +0100

pyuno: move officehelper.py from scripting to pyuno

... because at least in Fedora packages with system python it's a pain
to use officehelper.bootstrap() because unlike pyuno it is not installed
in the standard python directories but in libreoffice/program.

You might think that bootstrap() is not appropriate functionality for a
UNO langauge binding, but then why does ::cppu::bootstrap() exist?

Change-Id: I5fd4b344a811c087d32fb6304e55105ab3cb137e
Reviewed-on: https://gerrit.libreoffice.org/12968
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk
index 80af459..0588af3 100644
--- a/pyuno/Package_python_scripts.mk
+++ b/pyuno/Package_python_scripts.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER)
loader/pythonloader.py \
module/uno.py \
module/unohelper.py \
+   officehelper.py \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/source/pyprov/officehelper.py 
b/pyuno/source/officehelper.py
similarity index 100%
rename from scripting/source/pyprov/officehelper.py
rename to pyuno/source/officehelper.py
diff --git a/scripting/Pyuno_mailmerge.mk b/scripting/Pyuno_mailmerge.mk
index fd1e56d..6984547 100644
--- a/scripting/Pyuno_mailmerge.mk
+++ b/scripting/Pyuno_mailmerge.mk
@@ -14,7 +14,6 @@ $(eval $(call 
gb_Pyuno_set_componentfile,mailmerge,scripting/source/pyprov/mailm
 $(eval $(call gb_Pyuno_add_files,mailmerge,,\
mailmerge.py \
msgbox.py \
-   officehelper.py \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - pyuno/Package_python_scripts.mk pyuno/source scripting/Pyuno_mailmerge.mk scripting/source

2014-12-02 Thread Michael Stahl 
 pyuno/Package_python_scripts.mk |1 
 pyuno/source/officehelper.py|   84 
 scripting/Pyuno_mailmerge.mk|1 
 scripting/source/pyprov/officehelper.py |   84 
 4 files changed, 85 insertions(+), 85 deletions(-)

New commits:
commit 4c461ee4e0b04c780ec729ec541f7a995156ab2c
Author: Michael Stahl mst...@redhat.com
Date:   Wed Nov 19 16:26:50 2014 +0100

pyuno: move officehelper.py from scripting to pyuno

... because at least in Fedora packages with system python it's a pain
to use officehelper.bootstrap() because unlike pyuno it is not installed
in the standard python directories but in libreoffice/program.

You might think that bootstrap() is not appropriate functionality for a
UNO langauge binding, but then why does ::cppu::bootstrap() exist?

Change-Id: I5fd4b344a811c087d32fb6304e55105ab3cb137e
Reviewed-on: https://gerrit.libreoffice.org/12968
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 8eb37e74fff1806608563ee49489b8a1f71fc6b0)

diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk
index 80af459..0588af3 100644
--- a/pyuno/Package_python_scripts.mk
+++ b/pyuno/Package_python_scripts.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER)
loader/pythonloader.py \
module/uno.py \
module/unohelper.py \
+   officehelper.py \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/source/pyprov/officehelper.py 
b/pyuno/source/officehelper.py
similarity index 100%
rename from scripting/source/pyprov/officehelper.py
rename to pyuno/source/officehelper.py
diff --git a/scripting/Pyuno_mailmerge.mk b/scripting/Pyuno_mailmerge.mk
index fd1e56d..6984547 100644
--- a/scripting/Pyuno_mailmerge.mk
+++ b/scripting/Pyuno_mailmerge.mk
@@ -14,7 +14,6 @@ $(eval $(call 
gb_Pyuno_set_componentfile,mailmerge,scripting/source/pyprov/mailm
 $(eval $(call gb_Pyuno_add_files,mailmerge,,\
mailmerge.py \
msgbox.py \
-   officehelper.py \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a2/fdc4c281b66d927295b93b1102046845b1b958

2014-12-02 Thread Caolán McNamara 
 a2/fdc4c281b66d927295b93b1102046845b1b958 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4989648b7335179b77ca42ebc274be1b37bdcf54
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Dec 2 13:50:34 2014 +

Notes added by 'git notes add'

diff --git a/a2/fdc4c281b66d927295b93b1102046845b1b958 
b/a2/fdc4c281b66d927295b93b1102046845b1b958
new file mode 100644
index 000..d7618ca
--- /dev/null
+++ b/a2/fdc4c281b66d927295b93b1102046845b1b958
@@ -0,0 +1 @@
+prefer: d30a8ec448bcd08c6a52a37d6ae41a4b71c235da
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 01/38631f2551dd526e9f63f779e442b185801f9e

2014-12-02 Thread Caolán McNamara 
 01/38631f2551dd526e9f63f779e442b185801f9e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d2a836edb703c02d266235621650b00bfccb879f
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Dec 2 13:51:00 2014 +

Notes added by 'git notes add'

diff --git a/01/38631f2551dd526e9f63f779e442b185801f9e 
b/01/38631f2551dd526e9f63f779e442b185801f9e
new file mode 100644
index 000..d7618ca
--- /dev/null
+++ b/01/38631f2551dd526e9f63f779e442b185801f9e
@@ -0,0 +1 @@
+prefer: d30a8ec448bcd08c6a52a37d6ae41a4b71c235da
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Renato Ferreira 
 sw/source/core/crsr/bookmrk.cxx   |8 
 sw/source/core/doc/docbm.cxx  |6 ++
 sw/source/core/inc/bookmrk.hxx|4 +++-
 sw/source/core/unocore/unobkm.cxx |1 -
 4 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit f0c4cd51cb160492d78c2796f71ecd88da25fa59
Author: Renato Ferreira renato.w...@gmail.com
Date:   Sat Nov 15 00:22:57 2014 -0500

fdo#51741 Mark document as modified on bookmark rename / delete

Change-Id: I378037ea546d0f2dc4ab9e0b0e6f9bf65c8db5b4
Deletion: overrided DdeBookmark::DeregisterFromDoc in Bookmark
Renaming: in MarkManager::renameMark
Reviewed-on: https://gerrit.libreoffice.org/12436
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 35fc43e..d79fffc 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -272,6 +272,14 @@ namespace sw { namespace mark
 io_pDoc-getIDocumentState().SetModified();
 }
 
+void Bookmark::DeregisterFromDoc(SwDoc* const io_pDoc)
+{
+DdeBookmark::DeregisterFromDoc(io_pDoc);
+
+// fdo#51741 Bookmark should mark document as modified when deleted
+io_pDoc-getIDocumentState().SetModified();
+}
+
 ::sfx2::IXmlIdRegistry Bookmark::GetRegistry()
 {
 SwDoc *const pDoc( GetMarkPos().GetDoc() );
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 22cef6b..b06097a 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -28,6 +28,7 @@
 #include dcontact.hxx
 #include doc.hxx
 #include IDocumentRedlineAccess.hxx
+#include IDocumentState.hxx
 #include docary.hxx
 #include xmloff/odffields.hxx
 #include editsh.hxx
@@ -550,6 +551,11 @@ namespace sw { namespace mark
 m_aMarkNamesSet.erase(pMarkBase-GetName());
 m_aMarkNamesSet.insert(rNewName);
 pMarkBase-SetName(rNewName);
+
+// fdo#51741 Bookmark should mark document as modified when renamed
+if (dynamic_cast ::sw::mark::Bookmark* (io_pMark)) {
+m_pDoc-getIDocumentState().SetModified();
+}
 }
 return true;
 }
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index b5eef56..d5bc95c 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -152,7 +152,7 @@ namespace sw {
 
 void SetRefObject( SwServerObject* pObj );
 
-void DeregisterFromDoc(SwDoc* const pDoc);
+virtual void DeregisterFromDoc(SwDoc* const pDoc);
 virtual ~DdeBookmark();
 
 private:
@@ -171,6 +171,8 @@ namespace sw {
 const OUString rShortName);
 virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE;
 
+virtual void DeregisterFromDoc(SwDoc* const io_pDoc) SAL_OVERRIDE;
+
 virtual const OUString GetShortName() const SAL_OVERRIDE
 { return m_sShortName; }
 virtual const vcl::KeyCode GetKeyCode() const SAL_OVERRIDE
diff --git a/sw/source/core/unocore/unobkm.cxx 
b/sw/source/core/unocore/unobkm.cxx
index 3697649..f42beb3 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -357,7 +357,6 @@ throw (uno::RuntimeException, std::exception)
 m_pImpl-m_pDoc-GetIDocumentUndoRedo().AppendUndo(
 new SwUndoRenameBookmark(*m_pImpl-m_pRegisteredBookmark, 
sOldName));
 }
-m_pImpl-m_pDoc-getIDocumentState().SetModified();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 51741] EDIITING: Deleting bookmark is not seen as a modification of document

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=51741

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

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

fdo#51741 Mark document as modified on bookmark rename / delete

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

[Bug 51741] EDIITING: Deleting bookmark is not seen as a modification of document

2014-12-02 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=51741

Commit Notification libreoffice-comm...@lists.freedesktop.org changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillCpp|SkillCpp target:4.5.0

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

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

2014-12-02 Thread Eike Rathke 
 sc/inc/column.hxx   |2 
 sc/inc/document.hxx |2 
 sc/inc/refhint.hxx  |   18 ++
 sc/inc/table.hxx|2 
 sc/source/core/data/column.cxx  |   19 ++
 sc/source/core/data/document.cxx|4 
 sc/source/core/data/formulacell.cxx |   10 +
 sc/source/core/data/table2.cxx  |4 
 sc/source/core/data/table3.cxx  |  245 +++-
 sc/source/core/tool/refhint.cxx |6 
 sc/source/ui/docshell/dbdocfun.cxx  |2 
 11 files changed, 221 insertions(+), 93 deletions(-)

New commits:
commit e119f3883513aeaa49f332362620e955dc8b453f
Author: Eike Rathke er...@redhat.com
Date:   Tue Dec 2 14:53:53 2014 +0100

fdo#86762 re-establish listeners on moved broadcasters

...  also in SortReorderByColumn() similar to SortReorderByRow()

Change-Id: I7665dcc90d70fcf3b08bef0adb9ab6aaff1cdcdf

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 857850f..280cb32 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -715,6 +715,28 @@ void ScTable::SortReorderByColumn(
 for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
 aCol[nCol].SplitFormulaGroupByRelativeRef(aSortRange);
 
+// Collect all listeners of cell broadcasters of sorted range.
+std::vectorSvtListener* aCellListeners;
+
+if (!pArray-IsUpdateRefs())
+{
+// Collect listeners of cell broadcasters.
+for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
+aCol[nCol].CollectListeners(aCellListeners, nRow1, nRow2);
+
+// Remove any duplicate listener entries.  We must ensure that we
+// notify each unique listener only once.
+std::sort(aCellListeners.begin(), aCellListeners.end());
+aCellListeners.erase(std::unique(aCellListeners.begin(), 
aCellListeners.end()), aCellListeners.end());
+
+// Notify the cells' listeners to stop listening.
+/* TODO: for performance this could be enhanced to stop and later
+ * restart only listening to within the reordered range and keep
+ * listening to everything outside untouched. */
+StopListeningNotifier aFunc;
+std::for_each(aCellListeners.begin(), aCellListeners.end(), aFunc);
+}
+
 // table to keep track of column index to position in the index table.
 std::vectorSCCOLROW aPosTable(nCount);
 for (size_t i = 0; i  nCount; ++i)
@@ -743,38 +765,38 @@ void ScTable::SortReorderByColumn(
 for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
 aCol[nCol].ResetFormulaCellPositions(nRow1, nRow2, bUpdateRefs);
 
-// Set up column reorder map (for later broadcasting of reference updates).
-sc::ColRowReorderMapType aColMap;
-const std::vectorSCCOLROW rOldIndices = pArray-GetOrderIndices();
-for (size_t i = 0, n = rOldIndices.size(); i  n; ++i)
-{
-SCCOL nNew = i + nStart;
-SCCOL nOld = rOldIndices[i];
-aColMap.insert(sc::ColRowReorderMapType::value_type(nOld, nNew));
-}
-
-// Collect all listeners within sorted range ahead of time.
-std::vectorSvtListener* aListeners;
-
-// Get all area listeners that listen on one column within the range and
-// end their listening.
-ScRange aMoveRange( nStart, nRow1, nTab, nLast, nRow2, nTab);
-std::vectorsc::AreaListener aAreaListeners = 
pDocument-GetBASM()-GetAllListeners(
-aMoveRange, sc::OneColumnInsideArea);
+if (pArray-IsUpdateRefs())
 {
-std::vectorsc::AreaListener::iterator it = aAreaListeners.begin(), 
itEnd = aAreaListeners.end();
-for (; it != itEnd; ++it)
+// Set up column reorder map (for later broadcasting of reference 
updates).
+sc::ColRowReorderMapType aColMap;
+const std::vectorSCCOLROW rOldIndices = pArray-GetOrderIndices();
+for (size_t i = 0, n = rOldIndices.size(); i  n; ++i)
 {
-pDocument-EndListeningArea(it-maArea, it-mbGroupListening, 
it-mpListener);
-aListeners.push_back( it-mpListener);
+SCCOL nNew = i + nStart;
+SCCOL nOld = rOldIndices[i];
+aColMap.insert(sc::ColRowReorderMapType::value_type(nOld, nNew));
 }
-}
 
-if (pArray-IsUpdateRefs())
-{
+// Collect all listeners within sorted range ahead of time.
+std::vectorSvtListener* aListeners;
+
 for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
 aCol[nCol].CollectListeners(aListeners, nRow1, nRow2);
 
+// Get all area listeners that listen on one column within the range
+// and end their listening.
+ScRange aMoveRange( nStart, nRow1, nTab, nLast, nRow2, nTab);
+std::vectorsc::AreaListener aAreaListeners = 
pDocument-GetBASM()-GetAllListeners(
+aMoveRange, sc::OneColumnInsideArea);
+{
+std::vectorsc::AreaListener::iterator it = 
aAreaListeners.begin(), itEnd =

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

2014-12-02 Thread Michael Stahl 
 editeng/qa/unit/core-test.cxx  |   39 +
 editeng/source/editeng/editobj.cxx |   15 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

New commits:
commit 90e3a4ba5154a451153ae9431236864f81b5bb60
Author: Michael Stahl mst...@redhat.com
Date:   Mon Dec 1 19:25:13 2014 +0100

fdo#85496: editeng: avoid exporting duplicate attributes

Since commit 0d57434180db6c8eda8c5b9b704f8a1c18b371df multiple 0-length
attributes will be exported by the ODF filter as duplicate attributes.

(cherry picked from commit 7a242b463132d67a4a2d6e69319e0da367145cc0)
(cherry picked from commit 846b56b6b99e334dfa44f1a24640aa3158509854)

This backport takes a different approach from the master fix and simply
detects duplicates in EditTextObjectImpl::GetAllSections() which should
be safe enough for 4.2.8.2.

Change-Id: Iff787c8d2a71bc3082192cc98e3d916badee65dd
Reviewed-on: https://gerrit.libreoffice.org/13261
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 4e3da9b..3d5bd81 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -573,6 +573,45 @@ void Test::testSectionAttributes()
 CPPUNIT_ASSERT_EQUAL(static_castsize_t(0), pSecAttr-mnEnd);
 CPPUNIT_ASSERT_MESSAGE(Attribute array should be empty., 
pSecAttr-maAttributes.empty());
 }
+
+
+{
+aEngine.Clear();
+aEngine.SetText(one\ntwo);
+CPPUNIT_ASSERT_EQUAL(2, aEngine.GetParagraphCount());
+
+// embolden 2nd paragraph
+pSet.reset(new SfxItemSet(aEngine.GetEmptyItemSet()));
+pSet-Put(aBold);
+aEngine.QuickSetAttribs(*pSet, ESelection(1,0,1,3));
+// disboldify 1st paragraph
+SvxWeightItem aNotSoBold(WEIGHT_NORMAL, EE_CHAR_WEIGHT);
+pSet-Put(aNotSoBold);
+aEngine.QuickSetAttribs(*pSet, ESelection(0,0,0,3));
+
+// now delete  join the paragraphs - this is fdo#85496 scenario
+aEngine.QuickDelete(ESelection(0,0,1,3));
+CPPUNIT_ASSERT_EQUAL(1, aEngine.GetParagraphCount());
+
+boost::scoped_ptrEditTextObject 
pEditText(aEngine.CreateTextObject());
+CPPUNIT_ASSERT_MESSAGE(Failed to create text object., 
pEditText.get());
+std::vectorediteng::Section aAttrs;
+pEditText-GetAllSections(aAttrs);
+
+CPPUNIT_ASSERT_EQUAL(static_castsize_t(1), aAttrs.size());
+
+const editeng::Section* pSecAttr = aAttrs[0];
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnParagraph);
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnStart);
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnEnd);
+std::setsal_uInt16 whiches;
+for (size_t i = 0; i  pSecAttr-maAttributes.size(); ++i)
+{
+sal_uInt16 const nWhich(pSecAttr-maAttributes[i]-Which());
+CPPUNIT_ASSERT_MESSAGE(duplicate item in text portion attributes,
+whiches.insert(nWhich).second);
+}
+}
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index e85448e..691256e 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1014,7 +1014,20 @@ void EditTextObjectImpl::GetAllSections( 
std::vectorediteng::Section rAttrs )
 for (; itCurAttr != aAttrs.end()  itCurAttr-mnParagraph == 
nPara  itCurAttr-mnEnd = nEnd; ++itCurAttr)
 {
 editeng::Section rSecAttr = *itCurAttr;
-rSecAttr.maAttributes.push_back(pItem);
+bool bInsert(true);
+for (size_t j = 0; j  rSecAttr.maAttributes.size(); ++j)
+{
+if (rSecAttr.maAttributes[j]-Which() == pItem-Which())
+{
+SAL_WARN(editeng, GetAllSections(): duplicate 
attribute suppressed);
+bInsert = false;
+break;
+}
+}
+if (bInsert)
+{
+rSecAttr.maAttributes.push_back(pItem);
+}
 }
 }
 }
___
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' - editeng/qa editeng/source

2014-12-02 Thread Michael Stahl 
 editeng/qa/unit/core-test.cxx  |   39 +
 editeng/source/editeng/editobj.cxx |   15 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

New commits:
commit eba15473d5cadca30edba6989512ee3e331ad197
Author: Michael Stahl mst...@redhat.com
Date:   Mon Dec 1 19:25:13 2014 +0100

fdo#85496: editeng: avoid exporting duplicate attributes

Since commit 0d57434180db6c8eda8c5b9b704f8a1c18b371df multiple 0-length
attributes will be exported by the ODF filter as duplicate attributes.

(cherry picked from commit 7a242b463132d67a4a2d6e69319e0da367145cc0)
(cherry picked from commit 846b56b6b99e334dfa44f1a24640aa3158509854)

This backport takes a different approach from the master fix and simply
detects duplicates in EditTextObjectImpl::GetAllSections() which should
be safe enough for 4.2.8.2.

Change-Id: Iff787c8d2a71bc3082192cc98e3d916badee65dd
Reviewed-on: https://gerrit.libreoffice.org/13260
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 4e9b82b..0264f45 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -573,6 +573,45 @@ void Test::testSectionAttributes()
 CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnEnd);
 CPPUNIT_ASSERT_MESSAGE(Attribute array should be empty., 
pSecAttr-maAttributes.empty());
 }
+
+
+{
+aEngine.Clear();
+aEngine.SetText(one\ntwo);
+CPPUNIT_ASSERT_EQUAL(2, aEngine.GetParagraphCount());
+
+// embolden 2nd paragraph
+pSet.reset(new SfxItemSet(aEngine.GetEmptyItemSet()));
+pSet-Put(aBold);
+aEngine.QuickSetAttribs(*pSet, ESelection(1,0,1,3));
+// disboldify 1st paragraph
+SvxWeightItem aNotSoBold(WEIGHT_NORMAL, EE_CHAR_WEIGHT);
+pSet-Put(aNotSoBold);
+aEngine.QuickSetAttribs(*pSet, ESelection(0,0,0,3));
+
+// now delete  join the paragraphs - this is fdo#85496 scenario
+aEngine.QuickDelete(ESelection(0,0,1,3));
+CPPUNIT_ASSERT_EQUAL(1, aEngine.GetParagraphCount());
+
+boost::scoped_ptrEditTextObject 
pEditText(aEngine.CreateTextObject());
+CPPUNIT_ASSERT_MESSAGE(Failed to create text object., 
pEditText.get());
+std::vectorediteng::Section aAttrs;
+pEditText-GetAllSections(aAttrs);
+
+CPPUNIT_ASSERT_EQUAL(static_castsize_t(1), aAttrs.size());
+
+const editeng::Section* pSecAttr = aAttrs[0];
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnParagraph);
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnStart);
+CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr-mnEnd);
+std::setsal_uInt16 whiches;
+for (size_t i = 0; i  pSecAttr-maAttributes.size(); ++i)
+{
+sal_uInt16 const nWhich(pSecAttr-maAttributes[i]-Which());
+CPPUNIT_ASSERT_MESSAGE(duplicate item in text portion attributes,
+whiches.insert(nWhich).second);
+}
+}
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index 41fddb0..7dfd06f 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1000,7 +1000,20 @@ void EditTextObjectImpl::GetAllSections( 
std::vectorediteng::Section rAttrs )
 for (; itCurAttr != aAttrs.end()  itCurAttr-mnParagraph == 
nPara  itCurAttr-mnEnd = nEnd; ++itCurAttr)
 {
 editeng::Section rSecAttr = *itCurAttr;
-rSecAttr.maAttributes.push_back(pItem);
+bool bInsert(true);
+for (size_t j = 0; j  rSecAttr.maAttributes.size(); ++j)
+{
+if (rSecAttr.maAttributes[j]-Which() == pItem-Which())
+{
+SAL_WARN(editeng, GetAllSections(): duplicate 
attribute suppressed);
+bInsert = false;
+break;
+}
+}
+if (bInsert)
+{
+rSecAttr.maAttributes.push_back(pItem);
+}
 }
 }
 }
___
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/source

2014-12-02 Thread Andras Timar 
 sw/source/filter/html/htmlnumwriter.cxx |   18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

New commits:
commit c5c820c4312a200847cb152bc25edc95708e6a5a
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Dec 2 11:54:43 2014 +0100

fdo#68684 export more numbering types correctly into HTML

Change-Id: I6f1df02764f271143749ffbaeb4fc988b2f72f26
(cherry picked from commit c3d913724380eb76410dc0c792e9a307bbb24ca7)
Reviewed-on: https://gerrit.libreoffice.org/13266
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/filter/html/htmlnumwriter.cxx 
b/sw/source/filter/html/htmlnumwriter.cxx
index 8296f8d..6da50de 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -228,10 +228,20 @@ Writer OutHTML_NumBulListStart( SwHTMLWriter rWrt,
 sal_Char cType = 0;
 switch( eType )
 {
-case SVX_NUM_CHARS_UPPER_LETTER:cType = 'A'; break;
-case SVX_NUM_CHARS_LOWER_LETTER:cType = 'a'; break;
-case SVX_NUM_ROMAN_UPPER:   cType = 'I'; break;
-case SVX_NUM_ROMAN_LOWER:   cType = 'i'; break;
+case SVX_NUM_CHARS_UPPER_LETTER:
+case SVX_NUM_CHARS_UPPER_LETTER_N:
+cType = 'A';
+break;
+case SVX_NUM_CHARS_LOWER_LETTER:
+case SVX_NUM_CHARS_LOWER_LETTER_N:
+cType = 'a';
+break;
+case SVX_NUM_ROMAN_UPPER:
+cType = 'I';
+break;
+case SVX_NUM_ROMAN_LOWER:
+cType = 'i';
+break;
 }
 if( cType )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread Stanislav Horacek 
 sw/source/uibase/utlui/initui.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 82842e725cdc64abf4931ad294367b699ce2a18b
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Dec 1 20:01:53 2014 +0100

capitalize e-mail in list of publication types

Change-Id: I4f6742941c4abfcebe72a0f03a4119facf99ce16
Reviewed-on: https://gerrit.libreoffice.org/13254
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/uibase/utlui/initui.src 
b/sw/source/uibase/utlui/initui.src
index 999b27b..faf9681 100644
--- a/sw/source/uibase/utlui/initui.src
+++ b/sw/source/uibase/utlui/initui.src
@@ -263,7 +263,7 @@ String STR_AUTH_TYPE_UNPUBLISHED
 };
 String STR_AUTH_TYPE_EMAIL
 {
-Text [ en-US ] = e-mail;
+Text [ en-US ] = E-mail;
 };
 String STR_AUTH_TYPE_WWW
 {
___
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/uiconfig

2014-12-02 Thread Stanislav Horacek 
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui |2 +-
 sc/uiconfig/scalc/ui/movingaveragedialog.ui|2 +-
 sc/uiconfig/scalc/ui/randomnumbergenerator.ui  |6 +++---
 sc/uiconfig/scalc/ui/samplingdialog.ui |4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 0795fb9395d3245cbde679f9622d11020daf7ce4
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Dec 1 19:55:44 2014 +0100

mark numbers as untranslatable

Change-Id: Ieb04f562e94ae4b8f09efbfeeaea7009c22322ff
Reviewed-on: https://gerrit.libreoffice.org/13253
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui 
b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
index aec9a9a..93a5884 100644
--- a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
+++ b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
@@ -310,7 +310,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=invisible_char•/property
-property name=text 
translatable=yes0,20/property
+property name=text translatable=no0,20/property
 property 
name=adjustmentsmoothing-factor-adjustment/property
 property name=digits2/property
 property name=value0.2000298023224/property
diff --git a/sc/uiconfig/scalc/ui/movingaveragedialog.ui 
b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
index 6e3a7c3..c16f4ad 100644
--- a/sc/uiconfig/scalc/ui/movingaveragedialog.ui
+++ b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
@@ -308,7 +308,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=invisible_char•/property
-property name=text translatable=yes2/property
+property name=text translatable=no2/property
 property 
name=adjustmentinterval-adjustment/property
 property name=value2/property
   /object
diff --git a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui 
b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
index e46f1b3..002b848 100644
--- a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
+++ b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
@@ -315,7 +315,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_char•/property
-property name=text 
translatable=yes0,/property
+property name=text 
translatable=no0,/property
 property 
name=adjustmentparameter2-adjustment/property
 property name=digits4/property
   /object
@@ -330,7 +330,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_char•/property
-property name=text 
translatable=yes1,/property
+property name=text 
translatable=no1,/property
 property 
name=adjustmentparameter1-adjustment/property
 property name=digits4/property
 property name=value1/property
@@ -461,7 +461,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_char•/property
-property name=text translatable=yes1/property
+property name=text translatable=no1/property
 property 
name=adjustmentdecimal-places-adjustment/property
 property name=value1/property
   /object
diff --git a/sc/uiconfig/scalc/ui/samplingdialog.ui 
b/sc/uiconfig/scalc/ui/samplingdialog.ui
index 9a1f721..7689bec 100644
--- a/sc/uiconfig/scalc/ui/samplingdialog.ui
+++ b/sc/uiconfig/scalc/ui/samplingdialog.ui
@@ -230,7 +230,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_char•/property
-property name=text translatable=yes0/property
+property name=text translatable=no0/property
 property 
name=adjustmentsample-size-adjustment/property
 property name=update_policyif-valid/property
   /object
@@ -295,7 +295,7 @@
 property name=can_focusTrue/property

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

2014-12-02 Thread Yousuf Philips 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   12 +--
 sw/uiconfig/swriter/toolbar/tableobjectbar.xml  |   35 
+-
 2 files changed, 25 insertions(+), 22 deletions(-)

New commits:
commit dd359cff8814ad7a9796f05cd21c9d98190898c2
Author: Yousuf Philips philip...@hotmail.com
Date:   Tue Dec 2 16:04:39 2014 +0400

fdo#81475 reorganization of writer's table toolbar

Change-Id: I3672fa8e32975723d58e92fe3eceafc2e8993646
Reviewed-on: https://gerrit.libreoffice.org/13267
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index a417ddc..8616b5e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1109,7 +1109,7 @@
   /node
   node oor:name=.uno:DeleteRows oor:op=replace
 prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USDelete Row/value
+  value xml:lang=en-USDelete Rows/value
 /prop
 prop oor:name=ContextLabel oor:type=xs:string
   value xml:lang=en-US~Rows/value
@@ -1120,7 +1120,7 @@
   /node
   node oor:name=.uno:DeleteColumns oor:op=replace
 prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USDelete Column/value
+  value xml:lang=en-USDelete Columns/value
 /prop
 prop oor:name=ContextLabel oor:type=xs:string
   value xml:lang=en-US~Columns/value
@@ -1199,10 +1199,10 @@
   /node
   node oor:name=.uno:EntireRow oor:op=replace
 prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USSelect Rows/value
+  value xml:lang=en-USSelect Row/value
 /prop
 prop oor:name=ContextLabel oor:type=xs:string
-  value xml:lang=en-US~Rows/value
+  value xml:lang=en-US~Row/value
 /prop
 prop oor:name=Properties oor:type=xs:int
   value1/value
@@ -1210,7 +1210,7 @@
   /node
   node oor:name=.uno:EntireCell oor:op=replace
 prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USC~ells/value
+  value xml:lang=en-USC~ell/value
 /prop
   /node
   node oor:name=.uno:GoUp oor:op=replace
@@ -1223,7 +1223,7 @@
   value xml:lang=en-USSelect Column/value
 /prop
 prop oor:name=ContextLabel oor:type=xs:string
-  value xml:lang=en-US~Columns/value
+  value xml:lang=en-US~Column/value
 /prop
 prop oor:name=Properties oor:type=xs:int
   value1/value
diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
index 1e147ce..4ca1f02 100644
--- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
@@ -18,33 +18,36 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 --
 toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; 
xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar
- toolbar:toolbaritem xlink:href=.uno:LineStyle/
- toolbar:toolbaritem xlink:href=.uno:FrameLineColor/
+ toolbar:toolbaritem xlink:href=.uno:TableDialog/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:SetBorderStyle/
- toolbar:toolbaritem xlink:href=.uno:BackgroundColor 
toolbar:style=dropdown/
+ toolbar:toolbaritem xlink:href=.uno:InsertRows/
+ toolbar:toolbaritem xlink:href=.uno:InsertColumns/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:DeleteRows/
+ toolbar:toolbaritem xlink:href=.uno:DeleteColumns/
+ toolbar:toolbaritem xlink:href=.uno:DeleteTable/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:EntireRow/
+ toolbar:toolbaritem xlink:href=.uno:EntireColumn/
+ toolbar:toolbaritem xlink:href=.uno:SelectTable/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:MergeCells/
  toolbar:toolbaritem xlink:href=.uno:SplitCell/
  toolbar:toolbaritem xlink:href=.uno:OptimizeTable 
toolbar:style=dropdown/
- toolbar:toolbarbreak/
+ toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:CellVertTop toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:CellVertCenter toolbar:style=radio/
  toolbar:toolbaritem xlink:href=.uno:CellVertBottom toolbar:style=radio/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:InsertRows/
- toolbar:toolbaritem xlink:href=.uno:InsertColumns/
- toolbar:toolbaritem xlink:href=.uno:DeleteRows/
- toolbar:toolbaritem xlink:href=.uno:DeleteColumns/
- toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:SelectTable toolbar:visible=false/
- toolbar:toolbaritem xlink:href=.uno:EntireColumn toolbar:visible=false/
- toolbar:toolbaritem xlink:href=.uno:EntireRow toolbar:visible=false/
- toolbar:toolbarseparator/

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

2014-12-02 Thread Stanislav Horacek 
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui |2 +-
 sc/uiconfig/scalc/ui/movingaveragedialog.ui|2 +-
 sc/uiconfig/scalc/ui/randomnumbergenerator.ui  |6 +++---
 sc/uiconfig/scalc/ui/samplingdialog.ui |4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5228c6742734b0936b2b468315e069fd6bcc1dac
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Dec 1 19:52:55 2014 +0100

mark numbers as untranslatable

Change-Id: Ib6aa1a53bef3aefd9266b87340a5d787d99e600a
Reviewed-on: https://gerrit.libreoffice.org/13252
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui 
b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
index aec9a9a..93a5884 100644
--- a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
+++ b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
@@ -310,7 +310,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=invisible_char•/property
-property name=text 
translatable=yes0,20/property
+property name=text translatable=no0,20/property
 property 
name=adjustmentsmoothing-factor-adjustment/property
 property name=digits2/property
 property name=value0.2000298023224/property
diff --git a/sc/uiconfig/scalc/ui/movingaveragedialog.ui 
b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
index 6e3a7c3..c16f4ad 100644
--- a/sc/uiconfig/scalc/ui/movingaveragedialog.ui
+++ b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
@@ -308,7 +308,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=invisible_char•/property
-property name=text translatable=yes2/property
+property name=text translatable=no2/property
 property 
name=adjustmentinterval-adjustment/property
 property name=value2/property
   /object
diff --git a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui 
b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
index e46f1b3..002b848 100644
--- a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
+++ b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
@@ -315,7 +315,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_char•/property
-property name=text 
translatable=yes0,/property
+property name=text 
translatable=no0,/property
 property 
name=adjustmentparameter2-adjustment/property
 property name=digits4/property
   /object
@@ -330,7 +330,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_char•/property
-property name=text 
translatable=yes1,/property
+property name=text 
translatable=no1,/property
 property 
name=adjustmentparameter1-adjustment/property
 property name=digits4/property
 property name=value1/property
@@ -461,7 +461,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_char•/property
-property name=text translatable=yes1/property
+property name=text translatable=no1/property
 property 
name=adjustmentdecimal-places-adjustment/property
 property name=value1/property
   /object
diff --git a/sc/uiconfig/scalc/ui/samplingdialog.ui 
b/sc/uiconfig/scalc/ui/samplingdialog.ui
index 9a1f721..7689bec 100644
--- a/sc/uiconfig/scalc/ui/samplingdialog.ui
+++ b/sc/uiconfig/scalc/ui/samplingdialog.ui
@@ -230,7 +230,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_char•/property
-property name=text translatable=yes0/property
+property name=text translatable=no0/property
 property 
name=adjustmentsample-size-adjustment/property
 property name=update_policyif-valid/property
   /object
@@ -295,7 +295,7 @@
 property name=can_focusTrue/property

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

2014-12-02 Thread Winfried Donkers 
 sc/source/ui/app/inputhdl.cxx |   23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 7a93554500f82adec8f89fd4a137af07ec502013
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Wed Nov 12 11:18:35 2014 +0100

fdo#86169 fix completion of function name crash

function names with dot or underscore were not completed
correctly, leading to incorrect results or even crashes

Change-Id: Iacb6af29c609ab39746185c71d4443537bf46b5e
Reviewed-on: https://gerrit.libreoffice.org/12380
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
(cherry picked from commit 5456abc4d734583664a55c01a0e750e3051b03c9)
Signed-off-by: Eike Rathke er...@redhat.com
(cherry picked from commit d4aa91aa4cf7a01915cb9a2b1e4d52e20bf7454b)
Reviewed-on: https://gerrit.libreoffice.org/13155
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index aa1c955..961cbcd 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1149,16 +1149,23 @@ void completeFunction( EditView* pView, const OUString 
rInsert, bool rParInser
 aSel = pView-GetSelection();
 ESelection aOldSelection = aSel;
 OUString aSelectedText = pView-GetSelected();
-while(needToExtendSelection(aSelectedText, rInsert))
+if ( needToExtendSelection( aSelectedText, rInsert ) )
 {
-assert(aSel.nStartPos  0);
---aSel.nStartPos;
---aSel.nEndPos = aSel.nStartPos;
-pView-SetSelection(aSel);
-pView-SelectCurrentWord();
-aSelectedText = pView-GetSelected();
+while(needToExtendSelection(aSelectedText, rInsert))
+{
+assert(aSel.nStartPos  0);
+--aSel.nStartPos;
+aSel.nEndPos = aSel.nStartPos;
+pView-SetSelection(aSel);
+pView-SelectCurrentWord();
+aSelectedText = pView-GetSelected();
+}
+aSel.nStartPos = aSel.nEndPos - ( aSelectedText.getLength() - 
1 );
+}
+else
+{
+aSel.nStartPos = aSel.nEndPos - aSelectedText.getLength();
 }
-aSel.nStartPos -= ( aSelectedText.getLength() - 1 );
 aSel.nEndPos = aOldSelection.nEndPos;
 pView-SetSelection(aSel);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 2 commits - include/vcl vcl/inc vcl/opengl vcl/source

2014-12-02 Thread Louis-Francis Ratté-Boulianne 
 include/vcl/opengl/OpenGLContext.hxx |2 --
 vcl/inc/opengl/win/gdiimpl.hxx   |1 -
 vcl/inc/opengl/x11/gdiimpl.hxx   |1 -
 vcl/inc/openglgdiimpl.hxx|6 +++---
 vcl/opengl/gdiimpl.cxx   |   21 +++--
 vcl/opengl/win/gdiimpl.cxx   |   11 ++-
 vcl/opengl/x11/gdiimpl.cxx   |   10 --
 vcl/source/opengl/OpenGLContext.cxx  |8 
 8 files changed, 16 insertions(+), 44 deletions(-)

New commits:
commit e957683050f6598f00e9cebb13273c1c701d34cb
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date:   Tue Dec 2 09:08:57 2014 -0500

vcl: Release the OpenGL context for offscreen rendering after each operation

Change-Id: If253a4c0a1f64b1cc54e0079d4455abf39620ac0

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 1a38b1c..1fb59a2 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -160,6 +160,11 @@ void OpenGLSalGraphicsImpl::PostDraw()
 mpFramebuffer = NULL;
 
 CHECK_GL_ERROR();
+
+// release the context as there is no guarantee the underlying window
+// will still be valid for the next draw operation
+if( mbOffscreen )
+ReleaseContext();
 }
 
 void OpenGLSalGraphicsImpl::freeResources()
commit 797f4443559339ef25bce6b124f346c7dbc12a96
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date:   Tue Dec 2 09:05:19 2014 -0500

vcl: Don't create new contexts for Virtual Devices on Windows

Change-Id: I561a8142f986aca89e796ce2c4a0902fae41f9e6

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index 679de09..6546dde 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -238,8 +238,6 @@ public:
 return mbInitialized;
 }
 
-void resetToReInitialize();
-
 bool supportMultiSampling() const;
 
 static SystemWindowData generateWinData(vcl::Window* pParent, bool 
bRequestLegacyContext);
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index 30ade23..03007c9 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -30,7 +30,6 @@ public:
 protected:
 virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE;
 virtual bool UseContext( OpenGLContext* pContext ) SAL_OVERRIDE;
-virtual OpenGLContext* CreatePixmapContext() SAL_OVERRIDE;
 
 public:
 virtual void copyBits( const SalTwoRect rPosAry, SalGraphics* 
pSrcGraphics ) SAL_OVERRIDE;
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index d6ef010..feb3961 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -27,7 +27,6 @@ public:
 
 protected:
 virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE;
-virtual OpenGLContext* CreatePixmapContext() SAL_OVERRIDE;
 virtual bool UseContext( OpenGLContext* pContext ) SAL_OVERRIDE;
 
 public:
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 42c5520..3a4222e 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -110,12 +110,12 @@ protected:
 bool AcquireContext();
 bool ReleaseContext();
 
+// retrieve the default context for offscreen rendering
+virtual OpenGLContext* GetDefaultContext();
+
 // create a new context for window rendering
 virtual OpenGLContext* CreateWinContext() = 0;
 
-// create a new context for offscreen rendering
-virtual OpenGLContext* CreatePixmapContext() = 0;
-
 // check whether the given context can be used by this instance
 virtual bool UseContext( OpenGLContext* pContext ) = 0;
 
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index e9ae4db..1a38b1c 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -61,6 +61,11 @@ OpenGLContext* OpenGLSalGraphicsImpl::GetOpenGLContext()
 return mpContext;
 }
 
+OpenGLContext* OpenGLSalGraphicsImpl::GetDefaultContext()
+{
+return ImplGetDefaultWindow()-GetGraphics()-GetOpenGLContext();
+}
+
 bool OpenGLSalGraphicsImpl::AcquireContext( )
 {
 ImplSVData* pSVData = ImplGetSVData();
@@ -80,7 +85,7 @@ bool OpenGLSalGraphicsImpl::AcquireContext( )
 if( pContext )
 pContext-AddRef();
 else
-pContext = mbOffscreen ? CreatePixmapContext() : CreateWinContext();
+pContext = mbOffscreen ? GetDefaultContext() : CreateWinContext();
 
 mpContext = pContext;
 return (mpContext != NULL);
@@ -111,15 +116,6 @@ void OpenGLSalGraphicsImpl::Init()
 maOffscreenTex.GetHeight() != GetHeight() )
 {
 maOffscreenTex = OpenGLTexture();
-#if defined(WNT)
-// URGH ... VirtualDevice may have destroyed the underlying resource
-// our context is associated with - FIXME: can we do better here ?
-if (mpContext)
-{
-mpContext-resetToReInitialize();
-ReleaseContext();
-}
-#endif
 }
 }
 
diff --git a/vcl/opengl/win/gdiimpl.cxx

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

2014-12-02 Thread Caolán McNamara 
 config_host.mk.in  |1 +
 configure.ac   |   12 
 solenv/gbuild/platform/com_GCC_defs.mk |5 +
 3 files changed, 18 insertions(+)

New commits:
commit 34555600b019a85f0aec0a9d18e7833bc934788b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 1 10:02:36 2014 +

attempt to default enable stack-protector-strong

Change-Id: Iee42b3f6ab66636961e9ba1da33ab0e83d607eaa
Reviewed-on: https://gerrit.libreoffice.org/13241
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/config_host.mk.in b/config_host.mk.in
index 648705a..13639e8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -240,6 +240,7 @@ export GUIBASE=@GUIBASE@
 export HAMCREST_JAR=@HAMCREST_JAR@
 export HARDLINKDELIVER=@HARDLINKDELIVER@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
+export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
 export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
 export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
diff --git a/configure.ac b/configure.ac
index ae82b56..3be712e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5751,6 +5751,17 @@ if test $GCC = yes; then
 AC_MSG_RESULT([no])
 fi
 
+AC_MSG_CHECKING([whether $CC supports -fstack-protector-strong])
+save_CFLAGS=$CFLAGS
+CFLAGS=$CFLAGS -Werror -fstack-protector-strong
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
+CFLAGS=$save_CFLAGS
+if test $HAVE_GCC_STACK_PROTECTOR_STRONG = TRUE; then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+fi
+
 AC_MSG_CHECKING([whether $CC supports atomic functions])
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
 int v = 0;
@@ -5844,6 +5855,7 @@ if test $GCC = yes; then
 fi
 
 AC_SUBST(HAVE_GCC_AVX)
+AC_SUBST(HAVE_GCC_STACK_PROTECTOR_STRONG)
 AC_SUBST(HAVE_GCC_BUILTIN_ATOMIC)
 
 dnl ===
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index b6d9735..7acd068 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -96,6 +96,11 @@ gb_CXXFLAGS_COMMON += -fvisibility-inlines-hidden
 endif
 endif
 
+ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
+gb_CFLAGS_COMMON += -fstack-protector-strong
+gb_CXXFLAGS_COMMON += -fstack-protector-strong
+endif
+
 gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)
 
 # This is the default in non-C++11 mode
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-02 Thread David Ostrovsky 
 external/lcms2/ExternalProject_lcms2.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74b2cdd48992c3627586887d67638fc87125ca94
Author: David Ostrovsky da...@ostrovsky.org
Date:   Sun Nov 30 18:29:22 2014 +0100

lcms2: Don't hard code Win32 platform on Windows

Change-Id: I60701b2c0a0ec06ada24b397107b337676dbd319
Reviewed-on: https://gerrit.libreoffice.org/13229
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/external/lcms2/ExternalProject_lcms2.mk 
b/external/lcms2/ExternalProject_lcms2.mk
index 56982ee..dd98222 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
MSBuild.exe lcms2_DLL.vcxproj \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   /p:Platform=Win32 /p:TargetName=lcms2 \
+   /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) 
/p:TargetName=lcms2 \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,$(if $(filter 
120,$(VCVER)),Projects/VC2013/lcms2_DLL,Projects/VC2010/lcms2_DLL))
 else
___
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' - 3 commits - sc/inc sc/source

2014-12-02 Thread Eike Rathke 
 sc/inc/column.hxx   |2 
 sc/inc/document.hxx |2 
 sc/inc/refhint.hxx  |   18 ++
 sc/inc/table.hxx|2 
 sc/source/core/data/column.cxx  |   19 ++
 sc/source/core/data/document.cxx|4 
 sc/source/core/data/formulacell.cxx |   10 +
 sc/source/core/data/table2.cxx  |4 
 sc/source/core/data/table3.cxx  |  245 +++-
 sc/source/core/tool/refhint.cxx |6 
 sc/source/ui/docshell/dbdocfun.cxx  |2 
 11 files changed, 221 insertions(+), 93 deletions(-)

New commits:
commit 61f8e9734d5e27fd39978bada0e91c1526bc6003
Author: Eike Rathke er...@redhat.com
Date:   Tue Dec 2 14:53:53 2014 +0100

fdo#86762 re-establish listeners on moved broadcasters

...  also in SortReorderByColumn() similar to SortReorderByRow()

Change-Id: I7665dcc90d70fcf3b08bef0adb9ab6aaff1cdcdf
(cherry picked from commit e119f3883513aeaa49f332362620e955dc8b453f)

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 2c7b309..7e1d24a 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -714,6 +714,28 @@ void ScTable::SortReorderByColumn(
 for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
 aCol[nCol].SplitFormulaGroupByRelativeRef(aSortRange);
 
+// Collect all listeners of cell broadcasters of sorted range.
+std::vectorSvtListener* aCellListeners;
+
+if (!pArray-IsUpdateRefs())
+{
+// Collect listeners of cell broadcasters.
+for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
+aCol[nCol].CollectListeners(aCellListeners, nRow1, nRow2);
+
+// Remove any duplicate listener entries.  We must ensure that we
+// notify each unique listener only once.
+std::sort(aCellListeners.begin(), aCellListeners.end());
+aCellListeners.erase(std::unique(aCellListeners.begin(), 
aCellListeners.end()), aCellListeners.end());
+
+// Notify the cells' listeners to stop listening.
+/* TODO: for performance this could be enhanced to stop and later
+ * restart only listening to within the reordered range and keep
+ * listening to everything outside untouched. */
+StopListeningNotifier aFunc;
+std::for_each(aCellListeners.begin(), aCellListeners.end(), aFunc);
+}
+
 // table to keep track of column index to position in the index table.
 std::vectorSCCOLROW aPosTable(nCount);
 for (size_t i = 0; i  nCount; ++i)
@@ -742,38 +764,38 @@ void ScTable::SortReorderByColumn(
 for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
 aCol[nCol].ResetFormulaCellPositions(nRow1, nRow2, bUpdateRefs);
 
-// Set up column reorder map (for later broadcasting of reference updates).
-sc::ColRowReorderMapType aColMap;
-const std::vectorSCCOLROW rOldIndices = pArray-GetOrderIndices();
-for (size_t i = 0, n = rOldIndices.size(); i  n; ++i)
-{
-SCCOL nNew = i + nStart;
-SCCOL nOld = rOldIndices[i];
-aColMap.insert(sc::ColRowReorderMapType::value_type(nOld, nNew));
-}
-
-// Collect all listeners within sorted range ahead of time.
-std::vectorSvtListener* aListeners;
-
-// Get all area listeners that listen on one column within the range and
-// end their listening.
-ScRange aMoveRange( nStart, nRow1, nTab, nLast, nRow2, nTab);
-std::vectorsc::AreaListener aAreaListeners = 
pDocument-GetBASM()-GetAllListeners(
-aMoveRange, sc::OneColumnInsideArea);
+if (pArray-IsUpdateRefs())
 {
-std::vectorsc::AreaListener::iterator it = aAreaListeners.begin(), 
itEnd = aAreaListeners.end();
-for (; it != itEnd; ++it)
+// Set up column reorder map (for later broadcasting of reference 
updates).
+sc::ColRowReorderMapType aColMap;
+const std::vectorSCCOLROW rOldIndices = pArray-GetOrderIndices();
+for (size_t i = 0, n = rOldIndices.size(); i  n; ++i)
 {
-pDocument-EndListeningArea(it-maArea, it-mbGroupListening, 
it-mpListener);
-aListeners.push_back( it-mpListener);
+SCCOL nNew = i + nStart;
+SCCOL nOld = rOldIndices[i];
+aColMap.insert(sc::ColRowReorderMapType::value_type(nOld, nNew));
 }
-}
 
-if (pArray-IsUpdateRefs())
-{
+// Collect all listeners within sorted range ahead of time.
+std::vectorSvtListener* aListeners;
+
 for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
 aCol[nCol].CollectListeners(aListeners, nRow1, nRow2);
 
+// Get all area listeners that listen on one column within the range
+// and end their listening.
+ScRange aMoveRange( nStart, nRow1, nTab, nLast, nRow2, nTab);
+std::vectorsc::AreaListener aAreaListeners = 
pDocument-GetBASM()-GetAllListeners(
+aMoveRange, sc::OneColumnInsideArea);
+{
+

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

2014-12-02 Thread David Ostrovsky 
 external/glew/ExternalPackage_glew.mk |   10 +-
 external/glew/ExternalProject_glew.mk |2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit ce0513a9ee79d29f38db6b6b2bbc662826350eb6
Author: David Ostrovsky da...@ostrovsky.org
Date:   Sun Nov 30 19:19:13 2014 +0100

glew: Don't hard code Win32 platform on Windows

Change-Id: I753602314f0ed3822bce489e9e427a1de77d2431
Reviewed-on: https://gerrit.libreoffice.org/13230
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/external/glew/ExternalPackage_glew.mk 
b/external/glew/ExternalPackage_glew.mk
index a110f70..6678a69 100644
--- a/external/glew/ExternalPackage_glew.mk
+++ b/external/glew/ExternalPackage_glew.mk
@@ -11,12 +11,20 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,glew,glew))
 
 $(eval $(call gb_ExternalPackage_use_external_project,glew,glew))
 
+ifeq ($(OS)-$(COM),WNT-MSC)
+ifeq ($(CPUNAME),INTEL)
+glew_arch_subdir=Win32
+else ifeq ($(CPUNAME),X86_64)
+glew_arch_subdir=x64
+endif
+endif
+
 ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.1.10.0.dylib,lib/libGLEW.1.10.0.dylib))
 else ifeq ($(OS)-$(COM),WNT-GCC)
 else ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalPackage_add_files,glew,$(LIBO_LIB_FOLDER), \
-   bin/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.dll,Release/Win32/glew32.dll) \
+   bin/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/$(glew_arch_subdir)/glew32d.dll,Release/$(glew_arch_subdir)/glew32.dll)
 \
 ))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
 $(eval $(call 
gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.so.1.10,lib/libGLEW.so.1.10.0))
diff --git a/external/glew/ExternalProject_glew.mk 
b/external/glew/ExternalProject_glew.mk
index 54348f5..714972c 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,glew,\
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,build,\
-   msbuild.exe glew_shared.vcxproj /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+   msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 
80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,$(if $(filter 120,$(VCVER)),build/vc12,build/vc10))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-sdk odk/config odk/docs odk/settings

2014-12-02 Thread Stephan Bergmann 
 bin/distro-install-sdk  |1 -
 odk/config/configure.pl |4 
 odk/config/setsdkenv_unix.sh.in |   13 -
 odk/docs/install.html   |   22 ++
 odk/settings/settings.mk|4 +---
 5 files changed, 11 insertions(+), 33 deletions(-)

New commits:
commit 0ffe0bf68abcab15cfa2b4c949d30262a4aaa0e0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 15:41:20 2014 +0100

Fold URE: Remove OO_SDK_URE_HOME on non-Windows

Change-Id: Iad0480eb39e2c1312c27cf9b90146c2beba592fd

diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index 4bc4edf..f2b6e30 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -68,7 +68,6 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
 sed -e s,@OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk, \
 -e s,@OO_SDK_HOME@,$INSTALLDIR/sdk, \
 -e s,@OFFICE_HOME@,$INSTALLDIR, \
--e s,@OO_SDK_URE_HOME@,$INSTALLDIR/ure-link, \
 -e s,@OO_SDK_MAKE_HOME@,/usr/bin, \
 -e s,@OO_SDK_ZIP_HOME@,/usr/bin, \
 -e s,@OO_SDK_CPP_HOME@,/usr/bin, \
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 7080727..c0f3188 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -114,7 +114,6 @@ if ( $main::operatingSystem =~ m/darwin/ )
 }
 
 }
-$main::OO_SDK_URE_HOME = $main::OFFICE_HOME/Contents;
 } else
 {
 $main::OFFICE_HOME_SUGGESTION = searchoffice();
@@ -184,8 +183,6 @@ if ( $main::operatingSystem =~ m/darwin/ )
 }
 }
 }
-
-$main::OO_SDK_URE_HOME = $main::OFFICE_HOME;
 }
 
 # prepare GNU make path
@@ -768,7 +765,6 @@ sub prepareScriptFile()
 $_ =~ s#\@OO_SDK_NAME\@#$main::OO_SDK_NAME#go;
 $_ =~ s#\@OO_SDK_HOME\@#$main::OO_SDK_HOME#go;
 $_ =~ s#\@OFFICE_HOME\@#$main::OFFICE_HOME#go;
-$_ =~ s#\@OO_SDK_URE_HOME\@#$main::OO_SDK_URE_HOME#go;
 $_ =~ s#\@OO_SDK_MAKE_HOME\@#$main::OO_SDK_MAKE_HOME#go;
 $_ =~ s#\@OO_SDK_ZIP_HOME\@#$main::OO_SDK_ZIP_HOME#go;
 $_ =~ s#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go;
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index fc18d30..17afca3 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -32,11 +32,7 @@ OO_SDK_HOME='@OO_SDK_HOME@'
 # Office installation directory.
 # Example: OFFICE_HOME=/opt/libreoffice
 OFFICE_HOME='@OFFICE_HOME@'
-
-# URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/libreoffice/ure
-OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
-export OO_SDK_URE_HOME
+export OFFICE_HOME
 
 # Directory of the make command.
 # Example: OO_SDK_MAKE_HOME=/usr/bin
@@ -107,9 +103,9 @@ export UNO_PATH
 
 case ${sdk_platform} in
 darwin*)
-OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/MacOS
-OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/Frameworks
-OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/Resources/java
+OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
+OO_SDK_URE_LIB_DIR=${OFFICE_HOME}/Contents/Frameworks
+OO_SDK_URE_JAVA_DIR=${OFFICE_HOME}/${sdk_lo_java_dir}
 ;;
 *)
 OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
@@ -294,7 +290,6 @@ echo  * SDK environment is prepared for ${platform}
 echo  *
 echo  * SDK = $OO_SDK_HOME
 echo  * Office = $OFFICE_HOME
-echo  * URE = $OO_SDK_URE_HOME
 echo  * Make = $OO_SDK_MAKE_HOME
 echo  * Zip = $OO_SDK_ZIP_HOME
 echo  * cat = $OO_SDK_CAT_HOME
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 2ac300f..a39323e 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -240,12 +240,6 @@
   when you use the SDK build environment./td
   /tr
   tr
-td class=cell20bOO_SDK_URE_HOME/b/td
-td class=cell80Path to an existing UNO
-  Runtime Environment installation, e.g.
-  quot;/opt/libreoffice/urequot;./td
-  /tr
-  tr
 td class=cell20bOO_SDK_HOME/b/td
 td class=cell80Path to the SDK root
   directory, e.g.
@@ -346,24 +340,20 @@
   tr valign=top
 td class=cell20OO_SDK_URE_BIN_DIR/td
 td class=cell80The path within the chosen
-  URE installation where binary executables are
-  located (e.g., i$OO_SDK_URE_HOME/bin/i
-  for a Unix installation)./td
+  LibreOffice URE installation where binary
+  executables are located./td
   /tr
   tr valign=top

[Libreoffice-commits] core.git: odk/settings

2014-12-02 Thread Stephan Bergmann 
 odk/settings/settings.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 428bd61cd80b49c0e4ec1b2ee4b4b8870ebf9a35
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 15:44:07 2014 +0100

Consistently use $(...)

Change-Id: I68d3f99ca2a53988fb40ce0d5d364e19a8781cc0

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index b8548e3..2169af4 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -235,7 +235,7 @@ LIBRARY_LINK_FLAGS+=-m64
 EXE_LINK_FLAGS+=-m64
 endif
 
-URE_MISC=${OFFICE_PROGRAM_PATH}
+URE_MISC=$(OFFICE_PROGRAM_PATH)
 
 endif
 
@@ -347,7 +347,7 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined 
-Wl,-export-dynamic -Wl,-z,defs -Wl,-
 LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_LIB_DIR)
 LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)
 
-URE_MISC=${OFFICE_PROGRAM_PATH}
+URE_MISC=$(OFFICE_PROGRAM_PATH)
 
 endif
 
@@ -555,6 +555,6 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined
 LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_LIB_DIR) 
$(PTHREAD_LIBS)
 LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)
 
-URE_MISC=${OFFICE_PROGRAM_PATH}
+URE_MISC=$(OFFICE_PROGRAM_PATH)
 
 endif
___
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' - 52 commits - desktop/Library_sofficeapp.mk desktop/unx include/vcl svx/Executable_gengal.mk sw/Executable_tiledrendering.mk vcl/CppunitTest_v

2014-12-02 Thread Markus Mohrhard 
 desktop/Library_sofficeapp.mk|4 
 desktop/unx/source/glxtest.cxx   |  282 -
 include/vcl/opengl/OpenGLContext.hxx |   56 +
 include/vcl/opengl/glxtest.hxx   |2 
 include/vcl/outdev.hxx   |4 
 include/vcl/salgtype.hxx |8 
 svx/Executable_gengal.mk |7 
 sw/Executable_tiledrendering.mk  |   16 
 vcl/CppunitTest_vcl_outdev.mk|   52 +
 vcl/Executable_icontest.mk   |9 
 vcl/Executable_ui-previewer.mk   |   15 
 vcl/Executable_vcldemo.mk|   15 
 vcl/Library_vcl.mk   |4 
 vcl/Library_vclplug_gen.mk   |1 
 vcl/Module_vcl.mk|2 
 vcl/Package_opengl.mk|7 
 vcl/StaticLibrary_glxtest.mk |   45 
 vcl/generic/print/genpspgraphics.cxx |   10 
 vcl/headless/svpgdi.cxx  |   10 
 vcl/headless/svpvd.cxx   |   12 
 vcl/inc/generic/genpspgraphics.h |6 
 vcl/inc/headless/svpgdi.hxx  |5 
 vcl/inc/headless/svpvd.hxx   |5 
 vcl/inc/opengl/framebuffer.hxx   |   45 
 vcl/inc/opengl/program.hxx   |   71 +
 vcl/inc/opengl/salbmp.hxx|   12 
 vcl/inc/opengl/texture.hxx   |4 
 vcl/inc/opengl/win/WinDeviceInfo.hxx |  190 +++
 vcl/inc/opengl/win/gdiimpl.hxx   |   10 
 vcl/inc/opengl/x11/gdiimpl.hxx   |   11 
 vcl/inc/opengl/x11/salvd.hxx |   56 +
 vcl/inc/openglgdiimpl.hxx|  110 +-
 vcl/inc/quartz/salgdi.h  |8 
 vcl/inc/quartz/salvd.h   |1 
 vcl/inc/regionband.hxx   |2 
 vcl/inc/salframe.hxx |9 
 vcl/inc/salgdi.hxx   |   24 
 vcl/inc/salgdiimpl.hxx   |   12 
 vcl/inc/salgeom.hxx  |   12 
 vcl/inc/salvd.hxx|8 
 vcl/inc/svdata.hxx   |5 
 vcl/inc/unx/gtk/gtkgdi.hxx   |   14 
 vcl/inc/unx/salbmp.h |2 
 vcl/inc/unx/salgdi.h |   16 
 vcl/inc/unx/salvd.h  |   24 
 vcl/inc/unx/x11/x11gdiimpl.h |3 
 vcl/inc/win/salgdi.h |   13 
 vcl/inc/win/salvd.h  |7 
 vcl/opengl/blendedTextureFragmentShader.glsl |   27 
 vcl/opengl/blendedTextureVertexShader.glsl   |   22 
 vcl/opengl/diffTextureFragmentShader.glsl|   26 
 vcl/opengl/dumbVertexShader.glsl |   16 
 vcl/opengl/framebuffer.cxx   |   70 +
 vcl/opengl/gdiimpl.cxx   |  984 +++-
 vcl/opengl/maskVertexShader.glsl |   19 
 vcl/opengl/maskedTextureVertexShader.glsl|   19 
 vcl/opengl/program.cxx   |  237 
 vcl/opengl/salbmp.cxx|   24 
 vcl/opengl/scale.cxx |  125 --
 vcl/opengl/solidVertexShader.glsl|   16 
 vcl/opengl/texture.cxx   |   39 
 vcl/opengl/win/WinDeviceInfo.cxx | 1126 +++
 vcl/opengl/win/gdiimpl.cxx   |   58 -
 vcl/opengl/x11/X11DeviceInfo.cxx |5 
 vcl/opengl/x11/gdiimpl.cxx   |  145 +-
 vcl/opengl/x11/salvd.cxx |   97 +
 vcl/qa/cppunit/outdev.cxx|   82 +
 vcl/quartz/salbmp.cxx|6 
 vcl/quartz/salgdicommon.cxx  |   14 
 vcl/quartz/salvd.cxx |   16 
 vcl/source/gdi/regionband.cxx|2 
 vcl/source/gdi/salgdilayout.cxx  |   32 
 vcl/source/gdi/virdev.cxx|   17 
 vcl/source/opengl/OpenGLContext.cxx  |  193 +++
 vcl/source/opengl/OpenGLHelper.cxx   |   18 
 vcl/source/outdev/bitmap.cxx |   85 -
 vcl/source/outdev/gradient.cxx   |   19 
 vcl/source/outdev/mask.cxx   |   14 
 vcl/source/outdev/outdev.cxx |   54 -
 vcl/source/salmain/salmain.cxx   |7 
 vcl/source/window/window.cxx |   11 
 vcl/unx/generic/gdi/gdiimpl.cxx  |   40 
 vcl/unx/generic/gdi/gdiimpl.hxx  |   14 
 vcl/unx/generic/gdi/openglx11cairotextrender.cxx |   31 
 vcl/unx/generic/gdi/salbmp.cxx   |

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

2014-12-02 Thread David Ostrovsky 
 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9776af8215093f3d67cbfe58c87c8decd54b01d8
Author: David Ostrovsky da...@ostrovsky.org
Date:   Sun Nov 30 12:30:05 2014 +0100

except.cxx: Fix pTypeDescr is unknown in this context error

Change-Id: Ic47f69b01cf17a55901e9e3541419d9f477d9585
Reviewed-on: https://gerrit.libreoffice.org/13210
Tested-by: David Ostrovsky da...@ostrovsky.org
Reviewed-by: Stephan Bergmann sberg...@redhat.com

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index abea68d..1cd29f7 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -243,13 +243,13 @@ extern C typelib_TypeClass cpp_vtable_call(
 {
 SAL_WARN(
 bridges,
-illegal   OUString::unacquired(pTypeDescr-aBase.pTypeName)
+illegal   OUString::unacquired(pTD-aBase.pTypeName)
   vtable index   nFunctionIndex  /
- pTypeDescr-nMapFunctionIndexToMemberIndex);
+ pTD-nMapFunctionIndexToMemberIndex);
 throw RuntimeException(
-(illegal  + OUString::unacquired(pTypeDescr-aBase.pTypeName)
+(illegal  + OUString::unacquired(pTD-aBase.pTypeName)
  +  vtable index  + OUString::number(nFunctionIndex) + /
- + OUString::number(pTypeDescr-nMapFunctionIndexToMemberIndex)),
+ + OUString::number(pTD-nMapFunctionIndexToMemberIndex)),
 reinterpret_castXInterface *( pCppI ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

  1   2   3   4   5   >