date:20140709

 oox/source/drawingml/chart/axisconverter.cxx   |8 +---
 oox/source/drawingml/chart/objectformatter.cxx |8 +++-
 oox/source/token/properties.txt|1 +
 3 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 5d91431f2bd772cf4658a39faace7dd390208d64
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Jul 7 13:26:23 2014 -0400

Adjust for the splitting of number format properties in chart.

Since 1d38cb365543924f9c50014e6b2227e77de1d0c9, number format and
link number format to source properties are 2 separate properties.  Adjust
OOXML import code for that split.

Also, always set axis' number format via NumberFormat property even when 
it's
a percent format.  The axis object doesn't keep a non-percent and percent
number formats separately.

Change-Id: I8667b6f1a78d88cc37d059518919ad1b37f154e1
(cherry picked from commit af5a6615dfdbe5c2cacdcacb00fc6f418b925c06)
Reviewed-on: https://gerrit.libreoffice.org/10123
Reviewed-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Tested-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com

diff --git a/oox/source/drawingml/chart/axisconverter.cxx 
b/oox/source/drawingml/chart/axisconverter.cxx
index 6767c3e..a15c23e 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -307,13 +307,7 @@ void AxisConverter::convertFromModel( const Reference 
XCoordinateSystem  rxCo
 // number format --
 
 if( (aScaleData.AxisType == cssc2::AxisType::REALNUMBER) || 
(aScaleData.AxisType == cssc2::AxisType::PERCENT) )
-{
-bool bPercent = false;
-if( mrModel.maNumberFormat.maFormatCode.indexOf('%') = 0)
-bPercent = true;
-mrModel.maNumberFormat.mbSourceLinked = false;
-getFormatter().convertNumberFormat( aAxisProp, 
mrModel.maNumberFormat, bPercent );
-}
+getFormatter().convertNumberFormat(aAxisProp, 
mrModel.maNumberFormat, false);
 
 // position of crossing axis --
 
diff --git a/oox/source/drawingml/chart/objectformatter.cxx 
b/oox/source/drawingml/chart/objectformatter.cxx
index 54ef18a..d406ce9 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1133,11 +1133,7 @@ void ObjectFormatter::convertNumberFormat( PropertySet 
rPropSet, const NumberFo
 if( mxData-mxNumFmts.is() )
 {
 sal_Int32 nPropId = bPercentFormat ? PROP_PercentageNumberFormat : 
PROP_NumberFormat;
-if( rNumberFormat.mbSourceLinked || 
rNumberFormat.maFormatCode.isEmpty() )
-{
-rPropSet.setAnyProperty( nPropId, Any() );
-}
-else try
+try
 {
 sal_Int32 nIndex = 
rNumberFormat.maFormatCode.equalsIgnoreAsciiCase(general) ?
 mxData-mxNumTypes-getStandardIndex( mxData-maFromLocale ) :
@@ -1150,6 +1146,8 @@ void ObjectFormatter::convertNumberFormat( PropertySet 
rPropSet, const NumberFo
 OSL_FAIL( OStringBuffer( ObjectFormatter::convertNumberFormat - 
cannot create number format ' ).
 append( OUStringToOString( rNumberFormat.maFormatCode, 
osl_getThreadTextEncoding() ) ).append( '\'' ).getStr() );
 }
+
+rPropSet.setProperty(PROP_LinkNumberFormatToSource, 
makeAny(rNumberFormat.mbSourceLinked));
 }
 }
 
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 0ad6d7a..44c7597 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -298,6 +298,7 @@ LineStartWidth
 LineStyle
 LineTransparence
 LineWidth
+LinkNumberFormatToSource
 LinkURL
 LoadReadonly
 LookUpLabels
___
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' - include/oox oox/source

 include/oox/drawingml/chart/axisconverter.hxx|   10 ++
 oox/source/drawingml/chart/axisconverter.cxx |   38 ++-
 oox/source/drawingml/chart/plotareaconverter.cxx |6 +--
 3 files changed, 38 insertions(+), 16 deletions(-)

New commits:
commit 4656a2635a7b6032b955e1223bbe81df8b05f436
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Jul 7 16:38:29 2014 -0400

bnc#881025: Mark axis a percent axis only when all data series are percent.

(cherry picked from commit b8c444a46b2f41dae673c6118d84276be0e6c87d)

Conflicts:
oox/inc/drawingml/chart/axisconverter.hxx

Change-Id: I302cc1e5b164b2ce087293b034ec930951af
Reviewed-on: https://gerrit.libreoffice.org/10124
Reviewed-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Tested-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com

diff --git a/include/oox/drawingml/chart/axisconverter.hxx 
b/include/oox/drawingml/chart/axisconverter.hxx
index 3b7a587..15feb26 100644
--- a/include/oox/drawingml/chart/axisconverter.hxx
+++ b/include/oox/drawingml/chart/axisconverter.hxx
@@ -60,12 +60,10 @@ public:
 virtual ~AxisConverter();
 
 /** Creates a chart2 axis and inserts it into the passed coordinate 
system. */
-voidconvertFromModel(
-const ::com::sun::star::uno::Reference 
::com::sun::star::chart2::XCoordinateSystem  rxCoordSystem,
-TypeGroupConverter rTypeGroup,
-const AxisModel* pCrossingAxis,
-sal_Int32 nAxesSetIdx,
-sal_Int32 nAxisIdx );
+void convertFromModel(
+const css::uno::Referencecss::chart2::XCoordinateSystem 
rxCoordSystem,
+RefVectorTypeGroupConverter rTypeGroups, const AxisModel* 
pCrossingAxis,
+sal_Int32 nAxesSetIdx, sal_Int32 nAxisIdx );
 };
 
 
diff --git a/oox/source/drawingml/chart/axisconverter.cxx 
b/oox/source/drawingml/chart/axisconverter.cxx
index a15c23e..4133ae1 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -107,6 +107,26 @@ sal_Int32 lclGetTickMark( sal_Int32 nToken )
 return NONE;
 }
 
+/**
+ * The groups is of percent type only when all of its members are of percent
+ * type.
+ */
+bool isPercent( const RefVectorTypeGroupConverter rTypeGroups )
+{
+if (rTypeGroups.empty())
+return false;
+
+RefVectorTypeGroupConverter::const_iterator it = rTypeGroups.begin(), 
itEnd = rTypeGroups.end();
+for (; it != itEnd; ++it)
+{
+TypeGroupConverter rConv = **it;
+if (!rConv.isPercent())
+return false;
+}
+
+return true;
+}
+
 } // namespace
 
 
@@ -120,16 +140,20 @@ AxisConverter::~AxisConverter()
 {
 }
 
-void AxisConverter::convertFromModel( const Reference XCoordinateSystem  
rxCoordSystem,
-TypeGroupConverter rTypeGroup, const AxisModel* pCrossingAxis, 
sal_Int32 nAxesSetIdx, sal_Int32 nAxisIdx )
+void AxisConverter::convertFromModel(
+const Reference XCoordinateSystem  rxCoordSystem,
+RefVectorTypeGroupConverter rTypeGroups, const AxisModel* 
pCrossingAxis, sal_Int32 nAxesSetIdx, sal_Int32 nAxisIdx )
 {
+if (rTypeGroups.empty())
+return;
+
 Reference XAxis  xAxis;
 try
 {
 namespace cssc = ::com::sun::star::chart;
 namespace cssc2 = ::com::sun::star::chart2;
 
-const TypeGroupInfo rTypeInfo = rTypeGroup.getTypeInfo();
+const TypeGroupInfo rTypeInfo = rTypeGroups.front()-getTypeInfo();
 ObjectFormatter rFormatter = getFormatter();
 
 // create the axis object (always)
@@ -189,7 +213,7 @@ void AxisConverter::convertFromModel( const Reference 
XCoordinateSystem  rxCo
 currently). */
 aScaleData.AxisType = (bDateAxis  !mrModel.mbAuto) ? 
cssc2::AxisType::DATE : cssc2::AxisType::CATEGORY;
 aScaleData.AutoDateAxis = mrModel.mbAuto;
-aScaleData.Categories = 
rTypeGroup.createCategorySequence();
+aScaleData.Categories = 
rTypeGroups.front()-createCategorySequence();
 }
 else
 {
@@ -199,11 +223,11 @@ void AxisConverter::convertFromModel( const Reference 
XCoordinateSystem  rxCo
 break;
 case API_Y_AXIS:
 OSL_ENSURE( mrModel.mnTypeId == C_TOKEN( valAx ), 
AxisConverter::convertFromModel - unexpected axis model type (must: c:valAx) 
);
-aScaleData.AxisType = rTypeGroup.isPercent() ? 
cssc2::AxisType::PERCENT : cssc2::AxisType::REALNUMBER;
+aScaleData.AxisType = isPercent(rTypeGroups) ? 
cssc2::AxisType::PERCENT : cssc2::AxisType::REALNUMBER;
 break;
 case API_Z_AXIS:
 OSL_ENSURE( mrModel.mnTypeId == C_TOKEN( serAx ), 
AxisConverter::convertFromModel - unexpected axis model type (must: c:serAx) 
);
-

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

2014-07-09 Thread Michael Meeks

 sw/source/uibase/inc/content.hxx |   14 --
 1 file changed, 14 deletions(-)

New commits:
commit fe6f8010595dafc5fa8baffbaf92a09526aca3df
Author: Michael Meeks michael.me...@collabora.com
Date:   Wed Jul 9 10:09:20 2014 +0100

remove apparently unused SwPopup.

Change-Id: I2709a295c69131ec9536e97c27ee8ab46dde203f

diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 880633d..5ff34cd 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -33,20 +33,6 @@ class SwRangeRedline;
 
 //  helper classes
 
-class SwPopup : public PopupMenu
-{
-sal_uInt16  nCurId;
-virtual voidSelect() SAL_OVERRIDE {nCurId = GetCurItemId();}
-
-public:
-SwPopup() :
-PopupMenu(),
-nCurId(USHRT_MAX){}
-
-sal_uInt16  GetCurId() const { return nCurId; }
-
-};
-
 class SwOutlineContent : public SwContent
 {
 sal_uInt16  nOutlinePos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: README.cross

2014-07-09 Thread Tor Lillqvist

 README.cross |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit f285ac7c0a5df29d1476462fe2ba1b4d13b27aa4
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Jul 9 12:21:53 2014 +0300

Add note that building for the simulator is broken

Change-Id: I188ce756ea8194e903fc0d3edb0e859ab52c7d0f

diff --git a/README.cross b/README.cross
index 23fdc7c..cfeaadc 100644
--- a/README.cross
+++ b/README.cross
@@ -287,7 +287,8 @@ Here is an autogen.input for iOS (device) using Xcode 4.6, 
on OS X 10.8:
 --enable-debug
 --enable-werror
 
-For the iOS Simulator:
+For the iOS Simulator, but note that building for the simulator is
+broken at the moment (July 2014):
 
 --build=i386-apple-darwin10.7.0
 --host=arm-apple-darwin10
@@ -296,9 +297,9 @@ For the iOS Simulator:
 --enable-debug
 --enable-werror
 
-Note that you will have to install autoconf and automake yourself
-before running autogen.sh. They are no longer included in Xcode 4.3
-and later (not even in the add-on command line tools).
+You will have to install autoconf and automake yourself before running
+autogen.sh. They are no longer included in Xcode 4.3 and later (not
+even in the add-on command line tools).
 
 The -mmacosx-version-min=10.7 is necessary when building for the iOS
 simulator to avoid clang replacing simple calls to fprintf with calls
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-09 Thread Andras Timar

 unotools/source/config/useroptions.cxx |   38 +++--
 1 file changed, 32 insertions(+), 6 deletions(-)

New commits:
commit 33c36fb9fbc69bbc32088532dd21db7153aee09d
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Jul 9 11:44:32 2014 +0200

localized GetFullName()

Change-Id: I4f2bffadef3db1bd07432202525734ab9b0cb0de

diff --git a/unotools/source/config/useroptions.cxx 
b/unotools/source/config/useroptions.cxx
index 0f92991..6fab077 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -18,7 +18,7 @@
  */
 
 #include unotools/useroptions.hxx
-
+#include unotools/syslocale.hxx
 #include unotools/configmgr.hxx
 #include com/sun/star/uno/Any.hxx
 #include com/sun/star/uno/Sequence.hxx
@@ -37,6 +37,7 @@
 #include com/sun/star/util/ChangesEvent.hpp
 #include comphelper/configurationhelper.hxx
 #include comphelper/processfactory.hxx
+#include i18nlangtag/mslangid.hxx
 
 using namespace utl;
 using namespace com::sun::star;
@@ -194,11 +195,36 @@ void SvtUserOptions::Impl::SetToken (sal_uInt16 nToken, 
OUString const sToken)
 
 OUString SvtUserOptions::Impl::GetFullName () const
 {
-// TODO international name
-OUString sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
-if (!sFullName.isEmpty())
-sFullName +=  ;
-sFullName += GetToken(USER_OPT_LASTNAME).trim();
+OUString sFullName;
+switch (LanguageType const eLang = 
SvtSysLocale().GetUILanguageTag().getLanguageType())
+{
+case LANGUAGE_RUSSIAN:
+sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_FATHERSNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_LASTNAME).trim();
+break;
+default:
+if (MsLangId::isFamilyNameFirst(eLang))
+{
+sFullName = GetToken(USER_OPT_LASTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_FIRSTNAME).trim();
+}
+else
+{
+sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_LASTNAME).trim();
+}
+break;
+}
+
 return sFullName;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/sfx2 include/svx sfx2/source svx/inc svx/source svx/uiconfig

 include/sfx2/frame.hxx  |1 
 include/svx/imapdlg.hxx |1 
 sfx2/source/view/frame.cxx  |   19 +-
 svx/inc/helpid.hrc  |   19 --
 svx/source/dialog/imapdlg.cxx   |   50 ++-
 svx/source/dialog/imapwnd.cxx   |5 
 svx/source/dialog/imapwnd.hxx   |1 
 svx/uiconfig/ui/imapdialog.ui   |  127 ++--
 svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui |5 
 svx/uiconfig/ui/querysaveimagemapchangesdialog.ui   |5 
 10 files changed, 109 insertions(+), 124 deletions(-)

New commits:
commit 1fab8521b28516086dea4d11bf7d1f5620c5a851
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 9 10:51:19 2014 +0100

drop unused helpids

Change-Id: I385fcf216645a79d5c6cdadd31a37be20938371a

diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index acb9fb3..c697252 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -83,25 +83,6 @@
 #define HID_GALLERY_RENAME
SVX_HID_GALLERY_RENAME
 #define HID_GALLERY_THEMELIST 
SVX_HID_GALLERY_THEMELIST
 #define HID_GALLERY_WINDOW
SVX_HID_GALLERY_WINDOW
-#define HID_IMAPDLG_ACTIVE
SVX_HID_IMAPDLG_ACTIVE
-#define HID_IMAPDLG_APPLY 
SVX_HID_IMAPDLG_APPLY
-#define HID_IMAPDLG_CIRCLE
SVX_HID_IMAPDLG_CIRCLE
-#define HID_IMAPDLG_FREEPOLY  
SVX_HID_IMAPDLG_FREEPOLY
-#define HID_IMAPDLG_GRAPHWND  
SVX_HID_IMAPDLG_GRAPHWND
-#define HID_IMAPDLG_MACRO 
SVX_HID_IMAPDLG_MACRO
-#define HID_IMAPDLG_OPEN  
SVX_HID_IMAPDLG_OPEN
-#define HID_IMAPDLG_POLY  
SVX_HID_IMAPDLG_POLY
-#define HID_IMAPDLG_POLYDELETE
SVX_HID_IMAPDLG_POLYDELETE
-#define HID_IMAPDLG_POLYEDIT  
SVX_HID_IMAPDLG_POLYEDIT
-#define HID_IMAPDLG_POLYINSERT
SVX_HID_IMAPDLG_POLYINSERT
-#define HID_IMAPDLG_POLYMOVE  
SVX_HID_IMAPDLG_POLYMOVE
-#define HID_IMAPDLG_PROPERTY  
SVX_HID_IMAPDLG_PROPERTY
-#define HID_IMAPDLG_RECT  
SVX_HID_IMAPDLG_RECT
-#define HID_IMAPDLG_REDO  
SVX_HID_IMAPDLG_REDO
-#define HID_IMAPDLG_SAVEAS
SVX_HID_IMAPDLG_SAVEAS
-#define HID_IMAPDLG_SELECT
SVX_HID_IMAPDLG_SELECT
-#define HID_IMAPDLG_TOOLBOX   
SVX_HID_IMAPDLG_TOOLBOX
-#define HID_IMAPDLG_UNDO  
SVX_HID_IMAPDLG_UNDO
 #define HID_MENU_EXTRUSION_DEPTH  
SVX_HID_MENU_EXTRUSION_DEPTH
 #define HID_MENU_EXTRUSION_DIRECTION  
SVX_HID_MENU_EXTRUSION_DIRECTION
 #define HID_MENU_EXTRUSION_LIGHTING   
SVX_HID_MENU_EXTRUSION_LIGHTING
commit ac696f8b2d4ef40d6bf50207bcab8d902cd06415
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 9 10:47:33 2014 +0100

tweak conversion a bit

a) rework to remove the need for a ::Resize impl
b) move the explicit pixel size into relative APP_FONT size
c) lock down the target combobox size so it doesn't jump around

Change-Id: Iad995453c178234d1ad0f794b5193920dcd275fe

diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 1ac0191..dbf06f2 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -134,7 +134,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog 
// SfxFloatingWindow
 void*   pCheckObj;
 SvxIMapDlgItem  aIMapItem;
 
-virtual voidResize() SAL_OVERRIDE;
 virtual boolClose() SAL_OVERRIDE;
 
 DECL_LINK( TbxClickHdl, ToolBox* );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index c153103..64bcedd 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -125,12 +125,11 @@ extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL 
makeStatusBar(Window *pParent,
 return new StatusBar(pParent);
 }
 
-SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
-Window* _pParent ) :
-SfxModelessDialog   ( _pBindings, pCW, _pParent, ImapDialog, 
svx/ui/imapdialog.ui ),
-maImageList ( SVX_RES( IL_IMAPDLG ) ),
-pCheckObj   ( NULL ),
-aIMapItem   ( SID_IMAP_EXEC, *this, *_pBindings )
+SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, Window* 
_pParent)
+: SfxModelessDialog(_pBindings, pCW, _pParent,

memory release in libreoffice

2014-07-09 Thread Mahesh Patil

Hi,

I have problem in libreoffice code. Libreoffice is not releasing memory after 
converting document to pdf. Can someone explain me how to release memory. which 
function is called for this.

Thanks and Regards,
Mahesh

sample code

input is word document and output is pdf document

nbsp;nbsp;nbsp; OUString aInURL = translateExternalUris(aInputURL);
nbsp;nbsp;nbsp; OUString aOutURL = translateExternalUris(aOutputURL);
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; Referencelt; XDesktop2 gt; xDesktop = Desktop::create( 
::comphelper::getProcessComponentContext() );
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; // create parameter array
nbsp;nbsp;nbsp; sal_Int32 nCount = 5;
nbsp;nbsp;nbsp; const desktop::CommandLineArgsamp; rArgs = 
desktop::Desktop::GetCommandLineArgs();
nbsp;nbsp;nbsp; aOutURL = desktop::GetURL_Impl( aOutURL, rArgs.getCwdUrl());
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; Sequence lt; PropertyValue gt; aArgs( nCount );
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; // mark request as user interaction from outside
nbsp;nbsp;nbsp; aArgs[0].Name = Referer;
nbsp;nbsp;nbsp; aArgs[0].Value lt;lt;= OUString(private:OpenEvent);
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; aArgs[1].Name = ReadOnly;
nbsp;nbsp;nbsp; aArgs[2].Name = OpenNewView;
nbsp;nbsp;nbsp; aArgs[3].Name = Hidden;
nbsp;nbsp;nbsp; aArgs[4].Name = Silent;
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; OUString aName(desktop::GetURL_Impl( aInURL, 
rArgs.getCwdUrl()) );
nbsp;nbsp;nbsp; OUString aTarget(_default);
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; // documents opened for printing are opened readonly because 
they must be opened as a new document and this
nbsp;nbsp;nbsp; // document could be open already
nbsp;nbsp;nbsp; aArgs[1].Value lt;lt;= sal_True;
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; // always open a new document for printing, because it must 
be disposed afterwards
nbsp;nbsp;nbsp; aArgs[2].Value lt;lt;= sal_True;
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; // printing is done in a hidden view
nbsp;nbsp;nbsp; aArgs[3].Value lt;lt;= sal_True;
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; // load document for printing without user interaction
nbsp;nbsp;nbsp; aArgs[4].Value lt;lt;= sal_True;
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; // hidden documents should never be put into open tasks
nbsp;nbsp;nbsp; aTarget = _blank;
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; // load the document ... if they are loadable!
nbsp;nbsp;nbsp; // Otherwise try to dispatch it ...
nbsp;nbsp;nbsp; Reference lt; XPrintable gt; xDoc;
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; // This is a synchron loading of a component so we don't 
have to deal with our statusChanged listener mechanism.
nbsp;nbsp;nbsp; try
nbsp;nbsp;nbsp; {
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; xDoc = Reference lt; XPrintable 
gt;( ::comphelper::SynchronousDispatch::dispatch( xDesktop, aName, aTarget, 0, 
aArgs ), UNO_QUERY );
nbsp;nbsp;nbsp; }
nbsp;nbsp;nbsp; catch (const 
::com::sun::star::lang::IllegalArgumentExceptionamp; iae)
nbsp;nbsp;nbsp; {
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; SAL_WARN(
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;
 desktop.app,
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;
 Dispatchwatcher IllegalArgumentException while calling
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;
  loadComponentFromURL: \ lt;lt; iae.Message lt;lt; \);
nbsp;nbsp;nbsp; }
nbsp;nbsp;nbsp; catch (const com::sun::star::io::IOExceptionamp; ioe)
nbsp;nbsp;nbsp; {
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; SAL_WARN(
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;
 desktop.app,
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;
 Dispatchwatcher IOException while calling
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;
  loadComponentFromURL: \ lt;lt; ioe.Message lt;lt; \);
nbsp;nbsp;nbsp; }
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp; if (xDoc.is() )
nbsp;nbsp;nbsp; {
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; Referencelt; XStorable gt; 
xStorable( xDoc, UNO_QUERY );
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; if ( xStorable.is() )
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; {
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; OUString 
aFilter = impl_GuessFilter( aName, aOutURL );
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; 
Sequencelt;PropertyValuegt; conversionProperties( 2 );
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; 
conversionProperties[0].Name = Overwrite;
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; 
conversionProperties[0].Value lt;lt;= sal_True;
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; 
conversionProperties[1].Name = FilterName;
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; 
conversionProperties[1].Value lt;lt;= aFilter;
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; 
nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; OUString 
aTempName;

Re: memory release in libreoffice

2014-07-09 Thread Michael Meeks

Hi Mahesh,

On Tue, 2014-07-08 at 07:47 +, Mahesh Patil wrote:
 I have problem in libreoffice code. Libreoffice is not releasing
 memory after converting document to pdf. Can someone explain me how to
 release memory. which function is called for this.

Hmm - of course, it is quite possible / probable that there are memory
leaks - unfortunately.

 Reference  XCloseable  xClose( xDoc, UNO_QUERY );
 if ( xClose.is() )
 xClose-close( sal_True );
 else
 {
 Reference  XComponent  xComp( xDoc, UNO_QUERY );
 if ( xComp.is() )
 xComp-dispose();
 }

It is possible that you want to do the dispose after the close
unconditionally; but I'm really no expert here.

Have you considered using the LibreOfficeKit API in 4.3 ? (try a recent
4.3.0 rc) that provides a native C/C++ API for linking directly into the
LibreOffice process to do this work - which should make debugging rather
easier.

Beyond that I'd suggest running the soffice.bin binary under lsan or
valgrind to detect leaks and see where the memory is lurking after that
cycle. With some clear leak traces it shouldn't be too hard to work out
what's going on. Unfortunately it is possible that what is apparently
leaked is image caches etc. that are cleaned up at exit (but not on
document close) which would hide the leaks.

How much are you loosing ?

Thanks,

Michael.

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

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

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 6a5a4a6cab3f845701cd51613fbc27df30761850
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 9 11:05:19 2014 +0100

Updated core
Project: help  57ff135efcb010472bc58b57dd2749d3b488f96a

diff --git a/helpcontent2 b/helpcontent2
index 900defa..57ff135 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 900defa453aeb03e0d675d3860de5674786dd6cb
+Subproject commit 57ff135efcb010472bc58b57dd2749d3b488f96a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 helpers/help_hid.lst   |   22 --
 source/text/shared/01/0201.xhp |5 --
 source/text/shared/01/0202.xhp |5 --
 source/text/shared/01/0222.xhp |   78 ++---
 4 files changed, 43 insertions(+), 67 deletions(-)

New commits:
commit 57ff135efcb010472bc58b57dd2749d3b488f96a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 9 11:05:19 2014 +0100

update help ids for imap dialog .ui conversion

Change-Id: I3058ee9350d74b6560385556467cfb97e42c3f5f

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1c7367f..3f7dbfd 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1849,25 +1849,6 @@ HID_ICCDIALOG_OK_BTN,34093,
 HID_ICCDIALOG_RESET_BTN,34088,
 HID_IMAGECONTROL2,41152,
 HID_IMAGECONTROL3,41124,
-HID_IMAPDLG_ACTIVE,33950,
-HID_IMAPDLG_APPLY,33936,
-HID_IMAPDLG_CIRCLE,33941,
-HID_IMAPDLG_FREEPOLY,33943,
-HID_IMAPDLG_GRAPHWND,33982,
-HID_IMAPDLG_MACRO,33951,
-HID_IMAPDLG_OPEN,33937,
-HID_IMAPDLG_POLY,33942,
-HID_IMAPDLG_POLYDELETE,33947,
-HID_IMAPDLG_POLYEDIT,33944,
-HID_IMAPDLG_POLYINSERT,33946,
-HID_IMAPDLG_POLYMOVE,33945,
-HID_IMAPDLG_PROPERTY,33952,
-HID_IMAPDLG_RECT,33940,
-HID_IMAPDLG_REDO,33949,
-HID_IMAPDLG_SAVEAS,33938,
-HID_IMAPDLG_SELECT,33939,
-HID_IMAPDLG_TOOLBOX,33981,
-HID_IMAPDLG_UNDO,33948,
 HID_IMPGRF_CB_PREVIEW,33971,
 HID_INDEX_DIALOG_ACTION_TB,39147,
 HID_INSERT_CHART,52971,
@@ -5369,7 +5350,6 @@ 
svx_CheckBox_RID_SVX_MDLG_HANGULHANJA_CB_HANGUL_ONLY,1237599234,
 svx_CheckBox_RID_SVX_MDLG_HANGULHANJA_CB_HANJA_ONLY,1237599235,
 svx_CheckBox_RID_SVX_MDLG_HANGULHANJA_CB_REPLACE_BY_CHARACTER,1237599233,
 svx_CheckBox_RID_SVX_SPLITCELLDLG_CB_PROP,1238287371,
-svx_ComboBox_RID_SVXDLG_IMAP_CBB_URL,2318700545,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_CB_FRAME,704483360,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME,704450592,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_MAIL_CB_FRAME,704466976,
@@ -5387,7 +5367,6 @@ 
svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_ACTION,1368918030,
 svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_NAME,1368918028,
 svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_REF,1368918034,
 svx_Edit_RID_SVXDLG_ASSIGNCOMPONENT_EDIT_METHOD,1242449965,
-svx_Edit_RID_SVXDLG_IMAP_EDT_TEXT,2318698497,
 svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_1,2315372554,
 svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_2,2315372555,
 svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_3,2315372556,
@@ -5604,7 +5583,6 @@ svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872,
 svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224,
 svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744,
 svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336,
-svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448,
 svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701,
 svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860,
 svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719,
diff --git a/source/text/shared/01/0201.xhp 
b/source/text/shared/01/0201.xhp
index 662867a..a880be1 100644
--- a/source/text/shared/01/0201.xhp
+++ b/source/text/shared/01/0201.xhp
@@ -36,10 +36,9 @@
 bookmark_valueediting;undoing/bookmark_value
 /bookmark
 bookmark xml-lang=en-US branch=hid/.uno:Undo id=bm_id87410 
localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:Undo id=bm_id3155934 
localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_IMAPDLG_UNDO id=bm_id3148983 
localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/imapdialog/TBI_UNDO 
id=bm_id3148983 localize=false/
 paragraph role=heading id=hd_id3155069 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/01/0201.xhp 
name=UndoUndo/link/paragraph
-paragraph role=paragraph id=par_id3149205 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=HID_IMAPDLG_UNDOReverses the last command or the last 
entry you typed. To select the command that you want to reverse, click the 
arrow next to the emphUndo /emphicon on the Standard 
bar./ahelp/paragraph
+paragraph role=paragraph id=par_id3149205 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=svx/ui/imapdialog/TBI_UNDOReverses the last command or 
the last entry you typed. To select the command that you want to reverse, click 
the arrow next to the emphUndo /emphicon on the Standard 
bar./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/shared/00/0402.xhp#do/
diff --git a/source/text/shared/01/0202.xhp 
b/source/text/shared/01/0202.xhp
index 914c01e..734f627 100644
--- a/source/text/shared/01/0202.xhp
+++ b/source/text/shared/01/0202.xhp
@@ -33,10 +33,9 @@
 bookmark_valueredo command/bookmark_value
 /bookmarkcommentmw made restoring... a two level entry/comment
 bookmark xml-lang=en-US branch=hid/.uno:Redo id=bm_id5051868 
localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:Redo id=bm_id3154840 
localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_IMAPDLG_REDO id=bm_id3155069 
localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/imapdialog/TBI_REDO 
id=bm_id3155069 localize=false/

Re: memory release in libreoffice

2014-07-09 Thread Michael Stahl

On 09/07/14 12:07, Michael Meeks wrote:
 
 Reference  XCloseable  xClose( xDoc, UNO_QUERY );
 if ( xClose.is() )
 xClose-close( sal_True );
 else
 {
 Reference  XComponent  xComp( xDoc, UNO_QUERY );
 if ( xComp.is() )
 xComp-dispose();
 }
 
   It is possible that you want to do the dispose after the close
 unconditionally; but I'm really no expert here.

no you don't - the close() is an enhanced alternative to dispose(),
and if a component supports XCloseable you should never call dispose()
on it.


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

Looking into the moving anchors problems in Calc and Writer

2014-07-09 Thread Jan-Marek Glogowski

Hi everybody,

this is mostly a brain dump for myself, but probably I can get some input.

Now that MM seems to be fixed (in the spirit of correctness before
speed; PDF is correct, ODT seems correct - but still slow), I've started
to investigate the bug of the moving paragraph-bound anchor on ODT file
load (fdo#80926). The bug is actually unrelated to MM and I found a lot
of bugs, which might be related.

See https://bugs.freedesktop.org/show_bug.cgi?id=80926#c5 for the latest
details.

Summary: I'm trying to understand, why SwFmtHoriOrient is already wrong
in SwToCntntAnchoredObjectPosition::CalcPosition for the 2nd page.

Anybody an idea?


IMHO there are two problems:

1. Broken implementation of First page different style / footer / header

The original feature seems to have been introduced between OOo 3.3 and
LO 3.5; at least that's where the bug started. There have been many
fixes, but my guess is the implementation is still broken. My main
indicator is the fact, that the moving paragraph anchor just happens
on the 2nd page. No other pages seem to be affected. And - to make
things even stranger - just paragraph-anchored draw object with a
negative Y-offset are affected.

And if you MM the document, the 2nd page is still the only affected one.
And it even looses some page-anchored frames, but these are saved
correctly, in contrast to the paragraph-anchored draw objects.

2. Recalculation of anchor positions (for copies?!)

At least I found a calc commit, which was introduced during the 4.1
development cycle and looks suspicious. OTOH I have bisects for Writer
(fdo#80926) and Calc (fdo#67712), which both point to the same commit in
the bibisect repo. Here is one of my main problems:

git log
ba446dd58a4ad324d242afcd5b28d3b4dff5a881..5da10275a7475efdbfd9de14ea58cf8f4c6c1582
--pretty=oneline | wc -l
2240

From my POV it's just a coincidence, that anchored objects broke for
Writer and Calc in this commit range, but I don't know.

My current guess: the recalculations somehow revealed the first problem,
but I don't know how this can affect Calc. Currently that's just a wild
guess.


= Bug list (probably related) =

I've put most of my debugging information into fdo#80926!


== Open bugs ==

fdo#47153 - Form Letter PRINTING: Picture or Draw shape in Page Header
suppresses some contents on most pages of particular document (3.5)
fdo#59428 - mirrored page layout is not actually mirrored (4.1.2)
fdo#63833 - MAILMERGE: Loosing page formatting (3.6.0.1 rc)
fdo#66145 - Turning off Same content on first page' does not reflect in
UI (4.2.0.0alpha0+)

This bug is actually closed but is included as a reference from the fix
of fdo#69282.

BSA target:4.2.0 target:4.0.6 target:4.1.1

fdo#67712 - form controls and draw objects anchored to cell but changes
position after reopening (4.1.0 b1)
= commit 5da10275a7475efdbfd9de14ea58cf8f4c6c1582
   Related rhbz#915743: Abort UCB call from SvtMatchContext_Impl::Stop

commit 545737df40880875304bffc3f49800d1d2e99723
fdo#59056: Re-calculate cell anchor position of a pasted drawing object.

fdo#69282 - MAILMERGE: Format (page style) of the first page changed
from other pages in mail merge (4.1.2.3)

Reverting

commit 75084f6c42c27dc95418df9cefed2fddfb26000e
fdo#66145: do not check IsFirstShared() in SwPageDesc::GetLeftFmt()

fixes the problem for MM.

fdo#70232 - footer affected by header left/right sharing in UI and
ODF/DOCX formats (4.0.6.2)
fdo#80395 - MAILMERGE: Lines move when using mail merge (4.1.4.2)

fdo#80926 - Moving paragraph-bound anchor on ODT file load (3.6.7.2)
= commit 5da10275a7475efdbfd9de14ea58cf8f4c6c1582
   Related rhbz#915743: Abort UCB call from SvtMatchContext_Impl::Stop


== Already fixed in private/jmux/mailmerge-fixes ==

fdo#34502 - MAILMERGE PRINTING: Field Page Number shows constant
number instead of page count (OOo)
fdo#62364 - Mailmerge problem if list or numbering at the end of
document (3.6.6.2)


== MM Speed (still broken, but unrelated) ==

I've put quite some information into fdo#80823 to prevent optimizations
in the wrong area.

fdo#56355 - MAILMERGE: Creating mailing with more than 1000 records is
incredible slow (3.5.6.2)
fdo#79067 - MAILMERGE: mailmerge takes ages to create documents (3.6.7.2)
fdo#80823 - MAILMERGE: Use IDocumentMarkAccess::UNO_BOOKMARK to mark end
of one mail merge part (OOo)


Thanks for any input

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

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

2014-07-09 Thread Michael Stahl

 sw/source/filter/ww8/ww8par.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e16fe2a30164822e9345f5ad3f2ab94b754e7baf
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 8 13:05:41 2014 +0200

sw: do more input validation in SwWW8ImplReader::Read_And

(to fix up f2945255df273404ee2457dcf761cb8f334b732b)

Change-Id: Ie20fb9db4515b9737322ec7224ecd7e411d31c03
(cherry picked from commit ae2e7ad276acb9394691a9d4a702ed7a6b07b508)
Reviewed-on: https://gerrit.libreoffice.org/10141
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 42e4ad3..e2e9080 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2173,7 +2173,9 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 //that relate to each annotation index as the parser passes
 //those points.
 sal_Int32 nLen = nEnd - nStart;
-if( nLen )
+// the start and end positions are apparently stored in
+// different arrays, so in an invalid file only one could exist
+if(SAL_MAX_INT32 != nEnd  SAL_MAX_INT32 != nStart  nLen  
0)
 {
 if (pPaM-GetPoint()-nContent.GetIndex() = nLen)
 {
___
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' - unotools/source

2014-07-09 Thread Andras Timar

 unotools/source/config/useroptions.cxx |   38 +++--
 1 file changed, 32 insertions(+), 6 deletions(-)

New commits:
commit 9572b83a9fc00d5155386ea79ee518dbf77a4208
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Jul 9 11:44:32 2014 +0200

localized GetFullName()

Change-Id: I4f2bffadef3db1bd07432202525734ab9b0cb0de
(cherry picked from commit 33c36fb9fbc69bbc32088532dd21db7153aee09d)
Reviewed-on: https://gerrit.libreoffice.org/10166
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/unotools/source/config/useroptions.cxx 
b/unotools/source/config/useroptions.cxx
index 0f92991..6fab077 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -18,7 +18,7 @@
  */
 
 #include unotools/useroptions.hxx
-
+#include unotools/syslocale.hxx
 #include unotools/configmgr.hxx
 #include com/sun/star/uno/Any.hxx
 #include com/sun/star/uno/Sequence.hxx
@@ -37,6 +37,7 @@
 #include com/sun/star/util/ChangesEvent.hpp
 #include comphelper/configurationhelper.hxx
 #include comphelper/processfactory.hxx
+#include i18nlangtag/mslangid.hxx
 
 using namespace utl;
 using namespace com::sun::star;
@@ -194,11 +195,36 @@ void SvtUserOptions::Impl::SetToken (sal_uInt16 nToken, 
OUString const sToken)
 
 OUString SvtUserOptions::Impl::GetFullName () const
 {
-// TODO international name
-OUString sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
-if (!sFullName.isEmpty())
-sFullName +=  ;
-sFullName += GetToken(USER_OPT_LASTNAME).trim();
+OUString sFullName;
+switch (LanguageType const eLang = 
SvtSysLocale().GetUILanguageTag().getLanguageType())
+{
+case LANGUAGE_RUSSIAN:
+sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_FATHERSNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_LASTNAME).trim();
+break;
+default:
+if (MsLangId::isFamilyNameFirst(eLang))
+{
+sFullName = GetToken(USER_OPT_LASTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_FIRSTNAME).trim();
+}
+else
+{
+sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_LASTNAME).trim();
+}
+break;
+}
+
 return sFullName;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-09 Thread Adolfo Jayme Barrientos

 cui/uiconfig/ui/aboutconfigdialog.ui |  163 +++
 1 file changed, 72 insertions(+), 91 deletions(-)

New commits:
commit c1b562139a2e87cce2f189c50a242cf057970551
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Mon Jul 7 15:31:55 2014 -0500

Related fdo#67642: remove redundant 'Preferences' label to save some space

This label is redundant now that the dialog has a title.

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

diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui 
b/cui/uiconfig/ui/aboutconfigdialog.ui
index 9bd4bbd..865983a 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.1 --
 interface
-  !-- interface-requires gtk+ 3.0 --
+  requires lib=gtk+ version=3.0/
   !-- interface-requires LibreOffice 1.0 --
   object class=GtkDialog id=AboutConfig
 property name=can_focusFalse/property
@@ -96,95 +97,87 @@
   /packing
 /child
 child
-  object class=GtkFrame id=frame1
+  object class=GtkAlignment id=alignment1
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
-property name=label_xalign0/property
-property name=shadow_typenone/property
 child
-  object class=GtkAlignment id=alignment1
+  object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=top_padding6/property
-property name=left_padding12/property
+property name=orientationvertical/property
 child
-  object class=GtkBox id=box1
-property name=visibleTrue/property
+  object class=GtkGrid id=grid1
 property name=can_focusFalse/property
-property name=orientationvertical/property
+property name=no_show_allTrue/property
+property name=row_spacing6/property
+property name=column_spacing6/property
+property name=column_homogeneousTrue/property
 child
-  object class=GtkGrid id=grid1
+  object class=GtkLabel id=preference
+property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=no_show_allTrue/property
-property name=row_spacing6/property
-property name=column_spacing6/property
-property name=column_homogeneousTrue/property
-child
-  object class=GtkLabel id=preference
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property 
name=yalign0.4900953674316/property
-property name=label 
translatable=yesPreference Name/property
-  /object
-  packing
-property name=left_attach0/property
-property name=top_attach0/property
-property name=width1/property
-property name=height1/property
-  /packing
-/child
-child
-  object class=GtkLabel id=property
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property 
name=xalign0.5198092651367/property
-property 
name=yalign0.5099046325684/property
-property name=label 
translatable=yesProperty/property
-  /object
-  packing
-property name=left_attach1/property
-property name=top_attach0/property
-property name=width1/property
-property name=height1/property
-  /packing
-/child
-child
-  object class=GtkLabel id=type
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=label

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

2014-07-09 Thread Luke Deller

 sw/qa/extras/ww8import/data/fdo77844.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx |   47 +++
 sw/source/filter/ww8/ww8par.cxx  |   15 -
 3 files changed, 60 insertions(+), 2 deletions(-)

New commits:
commit f312ef98de57a5926be67421395544bb9d41b809
Author: Luke Deller l...@deller.id.au
Date:   Sun Jul 6 23:19:18 2014 +1000

fix fdo#77844: header wrongly enabled from .doc

The LO page style needs page headers to be turned on if the
corresponding .doc file section has a left (=even) page header or a
first page header.

However this should not be triggered in the case where a first page
header is present but hidden due to the different first page header
option being disabled. This case is fixed by this commit.

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

diff --git a/sw/qa/extras/ww8import/data/fdo77844.doc 
b/sw/qa/extras/ww8import/data/fdo77844.doc
new file mode 100755
index 000..cd7368d
Binary files /dev/null and b/sw/qa/extras/ww8import/data/fdo77844.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 270d665..147fb88 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -415,6 +415,53 @@ DECLARE_WW8IMPORT_TEST(testBnc875715, bnc875715.doc)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
getPropertysal_Int32(xSections-getByIndex(0), SectionLeftMargin));
 }
 
+DECLARE_WW8IMPORT_TEST(testFdo77844, fdo77844.doc)
+{
+uno::Referencecontainer::XNameAccess pageStyles = 
getStyles(PageStyles);
+
+// get a page cursor
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier xTextViewCursorSupplier(
+xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor xCursor(
+xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+
+// check that the first page has no header
+xCursor-jumpToFirstPage();
+OUString pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+uno::Referencestyle::XStyle pageStyle(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+bool headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(!headerIsOn);
+
+// check that the second page has a header
+xCursor-jumpToPage(2);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(headerIsOn);
+
+// check that the third page has a header
+xCursor-jumpToPage(3);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(headerIsOn);
+
+// check that the fourth page has no header
+// (#if'd out as this is not yet imported correctly)
+#if 0
+xCursor-jumpToPage(4);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(!headerIsOn);
+#endif
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9408e2c..885cf12 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2378,6 +2378,9 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const 
SwPageDesc *pPrev,
 long nLen;
 sal_uInt8 nNumber = 5;
 
+// This loops through the 6 flags WW8_{FOOTER,HEADER}_{ODD,EVEN,FIRST}
+// corresponding to bit fields in grpfIhdt indicating which
+// header/footer(s) are present in this section
 for( sal_uInt8 nI = 0x20; nI; nI = 1, nNumber-- )
 {
 if (nI  grpfIhdt)
@@ -2395,6 +2398,12 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const 
SwPageDesc *pPrev,
 = (nI  ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true: 
false;
 bool bUseFirst
 = (nI  ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST )) ? true: 
false;
+
+// If we are loading a first-page header/footer which is not
+// actually enabled in this section (it still needs to be
+// loaded as it may be inherited by a later section)
+bool bDisabledFirst = bUseFirst  !rSection.HasTitlePage();
+
 bool bFooter
 = (nI  ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD | 
WW8_FOOTER_FIRST )) ? true: false;
 
@@ -2409,7 +2418,8 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const 
SwPageDesc *pPrev,

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

2014-07-09 Thread Luke Deller

 sw/qa/extras/ww8import/data/fdo77844.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx |   47 +++
 sw/source/filter/ww8/ww8par.cxx  |   15 -
 3 files changed, 60 insertions(+), 2 deletions(-)

New commits:
commit 025a9cf3a8ceba61d8424d7dcb029ab9607a0d73
Author: Luke Deller l...@deller.id.au
Date:   Sun Jul 6 23:19:18 2014 +1000

fix fdo#77844: header wrongly enabled from .doc

The LO page style needs page headers to be turned on if the
corresponding .doc file section has a left (=even) page header or a
first page header.

However this should not be triggered in the case where a first page
header is present but hidden due to the different first page header
option being disabled. This case is fixed by this commit.

Change-Id: If3de0df45378587fdbdecc6a091d2f4b60940b43
Reviewed-on: https://gerrit.libreoffice.org/10100
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit f312ef98de57a5926be67421395544bb9d41b809)
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/qa/extras/ww8import/data/fdo77844.doc 
b/sw/qa/extras/ww8import/data/fdo77844.doc
new file mode 100755
index 000..cd7368d
Binary files /dev/null and b/sw/qa/extras/ww8import/data/fdo77844.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 270d665..147fb88 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -415,6 +415,53 @@ DECLARE_WW8IMPORT_TEST(testBnc875715, bnc875715.doc)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
getPropertysal_Int32(xSections-getByIndex(0), SectionLeftMargin));
 }
 
+DECLARE_WW8IMPORT_TEST(testFdo77844, fdo77844.doc)
+{
+uno::Referencecontainer::XNameAccess pageStyles = 
getStyles(PageStyles);
+
+// get a page cursor
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier xTextViewCursorSupplier(
+xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor xCursor(
+xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+
+// check that the first page has no header
+xCursor-jumpToFirstPage();
+OUString pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+uno::Referencestyle::XStyle pageStyle(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+bool headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(!headerIsOn);
+
+// check that the second page has a header
+xCursor-jumpToPage(2);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(headerIsOn);
+
+// check that the third page has a header
+xCursor-jumpToPage(3);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(headerIsOn);
+
+// check that the fourth page has no header
+// (#if'd out as this is not yet imported correctly)
+#if 0
+xCursor-jumpToPage(4);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(!headerIsOn);
+#endif
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9224568..11fafbe 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2377,6 +2377,9 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const 
SwPageDesc *pPrev,
 long nLen;
 sal_uInt8 nNumber = 5;
 
+// This loops through the 6 flags WW8_{FOOTER,HEADER}_{ODD,EVEN,FIRST}
+// corresponding to bit fields in grpfIhdt indicating which
+// header/footer(s) are present in this section
 for( sal_uInt8 nI = 0x20; nI; nI = 1, nNumber-- )
 {
 if (nI  grpfIhdt)
@@ -2394,6 +2397,12 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const 
SwPageDesc *pPrev,
 = (nI  ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true: 
false;
 bool bUseFirst
 = (nI  ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST )) ? true: 
false;
+
+// If we are loading a first-page header/footer which is not
+// actually enabled in this section (it still needs to be
+// loaded as it may be inherited by a later section)
+bool bDisabledFirst = bUseFirst  !rSection.HasTitlePage();
+
 bool bFooter
 = (nI  ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD |

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

2014-07-09 Thread Luke Deller

 sw/qa/extras/ww8import/data/fdo77844.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx |   47 +++
 sw/source/filter/ww8/ww8par.cxx  |   15 -
 3 files changed, 60 insertions(+), 2 deletions(-)

New commits:
commit 7cae592e57d2cfccf55583f18e65fb0f67c7fa42
Author: Luke Deller l...@deller.id.au
Date:   Sun Jul 6 23:19:18 2014 +1000

fix fdo#77844: header wrongly enabled from .doc

The LO page style needs page headers to be turned on if the
corresponding .doc file section has a left (=even) page header or a
first page header.

However this should not be triggered in the case where a first page
header is present but hidden due to the different first page header
option being disabled. This case is fixed by this commit.

Change-Id: If3de0df45378587fdbdecc6a091d2f4b60940b43
Reviewed-on: https://gerrit.libreoffice.org/10100
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit f312ef98de57a5926be67421395544bb9d41b809)
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/qa/extras/ww8import/data/fdo77844.doc 
b/sw/qa/extras/ww8import/data/fdo77844.doc
new file mode 100755
index 000..cd7368d
Binary files /dev/null and b/sw/qa/extras/ww8import/data/fdo77844.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 09467cd..0d360d8 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -278,6 +278,53 @@ DECLARE_WW8IMPORT_TEST(testBnc875715, bnc875715.doc)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
getPropertysal_Int32(xSections-getByIndex(0), SectionLeftMargin));
 }
 
+DECLARE_WW8IMPORT_TEST(testFdo77844, fdo77844.doc)
+{
+uno::Referencecontainer::XNameAccess pageStyles = 
getStyles(PageStyles);
+
+// get a page cursor
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier xTextViewCursorSupplier(
+xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor xCursor(
+xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+
+// check that the first page has no header
+xCursor-jumpToFirstPage();
+OUString pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+uno::Referencestyle::XStyle pageStyle(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+bool headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(!headerIsOn);
+
+// check that the second page has a header
+xCursor-jumpToPage(2);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(headerIsOn);
+
+// check that the third page has a header
+xCursor-jumpToPage(3);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(headerIsOn);
+
+// check that the fourth page has no header
+// (#if'd out as this is not yet imported correctly)
+#if 0
+xCursor-jumpToPage(4);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(!headerIsOn);
+#endif
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e2e9080..21ba56d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2371,6 +2371,9 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const 
SwPageDesc *pPrev,
 long nLen;
 sal_uInt8 nNumber = 5;
 
+// This loops through the 6 flags WW8_{FOOTER,HEADER}_{ODD,EVEN,FIRST}
+// corresponding to bit fields in grpfIhdt indicating which
+// header/footer(s) are present in this section
 for( sal_uInt8 nI = 0x20; nI; nI = 1, nNumber-- )
 {
 if (nI  grpfIhdt)
@@ -2388,6 +2391,12 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const 
SwPageDesc *pPrev,
 = (nI  ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true: 
false;
 bool bUseFirst
 = (nI  ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST )) ? true: 
false;
+
+// If we are loading a first-page header/footer which is not
+// actually enabled in this section (it still needs to be
+// loaded as it may be inherited by a later section)
+bool bDisabledFirst = bUseFirst  !rSection.HasTitlePage();
+
 bool bFooter
 = (nI  ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD |

Re: Looking into the moving anchors problems in Calc and Writer

2014-07-09 Thread Bjoern Michaelsen

Hi Jan-Marek,

On Wed, Jul 09, 2014 at 12:12:12PM +0200, Jan-Marek Glogowski wrote:
 == MM Speed (still broken, but unrelated) ==
 
 I've put quite some information into fdo#80823 to prevent optimizations
 in the wrong area.
 
 fdo#56355 - MAILMERGE: Creating mailing with more than 1000 records is
 incredible slow (3.5.6.2)
 fdo#79067 - MAILMERGE: mailmerge takes ages to create documents (3.6.7.2)
 fdo#80823 - MAILMERGE: Use IDocumentMarkAccess::UNO_BOOKMARK to mark end
 of one mail merge part (OOo)

Just a quick note on this: I did callgrind this, but with trivial document only
having some enumerations. It might very well be that there are lots of
different performance issues in the layouts for different sample documents.

In the end, specfically for mail merge, the goal IMHO has to be to kill the
relayout after each insert, to allow the merged document to be rendered _once_
at the end of the merge. 

Of course, speeding up the layout itself is nice too as it likely also helps
load/save speed in general. But I dont think it would be the right approach to
fix mail merge for good.

Best,

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source

2014-07-09 Thread Armin Le Grand

 sd/source/ui/unoidl/unopage.cxx |   22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

New commits:
commit d07778f62ed386672a60ef7570a89b5fa109e026
Author: Armin Le Grand a...@apache.org
Date:   Wed Jul 9 11:57:21 2014 +

i119287 corrected default style for draw objects created using UNO API

diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 2b96447..8a8d9c0 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -67,11 +67,7 @@
 #include svx/svdview.hxx
 #include misc.hxx
 #include View.hxx
-#ifndef SVX_LIGHT
-#ifndef SD_DRAW_DOC_SHELL_HXX
 #include DrawDocShell.hxx
-#endif
-#endif
 #include ViewShell.hxx
 #include DrawViewShell.hxx
 #include unoobj.hxx
@@ -80,6 +76,7 @@
 #include unopback.hxx
 #include unohelp.hxx
 #include vcl/dibtools.hxx
+#include svx/svdograf.hxx
 
 using ::com::sun::star::animations::XAnimationNode;
 using ::com::sun::star::animations::XAnimationNodeSupplier;
@@ -433,7 +430,22 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const 
Reference drawing::XShap
 {
 SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()-GetModel();
 if( pDoc )
-pObj-NbcSetStyleSheet( pDoc-GetDefaultStyleSheet(), sal_True 
);
+{
+// #119287# similar to the code in the SdrObject methods the 
graphic and ole
+// SdrObjects need another default style than the rest, see 
task. Adding here, too.
+// : Same as for #119287#: Can be removed in branch aw080 
again
+const bool bIsSdrGrafObj(0 != dynamic_cast SdrGrafObj* 
(pObj));
+const bool bIsSdrOle2Obj(0 != dynamic_cast SdrOle2Obj* 
(pObj));
+
+if(bIsSdrGrafObj || bIsSdrOle2Obj)
+{
+
pObj-NbcSetStyleSheet(pDoc-GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(), 
sal_True);
+}
+else
+{
+pObj-NbcSetStyleSheet(pDoc-GetDefaultStyleSheet(), 
sal_True);
+}
+}
 }
 return pObj;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 63962] Remove LibreOffice icon themes hardcoding

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

V Stuart Foote vstuart.fo...@utsa.edu changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=75937

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

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

2014-07-09 Thread David Tardon

 svx/source/dialog/fntctrl.cxx |   21 +
 1 file changed, 5 insertions(+), 16 deletions(-)

New commits:
commit ca4e6cad00fd0c0a9b8670b5f67a8145622fdacf
Author: David Tardon dtar...@redhat.com
Date:   Wed Jul 9 14:43:50 2014 +0200

simplify loop

Change-Id: I26c1456ca805c6f3ecfa5bd4876e7ae345f087e7

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index e9a92eb..80ca478 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -246,11 +246,13 @@ void FontPrevWin_Impl::CheckScript()
 Reference XComponentContext  xContext = 
::comphelper::getProcessComponentContext();
 xBreak = BreakIterator::create(xContext);
 }
-sal_uInt16 nScript = xBreak-getScriptType( aText, 0 );
+
+sal_uInt16 nScript = 0;
 sal_Int32 nChg = 0;
 
-do
+while ( nChg  aText.getLength() )
 {
+nScript = xBreak-getScriptType( aText, nChg );
 nChg = xBreak-endOfScript( aText, nChg, nScript );
 if (nChg  aText.getLength()  nChg  0 
 (com::sun::star::i18n::ScriptType::WEAK ==
@@ -273,12 +275,7 @@ void FontPrevWin_Impl::CheckScript()
 }
 aScriptType.push_back( nScript );
 aTextWidth.push_back( 0 );
-
-if( nChg  aText.getLength() )
-nScript = xBreak-getScriptType( aText, nChg );
-else
-break;
-} while( true );
+}
 }
 
 /*
commit 8817e5e3a0d92a4febae955ced7a35c52cb08910
Author: David Tardon dtar...@redhat.com
Date:   Wed Jul 9 14:41:29 2014 +0200

fdo#81004 this looks like a mis-merge to me

Change-Id: I2d30774a8a89002b6c2d8487bfce15eb13c82e0d

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 6e9ca6e..e9a92eb 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -248,14 +248,6 @@ void FontPrevWin_Impl::CheckScript()
 }
 sal_uInt16 nScript = xBreak-getScriptType( aText, 0 );
 sal_Int32 nChg = 0;
-if( com::sun::star::i18n::ScriptType::WEAK == nScript )
-{
-nChg = xBreak-endOfScript( aText, nChg, nScript );
-if (nChg  aText.getLength()  nChg = 0)
-nScript = xBreak-getScriptType( aText, nChg );
-else
-nScript = com::sun::star::i18n::ScriptType::LATIN;
-}
 
 do
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-09 Thread Michael Meeks

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af433f404f14c5dbed77b5fb764cf24caca9631e
Author: Michael Meeks michael.me...@collabora.com
Date:   Wed Jul 9 13:46:44 2014 +0100

fdo#75937 - package galaxy theme in a form we like; cf. fdo#81103.

Change-Id: If920257f141a2dc4208d1fd322b875fdc8315cee

diff --git a/configure.ac b/configure.ac
index 7be9bd2..5d25cf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11621,7 +11621,7 @@ dnl 
===
 AC_MSG_CHECKING([which themes to include])
 # if none given use default subset of available themes
 if test x$with_theme = x -o x$with_theme = xyes; then
-with_theme=crystal default hicontrast oxygen tango sifr
+with_theme=crystal default galaxy hicontrast oxygen tango sifr
 test -z $ENABLE_RELEASE_BUILD  with_theme=$with_theme tango_testing
 fi
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

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

Bug 75025 depends on bug 75937, which changed state.

Bug 75937 Summary: Galaxy icon set missing in 4.3
https://bugs.freedesktop.org/show_bug.cgi?id=75937

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

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

 cui/source/options/optaboutconfig.cxx |   42 +-
 cui/source/options/optaboutconfig.hxx |   12 +++--
 cui/source/options/optpath.cxx|4 +--
 3 files changed, 32 insertions(+), 26 deletions(-)

New commits:
commit 877aa0e1e879b057027029c1ceed07f90b00b0d3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 9 13:46:00 2014 +0100

Resolves: fdo#73806 reduce the size-request of the expert config dialog

the optimal size was set to be 1024x800, reduce this down to
effectively the same size as the options dialog itself.

This dialog just isn't ever going to be right given the huge
length of the strings and the number of strings. We need
something more like a file picker dialog view here

Change-Id: I019e951601c3df769a609b8b439b535b6d5e254f

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 9825645..e918c8a 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -124,21 +124,16 @@ Size CuiCustomMultilineEdit::GetOptimalSize() const
 return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
 }
 
-Size CuiAboutConfigTabPage::GetOptimalSize() const
-{
-return LogicToPixel(Size(1024,800),MAP_APPFONT);
-}
-
 CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent/*, const 
SfxItemSet rItemSet*/ ) :
 ModelessDialog( pParent, AboutConfig, cui/ui/aboutconfigdialog.ui),
 m_pPrefCtrl( getSvSimpleTableContainer(preferences) ),
 m_pResetBtn( getPushButton(reset) ),
 m_pEditBtn( getPushButton(edit) ),
 m_vectorOfModified(),
-m_pPrefBox( new OptHeaderTabListBox( *m_pPrefCtrl,
- WB_SCROLL | WB_HSCROLL | WB_VSCROLL ) 
)
+m_pPrefBox( new SvSimpleTable(*m_pPrefCtrl,
+  WB_SCROLL | WB_HSCROLL | WB_VSCROLL ) )
 {
-Size aControlSize(200,200);
+Size aControlSize(LogicToPixel(Size(385, 230), MAP_APPFONT));
 m_pPrefCtrl-set_width_request(aControlSize.Width());
 m_pPrefCtrl-set_height_request(aControlSize.Height());
 
@@ -152,11 +147,14 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* 
pParent/*, const SfxItemSe
 rBar.InsertItem( ITEMID_TYPE, getFixedText(type)-GetText(), 0,  
HIB_LEFT | HIB_VCENTER );
 rBar.InsertItem( ITEMID_VALUE, getFixedText(value)-GetText(), 0,  
HIB_LEFT | HIB_VCENTER );
 
-long aTabs[] = {4,900,50,50,50};//TODO: Not works correctly hardcoded for 
now.
+long aTabs[] = {4,0,0,0,0};
+
+float fWidth = approximate_char_width();
 
-aTabs[2] += aTabs[1] + rBar.GetTextWidth(rBar.GetItemText(1));
-aTabs[3] += aTabs[2] + 160; //rBar.GetTextWidth(rBar.GetItemText(2));
-aTabs[4] += aTabs[3] + 40; //rBar.GetTextWidth(rBar.GetItemText(3));
+aTabs[1] = 0;
+aTabs[2] = aTabs[1] + fWidth * 65;
+aTabs[3] = aTabs[2] + fWidth * 20;
+aTabs[4] = aTabs[3] + fWidth * 8;
 
 m_pPrefBox-SetTabs(aTabs, MAP_PIXEL);
 }
@@ -174,7 +172,7 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString 
rProp, const OUString r
 m_pPrefBox-Insert( pEntry );
 }
 
-void CuiAboutConfigTabPage::Reset(/* const SfxItemSet*/ )
+void CuiAboutConfigTabPage::Reset()
 {
 m_pPrefBox-Clear();
 
@@ -187,7 +185,7 @@ void CuiAboutConfigTabPage::Reset(/* const SfxItemSet*/ )
 m_pPrefBox-SetUpdateMode(true);
 }
 
-bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet*/ )
+bool CuiAboutConfigTabPage::FillItemSet()
 {
 bool bModified = false;
 
diff --git a/cui/source/options/optaboutconfig.hxx 
b/cui/source/options/optaboutconfig.hxx
index ee42492..e848cc4 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -37,7 +37,6 @@ public:
 
 virtual void KeyInput( const KeyEvent rKeyEvent ) SAL_OVERRIDE;
 virtual Size GetOptimalSize() const SAL_OVERRIDE;
-//void setBehaviour( bool bNumeric, int nLengthLimit);
 };
 
 class CuiAboutConfigTabPage : public ModelessDialog
@@ -48,7 +47,7 @@ private:
 PushButton* m_pEditBtn;
 
 std::vector boost::shared_ptr Prop_Impl   m_vectorOfModified;
-boost::scoped_ptr svx::OptHeaderTabListBox  m_pPrefBox;
+boost::scoped_ptr SvSimpleTable  m_pPrefBox;
 
 void AddToModifiedVector( const boost::shared_ptr Prop_Impl  rProp );
 std::vector OUString  commaStringToSequence( const OUString 
rCommaSepString );
@@ -57,15 +56,12 @@ private:
 DECL_LINK( ResetBtnHdl_Impl, void * );
 
 public:
-   //static ModalDialog* Create( Window* pParent, const SfxItemSet rItemset );
-   CuiAboutConfigTabPage( Window* pParent/*, const SfxItemSet rItemSet*/ );
+   CuiAboutConfigTabPage(Window* pParent);
void InsertEntry(const OUString rProp, const OUString rStatus, const 
OUString rType, const OUString rValue);
-   void Reset(/* const SfxItemSet*/ );
+   void Reset();
void FillItems(const 
com::sun::star::uno::Referencecom::sun::star::container::XNameAccess 
xNameAccess);

How to solve the libreoffice build error?

2014-07-09 Thread Zhen Anddavid

Hi, All

I'm trying to build the LibreOffice 4.2.4.2 source.
But while building, I met the error.
The error follows as below.

libreoffice-4.2.4.2\embedserv\source\inc\stdafx.h(22) : fatal error C1083:
Cannot open include file: 'atlbase.h': No such file or directory
make[1]: ***
[D:/0-Office-Work/Source/libreoffice-4.2.4.2/workdir/CxxObject/embedserv/source/embed/docholder.o]
Error 2
make[1]: *** Waiting for unfinished jobs
make[1]: ***
[D:/0-Office-Work/Source/libreoffice-4.2.4.2/workdir/CxxObject/embedserv/source/embed/ed_idataobj.o]
Error 2
make: *** [build] Error 2


There is atlbase.h file in C:\Program Files\Microsoft Visual Studio
10.0\VC\atlmfc\include on my computer.
My build environment follows as below.
Windows 7 SP1 (32bit), Visual Studio 2010 Ultimate SP1, cygwin

And I downloaded the make.exe from
http://dev-www.libreoffice.org/bin/cygwin/make and copied it /opt/lo/bin,
/bin, /usr/bin, /usr/local/bin folders.
Then, I used following instructions to build it.
cd $(SRC_ROOT)
chmod 755 * -R
./autogen.sh
--with-ant-home=/cygdrive/d/0-Office-Work/Tools/apache-ant-1.9.4/
--without-junit --disable-activex --disable-directx --enable-dbgutil
--without-help --without-myspell-dicts --without-doxygen
time make

Please help me. Thanks.

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

ign_christian ign_christ...@yahoo.com changed:

   What|Removed |Added

 Depends on||80846

--- Comment #177 from ign_christian ign_christ...@yahoo.com ---
Nominating Bug 80846 : regression, affects some users

Working in 4.1.6.2 and 4.2.4.2, 
but not working in 4.2.0.0.beta1, 4.2.5.2, 4.3.0.2

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

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

2014-07-09 Thread Armin Le Grand

 sd/source/ui/unoidl/unopage.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 0aa3dee5e88a1494a7a6a8401e084cbdb4324727
Author: Armin Le Grand a...@apache.org
Date:   Wed Jul 9 11:57:21 2014 +

Resolves: #i119287# corrected default style for draw objects...

created using UNO API

(cherry picked from commit d07778f62ed386672a60ef7570a89b5fa109e026)

Conflicts:
sd/source/ui/unoidl/unopage.cxx

Change-Id: I016d801edefb5ab32b7b6a8e13a1dc3e8fdb866e

diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 359bade..39cc6ee 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -71,6 +71,7 @@
 #include unopback.hxx
 #include unohelp.hxx
 #include vcl/dibtools.hxx
+#include svx/svdograf.hxx
 
 using ::com::sun::star::animations::XAnimationNode;
 using ::com::sun::star::animations::XAnimationNodeSupplier;
@@ -400,7 +401,22 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const 
Reference drawing::XShap
 {
 SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()-GetModel();
 if( pDoc )
-pObj-NbcSetStyleSheet( pDoc-GetDefaultStyleSheet(), true );
+{
+// #i119287# similar to the code in the SdrObject methods the 
graphic and ole
+// SdrObjects need another default style than the rest, see 
task. Adding here, too.
+// : Same as for #i119287#: Can be removed in branch aw080 
again
+const bool bIsSdrGrafObj(0 != dynamic_cast SdrGrafObj* 
(pObj));
+const bool bIsSdrOle2Obj(0 != dynamic_cast SdrOle2Obj* 
(pObj));
+
+if(bIsSdrGrafObj || bIsSdrOle2Obj)
+{
+
pObj-NbcSetStyleSheet(pDoc-GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(), 
true);
+}
+else
+{
+pObj-NbcSetStyleSheet(pDoc-GetDefaultStyleSheet(), true);
+}
+}
 }
 return pObj;
 }
___
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' - d0/7778f62ed386672a60ef7570a89b5fa109e026

 d0/7778f62ed386672a60ef7570a89b5fa109e026 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ead739f3d723c7e1fa146b60ccd497e27dd9acf2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 9 14:31:32 2014 +0100

Notes added by 'git notes add'

diff --git a/d0/7778f62ed386672a60ef7570a89b5fa109e026 
b/d0/7778f62ed386672a60ef7570a89b5fa109e026
new file mode 100644
index 000..9f51cdb
--- /dev/null
+++ b/d0/7778f62ed386672a60ef7570a89b5fa109e026
@@ -0,0 +1 @@
+merged as: 0aa3dee5e88a1494a7a6a8401e084cbdb4324727
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to solve the libreoffice build error?

On Wed, 2014-07-09 at 21:19 +0800, Zhen Anddavid wrote:
 Hi, All

 
 libreoffice-4.2.4.2\embedserv\source\inc\stdafx.h(22) : fatal error
 C1083: Cannot open include file: 'atlbase.h': No such file or

Try adding --disable-atl to you configure line

C.


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f2/7e75828f65ce454a50f92ba64ee6847456f88f

 f2/7e75828f65ce454a50f92ba64ee6847456f88f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6b1678c4ea35270ebc9c4475fd3f5f6621e62b15
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 9 15:01:12 2014 +0100

Notes added by 'git notes add'

diff --git a/f2/7e75828f65ce454a50f92ba64ee6847456f88f 
b/f2/7e75828f65ce454a50f92ba64ee6847456f88f
new file mode 100644
index 000..8c3572b
--- /dev/null
+++ b/f2/7e75828f65ce454a50f92ba64ee6847456f88f
@@ -0,0 +1 @@
+prefer: 61f6193d26615e5849a97d670f77d71c7f7d8dea
___
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' - include/oox oox/Library_oox.mk oox/source

2014-07-09 Thread Matúš Kukan

 include/oox/drawingml/ThemeOverrideFragmentHandler.hxx |   40 ++
 include/oox/ppt/pptimport.hxx  |1 
 oox/Library_oox.mk |1 
 oox/source/drawingml/ThemeOverrideFragmentHandler.cxx  |   48 +
 oox/source/drawingml/shape.cxx |   20 ++-
 5 files changed, 109 insertions(+), 1 deletion(-)

New commits:
commit 01a82fbc098cc668b68be933fb6cb6c68ce99ee9
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Fri Jul 4 15:12:59 2014 +0200

bnc#882383: Do not ignore themeOverride for charts in .pptx

Otherwise wrong colors are displayed.

(cherry picked from commit 08818d8a45e034ad825c7fafbb76766f106f1d1d)

Conflicts:
oox/source/drawingml/shape.cxx

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

diff --git a/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx 
b/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx
new file mode 100644
index 000..827cf5a
--- /dev/null
+++ b/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_OOX_DRAWINGML_THEMEOVERRICEFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_DRAWINGML_THEMEOVERRICEFRAGMENTHANDLER_HXX
+
+#include oox/core/fragmenthandler2.hxx
+
+namespace oox {
+namespace drawingml {
+
+class Theme;
+
+class ThemeOverrideFragmentHandler : public ::oox::core::FragmentHandler2
+{
+public:
+explicitThemeOverrideFragmentHandler(
+::oox::core::XmlFilterBase rFilter,
+const OUString rFragmentPath,
+Theme rTheme );
+virtual ~ThemeOverrideFragmentHandler();
+
+virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 
nElement, const AttributeList rAttribs ) SAL_OVERRIDE;
+
+private:
+Theme  mrTheme;
+};
+
+} // namespace drawingml
+} // namespace oox
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index ffde992..3aaf5f1 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -50,6 +50,7 @@ public:
 virtual const oox::drawingml::table::TableStyleListPtr getTableStyles();
 virtual ::oox::drawingml::chart::ChartConverter* getChartConverter();
 
+SlidePersistPtr 
getActualSlidePersist() const { return mpActualSlidePersist; };
 void
setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ 
mpActualSlidePersist = pActualSlidePersist; };
 std::map OUString, oox::drawingml::ThemePtr getThemes(){ return 
maThemes; };
 std::vector SlidePersistPtr  getDrawPages(){ 
return maDrawPages; };
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index f9ac63e..d933b56 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -201,6 +201,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/drawingml/theme \
 oox/source/drawingml/themeelementscontext \
 oox/source/drawingml/themefragmenthandler \
+oox/source/drawingml/ThemeOverrideFragmentHandler \
 oox/source/drawingml/transform2dcontext \
 oox/source/dump/dffdumper \
 oox/source/dump/dumperbase \
diff --git a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx 
b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
new file mode 100644
index 000..5f3e7fc
--- /dev/null
+++ b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
@@ -0,0 +1,48 @@
+/* -*- 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 oox/drawingml/ThemeOverrideFragmentHandler.hxx
+#include oox/drawingml/theme.hxx
+#include oox/drawingml/themeelementscontext.hxx
+
+using namespace ::oox::core;
+
+namespace oox {
+namespace drawingml {
+
+ThemeOverrideFragmentHandler::ThemeOverrideFragmentHandler( XmlFilterBase 
rFilter, const OUString rFragmentPath, Theme rTheme ) :
+FragmentHandler2( rFilter, rFragmentPath ),
+mrTheme( rTheme )
+{
+}
+

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

2014-07-09 Thread Oliver-Rainer Wittmann

 sw/inc/IDocumentMarkAccess.hxx |5 ---
 sw/source/core/doc/docbm.cxx   |   54 -
 sw/source/core/doc/docdde.cxx  |4 +-
 sw/source/core/inc/MarkManager.hxx |5 ---
 sw/source/filter/ww8/wrtw8nds.cxx  |9 --
 5 files changed, 10 insertions(+), 67 deletions(-)

New commits:
commit 9c3dec47a12d37dd9b6fa71dca1f41def975759b
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Jul 8 11:45:46 2014 +

Related: #i125215# MarkManager: remove unnecessary mark container

(cherry picked from commit f73412f09ca8a34bb7ec73370dae3e6033c0c581)

Conflicts:
sw/inc/IDocumentMarkAccess.hxx
sw/source/core/doc/docbm.cxx
sw/source/core/doc/docdde.cxx
sw/source/core/inc/MarkManager.hxx

Change-Id: I8aa3a0a3362de63fec9cd640ffde89d5f7f57417

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index fe5b608..c565a91 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -252,11 +252,6 @@ class IDocumentMarkAccess
 virtual ::sw::mark::IFieldmark* getDropDownFor(const SwPosition pos) 
const=0;
 virtual std::vector ::sw::mark::IFieldmark*  getDropDownsFor(const 
SwPaM rPaM) const=0;
 
-// Marks exclusive annotation marks
-virtual const_iterator_t getCommonMarksBegin() const = 0;
-virtual const_iterator_t getCommonMarksEnd() const = 0;
-virtual sal_Int32 getCommonMarksCount() const = 0;
-
 // Annotation Marks
 virtual const_iterator_t getAnnotationMarksBegin() const = 0;
 virtual const_iterator_t getAnnotationMarksEnd() const = 0;
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 39abcd6..1f190d7 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -347,7 +347,6 @@ namespace sw { namespace mark
 , m_vBookmarks()
 , m_vFieldmarks()
 , m_vAnnotationMarks()
-, m_vCommonMarks()
 , m_pDoc(rDoc)
 { }
 
@@ -436,12 +435,10 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::BOOKMARK:
 case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK:
 case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 lcl_InsertMarkSorted(m_vBookmarks, pMark);
 break;
 case IDocumentMarkAccess::TEXT_FIELDMARK:
 case IDocumentMarkAccess::CHECKBOX_FIELDMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 lcl_InsertMarkSorted(m_vFieldmarks, pMark);
 break;
 case IDocumentMarkAccess::ANNOTATIONMARK:
@@ -450,7 +447,6 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::NAVIGATOR_REMINDER:
 case IDocumentMarkAccess::DDE_BOOKMARK:
 case IDocumentMarkAccess::UNO_BOOKMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // no special array for these
 break;
 }
@@ -858,16 +854,6 @@ namespace sw { namespace mark
 {
 OSL_ENSURE( false, MarkManager::deleteMark(..) - 
Bookmark not found in Bookmark container.);
 }
-
-ppBookmark = lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppBookmark != m_vCommonMarks.end() )
-{
-m_vCommonMarks.erase(ppBookmark);
-}
-else
-{
-OSL_ENSURE( false, MarkManager::deleteMark(..) - 
Bookmark not found in common mark container.);
-}
 }
 break;
 
@@ -884,16 +870,6 @@ namespace sw { namespace mark
 {
 OSL_ENSURE( false, MarkManager::deleteMark(..) - 
Fieldmark not found in Fieldmark container.);
 }
-
-ppFieldmark = lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppFieldmark != m_vCommonMarks.end() )
-{
-m_vCommonMarks.erase(ppFieldmark);
-}
-else
-{
-OSL_ENSURE( false, MarkManager::deleteMark(..) - 
Fieldmark not found in common mark container.);
-}
 }
 break;
 
@@ -914,17 +890,7 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::NAVIGATOR_REMINDER:
 case IDocumentMarkAccess::DDE_BOOKMARK:
 case IDocumentMarkAccess::UNO_BOOKMARK:
-{
-IDocumentMarkAccess::iterator_t ppOtherMark = 
lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppOtherMark != m_vCommonMarks.end() )
-{
-m_vCommonMarks.erase(ppOtherMark);

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f7/3412f09ca8a34bb7ec73370dae3e6033c0c581

 f7/3412f09ca8a34bb7ec73370dae3e6033c0c581 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 85e358e8880fa7e9dc7550c1396e159712f92f9b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 9 16:17:29 2014 +0100

Notes added by 'git notes add'

diff --git a/f7/3412f09ca8a34bb7ec73370dae3e6033c0c581 
b/f7/3412f09ca8a34bb7ec73370dae3e6033c0c581
new file mode 100644
index 000..43cc3b1
--- /dev/null
+++ b/f7/3412f09ca8a34bb7ec73370dae3e6033c0c581
@@ -0,0 +1 @@
+merged as: 9c3dec47a12d37dd9b6fa71dca1f41def975759b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 3 commits - editeng/source svgio/source

2014-07-09 Thread matteocam

 editeng/source/outliner/outliner.cxx|3 ++-
 svgio/source/svgreader/svgcharacternode.cxx |1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c16b56a2c85f4d2405c6efa04153f1e85db24441
Author: matteocam matteo.campane...@gmail.com
Date:   Wed Jul 9 17:37:46 2014 +0200

Experiment with truncating length of DrawPortionInfo

Change-Id: I735d752a1817afb89028b2f8aed816860d918e2f

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 1fa6c59..34962f4 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1757,7 +1757,7 @@ void Outliner::DrawingText( const Point rStartPos, const 
OUString rText, sal_I
 if(aDrawPortionHdl.IsSet())
 {
 // FIXME(matteocam)
-DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
std::max(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
+DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
std::min(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
 pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, 
false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet);
 
 aDrawPortionHdl.Call( aInfo );
commit 96a2a9c3c284092551f2750e2c5498ef06ad3d38
Author: matteocam matteo.campane...@gmail.com
Date:   Wed Jul 9 17:33:28 2014 +0200

Experiment with truncating length of DrawPortionInfo

Change-Id: I05fb15a227b85f153de561e0e46143b6fc58e8fe

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 36fe59f..1fa6c59 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1757,7 +1757,7 @@ void Outliner::DrawingText( const Point rStartPos, const 
OUString rText, sal_I
 if(aDrawPortionHdl.IsSet())
 {
 // FIXME(matteocam)
-DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
stl::max(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
+DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
std::max(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
 pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, 
false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet);
 
 aDrawPortionHdl.Call( aInfo );
commit 94e9cc6952611d9e2aa20a18e5a5008738f43785
Author: matteocam matteo.campane...@gmail.com
Date:   Wed Jul 9 17:30:09 2014 +0200

Experiment with truncating length of DrawPortionInfo

Change-Id: I62763614bd60e8f7b27b37d14c895af216c553e7

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 08f0b79..36fe59f 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1756,7 +1756,8 @@ void Outliner::DrawingText( const Point rStartPos, const 
OUString rText, sal_I
 
 if(aDrawPortionHdl.IsSet())
 {
-DrawPortionInfo aInfo( rStartPos, rText, nTextStart, nTextLen, rFont, 
nPara, nIndex, pDXArray, pWrongSpellVector,
+// FIXME(matteocam)
+DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
stl::max(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
 pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, 
false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet);
 
 aDrawPortionHdl.Call( aInfo );
diff --git a/svgio/source/svgreader/svgcharacternode.cxx 
b/svgio/source/svgreader/svgcharacternode.cxx
index a266152..ff9237c 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -463,6 +463,7 @@ namespace svgio
 aFontAttribute,
 aLocale,
 aFill,
+COL_TRANSPARENT,
 
 // extra props for decorated
 aDecoColor,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-2-6'

New branch 'libreoffice-4-2-6' available with the following commits:
commit ca540b43eed07331bb1572225b011cb608114fbb
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 9 18:06:34 2014 +0200

Branch libreoffice-4-2-6

This is 'libreoffice-4-2-6' - the stable branch for the 4.2.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.2.x release,
please use the 'libreoffice-4-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I8d07d90d455e4cfa68558d30a27581ba668e90c0

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-2-6'

New branch 'libreoffice-4-2-6' available with the following commits:
commit 1b1d4f8e4596bf55b531a37617a5ea0763abe5fc
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 9 18:06:38 2014 +0200

Branch libreoffice-4-2-6

This is 'libreoffice-4-2-6' - the stable branch for the 4.2.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.2.x release,
please use the 'libreoffice-4-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I14398cae334d92af9becec9a093636f8548e5b9c

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-2-6'

New branch 'libreoffice-4-2-6' available with the following commits:
commit 4a43e761b51639b31c6b79fd747f377f7bd0b3e7
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 9 18:06:34 2014 +0200

Branch libreoffice-4-2-6

This is 'libreoffice-4-2-6' - the stable branch for the 4.2.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.2.x release,
please use the 'libreoffice-4-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I60a884970f91601952be54c212ec79343b03fc28

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sfx2/source sysui/desktop

2014-07-09 Thread Herbert Dürr

 sfx2/source/appl/impldde.cxx|   15 ---
 sysui/desktop/debian/makefile.mk|   20 ++--
 sysui/desktop/productversion.mk |2 +-
 sysui/desktop/slackware/makefile.mk |   20 ++--
 4 files changed, 33 insertions(+), 24 deletions(-)

New commits:
commit 2c835e761e1e9ddb6794895e6f3538b918160dd1
Author: Herbert DÃ¼rr h...@apache.org
Date:   Wed Jul 9 15:51:49 2014 +

#i125226# some macro preferences are directly applicable to DDE servers

diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 2dfe160..8bc1cb6 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -49,6 +49,8 @@
 #include svl/svdde.hxx
 #include sot/formats.hxx
 
+#include unotools/securityoptions.hxx
+
 #define DDELINK_COLD0
 #define DDELINK_HOT 1
 
@@ -255,13 +257,15 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
 }
 
 #if defined(WNT)
-bool bForbidden = bInWinExec;
-// TODO: also check the security level
-static const char* aBadServers[] = { cmd };
+// check the suitability of starting the DDE server
+const SvtSecurityOptions aSecOpts;
+bool bForbidden = (aSecOpts.GetMacroSecurityLevel() != eNEVER_EXECUTE);
+bForbidden |= (bInWinExec != sal_False);
+static const char* aBadServers[] = { cmd, rundll32 };
 for( int i = 0; i  sizeof(aBadServers)/sizeof(*aBadServers); ++i)
-bForbidden |= (sServer.CompareIgnoreCaseToAscii( aBadServers[i]) 
== COMPARE_EQUAL);
+bForbidden |= (sServer.CompareIgnoreCaseToAscii( aBadServers[i]) 
== COMPARE_EQUAL );
 
-// try to start the DDE server if it is not there
+// try to start the DDE server if it is not there already
 if( !bForbidden )
 {
 ByteString aCmdLine( sServer, RTL_TEXTENCODING_ASCII_US );
commit 88de6a59d9d7933b86fdcba733277aa4fbd5e132
Author: Herbert DÃ¼rr h...@apache.org
Date:   Wed Jul 9 15:23:59 2014 +

#i125226# don't try to access known-bad DDE servers

diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index c4d8ae6..2dfe160 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -255,9 +255,14 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
 }
 
 #if defined(WNT)
-
-// Server nicht da, starten und nochmal versuchen
-if( !bInWinExec )
+bool bForbidden = bInWinExec;
+// TODO: also check the security level
+static const char* aBadServers[] = { cmd };
+for( int i = 0; i  sizeof(aBadServers)/sizeof(*aBadServers); ++i)
+bForbidden |= (sServer.CompareIgnoreCaseToAscii( aBadServers[i]) 
== COMPARE_EQUAL);
+
+// try to start the DDE server if it is not there
+if( !bForbidden )
 {
 ByteString aCmdLine( sServer, RTL_TEXTENCODING_ASCII_US );
 aCmdLine.Append( .exe  );
commit e58576b77160240afb952e55b1f125cf703ae195
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Wed Jul 9 14:37:08 2014 +

124940: further 'version numbers' which need to be adapted to 4.2

diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index 30d886c..96c630a 100644
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -41,7 +41,7 @@ TARGET=debian
 
 .IF $(PKGFORMAT)!=$(PKGFORMAT:s/deb//)
 
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} 
$(PKGDIR)$/$i4.0-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)} 
$(PKGDIR)$/$i4.2-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
 
 .ENDIF
 
@@ -56,22 +56,22 @@ ALLTAR : $(DEBFILES)
 
 %/DEBIAN/control : $$(@:f)
 @$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
-ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//)) $*$/etc$/
-/bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.0//)  
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr create_tree.sh
-@cat openoffice.org-debian-menus | sed -e 
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//)) 
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.0//))/' -e 
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/' -e 
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.0//))/'  
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.0//)
-echo Package: $(*:f:s/_/ /:1:s/4.0//)  $@
-cat $(@:f) | tr -d \015 | sed s/%productname/$(PRODUCTNAME.$(*:f:s/-/ 
/:1:s/4.0//))/  $@
-echo Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.0//))-$(PKGREV)  $@
+ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//)) $*$/etc$/
+/bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.2//)  
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr create_tree.sh
+@cat openoffice.org-debian-menus | sed -e 
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.2//)) 
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.2//))/' -e

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-2-6'

New branch 'libreoffice-4-2-6' available with the following commits:
commit 8a262b50f401a27c342e0f763fae24ef26583678
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 9 18:06:55 2014 +0200

Branch libreoffice-4-2-6

This is 'libreoffice-4-2-6' - the stable branch for the 4.2.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.2.x release,
please use the 'libreoffice-4-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I9ab3c759892c827ef8b26e83712c526facccebe5

___
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' - configure.ac

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7bbcb384fddb2cab99de4c6bd4b74c65dd80c432
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 9 18:13:39 2014 +0200

bump product version to 4.2.7.0.0+

Change-Id: Ie7d38cc0bcb2852d5743a2e80b0ad69475d6cd04

diff --git a/configure.ac b/configure.ac
index aa6f483..312eacd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.6.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.7.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 comphelper/source/misc/storagehelper.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit f8226e87b446d96a3803df46d9b786c233d1e1f5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jul 9 12:04:35 2014 -0400

Pass a useful exception message.

Change-Id: Idde024a7b6896571d159c3983ef1985fa12d0c5a

diff --git a/comphelper/source/misc/storagehelper.cxx 
b/comphelper/source/misc/storagehelper.cxx
index 0c60a7c..51ee8c5 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -45,6 +45,7 @@
 
 #include comphelper/storagehelper.hxx
 
+#include boost/current_function.hpp
 
 using namespace ::com::sun::star;
 
@@ -274,7 +275,13 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
 else
 {
 // the mediatype is not known
-throw beans::IllegalTypeException();
+OUString aMsg(BOOST_CURRENT_FUNCTION);
+aMsg += :;
+aMsg += OUString::number(__LINE__);
+aMsg += : unknown media type ';
+aMsg += aMediaType;
+aMsg += ';
+throw beans::IllegalTypeException(aMsg);
 }
 
 return nResult;
___
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-6' - configure.ac

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2bb52f5d2c5901ffa3cde6981119406c351ea168
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 9 18:17:02 2014 +0200

bump product version to 4.2.6.1.0+

Change-Id: I1184bc48787bfe63d144b2c7631940a314488a4f

diff --git a/configure.ac b/configure.ac
index aa6f483..80822c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.6.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.6.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.6.1'

Tag 'libreoffice-4.2.6.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-07-09 17:16 -0700

Tag libreoffice-4.2.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJTvWrIAAoJEPQ0oe+v7q6j8C8P/AlcCYLgA9znyT71x5STJ2A/
PFNSj/WWDrHUY8kknyB+EC2xQQs4arp6QzcZfy2B2gF2dkuPgmBzkVuPrKfbWJ2N
ZBoqD83T26UGl5OgAR6dzEqJqNFotVJYacyBASWTcpCday5E83knWLoaYyAinz0E
CN+iEnEA2BJc68DKWufZNFA7f5tCrGyaxmcjGs/e/P+/8NjOysLSvrdviTgo5Kep
t/RfNYxbxg4B6yf4Si3c9+40OJCkSp3TeMgQkKY6dvc2H1HWfDmOZeK7lV+P5UbE
o1u92gqnQFyL/dDu5NNtbYdkrleQ96Y2kBeiyKe4TMNfVZ1MvcGvzoDTk73eVpxa
9+qZK4msGkHNOQFYNT1r4ystyxuwPh2qmDlIDh2fIseOSBd4C/w9W14iVMEOCLgM
zBWTUZ2XPCvgm9IYAFuWeTQwRDzjEy9XOxlCVgHLDOkcBDlSL5gYLMbTZx1XjrVx
u8H7ganf5pdf1/s69+p/SIBzgV7gNs0Isk2YOKt1ZGzfelUZKU0nwaVZ/BGhZmFL
OqCyEzMqrklABn2/InFRjX1cvBFKGTb4qFyfqZqEQLx4mDo30lanO3lVmMPW915T
HTzuzkXJuXBZ7SWz7Zj37l4Vd3xkEYhGqXNM0gXPJEJB26yD9DVSLdcxie7OQh+I
y6YPIVZ/sZ/q68Q7MeiC
=FCWd
-END PGP SIGNATURE-

Changes since cp-4.2-2-7:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.6.1'

Tag 'libreoffice-4.2.6.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-07-09 17:16 -0700

Tag libreoffice-4.2.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJTvWrMAAoJEPQ0oe+v7q6jPe0P/2DT64SxfeRzPUWpfN1lnG+2
pKguUHMElxDcor+G5WGAxMY1lKApQgycZ0UyHVavgLTFSc/jLB15aj8gDl+Ifkgt
VmWrsQ0AVWQvKlCW8waNv2AzFmtDrbz+XhZVxLHZ9Ol8eiJZO03b1SZ8V9M6HEeX
LZ/gq6P5AaoauYeaBYoKVUKACcFp9wtfEgh+PfNQB0VIHMaNgHOG9lpW2rHhZwXG
t3eawAFmfO+xt5Kg8hiDiM2n7IkR7zZ/2UwalOaSnqUz1SE7QLyT2DKajqZ7z/rm
KGMxPWzkObOcNNdvkycX0PoX2MIevYIv+XHqGmxzRH18HqLTyGhWGsJGEWvRw1Gu
MOyCoYjHmJ9bYM+LNnNUepLgjCfLdq/SKzga5NbqF14VdcNjGYCfSoyCVRk0HL6X
WnBhm+ISC6HJmWq3COm3R8GSbxIEkTLGbi44yQhWwpTN/3yZMijOuMLivEA1PjXT
382r/8mVcGluyw/IyGvYQ5+kvsmnIGOj9AcNCwvfFq/vHQ2f2KjOahV61lwTfp3F
cgWYu44k17YH8U0sqT9sacs1LO0Ljk4MmU2ms/vNT2KRU4dK7+PhPBvDA5hlnVLI
OlR4Hfi29+sp1s6kDQeWbm+yb9OPnxcfET+DhRNZQSEnFH752JfdwH7V0KeYoz6u
lht746wNXtRxXJ4qoO4F
=fiGw
-END PGP SIGNATURE-

Changes since cp-4.2-7-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.6.1'

Tag 'libreoffice-4.2.6.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-07-09 17:16 -0700

Tag libreoffice-4.2.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJTvWrPAAoJEPQ0oe+v7q6j5LQQAKYfuaMgFgcs+vw9l7ZU2l8k
u1uY837XWn/Bp36jQ2mmzOG6zJETpaVuLNEC/WtMrMhbkHDxkWAK/bKDz5hPOPaB
4DXcnP6vlZq4cXKZHyYH4I768MpYhXPIsw+Di2exP/5kU0hMoEWqMMb1mMKH/c1+
DGD565N+7owg8Gi2FWRW0Jax9zqG5elEPRm1m/eTBS4mOL7K5nUS+iTo/WzPL5lo
QVkmlPVMtudOoLDp6KESb3USNWy2WgNyeUpSviJtLRcvycoT/hBqxMuZidPiu9lz
XNHwG1OFbA+iMc0mvr1w5N+6MQBUrm/qYP4wvcx3ptkBCARCR8X9v9HRs8vb1Oni
RPyqn3dyFyMniCjWHwEaz3GzRF0Q7N25XXDmKvTRJoyjekT0F32an85QOQWIXC9M
Fi3RkiYO4/i2/KN24uAgIH89XjIi8ym1gqAU30zavWHJ0/zXcfbjKYhMAifu5kI7
/phP4YXAaLXwXxLySPupuMuCS90bU3cRsHHT6jDczwc+Dp4z+T+jbXllUX4ec2GC
QRaXSlVIW4jeK4xCTz8szNxnw0o0dXdrOqcgPiR4B9jysXSubCJ5iDVfKkkddJss
fTkzJXnbCtFFn30++elZoK+ac2aKz4RIkFYOG/CnJypAGwcg0IJirrBHo75TF7Gp
SVTk2VnXo3fGMLKMQ1Au
=kARJ
-END PGP SIGNATURE-

Changes since libreoffice-4-2-branch-point-21:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.6.1'

Tag 'libreoffice-4.2.6.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-07-09 17:16 -0700

Tag libreoffice-4.2.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJTvWrTAAoJEPQ0oe+v7q6jNi4P/066eu3mSgVSh3jN2sqbOjtI
adlZPqhAyAdhlk/PYljCy/beG+5TF6Ojdo7lFacgHwDoG8ogp73bbHe/DsoIDbdn
x35GEQMN89PYTLINuxEj9zl/OFCvf2KMd0pjbYZ0ZUGNtFdeWi5efkGqqfA9+Nbx
oC8ilTEn7TYPDNEdLb1F4mXPzMPGe/durq4k56W81BmgTdwST8wA0EfTTIATqhzj
F3iY1tC5Kt+864mib/Ye0MeHNafuEZVONyPmnQh//J05yLCVpsyAMv4dtfcSqFAq
k0NnPKD2/0FUks0H4kvjayjfG5SY35/PwyuNrKXLEYCwVk1twKxz4XFNJ2FWJEi4
V+rxz6QexXsoosuM2lsLqnn4B1bUVLuqw2Ny63VOW3BchJxKlc4ofIMNRzPv1kMw
KMdIJHdfYnqotue3V6uW344ZeVBUg3fzcgKRcUPXmy3cTYuwYVI6cYkeabwERq3e
wMzQEiI1sZohnzmDbmt1yyo9X7SvFSDUNJ9IX87/rd44H6fXq5ef2wsmqYAjsgWz
Fk3njb+hVqiNPjJW7Ou+yJcOwU1keeAzI+Tef3xYGvzYTuEGltzjYPsGYMIib1Tk
0F7CzNKx0EYUQxJdTmtD3U7KejAGJFLK/JuxkUnQaV1FKd9cikaqYqFub4IbZRbw
8qSv2te+Ae6vURRY3CgT
=tWfT
-END PGP SIGNATURE-

Changes since cp-4.2-branch-point-556:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to solve the libreoffice build error?

2014-07-09 Thread d . ostrovsky


On Wed Jul 9 06:19:04 PDT 2014, Zhen Anddavid wrote:


I'm trying to build the LibreOffice 4.2.4.2 source.

[...]

--without-junit --disable-activex --disable-directx --enable-dbgutil


Remove --disable-activex and it should work.

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

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

 sc/source/filter/xml/xmlcelli.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit fea6f83df8d2183b108695217bc4ff7a93e942c9
Author: Eike Rathke er...@redhat.com
Date:   Wed Jul 9 19:16:19 2014 +0200

resolved fdo#62250 absent value cell values are not NaN, set to 0.0

Change-Id: I41459d72adbaa8f6c0c7c22447f6eba5eb8be3e1

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 5a2e3aa..e2ac747 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1157,6 +1157,12 @@ void ScXMLTableRowCellContext::PutValueCell( const 
ScAddress rCurrentPos )
 }
 else  //regular value cell
 {
+// fdo#62250 absent values are not NaN, set to 0.0
+// PutValueCell() is called only for a known cell value type,
+// bIsEmpty==false in all these cases, no sense to check it here.
+if (::rtl::math::isNan( fValue))
+fValue = 0.0;
+
 // #i62435# Initialize the value cell's script type if the default
 // style's number format is latin-only. If the cell uses a different
 // format, the script type will be reset when the style is applied.
___
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-0' - sc/source

 sc/source/filter/xml/xmlcelli.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 068a7035bf679ba1b9650777cae327a18d3ee519
Author: Eike Rathke er...@redhat.com
Date:   Wed Jul 9 19:16:19 2014 +0200

resolved fdo#62250 absent value cell values are not NaN, set to 0.0

Change-Id: I41459d72adbaa8f6c0c7c22447f6eba5eb8be3e1
(cherry picked from commit fea6f83df8d2183b108695217bc4ff7a93e942c9)
Reviewed-on: https://gerrit.libreoffice.org/10175
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 4e4c552..d8d409a 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1157,6 +1157,12 @@ void ScXMLTableRowCellContext::PutValueCell( const 
ScAddress rCurrentPos )
 }
 else  //regular value cell
 {
+// fdo#62250 absent values are not NaN, set to 0.0
+// PutValueCell() is called only for a known cell value type,
+// bIsEmpty==false in all these cases, no sense to check it here.
+if (::rtl::math::isNan( fValue))
+fValue = 0.0;
+
 // #i62435# Initialize the value cell's script type if the default
 // style's number format is latin-only. If the cell uses a different
 // format, the script type will be reset when the style is applied.
___
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' - sc/source

 sc/source/filter/xml/xmlcelli.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit cd8acfacdc02dc6dbfc6a73ef64c5bec8eefebf4
Author: Eike Rathke er...@redhat.com
Date:   Wed Jul 9 19:16:19 2014 +0200

resolved fdo#62250 absent value cell values are not NaN, set to 0.0

Change-Id: I41459d72adbaa8f6c0c7c22447f6eba5eb8be3e1
(cherry picked from commit fea6f83df8d2183b108695217bc4ff7a93e942c9)
Reviewed-on: https://gerrit.libreoffice.org/10174
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 4e4c552..d8d409a 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1157,6 +1157,12 @@ void ScXMLTableRowCellContext::PutValueCell( const 
ScAddress rCurrentPos )
 }
 else  //regular value cell
 {
+// fdo#62250 absent values are not NaN, set to 0.0
+// PutValueCell() is called only for a known cell value type,
+// bIsEmpty==false in all these cases, no sense to check it here.
+if (::rtl::math::isNan( fValue))
+fValue = 0.0;
+
 // #i62435# Initialize the value cell's script type if the default
 // style's number format is latin-only. If the cell uses a different
 // format, the script type will be reset when the style is applied.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/filter/xml/xmlcelli.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 4e69127246028f72eee6279e9a810bb865ce654c
Author: Eike Rathke er...@redhat.com
Date:   Wed Jul 9 19:16:19 2014 +0200

resolved fdo#62250 absent value cell values are not NaN, set to 0.0

Change-Id: I41459d72adbaa8f6c0c7c22447f6eba5eb8be3e1
(cherry picked from commit fea6f83df8d2183b108695217bc4ff7a93e942c9)
Reviewed-on: https://gerrit.libreoffice.org/10176
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 41e6111..a3321c2 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1151,6 +1151,12 @@ void ScXMLTableRowCellContext::PutValueCell( const 
ScAddress rCurrentPos )
 }
 else  //regular value cell
 {
+// fdo#62250 absent values are not NaN, set to 0.0
+// PutValueCell() is called only for a known cell value type,
+// bIsEmpty==false in all these cases, no sense to check it here.
+if (::rtl::math::isNan( fValue))
+fValue = 0.0;
+
 // #i62435# Initialize the value cell's script type if the default
 // style's number format is latin-only. If the cell uses a different
 // format, the script type will be reset when the style is applied.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-09 Thread Miklos Vajna

 oox/source/token/namespaces-strict.txt |1 -
 oox/source/token/namespaces.txt|1 -
 writerfilter/source/ooxml/model.xml|1 -
 3 files changed, 3 deletions(-)

New commits:
commit 9c451090df100e477272895c1c6d0ffd03a15812
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Jul 9 20:23:09 2014 +0200

remove no longer needed http://sprm nonsense

Change-Id: I2f8d473ab564c9849963d937690fc48bc04a17b9

diff --git a/oox/source/token/namespaces-strict.txt 
b/oox/source/token/namespaces-strict.txt
index d49be5e..39a4fb5 100644
--- a/oox/source/token/namespaces-strict.txt
+++ b/oox/source/token/namespaces-strict.txt
@@ -68,7 +68,6 @@ ax  
http://schemas.microsoft.com/office/2006/activeX
 dc  http://purl.org/dc/elements/1.1/
 dcTerms http://purl.org/dc/terms/
 xm  http://schemas.microsoft.com/office/excel/2006/main
-sprmhttp://sprm
 mce 
http://schemas.openxmlformats.org/markup-compatibility/2006
 mceTest 
http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2
 wps 
http://schemas.microsoft.com/office/word/2010/wordprocessingShape
diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt
index 63c0ce6..0cbae45 100644
--- a/oox/source/token/namespaces.txt
+++ b/oox/source/token/namespaces.txt
@@ -68,7 +68,6 @@ ax  
http://schemas.microsoft.com/office/2006/activeX
 dc  http://purl.org/dc/elements/1.1/
 dcTerms http://purl.org/dc/terms/
 xm  http://schemas.microsoft.com/office/excel/2006/main
-sprmhttp://sprm
 mce 
http://schemas.openxmlformats.org/markup-compatibility/2006
 mceTest 
http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2
 wps 
http://schemas.microsoft.com/office/word/2010/wordprocessingShape
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index fb3e48b..9fab627 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -47,7 +47,6 @@
   namespace-alias 
name=http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing; 
alias=wp14 id=wp14/
   namespace-alias name=http://schemas.microsoft.com/office/word/2010/wordml; 
alias=w14 id=w14/
   namespace-alias 
name=http://schemas.microsoft.com/office/drawing/2010/main; alias=a14 
id=a14/
-  namespace-alias name=http://sprm; alias=sprm id=sprm/
   token tokenid=ooxml:shape/
   token tokenid=ooxml:token/
   token tokenid=ooxml:inputstream/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/svx/svdetc.hxx   |   10 +++-
 svx/source/svdraw/svdetc.cxx |  104 ---
 2 files changed, 67 insertions(+), 47 deletions(-)

New commits:
commit 2e92df040ee02f32ee42ebe6a33e716444a64480
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jul 9 15:29:46 2014 -0400

Scope reduction.

Change-Id: Ibc9314320c7b22f676978bb8b8157844a12c9bf8

diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 592ffce..9df6329 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -115,51 +115,51 @@ OLEObjCache::~OLEObjCache()
 
 void OLEObjCache::UnloadOnDemand()
 {
-if (nSize  maObjs.size())
+if (nSize = maObjs.size())
+return;
+
+// more objects than configured cache size try to remove objects
+// of course not the freshly inserted one at nIndex=0
+size_t nCount2 = maObjs.size();
+size_t nIndex = nCount2-1;
+while( nIndex  nCount2  nSize )
 {
-// more objects than configured cache size try to remove objects
-// of course not the freshly inserted one at nIndex=0
-size_t nCount2 = maObjs.size();
-size_t nIndex = nCount2-1;
-while( nIndex  nCount2  nSize )
+SdrOle2Obj* pUnloadObj = maObjs[nIndex--];
+if (!pUnloadObj)
+continue;
+
+try
 {
-SdrOle2Obj* pUnloadObj = maObjs[nIndex--];
-if ( pUnloadObj )
-{
-try
-{
-// it is important to get object without reinitialization 
to avoid reentrance
-uno::Reference embed::XEmbeddedObject  xUnloadObj = 
pUnloadObj-GetObjRef_NoInit();
+// it is important to get object without reinitialization to avoid 
reentrance
+uno::Reference embed::XEmbeddedObject  xUnloadObj = 
pUnloadObj-GetObjRef_NoInit();
 
-bool bUnload = SdrOle2Obj::CanUnloadRunningObj( 
xUnloadObj, pUnloadObj-GetAspect() );
+bool bUnload = SdrOle2Obj::CanUnloadRunningObj( xUnloadObj, 
pUnloadObj-GetAspect() );
 
-// check whether the object can be unloaded before looking 
for the parent objects
-if ( xUnloadObj.is()  bUnload )
+// check whether the object can be unloaded before looking for the 
parent objects
+if ( xUnloadObj.is()  bUnload )
+{
+uno::Reference frame::XModel  xUnloadModel( 
xUnloadObj-getComponent(), uno::UNO_QUERY );
+if ( xUnloadModel.is() )
+{
+for (size_t nCheckInd = 0; nCheckInd  maObjs.size(); 
nCheckInd++)
 {
-uno::Reference frame::XModel  xUnloadModel( 
xUnloadObj-getComponent(), uno::UNO_QUERY );
-if ( xUnloadModel.is() )
+SdrOle2Obj* pCacheObj = maObjs[nCheckInd];
+if ( pCacheObj  pCacheObj != pUnloadObj )
 {
-for (size_t nCheckInd = 0; nCheckInd  
maObjs.size(); nCheckInd++)
-{
-SdrOle2Obj* pCacheObj = maObjs[nCheckInd];
-if ( pCacheObj  pCacheObj != pUnloadObj )
-{
-uno::Reference frame::XModel  
xParentModel = pCacheObj-GetParentXModel();
-if ( xUnloadModel == xParentModel )
-bUnload = false; // the object has 
running embedded objects
-}
-}
+uno::Reference frame::XModel  xParentModel = 
pCacheObj-GetParentXModel();
+if ( xUnloadModel == xParentModel )
+bUnload = false; // the object has running 
embedded objects
 }
 }
-
-if ( bUnload  UnloadObj(pUnloadObj) )
-// object was successfully unloaded
-nCount2--;
 }
-catch( uno::Exception )
-{}
 }
+
+if ( bUnload  UnloadObj(pUnloadObj) )
+// object was successfully unloaded
+nCount2--;
 }
+catch( uno::Exception )
+{}
 }
 }
 
commit af4aaa22622e432cc0c899e019dfe819a360c567
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jul 9 15:27:36 2014 -0400

Let's not derive from std::vector.

Change-Id: I512d97d36c344df097cc5a1ac90aa9d3d219c1e9

diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 918205e..6212aab 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -195,9 +195,11 @@ SdrLinkList ImpGetUserMakeObjUserDataHdl();
 class SdrOle2Obj;
 class AutoTimer;
 
-class OLEObjCache :

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

 include/svx/svdetc.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d61c11c773656f8d8cbee982771be8df3d6516ea
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jul 9 15:43:08 2014 -0400

Export these symbols.

Change-Id: I8a16103564775e3df67d9a9891197e800ab63995

diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 6212aab..e524364 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -213,9 +213,9 @@ public:
 void InsertObj(SdrOle2Obj* pObj);
 void RemoveObj(SdrOle2Obj* pObj);
 
-size_t size() const;
-SdrOle2Obj* operator[](size_t nPos);
-const SdrOle2Obj* operator[](size_t nPos) const;
+SVX_DLLPUBLIC size_t size() const;
+SVX_DLLPUBLIC SdrOle2Obj* operator[](size_t nPos);
+SVX_DLLPUBLIC const SdrOle2Obj* operator[](size_t nPos) const;
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - writerfilter/CppunitTest_writerfilter_misc.mk writerfilter/qa writerfilter/source

2014-07-09 Thread Matúš Kukan

 writerfilter/CppunitTest_writerfilter_misc.mk|5 
 writerfilter/qa/cppunittests/misc/misc.cxx   |   27 ++-
 writerfilter/source/dmapper/ConversionHelper.cxx |   10 
 writerfilter/source/dmapper/ConversionHelper.hxx |5 ++--
 4 files changed, 34 insertions(+), 13 deletions(-)

New commits:
commit 6bcf07ec389ee78720e2dcfd66ee8ec57dd168a3
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Wed Jul 9 22:35:37 2014 +0200

unit test for convertTwipToMM100 functions (cp#187)

Change-Id: I36d68ecaa71319d90b9abaec21543cc5d4e76f24

diff --git a/writerfilter/CppunitTest_writerfilter_misc.mk 
b/writerfilter/CppunitTest_writerfilter_misc.mk
index 1cdcd80..ad6bd7f 100644
--- a/writerfilter/CppunitTest_writerfilter_misc.mk
+++ b/writerfilter/CppunitTest_writerfilter_misc.mk
@@ -23,11 +23,6 @@ $(eval $(call 
gb_CppunitTest_use_libraries,writerfilter_misc, \
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,writerfilter_misc, \
-   $$(INCLUDE) \
-   -I$(SRCDIR)/writerfilter/inc \
-))
-
 $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_misc, \
writerfilter/qa/cppunittests/misc/misc \
 ))
diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx 
b/writerfilter/qa/cppunittests/misc/misc.cxx
index ea0cfd2..fc37b14 100644
--- a/writerfilter/qa/cppunittests/misc/misc.cxx
+++ b/writerfilter/qa/cppunittests/misc/misc.cxx
@@ -25,8 +25,11 @@
 
 using namespace std;
 
-
 namespace writerfilter { namespace dmapper {
+namespace ConversionHelper{
+SAL_DLLPUBLIC_IMPORT sal_Int32 convertTwipToMM100(sal_Int32 _t);
+SAL_DLLPUBLIC_IMPORT sal_uInt32 convertTwipToMM100Unsigned(sal_Int32 
_t);
+}
 
 SAL_DLLPUBLIC_IMPORT // export just for test
 boost::tupleOUString, vectorOUString, vectorOUString 
@@ -44,9 +47,11 @@ public:
 virtual void setUp() SAL_OVERRIDE;
 virtual void tearDown() SAL_OVERRIDE;
 
+void testTwipConversions();
 void testFieldParameters();
 
 CPPUNIT_TEST_SUITE(WriterfilterMiscTest);
+CPPUNIT_TEST(testTwipConversions);
 CPPUNIT_TEST(testFieldParameters);
 CPPUNIT_TEST_SUITE_END();
 };
@@ -59,6 +64,26 @@ void WriterfilterMiscTest::tearDown()
 {
 }
 
+void WriterfilterMiscTest::testTwipConversions()
+{
+using writerfilter::dmapper::ConversionHelper::convertTwipToMM100;
+using writerfilter::dmapper::ConversionHelper::convertTwipToMM100Unsigned;
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-2), convertTwipToMM100(-1));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-17639), convertTwipToMM100(-1));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-70556), convertTwipToMM100(-4));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), convertTwipToMM100(1));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(17639), convertTwipToMM100(1));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), convertTwipToMM100(4));
+
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), convertTwipToMM100Unsigned(-1));
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), convertTwipToMM100Unsigned(-1));
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), convertTwipToMM100Unsigned(-4));
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(2), convertTwipToMM100Unsigned(1));
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(17639), convertTwipToMM100Unsigned(1));
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), convertTwipToMM100Unsigned(4));
+}
+
 void WriterfilterMiscTest::testFieldParameters()
 {
 using writerfilter::dmapper::lcl_SplitFieldCommand;
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx 
b/writerfilter/source/dmapper/ConversionHelper.hxx
index da0805c..596237c 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -43,8 +43,9 @@ namespace ConversionHelper{
 //convert the number format string form MS format to SO format
 OUString ConvertMSFormatStringToSO(
 const OUString rFormat, ::com::sun::star::lang::Locale rLocale, 
bool bHijri);
-sal_Int32 convertTwipToMM100(sal_Int32 _t);
-sal_uInt32 convertTwipToMM100Unsigned(sal_Int32 _t);
+// export just for test
+SAL_DLLPUBLIC_EXPORT sal_Int32 convertTwipToMM100(sal_Int32 _t);
+SAL_DLLPUBLIC_EXPORT sal_uInt32 convertTwipToMM100Unsigned(sal_Int32 _t);
 // probably the most useless unit in the world - English Metric Units 
(EMU) 360 000 EMU == 1cm
 sal_Int32 convertEMUToMM100(sal_Int32 _t);
 sal_Int16 convertTableJustification( sal_Int32 nIntValue );
commit 4d1621136c464b462a598571ecdcfe2ae119d8c7
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Wed Jul 9 14:25:04 2014 +0200

Fix ignoring large twips values like MSO does (cp#187)

which was introduced in 10b4da63e3143108ba75891e9e98fdaa2f7953ab.

Since 1e47614cdb84b018a22a334dad0cdd9f0f53892c, only
convertTwipToMM100Unsigned() ignores large values, which presumably
was not the intention. At least commit message suggests so.

So, move the check back to convertTwipToMM100().

Change-Id:

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

2014-07-09 Thread Takeshi Abe

 svl/source/items/itemprop.cxx   |9 ++---
 svl/source/items/poolio.cxx |4 +-
 svl/source/numbers/zforlist.cxx |   65 
 svl/source/numbers/zformat.cxx  |7 ++--
 4 files changed, 36 insertions(+), 49 deletions(-)

New commits:
commit 4468ab0e0c0ecb50de68d2ecce327756a50eb0ae
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Jul 10 00:05:35 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: I1dd003bc984a11d6d71c92aae44accc9d358db0c

diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 41f1a04..3ba833f 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -22,6 +22,7 @@
 #include svl/itempool.hxx
 #include svl/itemset.hxx
 #include com/sun/star/beans/PropertyAttribute.hpp
+#include boost/scoped_ptr.hpp
 #include boost/unordered_map.hpp
 /*
 UNO III Implementation
@@ -242,7 +243,7 @@ void SfxItemPropertySet::setPropertyValue( const 
SfxItemPropertySimpleEntry rEn
 {
 // get the SfxPoolItem
 const SfxPoolItem* pItem = 0;
-SfxPoolItem *pNewItem = 0;
+boost::scoped_ptrSfxPoolItem pNewItem;
 SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, pItem );
 if(SFX_ITEM_SET != eState  SFX_WHICH_MAX  rEntry.nWID )
 pItem = rSet.GetPool()-GetDefaultItem(rEntry.nWID);
@@ -253,23 +254,21 @@ void SfxItemPropertySet::setPropertyValue( const 
SfxItemPropertySimpleEntry rEn
 if(FillItem(aSet, rEntry.nWID, false))
 {
 const SfxPoolItem rItem = aSet.Get(rEntry.nWID);
-pNewItem = rItem.Clone();
+pNewItem.reset(rItem.Clone());
 }
 }
 if(!pNewItem  pItem)
 {
-pNewItem = pItem-Clone();
+pNewItem.reset(pItem-Clone());
 }
 if(pNewItem)
 {
 if( !pNewItem-PutValue( aVal, rEntry.nMemberId ) )
 {
-DELETEZ(pNewItem);
 throw IllegalArgumentException();
 }
 // apply new item
 rSet.Put( *pNewItem, rEntry.nWID );
-delete pNewItem;
 }
 }
 
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index ac481ba..08267a9 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -28,6 +28,7 @@
 #include svl/brdcst.hxx
 #include svl/filerec.hxx
 #include poolio.hxx
+#include boost/scoped_ptr.hpp
 #include boost/scoped_array.hpp
 
 /**
@@ -207,11 +208,10 @@ SvStream SfxItemPool::Store(SvStream rStream) const
 {
 sal_uLong nMark = rStream.Tell();
 rStream.Seek( nItemStartPos + 
sizeof(sal_uInt16) );
-SfxPoolItem *pClone = pItem-Create(rStream, 
nItemVersion );
+boost::scoped_ptrSfxPoolItem 
pClone(pItem-Create(rStream, nItemVersion ));
 sal_uInt16 nWh = pItem-Which();
 SFX_ASSERT( rStream.Tell() == nMark, 
nWh,asymmetric store/create );
 SFX_ASSERT( *pClone == *pItem, nWh, unequal 
after store/create );
-delete pClone;
 }
 #endif
 }
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 020d845..4c0f6bd 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -45,6 +45,7 @@
 
 #include math.h
 #include limits
+#include boost/scoped_ptr.hpp
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -685,7 +686,7 @@ void SvNumberFormatter::DeleteEntry(sal_uInt32 nKey)
 bool SvNumberFormatter::Load( SvStream rStream )
 {
 LanguageType eSysLang = SvtSysLocale().GetLanguageTag().getLanguageType();
-SvNumberFormatter* pConverter = NULL;
+boost::scoped_ptrSvNumberFormatter pConverter;
 
 ImpSvNumMultipleReadHeader aHdr( rStream );
 sal_uInt16 nVersion;
@@ -725,7 +726,7 @@ bool SvNumberFormatter::Load( SvStream rStream )
 // different SYSTEM locale
 if ( !pConverter )
 {
-pConverter = new SvNumberFormatter( m_xContext, eSysLang );
+pConverter.reset(new SvNumberFormatter( m_xContext, 
eSysLang ));
 }
 pEntry-ConvertLanguage( *pConverter, eSaveSysLang, 
eLoadSysLang, true );
 }
@@ -763,10 +764,7 @@ bool SvNumberFormatter::Load( SvStream rStream )
 aHdr.EndEntry();
 }
 
-if ( pConverter )
-{
-delete pConverter;
-}
+pConverter.reset();
 
 // generate additional i18n standard formats for all used locales
 LanguageType eOldLanguage = ActLnge;
@@ -1562,11 +1560,11 @@ bool SvNumberFormatter::GetPreviewString(const 
OUString sFormatString,
 eLnge = ActLnge;
 sal_Int32 nCheckPos = -1;
 OUString

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source

2014-07-09 Thread Herbert Dürr

 sfx2/source/appl/impldde.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 727ea069c6342e01a50c8b068ec302574b251cbd
Author: Herbert DÃ¼rr h...@apache.org
Date:   Wed Jul 9 21:14:50 2014 +

#i125226# typo fix

diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 8bc1cb6..76981f9 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -259,7 +259,7 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
 #if defined(WNT)
 // check the suitability of starting the DDE server
 const SvtSecurityOptions aSecOpts;
-bool bForbidden = (aSecOpts.GetMacroSecurityLevel() != eNEVER_EXECUTE);
+bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
 bForbidden |= (bInWinExec != sal_False);
 static const char* aBadServers[] = { cmd, rundll32 };
 for( int i = 0; i  sizeof(aBadServers)/sizeof(*aBadServers); ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/svx/svdoole2.hxx   |7 +++
 svx/source/svdraw/svdetc.cxx   |4 
 svx/source/svdraw/svdoole2.cxx |6 ++
 3 files changed, 17 insertions(+)

New commits:
commit b023565d4f064cd0312e8c1fcc23a9f552112935
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jul 9 21:46:34 2014 -0400

bnc#883684: Make chart objects exempt from automatic unloading.

The Memory option page contains Number of objects setting which controls
how many OLE objects can be loaded at any given time.  When the number of
total OLE objects exceeds this number the oldest ones get unloaded.  Note
that the total number is across all open documents, not per document.

Technically, chart objects are OLE objects, but unlike other OLE objects
that are embedded Calc, Writer, Draw documents, chart objects normally
belong to the host document.  It therefore makes no sense to subject
chart objects to this automatic unloading.

In the future we may want to apply this exemption to other types of OLE
objects, like formula objects for example..  Or maybe this setting can be
removed altogether...

Change-Id: I7dd92550880efb4db8fc843cf1c915c712166da4

diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 68ad43e..21d3b56 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -171,6 +171,13 @@ public:
 bool IsChart() const;
 bool IsCalc() const;
 
+/**
+ * Unloadable OLE objects are subject to automatic unloading per memory
+ * setting.  The Number of objects setting in the Memory option controls
+ * how many OLE objects can be loaded at any given moment.
+ */
+bool IsUnloadable() const;
+
 bool UpdateLinkURL_Impl();
 void BreakFileLink_Impl();
 void DisconnectFileLink_Impl();
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 9df6329..fbf9801 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -165,6 +165,10 @@ void OLEObjCache::UnloadOnDemand()
 
 void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
 {
+if (!pObj-IsUnloadable())
+// This OLE object is exempt from automatic unloading.
+return;
+
 if (!maObjs.empty())
 {
 SdrOle2Obj* pExistingObj = maObjs.front();
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 86379ce..889f3ed 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -2162,6 +2162,12 @@ bool SdrOle2Obj::IsCalc() const
 return false;
 }
 
+bool SdrOle2Obj::IsUnloadable() const
+{
+// Right now, chart OLE objects are the only ones exempt from automatic
+// unloading.
+return !IsChart();
+}
 
 uno::Reference frame::XModel  SdrOle2Obj::GetParentXModel() const
 {
___
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' - include/svx svx/source

 include/svx/svdoole2.hxx   |7 +++
 svx/source/svdraw/svdetc.cxx   |4 
 svx/source/svdraw/svdoole2.cxx |8 +++-
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 55612305b645a1c0872373c0a9f434763708732a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jul 9 21:46:34 2014 -0400

bnc#883684: Make chart objects exempt from automatic unloading.

The Memory option page contains Number of objects setting which controls
how many OLE objects can be loaded at any given time.  When the number of
total OLE objects exceeds this number the oldest ones get unloaded.  Note
that the total number is across all open documents, not per document.

Technically, chart objects are OLE objects, but unlike other OLE objects
that are embedded Calc, Writer, Draw documents, chart objects normally
belong to the host document.  It therefore makes no sense to subject
chart objects to this automatic unloading.

In the future we may want to apply this exemption to other types of OLE
objects, like formula objects for example..  Or maybe this setting can be
removed altogether...

(cherry picked from commit b023565d4f064cd0312e8c1fcc23a9f552112935)

Conflicts:
include/svx/svdoole2.hxx
svx/source/svdraw/svdetc.cxx
svx/source/svdraw/svdoole2.cxx

Change-Id: I7dd92550880efb4db8fc843cf1c915c712166da4

diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index fb95b8d..6ac1eba 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -171,6 +171,13 @@ public:
 sal_Bool IsChart() const;
 sal_Bool IsCalc() const;
 
+/**
+ * Unloadable OLE objects are subject to automatic unloading per memory
+ * setting.  The Number of objects setting in the Memory option controls
+ * how many OLE objects can be loaded at any given moment.
+ */
+bool IsUnloadable() const;
+
 sal_Bool UpdateLinkURL_Impl();
 void BreakFileLink_Impl();
 void DisconnectFileLink_Impl();
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 4caca94..afcc792 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -165,6 +165,10 @@ void OLEObjCache::UnloadOnDemand()
 
 void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
 {
+if (!pObj-IsUnloadable())
+// This OLE object is exempt from automatic unloading.
+return;
+
 if ( !empty() )
 {
 SdrOle2Obj* pExistingObj = front();
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index a0f0c33..4a7ecf0 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -2171,7 +2171,13 @@ sal_Bool SdrOle2Obj::IsCalc() const
 return sal_False;
 }
 
-// 
-
+bool SdrOle2Obj::IsUnloadable() const
+{
+// Right now, chart OLE objects are the only ones exempt from automatic
+// unloading.
+return !IsChart();
+}
+
 uno::Reference frame::XModel  SdrOle2Obj::GetParentXModel() const
 {
 uno::Reference frame::XModel  xDoc;
___
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' - include/svx svx/source

 include/svx/svdoole2.hxx   |7 +++
 svx/source/svdraw/svdetc.cxx   |4 
 svx/source/svdraw/svdoole2.cxx |6 ++
 3 files changed, 17 insertions(+)

New commits:
commit 2ced18a6e90e3c9494e48994af39c5d710188c44
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jul 9 21:46:34 2014 -0400

bnc#883684: Make chart objects exempt from automatic unloading.

The Memory option page contains Number of objects setting which controls
how many OLE objects can be loaded at any given time.  When the number of
total OLE objects exceeds this number the oldest ones get unloaded.  Note
that the total number is across all open documents, not per document.

Technically, chart objects are OLE objects, but unlike other OLE objects
that are embedded Calc, Writer, Draw documents, chart objects normally
belong to the host document.  It therefore makes no sense to subject
chart objects to this automatic unloading.

In the future we may want to apply this exemption to other types of OLE
objects, like formula objects for example..  Or maybe this setting can be
removed altogether...

(cherry picked from commit b023565d4f064cd0312e8c1fcc23a9f552112935)

Conflicts:
svx/source/svdraw/svdetc.cxx

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

diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 68ad43e..21d3b56 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -171,6 +171,13 @@ public:
 bool IsChart() const;
 bool IsCalc() const;
 
+/**
+ * Unloadable OLE objects are subject to automatic unloading per memory
+ * setting.  The Number of objects setting in the Memory option controls
+ * how many OLE objects can be loaded at any given moment.
+ */
+bool IsUnloadable() const;
+
 bool UpdateLinkURL_Impl();
 void BreakFileLink_Impl();
 void DisconnectFileLink_Impl();
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index a9cb949..3214a32 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -166,6 +166,10 @@ void OLEObjCache::UnloadOnDemand()
 
 void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
 {
+if (!pObj-IsUnloadable())
+// This OLE object is exempt from automatic unloading.
+return;
+
 if ( !empty() )
 {
 SdrOle2Obj* pExistingObj = front();
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 86379ce..889f3ed 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -2162,6 +2162,12 @@ bool SdrOle2Obj::IsCalc() const
 return false;
 }
 
+bool SdrOle2Obj::IsUnloadable() const
+{
+// Right now, chart OLE objects are the only ones exempt from automatic
+// unloading.
+return !IsChart();
+}
 
 uno::Reference frame::XModel  SdrOle2Obj::GetParentXModel() const
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-09 Thread Takeshi Abe

 svl/source/items/aeitem.cxx |   48 ++--
 1 file changed, 33 insertions(+), 15 deletions(-)

New commits:
commit 5e8b31f1d3507f4c93a164259e40b8da5b686343
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Jul 9 19:22:24 2014 +0900

fdo#75757: remove inheritance to std::vector

This also fixes possible memory leaks of SfxAllEnumValue_Impl
which may occur in SfxAllEnumItem::RemoveValue() of the original
implementation.

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

diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 517298e..a13eaf2 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -19,7 +19,8 @@
 
 #include rtl/ustring.hxx
 #include svl/aeitem.hxx
-#include vector
+#include boost/noncopyable.hpp
+#include boost/ptr_container/ptr_vector.hpp
 
 TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem)
 
@@ -31,14 +32,31 @@ struct SfxAllEnumValue_Impl
 OUString aText;
 };
 
-class SfxAllEnumValueArr : public std::vectorSfxAllEnumValue_Impl*
+class SfxAllEnumValueArr : boost::noncopyable
 {
 public:
-~SfxAllEnumValueArr()
-{
-for( const_iterator it = begin(); it != end(); ++it )
-delete *it;
+const SfxAllEnumValue_Impl operator[](size_t i) const {
+return mValues[i];
+}
+
+bool empty() const {
+return mValues.empty();
+}
+
+void Insert(sal_uInt16 n, SfxAllEnumValue_Impl *value) {
+mValues.insert(mValues.begin() + n, value);
 }
+
+void Erase(sal_uInt16 n) {
+mValues.erase(mValues.begin() + n);
+}
+
+size_t size() const {
+return mValues.size();
+}
+
+private:
+boost::ptr_vectorSfxAllEnumValue_Impl mValues;
 };
 
 
@@ -96,9 +114,9 @@ SfxAllEnumItem::SfxAllEnumItem(const SfxAllEnumItem rCopy):
 for ( sal_uInt16 nPos = 0; nPos  rCopy.pValues-size(); ++nPos )
 {
 SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
-pVal-nValue = (*rCopy.pValues)[nPos]-nValue;
-pVal-aText = (*rCopy.pValues)[nPos]-aText;
-pValues-insert( pValues-begin() + nPos, pVal );
+pVal-nValue = (*rCopy.pValues)[nPos].nValue;
+pVal-aText = (*rCopy.pValues)[nPos].aText;
+pValues-Insert( nPos, pVal );
 }
 
 if( rCopy.pDisabledValues )
@@ -127,7 +145,7 @@ sal_uInt16 SfxAllEnumItem::GetValueCount() const
 OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
 DBG_ASSERT( pValues  nPos  pValues-size(), enum overflow );
-return (*pValues)[nPos]-aText;
+return (*pValues)[nPos].aText;
 }
 
 
@@ -135,7 +153,7 @@ OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos 
) const
 sal_uInt16 SfxAllEnumItem::GetValueByPos( sal_uInt16 nPos ) const
 {
 DBG_ASSERT( pValues  nPos  pValues-size(), enum overflow );
-return (*pValues)[nPos]-nValue;
+return (*pValues)[nPos].nValue;
 }
 
 
@@ -171,7 +189,7 @@ sal_uInt16 SfxAllEnumItem::_GetPosByValue( sal_uInt16 nVal 
) const
 //!O: binaere Suche oder SortArray verwenden
 sal_uInt16 nPos;
 for ( nPos = 0; nPos  pValues-size(); ++nPos )
-if ( (*pValues)[nPos]-nValue = nVal )
+if ( (*pValues)[nPos].nValue = nVal )
 return nPos;
 return nPos;
 }
@@ -207,7 +225,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const 
OUString rValue )
 // remove when exists
 RemoveValue( nValue );
 // then insert
-pValues-insert( pValues-begin() + _GetPosByValue(nValue), pVal ); //! 
doppelte?!
+pValues-Insert( _GetPosByValue(nValue), pVal ); //! doppelte?!
 }
 
 
@@ -220,7 +238,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
 if ( !pValues )
 pValues = new SfxAllEnumValueArr;
 
-pValues-insert( pValues-begin() + _GetPosByValue(nValue), pVal ); //! 
doppelte?!
+pValues-Insert( _GetPosByValue(nValue), pVal ); //! doppelte?!
 }
 
 void SfxAllEnumItem::DisableValue( sal_uInt16 nValue )
@@ -249,7 +267,7 @@ void SfxAllEnumItem::RemoveValue( sal_uInt16 nValue )
 {
 sal_uInt16 nPos = GetPosByValue(nValue);
 DBG_ASSERT( nPos != USHRT_MAX, removing value not in enum );
-pValues-erase( pValues-begin() + nPos );
+pValues-Erase( nPos );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75757] remove inheritance to std::map and std::vector

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

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

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

fdo#75757: remove inheritance to std::vector



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

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

2014-07-09 Thread Philipp Weissenbacher

 svl/source/items/poolio.cxx |  334 +++-
 1 file changed, 151 insertions(+), 183 deletions(-)

New commits:
commit d72d71517ea3b13a1a5ddb685243c11ec7caa893
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Wed Jul 9 01:05:32 2014 +0200

Translate German comments (continued)

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

diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 08267a9..22b22cd 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -266,41 +266,31 @@ bool SfxItemPool::HasPersistentRefCounts() const
 return pImp-mbPersistentRefCounts;
 }
 
-void SfxItemPool::LoadCompleted()
-
-/*  [Beschreibung]
-
-Wurde der SfxItemPool mit 'bRefCounts' == sal_False geladen, mu\s das
-Laden der Dokumentinhalte mit einem Aufruf dieser Methode beendet
-werden. Ansonsten hat der Aufruf dieser Methode keine Funktion.
-
-
-[Anmerkung]
-
-Beim Laden ohne Ref-Counts werden diese tatsachlich auf 1 gesetzt,
-damit nicht wahrend des Ladevorgangs SfxPoolItems geloscht werden,
-die danach, aber auch noch beim Ladevorgang, benotigt werden. Diese
-Methode setzt den Ref-Count wieder zuruck und entfernt dabei
-gleichzeitig alle nicht mehr benotigten Items.
-
-
-[Querverweise]
-
-SfxItemPool::Load()
+/**
+ * If the SfxItemPool was loaded with 'bRefCounts' == sal_False, we need
+ * to finish the loading of the document contents with a call of this method.
+ * In any other case calling this function has no meaning.
+ *
+ * When loading without RefCounts, they are actually set to 1 so that
+ * SfxPoolItems that are needed during and after loading are not deleted.
+ * This method resets the RefCount and also removes all items that are not
+ * needed anymore.
+ *
+ * @see SfxItemPool::Load()
 */
-
+void SfxItemPool::LoadCompleted()
 {
-// wurden keine Ref-Counts mitgeladen?
+// Did we load without RefCounts?
 if ( pImp-nInitRefCount  1 )
 {
-// uber alle Which-Werte iterieren
+// Iterate over all Which values
 std::vectorSfxPoolItemArray_Impl*::iterator itrItemArr = 
pImp-maPoolItems.begin();
 for( sal_uInt16 nArrCnt = GetSize_Impl(); nArrCnt; --nArrCnt, 
++itrItemArr )
 {
-// ist uberhaupt ein Item mit dem Which-Wert da?
+// Is there an item with the Which value present at all?
 if ( *itrItemArr )
 {
-// uber alle Items mit dieser Which-Id iterieren
+// Iterate over all items with this WhichId
 SfxPoolItemArrayBase_Impl::iterator ppHtArr = 
(*itrItemArr)-begin();
 for( size_t n = (*itrItemArr)-size(); n; --n, ++ppHtArr )
 {
@@ -358,17 +348,17 @@ void SfxItemPool_Impl::readTheItems (
 sal_uLong n, nLastSurrogate = sal_uLong(-1);
 while (aItemsRec.GetContent())
 {
-// nachstes Surrogat holen
+// Get next surrogate
 sal_uInt16 nSurrogate = aItemsRec.GetContentTag();
 DBG_ASSERT( aItemsRec.GetContentVersion() == 'X',
 not an item content );
 
-// fehlende auffullen
+// Fill up missing ones
 for ( pItem = 0, n = nLastSurrogate+1; n  nSurrogate; ++n )
 pNewArr-push_back( (SfxPoolItem*) pItem );
 nLastSurrogate = nSurrogate;
 
-// Ref-Count und Item laden
+// Load RefCount and Item
 sal_uInt16 nRef(0);
 rStream.ReadUInt16( nRef );
 
@@ -376,7 +366,7 @@ void SfxItemPool_Impl::readTheItems (
 pNewArr-push_back( (SfxPoolItem*) pItem );
 
 if ( !mbPersistentRefCounts )
-// bis SfxItemPool::LoadCompleted() festhalten
+// Hold onto it until SfxItemPool::LoadCompleted()
 SfxItemPool::AddRef(*pItem, 1);
 else
 {
@@ -387,14 +377,14 @@ void SfxItemPool_Impl::readTheItems (
 }
 }
 
-// fehlende auffullen
+// Fill up missing ones
 for ( pItem = 0, n = nLastSurrogate+1; n  nItemCount; ++n )
 pNewArr-push_back( (SfxPoolItem*) pItem );
 
 SfxPoolItemArray_Impl *pOldArr = *ppArr;
 *ppArr = pNewArr;
 
-// die Items merken, die schon im Pool sind
+// Remember items that are already in the pool
 bool bEmpty = true;
 if ( 0 != pOldArr )
 for ( n = 0; bEmpty  n  pOldArr-size(); ++n )
@@ -402,7 +392,7 @@ void SfxItemPool_Impl::readTheItems (
 DBG_ASSERTWARNING( bEmpty, loading non-empty pool );
 if ( !bEmpty )
 {
-// fur alle alten suchen, ob ein gleiches neues existiert
+// See if there's a new one for all old ones
 for ( size_t nOld = 0; nOld  pOldArr-size(); ++nOld )
 {
 SfxPoolItem *pOldItem = (*pOldArr)[nOld];

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - include/oox oox/Library_oox.mk oox/source

2014-07-09 Thread Matúš Kukan

 include/oox/drawingml/ThemeOverrideFragmentHandler.hxx |   40 ++
 include/oox/ppt/pptimport.hxx  |1 
 oox/Library_oox.mk |1 
 oox/source/drawingml/ThemeOverrideFragmentHandler.cxx  |   48 +
 oox/source/drawingml/shape.cxx |   20 ++-
 5 files changed, 109 insertions(+), 1 deletion(-)

New commits:
commit 9e3adc0ee35d9922a12b63d0b36f7790247dec0f
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Fri Jul 4 15:12:59 2014 +0200

bnc#882383: Do not ignore themeOverride for charts in .pptx

Otherwise wrong colors are displayed.

(cherry picked from commit 08818d8a45e034ad825c7fafbb76766f106f1d1d)

Conflicts:
oox/source/drawingml/shape.cxx

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

diff --git a/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx 
b/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx
new file mode 100644
index 000..827cf5a
--- /dev/null
+++ b/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_OOX_DRAWINGML_THEMEOVERRICEFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_DRAWINGML_THEMEOVERRICEFRAGMENTHANDLER_HXX
+
+#include oox/core/fragmenthandler2.hxx
+
+namespace oox {
+namespace drawingml {
+
+class Theme;
+
+class ThemeOverrideFragmentHandler : public ::oox::core::FragmentHandler2
+{
+public:
+explicitThemeOverrideFragmentHandler(
+::oox::core::XmlFilterBase rFilter,
+const OUString rFragmentPath,
+Theme rTheme );
+virtual ~ThemeOverrideFragmentHandler();
+
+virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 
nElement, const AttributeList rAttribs ) SAL_OVERRIDE;
+
+private:
+Theme  mrTheme;
+};
+
+} // namespace drawingml
+} // namespace oox
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index c393be6..d304792 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -50,6 +50,7 @@ public:
 virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() 
SAL_OVERRIDE;
 virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() 
SAL_OVERRIDE;
 
+SlidePersistPtr 
getActualSlidePersist() const { return mpActualSlidePersist; };
 void
setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ 
mpActualSlidePersist = pActualSlidePersist; };
 std::map OUString, oox::drawingml::ThemePtr getThemes(){ return 
maThemes; };
 std::vector SlidePersistPtr  getDrawPages(){ 
return maDrawPages; };
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 4f4a35b..f356565 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -197,6 +197,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/drawingml/theme \
 oox/source/drawingml/themeelementscontext \
 oox/source/drawingml/themefragmenthandler \
+oox/source/drawingml/ThemeOverrideFragmentHandler \
 oox/source/drawingml/transform2dcontext \
 oox/source/dump/dffdumper \
 oox/source/dump/dumperbase \
diff --git a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx 
b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
new file mode 100644
index 000..5f3e7fc
--- /dev/null
+++ b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
@@ -0,0 +1,48 @@
+/* -*- 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 oox/drawingml/ThemeOverrideFragmentHandler.hxx
+#include oox/drawingml/theme.hxx
+#include oox/drawingml/themeelementscontext.hxx
+
+using namespace ::oox::core;
+
+namespace oox {
+namespace drawingml {
+
+ThemeOverrideFragmentHandler::ThemeOverrideFragmentHandler( XmlFilterBase 
rFilter, const OUString rFragmentPath, Theme rTheme ) :
+FragmentHandler2( rFilter, rFragmentPath ),
+mrTheme( rTheme )
+{
+}
+

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

2014-07-09 Thread Armin Le Grand

 sd/source/ui/unoidl/unopage.cxx|   16 +
 unotools/source/config/useroptions.cxx |   38 +++--
 2 files changed, 48 insertions(+), 6 deletions(-)

New commits:
commit 2b8f66388450fcf7fb2f8087ee7c66c142fe72c0
Author: Armin Le Grand a...@apache.org
Date:   Wed Jul 9 11:57:21 2014 +

Resolves: #i119287# corrected default style for draw objects...

created using UNO API

(cherry picked from commit d07778f62ed386672a60ef7570a89b5fa109e026)

Conflicts:
sd/source/ui/unoidl/unopage.cxx

(cherry picked from commit 0aa3dee5e88a1494a7a6a8401e084cbdb4324727)
Signed-off-by: Andras Timar andras.ti...@collabora.com

Conflicts:
sd/source/ui/unoidl/unopage.cxx

Change-Id: I016d801edefb5ab32b7b6a8e13a1dc3e8fdb866e

diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 9ad3473..fa61e5f 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -69,6 +69,7 @@
 #include unopback.hxx
 #include unohelp.hxx
 #include vcl/dibtools.hxx
+#include svx/svdograf.hxx
 
 using ::com::sun::star::animations::XAnimationNode;
 using ::com::sun::star::animations::XAnimationNodeSupplier;
@@ -410,7 +411,22 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const 
Reference drawing::XShap
 {
 SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()-GetModel();
 if( pDoc )
+{
+// #i119287# similar to the code in the SdrObject methods the 
graphic and ole
+// SdrObjects need another default style than the rest, see 
task. Adding here, too.
+// : Same as for #i119287#: Can be removed in branch aw080 
again
+const bool bIsSdrGrafObj(0 != dynamic_cast SdrGrafObj* 
(pObj));
+const bool bIsSdrOle2Obj(0 != dynamic_cast SdrOle2Obj* 
(pObj));
+
+if(bIsSdrGrafObj || bIsSdrOle2Obj)
+{
+
pObj-NbcSetStyleSheet(pDoc-GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(), 
sal_True);
+}
+else
+{
 pObj-NbcSetStyleSheet( pDoc-GetDefaultStyleSheet(), sal_True 
);
+}
+}
 }
 return pObj;
 }
commit 848ee355904db1453f343c8257a86635c1dddcac
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Jul 9 11:44:32 2014 +0200

localized GetFullName()

Change-Id: I4f2bffadef3db1bd07432202525734ab9b0cb0de
(cherry picked from commit 33c36fb9fbc69bbc32088532dd21db7153aee09d)

diff --git a/unotools/source/config/useroptions.cxx 
b/unotools/source/config/useroptions.cxx
index 01ae9e6..1dadaf3 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -19,7 +19,7 @@
 
 
 #include unotools/useroptions.hxx
-
+#include unotools/syslocale.hxx
 #include unotools/configmgr.hxx
 #include com/sun/star/uno/Any.hxx
 #include com/sun/star/uno/Sequence.hxx
@@ -39,6 +39,7 @@
 #include com/sun/star/util/ChangesEvent.hpp
 #include comphelper/configurationhelper.hxx
 #include comphelper/processfactory.hxx
+#include i18nlangtag/mslangid.hxx
 
 using namespace utl;
 using namespace com::sun::star;
@@ -210,11 +211,36 @@ void SvtUserOptions::Impl::SetToken (sal_uInt16 nToken, 
OUString const sToken)
 
 OUString SvtUserOptions::Impl::GetFullName () const
 {
-// TODO international name
-OUString sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
-if (!sFullName.isEmpty())
-sFullName +=  ;
-sFullName += GetToken(USER_OPT_LASTNAME).trim();
+OUString sFullName;
+switch (LanguageType const eLang = 
SvtSysLocale().GetUILanguageTag().getLanguageType())
+{
+case LANGUAGE_RUSSIAN:
+sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_FATHERSNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_LASTNAME).trim();
+break;
+default:
+if (MsLangId::isFamilyNameFirst(eLang))
+{
+sFullName = GetToken(USER_OPT_LASTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_FIRSTNAME).trim();
+}
+else
+{
+sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName +=  ;
+sFullName += GetToken(USER_OPT_LASTNAME).trim();
+}
+break;
+}
+
 return sFullName;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-qa] New Whiteboard Status - NeedQAAdvice

2014-07-09 Thread Joel Madero

Hi All,

Jay asked about this new status to parallel the NeedAdvice which is a
call for developers to get involved. I went ahead and said +1 so it's
added to the whiteboard wiki:
https://wiki.documentfoundation.org/QA/Bugzilla/Fields/Whiteboard/Advanced

So my advice is for experienced QA members (feel free to self
categorize yourself ;) ) to keep a lookout for these. For new QA members
- feel free to use this (although try to use it sparingly ;)) if you
just really aren't sure about where an UNCONFIRMED bug belongs.

Thanks!


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

[Libreoffice-qa] time to remove all 4.1.x RC versions

2014-07-09 Thread Tommy


as all of you should know, 4.1.x reached end of life few months ago

I thinks it's time to remove all 4.1.x RC versions from bugzilla version  
dropdown menu and leave just the final releases like it has already been  
done in previous dead branches




--
Using Opera's revolutionary email client: http://www.opera.com/mail/

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

Re: [Libreoffice-qa] time to remove all 4.1.x RC versions

2014-07-09 Thread Joel Madero

I believe we agreed to give it 6 months from EOL to give time for
transition. I could be wrong though ;)


Best,
Joel

On 07/09/2014 01:43 PM, Tommy wrote:
 as all of you should know, 4.1.x reached end of life few months ago

 I thinks it's time to remove all 4.1.x RC versions from bugzilla
 version dropdown menu and leave just the final releases like it has
 already been done in previous dead branches




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

Re: [Libreoffice-qa] time to remove all 4.1.x RC versions

2014-07-09 Thread Tommy

On Wed, 09 Jul 2014 22:44:33 +0200, Joel Madero jmadero@gmail.com  
wrote:



I believe we agreed to give it 6 months from EOL to give time for
transition. I could be wrong though ;)


Best,
Joel



ok, maybe you are right... I now remember that 6 months embargo too.

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

Re: [Libreoffice-qa] New Whiteboard Status - NeedQAAdvice

2014-07-09 Thread Jay Philips

Hi Joel  All,

Thanks for the announcement in the list of my whiteboard suggestion.

In my limited period in QA, i've mainly come across bugs that i've
finished triaging but dont feel comfortable closing without a mentors
second opinion. Other times, i've finished triaging and the bug reporter
believes libreoffice should do something different than whats its doing
and i cant judge if i agree with him or not, so i've wanted a mentors
second opinion.

Maybe we need another whiteboard called NeedQASecondOpinion. :)

Regards,
Jay Philips

On 07/09/2014 10:46 PM, Joel Madero wrote:
 Hi All,
 
 Jay asked about this new status to parallel the NeedAdvice which is a
 call for developers to get involved. I went ahead and said +1 so it's
 added to the whiteboard wiki:
 https://wiki.documentfoundation.org/QA/Bugzilla/Fields/Whiteboard/Advanced
 
 So my advice is for experienced QA members (feel free to self
 categorize yourself ;) ) to keep a lookout for these. For new QA members
 - feel free to use this (although try to use it sparingly ;)) if you
 just really aren't sure about where an UNCONFIRMED bug belongs.
 
 Thanks!
 
 
 Best,
 Joel
 ___
 List Name: Libreoffice-qa mailing list
 Mail address: Libreoffice-qa@lists.freedesktop.org
 Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
 Problems? 
 http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
 Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
 List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
 
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 81079] New: UI: Ease change Field contents for current Date / Time

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

  Priority: medium
Bug ID: 81079
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: UI: Ease change Field contents for current Date / Time
  Severity: enhancement
Classification: Unclassified
OS: All
  Reporter: libobugcrunc...@gmail.com
  Hardware: Other
Status: UNCONFIRMED
   Version: Inherited From OOo
 Component: Writer
   Product: LibreOffice

Created attachment 102456
  -- https://bugs.freedesktop.org/attachment.cgi?id=102456action=edit
Test Document with mock-up

This is an enhancement request.

Problem description: 
Current proceeding is rather long winded, please follow description in sample
document for WRITER:

Both fields are „Date / Fix, means they show the latest time when the fields
have been updated.
To get the current fields you currently need:
1. Double click on field (dialog opens)
2. In middle pane change selection from “fix” to “current”
3. OK (dialog closes, date (or time) changes)
4. Double click on field (dialog opens)
5. In Middle pane change selection from “current” to “fix” 
6. OK (dialog closes)

Suggestion - Add an Update button!
More comfortable way how to update:
1. Double click on field (dialog opens)
2. Click Update (dialog closes and field updates to current 
   time and date

Alternative - It might be more useful (and may be more consistent) not to close
the dialog immediately, but to allow to select other fields with next /
previous buttons and to close the dialog with OK.
But for my needs it would be more useful to close dialog immediately with
Update.

Additions:
The Update function also should be available in the context menu for the
fields.
It should be checked for what other fields such an update might be useful

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

[Libreoffice-bugs] [Bug 70307] EDITING: Input fields/lists are not updated in protected sections

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

Bugcruncher libobugcrunc...@gmail.com changed:

   What|Removed |Added

 CC||libobugcrunc...@gmail.com

--- Comment #11 from Bugcruncher libobugcrunc...@gmail.com ---
Simply a DUPlicate of 
Bug 63800 - EDITING: Input fields in write protected sections not update in
window when edited
?

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

[Libreoffice-bugs] [Bug 77896] FORMATTING: Calc do not recognize text:span of cell text in ODS file, thus shows wrong font color

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Whiteboard|BSA BibisectRequest |BSA bibisected
   Priority|medium  |high

--- Comment #11 from Joel Madero jmadero@gmail.com ---
a7e54955e9f49e8b59dfd8c4533785a680b1796c is the first bad commit
commit a7e54955e9f49e8b59dfd8c4533785a680b1796c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Oct 16 11:07:50 2013 +

source-hash-5da10275a7475efdbfd9de14ea58cf8f4c6c1582

commit 5da10275a7475efdbfd9de14ea58cf8f4c6c1582
Author: Stephan Bergmann sberg...@redhat.com
AuthorDate: Fri Mar 1 17:09:45 2013 +0100
Commit: Stephan Bergmann sberg...@redhat.com
CommitDate: Fri Mar 1 17:18:29 2013 +0100

Related rhbz#915743: Abort UCB call from SvtMatchContext_Impl::Stop

...as otherwise the SvtMatchContext_Impl thread can continue to run for
arbitrarily long, and the other thread calling Stop() and join() will
block.

However, especially the WebDAV UCP does not properly support aborting
commands,
see 260afe56fd6b2f34de8290f3cdb7d1df5b88f8a8  neon commands cannot be
aborted,
so this is not yet enough to actually fix rhbz#915743 thread
deadlock/slow
join in insert-hyperlink in impress.

Change-Id: I0da899f824763e1b3d19bb5b38d906feb690b623

:100644 100644 fd22aadcebcf1ca20b6c2fcdb9e135deeb9b5885
8a0f14e1bb71d7ecdf8086c62e9769bb7f2d09b8 Mautogen.log
:100644 100644 5af869ab53b50329a270e7d4e2587f802bf68afb
8519bf956c5e06a85818d380070eedc0ef846790 Mccache.log
:100644 100644 63cd7351c9d6feb098661a5783d51bb172d8a306
33abac29aad7182260562465482b493d94b78a83 Mcommitmsg
:100644 100644 e9ea867065a69fa4f0fbbb5c2abb40baeeabd307
21fc5294b2cb922862b78327b6b8a3cd953f38b5 Mdev-install.log
:100644 100644 4c087a5ff52a8cef08f31417ac650666b1d9d0af
c1cc87465560a589137349c81641a62968242386 Mmake.log
:04 04 ece742cbaf9101d015210ea8da6c00ad7a4457c7
9ff9cbceea1fe6b0ad1b17fe9068b2c8e32a6cbb Mopt

# bad: [423a84c4f7068853974887d98442bc2a2d0cc91b]
source-hash-c15927f20d4727c3b8de68497b6949e72f9e6e9e
# good: [65fd30f5cb4cdd37995a33420ed8273c0a29bf00]
source-hash-d6cde02dbce8c28c6af836e2dc1120f8a6ef9932
git bisect start 'latest' 'oldest'
# bad: [e02439a3d6297a1f5334fa558ddec5ef4212c574]
source-hash-6b8393474974d2af7a2cb3c47b3d5c081b550bdb
git bisect bad e02439a3d6297a1f5334fa558ddec5ef4212c574
# good: [8f4aeaad2f65d656328a451154142bb82efa4327]
source-hash-1885266f274575327cdeee9852945a3e91f32f15
git bisect good 8f4aeaad2f65d656328a451154142bb82efa4327
# good: [9995fae0d8a24ce31bcb5e9cd0459b69cfbf7a02]
source-hash-8600bc24bbc9029e92bea6102bff2921bc10b33e
git bisect good 9995fae0d8a24ce31bcb5e9cd0459b69cfbf7a02
# bad: [8ad82bc1416a07501651e8d96fe268e47d3931d3]
source-hash-13821254f88d2c5488fba9fe6393dcf4ae810db4
git bisect bad 8ad82bc1416a07501651e8d96fe268e47d3931d3
# bad: [238338bc4111eb82429ea47384d4012bcd7cdc3e]
source-hash-b6ba04639b9922f6717f79ac4be215e09691d7a9
git bisect bad 238338bc4111eb82429ea47384d4012bcd7cdc3e
# bad: [89dc8a802d1625e0efd88ba0fb720b22be87f3f0]
source-hash-da03bb1ee6a69d2f4fef4c3ca0adc0ba9588bd19
git bisect bad 89dc8a802d1625e0efd88ba0fb720b22be87f3f0
# bad: [fe956dc63cc7ed1831f0e7e9e7253ea4d8c99549]
source-hash-b15f095293c6127ecaef2f0fa3a1683e72392835
git bisect bad fe956dc63cc7ed1831f0e7e9e7253ea4d8c99549
# good: [cd762eb968ba8783f726b67d9d70b0a76f4eb55d]
source-hash-c9562064740baed3a9978723c5fe77b44a13a7aa
git bisect good cd762eb968ba8783f726b67d9d70b0a76f4eb55d
# bad: [a7e54955e9f49e8b59dfd8c4533785a680b1796c]
source-hash-5da10275a7475efdbfd9de14ea58cf8f4c6c1582
git bisect bad a7e54955e9f49e8b59dfd8c4533785a680b1796c
# good: [5e90d936616ff95724eaa3e3a0a7c7a9747e9b44]
source-hash-ba446dd58a4ad324d242afcd5b28d3b4dff5a881
git bisect good 5e90d936616ff95724eaa3e3a0a7c7a9747e9b44
# first bad commit: [a7e54955e9f49e8b59dfd8c4533785a680b1796c]
source-hash-5da10275a7475efdbfd9de14ea58cf8f4c6c1582

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

[Libreoffice-bugs] [Bug 78580] VIEWING: Linked images are not displayed when files are on read-only media (e.g. DVD)

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

--- Comment #13 from Ulrich Windl ulrich.wi...@rz.uni-regensburg.de ---
(In reply to comment #12)
You mean the properties dialog for a linked image? You mean properties like in
attachment 102424, where the image still isn't displayed (after being copied to
hard disk), or properties of a configuration that is actually displayed?

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

[Libreoffice-bugs] [Bug 80190] When you hide View - Slide Pane close Impress and reopen, toggle-on do not show up slide pane again

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Whiteboard|bibisectrequest |bibisected

--- Comment #3 from Joel Madero jmadero@gmail.com ---
9771d0c212cfa71b07742ff3dc5c05df22d600eb is the first bad commit
commit 9771d0c212cfa71b07742ff3dc5c05df22d600eb
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 27 02:45:33 2013 +

source-hash-a9a0933ec67eab0ec31c8fadb60fb8e8e3e90485

commit a9a0933ec67eab0ec31c8fadb60fb8e8e3e90485
Author: Lionel Elie Mamane lio...@mamane.lu
AuthorDate: Fri Sep 27 13:07:29 2013 +0200
Commit: Lionel Elie Mamane lio...@mamane.lu
CommitDate: Fri Sep 27 13:07:44 2013 +0200

raah... getURLFromWorkdir does not put the URL scheme

Change-Id: I62162230b313c66872ef1b3e8b18070126169aa1

:100644 100644 852827ab6e80d0adde64499d4b66d9d95413ef73
a46c9c52284a16a3ce365755b527b41e25f0f22f Mccache.log
:100644 100644 19aec38d05a7ffec0fcb0983b81751750b47e396
773f66bd54ba06715c937011f93d177a62549321 Mcommitmsg
:100644 100644 93217f5b28d79def07f69f20318dc4eb22a17679
a46cd23c656e877977f67d63e30a08ba21ad27b0 Mmake.log
:04 04 42bfe3d7df100cb42258f35f162fd8f7b35d8dc0
9af944dc810a23ba21149323072ad8665d3e8b0d Mopt

# bad: [423a84c4f7068853974887d98442bc2a2d0cc91b]
source-hash-c15927f20d4727c3b8de68497b6949e72f9e6e9e
# good: [65fd30f5cb4cdd37995a33420ed8273c0a29bf00]
source-hash-d6cde02dbce8c28c6af836e2dc1120f8a6ef9932
git bisect start 'latest' 'oldest'
# good: [e02439a3d6297a1f5334fa558ddec5ef4212c574]
source-hash-6b8393474974d2af7a2cb3c47b3d5c081b550bdb
git bisect good e02439a3d6297a1f5334fa558ddec5ef4212c574
# bad: [4850941efe43ae800be5c76e1102ab80ac2c085d]
source-hash-980a6e552502f02f12c15bfb1c9f8e6269499f4b
git bisect bad 4850941efe43ae800be5c76e1102ab80ac2c085d
# skip: [a043626b542eb8314218d7439534dce2fc325304]
source-hash-9379a922c07df3cdb7d567cc88dfaaa39ead3681
git bisect skip a043626b542eb8314218d7439534dce2fc325304
# skip: [aba65c3e4c0df07e4909aeefb758cdb688242bf6]
source-hash-827524abfb4b577d08276fde40929a9adfb7ff1a
git bisect skip aba65c3e4c0df07e4909aeefb758cdb688242bf6
# bad: [c81a8a0dcfc1ed095a80e4485c89dd0fcaf73f31]
source-hash-c69ed33628ec0b7abf6296539cf280d6c4265930
git bisect bad c81a8a0dcfc1ed095a80e4485c89dd0fcaf73f31
# good: [1d4980621741d3050a5fe61b247c157d769988f2]
source-hash-89d01a7d8028ddb765e02c116d202a2435894217
git bisect good 1d4980621741d3050a5fe61b247c157d769988f2
# skip: [89110ca258fa7a15dfc546acfb39e76fc3eb2a44]
source-hash-e450a2c506ac7cd4433b0f93fc750a89919bc03c
git bisect skip 89110ca258fa7a15dfc546acfb39e76fc3eb2a44
# good: [1cca92a409385d9288c28a54d5e3008e56728bc0]
source-hash-7be7824bbbdeee6fa998b950e6046ab37fe690cb
git bisect good 1cca92a409385d9288c28a54d5e3008e56728bc0
# skip: [5fa28ce2931a35ae64ae08d3904cfb76d24459d8]
source-hash-2304beaca33c63b94df99cb827716f00ce259f9a
git bisect skip 5fa28ce2931a35ae64ae08d3904cfb76d24459d8
# bad: [2a9ff869c5638dc5c3aa387d0fe55c3291c86288]
source-hash-01b7e04172889cbc9e4ac404b105e18ddc062d6f
git bisect bad 2a9ff869c5638dc5c3aa387d0fe55c3291c86288
# bad: [9771d0c212cfa71b07742ff3dc5c05df22d600eb]
source-hash-a9a0933ec67eab0ec31c8fadb60fb8e8e3e90485
git bisect bad 9771d0c212cfa71b07742ff3dc5c05df22d600eb
# good: [b68886f4c56ebc4cdf94aee9753398ccce28bb41]
source-hash-90830788b1f8fd61ea86135712868aeda395edd0
git bisect good b68886f4c56ebc4cdf94aee9753398ccce28bb41
# skip: [06793dd2acc5fe5c7dd3cecf09784c2d3426f33a]
source-hash-2232781ad303864b79a3973b5b0eec40a859a701
git bisect skip 06793dd2acc5fe5c7dd3cecf09784c2d3426f33a
# skip: [10fc65607493c257076c8af1b708839eb03d8d14]
source-hash-1500aae993c0a8b4fa9a5bcec1bc6203f3bcff66
git bisect skip 10fc65607493c257076c8af1b708839eb03d8d14
# good: [e3a648fdaa2bb87293750400b70ba590733a804a]
source-hash-33526481788137d959f27ae32910127d1436c1a8
git bisect good e3a648fdaa2bb87293750400b70ba590733a804a
# skip: [50f1f06ed2dd40d2e6f658524a5e160ba1a84807]
source-hash-647fb29f528b891a1c92846640f7865f5c1fbe7f
git bisect skip 50f1f06ed2dd40d2e6f658524a5e160ba1a84807
# good: [b5b034dfb3e4cd132c1e60a0283ff527ec92637a]
source-hash-b95acb2bdcc6bc7c09a806157361c83142858d97
git bisect good b5b034dfb3e4cd132c1e60a0283ff527ec92637a
# good: [84ecc38ca8396d29c5f2dfc3413fa4a701879fa3]
source-hash-781ae59664f91fa55a9aeda3f5d93076e501d65a
git bisect good 84ecc38ca8396d29c5f2dfc3413fa4a701879fa3
# first bad commit: [9771d0c212cfa71b07742ff3dc5c05df22d600eb]
source-hash-a9a0933ec67eab0ec31c8fadb60fb8e8e3e90485

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

[Libreoffice-bugs] [Bug 63800] EDITING: Input fields in write protected sections not update in window when edited

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 CC||h.kulov...@lohr.at

--- Comment #3 from Joel Madero jmadero@gmail.com ---
*** Bug 70307 has been marked as a duplicate of this bug. ***

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

[Libreoffice-bugs] [Bug 70307] EDITING: Input fields/lists are not updated in protected sections

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #12 from Joel Madero jmadero@gmail.com ---
Agreed

*** This bug has been marked as a duplicate of bug 63800 ***

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

[Libreoffice-bugs] [Bug 79664] vertical text in embedded WMF not rendered correctly

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

Version|3.4 all versions|PreBibisect

--- Comment #3 from Joel Madero jmadero@gmail.com ---
Also cannot confirm that this is a recent problem. PreBibisect shows same
problem (and in between it shows a bunch of other issues). Marking version as
PreBibisect

@Jay - can you test again on 3.5.7 and if you can confirm that it looks fine on
that mark the version appropriately and put NotBibisectable in the whiteboard.
Thanks!

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

[Libreoffice-bugs] [Bug 56391] Using old .sxw documents as templates causes segmentation fault

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

Rudolf Kollien rudolf.koll...@medas.de changed:

   What|Removed |Added

 Status|NEEDINFO|UNCONFIRMED
 Ever confirmed|1   |0

--- Comment #13 from Rudolf Kollien rudolf.koll...@medas.de ---
Sorry, first of all, the mentioned sxw files all contain highly confidential
medical informations, so it is impossible to upload it. As this error occurs
only on sxw files created with old versions of OpenOffice, it is not possible
to create new test files. As this bug is now over 1,5 years old, in the
meantime we converted all affected files to odt format. In the time till
conversation was finished, we uses OpenOffice 4.x at this workstations. OOo
doesn't behave faulty.

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

[Libreoffice-bugs] [Bug 79664] vertical text in embedded WMF not rendered correctly

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Whiteboard|bibisectrequest |

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

[Libreoffice-bugs] [Bug 81080] New: FILESAVE: Comments visibility does not save properly in xlsx format

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

  Priority: medium
Bug ID: 81080
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FILESAVE: Comments visibility does not save properly
in xlsx format
  Severity: normal
Classification: Unclassified
OS: Linux (All)
  Reporter: cicin...@gmail.com
  Hardware: Other
Whiteboard: BSA
Status: UNCONFIRMED
   Version: 4.2.4.2 release
 Component: Spreadsheet
   Product: LibreOffice

Created attachment 102458
  -- https://bugs.freedesktop.org/attachment.cgi?id=102458action=edit
Screenshot of one of my working sheets after opening.

Problem description: When saving spreadsheet to xlsx format, after reopening
all comments are shown, blocking the view of actual cells behind them.

Steps to reproduce:
1. Modify or create spreadsheet with comment and set the comment to hide, so it
shows on mouse-hover.
2. Save the sheet in xlsx and close it.
3. Reopen it.

Current behavior: Comments are all shown.

Expected behavior: Comments should be hidden and be shown only when mouse
hovers over them.


Operating System: Ubuntu
Version: 4.2.4.2 release

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

[Libreoffice-bugs] [Bug 81081] New: Other: Wrong calculation of value in cells

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

  Priority: medium
Bug ID: 81081
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Other: Wrong calculation of value in cells
  Severity: normal
Classification: Unclassified
OS: Linux (All)
  Reporter: zoran.mijano...@yahoo.com
  Hardware: Other
Whiteboard: BSA
Status: UNCONFIRMED
   Version: 4.2.4.2 release
 Component: Spreadsheet
   Product: LibreOffice

Created attachment 102459
  -- https://bugs.freedesktop.org/attachment.cgi?id=102459action=edit
spreadsheet that contain the wrong calculation

Problem description: 

Steps to reproduce:
1. Open the attached file wrong.ods. (You can also get the file from this link:
https://dl.dropboxusercontent.com/u/81157608/wrong.ods
2. Look at cells E51 and E53.
3. Read the comments in cells B51, B53 and B54.

Current behavior:
Cells E51 and E53 are incorrectly calculated.

Expected behavior:
You can see the comments in the file.

Operating System: Ubuntu
Version: 4.2.4.2 release

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

[Libreoffice-bugs] [Bug 56391] Using old .sxw documents as templates causes segmentation fault

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |INVALID

--- Comment #14 from Joel Madero jmadero@gmail.com ---
We'd need a test document. Closing as INVALID.

For confidential files you can do a fine and replace and replace every
character with a X. Without a test document, nothing we can do.

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

[Libreoffice-bugs] [Bug 56391] Using old .sxw documents as templates causes segmentation fault

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

--- Comment #15 from Rudolf Kollien rudolf.koll...@medas.de ---
When i change the document and save it, the error doesn't appear. As i wrote,
this only happens to sxw files created with old versions of OOo. As we do not
host antique software, i cannot change the documents without converting to a
compatible sxw format.

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

[Libreoffice-bugs] [Bug 81041] UI: tick indicating that dictionary is available for spellchecking is missing in list Language in dialog Format Character/Style

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 CC||jmadero@gmail.com

--- Comment #3 from Joel Madero jmadero@gmail.com ---
Sorry Cor but I have no experience with these dialogs. Can you tell me exactly
which one you are referring to and I will bibisect it

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

[Libreoffice-bugs] [Bug 81058] formula bar not rendering contents

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 CC||jmadero@gmail.com

--- Comment #1 from Joel Madero jmadero@gmail.com ---
This one won't be bibisectable until we get a new bibisect package which covers
4.4.

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

[Libreoffice-bugs] [Bug 45649] UI: Blinking hourglass icon during slideshow

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

sasha.libreoff...@gmail.com changed:

   What|Removed |Added

 Status|NEEDINFO|UNCONFIRMED
 Ever confirmed|1   |0

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

[Libreoffice-bugs] [Bug 77896] FORMATTING: Calc do not recognize text:span of cell text in ODS file, thus shows wrong font color

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

--- Comment #12 from Kevin Suo suokunl...@gmail.com ---
(In reply to comment #10)
 This bug should be separated into two separate bug reports as I can confirm
 one as a regression (the font color) but not the font size.

Sorry, it was my mistake, the second part is not a bug. When I was changing the
font size in comment 2, not only fo:font-size, but I should change all these:

[code]
  fo:font-size=20pt style:font-size-asian=20pt
style:font-size-complex=20pt
[/code]

When change all of these three font-size, libreoffice shows correctly 20pt font
size.

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

[Libreoffice-bugs] [Bug 64032] FILESAVE: Error Saving Document FILENAME: Write Error. The file could not be written.

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

--- Comment #6 from Eric Yeoh yeohe...@gmail.com ---
Issue has not re-occured after upgrade to one version from reported version.


On 9 July 2014 01:28, bugzilla-dae...@freedesktop.org wrote:

   *Comment # 5 https://bugs.freedesktop.org/show_bug.cgi?id=64032#c5 on
 bug 64032 https://bugs.freedesktop.org/show_bug.cgi?id=64032 from QA
 Administrators qa-ad...@libreoffice.org *

 Dear Bug Submitter,

 This bug has been in NEEDINFO status with no change for at least 6 months.
 Please provide the requested information as soon as possible and mark the bug
 as UNCONFIRMED. Due to regular bug tracker maintenance, if the bug is still in
 NEEDINFO status with no change in 30 days the QA team will close the bug as
 INVALID due to lack of needed information.

 For more information about our NEEDINFO policy please read the wiki located
 here: https://wiki.documentfoundation.org/QA/FDO/NEEDINFO

 If you have already provided the requested information, please mark the bug as
 UNCONFIRMED so that the QA team knows that the bug is ready to be confirmed.


 Thank you for helping us make LibreOffice even better for everyone!


 Warm Regards,
 QA Team

  --
 You are receiving this mail because:

- You are on the CC list for the bug.
- You reported the bug.



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

[Libreoffice-bugs] [Bug 81084] New: Sort causes crashes

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

  Priority: medium
Bug ID: 81084
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Sort causes crashes
  Severity: blocker
Classification: Unclassified
OS: Windows (All)
  Reporter: helplibreoff...@mailcatch.com
  Hardware: All
Status: UNCONFIRMED
   Version: unspecified
 Component: Spreadsheet
   Product: LibreOffice

Hello. I am an ordinary user and I have never filed a bug report, so please
forgive that I'm probably doing it all wrong.

When I try to sort in LibreOffice Calc, I routinely experience crashes.

Usually, I receive a dialog box stating unexpected error.  Sometimes I get an
invalid vector T subscript.  Sometimes I get The instruction at xxx
referenced memory at yyy.  The memory could not be read.  Click on OK to
terminate the program..

I have tried numerous spreadsheets, and I experience different crashes on each
one.

I have asked my manager if I can send you the spreadsheets, but she has
refused.

Most of my testing was on v4.2.4.2, but I have upgraded to v4.2.5.2 and still
experience numerous crashes.

For v4.2.4.2, the xxx above is sometimes 0x7c90100b and other times
0x7c9108f3.

I have spent a considerable amount of time trying to isolate the problems, but
there seems to be multiple causes, which is making testing challenging.  I
don't have any more time to allocate to this, unfortunately.

What I have concluded is that formatting seems to play a role.  I have one
spreadsheet that crashes every time I try to sort.  But if I change one column
from center-justified to left-justified, suddenly I can sort without a crash.

I also have concluded that conditional formatting plays a role.  When you copy
a row in LO, you wind up with a separate conditional formatting rule for each
row (which probably should be fixed).  In a different spreadsheet, if I delete
all that conditional formatting and change it to a single conditional
formatting rule for a range of cells, the sort no longer crashes LibreOffice.

I have tried this on multiple computers and get the same results.  I have
verified the SHA-256 and MD5 hashes of LO, and the installation files match.

Unfortunately, we might have to switch away from LO, as we need to sort
reliably without the program crashing.

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

[Libreoffice-bugs] [Bug 81084] Sort causes crashes

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

helplibreoff...@mailcatch.com changed:

   What|Removed |Added

   Priority|medium  |highest

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

[Libreoffice-bugs] [Bug 81084] Sort causes crashes

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

helplibreoff...@mailcatch.com changed:

   What|Removed |Added

Version|unspecified |4.2.5.2 release

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

[Libreoffice-bugs] [Bug 81085] New: EDITING: Slides copied from a pptx presentation are sometimes duplicated or fail to copy

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

Priority: medium
Bug ID: 81085
Assignee: libreoffice-bugs@lists.freedesktop.org
Summary: EDITING: Slides copied from a pptx presentation are
sometimes duplicated or fail to copy
Severity: normal
Classification: Unclassified
OS: Linux (All)
Reporter: matthew.hir...@gmail.com
Hardware: x86-64 (AMD64)
Status: UNCONFIRMED
Version: 4.2.5.2 release
Component: Presentation
Product: LibreOffice

When copying multiple slides out of a pptx file into a new, empty presentation,
under some circumstances, the first slide will be pasted into the new
presentation multiple times, rather than a single copy of each of the multiple
slides.

Here are the steps to replicate this bug in libreoffice-4.2.5.2-1.fc20.x86_64
in Fedora Linux.

1. Obtain the following presentation (created in MS PowerPoint 2010):

http://www.slideshare.net/mhirsch45/a-switchable-light-field-camera-architecture-with-angle-sensitive-pixels-and-dictionarybased-sparse-coding

2. Open it in impress.
3. Press the new button to obtain a new, blank impress presentation.
4. Select slides 10 and 11 from the pptx presentation.
5. Press ctrl-c or right click in the slide sorter and use the copy context
menu to copy the two slides
6. Change to the new, blank presentation window.
7. Press ctrl-v or right click in the slide sorter and select paste to paste in
the two slides.
8. Press either yes or no when asked to adapt the format (it doesn't matter
which)
9. Note that slide 10 has been copied twice, and slide 11 has not been copied.

This seems to have something to do with slides that are created by duplication
in the original powerpoint presentation. In this case, I'm pretty sure slide 11
was created by selecting slide 10 and clicking duplicate slide in powerpoint.
Then it was edited.

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

[Libreoffice-bugs] [Bug 81086] New: Conditional formatting issue