[Libreoffice-commits] core.git: 23 commits - include/svtools sc/inc sc/source svtools/source unusedcode.easy
include/svtools/ruler.hxx |1
include/svtools/viewdataentry.hxx |2 -
sc/inc/cellvalue.hxx |9 --
sc/inc/colorscale.hxx |1
sc/inc/column.hxx |3 --
sc/inc/dociter.hxx |3 --
sc/inc/document.hxx|1
sc/inc/dpfilteredcache.hxx |1
sc/inc/global.hxx |2 -
sc/inc/rangeutl.hxx|7 -
sc/inc/refdata.hxx |1
sc/inc/refreshtimer.hxx|1
sc/inc/segmenttree.hxx |1
sc/inc/table.hxx |3 --
sc/source/core/data/cellvalue.cxx | 28 +
sc/source/core/data/colorscale.cxx | 10 ---
sc/source/core/data/column2.cxx| 30 --
sc/source/core/data/column3.cxx| 10 ---
sc/source/core/data/dociter.cxx| 17
sc/source/core/data/document.cxx |8 --
sc/source/core/data/dpfilteredcache.cxx|5 ---
sc/source/core/data/global.cxx | 11
sc/source/core/data/segmenttree.cxx|5 ---
sc/source/core/data/table2.cxx | 11
sc/source/core/tool/rangeutl.cxx | 25 ---
sc/source/core/tool/refdata.cxx|5 ---
sc/source/core/tool/refreshtimer.cxx |5 ---
sc/source/filter/starcalc/collect.cxx | 13 -
sc/source/filter/starcalc/collect.hxx |1
sc/source/filter/xml/XMLExportIterator.cxx | 12 ++---
sc/source/filter/xml/XMLExportIterator.hxx |3 --
sc/source/ui/inc/gridwin.hxx |2 -
sc/source/ui/inc/reffact.hxx |1
sc/source/ui/inc/tabview.hxx |1
sc/source/ui/inc/tabvwsh.hxx |1
sc/source/ui/view/gridwin.cxx | 38 -
sc/source/ui/view/reffact.cxx | 10 ---
sc/source/ui/view/tabview2.cxx | 18 -
sc/source/ui/view/tabvwsh4.cxx | 10 ---
svtools/source/contnr/viewdataentry.cxx|7 -
svtools/source/control/ruler.cxx |5 ---
unusedcode.easy| 30 --
42 files changed, 6 insertions(+), 352 deletions(-)
New commits:
commit 04539b9bba00d4cd1e4673fc1fab0fa1977d53cd
Author: Noel Grandin n...@peralex.com
Date: Wed Feb 26 15:51:46 2014 +0200
remove unused code Ruler::GetPageWidth()
Change-Id: I7a061b869a699771b321d7143559c5b9f48937c5
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index eb7eadd..8301316 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -739,7 +739,6 @@ public:
longGetWinWidth() const { return mnWinWidth; }
voidSetPagePos( long nOff = 0, long nWidth = 0 );
longGetPageOffset() const;
-longGetPageWidth() const;
voidSetBorderPos( long nOff = 0 );
longGetBorderOffset() const { return mnBorderOff; }
Rectangle GetExtraRect() const { return maExtraRect; }
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 115eea5..6fbea32 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2763,11 +2763,6 @@ long Ruler::GetPageOffset() const
return mpData-nPageOff;
}
-long Ruler::GetPageWidth() const
-{
-return mpData-nPageWidth;
-}
-
long Ruler::GetNullOffset() const
{
return mpData-nNullOff;
diff --git a/unusedcode.easy b/unusedcode.easy
index 7619af8..495c4ec 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -56,7 +56,6 @@ OutputDevice::PixelToLogic(Region const, MapMode const)
const
PanelLayout::dispatch(rtl::OUString const,
com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue const)
RecentDocsView::SetThumbnailSize(long)
Resource::TestRes()
-Ruler::GetPageWidth() const
SalDisplay::PrintInfo() const
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const, basegfx::B2DPoint
const, basegfx::B2DPoint const, SalBitmap const, SalBitmap const*)
ScDocument::CreateFormatTable() const
commit d0edd3dc7d69d181f8452b8faf3863ddac542f9b
Author: Noel Grandin n...@peralex.com
Date: Wed Feb 26 14:17:52 2014 +0200
remove unused code in ScCellIterator
Specifically:
ScCellIterator::getValue()
ScCellIterator::hasNumeric() const
Change-Id: If15c627789576772bb220ece0b9dd143b1374a1b
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 0a8ef91..b906dd9 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -220,12 +220,10 @@ public:
const EditTextObject* getEditText() const;
ScFormulaCell* getFormulaCell();
const ScFormulaCell* getFormulaCell()
[Libreoffice-commits] core.git: icon-themes/industrial icon-themes/tango
dev/null |binary 1 file changed New commits: commit 3b15769cc2a2ba8e1e9d8c08527d47dccf4a5b62 Author: Andrew dent@gmail.com Date: Wed Feb 26 14:16:51 2014 + Icon redux 01: Remove old insertapplet icons i#87895 Porting old icon fixes from AOO Bugzilla. Delete 'insert applet' icons from custom themes. Checked via git grep core and help source. No instances. QA - Low risk; visual inspection of icons in general use. Originally icons appeared in insert-object-Applet, circa 2008. See i#86118. Change-Id: I0221ff8ba3f0ee54aa441feadd73227ee842a632 Signed-off-by: Andrew dent@gmail.com Reviewed-on: https://gerrit.libreoffice.org/8370 Reviewed-by: Jan Holesovsky ke...@collabora.com Tested-by: Jan Holesovsky ke...@collabora.com diff --git a/icon-themes/industrial/cmd/lc_insertapplet.png b/icon-themes/industrial/cmd/lc_insertapplet.png deleted file mode 100644 index 2a8f0b7..000 Binary files a/icon-themes/industrial/cmd/lc_insertapplet.png and /dev/null differ diff --git a/icon-themes/industrial/cmd/sc_insertapplet.png b/icon-themes/industrial/cmd/sc_insertapplet.png deleted file mode 100644 index f752e1f..000 Binary files a/icon-themes/industrial/cmd/sc_insertapplet.png and /dev/null differ diff --git a/icon-themes/tango/cmd/lc_insertapplet.png b/icon-themes/tango/cmd/lc_insertapplet.png deleted file mode 100644 index aeb5ba6..000 Binary files a/icon-themes/tango/cmd/lc_insertapplet.png and /dev/null differ diff --git a/icon-themes/tango/cmd/lc_insertapplet.xcf.bz2 b/icon-themes/tango/cmd/lc_insertapplet.xcf.bz2 deleted file mode 100644 index 2006b60..000 Binary files a/icon-themes/tango/cmd/lc_insertapplet.xcf.bz2 and /dev/null differ diff --git a/icon-themes/tango/cmd/sc_insertapplet.png b/icon-themes/tango/cmd/sc_insertapplet.png deleted file mode 100644 index c2de419..000 Binary files a/icon-themes/tango/cmd/sc_insertapplet.png and /dev/null differ diff --git a/icon-themes/tango/cmd/sc_insertapplet.xcf.bz2 b/icon-themes/tango/cmd/sc_insertapplet.xcf.bz2 deleted file mode 100644 index e2dba4a..000 Binary files a/icon-themes/tango/cmd/sc_insertapplet.xcf.bz2 and /dev/null differ ___ 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' - icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/oxygen officecfg/registry sw/inc sw/Library_swui.
icon-themes/crystal/cmd/lc_borderdialog.png |binary icon-themes/crystal/cmd/sc_borderdialog.png |binary icon-themes/galaxy/cmd/lc_borderdialog.png |binary icon-themes/galaxy/cmd/sc_borderdialog.png |binary icon-themes/hicontrast/cmd/lc_borderdialog.png |binary icon-themes/hicontrast/cmd/sc_borderdialog.png |binary icon-themes/human/cmd/lc_borderdialog.png |binary icon-themes/human/cmd/sc_borderdialog.png |binary icon-themes/oxygen/cmd/lc_borderdialog.png |binary icon-themes/oxygen/cmd/sc_borderdialog.png |binary officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 + sw/Library_swui.mk |1 sw/inc/cmdid.h |1 sw/inc/dialog.hrc |1 sw/inc/swabstdlg.hxx|1 sw/sdi/_basesh.sdi |6 sw/sdi/swriter.sdi | 25 +++ sw/source/ui/dialog/swdlgfact.cxx | 18 ++ sw/source/ui/dialog/swdlgfact.hxx |1 sw/source/ui/frmdlg/frmui.src |4 sw/source/ui/frmdlg/uiborder.cxx| 58 sw/source/ui/inc/frmui.hrc |1 sw/source/ui/inc/uiborder.hxx | 41 ++ sw/source/ui/shells/basesh.cxx | 67 ++ 24 files changed, 233 insertions(+) New commits: commit e661e6cb6f9e7c45bbd97c4dc8c489a7af952d60 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Thu Feb 27 08:32:54 2014 +0100 fdo#73159 Make border dialog work again I removed border dialog with commit 8560fb88c7252e5ad60674e447f2e194298f08de because it seems unused and when the corresponding command was called only a blank window was opened. It seems it was just bugous, so revert this commit and fix the dialog. Conflicts: sw/inc/swabstdlg.hxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx (cherry picked from commit f73ffb91b85422067274fafc0d411aef8a6e6abb) Change-Id: I68f8c13457e899a894f03bdd60ebedfb2b70afea Reviewed-on: https://gerrit.libreoffice.org/8375 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/icon-themes/crystal/cmd/lc_borderdialog.png b/icon-themes/crystal/cmd/lc_borderdialog.png new file mode 100644 index 000..c0ca4f6 Binary files /dev/null and b/icon-themes/crystal/cmd/lc_borderdialog.png differ diff --git a/icon-themes/crystal/cmd/sc_borderdialog.png b/icon-themes/crystal/cmd/sc_borderdialog.png new file mode 100644 index 000..6b6ab48 Binary files /dev/null and b/icon-themes/crystal/cmd/sc_borderdialog.png differ diff --git a/icon-themes/galaxy/cmd/lc_borderdialog.png b/icon-themes/galaxy/cmd/lc_borderdialog.png new file mode 100644 index 000..0cd8935 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_borderdialog.png differ diff --git a/icon-themes/galaxy/cmd/sc_borderdialog.png b/icon-themes/galaxy/cmd/sc_borderdialog.png new file mode 100644 index 000..c8b915b Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_borderdialog.png differ diff --git a/icon-themes/hicontrast/cmd/lc_borderdialog.png b/icon-themes/hicontrast/cmd/lc_borderdialog.png new file mode 100644 index 000..a61a1a6 Binary files /dev/null and b/icon-themes/hicontrast/cmd/lc_borderdialog.png differ diff --git a/icon-themes/hicontrast/cmd/sc_borderdialog.png b/icon-themes/hicontrast/cmd/sc_borderdialog.png new file mode 100644 index 000..6c65b36 Binary files /dev/null and b/icon-themes/hicontrast/cmd/sc_borderdialog.png differ diff --git a/icon-themes/human/cmd/lc_borderdialog.png b/icon-themes/human/cmd/lc_borderdialog.png new file mode 100644 index 000..323a8df Binary files /dev/null and b/icon-themes/human/cmd/lc_borderdialog.png differ diff --git a/icon-themes/human/cmd/sc_borderdialog.png b/icon-themes/human/cmd/sc_borderdialog.png new file mode 100644 index 000..d71ad45 Binary files /dev/null and b/icon-themes/human/cmd/sc_borderdialog.png differ diff --git a/icon-themes/oxygen/cmd/lc_borderdialog.png b/icon-themes/oxygen/cmd/lc_borderdialog.png new file mode 100644 index 000..c0ca4f6 Binary files /dev/null and b/icon-themes/oxygen/cmd/lc_borderdialog.png differ diff --git a/icon-themes/oxygen/cmd/sc_borderdialog.png b/icon-themes/oxygen/cmd/sc_borderdialog.png new file mode 100644
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/frmdlg/uiborder.cxx |6 +++---
sw/source/ui/inc/uiborder.hxx|2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 97197e881d609404288eaa903fa7db2c3b0c70b6
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Feb 27 09:57:52 2014 +0100
fdo#73159 Make border dialog work again
It seems converting to SfxSingleTabDialog makes it work.
Similar conversions were made on master branch.
Change-Id: I49985bed56f12460d289c7f0d4e1c1435aa4674e
Reviewed-on: https://gerrit.libreoffice.org/8377
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 2f4b1ef..8925786 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -34,7 +34,7 @@
SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet rSet, sal_uInt16 nType) :
-SfxNoLayoutSingleTabDialog(pParent, rSet, 0)
+SfxSingleTabDialog(pParent, rSet)
{
SetText(SW_RESSTR(STR_FRMUI_BORDER));
@@ -45,13 +45,13 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet rSet,
sal_uInt16 nType) :
::CreateTabPage fnCreatePage = pFact-GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER );
if ( fnCreatePage )
{
-SfxTabPage* pNewPage = (*fnCreatePage)( this, rSet );
+SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), rSet );
SfxAllItemSet aSet(*(rSet.GetPool()));
aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,nType));
if(SW_BORDER_MODE_TABLE == nType)
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_HIDESHADOWCTL));
pNewPage-PageCreated(aSet);
-SetTabPage(pNewPage);
+setTabPage(pNewPage);
}
}
diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx
index 20e5e87..a8890b4 100644
--- a/sw/source/ui/inc/uiborder.hxx
+++ b/sw/source/ui/inc/uiborder.hxx
@@ -24,7 +24,7 @@
class Window;
class SfxItemSet;
-class SwBorderDlg : public SfxNoLayoutSingleTabDialog
+class SwBorderDlg : public SfxSingleTabDialog
{
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/toolkit toolkit/source
include/toolkit/awt/vclxtabpagemodel.hxx | 73
toolkit/source/awt/vclxtabpagemodel.cxx | 141 ---
toolkit/source/awt/vclxtoolkit.cxx |1
3 files changed, 215 deletions(-)
New commits:
commit a463234e8893b349f99bef899e71709f3ab82cd6
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 27 10:24:53 2014 +0100
Remove unused VCLXTabPageModel
Unused since 265043a935781633f204b1ddfede5f454b8555fe tabcontrol: #i113362#
impl tabcontrol in awt and not even built since
0a966b904bd6fd570d2fb09825810aceed4e00e8 tabcontrol: fix some compile
errors.
Change-Id: Ida6fde85207288a0b4e09cee767bd004f9384d99
diff --git a/include/toolkit/awt/vclxtabpagemodel.hxx
b/include/toolkit/awt/vclxtabpagemodel.hxx
deleted file mode 100644
index d128e99..000
--- a/include/toolkit/awt/vclxtabpagemodel.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
-
-#include toolkit/dllapi.h
-#include com/sun/star/beans/PropertyValues.hpp
-#include com/sun/star/beans/XPropertySet.hpp
-#include com/sun/star/beans/PropertyValue.hpp
-#include com/sun/star/beans/PropertyState.hpp
-#include com/sun/star/beans/XPropertySetInfo.hpp
-#include toolkit/awt/vclxwindow.hxx
-#include toolkit/controls/unocontrolmodel.hxx
-#include com/sun/star/awt/tab/XTabPageModel.hpp
-#include com/sun/star/awt/tab/XTabPage.hpp
-#include cppuhelper/implbase1.hxx
-//
-typedef ::cppu::AggImplInheritanceHelper1 UnoControlModel,
-
::com::sun::star::awt::tab::XTabPageModel
- VCLXTabPageModel_Base;
-class VCLXTabPageModel : public VCLXTabPageModel_Base
-{
-public:
-VCLXTabPageModel();
-VCLXTabPageModel( const VCLXTabPageModel rModel ) :
VCLXTabPageModel_Base( rModel ) {;}
-~VCLXTabPageModel();
-
-// ::com::sun::star::awt::XView
-void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY )
throw(::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::awt::XDevice,
-::com::sun::star::awt::DeviceInfo SAL_CALL getInfo()
throw(::com::sun::star::uno::RuntimeException);
-
-UnoControlModel*Clone() const { return new VCLXTabPageModel( *this ); }
-
-// ::com::sun::star::beans::XMultiPropertySet
-::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySetInfo SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException);
-// ::com::sun::star::awt::XVclWindowPeer
-void SAL_CALL setProperty( const OUString PropertyName, const
::com::sun::star::uno::Any Value )
throw(::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::awt::tab::XTabPageModel
-virtual ::sal_Int16 SAL_CALL getTabPageID() throw
(::com::sun::star::uno::RuntimeException);
-virtual ::sal_Bool SAL_CALL getEnabled() throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getTitle() throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setTitle( const OUString _title ) throw
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getImageURL() throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setImageURL( const OUString _imageurl ) throw
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getToolTip() throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setToolTip( const OUString _tooltip ) throw
(::com::sun::star::uno::RuntimeException);
-protected:
-::cppu::IPropertyArrayHelper SAL_CALL getInfoHelper();
-};
-#endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx
b/toolkit/source/awt/vclxtabpagemodel.cxx
deleted file mode 100644
index
[Libreoffice-commits] core.git: store/source store/workben
store/source/lockbyte.cxx |1
store/source/object.cxx |1
store/source/object.hxx |1
store/source/storbase.cxx |1
store/source/storbase.hxx |1
store/source/storcach.cxx | 84 +-
store/source/stordata.cxx |1
store/source/stordir.cxx |1
store/source/store.cxx|2 -
store/source/storlckb.cxx |3 -
store/source/storpage.cxx |1
store/source/stortree.cxx |1
store/workben/t_base.cxx | 10 -
store/workben/t_file.cxx |1
store/workben/t_page.cxx |2 -
store/workben/t_store.cxx |2 -
16 files changed, 25 insertions(+), 88 deletions(-)
New commits:
commit d39d80a52642489207fc4f7d384a3474e6d20136
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 20:42:46 2014 +0100
Remove visual noise from store
Change-Id: I6753eb480618af747ecf4a3ae3c666257761ce70
Reviewed-on: https://gerrit.libreoffice.org/8317
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index b51c59f..8aaadab 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include lockbyte.hxx
#include sal/types.h
diff --git a/store/source/object.cxx b/store/source/object.cxx
index acafa83..eb56b3d 100644
--- a/store/source/object.cxx
+++ b/store/source/object.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include object.hxx
#include sal/types.h
diff --git a/store/source/object.hxx b/store/source/object.hxx
index a3213a1..04a4742 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -45,7 +45,6 @@ protected:
~IStoreHandle() {}
};
-
/** Template helper function as dynamic_cast replacement.
*/
templateclass store_handle_type
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index 1c5b22b..2173992 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include storbase.hxx
#include sal/types.h
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index cbd4fc5..7a6dc0d 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -884,7 +884,6 @@ public:
return store_E_None;
}
-
PageHolder get() { return m_xPage; }
PageHolder const get() const { return m_xPage; }
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index 2b10ad4..b76559e 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -36,12 +36,7 @@
using namespace store;
-/*
- *
- * PageCache (non-virtual interface) implementation.
- *
- *==*/
-
+// PageCache (non-virtual interface) implementation.
storeError PageCache::lookupPageAt (PageHolder rxPage, sal_uInt32 nOffset)
{
OSL_PRECOND(!(nOffset == STORE_PAGE_NULL),
store::PageCache::lookupPageAt(): invalid Offset);
@@ -100,45 +95,33 @@ storeError PageCache::removePageAt (sal_uInt32 nOffset)
return removePageAt_Impl (nOffset);
}
-/*
- *
- * Entry.
- *
- *==*/
+// Entry
namespace
{
struct Entry
{
-/** Representation.
- */
+// Representation
PageHolder m_xPage;
sal_uInt32 m_nOffset;
Entry *m_pNext;
-/** Allocation.
- */
+// Allocation
static void * operator new (size_t, void * p) { return p; }
static void operator delete (void *, void *) {}
-/** Construction.
- */
+// Construction
explicit Entry (PageHolder const rxPage = PageHolder(), sal_uInt32
nOffset = STORE_PAGE_NULL)
: m_xPage(rxPage), m_nOffset(nOffset), m_pNext(0)
{}
-/** Destruction.
- */
+// Destruction
~Entry() {}
};
} // namespace
-/*
- *
- * EntryCache interface.
- *
- *==*/
+// EntryCache interface
namespace
{
@@ -160,12 +143,7 @@ protected:
} // namespace
-/*
- *
- * EntryCache implementation.
- *
- *==*/
-
+// EntryCache implementation
EntryCache EntryCache::get()
{
static EntryCache g_entry_cache;
@@ -197,7 +175,7 @@ Entry * EntryCache::create (PageHolder const rxPage,
sal_uInt32 nOffset)
void * pAddr = rtl_cache_alloc (m_entry_cache);
if (pAddr != 0)
{
-//
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/framework default_images/introabout desktop/prj desktop/zipintro instsetoo_native/util solenv/bin
default_images/framework/res/beta/backing-beta.png |binary default_images/framework/res/beta/backing.png |binary default_images/framework/res/beta/backing_hc.png|binary default_images/framework/res/beta/backing_rtl_left-beta.png |binary default_images/framework/res/beta/backing_rtl_left.png |binary default_images/framework/res/beta/backing_rtl_left_hc.png |binary default_images/introabout/beta/about.png|binary default_images/introabout/beta/intro.png|binary desktop/prj/d.lst |2 desktop/zipintro/makefile.mk| 13 + instsetoo_native/util/makefile.mk | 30 instsetoo_native/util/openoffice.lst| 60 solenv/bin/replace_in_zip.pl| 87 13 files changed, 191 insertions(+), 1 deletion(-) New commits: commit 44cca168c8a086cb779e1981c14bfccc318f5339 Author: Andre Fischer a...@apache.org Date: Thu Feb 27 09:53:06 2014 + 124311: Merge in revision 1572480 from AOO410: adding 'beta' to product names and images. diff --git a/default_images/framework/res/beta/backing-beta.png b/default_images/framework/res/beta/backing-beta.png new file mode 100755 index 000..4ff3f6d Binary files /dev/null and b/default_images/framework/res/beta/backing-beta.png differ diff --git a/default_images/framework/res/beta/backing.png b/default_images/framework/res/beta/backing.png new file mode 100755 index 000..069dace Binary files /dev/null and b/default_images/framework/res/beta/backing.png differ diff --git a/default_images/framework/res/beta/backing_hc.png b/default_images/framework/res/beta/backing_hc.png new file mode 100755 index 000..f9c2561 Binary files /dev/null and b/default_images/framework/res/beta/backing_hc.png differ diff --git a/default_images/framework/res/beta/backing_rtl_left-beta.png b/default_images/framework/res/beta/backing_rtl_left-beta.png new file mode 100755 index 000..d4d123b Binary files /dev/null and b/default_images/framework/res/beta/backing_rtl_left-beta.png differ diff --git a/default_images/framework/res/beta/backing_rtl_left.png b/default_images/framework/res/beta/backing_rtl_left.png new file mode 100755 index 000..1bab1e7 Binary files /dev/null and b/default_images/framework/res/beta/backing_rtl_left.png differ diff --git a/default_images/framework/res/beta/backing_rtl_left_hc.png b/default_images/framework/res/beta/backing_rtl_left_hc.png new file mode 100755 index 000..696a0ca Binary files /dev/null and b/default_images/framework/res/beta/backing_rtl_left_hc.png differ diff --git a/default_images/introabout/beta/about.png b/default_images/introabout/beta/about.png new file mode 100755 index 000..83f0b35 Binary files /dev/null and b/default_images/introabout/beta/about.png differ diff --git a/default_images/introabout/beta/intro.png b/default_images/introabout/beta/intro.png new file mode 100755 index 000..10f6d6c Binary files /dev/null and b/default_images/introabout/beta/intro.png differ diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst index 074f2c3..c37aea2 100644 --- a/desktop/prj/d.lst +++ b/desktop/prj/d.lst @@ -116,10 +116,12 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_nologo +mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_beta ..\%__SRC%\bin\intro\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip ..\%__SRC%\bin\dev\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.zip ..\%__SRC%\bin\dev_nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo\intro.zip ..\%__SRC%\bin\nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_nologo\intro.zip +..\%__SRC%\bin\beta\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_beta\intro.zip ..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index 2db5c49..9ff1751 100644 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -29,7 +29,7 @@ TARGET=zipintro .INCLUDE : settings.mk -DEFAULT_FLAVOURS=dev dev_nologo nologo intro +DEFAULT_FLAVOURS=dev dev_nologo nologo intro beta ZIP1LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \ @@ -47,6 +47,10 @@ ZIP4LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png $(INTRO_BITMAPS)) \ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) \ $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png +ZIP5LIST= \ +$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/intro.png $(INTRO_BITMAPS)) \ +$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/about.png $(ABOUT_BITMAPS)) \ +
[Libreoffice-commits] core.git: 2 commits - scripting/source sfx2/source
scripting/source/provider/ProviderCache.hxx|2
scripting/source/provider/ScriptingContext.cxx | 104 -
scripting/source/provider/ScriptingContext.hxx | 81 ---
sfx2/source/appl/newhelp.hxx | 23 -
4 files changed, 210 deletions(-)
New commits:
commit 98b829562d37f156fefd23e5756044fc582829ce
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 27 11:08:37 2014 +0100
Remove unused OpenStatusListener_Impl
Unused since a7551a6a18fd46b4e287225c84807f9665db63ab INTEGRATION: CWS
fwk02ea
(1.93.78); FILE MERGED.
Change-Id: I090e8182a91c180bc8d875ba054ec3c94722d699
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 69f92bb..0786654 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -44,29 +44,6 @@ namespace com { namespace sun { namespace star { namespace
text { class XTextRan
#include srchdlg.hxx
-// class OpenStatusListener_Impl -
-
-class OpenStatusListener_Impl : public ::cppu::WeakImplHelper1
::com::sun::star::frame::XDispatchResultListener
-{
-private:
-sal_Boolm_bFinished;
-sal_Boolm_bSuccess;
-Linkm_aOpenLink;
-OUStringm_sURL;
-
-public:
-OpenStatusListener_Impl() : m_bFinished( sal_False ), m_bSuccess(
sal_False ) {}
-
-virtual void SAL_CALL dispatchFinished( const
::com::sun::star::frame::DispatchResultEvent Event )
throw(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject Source )
throw(::com::sun::star::uno::RuntimeException);
-
-inline sal_Bool IsFinished() const { return m_bFinished; }
-inline sal_Bool IsSuccessful() const { return m_bSuccess; }
-inline void SetURL( const OUString rURL ) { m_sURL = rURL; }
-inline OUString GetURL() const { return m_sURL; }
-inline void SetOpenHdl( const Link rLink ) { m_aOpenLink =
rLink; }
-};
-
// ContentListBox_Impl ---
class ContentListBox_Impl : public SvTreeListBox
commit 5133b4460176fbf9f382753efe263f4832eee7b6
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 27 10:53:00 2014 +0100
Remove unused ScriptingContext
Unused and not even built since 11ddfdb8563901bf515fa2eb07fa27244cc58ced/
4516589f91e03fa5d8589a52ed8b72af8f9e4521 INTEGRATION: CWS scriptingf2
(1.7.2);
FILE MERGED.
Change-Id: I06eec282877a91955b3f20109c3c1189b660f2da
diff --git a/scripting/source/provider/ProviderCache.hxx
b/scripting/source/provider/ProviderCache.hxx
index 2d15e88..6e48e71 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -33,8 +33,6 @@
#include com/sun/star/frame/XModel.hpp
#include com/sun/star/script/provider/XScriptProvider.hpp
-#include ScriptingContext.hxx
-
namespace func_provider
{
diff --git a/scripting/source/provider/ScriptingContext.cxx
b/scripting/source/provider/ScriptingContext.cxx
deleted file mode 100644
index 1e02748..000
--- a/scripting/source/provider/ScriptingContext.cxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include com/sun/star/beans/PropertyAttribute.hpp
-#include com/sun/star/frame/XModel.hpp
-
-#include cppuhelper/implementationentry.hxx
-#include cppuhelper/factory.hxx
-
-#include util/scriptingconstants.hxx
-
-#include ScriptingContext.hxx
-
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
-#define DOC_REF_PROPID 1
-#define DOC_STORAGE_ID_PROPID 2
-#define DOC_URI_PROPID 3
-#define RESOLVED_STORAGE_ID_PROPID 4
-#define SCRIPT_INFO_PROPID 5
-#define SCRIPTINGCONTEXT_DEFAULT_ATTRIBS()
beans::PropertyAttribute::TRANSIENT | beans::PropertyAttribute::MAYBEVOID
-namespace func_provider
-{
-
-
-// XScriptingContext implementation
-
-
-ScriptingContext::ScriptingContext( const Reference XComponentContext
xContext ) : //ScriptingContextImpl_BASE( GetMutex()),
-
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/plugin.cxx|2 --
compilerplugins/clang/plugin.hxx|2 --
compilerplugins/clang/pluginhandler.cxx |1 -
compilerplugins/clang/store/referencecasting.cxx|2 --
compilerplugins/clang/store/rtlconstasciimacro.cxx |1 -
compilerplugins/clang/store/svstreamoutputoperators.cxx |1 -
6 files changed, 9 deletions(-)
New commits:
commit 15e0b08ab524e6132ef2792db91a2ae5671d9539
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:55:35 2014 +0100
Remove visual noise from compilerplugins
Change-Id: Ibfed0b64bd60804fa377b5e25e5f197a7772d605
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 48c9843..f319e60 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -151,8 +151,6 @@ SourceLocation Plugin::locationAfterToken( SourceLocation
location )
return Lexer::getLocForEndOfToken( location, 0,
compiler.getSourceManager(), compiler.getLangOpts());
}
-/
-
RewritePlugin::RewritePlugin( const InstantiationData data )
: Plugin( data )
, rewriter( data.rewriter )
diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index b70fd78..afdecdd 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -164,8 +164,6 @@ class RegistrationCreate
template typename T, bool static T* create( const
Plugin::InstantiationData data );
};
-/
-
inline
Plugin::~Plugin()
{
diff --git a/compilerplugins/clang/pluginhandler.cxx
b/compilerplugins/clang/pluginhandler.cxx
index 361f12c..065bd1a 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -252,7 +252,6 @@ bool LibreOfficeAction::ParseArgs( const CompilerInstance,
const vector string
return true;
}
-
static FrontendPluginRegistry::Add loplugin::LibreOfficeAction X(
loplugin, LibreOffice compile check plugin );
} // namespace
diff --git a/compilerplugins/clang/store/referencecasting.cxx
b/compilerplugins/clang/store/referencecasting.cxx
index c957367..113002c 100644
--- a/compilerplugins/clang/store/referencecasting.cxx
+++ b/compilerplugins/clang/store/referencecasting.cxx
@@ -32,7 +32,6 @@ I have logged a bug here:
http://llvm.org/bugs/show_bug.cgi?id=15902
*/
-
ReferenceCasting::ReferenceCasting( CompilerInstance compiler )
: Plugin( compiler )
{
@@ -189,7 +188,6 @@ static const Type* extractTemplateType(Expr* cce)
return templateParamQT.getTypePtr();
}
-
static Plugin::Registration ReferenceCasting X( referencecasting );
} // namespace
diff --git a/compilerplugins/clang/store/rtlconstasciimacro.cxx
b/compilerplugins/clang/store/rtlconstasciimacro.cxx
index be627f9..482c9ad 100644
--- a/compilerplugins/clang/store/rtlconstasciimacro.cxx
+++ b/compilerplugins/clang/store/rtlconstasciimacro.cxx
@@ -59,7 +59,6 @@ void RtlConstAsciiMacro::run()
TraverseDecl( compiler.getASTContext().getTranslationUnitDecl());
}
-
#if __clang_major__ 3 || __clang_major__ == 3 __clang_minor__ 3
void RtlConstAsciiMacro::MacroExpands( const Token macro, const MacroInfo*,
SourceRange range )
#else
diff --git a/compilerplugins/clang/store/svstreamoutputoperators.cxx
b/compilerplugins/clang/store/svstreamoutputoperators.cxx
index 9cdc4b2..dcabbf5 100644
--- a/compilerplugins/clang/store/svstreamoutputoperators.cxx
+++ b/compilerplugins/clang/store/svstreamoutputoperators.cxx
@@ -217,7 +217,6 @@ SourceLocation SvStreamOutputOperators::after( const
SourceLocation loc )
return Lexer::getLocForEndOfToken( loc, 0,
compiler.getASTContext().getSourceManager(),
compiler.getASTContext().getLangOpts() );
}
-
static Plugin::Registration SvStreamOutputOperators X(
svstreamoutputoperators );
} // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/resourcemodel/resourcemodel.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit e3283f9f059b2b9d766319beaff5e2e94eb5c43b Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Feb 27 11:17:49 2014 +0100 writerfilter: unused global string Change-Id: I85afca0a74516375958aeb93919e55fd3b7cf7a7 diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx index 23abf4c..24b6aa1 100644 --- a/writerfilter/source/resourcemodel/resourcemodel.cxx +++ b/writerfilter/source/resourcemodel/resourcemodel.cxx @@ -41,7 +41,6 @@ public: ResourceModelOutputWithDepth output; -string gInfo = ; // --- WW8TableDataHandler - class TablePropsRef : public writerfilter::ReferenceProperties ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How many connection UNO can handle?
On 02/26/2014 11:39 PM, Alexandre Vicenzi wrote: How many connections a single UNO server can handle? And how many UNO servers LibreOffice can start at the same time? An --accept=... argument to LO keeps listening for new connections concurrently with any already established connections, there is no fixed limit. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/inc/srcedtw.hxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 344c2dca6f460c54e715fcf818d951ff252c48af
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 27 12:42:18 2014 +0100
SwSrcEditWindow::Read/Write return value is never used anyway
Change-Id: I9b4064c1e08db9ac0bf48e1aa19e03b8bb495060
diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx
index 8f40120..40d42ee 100644
--- a/sw/source/ui/inc/srcedtw.hxx
+++ b/sw/source/ui/inc/srcedtw.hxx
@@ -121,10 +121,8 @@ public:
voidSetScrollBarRanges();
voidInitScrollBars();
-sal_uLong Read( SvStream rInput)
-{return pTextEngine-Read(rInput) ? 1 : 0;}
-sal_uLong Write( SvStream rOutput)
-{return pTextEngine-Write(rOutput) ? 1 : 0;}
+voidRead(SvStream rInput) { pTextEngine-Read(rInput); }
+voidWrite(SvStream rOutput) { pTextEngine-Write(rOutput); }
ExtTextView*GetTextView()
{return pTextView;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: embeddedobj/source
embeddedobj/source/msole/oleembed.cxx|6 --
embeddedobj/source/msole/olemisc.cxx | 22 --
embeddedobj/source/msole/olepersist.cxx |5 -
embeddedobj/source/msole/oleregister.cxx |3 +++
embeddedobj/source/msole/olevisual.cxx |6 +-
5 files changed, 32 insertions(+), 10 deletions(-)
New commits:
commit e74a09929d4771972913a3ebcdd6df042f871fca
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 27 12:51:43 2014 +0100
Exclude WNT-specific includes on other platforms
Change-Id: I7eeae61275269e09092267f2a6ccb27d7bb91ddb
diff --git a/embeddedobj/source/msole/oleembed.cxx
b/embeddedobj/source/msole/oleembed.cxx
index 244c543..fe21086 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -50,10 +50,12 @@
#include targetstatecontrol.hxx
-#include olecomponent.hxx
-
#include ownview.hxx
+#if defined WNT
+#include olecomponent.hxx
+#endif
+
using namespace ::com::sun::star;
#ifdef WNT
diff --git a/embeddedobj/source/msole/olemisc.cxx
b/embeddedobj/source/msole/olemisc.cxx
index ee5b9b7..9215e10 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+
+#include cassert
+
#include com/sun/star/embed/EmbedUpdateModes.hpp
#include com/sun/star/embed/EmbedStates.hpp
#include com/sun/star/lang/XComponent.hpp
@@ -25,10 +29,13 @@
#include cppuhelper/interfacecontainer.h
#include oleembobj.hxx
-#include olecomponent.hxx
#include ownview.hxx
+#if defined WNT
+#include olecomponent.hxx
+#endif
+
using namespace ::com::sun::star;
sal_Bool KillFile_Impl( const OUString aURL, const uno::Reference
lang::XMultiServiceFactory xFactory );
@@ -380,14 +387,17 @@ uno::Reference util::XCloseable SAL_CALL
OleEmbeddedObject::getComponent()
uno::Reference uno::XInterface (
static_cast ::cppu::OWeakObject* (this) ) );
}
-if ( !m_pOleComponent )
+#if defined WNT
+if (m_pOleComponent != 0)
{
-// TODO/LATER: Is it correct???
-return uno::Reference util::XCloseable ();
-// throw uno::RuntimeException(); // TODO
+return uno::Reference util::XCloseable ( static_cast
::cppu::OWeakObject* ( m_pOleComponent ), uno::UNO_QUERY );
}
+#endif
-return uno::Reference util::XCloseable ( static_cast
::cppu::OWeakObject* ( m_pOleComponent ), uno::UNO_QUERY );
+assert(m_pOleComponent == 0);
+// TODO/LATER: Is it correct???
+return uno::Reference util::XCloseable ();
+// throw uno::RuntimeException(); // TODO
}
diff --git a/embeddedobj/source/msole/olepersist.cxx
b/embeddedobj/source/msole/olepersist.cxx
index e3c17be..915a89a 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -43,9 +43,12 @@
#include comphelper/classids.hxx
#include osl/thread.hxx
-#include olecomponent.hxx
#include closepreventer.hxx
+#if defined WNT
+#include olecomponent.hxx
+#endif
+
using namespace ::com::sun::star;
using namespace ::comphelper;
diff --git a/embeddedobj/source/msole/oleregister.cxx
b/embeddedobj/source/msole/oleregister.cxx
index c9bca29..d983f4b 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -22,7 +22,10 @@
#include cppuhelper/factory.hxx
#include xolefactory.hxx
+
+#if defined WNT
#include xdialogcreator.hxx
+#endif
using namespace ::com::sun::star;
diff --git a/embeddedobj/source/msole/olevisual.cxx
b/embeddedobj/source/msole/olevisual.cxx
index 0e56fd1..76ed05d 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -26,10 +26,14 @@
#include com/sun/star/embed/NoVisualAreaSizeException.hpp
#include oleembobj.hxx
-#include olecomponent.hxx
+//#include olecomponent.hxx
#include comphelper/mimeconfighelper.hxx
#include comphelper/seqstream.hxx
+#if defined WNT
+#include olecomponent.hxx
+#endif
+
using namespace ::com::sun::star;
using namespace ::comphelper;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #63 from Michael Stahl mst...@redhat.com --- (In reply to comment #62) Can I get this patch and correct to reapply the changes I've made? Or I need to create a new patch? something like git revert 4137f39d7b13c0ad2e649d7efb02ecfc14a31a25 followed by git checkout HEAD~ files-that-contain-unwanted-changes, then git commit --amend should probably work... -- 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: codemaker/source
codemaker/source/codemaker/global.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0bb7b87a7e0b810ac9ff4d4da0bbf7c7c273fb19
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:51:20 2014 +0100
Remove visual noise from codemaker
Change-Id: I098c636ed8794c858317fdbefa9ffa1c6d81c320
Reviewed-on: https://gerrit.libreoffice.org/8241
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/codemaker/source/codemaker/global.cxx
b/codemaker/source/codemaker/global.cxx
index 9549763..9ec4d6b 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -269,9 +269,9 @@ OUString convertToFileUrl(const OString fileName)
}
-//*
+
// FileStream
-//*
+
FileStream::FileStream()
: m_file(NULL)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppu/source
cppu/source/cppu/cppu_opt.cxx|6 ++--
cppu/source/threadpool/current.cxx | 12
cppu/source/threadpool/current.hxx |2 -
cppu/source/threadpool/thread.hxx|4 +-
cppu/source/typelib/static_types.cxx | 14 +-
cppu/source/typelib/typelib.cxx | 10 +++
cppu/source/uno/any.cxx | 16 +--
cppu/source/uno/assign.hxx | 14 +-
cppu/source/uno/constr.hxx | 10 +++
cppu/source/uno/copy.hxx | 20 +++---
cppu/source/uno/data.cxx | 48 +--
cppu/source/uno/destr.hxx| 18 ++---
cppu/source/uno/eq.hxx | 16 +--
cppu/source/uno/lbenv.cxx| 22
cppu/source/uno/lbmap.cxx| 26 +-
cppu/source/uno/prim.hxx | 20 +++---
cppu/source/uno/sequence.cxx | 16 +--
17 files changed, 137 insertions(+), 137 deletions(-)
New commits:
commit f480f26e619a4d17f790200b0c38584bbd356893
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 18:01:43 2014 +0100
Remove visual noise from cppu
Change-Id: Ib776a6e5397eb9731cf908c4015642c29b320ff6
Reviewed-on: https://gerrit.libreoffice.org/8247
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx
index dfe092e..2d53721 100644
--- a/cppu/source/cppu/cppu_opt.cxx
+++ b/cppu/source/cppu/cppu_opt.cxx
@@ -25,7 +25,7 @@
using namespace ::rtl;
-//##
+
extern C CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg(
typelib_TypeDescriptionReference * pType )
SAL_THROW_EXTERN_C()
@@ -39,7 +39,7 @@ extern C CPPU_DLLPUBLIC rtl_uString * SAL_CALL
cppu_unsatisfied_iquery_msg(
return ret.pData;
}
-//##
+
extern C CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg(
typelib_TypeDescriptionReference * pType )
SAL_THROW_EXTERN_C()
@@ -53,7 +53,7 @@ extern C CPPU_DLLPUBLIC rtl_uString * SAL_CALL
cppu_unsatisfied_iset_msg(
return ret.pData;
}
-//##
+
extern C CPPU_DLLPUBLIC rtl_uString * SAL_CALL
cppu_Any_extraction_failure_msg(
uno_Any * pAny, typelib_TypeDescriptionReference * pType )
SAL_THROW_EXTERN_C()
diff --git a/cppu/source/threadpool/current.cxx
b/cppu/source/threadpool/current.cxx
index bb64202..9ae55e9 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -93,9 +93,9 @@ static typelib_InterfaceTypeDescription *
get_type_XCurrentContext()
return s_type_XCurrentContext;
}
-//##
-//==
+
+
class ThreadKey
{
bool _bInit;
@@ -137,7 +137,7 @@ inline oslThreadKey ThreadKey::getThreadKey() SAL_THROW(())
return _hThreadKey;
}
-//==
+
extern C void SAL_CALL delete_IdContainer( void * p )
{
if (p)
@@ -158,7 +158,7 @@ extern C void SAL_CALL delete_IdContainer( void * p )
delete pId;
}
}
-//==
+
IdContainer * getIdContainer() SAL_THROW(())
{
static ThreadKey s_key( delete_IdContainer );
@@ -178,7 +178,7 @@ IdContainer * getIdContainer() SAL_THROW(())
}
-//##
+
extern C CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_setCurrentContext(
void * pCurrentContext,
rtl_uString * pEnvTypeName, void * pEnvContext )
@@ -226,7 +226,7 @@ extern C CPPU_DLLPUBLIC sal_Bool SAL_CALL
uno_setCurrentContext(
}
return sal_True;
}
-//##
+
extern C CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_getCurrentContext(
void ** ppCurrentContext, rtl_uString * pEnvTypeName, void * pEnvContext )
SAL_THROW_EXTERN_C()
diff --git a/cppu/source/threadpool/current.hxx
b/cppu/source/threadpool/current.hxx
index f425fd3..a238f9f 100644
--- a/cppu/source/threadpool/current.hxx
+++ b/cppu/source/threadpool/current.hxx
@@ -32,7 +32,7 @@ struct IdContainer
{
void * pCurrentContext;
uno_ExtEnvironment * pCurrentContextEnv;
-//
+
boolbInit;
sal_Sequence * pLocalThreadId;
sal_Int32
[Libreoffice-commits] core.git: cli_ure/readme.txt cli_ure/source
cli_ure/readme.txt |4 ++--
cli_ure/source/climaker/climaker_app.cxx | 14 +++---
cli_ure/source/climaker/climaker_share.h |8
cli_ure/source/native/native_share.h |4 ++--
cli_ure/source/uno_bridge/cli_base.h |6 +++---
cli_ure/source/uno_bridge/cli_bridge.cxx |4 ++--
cli_ure/source/uno_bridge/cli_bridge.h |2 +-
cli_ure/source/uno_bridge/cli_proxy.cxx |2 +-
8 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 1712e6c614ca23fd5b895dc30df8d20cc69d8958
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:47:56 2014 +0100
Remove visual noise from cli_ure
Change-Id: I1ddada46767b2840c663a0a077e1b723f9645b56
Reviewed-on: https://gerrit.libreoffice.org/8240
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/cli_ure/readme.txt b/cli_ure/readme.txt
index 4ba8bee..1f4d848 100644
--- a/cli_ure/readme.txt
+++ b/cli_ure/readme.txt
@@ -102,10 +102,10 @@ Step 5: Changing the versions in the unoil module
The unoil module builds the cli_oootypes.dll which contains the office types
(offapi). Change the contents
of unoil/climaker/version.txt similar to the versions.txt in this module. Then
rebuild the module
-//==
+
The automatic test in cli_ure/qa/versioning should be extended. See the
readme.txt in that directory
for more information.
-//=
+
diff --git a/cli_ure/source/climaker/climaker_app.cxx
b/cli_ure/source/climaker/climaker_app.cxx
index c8771d6..8c416d6 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -112,7 +112,7 @@ static const OptionInfo s_option_infos [] = {
{ RTL_CONSTASCII_STRINGPARAM(help), 'h', false }
};
-//==
+
static OptionInfo const * get_option_info(
OUString const opt, sal_Unicode copt = '\0' )
{
@@ -145,7 +145,7 @@ static OptionInfo const * get_option_info(
return 0;
}
-//==
+
static bool is_option(
OptionInfo const * option_info, sal_uInt32 * pIndex )
{
@@ -181,7 +181,7 @@ static bool is_option(
return false;
}
-//==
+
static inline bool read_option(
bool * flag, OptionInfo const * option_info, sal_uInt32 * pIndex )
{
@@ -191,7 +191,7 @@ static inline bool read_option(
return ret;
}
-//==
+
static bool read_argument(
OUString * pValue, OptionInfo const * option_info, sal_uInt32 * pIndex )
{
@@ -213,7 +213,7 @@ static bool read_argument(
return false;
}
-//==
+
static OUString const path_get_working_dir()
{
static OUString s_workingDir;
@@ -222,7 +222,7 @@ static OUString const path_get_working_dir()
return s_workingDir;
}
-//==
+
static OUString path_make_absolute_file_url( OUString const path )
{
OUString file_url;
@@ -256,7 +256,7 @@ static OUString path_make_absolute_file_url( OUString const
path )
using namespace ::climaker;
-//##
+
SAL_IMPLEMENT_MAIN()
{
sal_uInt32 nCount = osl_getCommandArgCount();
diff --git a/cli_ure/source/climaker/climaker_share.h
b/cli_ure/source/climaker/climaker_share.h
index 85ed6fc..700321a 100644
--- a/cli_ure/source/climaker/climaker_share.h
+++ b/cli_ure/source/climaker/climaker_share.h
@@ -35,7 +35,7 @@
namespace climaker
{
-//--
+
extern bool g_verbose;
ref struct Constants
@@ -79,13 +79,13 @@ ref struct Constants
};
-//--
+
inline ::System::String ^ ustring_to_String( OUString const ustr )
{
return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() );
}
-//--
+
inline OUString String_to_ustring( ::System::String ^ str )
{
OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) );
@@ -108,7 +108,7 @@ static ::System::Reflection::MethodAttributes
c_ctor_method_attr =
/* | xxx todo: ??? compiler does not know Instance ???
::System::Reflection::MethodAttributes::Instance*/);
-//==
+
ref class TypeEmitter : public ::System::IDisposable
{
::System::Reflection::Emit::ModuleBuilder ^ m_module_builder;
diff --git a/cli_ure/source/native/native_share.h
b/cli_ure/source/native/native_share.h
index
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #64 from Alexandre Vicenzi vicenzi.alexan...@gmail.com --- Thanks Michael. -- 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: padmin/source
padmin/source/pamain.cxx | 54 ++-
1 file changed, 30 insertions(+), 24 deletions(-)
New commits:
commit c828e3cc409077a1916911b8abf1d7b8dbb2078a
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 27 13:18:36 2014 +0100
fdo#75540 setProcessServiceFactory must be called before InitVCL
...because InitVCL now calls:
comphelper::getProcessServiceFactory
comphelper::getProcessComponentContext
utl::DefaultFontConfiguration::DefaultFontConfiguration
rtl::Staticutl::DefaultFontConfiguration, (anonymous
namespace)::theDefaultFontConfiguration::get
utl::DefaultFontConfiguration::get
ImplStyleData::SetStandardStyles
ImplStyleData::ImplStyleData
boost::make_sharedImplStyleData
StyleSettings::StyleSettings
ImplAllSettingsData::ImplAllSettingsData
boost::make_sharedImplAllSettingsData
AllSettings::AllSettings
Application::InitSettings
Application::GetSettings
GtkInstance::AfterAppInit
InitVCL
ImplSVMain
SVMain
sal_main
main
and Application::Main is only called after InitVCL.
Change-Id: I1126e33f454a4ea35ef295cbd3f48429c473efb4
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 6893776..a1f6c31 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -52,6 +52,11 @@ public:
virtual sal_uInt16 Exception( sal_uInt16 nError );
static OUString ReadStringHook( const OUString );
+
+private:
+virtual void Init() SAL_OVERRIDE;
+
+Reference XComponentContext xCtx_;
};
void vclmain::createApplication()
@@ -85,35 +90,13 @@ int MyApp::Main()
EnableAutoHelpId();
-
-// create the global service-manager
-
-Reference XComponentContext xCtx;
-Reference XMultiServiceFactory xFactory;
-try
-{
-xCtx = defaultBootstrap_InitialComponentContext();
-xFactory = Reference XMultiServiceFactory (
xCtx-getServiceManager(), UNO_QUERY );
-if( xFactory.is() )
-setProcessServiceFactory( xFactory );
-}
-catch( const com::sun::star::uno::Exception )
-{
-}
-
-if( ! xFactory.is() )
-{
-fprintf( stderr, Could not bootstrap UNO, installation must be in
disorder. Exiting.\n );
-exit( 1 );
-}
-
// Detect desktop environment - need to do this as early as possible
com::sun::star::uno::setCurrentContext(
new DesktopContext( com::sun::star::uno::getCurrentContext() ) );
// Create UCB (for backwards compatibility, in case some code still uses
// plain createInstance w/o args directly to obtain an instance):
-com::sun::star::ucb::UniversalContentBroker::create(xCtx);
+com::sun::star::ucb::UniversalContentBroker::create(xCtx_);
/*
* Initialize the MSAA UNO AccessBridge if accessibility is turned on
@@ -138,7 +121,7 @@ int MyApp::Main()
*/
try
{
-ReferenceXComponent xComp(xCtx, UNO_QUERY_THROW);
+ReferenceXComponent xComp(xCtx_, UNO_QUERY_THROW);
xComp-dispose();
}
catch(...)
@@ -148,4 +131,27 @@ int MyApp::Main()
return EXIT_SUCCESS;
}
+void MyApp::Init()
+{
+// create the global service-manager
+
+Reference XMultiServiceFactory xFactory;
+try
+{
+xCtx_ = defaultBootstrap_InitialComponentContext();
+xFactory = Reference XMultiServiceFactory (
xCtx_-getServiceManager(), UNO_QUERY );
+if( xFactory.is() )
+setProcessServiceFactory( xFactory );
+}
+catch( const com::sun::star::uno::Exception )
+{
+}
+
+if( ! xFactory.is() )
+{
+fprintf( stderr, Could not bootstrap UNO, installation must be in
disorder. Exiting.\n );
+exit( 1 );
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/OutlineView.hxx |4 +++-
sd/source/ui/view/outlnvsh.cxx |3 ++-
sd/source/ui/view/outlview.cxx | 27 +++
3 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit 44c90b3d754faa3a0622423f4839194c85e219fa
Author: Rob Snelders programm...@ertai.nl
Date: Mon Feb 3 19:53:40 2014 +0100
Improve usability of the outline
If you had data in the outline and would scroll to the bottom then it would
be
an empty view at the bottom. The width of the outline was defined as a fixed
with twice. Once in the outlnvsh and one (even smaller) in the outlview. I
have
changed the with of the outlview to take the with of the outlnvsh.
Change-Id: I1376a135acd92dbe8966b29ccb075e6b74412a8c
Reviewed-on: https://gerrit.libreoffice.org/7832
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 056c8f7..bc81379 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -111,7 +111,7 @@ public:
DECL_LINK( EndDropHdl, void * );
DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo* );
-sal_uLong GetPaperWidth() const { return 2*21000; } // DIN A4
Breite
+sal_uLong GetPaperWidth();
sal_Bool PrepareClose(sal_Bool bUI = sal_True);
@@ -188,6 +188,8 @@ private:
sal_BoolmbFirstPaint;
+sal_uLong mnPaperWidth;
+
SfxProgress*mpProgress;
/** stores the last used document color.
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index b44e1df..6e833df 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -299,7 +299,8 @@ void OutlineViewShell::ArrangeGUIElements ()
Rectangle aText = Rectangle(Point(0,0),
Size(pOlView-GetPaperWidth(),
pOlView-GetOutliner()-GetTextHeight()));
-aText.Bottom() += aWin.GetHeight();
+if (aWin.GetHeight() aText.Bottom())
+aText.Bottom() = aWin.GetHeight();
if (!aWin.IsEmpty())// not when opening
{
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 7ddf67d..0288c16 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -73,9 +73,6 @@ using namespace ::com::sun::star::frame;
namespace sd {
-// width: DIN A4, two margins at 1 cm each
-#define OUTLINE_PAPERWIDTH 19000
-
// a progress bar gets displayed when more than
// PROCESS_WITH_PROGRESS_THRESHOLD pages are concerned
#define PROCESS_WITH_PROGRESS_THRESHOLD 5
@@ -90,9 +87,9 @@ struct SdParaAndPos
TYPEINIT1( OutlineView, ::sd::View );
-OutlineView::OutlineView( DrawDocShell rDocSh, ::Window* pWindow,
OutlineViewShell rOutlineViewSh)
-: ::sd::View(*rDocSh.GetDoc(), pWindow, rOutlineViewSh)
-, mrOutlineViewShell(rOutlineViewSh)
+OutlineView::OutlineView( DrawDocShell rDocSh, ::Window* pWindow,
OutlineViewShell rOutlineViewShell)
+: ::sd::View(*rDocSh.GetDoc(), pWindow, rOutlineViewShell)
+, mrOutlineViewShell(rOutlineViewShell)
, mrOutliner(*mrDoc.GetOutliner(sal_True))
, mnPagesToProcess(0)
, mnPagesProcessed(0)
@@ -109,8 +106,9 @@ OutlineView::OutlineView( DrawDocShell rDocSh, ::Window*
pWindow, OutlineViewSh
bInitOutliner = sal_True;
mrOutliner.Init( OUTLINERMODE_OUTLINEVIEW );
mrOutliner.SetRefDevice( SD_MOD()-GetRefDevice( rDocSh ) );
-sal_uLong nWidth = OUTLINE_PAPERWIDTH;
-mrOutliner.SetPaperSize(Size(nWidth, 4));
+//viewsize without the width of the image and number in front
+mnPaperWidth =
(mrOutlineViewShell.GetActiveWindow()-GetViewSize().Width() - 4000);
+mrOutliner.SetPaperSize(Size(mnPaperWidth, 4));
}
// insert View into Outliner
@@ -798,16 +796,16 @@ IMPL_LINK_NOARG(OutlineView, StatusEventHdl)
::sd::Window* pWin = mrOutlineViewShell.GetActiveWindow();
OutlinerView* pOutlinerView = GetViewByWindow(pWin);
Rectangle aVis = pOutlinerView-GetVisArea();
-sal_uLong nWidth = OUTLINE_PAPERWIDTH;
Rectangle aText = Rectangle(Point(0,0),
- Size(nWidth,
-mrOutliner.GetTextHeight()));
+Size(mnPaperWidth,
+ mrOutliner.GetTextHeight()));
Rectangle aWin(Point(0,0), pWin-GetOutputSizePixel());
aWin = pWin-PixelToLogic(aWin);
if (!aVis.IsEmpty())// not when opening
{
-aText.Bottom() += aWin.GetHeight();
+if (aWin.GetHeight() aText.Bottom())
+aText.Bottom() = aWin.GetHeight();
mrOutlineViewShell.InitWindows(Point(0,0), aText.GetSize(),
Point(aVis.TopLeft()));
@@ -1044,6
[Libreoffice-commits] core.git: eventattacher/source
eventattacher/source/eventattacher.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9fd15d9e37678056341abfc74e15edb27acf95de Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Feb 27 12:22:36 2014 +0100 eventattacher: fix out of bounds string access Change-Id: Ic1f7ac2b6c3f5a865b316a83d92a0f2ff7616f5c diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 08da9e3..d7f4715 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -624,7 +624,7 @@ ReferenceXEventListener EventAttacherImpl::attachListenerForTarget( else nIndex++; -OUString aListenerName = (aListenerType[nIndex] == 'X') ? aListenerType.copy(nIndex+1) : aListenerType; +OUString aListenerName = (!aListenerType.isEmpty() aListenerType[nIndex] == 'X') ? aListenerType.copy(nIndex+1) : aListenerType; OUString aAddListenerName = add + aListenerName; // Send Methods to the correct addListener-Method ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/jmux/master+fixes'
New branch 'private/jmux/master+fixes' available with the following commits: commit b8a07016908f418d97483b7e88319290320bbf6d Author: Jan-Marek Glogowski glo...@fbihome.de Date: Thu Feb 27 08:54:57 2014 + KDE4: try hard to paint any rect for menus Current Oxygen theme doesn't draw rects for menus, but uses shaped and colored background images. As a workaround paint window and menu rects for menus - currently any painted rect is better then no rect at all. Change-Id: I4d553ea58cac2729826f8395cb2597fa200187b6 commit c11deb60cabfa8e7ee511b94abb0e19601b42fe6 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Thu Feb 27 08:51:00 2014 + KDE4: Report correct check and radio item sizes Use the correct sizs from the current style. Change-Id: I7e163bdc8d467baf2d6e3d0d2bc3e1da7558cf42 commit 3cd6781ae8ed2283d8895092657d4020d453c5d9 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Wed Feb 26 18:19:11 2014 + KDE4: Freeze yield for native file picker dialogs As it seems to be the only way to poll the clipboard, reintroduce m_pApplication-clipboard()-setProperty( useEventLoopWhenWaiting, true ); To prevent crashes disable Yielding while the dialog is open. This keeps the FP dialogs kind of usable, but feels like a horrible workaround. Change-Id: I10c422f1c0d7448d4a7ad28e57a32ed2cb42f48f commit b4f7f9c9322a85ff3bee141a3dfb5dedbdb16543 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Wed Feb 26 16:34:55 2014 + KDE4: fix boolean prototypes in signal connections Fix missed connect function prototypes from the sal_Bool - bool conversation of the vcl module. Change-Id: I33d930e260940bc9f300b83b14355b2dd7903ca7 commit 7b083444942b1d5890b51a1f4a8560ba4e411e46 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Wed Feb 26 17:02:38 2014 +0200 KDE4: Drop Qt 4.9 support I don't think there will ever be any 4.9 release, so drop all the unused code. Change-Id: I4b72de96e6064240582cd83d4e45547096a2efb0 commit de77e0d80029114f2dae15c3f10f1bed2510e141 Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Tue Oct 15 14:54:40 2013 +0200 sw/docx export: fix handling of document with header and section(s) This fix 2 issues: * header loss * text after section moved to a new page Change-Id: I0692100513cc21e75203a8befc21804885f66a76 commit a2b76750d3de04def20d777104d5a7a49a12ee66 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Mon Jan 20 11:11:53 2014 + Drop GtkScrolledWindow from GtkTextView GtkTextView is mapped to VclMultiLineEdit, which manages its own scrolling, so we can drop all GtkScrolledWindow references. Change-Id: I046a23b22e88d34997dd7b6e7e822fd89e2685be commit 2fc86456ac592e869d408c152b7f5f3e4361b3b7 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Tue Dec 24 20:18:41 2013 +0100 Use exceptions for correct mail error handling If we're missing the eMail column we're to deep inside the code for a simple return on error. So this uses a try .. catch block and a private exception to cleanup after an error. Change-Id: Ice042f9cab0037e7aac0bd6940ae9b863ed849d2 commit 4bfaf90b63a2d3eac026e66ee8b8fddf8c42d7a5 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Tue Dec 24 19:58:06 2013 +0100 Clarify mail merge cancel and error handling A mail merge cancel is no error. So we actually test both booleand in the loop and don't set cancel on error. Change-Id: Icb7722c3758c1db984fa683a6b6a9eb9120ff925 commit d1e621d2ed3047e567ba07a5a98f397127165e48 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Thu Nov 14 11:51:14 2013 +0100 Implement Qt single event processing. This implements the expected single event processing in the processYield function. It uses an eventFilter, which exits the processing loop after the first event. Currently the code results in refresh problems, so it's disabled. Change-Id: I06988223990fcae08254be346f9e1fe679130371 commit e9007782138ef04f8b363c76ee1592b91983313d Author: Jan-Marek Glogowski glo...@fbihome.de Date: Fri Nov 15 14:51:09 2013 +0100 Simplify KDE4 yielding. QAbstractEventDispatcher::processEvents always processes all pending events, so we can ignore the the second Yield parameter (bHandleAllCurrentEvents). Change-Id: I49a70ed13d0215b89f48eed93d78eef2f083dc0d commit a3930f9e6e0c88f39a810ec4ec7733ef0af5772c Author: Maxime de Roucy mdero...@linagora.com Date: Tue Jan 7 09:31:11 2014 +0100 API remove image : change document state #i74651# Now when an image is removed from a Calc document using the API it changes the modified state of the document. Change-Id: I5dad550ec78a12227f3fb04fd934c7d0c5066a9f ___
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/cuihyperdlg.cxx | 12 +---
cui/source/dialogs/hlmarkwn.cxx| 10 +-
cui/source/dialogs/hlmarkwn.hrc|2 +-
cui/source/dialogs/hlmarkwn.src|4 ++--
cui/source/inc/cuihyperdlg.hxx |2 +-
cui/source/inc/hlmarkwn.hxx|4 ++--
6 files changed, 16 insertions(+), 18 deletions(-)
New commits:
commit 65453d5aebdf851034632d5593f0a1023f7015fe
Author: pje335_NL meulentho...@gmail.com
Date: Wed Feb 26 11:48:56 2014 +0100
Undoing changed made on fdo#63271 because of complains.
Change-Id: I504676db3e692072f9c4d6a265877133ae97f288
Please enter the commit message for your changes. Lines starting
Reviewed-on: https://gerrit.libreoffice.org/8376
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/dialogs/cuihyperdlg.cxx
b/cui/source/dialogs/cuihyperdlg.cxx
index e93ce96..1c7bccb 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -131,7 +131,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings*
pBindings)
GetOKButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) );
GetCancelButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) );
-GetOKButton().SetClickHdl( LINK ( this, SvxHpLinkDlg, ClickOkHdl_Impl
) );
+GetOKButton().SetClickHdl( LINK ( this, SvxHpLinkDlg,
ClickApplyHdl_Impl ) );
GetCancelButton().SetClickHdl( LINK ( this, SvxHpLinkDlg,
ClickCloseHdl_Impl ) );
}
@@ -213,11 +213,11 @@ void SvxHpLinkDlg::Move()
/*
|*
-|* Click on Ok-button
+|* Click on Apply-button
|*
|/
-IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl)
+IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
{
SfxItemSet aItemSet( SFX_APP()-GetPool(), SID_HYPERLINK_GETLINK,
SID_HYPERLINK_SETLINK );
@@ -231,16 +231,14 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl)
SvxHyperlinkItem *aItem = (SvxHyperlinkItem *)
aItemSet.GetItem (SID_HYPERLINK_SETLINK);
-
-if ( !aItem-GetURL().isEmpty() )
+OUString aStrEmpty;
+if ( aItem-GetURL() != aStrEmpty )
GetDispatcher()-Execute( SID_HYPERLINK_SETLINK,
SFX_CALLMODE_ASYNCHRON |
SFX_CALLMODE_RECORD, aItem, 0L);
( (SvxHyperlinkTabPageBase*)GetTabPage ( GetCurPageId() ) )-DoApply();
}
-Close();
-
return( 0L );
}
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index babcd57..32db420 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -121,7 +121,7 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle rRect )
SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
: ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND )
),
-maBtOk( this, CUI_RES (BT_OK) ),
+maBtApply( this, CUI_RES (BT_APPLY) ),
maBtClose( this, CUI_RES (BT_CLOSE) ),
maLbTree ( this, CUI_RES (TLB_MARK) ),
mbUserMoved ( sal_False ),
@@ -130,9 +130,9 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd(
SvxHyperlinkTabPageBase *pParent )
{
FreeResource();
-maBtOk.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd,
ClickOkHdl_Impl ) );
+maBtApply.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd,
ClickApplyHdl_Impl ) );
maBtClose.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd,
ClickCloseHdl_Impl ) );
-maLbTree.SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd,
ClickOkHdl_Impl ) );
+maLbTree.SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd,
ClickApplyHdl_Impl ) );
// add lines to the Tree-ListBox
maLbTree.SetStyle( maLbTree.GetStyle() | WB_TABSTOP | WB_BORDER |
WB_HASLINES |
@@ -532,11 +532,11 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(OUString aStrMark)
/*
|*
-|* Click on Ok-Button / Doubleclick on item in tree
+|* Click on Apply-Button / Doubleclick on item in tree
|*
|/
-IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickOkHdl_Impl)
+IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl)
{
SvTreeListEntry* pEntry = maLbTree.GetCurEntry();
diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc
index f937981..2c4b6ac 100644
--- a/cui/source/dialogs/hlmarkwn.hrc
+++ b/cui/source/dialogs/hlmarkwn.hrc
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define BT_OK 1
+#define BT_APPLY1
#define BT_CLOSE2
#define TLB_MARK3
#define STR_MARK_TREE 5000
diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src
index c035163..10fc781
[Libreoffice-commits] core.git: cppuhelper/source cppuhelper/test
cppuhelper/source/component.cxx |4 ++--
cppuhelper/source/component_context.cxx |8
cppuhelper/source/exc_thrower.cxx |6 +++---
cppuhelper/source/factory.cxx |2 +-
cppuhelper/source/implbase.cxx |8
cppuhelper/source/implbase_ex.cxx | 26 +-
cppuhelper/source/macro_expander.cxx|2 +-
cppuhelper/source/propshlp.cxx | 26 +-
cppuhelper/source/tdmgr.cxx | 22 +++---
cppuhelper/test/cfg_test.cxx| 18 +-
cppuhelper/test/testimplhelper.cxx | 26 +-
11 files changed, 74 insertions(+), 74 deletions(-)
New commits:
commit 518b75326a83166a24b9d3c1b31ce63189f60c7f
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 18:02:27 2014 +0100
Remove visual noise from cppuhelper
Change-Id: If23a1aa19949f91f900d55ff9e1d5039378d7277
Reviewed-on: https://gerrit.libreoffice.org/8248
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 9ce2cc4..0975b8d 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -36,9 +36,9 @@ using ::rtl::OUStringToOString;
namespace cppu
{
-//
+
// class OComponentHelper
-//
+
OComponentHelper::OComponentHelper( Mutex rMutex ) SAL_THROW(())
: rBHelper( rMutex )
diff --git a/cppuhelper/source/component_context.cxx
b/cppuhelper/source/component_context.cxx
index 7892b69..1e54448 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -284,7 +284,7 @@ static inline void try_dispose( Reference lang::XComponent
const xComp )
}
}
-//==
+
class DisposingForwarder
: public WeakImplHelper1 lang::XEventListener
@@ -324,13 +324,13 @@ void DisposingForwarder::disposing( lang::EventObject
const )
m_xTarget.clear();
}
-//==
+
struct MutexHolder
{
protected:
Mutex m_mutex;
};
-//==
+
class ComponentContext
: private MutexHolder
@@ -806,7 +806,7 @@ ComponentContext::ComponentContext(
}
-//##
+
extern C { static void s_createComponentContext_v(va_list * pParam)
{
ContextEntry_Init const * pEntries = va_arg(*pParam,
ContextEntry_Init const *);
diff --git a/cppuhelper/source/exc_thrower.cxx
b/cppuhelper/source/exc_thrower.cxx
index 4cc2d93..2807487 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -40,7 +40,7 @@ namespace
using cppuhelper::detail::XExceptionThrower;
-//==
+
struct ExceptionThrower : public uno_Interface, XExceptionThrower
{
inline ExceptionThrower();
@@ -183,7 +183,7 @@ class theExceptionThrower : public
rtl::StaticExceptionThrower, theExceptionThr
namespace cppu
{
-//==
+
void SAL_CALL throwException( Any const exc ) SAL_THROW( (Exception) )
{
if (exc.getValueTypeClass() != TypeClass_EXCEPTION)
@@ -211,7 +211,7 @@ void SAL_CALL throwException( Any const exc ) SAL_THROW(
(Exception) )
xThrower-throwException( exc );
}
-//==
+
Any SAL_CALL getCaughtException()
{
Mapping cpp2uno(Environment::getCurrent(), Environment(UNO_LB_UNO));
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 40c1259..9751074 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -1033,7 +1033,7 @@ ReferenceXSingleServiceFactory SAL_CALL
createOneInstanceRegistryFactory(
rServiceManager, rImplementationName, rImplementationKey, true );
}
-//##
+
Reference lang::XSingleComponentFactory SAL_CALL
createSingleComponentFactory(
ComponentFactoryFunc fptr,
OUString const rImplementationName,
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index dbd11f9..9ed1ddf 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -41,7 +41,7 @@ namespace
namespace cppu
{
[Bug 38835] strip out non-trivial globals before main
https://bugs.freedesktop.org/show_bug.cgi?id=38835 --- Comment #6 from Jan Holesovsky ke...@collabora.com --- Let me add some more information to this Easy Hack, as it would be really quite useful to improve the situation :-) The simplest way to find global statics is like: git grep '^static[^(]*$' -- *.cxx and look after those that define a global variable of a more complex type (ie. skip the OUStrings / bools / ints for now). Then as the first thing, try to make it non-global if it is possible, like here: http://cgit.freedesktop.org/libreoffice/core/commit/?id=92bede3900e84d4f08efb81757ec95c518c7fa76 because that way this will get initialized when used for the first time. If that is not possible, or not practical, then you can do what is suggested in the initial comment. An example can be seen in this commit: http://cgit.freedesktop.org/libreoffice/core/commit/?id=020e29fb95d742b160feab1df6751e59d4108239 Hope that helps :-) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38835] strip out non-trivial globals before main
https://bugs.freedesktop.org/show_bug.cgi?id=38835 --- Comment #7 from Jan Holesovsky ke...@collabora.com --- git grep '^static[^(]*=.*$' -- *.cxx | grep -v '\\(bool\|sal_Bool\|OUString\|char\|int\|short\|long\|double\|sal_Int[0-9]*\|sal_uInt[0-9]*\|sal_Char\|sal_Unicode\)\' | less filters out most of the trivial cases... -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 44/cca168c8a086cb779e1981c14bfccc318f5339
44/cca168c8a086cb779e1981c14bfccc318f5339 |1 + 1 file changed, 1 insertion(+) New commits: commit 2ec2200d1695021183be8658949d99e99ab77507 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 27 13:04:14 2014 + Notes added by 'git notes add' diff --git a/44/cca168c8a086cb779e1981c14bfccc318f5339 b/44/cca168c8a086cb779e1981c14bfccc318f5339 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/44/cca168c8a086cb779e1981c14bfccc318f5339 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/button.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 779b808df16a47ff6261b8e23b6d9f83f9ce
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 27 13:13:10 2014 +
bad
Change-Id: Ife660e5738d862e28260abe412817fb06272f4e8
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index e45874d..94fc477 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -605,7 +605,7 @@ void PushButton::ImplInitPushButtonData()
mbInUserDraw= false;
}
-namespace
+namespace
{
Window* getPreviousSibling(Window *pParent)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools
include/tools/shl.hxx |1 - include/tools/unqidx.hxx |1 - include/tools/vcompat.hxx |1 - 3 files changed, 3 deletions(-) New commits: commit 8240641ce73c682b05f32f9d12649759d6e98b00 Author: Alexandre Vicenzi vicenzi.alexan...@gmail.com Date: Wed Feb 26 23:37:38 2014 -0300 fdo#63154 remove unused solar.h reference in tools Change-Id: I1ad2f6323a787b9ea38031a1427d99dd47f5e030 Reviewed-on: https://gerrit.libreoffice.org/8373 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Marcos Souza marcos.souza@gmail.com diff --git a/include/tools/shl.hxx b/include/tools/shl.hxx index ebfdc51..4da6400 100644 --- a/include/tools/shl.hxx +++ b/include/tools/shl.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_TOOLS_SHL_HXX #define INCLUDED_TOOLS_SHL_HXX -#include tools/solar.h #include tools/toolsdllapi.h // GetAppData() diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx index 14710f9..9042476 100644 --- a/include/tools/unqidx.hxx +++ b/include/tools/unqidx.hxx @@ -20,7 +20,6 @@ #define INCLUDED_TOOLS_UNQIDX_HXX #include tools/toolsdllapi.h -#include tools/solar.h #include tools/contnr.hxx #include map diff --git a/include/tools/vcompat.hxx b/include/tools/vcompat.hxx index 9b60220..2d0412f 100644 --- a/include/tools/vcompat.hxx +++ b/include/tools/vcompat.hxx @@ -20,7 +20,6 @@ #define INCLUDED_TOOLS_VCOMPAT_HXX #include tools/toolsdllapi.h -#include tools/solar.h #define COMPAT_FORMAT( char1, char2, char3, char4 ) \ ((sal_uInt32)sal_uInt32)(char)(char1)))|\ ___ 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' - padmin/source
padmin/source/pamain.cxx | 54 ++-
1 file changed, 30 insertions(+), 24 deletions(-)
New commits:
commit 34c72f10939d473eb1a098fac1f05647c0232727
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 27 13:18:36 2014 +0100
fdo#75540 setProcessServiceFactory must be called before InitVCL
...because InitVCL now calls:
comphelper::getProcessServiceFactory
comphelper::getProcessComponentContext
utl::DefaultFontConfiguration::DefaultFontConfiguration
rtl::Staticutl::DefaultFontConfiguration, (anonymous
namespace)::theDefaultFontConfiguration::get
utl::DefaultFontConfiguration::get
ImplStyleData::SetStandardStyles
ImplStyleData::ImplStyleData
boost::make_sharedImplStyleData
StyleSettings::StyleSettings
ImplAllSettingsData::ImplAllSettingsData
boost::make_sharedImplAllSettingsData
AllSettings::AllSettings
Application::InitSettings
Application::GetSettings
GtkInstance::AfterAppInit
InitVCL
ImplSVMain
SVMain
sal_main
main
and Application::Main is only called after InitVCL.
(cherry picked from commit c828e3cc409077a1916911b8abf1d7b8dbb2078a)
Conflicts:
padmin/source/pamain.cxx
Change-Id: I1126e33f454a4ea35ef295cbd3f48429c473efb4
Reviewed-on: https://gerrit.libreoffice.org/8380
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index bbccadf..b510f99 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -51,6 +51,11 @@ public:
virtual sal_uInt16 Exception( sal_uInt16 nError );
static OUString ReadStringHook( const OUString );
+
+private:
+virtual void Init() SAL_OVERRIDE;
+
+Reference XComponentContext xCtx_;
};
void vclmain::createApplication()
@@ -84,35 +89,13 @@ int MyApp::Main()
EnableAutoHelpId();
-//-
-// create the global service-manager
-//-
-Reference XComponentContext xCtx;
-Reference XMultiServiceFactory xFactory;
-try
-{
-xCtx = defaultBootstrap_InitialComponentContext();
-xFactory = Reference XMultiServiceFactory (
xCtx-getServiceManager(), UNO_QUERY );
-if( xFactory.is() )
-setProcessServiceFactory( xFactory );
-}
-catch( const com::sun::star::uno::Exception )
-{
-}
-
-if( ! xFactory.is() )
-{
-fprintf( stderr, Could not bootstrap UNO, installation must be in
disorder. Exiting.\n );
-exit( 1 );
-}
-
// Detect desktop environment - need to do this as early as possible
com::sun::star::uno::setCurrentContext(
new DesktopContext( com::sun::star::uno::getCurrentContext() ) );
// Create UCB (for backwards compatibility, in case some code still uses
// plain createInstance w/o args directly to obtain an instance):
-com::sun::star::ucb::UniversalContentBroker::create(xCtx);
+com::sun::star::ucb::UniversalContentBroker::create(xCtx_);
/*
* Initialize the Java UNO AccessBridge if accessibility is turned on
@@ -139,7 +122,7 @@ int MyApp::Main()
*/
try
{
-ReferenceXComponent xComp(xCtx, UNO_QUERY_THROW);
+ReferenceXComponent xComp(xCtx_, UNO_QUERY_THROW);
xComp-dispose();
}
catch(...)
@@ -149,4 +132,27 @@ int MyApp::Main()
return EXIT_SUCCESS;
}
+void MyApp::Init()
+{
+// create the global service-manager
+
+Reference XMultiServiceFactory xFactory;
+try
+{
+xCtx_ = defaultBootstrap_InitialComponentContext();
+xFactory = Reference XMultiServiceFactory (
xCtx_-getServiceManager(), UNO_QUERY );
+if( xFactory.is() )
+setProcessServiceFactory( xFactory );
+}
+catch( const com::sun::star::uno::Exception )
+{
+}
+
+if( ! xFactory.is() )
+{
+fprintf( stderr, Could not bootstrap UNO, installation must be in
disorder. Exiting.\n );
+exit( 1 );
+}
+}
+
/* 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 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #65 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8240641ce73c682b05f32f9d12649759d6e98b00 fdo#63154 remove unused solar.h reference in tools The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 38619, which changed state. Bug 38619 Summary: PRINTING: Picture of type WMF is not printed correctly on Windows. https://bugs.freedesktop.org/show_bug.cgi?id=38619 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] Tag libreoffice-4.2.2.1 (on branch libreoffice-4-2-2) created
Hi all, The tag libreoffice-4.2.2.1 (AKA 4.2.2 RC1) has been created on the libreoffice-4-2-2 branch. The branch will be used for fine tuning of the 4.2.2 release. (It is the last scheduled RC, due to the 4.2.1 interim release) The 'libreoffice-4-2' branch is still active and will be used for the 4.2.3 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.2_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.2.2.1 libreoffice-4.2.2.1 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.2.1 RC1 (final) Happy hacking, Christian + core + allow overwriting of string value with numeric one. (fdo#72691) [Kohei Yoshida] + always set input as text when that's requested. (fdo#72491) [Kohei Yoshida] + ambiguity [Stephan Bergmann] + branch libreoffice-4-2-2 [Christian Lohmaier] + bump product version to 4.2.2.1 [Christian Lohmaier] + bump version to 4.2.1.1.0+ [Christian Lohmaier] + bump version to 4.2.2.0.0+ [Christian Lohmaier] + check if the *document* is closing, not the *app*. (fdo#73773) [Kohei Yoshida] + CUPS printing: use collate option when PDF is available (fdo#41524) [Michael Stahl] + draw position size tab - min size is 0 not 1 (mm) (fdo#72967) [Tomaž Vajngerl] + export cell borders to xls and xlsx correctly. (fdo#75130) [Kohei Yoshida] + fix branch in .gitreview [Michael Stahl] + fix incorrect separator in function description in Calc (fdo#73800) [Winfried Donkers] + fix the ODS export as well. (fdo#74512) [Kohei Yoshida] + handle note copying correctly. (fdo#75032) [Kohei Yoshida] + intern strings as we populate the external cache. (fdo#72041) [Kohei Yoshida] + intern strings in the external ref cache with the host document. (fdo#72041) [Kohei Yoshida] + java.lang.System.mapLibraryName dylib vs. jnilib confusion (fdo#74683) [Stephan Bergmann] + let's not skip auto styles from unmodified sheets. (fdo#72390) [Kohei Yoshida] + more java.lang.System.mapLibraryName dylib vs. jnilib confusion [Stephan Bergmann] + populate date members in a locale-safe way. (fdo#73565) [Kohei Yoshida] + prevent the accumulation of rounding errors (i#124233, fdo#64957) [Herbert Dürr] + re-implement BinarySearch() to disregard empty cell blocks. (fdo#72348, fdo#74558) [Kohei Yoshida] + RTF import: don't drop nested cells if not enough \cellx (rhbz#1065629) [Michael Stahl] + RTF import: re-implement nested tables (rhbz#1065629) [Michael Stahl] + RTFSdrImport::resolveDhgt(): fix crashing C-cast [Michael Stahl] + sdk: install URE library symlinks / import libs again (fdo#75526) [Michael Stahl] + some shared formulas cannot be exported as shared formulas. (fdo#74345) [Kohei Yoshida] + sw: do not paint zero-width lines (fdo#75118) [Michael Stahl] + sw: fix painting of SVG page background (fdo#68927) [Michael Stahl] + these tags should be lowercase for correct clipboard handling. (fdo#74584) [Kohei Yoshida] + too long style names over-stretch dialog (fdo#72233) [Caolán McNamara] + update the incrementer when skipping over hidden regions. (fdo#74857) [Kohei Yoshida] + updated core [Christian Lohmaier, Olivier R] + use 'ne' for string comparison (fdo#75206) [Andras Timar] + use AccessibleRole::PANEL for VclBoxes under windows (fdo#74284) [Caolán McNamara] + version 4.2.2.1, tag libreoffice-4.2.2.1 [Christian Lohmaier] + we still need to get the value only to pop value from the stack. (fdo#75228) [Kohei Yoshida] + wiki Publisher Extension is not working (fdo#69925) [Julien Nabet] + writerfilter: attempt to appease Mac tinderboxes [Michael Stahl] + dictionaries + update French spelling dictionary (v5.0.2) [Olivier R] + help + version 4.2.2.1, tag libreoffice-4.2.2.1 [Christian Lohmaier] + translations + update for 4.2.2 rc1 [Christian Lohmaier] fdo#41524 CUPS printing: use collate option when PDF is available [Michael Stahl] fdo#64957 prevent the accumulation of rounding errors [Herbert Dürr] fdo#68927 sw: fix painting of SVG page background [Michael Stahl] fdo#69925 wiki Publisher Extension is not working [Julien Nabet] fdo#72041 intern strings in the external ref cache with the host document. [Kohei Yoshida] fdo#72233 too long style names over-stretch dialog [Caolán McNamara] fdo#72348 re-implement BinarySearch() to disregard empty cell blocks. [Kohei Yoshida] fdo#72390 let's not skip auto styles from unmodified sheets. [Kohei Yoshida] fdo#72491 always set input as text when that's requested. [Kohei Yoshida] fdo#72691 allow overwriting of string value with numeric one. [Kohei Yoshida] fdo#72967 draw
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/toolbox.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 90b33b30756999298fe20bb3006f4742901de8cb
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 27 15:06:55 2014 +0100
-Werror,-Wunused-variable
Change-Id: Ib207ea292a2ea389005510bad0ae931df91424f0
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 439b3df6..aa3910d 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2694,7 +2694,6 @@ void ToolBox::ImplFormat( bool bResize )
// store the new calculated item rects
maPaintRect = aEmptyRect;
-Rectangle aVisibleRect(Point(0, 0), GetOutputSizePixel());
it = mpData-m_aItems.begin();
while ( it != mpData-m_aItems.end() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - filter/source oox/source svtools/source svx/source sw/source vcl/inc vcl/source
filter/source/msfilter/escherex.cxx | 32 -
oox/source/export/drawingml.cxx |8 ++
svtools/source/filter/filter.cxx|8 ++
svtools/source/graphic/descriptor.cxx |4 +
svx/source/gallery2/galtheme.cxx|5 +
svx/source/xml/xmlgrhlp.cxx |4 +
svx/source/xoutdev/_xoutbmp.cxx |4 +
sw/source/core/doc/docedt.cxx | 48 ++---
sw/source/core/doc/docredln.cxx | 16 ++--
sw/source/core/edit/edundo.cxx |2
sw/source/core/inc/UndoRedline.hxx | 10 +-
sw/source/core/undo/undobj.cxx | 97 +++-
sw/source/core/undo/unredln.cxx | 54 +++
sw/source/filter/ww8/rtfattributeoutput.cxx | 13 +++
sw/source/ui/docvw/romenu.cxx |4 +
vcl/inc/vcl/gfxlink.hxx |6 +
vcl/source/gdi/gfxlink.cxx |4 +
17 files changed, 209 insertions(+), 110 deletions(-)
New commits:
commit e8613c7e3b76a83d804d28199fdeacc6369569c6
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Feb 27 14:00:06 2014 +
123480: assure correct Undo/Redo with not shown tracked changes
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index fa42f2d..d8f1008 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1561,50 +1561,48 @@ bool SwDoc::DeleteAndJoinWithRedlineImpl( SwPaM rPam,
const bool )
{
SwUndoRedlineDelete* pUndo = 0;
RedlineMode_t eOld = GetRedlineMode();
-checkRedlining(eOld);
+checkRedlining( eOld );
if (GetIDocumentUndoRedo().DoesUndo())
{
-//JP 06.01.98: MUSS noch optimiert werden!!!
-SetRedlineMode(
- (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON |
nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE ));
+//JP 06.01.98: MUSS noch optimiert werden!!!
+SetRedlineMode(
+(RedlineMode_t) ( nsRedlineMode_t::REDLINE_ON |
nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE ) );
-GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
+GetIDocumentUndoRedo().StartUndo( UNDO_DELETE, NULL );
pUndo = new SwUndoRedlineDelete( rPam, UNDO_DELETE );
-GetIDocumentUndoRedo().AppendUndo(pUndo);
+GetIDocumentUndoRedo().AppendUndo( pUndo );
}
-if( *rPam.GetPoint() != *rPam.GetMark() )
-AppendRedline( new SwRedline( nsRedlineType_t::REDLINE_DELETE,
rPam ), true);
+
+if ( *rPam.GetPoint() != *rPam.GetMark() )
+AppendRedline( new SwRedline( nsRedlineType_t::REDLINE_DELETE,
rPam ), true );
SetModified();
-if( pUndo )
+if ( pUndo )
{
-GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
+GetIDocumentUndoRedo().EndUndo( UNDO_EMPTY, NULL );
// ??? why the hell is the AppendUndo not below the
// CanGrouping, so this hideous cleanup wouldn't be necessary?
// bah, this is redlining, probably changing this would break it...
-if (GetIDocumentUndoRedo().DoesGroupUndo())
+if ( GetIDocumentUndoRedo().DoesGroupUndo() )
{
-SwUndo *const pLastUndo( GetUndoManager().GetLastUndo() );
-SwUndoRedlineDelete *const pUndoRedlineDel(
-dynamic_castSwUndoRedlineDelete*(pLastUndo) );
-if (pUndoRedlineDel)
+SwUndo * const pLastUndo( GetUndoManager().GetLastUndo() );
+SwUndoRedlineDelete * const pUndoRedlineDel( dynamic_cast
SwUndoRedlineDelete* ( pLastUndo ) );
+if ( pUndoRedlineDel )
{
-bool const bMerged = pUndoRedlineDel-CanGrouping(*pUndo);
-if (bMerged)
+bool const bMerged = pUndoRedlineDel-CanGrouping( *pUndo
);
+if ( bMerged )
{
-::sw::UndoGuard const
undoGuard(GetIDocumentUndoRedo());
-SwUndo const*const pDeleted =
-GetUndoManager().RemoveLastUndo();
-OSL_ENSURE(pDeleted == pUndo,
-DeleteAndJoinWithRedlineImpl:
-undo removed is not undo inserted?);
+::sw::UndoGuard const undoGuard(
GetIDocumentUndoRedo() );
+SwUndo const* const pDeleted =
GetUndoManager().RemoveLastUndo();
+OSL_ENSURE( pDeleted == pUndo,
DeleteAndJoinWithRedlineImpl:
+undo removed is not undo inserted? );
delete pDeleted;
}
}
}
-//JP 06.01.98: MUSS noch optimiert werden!!!
-SetRedlineMode(
Release Schedule updated for x.y.1 releases
Hi *, as discussed by the ESC and announced in the minutes already, the release plan in the wiki was updated to reflect the decision. Previously there was a 5 week gap between the .0 and .1 release followed by a 4 week gap between the .1 and .2 release. Now the .1 release was moved one week forward, so the gaps are now 4 weeks between .0 and .1, and 5 weeks between .1 and .2 ascii representation of the change (view with fixed-width font): X.Y.0 5 weeks X.Y.14 weeksX.Y.2 X.Y.0 4 weeksX.Y.1 5 weeks X.Y.2 so only the release date of the .1 release changes, the rest of the schedule remains the same. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/table.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 14 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 10 --
3 files changed, 22 insertions(+), 2 deletions(-)
New commits:
commit 743d90ca384ae71b57eaf2b99fb7da68fc381215
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Feb 27 14:43:21 2014 +0100
DOCX export: fix order of table border elements
Change-Id: I17d8634017c5b0374d30501186b338ddedbcd7ea
diff --git a/sw/qa/extras/ooxmlexport/data/table.odt
b/sw/qa/extras/ooxmlexport/data/table.odt
new file mode 100644
index 000..25b2a5f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/table.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 658ef03..400745e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -323,6 +323,20 @@ DECLARE_OOXMLEXPORT_TEST(testMathVerticalStacks,
math-vertical_stacks.docx)
//CHECK_FORMULA( binom {a} {binom {b} {c}}, getFormula( getRun(
getParagraph( 4 ), 1 )));
}
+DECLARE_OOXMLEXPORT_TEST(testTable, table.odt)
+{
+// Validation test: order of elements were wrong.
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+// Order was: insideH, end, insideV.
+int nEnd = getXPathPosition(pXmlDoc,
/w:document/w:body/w:tbl/w:tblPr/w:tblBorders, end);
+int nInsideH = getXPathPosition(pXmlDoc,
/w:document/w:body/w:tbl/w:tblPr/w:tblBorders, insideH);
+int nInsideV = getXPathPosition(pXmlDoc,
/w:document/w:body/w:tbl/w:tblPr/w:tblBorders, insideV);
+CPPUNIT_ASSERT(nEnd nInsideH);
+CPPUNIT_ASSERT(nInsideH nInsideV);
+}
+
DECLARE_OOXMLEXPORT_TEST(testTablePosition, table-position.docx)
{
sal_Int32 xCoordsFromOffice[] = { 2500, -1000, 0, 0 };
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index dea9e5b..09bfa06 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2119,6 +2119,8 @@ static void impl_borders( FSHelperPtr pSerializer, const
SvxBoxItem rBox, const
bExportDistanceFromPageEdge = true;
}
+bool bWriteInsideH = false;
+bool bWriteInsideV = false;
for( int i = 0; i 4; ++i, ++pBrd )
{
const SvxBorderLine* pLn = rBox.GetLine( *pBrd );
@@ -2186,11 +2188,15 @@ static void impl_borders( FSHelperPtr pSerializer,
const SvxBoxItem rBox, const
// When exporting default borders, we need to export these 2 attr
if ( rOptions.bWriteInsideHV) {
if ( i == 2 )
-impl_borderLine( pSerializer, XML_insideH, pLn, 0 );
+bWriteInsideH = true;
else if ( i == 3 )
-impl_borderLine( pSerializer, XML_insideV, pLn, 0 );
+bWriteInsideV = true;
}
}
+if (bWriteInsideH)
+impl_borderLine( pSerializer, XML_insideH,
rBox.GetLine(BOX_LINE_BOTTOM), 0 );
+if (bWriteInsideV)
+impl_borderLine( pSerializer, XML_insideV,
rBox.GetLine(BOX_LINE_RIGHT), 0 );
if (tagWritten rOptions.bWriteTag) {
pSerializer-endElementNS( XML_w, rOptions.tag );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TextEffectsHandler.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit a4bdeebac28852e382331439017dae85b3881a95
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 27 16:11:55 2014 +0100
Missing includes
Change-Id: I6561641eb44dd1f81136f21e930411c4e3d7d79c
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx
b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index e900f2c..9536576 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -13,7 +13,9 @@
#include comphelper/string.hxx
#include ooxml/resourceids.hxx
#include dmapperLoggers.hxx
+#include map
#include stack
+#include vector
namespace writerfilter {
namespace dmapper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/zoom.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/filter/ww8/docxattributeoutput.cxx | 14 +++---
3 files changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 150420cbff39967e9376cab05b6af45b642edae8
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Feb 27 15:51:55 2014 +0100
DOCX export: fix style's next element order
Change-Id: I03e91a448794efc2b91f3a6fb6c29dda3403ce9b
diff --git a/sw/qa/extras/ooxmlexport/data/zoom.docx
b/sw/qa/extras/ooxmlexport/data/zoom.docx
index 6c2cd46..a61069f 100644
Binary files a/sw/qa/extras/ooxmlexport/data/zoom.docx and
b/sw/qa/extras/ooxmlexport/data/zoom.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 400745e..b90075d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -94,6 +94,15 @@ DECLARE_OOXMLEXPORT_TEST(testZoom, zoom.docx)
sal_Int16 nValue = 0;
xPropertySet-getPropertyValue(ZoomValue) = nValue;
CPPUNIT_ASSERT_EQUAL(sal_Int16(42), nValue);
+
+// Validation test: order of elements were wrong.
+xmlDocPtr pXmlDoc = parseExport(word/styles.xml);
+if (!pXmlDoc)
+return;
+// Order was: rsid, next.
+int nNext = getXPathPosition(pXmlDoc, /w:styles/w:style[3], next);
+int nRsid = getXPathPosition(pXmlDoc, /w:styles/w:style[3], rsid);
+CPPUNIT_ASSERT(nNext nRsid);
}
DECLARE_OOXMLEXPORT_TEST(defaultTabStopNotInStyles, empty.odt)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 09bfa06..4e48125 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3977,6 +3977,13 @@ void DocxAttributeOutput::StartStyle( const OUString
rName, StyleType eType,
FSEND );
}
+if ( nNext != nId eType != STYLE_TYPE_LIST)
+{
+m_pSerializer-singleElementNS( XML_w, XML_next,
+FSNS( XML_w, XML_val ),
m_rExport.pStyles-GetStyleId(nNext).getStr(),
+FSEND );
+}
+
if (!aLink.isEmpty())
m_pSerializer-singleElementNS(XML_w, XML_link,
FSNS(XML_w, XML_val), OUStringToOString(aLink,
RTL_TEXTENCODING_UTF8).getStr(),
@@ -3999,13 +4006,6 @@ void DocxAttributeOutput::StartStyle( const OUString
rName, StyleType eType,
FSNS(XML_w, XML_val), OUStringToOString(aRsid,
RTL_TEXTENCODING_UTF8).getStr(),
FSEND);
-if ( nNext != nId eType != STYLE_TYPE_LIST)
-{
-m_pSerializer-singleElementNS( XML_w, XML_next,
-FSNS( XML_w, XML_val ),
m_rExport.pStyles-GetStyleId(nNext).getStr(),
-FSEND );
-}
-
if ( bAutoUpdate )
m_pSerializer-singleElementNS( XML_w, XML_autoRedefine, FSEND );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: testtools/source
testtools/source/bridgetest/bridgetest.cxx | 20 -
testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs |2
testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx |6 +-
testtools/source/bridgetest/cli/cli_cs_bridgetest.cs|6 +-
testtools/source/bridgetest/cppobj.cxx | 10 ++--
testtools/source/cliversioning/version.cs | 12 ++---
testtools/source/performance/pseudo.cxx |8 +--
testtools/source/performance/ubobject.cxx | 16 +++
testtools/source/performance/ubtest.cxx | 26 ++--
9 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit a9311d6b1a8528d009bc25a4f1c80c7d9db58e49
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 22:27:51 2014 +0100
Remove visual noise from testtools
Change-Id: Idbf31a46a9e174b96b3cac76be6a01a6ada0abde
Reviewed-on: https://gerrit.libreoffice.org/8325
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/testtools/source/bridgetest/bridgetest.cxx
b/testtools/source/bridgetest/bridgetest.cxx
index 3bc84e2..c647b1c 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -100,7 +100,7 @@ bool checkEmpty(OUString const string, char const *
message) {
}
-//==
+
class TestBridgeImpl : public osl::DebugBaseTestBridgeImpl,
public WeakImplHelper2 XMain, XServiceInfo
{
@@ -123,7 +123,7 @@ public:
virtual sal_Int32 SAL_CALL run( const Sequence OUString rArgs ) throw
(RuntimeException, std::exception);
};
-//==
+
static sal_Bool equals( const TestElement rData1, const TestElement rData2
)
{
check( rData1.Bool == rData2.Bool, ### bool does not match! );
@@ -158,7 +158,7 @@ static sal_Bool equals( const TestElement rData1, const
TestElement rData2 )
rData1.Interface == rData2.Interface
rData1.Any == rData2.Any);
}
-//==
+
static sal_Bool equals( const TestData rData1, const TestData rData2 )
{
sal_Int32 nLen;
@@ -182,7 +182,7 @@ static sal_Bool equals( const TestData rData1, const
TestData rData2 )
}
return sal_False;
}
-//==
+
static void assign( TestElement rData,
sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
@@ -363,7 +363,7 @@ void MyClass::release() throw ()
OWeakObject::release();
}
-//==
+
static sal_Bool performTest(
const ReferenceXComponentContext xContext,
const ReferenceXBridgeTest xLBT,
@@ -948,7 +948,7 @@ static sal_Bool raiseOnewayException( const Reference
XBridgeTest xLBT )
return bReturn;
}
-//==
+
static sal_Bool raiseException( const Reference XBridgeTest xLBT )
{
sal_Int32 nCount = 0;
@@ -1138,7 +1138,7 @@ inline bool makeSurrogate(
return rOut.is();
}
-//==
+
sal_Int32 TestBridgeImpl::run( const Sequence OUString rArgs )
throw (RuntimeException, std::exception)
{
@@ -1253,9 +1253,9 @@ Sequence OUString
TestBridgeImpl::getSupportedServiceNames()
return bridge_test::getSupportedServiceNames();
}
-// ...
-//==
+
+
static Reference XInterface SAL_CALL TestBridgeImpl_create(
const Reference XComponentContext xContext )
{
@@ -1267,7 +1267,7 @@ static Reference XInterface SAL_CALL
TestBridgeImpl_create(
extern C
{
-//==
+
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * )
diff --git a/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
b/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
index c90b75c..1cb4f31 100644
--- a/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
+++ b/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
@@ -25,7 +25,7 @@ using unoidl.com.sun.star.lang;
using unoidl.com.sun.star.container;
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/util scp2/source setup_native/prj setup_native/source solenv/bin solenv/inc vcl/aqua
instsetoo_native/util/makefile.mk | 45 ++-
instsetoo_native/util/openoffice.lst| 48
scp2/source/ooo/scpaction_ooo.scp |4 +
scp2/source/sdkoo/sdkoo.scp |6 +-
setup_native/prj/d.lst |6 ++
setup_native/source/mac/ooo/DS_Store_Beta |binary
setup_native/source/mac/ooo/DS_Store_Langpack_Beta |binary
setup_native/source/mac/ooo/osxdndinstall.png |binary
setup_native/source/mac/ooo/osxdndinstall_beta.png |binary
setup_native/source/mac/ooo/osxdndinstall_lang.png |binary
setup_native/source/mac/ooo/osxdndinstall_lang_beta.png |binary
setup_native/source/mac/sdk/DS_Store_SDK_Beta |binary
setup_native/source/mac/sdk/osxdndinstall_sdk.png |binary
setup_native/source/mac/sdk/osxdndinstall_sdk_beta.png |binary
solenv/bin/make_installer.pl|7 ++
solenv/bin/modules/installer/globals.pm |1
solenv/bin/modules/installer/scriptitems.pm | 30 ++
solenv/bin/modules/installer/systemactions.pm |2
solenv/inc/minor.mk |6 +-
vcl/aqua/source/gdi/ctlayout.cxx| 47 +--
20 files changed, 162 insertions(+), 40 deletions(-)
New commits:
commit 28c209b62358e8ecce8c4063a84db8e377aa57f8
Author: Jürgen Schmidt j...@apache.org
Date: Thu Feb 27 14:54:22 2014 +
#124311# merge from AOO410 branch
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 9ff42ba..2577150 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -25,7 +25,7 @@ TARGET=util
.INCLUDE: settings.mk
.INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk
-.INCLUDE: $(SOLARENVINC)$/version.mk
+#.INCLUDE: $(SOLARENVINC)$/version.mk
# watch for the path delimiter
.IF $(GUI)==WNT
@@ -80,9 +80,11 @@ help .PHONY :
@echo openofficedev devloper snapshot
@echo openofficewithjre
@echo ooolanguagepack
+@echo ooobetalanguagepack
@echo ooodevlanguagepack
-@echo sdkoo
-@echo sdkoodev
+@echo sdkoo builds the developer SDK package
+@echo sdkoobeta like sdkoo but with 'Beta' appended to
the product name
+@echo sdkoodev builds the developer snapshot of the SDK
@echo openofficebeta like openoffice but with 'Beta' appended
to product name
@echo
@echo experimental targets:
@@ -182,11 +184,13 @@ openoffice:
# Add dependencies of basic targets on language specific targets.
openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
-beta: $(foreach,i,$(alllangiso) beta_$i)
+openofficebeta: $(foreach,i,$(alllangiso) openofficebeta_$i)
openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
+ooobetalanguagepack : $(foreach,i,$(alllangiso) ooobetalanguagepack_$i)
ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
+sdkoobeta: $(foreach,i,$(alllangiso) sdkoobeta_$i)
sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
patch-create: $(foreach,i,$(alllangiso) patch-create_$i)
@@ -218,11 +222,13 @@ updatepack : local_python_files
$(foreach,i,$(alllangiso) openoffice_$i) : adddeps
openoffice_$(defaultlangiso).archive : adddeps
$(foreach,i,$(alllangiso) openofficedev_$i) : adddeps
-$(foreach,i,$(alllangiso) beta_$i) : adddeps $(BETA_LOGO_SPLASH)
+$(foreach,i,$(alllangiso) openofficebeta_$i) : adddeps $(BETA_LOGO_SPLASH)
$(foreach,i,$(alllangiso) openofficewithjre_$i) : adddeps
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : adddeps
+$(foreach,i,$(alllangiso) ooobetalanguagepack_$i) : adddeps
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : adddeps
$(foreach,i,$(alllangiso) sdkoo_$i) : adddeps
+$(foreach,i,$(alllangiso) sdkoobeta_$i) : adddeps
$(foreach,i,$(alllangiso) sdkoodev_$i) : adddeps
# Create targets that take the package formats into account. Together with
language dependency we
@@ -232,10 +238,12 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) : adddeps
$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^.)}
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^.)}
$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^.)}
-$(foreach,i,$(alllangiso) beta_$i) : $$@{$(PKGFORMAT:^.)}
+$(foreach,i,$(alllangiso) openofficebeta_$i) : $$@{$(PKGFORMAT:^.)}
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^.)}
+$(foreach,i,$(alllangiso) ooobetalanguagepack_$i) : $$@{$(PKGFORMAT:^.)}
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^.)}
$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^.)}
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/redline.hxx | 38 ---
sw/source/core/doc/docredln.cxx | 33 ---
sw/source/filter/ww8/docxattributeoutput.cxx |6 ++--
3 files changed, 27 insertions(+), 50 deletions(-)
New commits:
commit f3307b030635651a01941e76b2011f5c51ed1b84
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 27 14:57:39 2014 +
coverity#1187644 confused copy ctors, leaks, etc.
also
coverity#1187861 Uninitialized pointer field
coverity#1187862 Uninitialized pointer field
Change-Id: Ibc420b8ef2d6db58b1b23a85a4029182a05b5f44
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 9bd90c9..09df1f9 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -299,11 +299,9 @@ public:
};
/// Base object for 'Redlines' that are not of 'Ranged' type (like table row
insert\delete)
-class SW_DLLPUBLIC SwExtraRedline
+class SW_DLLPUBLIC SwExtraRedline : private boost::noncopyable
{
public:
-SwExtraRedline( );
-SwExtraRedline( const SwExtraRedline );
virtual ~SwExtraRedline();
};
@@ -311,48 +309,46 @@ public:
class SW_DLLPUBLIC SwTableRowRedline : public SwExtraRedline
{
private:
-SwRedlineData* pRedlineData;
-const SwTableLine* pTableLine;
+SwRedlineData m_aRedlineData;
+const SwTableLine m_rTableLine;
public:
-SwTableRowRedline( const SwRedlineData rData, SwTableLine aTableLine );
-SwTableRowRedline( const SwTableRowRedline );
+SwTableRowRedline(const SwRedlineData rData, const SwTableLine
rTableLine);
virtual ~SwTableRowRedline();
/** ExtraData gets copied, the pointer is therefor not taken over by
* the RedLineObject.*/
void SetExtraData( const SwRedlineExtraData* pData )
-{ pRedlineData-SetExtraData( pData ); }
+{ m_aRedlineData.SetExtraData( pData ); }
const SwRedlineExtraData* GetExtraData() const
-{ return pRedlineData-GetExtraData(); }
-const SwTableLine* GetTableLine() const
-{ return pTableLine; }
+{ return m_aRedlineData.GetExtraData(); }
+const SwTableLine GetTableLine() const
+{ return m_rTableLine; }
const SwRedlineData GetRedlineData() const
-{ return *pRedlineData; }
+{ return m_aRedlineData; }
};
/// Redline that holds information about a table-cell that had some change
class SW_DLLPUBLIC SwTableCellRedline : public SwExtraRedline
{
private:
-SwRedlineData* pRedlineData;
-const SwTableBox* pTableBox;
+SwRedlineData m_aRedlineData;
+const SwTableBox m_rTableBox;
public:
-SwTableCellRedline( const SwRedlineData rData, SwTableBox aTableBox );
-SwTableCellRedline( const SwTableCellRedline );
+SwTableCellRedline(const SwRedlineData rData, const SwTableBox
rTableBox);
virtual ~SwTableCellRedline();
/** ExtraData gets copied, the pointer is therefor not taken over by
* the RedLineObject.*/
void SetExtraData( const SwRedlineExtraData* pData )
-{ pRedlineData-SetExtraData( pData ); }
+{ m_aRedlineData.SetExtraData( pData ); }
const SwRedlineExtraData* GetExtraData() const
-{ return pRedlineData-GetExtraData(); }
-const SwTableBox* GetTableBox() const
-{ return pTableBox; }
+{ return m_aRedlineData.GetExtraData(); }
+const SwTableBox GetTableBox() const
+{ return m_rTableBox; }
const SwRedlineData GetRedlineData() const
-{ return *pRedlineData; }
+{ return m_aRedlineData; }
};
class SW_DLLPUBLIC SwRedlineHint : public SfxHint
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 10df07a..3ea13c0 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -3981,29 +3981,14 @@ void SwExtraRedlineTbl::DeleteAndDestroyAll()
DeleteAndDestroy(0, m_aExtraRedlines.size());
}
-SwExtraRedline::SwExtraRedline( )
-{
-}
-
-SwExtraRedline::SwExtraRedline( const SwExtraRedline rCpy )
-{
-(void)rCpy;
-}
-
SwExtraRedline::~SwExtraRedline()
{
}
-SwTableRowRedline::SwTableRowRedline( const SwRedlineData rData, SwTableLine
aTableLine )
-: pRedlineData( new SwRedlineData( rData ))
+SwTableRowRedline::SwTableRowRedline(const SwRedlineData rData, const
SwTableLine rTableLine)
+: m_aRedlineData(rData)
+, m_rTableLine(rTableLine)
{
-pTableLine = aTableLine;
-}
-
-SwTableRowRedline::SwTableRowRedline( const SwTableRowRedline rCpy )
-: SwExtraRedline( rCpy )
-{
-pTableLine = rCpy.pTableLine;
}
SwTableRowRedline::~SwTableRowRedline()
@@ -4055,16 +4040,10 @@ bool SwDoc::AppendTableRowRedline( SwTableRowRedline*
pNewRedl, bool bCallDelete
return ( 0 != pNewRedl ) || bMerged;
}
-SwTableCellRedline::SwTableCellRedline( const SwRedlineData rData,
SwTableBox aTableBox )
-: pRedlineData( new SwRedlineData( rData ))
-{
-pTableBox = aTableBox;
-}
-
-SwTableCellRedline::SwTableCellRedline( const
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 28/c209b62358e8ecce8c4063a84db8e377aa57f8
28/c209b62358e8ecce8c4063a84db8e377aa57f8 |1 + 1 file changed, 1 insertion(+) New commits: commit d3e0df0591f69d23e63f81ce85d858dd0ccc6782 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 27 16:10:23 2014 + Notes added by 'git notes add' diff --git a/28/c209b62358e8ecce8c4063a84db8e377aa57f8 b/28/c209b62358e8ecce8c4063a84db8e377aa57f8 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/28/c209b62358e8ecce8c4063a84db8e377aa57f8 @@ -0,0 +1 @@ +ignore: aoo ___ 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/inc sc/source
sc/inc/address.hxx |6 +++---
sc/inc/compiler.hxx| 10 +-
sc/inc/tokenuno.hxx|2 +-
sc/source/core/tool/address.cxx| 12 ++--
sc/source/core/tool/compiler.cxx | 14 +-
sc/source/filter/oox/formulabuffer.cxx | 21 ++---
6 files changed, 34 insertions(+), 31 deletions(-)
New commits:
commit 86af0776a09fd49cbd8339350e3b699100c0142a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Feb 24 16:02:20 2014 -0500
fdo#75304: Set external reference info to ScCompiler.
And remove this excessive const fetish which was unfortunately necessary to
get this to compile. Setting the container const is good enough.
Change-Id: I2c6cc55a88643a68e065c4518cdf069c247f4f02
(cherry picked from commit 4917cebdb988223be47b0f1a82241ade643bc675)
Reviewed-on: https://gerrit.libreoffice.org/8212
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index f764e08..608a505 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -286,7 +286,7 @@ public:
const Details rDetails = detailsOOOa1,
ExternalInfo* pExtInfo = NULL,
const ::com::sun::star::uno::Sequence
-const ::com::sun::star::sheet::ExternalLinkInfo *
pExternalLinks = NULL );
+com::sun::star::sheet::ExternalLinkInfo* pExternalLinks =
NULL );
SC_DLLPUBLIC OUString Format( sal_uInt16 = 0, const ScDocument* = NULL,
const Details rDetails = detailsOOOa1) const;
@@ -450,7 +450,7 @@ public:
const ScAddress::Details rDetails = ScAddress::detailsOOOa1,
ScAddress::ExternalInfo* pExtInfo = NULL,
const ::com::sun::star::uno::Sequence
-const ::com::sun::star::sheet::ExternalLinkInfo *
pExternalLinks = NULL );
+com::sun::star::sheet::ExternalLinkInfo* pExternalLinks =
NULL );
SC_DLLPUBLIC sal_uInt16 ParseAny( const OUString, ScDocument* = NULL,
const ScAddress::Details rDetails =
ScAddress::detailsOOOa1 );
@@ -483,7 +483,7 @@ public:
OUString rExternDocName, OUString rStartTabName, OUString
rEndTabName, sal_uInt16 nFlags,
bool bOnlyAcceptSingle,
const ::com::sun::star::uno::Sequence
-const ::com::sun::star::sheet::ExternalLinkInfo *
pExternalLinks = NULL );
+com::sun::star::sheet::ExternalLinkInfo* pExternalLinks =
NULL );
SC_DLLPUBLIC OUString Format(sal_uInt16 = 0, const ScDocument* = NULL,
const ScAddress::Details rDetails = ScAddress::detailsOOOa1)
const;
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 78f896e..b88ecd5 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -254,7 +254,7 @@ public:
virtual bool parseExternalName( const OUString rSymbol, OUString
rFile, OUString rName,
const ScDocument* pDoc,
const ::com::sun::star::uno::Sequence
-const ::com::sun::star::sheet::ExternalLinkInfo *
pExternalLinks ) const = 0;
+com::sun::star::sheet::ExternalLinkInfo* pExternalLinks )
const = 0;
virtual OUString makeExternalNameStr( const OUString rFile, const
OUString rName ) const = 0;
@@ -318,7 +318,7 @@ private:
SvNumberFormatter* mpFormatter;
// For CONV_XL_OOX, may be set via API by MOOXML filter.
-::com::sun::star::uno::Sequence const
::com::sun::star::sheet::ExternalLinkInfo maExternalLinks;
+com::sun::star::uno::Sequencecom::sun::star::sheet::ExternalLinkInfo
maExternalLinks;
sal_Unicode cSymbol[MAXSTRLEN]; // current Symbol
OUStringaFormula; // formula source code
@@ -431,9 +431,9 @@ private:
public:
/// Set external link info for ScAddress::CONV_XL_OOX.
-inline voidSetExternalLinks(
-const ::com::sun::star::uno::Sequence
-const ::com::sun::star::sheet::ExternalLinkInfo rLinks )
+void SetExternalLinks(
+const ::com::sun::star::uno::Sequence
+com::sun::star::sheet::ExternalLinkInfo rLinks )
{
maExternalLinks = rLinks;
}
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index 4287405..408298d 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -56,7 +56,7 @@ class ScFormulaParserObj : public ::cppu::WeakImplHelper3
{
private:
::com::sun::star::uno::Sequence const
::com::sun::star::sheet::FormulaOpCodeMapEntry maOpCodeMapping;
-::com::sun::star::uno::Sequence const
::com::sun::star::sheet::ExternalLinkInfo maExternalLinks;
+::com::sun::star::uno::Sequencecom::sun::star::sheet::ExternalLinkInfo
maExternalLinks;
[Libreoffice-commits] core.git: 16 commits - oox/source sw/qa sw/source writerfilter/source
oox/source/token/tokens.txt
|1
sw/qa/extras/ooxmlexport/data/TextEffects_Props3d_Ligatures_NumForm_NumSpacing.docx
|binary
sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx
|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
| 41 ++
sw/source/filter/ww8/docxattributeoutput.cxx
| 12
writerfilter/source/dmapper/TextEffectsHandler.cxx
| 93 +
writerfilter/source/dmapper/TextEffectsHandler.hxx
|3
writerfilter/source/ooxml/model.xml
| 157 +-
8 files changed, 290 insertions(+), 17 deletions(-)
New commits:
commit b731909d3c8bb01a7ab55e6bd2967ad0256b716d
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Thu Feb 27 17:33:44 2014 +0100
ooxml: extend roundtrip test - stylisticSets, cntxtAlts
Change-Id: I727df93d112e28be31b196c7f861cf1d0133bfe1
diff --git
a/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx
b/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx
new file mode 100644
index 000..7233104
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 9799ac4..69311ca 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2863,6 +2863,24 @@
DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_Props3d_Ligatures_NumForm_NumSpacing
assertXPath(pXmlDoc,
/w:document/w:body/w:p[3]/w:r[4]/w:rPr/w14:numSpacing, val, proportional);
}
+DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_StylisticSets_CntxtAlts,
TextEffects_StylisticSets_CntxtAlts.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+// Paragraph 1 - w14:stylisticSets
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w14:stylisticSets/w14:styleSet, 1);
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w14:stylisticSets/w14:styleSet, id,
4);
+
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w14:stylisticSets/w14:styleSet, 1);
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w14:stylisticSets/w14:styleSet, id,
2);
+
+// Paragraph 1 - w14:cntxtAlts
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[2]/w:r[1]/w:rPr/w14:cntxtAlts, 1);
+
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
commit 1c0e1b9c64b7c33008966e24a240819ec0b223f6
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Thu Feb 27 17:33:01 2014 +0100
ooxml export: w14:stylisticSets w14:cntxtAlts element
Change-Id: I46e838fac213378f95389812b47ce5896f703505
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 65b41a5..c4700b4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1181,6 +1181,8 @@ void DocxAttributeOutput::InitCollectedRunProperties()
FSNS( XML_w14, XML_ligatures ),
FSNS( XML_w14, XML_numForm ),
FSNS( XML_w14, XML_numSpacing ),
+FSNS( XML_w14, XML_stylisticSets ),
+FSNS( XML_w14, XML_cntxtAlts ),
};
// postpone the output so that we can later [in EndParagraphProperties()]
@@ -1215,6 +1217,8 @@ const NameToId constNameToIdMapping[] =
{ OUString(ligatures),FSNS( XML_w14, XML_ligatures ) },
{ OUString(numForm), FSNS( XML_w14, XML_numForm ) },
{ OUString(numSpacing), FSNS( XML_w14, XML_numSpacing ) },
+{ OUString(stylisticSets),FSNS( XML_w14, XML_stylisticSets ) },
+{ OUString(cntxtAlts),FSNS( XML_w14, XML_cntxtAlts ) },
{ OUString(val), FSNS( XML_w14, XML_val ) },
{ OUString(rad), FSNS( XML_w14, XML_rad ) },
@@ -1252,6 +1256,7 @@ const NameToId constNameToIdMapping[] =
{ OUString(extrusionH), FSNS( XML_w14, XML_extrusionH ) },
{ OUString(contourW), FSNS( XML_w14, XML_contourW ) },
{ OUString(prstMaterial), FSNS( XML_w14, XML_prstMaterial ) },
+{ OUString(id), FSNS( XML_w14, XML_id ) },
{ OUString(schemeClr),FSNS( XML_w14, XML_schemeClr ) },
{ OUString(srgbClr), FSNS( XML_w14, XML_srgbClr ) },
@@ -1285,6 +1290,7 @@ const NameToId constNameToIdMapping[] =
{ OUString(bevelB), FSNS( XML_w14, XML_bevelB ) },
{ OUString(extrusionClr), FSNS( XML_w14, XML_extrusionClr ) },
{ OUString(contourClr), FSNS( XML_w14, XML_contourClr ) },
+{ OUString(styleSet), FSNS( XML_w14, XML_styleSet ) },
};
commit cdd3fb6df0818d94303681392a1b2162097438cc
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Thu Feb 27 17:31:21 2014 +0100
minutes of ESC call ...
* Present + Caolan, David, Cedric, Norbert, Markus, Michael M, Lionel, Eike, Astron, Jacobo, Kohei, Stephan B, Robinson, Christian, Adam, Miklos, Kendy * Completed Action Items + test Bjoern's up-streamed dep caching on Windows (Kendy) [make 3.82: (4m04), 3m29, 3m30, 3m28; make 4.0: (3m30), 3m24, 3m23, 3m25] + GSOC mentors - prune / remove already done ideas from each side (All) + need design for copying styles between templates (Cor Nouws/other UX?) cf. http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html Astron made mockup as discussed with Cor: https://wiki.documentfoundation.org/Design/Whiteboards/Importing_Styles_from_Other_Files + update the release plan wiki for 4.3 (Christian) initially we had .0 5 weeks .1, then 4 weeks .2 now it is .0, then 4 weeks .1, then 5 weeks, .2 no idea where the initial schedule came from - was that way for 4.1 and 4.2 4 weeks is OK if .0 is in a shape we are happy with - feedback from users takes at least 2 weeks, so shorter gap doesn't make much sense. + 3.6.0 had a three week gap - prefer something smaller ? (Michael) + cherry-pick patches 4-2-1 - 4-2-2 (Christian) [ checked, but not necessary ] + poke inactive GSoC mentors (Cedric) * Pending Action Items: + will try filing a lot of small string changes as easy hacks (Astron) + review HiDPI branch for 4.2 (Kendy, Michael, Caolan) [ pending branch creation ] + talk with Thorsten wrt. ODF TC representation (Michael S) * Release Engineering update (Christian) + 4.2.2 currently building rc1 (initially known as 4.2.1 rc2) + only one rc planned for this + this release should be the final one. + 4.2.3 deadline - week of March 10th + MAB: + 2 are more serious: https://bugs.freedesktop.org/50855 + just added a bibisect request (Michael) + tried to bi-bisect it (Christian) + but didn't find a version that it worked for. + like PDF export, a bug but needs description tweak. + 4.2 just picks a different style by default. * UX update (Astron) + concerned about the hyperlink dialog was handled on ux-advise + patch in gerrit to make it disappear when you hit apply, some push-back, proposed a new patch to revert back. + is a bit confusing, but agree with Mirek's analysis. + Sifr-light discussion and/or using it as the high-contrast theme. + bugs have been filed. + would be cool to have a programmatic re-colouring of the icons. + already have darken/lighten BitmapEx bits (Michael) + is it a real replacement from an a11y perspective ? (Bjoern) + Stuart - no problem with replacing hicontrast with Sifr (Astron) = nothing in the way etc. + talked with Matthew Paul Thomas @ Canonical (Bjoern) + loves detail, and had some great insights + would like to introduce him to other UX guys. + one item: sorting out the LibreOffice menus. * GSoC update (Cedric) + Lots of tasks in the impress area + need other mentors for tasks there + please consider what you are able to mentor: + https://wiki.documentfoundation.org/Development/GSoC/Ideas + students are starting to arrive, applications from March 10th - 21st. * OOXML Strict namespaces (Markus) + import issues caused by namespace handling bits + can solve this by mapping new namespaces to the same IDs + otherwise need a lot of code changes. + for export, can use the same trick; but with more places + need to drop features for strict. + needs a new filter, needs handling for cases to remove. + VML not supported eg. + no concerns wrt. duplicate namespace tokens for import (All) + already have 2x OOXML exports: 2007 and ISO transitional (Markus) + need to extend the enum already here for writer (Kendy) * Editeng indexing change (Norbert/Kohei) + spell-checking currently broken in master, but works in 4.2 AI + have a look into it (Norbert) * Crashtest update (Markus) + no new crash-test / data etc. + hitting a kernel bug on the crash-testing VM + 2x deadlocks of the VM - when load was too high, couldn't log in. + already at a load of 24; 500 documents every 2 hours or so. + after 10k documents: load jumps up. + 50k documents - a week. + normally takes 3-4 days. + no real insights yet; log shows kernel oops' (Cloph) + running current Fedora 19 - recent updates, caused grief ? + upgrade to F20 instead ? + used it to get a modern toolchain. AI: + upgrade it to F20 (Cloph) +
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #110 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Stefan Ring committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8827b08dc3ab5a08e929815844737635201b3c1d fdo#39468 Translate German comments: sw/source/filter/ww1 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: sw/source
sw/source/filter/ww1/w1filter.cxx | 26 +++---
1 file changed, 11 insertions(+), 15 deletions(-)
New commits:
commit 8827b08dc3ab5a08e929815844737635201b3c1d
Author: Stefan Ring stefan...@gmail.com
Date: Thu Feb 27 17:18:36 2014 +0100
fdo#39468 Translate German comments: sw/source/filter/ww1
There was still one untranslated paragraph left.
Change-Id: I9b951c5216560614bd3fc42f9118477ad66cbdf2
Reviewed-on: https://gerrit.libreoffice.org/8385
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww1/w1filter.cxx
b/sw/source/filter/ww1/w1filter.cxx
index 1508f5a..537293c 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1236,23 +1236,19 @@ void Ww1Style::Out(Ww1Shell rOut, Ww1Manager rMan)
pPapx-Start(rOut, rMan);
}
-// die Out() methoden von plaintext fuer den filter geben eine anzahl
-// zeichen aus auf die shell, einen string oder einen char, wieviel
-// zeichen ausgegeben werden, bestimmt ulEnd, das das ende bestimmt,
-// bis zudem ausgegeben wird. ausserdem beenden die methoden die
-// ausgabe bei kontrollzeichen.
-// diese sind definiert durch MinChar. alle zeichen mit wert darunter
-// gelten als kontroll- zeichen. dafuer gibts die methode IsChar, die
-// zurueckgibt, ob es sich um ein standard zeichen handelt. kommt ein
-// solches zeichen, wird dieses zeichen zurueckgegeben und die methode
-// beendet, auch wenn ulEnd noch nicht erreicht wurde. bei nutzung
-// also beachten, dasz wenn !IsChar(Out(...)) gilt, ulEnd unter
-// umstaenden nicht erreicht wurde. dann wurde das kontrollzeichen
-// zwar (weg-)gelesen, jedoch noch nicht ausgegeben.
+// The Out() methods output a number of characters to the shell, a
+// string or a character. The amount of output is determined by ulEnd,
+// which specifies the position at which to stop. Control characters
+// also end the output.
+// They are defined by MinChar. All characters with a value lower than
+// that are treated as control characters. This classification is
+// handled by IsChar. If a control character is encountered, the
+// output method returns immediately and returns it. Pay attention to
+// this; ulEnd might not have been reached if !IsChar(Out(...)). In
+// this case, the control character has been consumed, but not been
+// output.
sal_Unicode Ww1PlainText::Out( Ww1Shell rOut, sal_uLong ulEnd )
{
-// gibt die zeichen bis ulEnd aus, es sei den es kommen sonderzeichen
-// die eine bedeutung haben wie absatzende oder seitenumbruch.
if (ulEnd Count())
ulEnd = Count();
while (ulSeek ulEnd)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75240] improve coding style in bitmap3.cxx
https://bugs.freedesktop.org/show_bug.cgi?id=75240 Mihai Varga mihai.m...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |mihai.m...@gmail.com |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75240] improve coding style in bitmap3.cxx
https://bugs.freedesktop.org/show_bug.cgi?id=75240 --- Comment #2 from Mihai Varga mihai.m...@gmail.com --- Hello, I am willing to work on this bug. I was wondering if it is ok to submit the WHOLE file with it's diff, or should I submit chunks of about 100 lines each? -- 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: filter/source include/vcl oox/source svtools/source svx/source sw/source vcl/source
filter/source/msfilter/escherex.cxx | 36 +---
include/vcl/gfxlink.hxx |6 +++-
oox/source/export/drawingml.cxx |8 ++
svtools/source/graphic/descriptor.cxx |4 +++
svx/source/core/graphichelper.cxx |3 ++
svx/source/dialog/compressgraphicdialog.cxx |3 ++
svx/source/gallery2/galtheme.cxx|5 +++
svx/source/xml/xmlgrhlp.cxx |2 +
svx/source/xoutdev/_xoutbmp.cxx |4 +++
sw/source/filter/ww8/rtfattributeoutput.cxx | 13 ++
vcl/source/filter/graphicfilter.cxx |7 +
vcl/source/gdi/gfxlink.cxx |4 +++
12 files changed, 90 insertions(+), 5 deletions(-)
New commits:
commit af63727b9fdd48258f692d1ccf6d15daccc18681
Author: Armin Le Grand a...@apache.org
Date: Thu Feb 27 13:46:24 2014 +
Resolves: #i15508# Added support for BMP file type
(cherry picked from commit 9956ed1303545cd61901e33b110698c4e5e224c4)
Conflicts:
filter/source/msfilter/escherex.cxx
include/vcl/gfxlink.hxx
svx/source/xml/xmlgrhlp.cxx
sw/source/ui/docvw/romenu.cxx
vcl/source/filter/graphicfilter.cxx
Change-Id: Ibcbb69b9c57cd8a438788e9a9c95744e99b6fcdd
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index a50b72a..06652f1 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4359,6 +4359,15 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream
rPicOutStrm, const OStrin
{
case GFX_LINK_TYPE_NATIVE_JPG :
p_EscherBlibEntry-meBlibType = PEG; break;
case GFX_LINK_TYPE_NATIVE_PNG :
p_EscherBlibEntry-meBlibType = PNG; break;
+
+// #i15508# added BMP type for better exports; need to
check this
+// checked - does not work that way, so keep out for now.
It may
+// work somehow with direct DIB data, but that would need
to be checked
+// carefully
+// for more comments please check
RtfAttributeOutput::FlyFrameGraphic
+//
+// case GFX_LINK_TYPE_NATIVE_BMP :
p_EscherBlibEntry-meBlibType = DIB; break;
+
case GFX_LINK_TYPE_NATIVE_WMF :
{
if ( pGraphicAry ( p_EscherBlibEntry-mnSize 0x2c
) )
@@ -4456,13 +4465,34 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream
rPicOutStrm, const OStrin
else if ( eBlibType == PEG )
rPicOutStrm.WriteUInt16( (sal_uInt16)0x0505 );
}
+
// fdo#69607 do not compress WMF files if we are in OOXML export
-if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) ||
-( ( ( eBlibType == WMF ) || ( eBlibType == EMF ) )
bOOxmlExport ) )
+if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) // || (
eBlibType == DIB )) // #i15508#
+|| ( ( ( eBlibType == WMF ) || ( eBlibType == EMF ) )
bOOxmlExport ) )
{
nExtra = 17;
p_EscherBlibEntry-mnSizeExtra = nExtra + 8;
-nInstance = ( eBlibType == PNG ) ? 0xf01e6e00 : 0xf01d46a0;
+
+// #i15508# type see SvxMSDffManager::GetBLIPDirect (checked,
does not work this way)
+// see RtfAttributeOutput::FlyFrameGraphic for more comments
+// maybe it would work with direct DIB data, but that would
need thorough testing
+if( eBlibType == PNG )
+{
+nInstance = 0xf01e6e00;
+}
+else // if( eBlibType == PEG )
+{
+nInstance = 0xf01d46a0;
+}
+//else // eBlibType == DIB
+//{
+//nInstance = 0xf01d7A80;
+//}
+
+// #i15508#
+//nInstance = ( eBlibType == PNG ) ? 0xf01e6e00 : 0xf01d46a0;
+
+
rPicOutStrm.WriteUInt32( nInstance ).WriteUInt32(
(sal_uInt32)( p_EscherBlibEntry-mnSize + nExtra ) );
rPicOutStrm.Write( p_EscherBlibEntry-mnIdentifier, 16 );
rPicOutStrm.WriteUChar( (sal_uInt8)0xff );
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 35ae2f5..84d4931 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -103,12 +103,14 @@ enum GfxLinkType
GFX_LINK_TYPE_NATIVE_MET= 7,// Don't forget to update the
following defines
GFX_LINK_TYPE_NATIVE_PCT= 8,// Don't forget to update the
following defines
GFX_LINK_TYPE_NATIVE_SVG= 9,// Don't forget to update the
following defines
-GFX_LINK_TYPE_NATIVE_MOV= 10,
+GFX_LINK_TYPE_NATIVE_MOV= 10, // Don't forget to update the
following defines
+//
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 99/56ed1303545cd61901e33b110698c4e5e224c4
99/56ed1303545cd61901e33b110698c4e5e224c4 |1 + 1 file changed, 1 insertion(+) New commits: commit 244103febfd7d6176e3383f2d9a2555e0adb0985 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 27 19:31:06 2014 + Notes added by 'git notes add' diff --git a/99/56ed1303545cd61901e33b110698c4e5e224c4 b/99/56ed1303545cd61901e33b110698c4e5e224c4 new file mode 100644 index 000..c052917 --- /dev/null +++ b/99/56ed1303545cd61901e33b110698c4e5e224c4 @@ -0,0 +1 @@ +merged as: af63727b9fdd48258f692d1ccf6d15daccc18681 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Andrew Dent - license statement
Dear Team, All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Regards, Andrew ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38835] strip out non-trivial globals before main
https://bugs.freedesktop.org/show_bug.cgi?id=38835 --- Comment #8 from Caolán McNamara caol...@redhat.com --- Another approach is to start soffice.bin under gdb and point a breakpoint on __do_global_ctors_aux (I think, something of that nature) and see what gets called during startup. Here are some other resources that might be useful http://neugierig.org/software/chromium/notes/2011/08/static-initializers.html http://stackoverflow.com/questions/335369/finding-c-static-initialization-order-problems -- 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: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 22 ++--
writerfilter/source/dmapper/NumberingManager.cxx |2
writerfilter/source/doctok/resources.xmi | 124 ---
writerfilter/source/ooxml/model.xml |8 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 -
5 files changed, 20 insertions(+), 144 deletions(-)
New commits:
commit 1107ddf30b62f60471978b3128d8ea2b2546aecd
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Feb 27 21:31:49 2014 +0100
writerfilter: convert sprm:C{Hps,HpsBi,Highlight,SfxText}
Change-Id: I7092bd2b99460f083da0ef1515929c41bca6e9b9
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 7a51057..00b23ad 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1298,7 +1298,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
if (pSectionContext != NULL)
pSectionContext-Insert(PROP_WRITING_MODE, uno::makeAny(
text::WritingMode2::RL_TB));
break;
-case NS_sprm::LN_CHighlight:
+case NS_ooxml::LN_EG_RPrBase_highlight:
{
sal_Int32 nColor = 0;
if( (mbIsHighlightSet = getColorFromIndex(nIntValue, nColor)) )
@@ -1306,7 +1306,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
else if (mnBackgroundColor)
rContext-Insert(PROP_CHAR_BACK_COLOR, uno::makeAny(
mnBackgroundColor ));
}
-break; // sprmCHighlight
+break;
case NS_sprm::LN_CKcd:
rContext-Insert(PROP_CHAR_EMPHASIS, uno::makeAny ( getEmphasisValue
(nIntValue)));
break; // sprmCKcd
@@ -1473,13 +1473,13 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
rContext-Insert(PROP_CHAR_COLOR, uno::makeAny( nColor ) );
}
break; // sprmCIco
-case NS_sprm::LN_CHpsBi:// sprmCHpsBi
-case NS_sprm::LN_CHps:// sprmCHps
+case NS_ooxml::LN_EG_RPrBase_sz:
+case NS_ooxml::LN_EG_RPrBase_szCs:
{
//multiples of half points (12pt == 24)
double fVal = double(nIntValue) / 2.;
uno::Any aVal = uno::makeAny( fVal );
-if( NS_sprm::LN_CHpsBi == nSprmId )
+if( NS_ooxml::LN_EG_RPrBase_szCs == nSprmId )
{
rContext-Insert( PROP_CHAR_HEIGHT_COMPLEX, aVal );
}
@@ -1507,7 +1507,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
// Make sure char sizes defined in the stylesheets don't affect
char props from direct formatting.
if (!m_pImpl-IsStyleSheetImport())
m_pImpl-deferCharacterProperty( nSprmId, uno::makeAny(
nIntValue ));
-m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, (nSprmId ==
NS_sprm::LN_CHps ? OUString(sz) : OUString(szCs)),
OUString::number(nIntValue));
+m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, (nSprmId ==
NS_ooxml::LN_EG_RPrBase_sz ? OUString(sz) : OUString(szCs)),
OUString::number(nIntValue));
}
break;
case NS_ooxml::LN_EG_RPrBase_position:
@@ -1582,14 +1582,14 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
rContext-Insert(PROP_CHAR_RELIEF,
uno::makeAny( nIntValue ? awt::FontRelief::ENGRAVED :
awt::FontRelief::NONE ));
break;
-case NS_sprm::LN_CSfxText:
+case NS_ooxml::LN_EG_RPrBase_effect:
// The file-format has many character animations. We have only
// one, so we use it always. Suboptimal solution though.
if (nIntValue)
rContext-Insert(PROP_CHAR_FLASH, uno::makeAny( true ));
else
rContext-Insert(PROP_CHAR_FLASH, uno::makeAny( false ));
-break; // sprmCSfxText
+break;
case NS_sprm::LN_CFBiDi:
break; // sprmCFBiDi
case NS_sprm::LN_CShd:
@@ -2397,8 +2397,8 @@ void DomainMapper::processDeferredCharacterProperties(
const std::map sal_Int32
it-second = sStringValue;
switch( Id )
{
-case NS_sprm::LN_CHps:
-case NS_sprm::LN_CHpsBi:
+case NS_ooxml::LN_EG_RPrBase_sz:
+case NS_ooxml::LN_EG_RPrBase_szCs:
break; // only for use by other properties, ignore here
case NS_ooxml::LN_EG_RPrBase_position:
{
@@ -2408,7 +2408,7 @@ void DomainMapper::processDeferredCharacterProperties(
const std::map sal_Int32
nProp = 0;
else
{
-std::map sal_Int32, uno::Any ::const_iterator font =
deferredCharacterProperties.find( NS_sprm::LN_CHps );
+std::map sal_Int32, uno::Any ::const_iterator font =
deferredCharacterProperties.find( NS_ooxml::LN_EG_RPrBase_sz );
PropertyMapPtr
Aditya Kale License Statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/jmux/master+fixes' - 2 commits - .gitignore vcl/unx
.gitignore |8
vcl/unx/kde4/KDESalGraphics.cxx | 21 -
vcl/unx/kde4/KDESalInstance.cxx |5 +
vcl/unx/kde4/KDESalInstance.hxx |1 +
vcl/unx/kde4/KDEXLib.cxx| 26 +-
vcl/unx/kde4/KDEXLib.hxx|5 -
6 files changed, 47 insertions(+), 19 deletions(-)
New commits:
commit 99071043c11b754b41f202d318fc63339d0243c7
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Thu Feb 27 20:34:00 2014 +
KDE4: evaluate frameWidth in the Qt thread
QWidget::ensurePolished() uses events, which need to be processed in
the Qt thread. This happens when opening a document via Java UNO,
and no LO instance is already running. The Java UNO call is processed
in the main / Qt thread while loading happens in a second thread.
Actually getNativeControlRegion should not involve any drawing, but
KDE4 needs it to get the correct frame width.
Change-Id: I344d5089d958963c48a9a8a84bfa9fe8f092b75a
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index a41b0cd1..4fbe79b 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -31,10 +31,12 @@
#undef Region
#include KDESalGraphics.hxx
+#include KDESalInstance.hxx
#include vcl/settings.hxx
#include vcl/decoview.hxx
#include rtl/ustrbuf.hxx
+#include unx/saldata.hxx
using namespace ::rtl;
@@ -165,21 +167,6 @@ namespace
kapp-style()-drawComplexControl(element, option, painter);
}
-int getFrameWidth()
-{
-static int s_nFrameWidth = -1;
-if( s_nFrameWidth 0 )
-{
-// fill in a default
-QFrame aFrame( NULL );
-aFrame.setFrameRect( QRect(0, 0, 100, 30) );
-aFrame.setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
-aFrame.ensurePolished();
-s_nFrameWidth = aFrame.frameWidth();
-}
-return s_nFrameWidth;
-}
-
void lcl_drawFrame(QStyle::PrimitiveElement element, QImage* image,
QStyle::State state)
{
#if ( QT_VERSION = QT_VERSION_CHECK( 4, 5, 0 ) )
@@ -554,7 +541,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type,
ControlPart part,
vclStateValue2StateFlag(nControlState, value) );
// draw just the border, see
http://qa.openoffice.org/issues/show_bug.cgi?id=107945
-int fw = getFrameWidth();
+int fw = static_cast KDESalInstance*
(GetSalData()-m_pInstance)-getFrameWidth();
clipRegion = new QRegion( QRegion( widgetRect ).subtracted(
widgetRect.adjusted( fw, fw, -fw, -fw )));
}
else if (type == CTRL_WINDOW_BACKGROUND)
@@ -857,7 +844,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType
type, ControlPart part,
{
if( part == PART_BORDER )
{
-int nFrameWidth = getFrameWidth();
+int nFrameWidth = static_cast KDESalInstance*
(GetSalData()-m_pInstance)-getFrameWidth();
sal_uInt16 nStyle = val.getNumericVal();
if( nStyle FRAME_DRAW_NODRAW )
{
diff --git a/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx
index 224ac3a..9670172 100644
--- a/vcl/unx/kde4/KDESalInstance.cxx
+++ b/vcl/unx/kde4/KDESalInstance.cxx
@@ -38,4 +38,9 @@ uno::Reference ui::dialogs::XFilePicker2
KDESalInstance::createFilePicker(
static_castKDEXLib*( mpXLib )-createFilePicker(xMSF) );
}
+int KDESalInstance::getFrameWidth()
+{
+return static_castKDEXLib*( mpXLib )-getFrameWidth();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 3c07f52..f73af0d 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -36,6 +36,7 @@ class KDESalInstance : public X11SalInstance
virtual com::sun::star::uno::Reference
com::sun::star::ui::dialogs::XFilePicker2
createFilePicker( const com::sun::star::uno::Reference
com::sun::star::uno::XComponentContext );
+int getFrameWidth();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 2cf71e1..1f000d9 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -59,7 +59,7 @@ KDEXLib::KDEXLib() :
SalXLib(), m_bStartupDone(false), m_pApplication(0),
m_pFreeCmdLineArgs(0), m_pAppCmdLineArgs(0), m_nFakeCmdLineArgs( 0 ),
eventLoopType( LibreOfficeEventLoop ),
-m_bYieldFrozen( false )
+m_bYieldFrozen( false ), m_frameWidth( -1 )
{
// the timers created here means they belong to the main thread
connect( timeoutTimer, SIGNAL( timeout()), this, SLOT(
timeoutActivated()));
@@ -82,6 +82,9 @@ KDEXLib::KDEXLib() :
this, SLOT( createFilePicker( const
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - sc/source
sc/source/core/data/column3.cxx | 25 -
sc/source/core/tool/token.cxx |3 +++
sc/source/filter/xml/xmlexprt.cxx |7 ---
3 files changed, 23 insertions(+), 12 deletions(-)
New commits:
commit 64ea6100c6a6b85bea1d01715b17724de045810a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Feb 18 22:57:39 2014 -0500
fdo#72491: Always set input as text when that's requested.
Even when the text begins with '='.
(cherry picked from commit ca50752c34de4477c696471b707e1b8136e27661)
Conflicts:
sc/source/core/data/column3.cxx
Change-Id: I6e0a995f3042240b9f78068b5d0b9b758eb253ed
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c19662e..4bd6a5a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1185,6 +1185,19 @@ void ScColumn::StartListeningInArea(
sc::StartListeningContext rCxt, SCROW nRow
}
}
+namespace {
+
+void applyTextNumFormat( ScColumn rCol, ScDocument rDoc, SCROW nRow,
SvNumberFormatter* pFormatter )
+{
+sal_uInt32 nFormat = pFormatter-GetStandardFormat(NUMBERFORMAT_TEXT);
+ScPatternAttr aNewAttrs(rDoc.GetPool());
+SfxItemSet rSet = aNewAttrs.GetItemSet();
+rSet.Put(SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat));
+rCol.ApplyPattern(nRow, aNewAttrs);
+}
+
+}
+
bool ScColumn::ParseString(
ScCellValue rCell, SCROW nRow, SCTAB nTabP, const String rString,
formula::FormulaGrammar::AddressConvention eConv,
@@ -1217,6 +1230,12 @@ bool ScColumn::ParseString(
{
if ( rString.Len() == 1 ) // = Text
rCell.set(rString);
+else if (aParam.meSetTextNumFormat == ScSetStringParam::Always)
+{
+// Set the cell format type to Text.
+applyTextNumFormat(*this, *pDocument, nRow, aParam.mpNumFormatter);
+rCell.set(rString);
+}
else // = Formula
rCell.set(
new ScFormulaCell(
@@ -1325,11 +1344,7 @@ bool ScColumn::ParseString(
if (aParam.meSetTextNumFormat != ScSetStringParam::Never
aParam.mpNumFormatter-IsNumberFormat(rString, nIndex, nVal))
{
// Set the cell format type to Text.
-sal_uInt32 nFormat =
aParam.mpNumFormatter-GetStandardFormat(NUMBERFORMAT_TEXT);
-ScPatternAttr aNewAttrs(pDocument-GetPool());
-SfxItemSet rSet = aNewAttrs.GetItemSet();
-rSet.Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat) );
-ApplyPattern(nRow, aNewAttrs);
+applyTextNumFormat(*this, *pDocument, nRow,
aParam.mpNumFormatter);
}
rCell.set(rString);
commit ad1aed031148f3e2278eb2c6e3c285cdf61160f7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Feb 14 20:39:18 2014 -0500
fdo#72691: Allow overwriting of string value with numeric one.
This can legitimately happen when you have a matrix with a reference to
another cell inside, and the referenced cell originally contained a
string value then later overwritten by a numeric value.
Example. Put a Text in A1, and in B1 put a 1x1 matrix {=A1}. It
displays Text in B1. Then put 11 in A1. Prior to this change, B1
would become blank. With this change, B1 will display 11.
Change-Id: I3feba3a8658e1a5ebf6f9e5ac34de2d579464ddb
(cherry picked from commit 9bf907a8278cecd816368db7b8c4ab745a914a59)
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 3dff6a9..cd14c4c 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1084,6 +1084,9 @@ void ScMatrixFormulaCellToken::SetUpperLeftDouble( double
f )
case svDouble:
const_castFormulaToken*(xUpperLeft.get())-GetDoubleAsReference() = f;
break;
+case svString:
+xUpperLeft = new FormulaDoubleToken( f);
+break;
case svUnknown:
if (!xUpperLeft)
{
commit 827d589da74b3f6656a7e5726b106bc087ba9bd7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Feb 14 11:41:02 2014 -0500
fdo#72390: Let's not skip auto styles from unmodified sheets.
We do re-use sheet XML stream for unmodified sheets on re-save, which
is okay. But skipping auto style population from unmodified sheets
is not okay because autostyles are shared across all sheets and written
outside the sheet XML streams. Skipping styles from unmodified sheets
could potentially fail to export used styles, not to mention could
cause a crash as reported in the bug.
Change-Id: I73e439f7354e341c2c07e28ecca5452193985860
(cherry picked from commit 5000e64ecc55efd47d92714cf6db375ff37aac4b)
(cherry picked from commit 47e540d8323e8ea2db5e7aae455503b32f306ca3)
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 09dc864..4b09c3b
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #104 from choffardet pierre.choffar...@free.fr --- Can someone consider adding this bug to MAB 4.2 https://bugs.freedesktop.org/show_bug.cgi?id=75408 Formula in writer is shrinked instead of keeping same size when changing border space in writer style There is no workaround and i's a functionality loss -- 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
Mihai Varga license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Bug 73552 - Set name of CSV import sheet to something friendly
0001-Set-name-of-CSV-import-sheet-to-something-friendly.patch ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
STL iterators and for loops
In the stackoverflow question What does enabling STL iterator
debugging really do? [1], the top answer points out that creation and
destruction of STL iterators in debug mode is comparatively expensive.
The example given in the answer is:
for (iterator_t it = vec.begin();
it != vec.end(); // Oups
++it)
// body
LibreOffice has quite a number of loops written this way. Do we care?
My builds with --enable-dbgutil are noticeably slow, but (a) that
build option does other things, too; (b) my machine is very
underpowered for this task; and (c) most people do not use debug
builds. So, possibly we do not care. OTOH, hoisting vec.end() so
that is is called only once should be a quite mechanical task, even a
candidate for an easyhack.
FWIW, the output from
git grep --extended-regexp '((for)|(while)) *\(.*\. *end\('
was 2974 lines when I looked at it. An examination of 13 lines from
the output shows that 10 of them evaluate end() in each iteration.
Measurement of the actual cost in performance is beyond my capability.
Just for reference, note the thread on the this list General question
about vectors [2], which discusses the choice between `for` loops and
`for_each` calls.
Thoughts?
Terry.
References:
[1]
http://stackoverflow.com/questions/2731419/what-does-enabling-stl-iterator-debugging-really-do
[2]
http://nabble.documentfoundation.org/General-question-about-vectors-td4094114.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] FILESAVE: Empty custom properties are lost while saving in .doc format
Hi, The Bug is filed and accepted at: https://bugs.freedesktop.org/show_bug.cgi?id=75243 Steps to reproduce: 1. Open Writer and use a document .doc 2. Add it a custom property. Don't enter any value for the property 3. Save it and close Writer 4. Open again Writer and use same document recently saved. 5. Custom property is lost. Attached is a patch that solves the problem. Patch is also attached to the bug. Please consider this patch for inclusion. I declare that this and my further patches are under LGPLv3+ / MPL license. With Regards, Tarun Kumar TOGAF®, CSM®, PMP®, PRINCE2®, ITILV3® --- oleprops.hxx 2014-01-14 15:00:18.0 +0530 +++ oleprops_copy.hxx 2014-02-20 10:57:54.286704766 +0530 @@ -310,7 +310,7 @@ voidSetBoolValue( sal_Int32 nPropId, bool bValue ); /** Inserts a string property with the passed value. @return true = Property inserted; false = String was empty, property not inserted. */ -boolSetStringValue( sal_Int32 nPropId, const OUString rValue, bool bSkipEmpty = true ); +boolSetStringValue( sal_Int32 nPropId, const OUString rValue, bool bSkipEmpty = false ); /** Inserts a time stamp property with the passed value. */ voidSetFileTimeValue( sal_Int32 nPropId, const ::com::sun::star::util::DateTime rValue ); /** Inserts a date property with the passed value. */ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
BuildBot BUG
Hi folks, The buildbot is adding broken links in the history. It's aways showing this link: https://ci.libreoffice.org/job/buildbot/0 Can someone take a look? It's a little bit harder when we have to check something in logs. I need to go at Jenkins and find in the history by the build number. Thanks, Alexandre Vicenzi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice Digest, Vol 42, Issue 27
Hello I'm working on a new extension for LibreOffice writer, and I need to see how, if possible, from OOo Basic capture the dimension of the user's screen and the size of the current window of LibreOffice on which you are working. I hope some of you can help me. any suggestions about how to view two documents in the same editor and move both at once is also useful. thanks. I program in LibreOffice Basic. Hola estoy trabajando en una nueva extensión para LibreOffice writer, y necesito ver la manera, si es posible, desde LibreOffice Basic capturar la dimensión de la pantalla del usuario y la dimensión de la ventana actual de LibreOffice sobre la que se está trabajando. Espero que alguno de ustedes pueda ayudarme. Ah cualquier sugerencia acerca de cómo visulizar dos documentos en el mismo editor y poder dezplazarme por ambos a la vez tambien es de utilidad. Quedo al tanto.Gracias - Mensaje original - De: libreoffice-requ...@lists.freedesktop.org Para: libreoffice@lists.freedesktop.org Enviados: Martes, 25 de Febrero 2014 15:00:27 Asunto: LibreOffice Digest, Vol 42, Issue 27 Send LibreOffice mailing list submissions to libreoffice@lists.freedesktop.org To subscribe or unsubscribe via the World Wide Web, visit http://lists.freedesktop.org/mailman/listinfo/libreoffice or, via email, send a message with subject or body 'help' to libreoffice-requ...@lists.freedesktop.org You can reach the person managing the list at libreoffice-ow...@lists.freedesktop.org When replying, please edit your Subject line so it is more specific than Re: Contents of LibreOffice digest... Today's Topics: 1. [Bug 63962] Remove LibreOffice icon themes hardcoding (bugzilla-dae...@freedesktop.org) 2. [Bug 30425] Making Icon Themes is Far too Difficult (bugzilla-dae...@freedesktop.org) 3. Re: core.git: bin/gbuild-to-ide (Jan Havl??ek) 4. [Bug 64900] Write a PyUNO tutorial/walktrough (bugzilla-dae...@freedesktop.org) 5. [Bug 64900] Write a PyUNO tutorial/walktrough (bugzilla-dae...@freedesktop.org) 6. LibreOffice Gerrit News for core on 2014-02-25 (ger...@libreoffice.org) 7. RE: fdo75264 incorrect function name tips, suggestions wanted (Winfried Donkers) 8. Re: junit autogen error? (Stephan Bergmann) 9. QA Meeting Minutes - 2014-02-24 (Robinson Tryon) 10. Re: Drop CLANGBUILD in addition to CLANGDIR? (Stephan Bergmann) 11. Can XML been imported/transformed with API (Fernand Vanrie) 12. Re: Testing/Working on PyUNO? (Kevin Hunter Kesling) 13. Re: Minutes of ESC call (Noel Grandin) 14. Notes on compilerplugins/clang/store/salbool.cxx (Stephan Bergmann) 15. Paris Hackfest in June (Charles-H. Schulz) 16. Re: Fix for a crash test? (Miklos Vajna) 17. Re: Fix for a crash test? (Michael Stahl) 18. Need help, regarding Easy Hack, Bug 64290 - UI: count selected rows and columns.. (Sujay m) 19. Re: Fix for a crash test? (julien2412) -- Message: 1 Date: Mon, 24 Feb 2014 22:25:24 + From: bugzilla-dae...@freedesktop.org To: libreoffice@lists.freedesktop.org Subject: [Bug 63962] Remove LibreOffice icon themes hardcoding Message-ID: bug-63962-19970-ddvtydt...@http.bugs.freedesktop.org/ Content-Type: text/plain; charset=utf-8 https://bugs.freedesktop.org/show_bug.cgi?id=63962 Tobias Lippert d...@fastmail.fm changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED --- Comment #12 from Tobias Lippert d...@fastmail.fm --- The changes are available on the master branch. If you find that the feature is not working as desired, please reopen the bug. -- You are receiving this mail because: You are on the CC list for the bug. -- next part -- An HTML attachment was scrubbed... URL: http://lists.freedesktop.org/archives/libreoffice/attachments/20140224/2c854ab8/attachment-0001.html -- Message: 2 Date: Mon, 24 Feb 2014 22:25:25 + From: bugzilla-dae...@freedesktop.org To: libreoffice@lists.freedesktop.org Subject: [Bug 30425] Making Icon Themes is Far too Difficult Message-ID: bug-30425-19970-bumkijh...@http.bugs.freedesktop.org/ Content-Type: text/plain; charset=utf-8 https://bugs.freedesktop.org/show_bug.cgi?id=30425 Bug 30425 depends on bug 63962, which changed state. Bug 63962 Summary: Remove LibreOffice icon themes hardcoding https://bugs.freedesktop.org/show_bug.cgi?id=63962 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the
GSoC 2014 Fresh Ideas
Hi, I wish to contribute to LibreOffice and work through GSoC 2014. I have read through the Ideas page of LibreOffice. I have a few project ideas other than those listed there. 1) Writer - Bullets and Numbering button I wish to implement a bullets and numbering button in the toolbar, since it is a frequently used command. The toolbar button could be a button-cum-dropdown populated with frequently used bullet and numbering styles and an advanced button as a shortcut to the complete dialog box. 2) Writer - Advanced Text Shadows I wish to implement advanced text shadows as a part of formatting characters. The new text shadow would be more customizable. The user will be able to control relative x, y positioning, blur radius, colour of the shadow. We could render a toolbar button for the same if possible. Please review the ideas and make suggestions as necessary. Regards, Ashutosh Agarwal, IInd Year BTech, Computer Science and Engineering, Indian Institute of Technology, Patna. Email: ashutosh.e...@iitp.ac.in Ph# +91-9453012060 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: tools/source
tools/source/stream/stream.cxx | 46 -
1 file changed, 27 insertions(+), 19 deletions(-)
New commits:
commit 95b401558466954453d490456be01beb6d747806
Author: David Tardon dtar...@redhat.com
Date: Thu Feb 27 13:49:25 2014 +0100
do not crash if allocation failed
Change-Id: I2fbc259de52a3c7f2c8c33027d74bb857d44b437
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 476f1a8..1c8ac21 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -2056,14 +2056,18 @@ OString read_uInt8s_ToOString(SvStream rStrm, sal_Size
nLen)
//alloc a (ref-count 1) rtl_String of the desired length.
//rtl_String's buffer is uninitialized, except for null termination
pStr = rtl_string_alloc(sal::static_int_castsal_Int32(nLen));
-sal_Size nWasRead = rStrm.Read(pStr-buffer, nLen);
-if (nWasRead != nLen)
+SAL_WARN_IF(!pStr, tools, allocation failed);
+if (pStr)
{
-//on (typically unlikely) short read set length to what we could
-//read, and null terminate. Excess buffer capacity remains of
-//course, could create a (true) replacement OString if it matters.
-pStr-length = sal::static_int_castsal_Int32(nWasRead);
-pStr-buffer[pStr-length] = 0;
+sal_Size nWasRead = rStrm.Read(pStr-buffer, nLen);
+if (nWasRead != nLen)
+{
+//on (typically unlikely) short read set length to what we
could
+//read, and null terminate. Excess buffer capacity remains of
+//course, could create a (true) replacement OString if it
matters.
+pStr-length = sal::static_int_castsal_Int32(nWasRead);
+pStr-buffer[pStr-length] = 0;
+}
}
}
@@ -2081,19 +2085,23 @@ OUString read_uInt16s_ToOUString(SvStream rStrm,
sal_Size nLen)
//alloc a (ref-count 1) rtl_uString of the desired length.
//rtl_String's buffer is uninitialized, except for null termination
pStr = rtl_uString_alloc(sal::static_int_castsal_Int32(nLen));
-sal_Size nWasRead = rStrm.Read(pStr-buffer, nLen*2)/2;
-if (nWasRead != nLen)
-{
-//on (typically unlikely) short read set length to what we could
-//read, and null terminate. Excess buffer capacity remains of
-//course, could create a (true) replacement OUString if it matters.
-pStr-length = sal::static_int_castsal_Int32(nWasRead);
-pStr-buffer[pStr-length] = 0;
-}
-if (rStrm.IsEndianSwap())
+SAL_WARN_IF(!pStr, tools, allocation failed);
+if (pStr)
{
-for (sal_Int32 i = 0; i pStr-length; ++i)
-pStr-buffer[i] = OSL_SWAPWORD(pStr-buffer[i]);
+sal_Size nWasRead = rStrm.Read(pStr-buffer, nLen*2)/2;
+if (nWasRead != nLen)
+{
+//on (typically unlikely) short read set length to what we
could
+//read, and null terminate. Excess buffer capacity remains of
+//course, could create a (true) replacement OUString if it
matters.
+pStr-length = sal::static_int_castsal_Int32(nWasRead);
+pStr-buffer[pStr-length] = 0;
+}
+if (rStrm.IsEndianSwap())
+{
+for (sal_Int32 i = 0; i pStr-length; ++i)
+pStr-buffer[i] = OSL_SWAPWORD(pStr-buffer[i]);
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 73860, which changed state. Bug 73860 Summary: FILEOPEN: Space characters missing in PPTX file (4.2 specific) https://bugs.freedesktop.org/show_bug.cgi?id=73860 What|Removed |Added Status|RESOLVED|REOPENED 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
ProposedEasyHack Changed to NeedsDevEval
Hi All, Just got done changing all ProposedEasyHack to NeedsDevEval. Having ProposedEasyHack was causing some confusion and caused some headaches for queries so the new status is once agains *NeedsDevEval. *Change: Old: ProposedEasyHack New: NeedsDevEval I left Resolved bugs alone just to avoid the extra noise. Warm Regards, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75240] improve coding style in bitmap3.cxx
https://bugs.freedesktop.org/show_bug.cgi?id=75240 --- Comment #3 from Markus Mohrhard markus.mohrh...@googlemail.com --- (In reply to comment #2) Hello, I am willing to work on this bug. I was wondering if it is ok to submit the WHOLE file with it's diff, or should I submit chunks of about 100 lines each? Please submit a git format-patch or use gerrit.libreoffice.org directly. -- 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 - formula/source include/formula include/rtl sal/inc sal/Library_sal.mk sal/osl sal/rtl sal/util sc/inc sc/source
formula/source/core/api/vectortoken.cxx | 29 +
include/formula/vectortoken.hxx | 13 --
include/rtl/alloc.h | 24 +++
sal/Library_sal.mk |2
sal/inc/internal/oslmemory.h| 30 ++
sal/osl/unx/memory.c| 26
sal/osl/w32/memory.c| 24 +++
sal/rtl/alloc_global.cxx| 11 +
sal/util/sal.map|6 ++
sc/inc/formulagroup.hxx |4 +
sc/inc/stlalgorithm.hxx | 60
sc/source/core/data/grouptokenconverter.cxx | 12 ++---
12 files changed, 222 insertions(+), 19 deletions(-)
New commits:
commit 03f7a342011a4f69cfcbec7af3e4f1a2e835618b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Feb 26 16:29:27 2014 -0500
Ensure that numeric array storage is aligned to 256-byte boundary.
OpenCL devices require this else we would get a performance hit.
Change-Id: I6b1db6320fa84f933b6446022a0fd02ba267bf21
diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h
index 9d0b44e..f3459ba 100644
--- a/include/rtl/alloc.h
+++ b/include/rtl/alloc.h
@@ -96,6 +96,30 @@ SAL_DLLPUBLIC void SAL_CALL rtl_freeZeroMemory (
) SAL_THROW_EXTERN_C();
+/** Allocate memory.
+
+A call to this function will return NULL upon the requested
+memory size being either zero or larger than currently allocatable.
+
+@param Alignment alignment in bytes.
+@param Bytes [in] memory size.
+@return pointer to allocated memory.
+ */
+SAL_DLLPUBLIC void* SAL_CALL rtl_allocateAlinedMemory (
+sal_Size Alignment,
+sal_Size Bytes
+) SAL_THROW_EXTERN_C();
+
+
+/** Free memory allocated with rtl_allocateAlinedMemory.
+@param Ptr [in] pointer to previously allocated memory.
+@return none. Memory is released. Ptr is invalid.
+ */
+SAL_DLLPUBLIC void SAL_CALL rtl_freeAlignedMemory (
+void * Ptr
+) SAL_THROW_EXTERN_C();
+
+
/** Opaque rtl_arena_type.
*/
typedef struct rtl_arena_st rtl_arena_type;
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index cbc52a7..6b16426 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -168,6 +168,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
$(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
))
$(eval $(call gb_Library_add_cobjects,sal,\
+ sal/osl/unx/memory \
sal/osl/unx/mutex \
sal/osl/unx/nlsupport \
sal/osl/unx/pipe \
@@ -253,6 +254,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/w32/dllentry \
sal/osl/w32/file_error \
sal/osl/w32/interlck \
+ sal/osl/w32/memory \
sal/osl/w32/mutex \
sal/osl/w32/nlsupport \
sal/osl/w32/pipe \
diff --git a/sal/inc/internal/oslmemory.h b/sal/inc/internal/oslmemory.h
new file mode 100644
index 000..8ef094a
--- /dev/null
+++ b/sal/inc/internal/oslmemory.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SAL_INTERNAL_OSLMEMORY_H
+#define INCLUDED_SAL_INTERNAL_OSLMEMORY_H
+
+#include sal/saldllapi.h
+#include sal/types.h
+
+#if defined __cplusplus
+extern C {
+#endif
+
+void* osl_aligned_alloc( sal_Size align, sal_Size size );
+
+void osl_aligned_free( void* p );
+
+#if defined __cplusplus
+}
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/memory.c b/sal/osl/unx/memory.c
new file mode 100644
index 000..a70bc16
--- /dev/null
+++ b/sal/osl/unx/memory.c
@@ -0,0 +1,26 @@
+/* -*- 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 internal/oslmemory.h
+
+#include stdlib.h
+
+void* osl_aligned_alloc( sal_Size align, sal_Size size )
+{
+void* ptr;
+int err = posix_memalign(ptr, align, size);
+return err ? NULL : ptr;
+}
+
+void osl_aligned_free( void* p )
+{
+free(p);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/memory.c b/sal/osl/w32/memory.c
new file mode 100644
index 000..279a168
--- /dev/null
+++ b/sal/osl/w32/memory.c
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/columnspanset.hxx |2
sc/inc/markdata.hxx|3
sc/qa/unit/subsequent_filters-test.cxx |8 +-
sc/source/core/data/markdata.cxx | 114 -
sc/source/ui/docshell/docfunc.cxx | 38 +--
sc/source/ui/inc/docfunc.hxx | 13 ++-
sc/source/ui/inc/undoblk.hxx |5 -
sc/source/ui/inc/viewfunc.hxx | 14 ++--
sc/source/ui/undo/undoblk2.cxx |9 +-
sc/source/ui/unoobj/cellsuno.cxx | 26 +++
sc/source/ui/unoobj/docuno.cxx | 27 +++
sc/source/ui/vba/vbarange.cxx | 32 +++--
sc/source/ui/view/colrowba.cxx | 41 +++
sc/source/ui/view/preview.cxx |6 -
sc/source/ui/view/viewfunc.cxx | 80 +++
15 files changed, 139 insertions(+), 279 deletions(-)
New commits:
commit cf70996311af2081b2e5920ad27094a0774bdd05
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 27 21:29:30 2014 -0500
Remove all uses of GetMarkRowRanges() and use GetMarkedRowSpans().
And ditto with its column variant. The former created a heap array of
1 million elements (=MAXROWCOUNT). There is no need for this memory
wastage.
Change-Id: I07845966c51cdcbdc676cd0d249f6420a19b9c5e
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 7da9896..60dae41 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -33,7 +33,7 @@ struct RowSpan
RowSpan(SCROW nRow1, SCROW nRow2);
};
-struct ColRowSpan
+struct SC_DLLPUBLIC ColRowSpan
{
SCCOLROW mnStart;
SCCOLROW mnEnd;
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index 6733036..da225f5 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -106,9 +106,6 @@ public:
voidMarkFromRangeList( const ScRangeList rList, bool bReset );
-SCCOLROWGetMarkColumnRanges( SCCOLROW* pRanges );
-SCCOLROWGetMarkRowRanges( SCCOLROW* pRanges );
-
std::vectorsc::ColRowSpan GetMarkedRowSpans() const;
std::vectorsc::ColRowSpan GetMarkedColSpans() const;
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 474700b..4df450c 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -48,6 +48,7 @@
#include dpsave.hxx
#include dpshttab.hxx
#include scopetools.hxx
+#include columnspanset.hxx
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include com/sun/star/drawing/XControlShape.hpp
@@ -2335,12 +2336,11 @@ void ScFiltersTest::testOptimalHeightReset()
nHeight = sc::TwipsToHMM( pDoc-GetRowHeight(nRow, nTab, false) );
// set optimal height for empty row 2
-SCCOLROW nRowArr[2];
-nRowArr[0] = nRowArr[1] = 2;
-rFunc.SetWidthOrHeight( false, 1, nRowArr, nTab, SC_SIZE_OPTIMAL, 0, true,
true );
+std::vectorsc::ColRowSpan aRowArr(1, sc::ColRowSpan(2,2));
+rFunc.SetWidthOrHeight(false, aRowArr, nTab, SC_SIZE_OPTIMAL, 0, true,
true);
// retrieve optimal height
-int nOptimalHeight = sc::TwipsToHMM( pDoc-GetRowHeight( nRowArr[0], nTab,
false) );
+int nOptimalHeight = sc::TwipsToHMM(
pDoc-GetRowHeight(aRowArr[0].mnStart, nTab, false) );
// check if the new height of A1 ( after delete ) is now the optimal
height of an empty cell
CPPUNIT_ASSERT_EQUAL(nOptimalHeight, nHeight );
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 0ca8ebc..04277bf 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -437,120 +437,6 @@ ScRangeList ScMarkData::GetMarkedRanges() const
return aRet;
}
-SCCOLROW ScMarkData::GetMarkColumnRanges( SCCOLROW* pRanges )
-{
-if (bMarked)
-MarkToMulti();
-
-if (!bMultiMarked)
-return 0;
-
-OSL_ENSURE(pMultiSel, bMultiMarked, but pMultiSel == 0);
-
-const SCCOLROW nMultiStart = aMultiRange.aStart.Col();
-const SCCOLROW nMultiEnd = aMultiRange.aEnd.Col();
-if (nMultiStart == 0 nMultiEnd == MAXCOL)
-{
-// One or more entire rows.
-pRanges[0] = 0;
-pRanges[1] = MAXCOL;
-return 1;
-}
-
-SCCOLROW nRangeCnt = 0;
-SCCOLROW nStart = nMultiStart;
-while (nStart = nMultiEnd)
-{
-while (nStart nMultiEnd !pMultiSel[nStart].HasMarks())
-++nStart;
-if (pMultiSel[nStart].HasMarks())
-{
-SCCOLROW nEnd = nStart;
-while (nEnd nMultiEnd pMultiSel[nEnd].HasMarks())
-++nEnd;
-if (!pMultiSel[nEnd].HasMarks())
---nEnd;
-pRanges[2*nRangeCnt ] = nStart;
-pRanges[2*nRangeCnt+1] = nEnd;
-++nRangeCnt;
-nStart = nEnd+1;
-}
-else
-nStart = nMultiEnd+1;
-}
-
-return nRangeCnt;
-}
-
-SCCOLROW ScMarkData::GetMarkRowRanges( SCCOLROW* pRanges )
-{
-if
[Libreoffice-commits] core.git: configure.ac
configure.ac | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 10e3474d9096fa6428a6d68e6e486293c323d4a1 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Feb 27 21:50:02 2014 -0500 Typo: counter-producive - counter-productive Change-Id: I69ad51d99b11976b07fafff9748ada0acc215c78 diff --git a/configure.ac b/configure.ac index 7639f45..4d98071 100644 --- a/configure.ac +++ b/configure.ac @@ -2447,18 +2447,18 @@ if test $CCACHE != ; then # we could not determine the size or it was less than 1GB - disable auto-ccache if test $ccache_size -lt 1024; then CCACHE= -AC_MSG_WARN([ccache's cache size is less than 1GB using it is counter-producive: Disabling auto-ccache detection]) -add_warning ccache's cache size is less than 1GB using it is counter-producive: auto-ccache detection disabled +AC_MSG_WARN([ccache's cache size is less than 1GB using it is counter-productive: Disabling auto-ccache detection]) +add_warning ccache's cache size is less than 1GB using it is counter-productive: auto-ccache detection disabled else # warn that ccache may be too small for debug build -AC_MSG_WARN([ccache's cache size is less than 5GB using it may be counter-producive for debug or symbol-enabled build]) -add_warning ccache's cache size is less than 5GB using it may be counter-producive for debug or symbol-enabled build +AC_MSG_WARN([ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build]) +add_warning ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build fi else if test $ccache_size -lt 5; then #warn that ccache may be too small for debug build -AC_MSG_WARN([ccache's cache size is less than 5GB using it may be counter-producive for debug or symbol-enabled build]) -add_warning ccache's cache size is less than 5GB using it may be counter-producive for debug or symbol-enabled build +AC_MSG_WARN([ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build]) +add_warning ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build fi fi fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 m.a.riosv mari...@miguelangel.mobi changed: What|Removed |Added Depends on||75053 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |3 -
sd/source/ui/view/drviews1.cxx| 14 +-
sd/source/ui/view/drviews3.cxx| 29 +++---
sd/source/ui/view/drviews4.cxx|6 ++
sd/source/ui/view/drviews7.cxx| 29 --
sd/source/ui/view/drviewsb.cxx| 24 ++-
6 files changed, 83 insertions(+), 22 deletions(-)
New commits:
commit 903afaa8ea0766e01ba41a227d2794c2c40b129a
Author: Armin Le Grand a...@apache.org
Date: Fri Feb 28 02:15:29 2014 +
i87182 secured usage of LayerTabBar in Draw application, ensured
initialization when used as OLE
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 5a00795..acd38ae 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -876,7 +876,8 @@ uno::Any SAL_CALL
AccessibleDocumentViewBase::getExtendedAttributes()
sValue += sName;
sValue +=
String::CreateFromInt32(pDrViewSh-GetPageTabControl()-GetPageCount()) ;
sValue += rtl::OUString::createFromAscii(;);
-if(pDrViewSh-IsLayerModeActive() )
+
+if(pDrViewSh-IsLayerModeActive() pDrViewSh-GetLayerTabControl())
// #87182#
{
sName = rtl::OUString::createFromAscii(page-name:);
sValue = sName;
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 6dbb4c8..7c1f44b 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -401,7 +401,13 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
GetViewShellBase().GetDrawController().BroadcastContextChange();
meEditMode = eEMode;
-mbIsLayerModeActive = bIsLayerModeActive;
+
+if(pLayerBar)
+{
+// #87182# only switch activation mode of LayerTabBar when there
is one,
+// else it will not get initialized with the current set of Layers
as needed
+mbIsLayerModeActive = bIsLayerModeActive;
+}
// Determine whether to show the master view toolbar. The master
// page mode has to be active and the shell must not be a handout
@@ -684,7 +690,11 @@ IMPL_LINK( DrawViewShell, TabSplitHdl, TabBar *, pTab )
aTabSize.Width() = Min(pTab-GetSplitSize(), (long)(nMax-1));
maTabControl.SetSizePixel(aTabSize);
-GetLayerTabControl()-SetSizePixel(aTabSize);
+
+if(GetLayerTabControl()) // #87182#
+{
+GetLayerTabControl()-SetSizePixel(aTabSize);
+}
Point aPos = maTabControl.GetPosPixel();
aPos.X() += aTabSize.Width();
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 5fee511..d3079a3 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -222,17 +222,34 @@ void DrawViewShell::ExecCtrl(SfxRequest rReq)
case SID_SWITCHLAYER: // BASIC
{
const SfxItemSet *pArgs = rReq.GetArgs ();
-sal_uInt16 nCurPage = GetLayerTabControl()-GetCurPageId ();
-if( pArgs pArgs-Count () == 1)
+// #87182#
+bool bCurPageValid(false);
+sal_uInt16 nCurPage(0);
+
+if(GetLayerTabControl())
+{
+nCurPage = GetLayerTabControl()-GetCurPageId();
+bCurPageValid = true;
+}
+
+if(pArgs 1 == pArgs-Count())
{
SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item,
ID_VAL_WHATLAYER, sal_False);
-if( pWhatLayer )
-nCurPage = (short) pWhatLayer-GetValue ();
+
+if(pWhatLayer)
+{
+nCurPage = (short)pWhatLayer-GetValue();
+bCurPageValid = true;
+}
+}
+
+if(bCurPageValid)
+{
+mpDrawView-SetActiveLayer(
GetLayerTabControl()-GetPageText(nCurPage) );
+Invalidate();
}
-mpDrawView-SetActiveLayer(
GetLayerTabControl()-GetPageText(nCurPage) );
-Invalidate();
rReq.Done ();
break;
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 0b6e2ee..bc3ae88 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -124,6 +124,12 @@ void DrawViewShell::DeleteActualPage()
void DrawViewShell::DeleteActualLayer()
{
+if(!GetLayerTabControl()) // #87182#
+{
+OSL_ENSURE(false, No LayerTabBar (!));
+return;
+}
+
SdrLayerAdmin rAdmin = GetDoc()-GetLayerAdmin();
const String rName =
GetLayerTabControl()-GetPageText(GetLayerTabControl()-GetCurPageId());
String
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|59613 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||59613 -- 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: sc/inc sc/source
sc/inc/cellvalue.hxx |2 +
sc/source/core/data/cellvalue.cxx | 43 +
sc/source/ui/inc/undocell.hxx | 17 +++-
sc/source/ui/undo/undocell.cxx| 76 ++
sc/source/ui/view/viewfun4.cxx| 69 +-
5 files changed, 76 insertions(+), 131 deletions(-)
New commits:
commit c177e1cbec9da5c33b57b55493bbeae198051b6f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 27 23:22:21 2014 -0500
Simplify ScViewFunc::DoThesaurus() with ScCellValue.
Change-Id: Ic5d31107aa7653cd8e3fae096888bd633696074f
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index dd07d1c..08cd8ce 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -77,6 +77,8 @@ struct SC_DLLPUBLIC ScCellValue
void release( ScColumn rColumn, SCROW nRow );
+OUString getString( const ScDocument* pDoc );
+
bool isEmpty() const;
bool equalsWithoutFormat( const ScCellValue r ) const;
diff --git a/sc/source/core/data/cellvalue.cxx
b/sc/source/core/data/cellvalue.cxx
index 0a9d53d..3155f98 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -154,6 +154,27 @@ bool hasNumericImpl( CellType eType, ScFormulaCell*
pFormula )
}
}
+templatetypename _CellT
+OUString getStringImpl( const _CellT rCell, const ScDocument* pDoc )
+{
+switch (rCell.meType)
+{
+case CELLTYPE_VALUE:
+return OUString::number(rCell.mfValue);
+case CELLTYPE_STRING:
+return rCell.mpString-getString();
+case CELLTYPE_EDIT:
+if (rCell.mpEditText)
+return ScEditUtil::GetString(*rCell.mpEditText, pDoc);
+break;
+case CELLTYPE_FORMULA:
+return rCell.mpFormula-GetString().getString();
+default:
+;
+}
+return EMPTY_OUSTRING;
+}
+
}
ScCellValue::ScCellValue() : meType(CELLTYPE_NONE), mfValue(0.0) {}
@@ -442,6 +463,11 @@ void ScCellValue::release( ScColumn rColumn, SCROW nRow )
mfValue = 0.0;
}
+OUString ScCellValue::getString( const ScDocument* pDoc )
+{
+return getStringImpl(*this, pDoc);
+}
+
bool ScCellValue::isEmpty() const
{
return meType == CELLTYPE_NONE;
@@ -553,22 +579,7 @@ double ScRefCellValue::getValue()
OUString ScRefCellValue::getString( const ScDocument* pDoc )
{
-switch (meType)
-{
-case CELLTYPE_VALUE:
-return OUString::number(mfValue);
-case CELLTYPE_STRING:
-return mpString-getString();
-case CELLTYPE_EDIT:
-if (mpEditText)
-return ScEditUtil::GetString(*mpEditText, pDoc);
-break;
-case CELLTYPE_FORMULA:
-return mpFormula-GetString().getString();
-default:
-;
-}
-return EMPTY_OUSTRING;
+return getStringImpl(*this, pDoc);
}
bool ScRefCellValue::isEmpty() const
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 3562983..6bda9c7 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -229,10 +229,9 @@ class ScUndoThesaurus: public ScSimpleUndo
{
public:
TYPEINFO();
-ScUndoThesaurus( ScDocShell* pNewDocShell,
-SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
-const OUString rNewUndoStr, const EditTextObject*
pUndoTObj,
-const OUString rNewRedoStr, const EditTextObject*
pRedoTObj);
+ScUndoThesaurus( ScDocShell* pNewDocShell,
+ SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
+ const ScCellValue rOldText, const ScCellValue rNewText
);
virtual ~ScUndoThesaurus();
virtual voidUndo();
@@ -246,14 +245,12 @@ private:
SCCOL nCol;
SCROW nRow;
SCTAB nTab;
-OUStringaUndoStr; // Data at String cell
-EditTextObject* pUndoTObject; // at Edit cell
-OUStringaRedoStr;
-EditTextObject* pRedoTObject;
sal_uLong nEndChangeAction;
-voidDoChange( bool bUndo, const OUString rStr,
-const EditTextObject* pTObj );
+ScCellValue maOldText;
+ScCellValue maNewText;
+
+void DoChange( bool bUndo, const ScCellValue rText );
void SetChangeTrack( const ScCellValue rOldCell );
};
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 7a6f4e1..60f6594 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -646,39 +646,20 @@ bool ScUndoPrintZoom::CanRepeat(SfxRepeatTarget rTarget)
const
return rTarget.ISA(ScTabViewTarget);
}
-ScUndoThesaurus::ScUndoThesaurus( ScDocShell* pNewDocShell,
- SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
- const
Re: STL iterators and for loops
My builds with --enable-dbgutil are noticeably slow, Well, that is more or less the point, isn't it? That shows that 1) the code is not compiled as optimised (and thus is easier to debug), and 2) it includes the extra debugging consistency checks etc. So, possibly we do not care. I'd say that is the case, yes. As long as a dbgutil build is still usable, it fills its purpose. --tml OTOH, hoisting vec.end() so that is is called only once should be a quite mechanical task, Mechanical tasks are typically those where it is very easy to miss some crucial detail in some case and introduce a bug. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-02-28
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#60698: Split out slideshow code from animations in https://gerrit.libreoffice.org/8389 from Marcos Souza about module animations, include, slideshow + fdo#63154 Remove unused solar.h in https://gerrit.libreoffice.org/8118 from Alexandre Vicenzi about module dbaccess, editeng, filter, framework, include, lotuswordpro, reportdesign, rsc, uui + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar about module sw + fdo#73596 Added support to import and export \r,\h Index flags. in https://gerrit.libreoffice.org/8099 from Nikhil Walvekar about module sw, writerfilter + [bug 75240] - removed unnecessary white spaces in https://gerrit.libreoffice.org/8388 from Mihai Varga about module vcl + libcmis (bundled): add missing definition for HTML_PARSE_RECOVER in https://gerrit.libreoffice.org/8387 from Douglas Mencken about module external + curl (bundled): with-darwinssl option is not compatible with OSX SDK 10.5 in https://gerrit.libreoffice.org/8386 from Douglas Mencken about module external + Icon redux 01: Remove old draft view icons in https://gerrit.libreoffice.org/8363 from Andrew Dent about module icon-themes + fdo#73219 File corruption: Table in header in https://gerrit.libreoffice.org/8378 from Priyanka Gaikwad about module sw End of freshness + Remove visual noise from winaccessibility in https://gerrit.libreoffice.org/8340 from Alexander Wilms about module winaccessibility + Remove visual noise from bridges in https://gerrit.libreoffice.org/8237 from Alexander Wilms about module bridges + sal_Bool - bool in mostly vcl module in https://gerrit.libreoffice.org/8219 from Chris Sherlock about module basctl, editeng, filter, include, sc, sd, sfx2, starmath, svtools, svx, sw, vcl + fix sw life cycle related crash in unittest in https://gerrit.libreoffice.org/7116 from Norbert Thiebaud about module sw + Add CoinMP external as an alternative to lpsolve. in https://gerrit.libreoffice.org/8383 from Matúš Kukan about module build, external + Remove visual noise from include in https://gerrit.libreoffice.org/8272 from Alexander Wilms about module include + WIP Converted group by [number|date] pivot table dlg to .ui in https://gerrit.libreoffice.org/8382 from Katarina Behrens about module sc + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar about module filter, sw, writerfilter * Merged changes on master for project core changed in the last 25 hours: + Icon redux 01: Remove old dbaccess icons in https://gerrit.libreoffice.org/8361 from Andrew Dent + fdo#39468 Translate German comments: sw/source/filter/ww1 in https://gerrit.libreoffice.org/8385 from Stefan Ring + Remove visual noise from testtools in https://gerrit.libreoffice.org/8325 from Alexander Wilms + Remove visual noise from sw in https://gerrit.libreoffice.org/8322 from Alexander Wilms + fdo#63154 remove unused solar.h reference in tools in https://gerrit.libreoffice.org/8373 from Alexandre Vicenzi + Remove visual noise from extensions in https://gerrit.libreoffice.org/8259 from Alexander Wilms + Remove visual noise from editeng in https://gerrit.libreoffice.org/8255 from Alexander Wilms + Remove visual noise from drawinglayer in https://gerrit.libreoffice.org/8253 from Alexander Wilms + Remove visual noise from connectivity in https://gerrit.libreoffice.org/8245 from Alexander Wilms + Remove visual noise from dbaccess in https://gerrit.libreoffice.org/8251 from Alexander Wilms + Removed unnecessary comment decorations and wspace from VCL sources in https://gerrit.libreoffice.org/8374 from Chris Sherlock + Remove visual noise from cppuhelper in https://gerrit.libreoffice.org/8248 from Alexander Wilms + Remove visual noise from comphelper in https://gerrit.libreoffice.org/8242 from Alexander Wilms + Undoing changed made on fdo#63271 because of complains. in https://gerrit.libreoffice.org/8376 from Thomas van der meulen + Improve usability of the outline in https://gerrit.libreoffice.org/7832 from Rob Snelders + Remove visual noise from cli_ure in https://gerrit.libreoffice.org/8240 from Alexander Wilms + Remove visual noise from cppu in https://gerrit.libreoffice.org/8247 from Alexander Wilms + Remove visual noise from codemaker in https://gerrit.libreoffice.org/8241 from Alexander Wilms + Remove visual noise from filter in https://gerrit.libreoffice.org/8261 from Alexander Wilms + Remove visual noise from desktop in https://gerrit.libreoffice.org/8252 from Alexander Wilms + Remove visual noise from compilerplugins in https://gerrit.libreoffice.org/8243 from Alexander Wilms + Remove visual noise from store in
[Libreoffice-commits] core.git: include/rtl sal/rtl sal/util sc/inc
include/rtl/alloc.h |4 ++--
sal/rtl/alloc_global.cxx |2 +-
sal/util/sal.map |2 +-
sc/inc/stlalgorithm.hxx |2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9aab0e9ac656be862049a592587865f7c15f0fd4
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 08:27:17 2014 +0200
Fix typo: s/Alined/Aligned
Change-Id: I248d002d2ed0e61f97a35ea0d329c64832252ad7
diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h
index f3459ba..01a556b 100644
--- a/include/rtl/alloc.h
+++ b/include/rtl/alloc.h
@@ -105,13 +105,13 @@ SAL_DLLPUBLIC void SAL_CALL rtl_freeZeroMemory (
@param Bytes [in] memory size.
@return pointer to allocated memory.
*/
-SAL_DLLPUBLIC void* SAL_CALL rtl_allocateAlinedMemory (
+SAL_DLLPUBLIC void* SAL_CALL rtl_allocateAlignedMemory (
sal_Size Alignment,
sal_Size Bytes
) SAL_THROW_EXTERN_C();
-/** Free memory allocated with rtl_allocateAlinedMemory.
+/** Free memory allocated with rtl_allocateAlignedMemory.
@param Ptr [in] pointer to previously allocated memory.
@return none. Memory is released. Ptr is invalid.
*/
diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx
index 4108333..0c02efd 100644
--- a/sal/rtl/alloc_global.cxx
+++ b/sal/rtl/alloc_global.cxx
@@ -379,7 +379,7 @@ void SAL_CALL rtl_freeZeroMemory (void * p, sal_Size n)
SAL_THROW_EXTERN_C()
}
}
-void* SAL_CALL rtl_allocateAlinedMemory (sal_Size Alignment, sal_Size Bytes)
SAL_THROW_EXTERN_C()
+void* SAL_CALL rtl_allocateAlignedMemory (sal_Size Alignment, sal_Size Bytes)
SAL_THROW_EXTERN_C()
{
return osl_aligned_alloc(Alignment, Bytes);
}
diff --git a/sal/util/sal.map b/sal/util/sal.map
index f63f38b..900d077 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -672,7 +672,7 @@ LIBO_UDK_4.2 { # symbols available in = LibO 4.2
LIBO_UDK_4.3 { # symbols available in = LibO 4.3
global:
-rtl_allocateAlinedMemory;
+rtl_allocateAlignedMemory;
rtl_freeAlignedMemory;
} LIBO_UDK_4.2;
diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index 37d7ba8..bda11bf 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -74,7 +74,7 @@ public:
pointer allocate(size_type n)
{
-return (pointer)rtl_allocateAlinedMemory(_Alignment,
n*sizeof(value_type));
+return (pointer)rtl_allocateAlignedMemory(_Alignment,
n*sizeof(value_type));
}
void deallocate(pointer p, size_type)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 15 commits - basic/source editeng/source i18nlangtag/source i18npool/source include/basic include/i18nlangtag include/sfx2 include/svtools include/svx include/tools inc
basic/source/classes/codecompletecache.cxx | 15
editeng/source/editeng/editobj.cxx | 10 -
editeng/source/editeng/editobj2.hxx|1
i18nlangtag/source/languagetag/languagetag.cxx | 28
i18npool/source/localedata/LocaleNode.hxx |3 -
i18npool/source/localedata/filewriter.cxx | 19 ---
include/basic/codecompletecache.hxx|4 --
include/i18nlangtag/languagetag.hxx| 16 -
include/sfx2/recentdocsview.hxx|1
include/svtools/ctrlbox.hxx|1
include/svx/sidebar/PanelLayout.hxx|2 -
include/tools/bigint.hxx |1
include/tools/rc.hxx |2 +
include/vcl/menu.hxx |7 +---
sc/source/filter/excel/impop.cxx |6 ---
sc/source/filter/inc/imp_op.hxx|1
sfx2/source/control/recentdocsview.cxx |6 ---
svtools/source/control/ctrlbox.cxx | 19 ---
svx/source/sidebar/PanelLayout.cxx | 17 -
tools/source/generic/bigint.cxx| 43 -
tools/source/rc/resmgr.cxx |2 +
unusedcode.easy| 21
vcl/inc/outfont.hxx|2 +
vcl/inc/regband.hxx|5 --
vcl/inc/unx/saldisp.hxx|2 -
vcl/source/gdi/outdev3.cxx |2 -
vcl/source/gdi/regband.cxx | 32 --
vcl/source/window/menu.cxx | 13 ++-
vcl/unx/generic/app/saldisp.cxx|2 -
29 files changed, 16 insertions(+), 267 deletions(-)
New commits:
commit 2dcc6a491a308b65172b509e895942d8b1b9c536
Author: Noel Grandin n...@peralex.com
Date: Fri Feb 28 08:31:06 2014 +0200
remove unused code BigInt::GetString()
Change-Id: I0e1b1e07103b7aafd0b6691e0fcf0d2c8f612ac8
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index 3b8a982..6d52b60 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -80,7 +80,6 @@ public:
operatorsal_uIntPtr() const;
voidSet( bool bSet ) { bIsSet = bSet ? sal_True : sal_False; }
-OUStringGetString() const;
boolIsSet() const { return (bool)bIsSet; }
boolIsNeg() const;
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 6576cfb..61e404c 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -607,49 +607,6 @@ BigInt::operator double() const
}
}
-OUString BigInt::GetString() const
-{
-
-if ( !bIsBig )
-{
-return OUString::number( nVal );
-}
-else
-{
-BigInt aTmp( *this );
-BigInt a10( 10L );
-aTmp.Abs();
-OUStringBuffer sBuff(30);
-do
-{
-BigInt a = aTmp;
-a%= a10;
-aTmp /= a10;
-if ( a.nVal 1L )
-{
-// to get leading 0s
-OUString aStr(OUString::number( a.nVal + 10L ));
-sBuff.insert(0, aStr.getStr() + 1);
-}
-else
-{
-sBuff.insert(0, OUString::number( a.nVal ));
-}
-}
-while( aTmp.bIsBig );
-
-if ( bIsNeg )
-{
-sBuff.insert(0, OUString::number( -aTmp.nVal ));
-}
-else
-{
-sBuff.insert(0, OUString::number( aTmp.nVal ));
-}
-return sBuff.makeStringAndClear();
-}
-}
-
BigInt BigInt::operator=( const BigInt rBigInt )
{
if ( rBigInt.bIsBig )
diff --git a/unusedcode.easy b/unusedcode.easy
index b25c716..86cb448 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,5 @@
AddressWalker::pop()
BigInt::BigInt(unsigned int)
-BigInt::GetString() const
CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const)
Chart2ExportTest::testFdo74115WallGradientFill()
ComboBox::GetMRUCount() const
commit f6d97d00cd0c8d710bce614f7e557db2bc6d2f77
Author: Noel Grandin n...@peralex.com
Date: Thu Feb 27 16:30:49 2014 +0200
remove unused code in basic/CodeCompleteDataCache
Specifically:
CodeCompleteDataCache::GetVars() const
CodeCompleteDataCache::SetVars(boost::unordered_map const)
CodeCompleteDataCache::print() const
Change-Id: I59fb6f50ff47747c3cac959302bf6b7c4f4d79d3
diff --git a/basic/source/classes/codecompletecache.cxx
b/basic/source/classes/codecompletecache.cxx
index aad0e4f..4c97310 100644
--- a/basic/source/classes/codecompletecache.cxx
+++ b/basic/source/classes/codecompletecache.cxx
@@ -118,21 +118,6 @@ std::ostream operator (std::ostream aStream, const
CodeCompleteDataCache aC
return aStream;
}
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/memory.c |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 757856e9275d19e2c7a3673d10fa8963fb9fbeb3
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 08:41:57 2014 +0200
Android does not have posix_memalign()
Change-Id: I4cd2f1e41b3bcab0d87a7b353d63c04b20aad492
diff --git a/sal/osl/unx/memory.c b/sal/osl/unx/memory.c
index a70bc16..2b6c20f 100644
--- a/sal/osl/unx/memory.c
+++ b/sal/osl/unx/memory.c
@@ -10,12 +10,19 @@
#include internal/oslmemory.h
#include stdlib.h
+#ifdef __ANDROID__
+#include malloc.h
+#endif
void* osl_aligned_alloc( sal_Size align, sal_Size size )
{
+#ifdef __ANDROID__
+return memalign(align, size);
+#else
void* ptr;
int err = posix_memalign(ptr, align, size);
return err ? NULL : ptr;
+#endif
}
void osl_aligned_free( void* p )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] [ANNOUNCE] Tag libreoffice-4.2.2.1 (on branch libreoffice-4-2-2) created
Hi all, The tag libreoffice-4.2.2.1 (AKA 4.2.2 RC1) has been created on the libreoffice-4-2-2 branch. The branch will be used for fine tuning of the 4.2.2 release. (It is the last scheduled RC, due to the 4.2.1 interim release) The 'libreoffice-4-2' branch is still active and will be used for the 4.2.3 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.2_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.2.2.1 libreoffice-4.2.2.1 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.2.1 RC1 (final) Happy hacking, Christian + core + allow overwriting of string value with numeric one. (fdo#72691) [Kohei Yoshida] + always set input as text when that's requested. (fdo#72491) [Kohei Yoshida] + ambiguity [Stephan Bergmann] + branch libreoffice-4-2-2 [Christian Lohmaier] + bump product version to 4.2.2.1 [Christian Lohmaier] + bump version to 4.2.1.1.0+ [Christian Lohmaier] + bump version to 4.2.2.0.0+ [Christian Lohmaier] + check if the *document* is closing, not the *app*. (fdo#73773) [Kohei Yoshida] + CUPS printing: use collate option when PDF is available (fdo#41524) [Michael Stahl] + draw position size tab - min size is 0 not 1 (mm) (fdo#72967) [Tomaž Vajngerl] + export cell borders to xls and xlsx correctly. (fdo#75130) [Kohei Yoshida] + fix branch in .gitreview [Michael Stahl] + fix incorrect separator in function description in Calc (fdo#73800) [Winfried Donkers] + fix the ODS export as well. (fdo#74512) [Kohei Yoshida] + handle note copying correctly. (fdo#75032) [Kohei Yoshida] + intern strings as we populate the external cache. (fdo#72041) [Kohei Yoshida] + intern strings in the external ref cache with the host document. (fdo#72041) [Kohei Yoshida] + java.lang.System.mapLibraryName dylib vs. jnilib confusion (fdo#74683) [Stephan Bergmann] + let's not skip auto styles from unmodified sheets. (fdo#72390) [Kohei Yoshida] + more java.lang.System.mapLibraryName dylib vs. jnilib confusion [Stephan Bergmann] + populate date members in a locale-safe way. (fdo#73565) [Kohei Yoshida] + prevent the accumulation of rounding errors (i#124233, fdo#64957) [Herbert Dürr] + re-implement BinarySearch() to disregard empty cell blocks. (fdo#72348, fdo#74558) [Kohei Yoshida] + RTF import: don't drop nested cells if not enough \cellx (rhbz#1065629) [Michael Stahl] + RTF import: re-implement nested tables (rhbz#1065629) [Michael Stahl] + RTFSdrImport::resolveDhgt(): fix crashing C-cast [Michael Stahl] + sdk: install URE library symlinks / import libs again (fdo#75526) [Michael Stahl] + some shared formulas cannot be exported as shared formulas. (fdo#74345) [Kohei Yoshida] + sw: do not paint zero-width lines (fdo#75118) [Michael Stahl] + sw: fix painting of SVG page background (fdo#68927) [Michael Stahl] + these tags should be lowercase for correct clipboard handling. (fdo#74584) [Kohei Yoshida] + too long style names over-stretch dialog (fdo#72233) [Caolán McNamara] + update the incrementer when skipping over hidden regions. (fdo#74857) [Kohei Yoshida] + updated core [Christian Lohmaier, Olivier R] + use 'ne' for string comparison (fdo#75206) [Andras Timar] + use AccessibleRole::PANEL for VclBoxes under windows (fdo#74284) [Caolán McNamara] + version 4.2.2.1, tag libreoffice-4.2.2.1 [Christian Lohmaier] + we still need to get the value only to pop value from the stack. (fdo#75228) [Kohei Yoshida] + wiki Publisher Extension is not working (fdo#69925) [Julien Nabet] + writerfilter: attempt to appease Mac tinderboxes [Michael Stahl] + dictionaries + update French spelling dictionary (v5.0.2) [Olivier R] + help + version 4.2.2.1, tag libreoffice-4.2.2.1 [Christian Lohmaier] + translations + update for 4.2.2 rc1 [Christian Lohmaier] fdo#41524 CUPS printing: use collate option when PDF is available [Michael Stahl] fdo#64957 prevent the accumulation of rounding errors [Herbert Dürr] fdo#68927 sw: fix painting of SVG page background [Michael Stahl] fdo#69925 wiki Publisher Extension is not working [Julien Nabet] fdo#72041 intern strings in the external ref cache with the host document. [Kohei Yoshida] fdo#72233 too long style names over-stretch dialog [Caolán McNamara] fdo#72348 re-implement BinarySearch() to disregard empty cell blocks. [Kohei Yoshida] fdo#72390 let's not skip auto styles from unmodified sheets. [Kohei Yoshida] fdo#72491 always set input as text when that's requested. [Kohei Yoshida] fdo#72691 allow overwriting of string value with numeric one. [Kohei Yoshida] fdo#72967 draw
[Libreoffice-qa] Test spadmin with moztrap?
Hi Sophie, all, In the light of https://bugs.freedesktop.org/show_bug.cgi?id=75540 spadmin throws exception, where Linux-only spadmin tool no longer starts at all on LO 4.2, would moztrap be a good place to add a manual test to verify that spadmin at least starts up and shows a GUI? (Which couldn't be easily tested programmatically.) Stephan ___ 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] Test spadmin with moztrap?
Hi Stephan, all, Le 27/02/2014 15:05, Stephan Bergmann a écrit : Hi Sophie, all, In the light of https://bugs.freedesktop.org/show_bug.cgi?id=75540 spadmin throws exception, where Linux-only spadmin tool no longer starts at all on LO 4.2, would moztrap be a good place to add a manual test to verify that spadmin at least starts up and shows a GUI? (Which couldn't be easily tested programmatically.) Yes, Moztrap is a very good place for that :) I'll add the test to the series and it will be available in the next run. Cheers Sophie ___ 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] Calc Import Unit Tests - Financial Functions
Hey Ken, On Sun, Feb 16, 2014 at 2:25 AM, Ken Biondi kenbio...@hotmail.com wrote: Hello, See the attached two files: functions.ods and financial-functions.csv. I extended functions.ods with tests (normal values only) for every financial function except OPT_BARRIER and ODDFYIELD. I don't fully understand OPT_BARRIER, so I will write a test for it after further study. ODDFYIELD has a bug inherited from AOO Bugzilla #92177. financial-functions.csv contains the expected results. I welcome any feedback - positive or constructive criticism. I license this content under MPL/LGPLv3+. Sorry that I missed that mail. I'm going to review the patch and integrate it. Thanks for your work. Are you interested in continuing with more functions? Regards, Markus ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] minutes of ESC call ...
* Present + Caolan, David, Cedric, Norbert, Markus, Michael M, Lionel, Eike, Astron, Jacobo, Kohei, Stephan B, Robinson, Christian, Adam, Miklos, Kendy * Completed Action Items + test Bjoern's up-streamed dep caching on Windows (Kendy) [make 3.82: (4m04), 3m29, 3m30, 3m28; make 4.0: (3m30), 3m24, 3m23, 3m25] + GSOC mentors - prune / remove already done ideas from each side (All) + need design for copying styles between templates (Cor Nouws/other UX?) cf. http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html Astron made mockup as discussed with Cor: https://wiki.documentfoundation.org/Design/Whiteboards/Importing_Styles_from_Other_Files + update the release plan wiki for 4.3 (Christian) initially we had .0 5 weeks .1, then 4 weeks .2 now it is .0, then 4 weeks .1, then 5 weeks, .2 no idea where the initial schedule came from - was that way for 4.1 and 4.2 4 weeks is OK if .0 is in a shape we are happy with - feedback from users takes at least 2 weeks, so shorter gap doesn't make much sense. + 3.6.0 had a three week gap - prefer something smaller ? (Michael) + cherry-pick patches 4-2-1 - 4-2-2 (Christian) [ checked, but not necessary ] + poke inactive GSoC mentors (Cedric) * Pending Action Items: + will try filing a lot of small string changes as easy hacks (Astron) + review HiDPI branch for 4.2 (Kendy, Michael, Caolan) [ pending branch creation ] + talk with Thorsten wrt. ODF TC representation (Michael S) * Release Engineering update (Christian) + 4.2.2 currently building rc1 (initially known as 4.2.1 rc2) + only one rc planned for this + this release should be the final one. + 4.2.3 deadline - week of March 10th + MAB: + 2 are more serious: https://bugs.freedesktop.org/50855 + just added a bibisect request (Michael) + tried to bi-bisect it (Christian) + but didn't find a version that it worked for. + like PDF export, a bug but needs description tweak. + 4.2 just picks a different style by default. * UX update (Astron) + concerned about the hyperlink dialog was handled on ux-advise + patch in gerrit to make it disappear when you hit apply, some push-back, proposed a new patch to revert back. + is a bit confusing, but agree with Mirek's analysis. + Sifr-light discussion and/or using it as the high-contrast theme. + bugs have been filed. + would be cool to have a programmatic re-colouring of the icons. + already have darken/lighten BitmapEx bits (Michael) + is it a real replacement from an a11y perspective ? (Bjoern) + Stuart - no problem with replacing hicontrast with Sifr (Astron) = nothing in the way etc. + talked with Matthew Paul Thomas @ Canonical (Bjoern) + loves detail, and had some great insights + would like to introduce him to other UX guys. + one item: sorting out the LibreOffice menus. * GSoC update (Cedric) + Lots of tasks in the impress area + need other mentors for tasks there + please consider what you are able to mentor: + https://wiki.documentfoundation.org/Development/GSoC/Ideas + students are starting to arrive, applications from March 10th - 21st. * OOXML Strict namespaces (Markus) + import issues caused by namespace handling bits + can solve this by mapping new namespaces to the same IDs + otherwise need a lot of code changes. + for export, can use the same trick; but with more places + need to drop features for strict. + needs a new filter, needs handling for cases to remove. + VML not supported eg. + no concerns wrt. duplicate namespace tokens for import (All) + already have 2x OOXML exports: 2007 and ISO transitional (Markus) + need to extend the enum already here for writer (Kendy) * Editeng indexing change (Norbert/Kohei) + spell-checking currently broken in master, but works in 4.2 AI + have a look into it (Norbert) * Crashtest update (Markus) + no new crash-test / data etc. + hitting a kernel bug on the crash-testing VM + 2x deadlocks of the VM - when load was too high, couldn't log in. + already at a load of 24; 500 documents every 2 hours or so. + after 10k documents: load jumps up. + 50k documents - a week. + normally takes 3-4 days. + no real insights yet; log shows kernel oops' (Cloph) + running current Fedora 19 - recent updates, caused grief ? + upgrade to F20 instead ? + used it to get a modern toolchain. AI: + upgrade it to F20 (Cloph) +
Re: [Libreoffice-qa] Calc Import Unit Tests - Financial Functions
Date: Thu, 27 Feb 2014 17:00:20 +0100 Sorry that I missed that mail. I'm going to review the patch and integrate it. Thanks for your work. Are you interested in continuing with more functions? Regards, Markus Hi Markus, Yes, I plan to continue with more functions. I'll wait for your feedback to make sure I'm doing this correctly. Cheers, Ken ___ 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] [ANN] LibreOffice 4.2.2 RC1 test builds available
Hi *, for the upcoming new version 4.2.2, the builds for rc1 are now available on pre-releases (some windows helppacks still uploading) Besides the usual builds, there are also 64bit builds for Mac available for testing. See https://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.2_release for the complete schedule. (only one rc is planned for 4.2.2) Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report any severe bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to 4.2.1 final (rc1) is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-2-2-release-4.2.2.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Christian ___ 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] last surviving mab4.0
bump On Mon, 17 Feb 2014 18:34:05 +0100, Tommy ba...@quipo.it wrote: I've recently noticed that user Stephane Guillou (aka chtfn on bugzilla) spent several time testing all existing unfixed mab4.0 and moved them to mab4.1 list actually just 2 mab4.0 are still untested Bug 36799 - If you insert an envelope into a document only the envelope is printed (Mac OS X) https://bugs.freedesktop.org/show_bug.cgi?id=36799 Bug 59613 - RTL VIEWING: Increasing size of dialogs to right or bottom causes artifacts https://bugs.freedesktop.org/show_bug.cgi?id=59613 unfortunatley I cannot test them (one is MacOs and one about RTL where I don't have experience) so I ask if there's anybaody of the QA team that can test them against 4.1.x and 4.2.x branch before moving to the mab4.1 list (or mark them as resolved) ___ 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/ -- 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] last surviving mab4.0
Bug 59613 - RTL VIEWING: Increasing size of dialogs to right or bottom causes artifacts https://bugs.freedesktop.org/show_bug.cgi?id=59613 This one is still there in 4.1 and 4.2. BTW you can test RTL with en-US builds, if you set the SAL_RTL_ENABLED environment variable. Best regards, Andras ___ 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] ProposedEasyHack Changed to NeedsDevEval
Hi All, Just got done changing all ProposedEasyHack to NeedsDevEval. Having ProposedEasyHack was causing some confusion and caused some headaches for queries so the new status is once agains *NeedsDevEval. *Change: Old: ProposedEasyHack New: NeedsDevEval I left Resolved bugs alone just to avoid the extra noise. Warm Regards, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] last surviving mab4.0
On Thu, 27 Feb 2014 21:43:01 +0100, Andras Timar ti...@fsf.hu wrote: Bug 59613 - RTL VIEWING: Increasing size of dialogs to right or bottom causes artifacts https://bugs.freedesktop.org/show_bug.cgi?id=59613 This one is still there in 4.1 and 4.2. BTW you can test RTL with en-US builds, if you set the SAL_RTL_ENABLED environment variable. Best regards, Andras thanks Andras. now there's only one left which is MacOS specific https://bugs.freedesktop.org/show_bug.cgi?id=36799 is there any Mac user who con retest it? -- 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] last surviving mab4.0
CC'ing Joren - he's an OSX user. Best, Joel On 02/27/2014 08:13 PM, Tommy wrote: On Thu, 27 Feb 2014 21:43:01 +0100, Andras Timar ti...@fsf.hu wrote: Bug 59613 - RTL VIEWING: Increasing size of dialogs to right or bottom causes artifacts https://bugs.freedesktop.org/show_bug.cgi?id=59613 This one is still there in 4.1 and 4.2. BTW you can test RTL with en-US builds, if you set the SAL_RTL_ENABLED environment variable. Best regards, Andras thanks Andras. now there's only one left which is MacOS specific https://bugs.freedesktop.org/show_bug.cgi?id=36799 is there any Mac user who con retest it? ___ 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 65813] Industrial icons in Tango toolbar
https://bugs.freedesktop.org/show_bug.cgi?id=65813 Stefan Knorr (astron) heinzless...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Stefan Knorr (astron) heinzless...@gmail.com --- All fixed in 4.2.0 final and recent master. Resolving fixed. -- 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 67903] Print dialog preview in Draw does not update with paper size change
https://bugs.freedesktop.org/show_bug.cgi?id=67903 --- Comment #14 from Daniel Passos daniel.pas...@kanaan.org --- (In reply to comment #11) Wait - the description of the bug says print dialog preview not printing itself. Can you clarify if I'm mistaking or if the title is not accurate? Also, is this a regression? It is correct that the description speaks only of the print dialog. But just like Karl Relton, we are experiencing not only a bug on the print dialog preview, but in the printing as well. You ask if this is a regression. It sort of seems that way to us, but we have very little experience with bug reporting... tmacalp writes that this bug is also affecting Impress, and Karl confirms the bug on calc/writer. Should we, in that case, create a new bug report, or should this bug report be expanded/modified? -- 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 75560] New: Typo in Norwegian Bokmaal translation, nb-no.
https://bugs.freedesktop.org/show_bug.cgi?id=75560 Priority: medium Bug ID: 75560 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Typo in Norwegian Bokmaal translation, nb-no. Severity: normal Classification: Unclassified OS: All Reporter: klaus...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.2.0.4 release Component: Localization Product: LibreOffice The new opening splashscreen contains a typo. The word Teksdokument is wrong, it should say Tekstdokument. -- 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 75561] New: add selected object fill / stroke color
https://bugs.freedesktop.org/show_bug.cgi?id=75561 Priority: medium Bug ID: 75561 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: add selected object fill / stroke color Severity: normal Classification: Unclassified OS: All Reporter: mohith.ma...@skanray.com Hardware: Other Status: UNCONFIRMED Version: 4.0.6.2 release Component: Libreoffice Product: LibreOffice Created attachment 94803 -- https://bugs.freedesktop.org/attachment.cgi?id=94803action=edit Implementing add color LO has a named list of colors that can be used as fill / stroke colors for all objects. A new color can be added through Tools Options Color. However if I open a document (say a ppt) which has objects with colors not added to LO, I cannot save that color to the list of colors. The only way to use it is to use the copy format tool, won't be so convenient because it will change all formatting along with fill color. Observation On selecting an object who's fill / stroke colors are not added, the respective color picker drop down list on the menu bar automatically adds a new icon (with the selected object color) with an empty bracket pair '[]'. New Feature Required Provision to add the selected object's fill / stroke color on selecting it in the color selection drop down list in the menu bar. -- 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 75562] New: Help Button in new Start Center leads to empty Wiki Help page
https://bugs.freedesktop.org/show_bug.cgi?id=75562 Priority: medium Bug ID: 75562 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Help Button in new Start Center leads to empty Wiki Help page Severity: normal Classification: Unclassified OS: All Reporter: heinzless...@gmail.com Hardware: All Status: UNCONFIRMED Version: 4.2.0.4 release Component: Documentation Product: LibreOffice The help button in the bottom left of the new Start Center leads to https://help.libreoffice.org/swriter/sfx/ui/startcenter/extensions?Language=en-US That is _very_ unfortunate, as almost every user will see this button and for many newcomers this will be the first button they will see that can help them explore their newly installed software. Clicking this button, I would hope to get to some overview over the different LibreOffice modules. I would also expect some explanations of what the Start Center can do for me (not reference documentation, though). -- 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
