[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/information/fods/na.fods | 1658 sc/qa/unit/data/functions/mathematical/fods/pi.fods | 1626 +++ 2 files changed, 3284 insertions(+) New commits: commit 8c73acd101c80a4479f25e35278a451dc3c4b22e Author: ZdenÄk Crhonek Date: Sun Jan 8 18:00:20 2017 +0100 add PI, NA testcase Change-Id: I1c72c1c81883b43a13cf583a98b2f2a261a60895 Reviewed-on: https://gerrit.libreoffice.org/32844 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek diff --git a/sc/qa/unit/data/functions/information/fods/na.fods b/sc/qa/unit/data/functions/information/fods/na.fods new file mode 100644 index 000..ac1104f --- /dev/null +++ b/sc/qa/unit/data/functions/information/fods/na.fods @@ -0,0 +1,1658 @@ + + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:form x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> + 2017-01-08T17:26:18.147481385P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64 LibreOffice_project/92a1ad1f36b6d3cc13135a8c0805508933011577 + + + 0 + 0 + 25900 + 1672 + + + view1 + + + 2 + 8 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 90 + 60 + true + false + + + 2 + 3 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 90 + 60 + true + false + + + Sheet2 + 1241 + 0 + 90 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + false + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + cs + CZ + + + + + + en + US + + + + + + nl + NL + + + + + + true + true + 3 + 1 + true + 1 + true + sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgBJbnB1dFNsb3Q6VHJheTEARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY= + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + + + + + + + + + ( + + ) + + + + + - + + + + + + + + + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + +
[Libreoffice-commits] core.git: vcl/null
vcl/null/printerinfomanager.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit d1787d6ac6c15c02e6f66c8cfb6d6360d06c85c2
Author: Noel Grandin
Date: Fri Jan 13 09:25:40 2017 +0200
fix android build
Change-Id: I55ff31b40366398b6159ee7a99c75e393a05b36a
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index f00dff2..a5cd3b4 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -21,9 +21,18 @@
#include "unx/gendata.hxx"
+// needed since we declare a std::unique_ptr
+namespace psp
+{
+class SystemQueueInfo
+{
+};
+}
+
using namespace psp;
using namespace osl;
+
PrinterInfoManager& PrinterInfoManager::get()
{
SalData* pSalData = GetSalData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source include/vcl reportdesign/source sc/source sfx2/source svx/source sw/source vcl/headless vcl/inc vcl/opengl vcl/source vcl/unx
cui/source/options/optcolor.cxx|2 -
include/vcl/builder.hxx|2 -
include/vcl/commandevent.hxx |4 +--
include/vcl/field.hxx |3 +-
include/vcl/graph.hxx |4 +--
include/vcl/metaact.hxx|5 ++--
include/vcl/oldprintadaptor.hxx|2 -
include/vcl/print.hxx |3 +-
include/vcl/printerinfomanager.hxx |3 +-
include/vcl/textdata.hxx |3 +-
include/vcl/txtattr.hxx|4 ++-
reportdesign/source/ui/dlg/Condition.cxx |2 -
sc/source/ui/condformat/condformatdlgentry.cxx |4 +--
sc/source/ui/dbgui/sortkeydlg.cxx |2 -
sfx2/source/appl/newhelp.cxx |2 -
sfx2/source/dialog/backingwindow.cxx |2 -
sfx2/source/dialog/dinfdlg.cxx |8 +++
svx/source/dialog/ctredlin.cxx |2 -
svx/source/form/datanavi.cxx |2 -
svx/source/sidebar/PanelLayout.cxx |2 -
svx/source/sidebar/paragraph/ParaSpacingWindow.cxx |8 +++
sw/source/ui/index/cnttab.cxx |4 +--
vcl/headless/svpglyphcache.cxx |5 +---
vcl/headless/svpinst.cxx |2 -
vcl/inc/controldata.hxx|3 --
vcl/inc/impbmp.hxx |5 ++--
vcl/inc/opengl/x11/salvd.hxx |3 +-
vcl/inc/unx/geninst.h |2 -
vcl/opengl/x11/salvd.cxx |3 --
vcl/source/control/button.cxx |6 ++---
vcl/source/control/combobox.cxx|2 -
vcl/source/control/ctrl.cxx|8 +--
vcl/source/control/edit.cxx| 14 +---
vcl/source/control/field.cxx |3 --
vcl/source/control/fixed.cxx |4 +--
vcl/source/control/group.cxx |2 -
vcl/source/control/imp_listbox.cxx |4 +--
vcl/source/control/listbox.cxx |2 -
vcl/source/control/notebookbar.cxx |2 -
vcl/source/control/spinfld.cxx |2 -
vcl/source/edit/textdata.cxx |9 ++-
vcl/source/edit/textdoc.cxx|5 +---
vcl/source/filter/ixbm/xbmread.cxx | 13 +++
vcl/source/gdi/impbmp.cxx |1
vcl/source/gdi/impgraph.cxx|7 --
vcl/source/gdi/impvect.cxx | 11 -
vcl/source/gdi/metaact.cxx | 24 +++--
vcl/source/gdi/oldprintadaptor.cxx |1
vcl/source/gdi/pdfwriter_impl.cxx | 15 +
vcl/source/gdi/pdfwriter_impl.hxx |6 +++--
vcl/source/gdi/print3.cxx |1
vcl/source/window/commandevent.cxx | 17 +++---
vcl/source/window/dialog.cxx |1
vcl/source/window/dockwin.cxx |2 -
vcl/source/window/printdlg.cxx |6 ++---
vcl/source/window/syswin.cxx | 18 +++
vcl/source/window/tabpage.cxx |2 -
vcl/source/window/toolbox.cxx |4 +--
vcl/unx/generic/app/geninst.cxx|9 +++
vcl/unx/generic/printer/printerinfomanager.cxx |6 +
60 files changed, 140 insertions(+), 163 deletions(-)
New commits:
commit e8b49f09074fe184374bee5062715357427ae044
Author: Noel Grandin
Date: Wed Jan 11 09:48:18 2017 +0200
new loplugin: useuniqueptr: vcl
Change-Id: Idcbc8655108ff57c06c33bbcabd652387bf3c4ec
Reviewed-on: https://gerrit.libreoffice.org/32948
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 5af0986..5508d98 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -481,7 +481,7 @@ void ColorConfigWindow_Impl::Entry::SetColor (Color aColor)
ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent)
: VclContainer(pParent)
{
-m_pUIBuilder = new VclBuilder(this, getUIRootDir(),
"cui/ui/colorconfigwin.ui");
+m_pUIBuilder.reset(new VclBuilder(this, getUIRootDir(),
"cui/ui/colorconfigwin.ui"));
get(m_pGrid, "ColorConfigWindow");
CreateEntries();
SetAppearance();
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 428f9aa..e849ee5d 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.h
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - accessibility/source
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit ef191c51ee9912ebc0ef3c59f6d9a86ff09723b1
Author: Caolán McNamara
Date: Thu Jan 12 14:03:43 2017 +
a11y crash on accessing disposed TabControl during close of impress
Change-Id: I3064eb136ed3a6a32acd64bfb2f6fbe31595e1cf
(cherry picked from commit ff30d20c1ae3a30717123c267d52eb2b3105a1b7)
Reviewed-on: https://gerrit.libreoffice.org/33007
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index e9ee495..f086077 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -43,9 +43,14 @@ VCLXAccessibleTabControl::VCLXAccessibleTabControl(
VCLXWindow* pVCLXWindow )
:VCLXAccessibleComponent( pVCLXWindow )
{
m_pTabControl = static_cast< TabControl* >( GetWindow().get() );
-
-if ( m_pTabControl )
-m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(),
Reference< XAccessible >() );
+if (!m_pTabControl)
+return;
+if (m_pTabControl->isDisposed())
+{
+m_pTabControl.clear();
+return;
+}
+m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), Reference<
XAccessible >() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: I have question in build step
> On 12 Jan 2017, at 13:46, 김광연 wrote: > > Follwing step-by-step guide, I runned autogen in my windows 10 system. But It > says 'configure: error:Ant not found - Make sure it's in the path or use > --with-ant-home' > Please help me. the step by step guide, says install with LODE, and that downloads ant. rgds jan I. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/defnamesbuffer.hxx |1 -
sc/source/filter/oox/autofilterbuffer.cxx |7 +--
sc/source/filter/oox/defnamesbuffer.cxx |8
3 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 5e0e27e758e6f7fa325f36e6e51540e10bab0fdc
Author: Jochen Nitschke
Date: Thu Jan 12 00:33:46 2017 +0100
tdf#48140 replace CellRangeAddress in xlsx import (14)
Change-Id: Ie322489bd11d2a14810fec87f83ce04c652bea43
Reviewed-on: https://gerrit.libreoffice.org/33002
Reviewed-by: Jochen Nitschke
Tested-by: Jochen Nitschke
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx
b/sc/source/filter/inc/defnamesbuffer.hxx
index 5a6c812..fed44d8 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -117,7 +117,6 @@ public:
/** Returns the token index used in API token arrays
(com.sun.star.sheet.FormulaToken). */
inline sal_Int32getTokenIndex() const { return mnTokenIndex; }
/** Tries to resolve the defined name to an absolute cell range. */
-boolgetAbsoluteRange( css::table::CellRangeAddress&
orRange ) const;
boolgetAbsoluteRange( ScRange& orRange ) const;
private:
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx
b/sc/source/filter/oox/autofilterbuffer.cxx
index fab9638..3b20a87 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -664,7 +664,7 @@ void AutoFilterBuffer::finalizeImport( sal_Int16 nSheet )
// the built-in defined name 'Criteria' must exist
if( const DefinedName* pCriteriaName =
getDefinedNames().getByBuiltinId( BIFF_DEFNAME_CRITERIA, nSheet ).get() )
{
-CellRangeAddress aCriteriaRange;
+ScRange aCriteriaRange;
if( pCriteriaName->getAbsoluteRange( aCriteriaRange ) )
{
// set some common properties for the filter descriptor
@@ -693,7 +693,10 @@ void AutoFilterBuffer::finalizeImport( sal_Int16 nSheet )
deleted). */
PropertySet aRangeProps( xDatabaseRange );
aRangeProps.setProperty( PROP_AutoFilter, false );
-aRangeProps.setProperty( PROP_FilterCriteriaSource,
aCriteriaRange );
+aRangeProps.setProperty( PROP_FilterCriteriaSource,
+ CellRangeAddress(
aCriteriaRange.aStart.Tab(),
+
aCriteriaRange.aStart.Col(), aCriteriaRange.aStart.Row(),
+
aCriteriaRange.aEnd.Col(), aCriteriaRange.aEnd.Row() ));
}
}
}
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx
b/sc/source/filter/oox/defnamesbuffer.cxx
index b668d98..1588ce9 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -398,14 +398,6 @@ void DefinedName::convertFormula( const
css::uno::SequenceGetCode();
-Sequence< FormulaToken > aFTokenSeq;
-ScTokenConversion::ConvertToTokenSequence(getScDocument(), aFTokenSeq,
*pTokenArray);
-return getFormulaParser().extractCellRange( orRange, aFTokenSeq, false );
-}
-
bool DefinedName::getAbsoluteRange( ScRange& orRange ) const
{
ScTokenArray* pTokenArray = mpScRangeData->GetCode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/sdmod.hxx |5 --
sd/source/ui/app/sdmod.cxx |4 -
sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx |2
sd/source/ui/tools/SdGlobalResourceContainer.cxx | 41 ---
4 files changed, 29 insertions(+), 23 deletions(-)
New commits:
commit 983ac87793a891855c7d25c42fe795908543716c
Author: Michael Stahl
Date: Fri Jan 13 00:16:02 2017 +0100
tdf#105188 sd: fix shutdown crash after accessing master pages
The problem here is that the destructor of SdModule does a lot of
things, including destroying an SdXImpressDocument that is referenced
from some SdGlobalResourceContainer.
This calls SD_MOD() to get the SdModule to get some resource, but at
that point SfxApplication::GetModule() returns null, because the
sequence was changed from first deleting the SfxModules, then clearing
the pointer in ~SfxModule to null, to unique_ptr::reset(), which, at
least in libstdc++, is implemented via std::swap, so it clears the
pointer before deleting the SfxModule.
It appears rather brittle to rely on such a subtle detail, so refactor
things so that SdGlobalResourceContainer is no longer owned by SdModule
but has its own pet XTerminationListener, which means it will be
destroyed earlier, while the SdModule is still fully alive.
(regression from f7b1cd66167050afecf487e3d89ea12de74200b5)
Change-Id: I7f03f3adf431be8728ef3d65a078b536cb96f959
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 6a8f735..c96a1b1 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -47,7 +47,6 @@ namespace svtools { class ColorConfig; }
namespace sd {
class DrawDocShell;
-class SdGlobalResourceContainer;
}
namespace com { namespace sun { namespace star { namespace frame {
@@ -156,10 +155,6 @@ private:
static SfxFrame* CreateEmptyDocument( const css::uno::Reference<
css::frame::XFrame >& i_rFrame );
static SfxFrame* CreateFromTemplate( const OUString& rTemplatePath, const
css::uno::Reference< css::frame::XFrame >& i_rFrame );
-/** The resource container controls the lifetime of some singletons.
-*/
-::std::unique_ptr< ::sd::SdGlobalResourceContainer> mpResourceContainer;
-
bool mbEventListenerAdded;
/** Take an outline from a text document and create a new impress
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index ebef895..bd02499 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -53,7 +53,6 @@
#include "strings.hrc"
#include "res_bmp.hrc"
#include "cfgids.hxx"
-#include "tools/SdGlobalResourceContainer.hxx"
#define SdModule
@@ -77,7 +76,6 @@ SdModule::SdModule(SfxObjectFactory* pFact1,
SfxObjectFactory* pFact2 )
pSearchItem(nullptr),
pNumberFormatter( nullptr ),
bWaterCan(false),
-mpResourceContainer(new ::sd::SdGlobalResourceContainer()),
mbEventListenerAdded(false),
mpColorConfig(new svtools::ColorConfig)
{
@@ -110,8 +108,6 @@ SdModule::~SdModule()
Application::RemoveEventListener( LINK( this, SdModule,
EventListenerHdl ) );
}
-mpResourceContainer.reset();
-
delete mpErrorHdl;
mpVirtualRefDevice.disposeAndClear();
}
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index e1c483e..c8afe89 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -82,7 +82,7 @@ public:
void AddResource (const css::uno::Reference&
rxResource);
protected:
-friend class ::SdModule;
+friend class SdGlobalResourceContainerInstance;
friend struct ::std::default_delete;
class Implementation;
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index a7f0d54..1465355 100644
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -19,6 +19,13 @@
#include "tools/SdGlobalResourceContainer.hxx"
+#include
+#include
+
+#include
+
+#include
+
#include
#include
@@ -27,13 +34,30 @@ using namespace ::com::sun::star::uno;
namespace sd {
+class SdGlobalResourceContainerInstance
+: public
comphelper::unique_disposing_solar_mutex_reset_ptr
+{
+public:
+SdGlobalResourceContainerInstance()
+:
comphelper::unique_disposing_solar_mutex_reset_ptr(
+
uno::Reference(frame::Desktop::create(comphelper::getProcessComponentContext()),
uno::UNO_QUERY_THROW),
+new SdGlobalResourceContainer, true)
+{
+}
+};
+
+namespace {
+
+struct theSdGlobalResourceContainerInstance : public
rtl::Static {};
+
+} // namespace
+
//= SdGlobalResourceContainer::Implementation =
class SdGlobalResourceContainer::Implementation
{
private:
friend class SdGlobalResourceCo
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/salfont.cxx | 28
1 file changed, 8 insertions(+), 20 deletions(-)
New commits:
commit 349a3c073391842e94ee83345e9c2f38339be1d7
Author: Khaled Hosny
Date: Thu Jan 12 08:51:39 2017 +0200
Drop unused struct members
Change-Id: I37aea9a2a40ab0e9642709de3b9e935bee9a6a53
Reviewed-on: https://gerrit.libreoffice.org/32986
Reviewed-by: Khaled Hosny
Tested-by: Khaled Hosny
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 9860d5f..d1332ae8 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -335,10 +335,7 @@ struct ImplEnumInfo
HDC mhDC;
PhysicalFontCollection* mpList;
OUString* mpName;
-LOGFONTA* mpLogFontA;
-LOGFONTW* mpLogFontW;
-UINTmnPreferredCharSet;
-boolmbPrinter;
+LOGFONTW* mpLogFont;
int mnFontCount;
};
@@ -1049,12 +1046,12 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW*
lpelfe,
{
OUString aName = OUString(reinterpret_cast(pLogFont->elfLogFont.lfFaceName));
pInfo->mpName = &aName;
-memcpy( pInfo->mpLogFontW->lfFaceName,
pLogFont->elfLogFont.lfFaceName, (aName.getLength()+1)*sizeof( wchar_t ) );
-pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet;
-EnumFontFamiliesExW( pInfo->mhDC, pInfo->mpLogFontW,
SalEnumFontsProcExW,
- reinterpret_cast(pInfo), 0 );
-pInfo->mpLogFontW->lfFaceName[0] = '\0';
-pInfo->mpLogFontW->lfCharSet = DEFAULT_CHARSET;
+memcpy(pInfo->mpLogFont->lfFaceName,
pLogFont->elfLogFont.lfFaceName, (aName.getLength()+1)*sizeof(wchar_t));
+pInfo->mpLogFont->lfCharSet = pLogFont->elfLogFont.lfCharSet;
+EnumFontFamiliesExW(pInfo->mhDC, pInfo->mpLogFont,
SalEnumFontsProcExW,
+reinterpret_cast(pInfo), 0);
+pInfo->mpLogFont->lfFaceName[0] = '\0';
+pInfo->mpLogFont->lfCharSet = DEFAULT_CHARSET;
pInfo->mpName = nullptr;
}
}
@@ -1326,21 +1323,12 @@ void WinSalGraphics::GetDevFontList(
PhysicalFontCollection* pFontCollection )
aInfo.mhDC = getHDC();
aInfo.mpList= pFontCollection;
aInfo.mpName= nullptr;
-aInfo.mpLogFontA= nullptr;
-aInfo.mpLogFontW= nullptr;
-aInfo.mbPrinter = mbPrinter;
aInfo.mnFontCount = 0;
-aInfo.mnPreferredCharSet = DEFAULT_CHARSET;
-DWORD nCP = GetACP();
-CHARSETINFO aCharSetInfo;
-if ( TranslateCharsetInfo( reinterpret_cast((sal_IntPtr)nCP),
&aCharSetInfo, TCI_SRCCODEPAGE ) )
-aInfo.mnPreferredCharSet = aCharSetInfo.ciCharset;
-
LOGFONTW aLogFont;
memset( &aLogFont, 0, sizeof( aLogFont ) );
aLogFont.lfCharSet = DEFAULT_CHARSET;
-aInfo.mpLogFontW = &aLogFont;
+aInfo.mpLogFont = &aLogFont;
EnumFontFamiliesExW( getHDC(), &aLogFont,
SalEnumFontsProcExW, reinterpret_cast(&aInfo), 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Resizable wizards
Issue filed as #105299 in bugzilla > On 12.01.2017, at 12:45, Stephan Bergmann wrote: > > On 01/10/2017 08:33 PM, Thorsten Wagner wrote: >> please keep in mind that resizable dialogs cause problems on OS X. In full >> screen mode they cover the whole display, because such windows are maximized >> by OS X in full screen mode. Non resizable dialogs are a prerequisite to >> keep LO usable in full screen mode on Macs. > > Is there a bugzilla issue for that? (I'd assume/hope that that's a problem > we can address in VCL?) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 43a0f83fd7620dc0e81a8245f8a7feef04c2a27b Author: Andras Timar Date: Thu Jan 12 22:42:18 2017 +0100 Updated core Project: translations 8717b9da50e69a92e7afb89f641631ac2a7b51bf Updated Slovenian translation Change-Id: I2a83d61ba3142e336af58bd6250ef342d11711c2 diff --git a/translations b/translations index 86d6efc..8717b9d 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 86d6efcc43918d0c1252b02e808f921cbc4f5a34 +Subproject commit 8717b9da50e69a92e7afb89f641631ac2a7b51bf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-3' - source/sl
source/sl/cui/uiconfig/ui.po | 10 +- source/sl/helpcontent2/source/text/sbasic/shared.po|4 ++-- source/sl/helpcontent2/source/text/scalc/01.po |4 ++-- source/sl/helpcontent2/source/text/sdraw/04.po |4 ++-- source/sl/helpcontent2/source/text/shared/00.po|4 ++-- source/sl/helpcontent2/source/text/shared/01.po|4 ++-- source/sl/helpcontent2/source/text/shared/02.po|4 ++-- source/sl/helpcontent2/source/text/shared/04.po|4 ++-- source/sl/helpcontent2/source/text/shared/05.po|4 ++-- source/sl/helpcontent2/source/text/shared/autopi.po|4 ++-- source/sl/helpcontent2/source/text/shared/explorer/database.po |4 ++-- source/sl/helpcontent2/source/text/shared/guide.po |4 ++-- source/sl/helpcontent2/source/text/shared/optionen.po |4 ++-- source/sl/helpcontent2/source/text/simpress/01.po |4 ++-- source/sl/helpcontent2/source/text/simpress/04.po |4 ++-- source/sl/helpcontent2/source/text/smath/01.po |4 ++-- source/sl/reportdesign/source/ui/report.po |4 ++-- source/sl/sc/source/ui/src.po |4 ++-- source/sl/sd/source/core.po|4 ++-- source/sl/sfx2/uiconfig/ui.po | 10 +- source/sl/svx/source/src.po|4 ++-- source/sl/sw/source/ui/app.po |4 ++-- source/sl/sw/uiconfig/swriter/ui.po|4 ++-- 23 files changed, 52 insertions(+), 52 deletions(-) New commits: commit 8717b9da50e69a92e7afb89f641631ac2a7b51bf Author: Andras Timar Date: Thu Jan 12 22:42:18 2017 +0100 Updated Slovenian translation Change-Id: I2a83d61ba3142e336af58bd6250ef342d11711c2 diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po index 7e09b33..7c6a9f3 100644 --- a/source/sl/cui/uiconfig/ui.po +++ b/source/sl/cui/uiconfig/ui.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 5.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2017-01-06 11:51+0100\n" -"PO-Revision-Date: 2016-12-26 20:36+0200\n" +"POT-Creation-Date: 2017-01-12 14:45+0100\n" +"PO-Revision-Date: 2017-01-12 22:01+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" @@ -185,8 +185,8 @@ msgctxt "" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000â2016 LibreOffice contributors." -msgstr "Copyright © 2000 â 2016 avtorji prispevkov LibreOffice." +msgid "Copyright © 2000â2017 LibreOffice contributors." +msgstr "Copyright © 2000 â 2017 avtorji prispevkov LibreOffice." #: aboutdialog.ui msgctxt "" diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po b/source/sl/helpcontent2/source/text/sbasic/shared.po index fdd6508..8df6d1d 100644 --- a/source/sl/helpcontent2/source/text/sbasic/shared.po +++ b/source/sl/helpcontent2/source/text/sbasic/shared.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 5.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2016-11-02 07:31+0100\n" +"POT-Creation-Date: 2017-01-12 14:45+0100\n" "PO-Revision-Date: 2017-01-07 16:44+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" diff --git a/source/sl/helpcontent2/source/text/scalc/01.po b/source/sl/helpcontent2/source/text/scalc/01.po index 4a078ca..a10a729 100644 --- a/source/sl/helpcontent2/source/text/scalc/01.po +++ b/source/sl/helpcontent2/source/text/scalc/01.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 5.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2017-01-06 11:51+0100\n" +"POT-Creation-Date: 2017-01-12 14:45+0100\n" "PO-Revision-Date: 2017-01-07 11:06+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice
[Libreoffice-commits] core.git: sfx2/qa
sfx2/qa/complex/sfx2/UndoManager.java |5 +
1 file changed, 5 insertions(+)
New commits:
commit e19cdeaf7ddbcf39da47d9685d8e79e775dde7f4
Author: Michael Stahl
Date: Thu Jan 12 22:09:27 2017 +0100
sfx2: fix race in JunitTest UndoManager.checkBrokenScripts()
1) checkBrokenScripts(complex.sfx2.UndoManager)
java.lang.NullPointerException
at complex.sfx2.UndoManager.impl_clickButton(UndoManager.java:432)
at complex.sfx2.UndoManager.checkBrokenScripts(UndoManager.java:188)
impl_clickButton() gets the wrong accessible object and throws.
The .uno:SwitchControlDesignMode is dispatched async, so make sure
it's processesed before trying to click the button.
See UnoControl::getAccessibleContext() "in design mode, use a fallback".
This was running in "rr record --chaos".
Change-Id: Iee9f25c2fff56d32e6b579b5d44ee6df9870fd8b
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java
b/sfx2/qa/complex/sfx2/UndoManager.java
index ad82ca4..a8e6bcd 100644
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -24,6 +24,7 @@ import com.sun.star.awt.Point;
import com.sun.star.awt.Size;
import com.sun.star.awt.XControl;
import com.sun.star.awt.XControlModel;
+import com.sun.star.awt.XToolkitExperimental;
import com.sun.star.beans.NamedValue;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.NoSuchElementException;
@@ -182,6 +183,10 @@ public class UndoManager
// switch the doc's view to form alive mode (so the button will
actually work)
m_currentDocument.getCurrentView().dispatch(
".uno:SwitchControlDesignMode" );
+XToolkitExperimental xToolkit = UnoRuntime.queryInterface(
+XToolkitExperimental.class,
+getORB().createInstance("com.sun.star.awt.Toolkit"));
+xToolkit.processEventsToIdle();
// click the button
m_callbackCalled = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table2.cxx | 69 -
sc/source/core/data/table4.cxx |8 ++--
sc/source/core/data/table6.cxx | 23 -
sc/source/core/data/table7.cxx |6 +--
4 files changed, 57 insertions(+), 49 deletions(-)
New commits:
commit 5e223be2102a171c857be8db1327f23faea0ef78
Author: Bartosz Kosiorek
Date: Tue Jan 3 23:25:51 2017 +0100
tdf#50916 Use aCol.size() instead of MAXCOL to increase max number of column
Currently when we are increasing MAXCOL variable, the memory usage and
performance are increase dramatically. To resolve that, columns
needs to be created dynamically according to needs.
This patch replace hardcoded MAXCOL with aCol.size().
It is next step to make creation of columns dynamic.
Change-Id: Ic7b7a76863e063a607165629bdf82699eaa847b3
Reviewed-on: https://gerrit.libreoffice.org/32708
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index f94e732..9814b65 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -716,7 +716,7 @@ void ScTable::MixMarked(
sc::MixDocContext& rCxt, const ScMarkData& rMark, ScPasteFunc nFunction,
bool bSkipEmpty, const ScTable* pSrcTab )
{
-for (SCCOL i=0; i<=MAXCOL; i++)
+for (SCCOL i=0; i < aCol.size(); i++)
aCol[i].MixMarked(rCxt, rMark, nFunction, bSkipEmpty,
pSrcTab->aCol[i]);
}
@@ -1036,7 +1036,7 @@ void ScTable::StartListeners( sc::StartListeningContext&
rCxt, bool bAll )
std::shared_ptr pColSet = rCxt.getColumnSet();
if (!pColSet)
{
-for (SCCOL i=0; i<=MAXCOL; i++)
+for (SCCOL i=0; i < aCol.size(); i++)
aCol[i].StartListeners(rCxt, bAll);
}
else if (pColSet->hasTab( nTab))
@@ -1045,7 +1045,7 @@ void ScTable::StartListeners( sc::StartListeningContext&
rCxt, bool bAll )
pColSet->getColumns( nTab, aColumns);
for (auto i : aColumns)
{
-if (0 <= i && i <= MAXCOL)
+if (0 <= i && i < aCol.size())
aCol[i].StartListeners(rCxt, bAll);
}
}
@@ -1238,7 +1238,7 @@ void ScTable::UndoToTable(
bool bWidth = (nRow1==0 && nRow2==MAXROW && pColWidth &&
pDestTab->pColWidth);
bool bHeight = (nCol1==0 && nCol2==MAXCOL && mpRowHeights &&
pDestTab->mpRowHeights);
-for ( SCCOL i = 0; i <= MAXCOL; i++)
+for ( SCCOL i = 0; i < aCol.size(); i++)
{
if ( i >= nCol1 && i <= nCol2 )
aCol[i].UndoToColumn(rCxt, nRow1, nRow2, nFlags, bMarked,
pDestTab->aCol[i]);
@@ -1268,7 +1268,7 @@ void ScTable::UndoToTable(
void ScTable::CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const
{
-for (SCCOL i=0; i<=MAXCOL; i++)
+for (SCCOL i=0; i < aCol.size(); i++)
aCol[i].CopyUpdated( pPosTab->aCol[i], pDestTab->aCol[i] );
}
@@ -1286,7 +1286,7 @@ void ScTable::CopyScenarioTo( ScTable* pDestTab ) const
{
OSL_ENSURE( bScenario, "bScenario == FALSE" );
-for (SCCOL i=0; i<=MAXCOL; i++)
+for (SCCOL i=0; i < aCol.size(); i++)
aCol[i].CopyScenarioTo( pDestTab->aCol[i] );
}
@@ -1294,7 +1294,7 @@ void ScTable::CopyScenarioFrom( const ScTable* pSrcTab )
{
OSL_ENSURE( bScenario, "bScenario == FALSE" );
-for (SCCOL i=0; i<=MAXCOL; i++)
+for (SCCOL i=0; i < aCol.size(); i++)
aCol[i].CopyScenarioFrom( pSrcTab->aCol[i] );
}
@@ -1305,7 +1305,7 @@ void ScTable::MarkScenarioIn( ScMarkData& rDestMark,
ScScenarioFlags nNeededBits
if ( ( nScenarioFlags & nNeededBits ) != nNeededBits ) // Are all Bits
set?
return;
-for (SCCOL i=0; i<=MAXCOL; i++)
+for (SCCOL i=0; i < aCol.size(); i++)
aCol[i].MarkScenarioIn( rDestMark );
}
@@ -1360,7 +1360,7 @@ bool ScTable::TestCopyScenarioTo( const ScTable* pDestTab
) const
return true;
bool bOk = true;
-for (SCCOL i=0; i<=MAXCOL && bOk; i++)
+for (SCCOL i=0; i < aCol.size() && bOk; i++)
bOk = aCol[i].TestCopyScenarioTo( pDestTab->aCol[i] );
return bOk;
}
@@ -1583,7 +1583,7 @@ SCROW ScTable::GetNotePosition( SCCOL nCol, size_t nIndex
) const
void ScTable::CreateAllNoteCaptions()
{
-for (SCCOL i = 0; i <= MAXCOL; ++i)
+for (SCCOL i = 0; i < aCol.size(); ++i)
aCol[i].CreateAllNoteCaptions();
}
@@ -1598,7 +1598,7 @@ void ScTable::ForgetNoteCaptions( SCCOL nCol1, SCROW
nRow1, SCCOL nCol2, SCROW n
void ScTable::GetAllNoteEntries( std::vector& rNotes ) const
{
-for (SCCOL nCol = 0; nCol < MAXCOLCOUNT; ++nCol)
+for (SCCOL nCol = 0; nCol < aCol.size(); ++nCol)
aCol[nCol].GetAllNoteEntries(rNotes);
}
@@ -1645,10 +1645,10 @@ void ScTable::GetFirstDataPos(SCCOL& rCol, SCROW& rRow)
const
{
rCol = 0;
rRow = MAXROW+1;
-while (aCol[rCol].IsEmptyData() && rCol < MAXCOL)
+while (aCol[rCol].IsEmptyData() && rCol < aCo
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/ios2met/ios2met.cxx | 12
1 file changed, 12 deletions(-)
New commits:
commit 80e261cec7a90272f8820a36cca4c751a90916f5
Author: Caolán McNamara
Date: Thu Jan 12 20:58:21 2017 +
ofz: this cluster of variables are unused
but lead to a fpe on an empty filter
Change-Id: Id76b365b5fcc866d214753dada80411fc33d2e5c
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 6e09ee4..e5e5e6d 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2603,8 +2603,6 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType,
sal_uInt16 nFieldSize)
void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile &
rGDIMetaFile )
{
-sal_uLong nPercent, nLastPercent;
-
ErrorCode=0;
pOS2MET = &rStreamOS2MET;
@@ -2667,20 +2665,10 @@ void OS2METReader::ReadOS2MET( SvStream &
rStreamOS2MET, GDIMetaFile & rGDIMetaF
pOS2MET->SetEndian(SvStreamEndian::LITTLE);
-sal_uInt64 const nStartPos = pOS2MET->Tell();
-sal_uInt64 const nRemaining = pOS2MET->remainingSize();
-
-nLastPercent=0;
-
sal_uInt64 nPos = pOS2MET->Tell();
for (;;) {
-nPercent = (nPos-nStartPos)*100 / nRemaining;
-if (nLastPercent+4<=nPercent) {
-nLastPercent=nPercent;
-}
-
sal_uInt16 nFieldSize = ReadBigEndianWord();
sal_uInt8 nMagicByte(0);
pOS2MET->ReadUChar( nMagicByte );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/idxf/dxfreprd.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 1cd1b640f428763de7eeebe2edaf8f9b062c0b1d
Author: Caolán McNamara
Date: Thu Jan 12 20:54:36 2017 +
ofz: avoid config during fuzzing
Change-Id: Ia5fa7a9c3304483e69db31256b9ffb22bb152c62
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx
b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 4373e51..c813723 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -23,7 +23,8 @@
#include "osl/nlsupport.h"
#include "officecfg/Setup.hxx"
#include "officecfg/Office/Linguistic.hxx"
-#include "unotools/wincodepage.hxx"
+#include
+#include
//--DXFBoundingBox
@@ -145,6 +146,9 @@ namespace {
OUString getLODefaultLanguage()
{
+if (utl::ConfigManager::IsAvoidConfig())
+return OUString("en-US");
+
OUString
result(officecfg::Office::Linguistic::General::DefaultLocale::get());
if (result.isEmpty())
result = officecfg::Setup::L10N::ooSetupSystemLocale::get();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/Library_oox.mk
oox/Library_oox.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 8f15fa63ce726d0ef1f91a76d640981c16d301cd Author: Rene Engelhard Date: Thu Jan 12 19:00:28 2017 +0100 add -mlong-jump-table-offsets for m68k also for oox Change-Id: Ibfba6c7c808ca5212884032c17546e95fa16353a diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index fcd7215..e6765f4 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -314,4 +314,10 @@ $(eval $(call gb_Library_add_exception_objects,oox,\ )) endif +ifeq ($(CPUNAME),M68K) +$(eval $(call gb_Library_add_cxxflags,oox,\ +-mlong-jump-table-offsets \ +)) +endif + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/dbmgr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 03ec9c397c676faff51041d992f6d715c475ff13 Author: Alex McMurchy1917 Date: Thu Jan 12 11:06:52 2017 + tdf#105071 MM no emails sent when using doc as mail body The conditional statement exits if there is data to process and continues if there is no data to process. Thus all records are lost. This commit reverses this behaviour so that data is processed by the rest of the Mail merge activities. Change-Id: I4c92cbd7ca55be7842b07ad887813e417430ba4f Reviewed-on: https://gerrit.libreoffice.org/32994 Reviewed-by: Jan-Marek Glogowski Tested-by: Jan-Marek Glogowski diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index b0f95bc..e55d073 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1050,7 +1050,7 @@ uno::Reference< mail::XMailMessage > lcl_CreateMailFromDoc( SfxMedium aMedium( sFileURL, StreamMode::READ ); SvStream* pInStream = aMedium.GetInStream(); assert( pInStream && "no output file created?" ); -if( pInStream ) +if( !pInStream ) return xMessage; pInStream->SetStreamCharSet( sMailEncoding ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/formulabase.hxx |2
sc/source/filter/oox/formulabase.cxx |5 +-
sc/source/filter/oox/formulaparser.cxx| 63 --
sc/source/filter/oox/ooxformulaparser.cxx |7 +--
4 files changed, 18 insertions(+), 59 deletions(-)
New commits:
commit 58c5a9de2a0b985ef81557271db39c56ceb624f9
Author: Jochen Nitschke
Date: Thu Jan 12 02:27:09 2017 +0100
tdf#48140 replace CellAddress in xlsx import (4)
Change-Id: I52d7a37dd106744052d714e66fd84895aeb0a9b8
Reviewed-on: https://gerrit.libreoffice.org/33001
Reviewed-by: Jochen Nitschke
Tested-by: Jochen Nitschke
diff --git a/sc/source/filter/inc/formulabase.hxx
b/sc/source/filter/inc/formulabase.hxx
index 91c67c8..46ddbfb 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -609,7 +609,7 @@ public:
/** Calls the XFormulaParser::parseFormula() function of the API parser. */
ApiTokenSequenceparseFormula(
const OUString& rFormula,
-const css::table::CellAddress& rRefPos );
+const ScAddress& rRefPos );
private:
css::uno::Reference< css::sheet::XFormulaParser >
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index 5966c08..b2f0ace 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -1441,12 +1441,13 @@ ApiParserWrapper::ApiParserWrapper(
maParserProps.setProperty( PROP_OpCodeMap, getOoxParserMap() );
}
-ApiTokenSequence ApiParserWrapper::parseFormula( const OUString& rFormula,
const CellAddress& rRefPos )
+ApiTokenSequence ApiParserWrapper::parseFormula( const OUString& rFormula,
const ScAddress& rRefPos )
{
ApiTokenSequence aTokenSeq;
if( mxParser.is() ) try
{
-aTokenSeq = mxParser->parseFormula( rFormula, rRefPos );
+aTokenSeq = mxParser->parseFormula( rFormula,
+CellAddress(rRefPos.Tab(),
rRefPos.Col(), rRefPos.Row()) );
}
catch( Exception& )
{
diff --git a/sc/source/filter/oox/formulaparser.cxx
b/sc/source/filter/oox/formulaparser.cxx
index 759c1c7..ff0ce24 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -423,20 +423,11 @@ public:
/** Converts an OOXML formula string. */
virtual ApiTokenSequence importOoxFormula(
-const CellAddress& rBaseAddress,
-const OUString& rFormulaString );
-
-virtual ApiTokenSequence importOoxFormulaSc(
const ScAddress& rBaseAddress,
const OUString& rFormulaString );
/** Imports and converts a BIFF12 token array from the passed stream. */
virtual ApiTokenSequence importBiff12Formula(
-const CellAddress& rBaseAddress,
-FormulaType eType,
-SequenceInputStream& rStrm );
-
-virtual ApiTokenSequence importBiff12FormulaSc(
const ScAddress& rBaseAddress,
FormulaType eType,
SequenceInputStream& rStrm );
@@ -449,7 +440,7 @@ protected:
typedef ::std::vector< WhiteSpace > WhiteSpaceVec;
/** Initializes the formula parser before importing a formula. */
-voidinitializeImport( const CellAddress& rBaseAddress,
FormulaType eType );
+voidinitializeImport( const ScAddress& rBaseAddress,
FormulaType eType );
/** Finalizes the internal token storage after import. */
ApiTokenSequencefinalizeImport();
@@ -579,31 +570,18 @@ FormulaParserImpl::FormulaParserImpl( const
FormulaParser& rParent ) :
maClosingSpaces.reserve( 256 );
}
-ApiTokenSequence FormulaParserImpl::importOoxFormula( const CellAddress&,
const OUString& )
+ApiTokenSequence FormulaParserImpl::importOoxFormula( const ScAddress&, const
OUString& )
{
OSL_FAIL( "FormulaParserImpl::importOoxFormula - not implemented" );
return ApiTokenSequence();
}
-ApiTokenSequence FormulaParserImpl::importOoxFormulaSc( const ScAddress&,
const OUString& )
-{
-OSL_FAIL( "FormulaParserImpl::importOoxFormula - not implemented" );
-return ApiTokenSequence();
-}
-
-ApiTokenSequence FormulaParserImpl::importBiff12Formula( const CellAddress&,
FormulaType, SequenceInputStream& )
-{
-SAL_WARN("sc.filter", "FormulaParserImpl::importBiff12Formula - not
implemented" );
-return ApiTokenSequence();
-}
-
-ApiTokenSequence FormulaParserImpl::importBiff12FormulaSc( const ScAddress&,
FormulaType, SequenceInputStream& )
+ApiTokenSequence FormulaParserImpl::importBiff12Formula( const ScAddress&,
FormulaType, SequenceInputStream& )
{
SAL_WARN("sc.filter", "FormulaParserImpl::importBiff12Formula - not
implemented" );
return Api
I have question in build step
Follwing step-by-step guide, I runned autogen in my windows 10 system. But It says 'configure: error:Ant not found - Make sure it's in the path or use --with-ant-home' Please help me. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 39 +++--
1 file changed, 22 insertions(+), 17 deletions(-)
New commits:
commit 2fd88ab1cbb4690a770ca2ca5d66157ec4906a2e
Author: Caolán McNamara
Date: Thu Jan 12 16:42:05 2017 +
Resolves: tdf#101187 colossal page width wraps around if doubled
when trying to generate a reasonable upper bound clipping region
Change-Id: I53f8ea1bd6c52c88284e1f41369f83492d078b5d
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 2b0e78a..78455f4 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -99,23 +99,28 @@ namespace sdr
sal_Int32 nPageWidth = pPage ? pPage->GetWdt() : 0;
sal_Int32 nPageHeight = pPage ? pPage->GetHgt() : 0;
-//But, see tdf#97276 and tdf#98366. Don't clip too much if the
-//underlying page dimension is unknown or a paste document
-//where the page sizes use the odd default of 10x10
-nPageWidth = std::max(21000, nPageWidth);
-nPageHeight = std::max(29700, nPageHeight);
-basegfx::B2DRange aClipRange(-nPageWidth, -nPageHeight,
- nPageWidth*2, nPageHeight*2);
-
-aUnitPolyPolygon =
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
- aClipRange,
true, true);
-nPolyCount = ensureGeometry(aUnitPolyPolygon);
-
-// re-check that we have't been clipped out to oblivion
-bIsLine =
-!aUnitPolyPolygon.areControlPointsUsed()
-&& 1 == nPolyCount
-&& 2 == aUnitPolyPolygon.getB2DPolygon(0).count();
+//But, see tdf#101187, only do this if our generous clip region
+//would not over flow into a tiny clip region
+if (nPageWidth < SAL_MAX_INT32/2 && nPageHeight <
SAL_MAX_INT32/2)
+{
+//But, see tdf#97276 and tdf#98366. Don't clip too much if
the
+//underlying page dimension is unknown or a paste document
+//where the page sizes use the odd default of 10x10
+nPageWidth = std::max(21000, nPageWidth);
+nPageHeight = std::max(29700, nPageHeight);
+basegfx::B2DRange aClipRange(-nPageWidth, -nPageHeight,
+ nPageWidth*2, nPageHeight*2);
+
+aUnitPolyPolygon =
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
+
aClipRange, true, true);
+nPolyCount = ensureGeometry(aUnitPolyPolygon);
+
+// re-check that we have't been clipped out to oblivion
+bIsLine =
+!aUnitPolyPolygon.areControlPointsUsed()
+&& 1 == nPolyCount
+&& 2 == aUnitPolyPolygon.getB2DPolygon(0).count();
+}
}
if(bIsLine)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/areatabpage.ui |2 ++ 1 file changed, 2 insertions(+) New commits: commit 00db9f51215d11da3b27685a39ec940ecd65e387 Author: Tomaž Vajngerl Date: Thu Jan 12 17:39:52 2017 +0100 tdf#103225 make AreaTab box fill to content Change-Id: I9900bab2bb4510352d191ee42c0fa83049d9cecc Reviewed-on: https://gerrit.libreoffice.org/33006 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl diff --git a/cui/uiconfig/ui/areatabpage.ui b/cui/uiconfig/ui/areatabpage.ui index 740d508..4050601 100644 --- a/cui/uiconfig/ui/areatabpage.ui +++ b/cui/uiconfig/ui/areatabpage.ui @@ -12,6 +12,8 @@ True False +True +True vertical 3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/menubar.css | 21 -
1 file changed, 21 deletions(-)
New commits:
commit 9a4aba717a8b531d0f84e90f7c554497be9e2ef6
Author: Pranav Kant
Date: Thu Jan 12 21:45:47 2017 +0530
loleaflet: Remove this hamburger <-> closebutton animation
Change-Id: I0c5a4ad2ee0b1d7041091d54c21f538c1a2912f8
diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index 5177f1d..e7e6a86 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -162,27 +162,6 @@
left: 0;
}
-
-/* x icon */
-
-#main-menu-state:checked ~ .main-menu-btn .main-menu-btn-icon {
-height: 0;
-background: transparent;
-}
-
-#main-menu-state:checked ~ .main-menu-btn .main-menu-btn-icon:before {
-top: 0;
--webkit-transform: rotate(-45deg);
-transform: rotate(-45deg);
-}
-
-#main-menu-state:checked ~ .main-menu-btn .main-menu-btn-icon:after {
-top: 0;
--webkit-transform: rotate(45deg);
-transform: rotate(45deg);
-}
-
-
/* hide menu state checkbox (keep it visible to screen readers) */
#main-menu-state {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 8 commits - loleaflet/dist loleaflet/src
loleaflet/dist/loleaflet.css | 27 +++-
loleaflet/dist/loleaflet.html |3 ++
loleaflet/dist/menubar.css| 20 +++--
loleaflet/dist/spreadsheet.css| 16 ++
loleaflet/dist/toolbar.css|4 +--
loleaflet/dist/toolbar/toolbar.js | 10
loleaflet/src/control/Control.ColumnHeader.js |6 ++---
loleaflet/src/control/Control.Menubar.js | 29 +-
loleaflet/src/control/Control.RowHeader.js|4 +--
9 files changed, 90 insertions(+), 29 deletions(-)
New commits:
commit 456afb50bd3487a4e5637ddf1857fa8b540aabfb
Author: Pranav Kant
Date: Thu Jan 12 21:33:49 2017 +0530
loleaflet: Move closebutton to menu bar option in mobile mode
Change-Id: Ie6b9f507862e36ada44fda88acd96b1b495ae002
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index d14c8e8..787a328 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -63,6 +63,9 @@ body {
#tb_toolbar-up_item_rightmenupadding {
padding-right: 40px;
}
+#tb_toolbar-up_item_close {
+ display: none;
+}
}
.loleaflet-font {
diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index 8df0d13..5177f1d 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -228,4 +228,7 @@
position: static;
width: auto;
}
+#menu-closedocument {
+ display: none;
+}
}
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 3193c17..fbd2405 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -2,7 +2,7 @@
* Control.Menubar
*/
-/* global $ _ map title vex revHistoryEnabled */
+/* global $ _ map title vex revHistoryEnabled closebutton */
L.Control.Menubar = L.Control.extend({
// TODO: Some mechanism to stop the need to copy duplicate menus (eg.
Help)
options: {
@@ -155,7 +155,8 @@ L.Control.Menubar = L.Control.extend({
{name: _('Help'), type: 'menu', menu: [
{name: _('Keyboard shortcuts'), id:
'keyboard-shortcuts', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
- }
+ },
+ {name: _('Close'), id: 'closedocument', type: 'action'}
],
presentation: [
@@ -213,7 +214,8 @@ L.Control.Menubar = L.Control.extend({
{name: _('Help'), type: 'menu', menu: [
{name: _('Keyboard shortcuts'), id:
'keyboard-shortcuts', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
- }
+ },
+ {name: _('Close'), id: 'closedocument', type: 'action'}
],
spreadsheet: [
@@ -259,7 +261,8 @@ L.Control.Menubar = L.Control.extend({
{name: _('Help'), type: 'menu', menu: [
{name: _('Keyboard shortcuts'), id:
'keyboard-shortcuts', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
- }
+ },
+ {name: _('Close'), id: 'closedocument', type: 'action'}
],
commandStates: {},
@@ -462,7 +465,11 @@ L.Control.Menubar = L.Control.extend({
// if we are being loaded inside an iframe, ask
// our host to show revision history mode
map.fire('postMessage', {msgId: 'rev-history'});
- } else if (id === 'repair') {
+ } else if (id === 'closedocument') {
+ map.fire('postMessage', {msgId: 'UI_Close'});
+ map.remove();
+ }
+ else if (id === 'repair') {
map._socket.sendMessage('commandvalues
command=.uno:DocumentRepair');
} else if (id === 'a4portrait') {
map.sendUnoCommand('.uno:AttributePageSize
{"AttributePageSize.Width":{"type":"long", "value":
"21000"},"AttributePageSize.Height":{"type":"long", "value": "29700"}}');
@@ -513,10 +520,11 @@ L.Control.Menubar = L.Control.extend({
_createMenu: function(menu) {
var itemList = [];
for (var i in menu) {
- if (menu[i].type === 'action' &&
- menu[i].id === 'rev-history' &&
- !revHistoryEnabled) {
- continue;
+ if (menu[i].type === 'action') {
+ if ((menu[i].id === 'rev-history' &&
!revHistoryEnabled) ||
+
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source
vcl/source/window/window2.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 16867471ffdb4742c18d6a04ceacd66e8f33dfa6 Author: Michael Meeks Date: Fri Jan 6 15:23:30 2017 + tdf#105151 - be more conservative about EndTracking / Tracking calls. We really shouldn't be emitting these into widgets after they are disposed - it serves only to confuse things. Restore behaviour to how it was before the VclPtr change for this. Change-Id: Ife666929f8aac0e4431a5e43970769692c11888c Reviewed-on: https://gerrit.libreoffice.org/32785 Tested-by: Jenkins Reviewed-by: Michael Meeks (cherry picked from commit d788d37a16d382d7ff32a19e8d65e5c605ac55dd) Reviewed-on: https://gerrit.libreoffice.org/32789 Reviewed-by: Eike Rathke diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 9e42f3c..24d1fa7 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -365,7 +365,11 @@ void Window::EndTracking( TrackingEventFlags nFlags ) mpWindowImpl->mpFrameData->mnMouseCode, mpWindowImpl->mpFrameData->mnMouseCode ); TrackingEvent aTEvt( aMEvt, nFlags | TrackingEventFlags::End ); -Tracking( aTEvt ); +// CompatTracking effectively +if (!mpWindowImpl || mpWindowImpl->mbInDispose) +return Window::Tracking( aTEvt ); +else +return Tracking( aTEvt ); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: test-bugzilla-files.py issues
> UnicodeDecodeError: 'utf-8' codec can't decode byte 0x83 in position 10: > invalid start byte I have frequently the same problem with differen python scripts on different machines. The problem is usually you locale setting. I added export LANG='' export LC_ALL=en_US.UTF-8 export LC_CTYPE=en_US.UTF-8 to .bashrc, and then the scripts I work. rgds jan I.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
test-bugzilla-files.py issues
Hey, I want to run test-bugzilla-files.py to make some test, but I got an error: /opt/libreoffice5.3/program/python /opt/dev-tools/test-bugzilla-files/test-bugzilla-files.py --soffice=/opt/libreoffice5.3/program/soffice /opt/testfiles/untitled1.ods Traceback (most recent call last): File "/opt/dev-tools/test-bugzilla-files/test-bugzilla-files.py", line 612, in runLoadFileTests(opts, args) File "/opt/dev-tools/test-bugzilla-files/test-bugzilla-files.py", line 567, in runLoadFileTests files.extend(getFiles(file_list_name[0])) File "/opt/dev-tools/test-bugzilla-files/test-bugzilla-files.py", line 75, in getFiles files = file_list.readlines() File "/opt/libreoffice5.3/program/python-core-3.5.0/lib/codecs.py", line 321, in decode (result, consumed) = self._buffer_decode(data, self.errors, final) UnicodeDecodeError: 'utf-8' codec can't decode byte 0x83 in position 10: invalid start byte I mention that I'm not an expert deveopoer and try to run the test with normal LibreOffice instalation. -- Ákos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/vml/vmlshape.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 6bc2c54711fc3e798c440978a78d03488f14f0d9
Author: Mike Kaganski
Date: Wed Jan 11 10:37:28 2017 +0300
tdf#104414: don't stop on exception from SwXFrame::setPosition
Change-Id: Ib6d4e398d546d6fe250b9c1efe099ae8eef2d580
Reviewed-on: https://gerrit.libreoffice.org/32978
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 0b68675..ad44bcf 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1081,8 +1081,16 @@ Reference< XShape > BezierShape::implConvertAndInsert(
const Reference< XShapes
}
// Hacky way of ensuring the shape is correctly sized/positioned
-xShape->setSize( awt::Size( rShapeRect.Width, rShapeRect.Height ) );
-xShape->setPosition( awt::Point( rShapeRect.X, rShapeRect.Y ) );
+try
+{
+// E.g. SwXFrame::setPosition() unconditionally throws
+xShape->setSize( awt::Size( rShapeRect.Width, rShapeRect.Height ) );
+xShape->setPosition( awt::Point( rShapeRect.X, rShapeRect.Y ) );
+}
+catch (const ::css::uno::Exception&)
+{
+// TODO: try some other way to ensure size/position
+}
return xShape;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/layout.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 1d7cf3f0391214a17593eced752e2a1786c0a1e3
Author: Caolán McNamara
Date: Thu Jan 12 15:24:36 2017 +
Resolves: tdf#104897 sort windows buttons into yes, no, cancel
and kde, for gnome/macosx use no, cancel, yes
Change-Id: I4aff39938c1c9f81b47934d8f1d9400c106781ad
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index cd18eb3..ca082e0 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -828,18 +828,22 @@ struct ButtonOrder
static int getButtonPriority(const OString &rType)
{
-static const size_t N_TYPES = 3;
+static const size_t N_TYPES = 5;
static const ButtonOrder aDiscardCancelSave[N_TYPES] =
{
{ "/discard", 0 },
+{ "/no", 0 },
{ "/cancel", 1 },
-{ "/save", 2 }
+{ "/save", 2 },
+{ "/yes", 2 }
};
static const ButtonOrder aSaveDiscardCancel[N_TYPES] =
{
{ "/save", 0 },
+{ "/yes", 0 },
{ "/discard", 1 },
+{ "/no", 1 },
{ "/cancel", 2 }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/layout.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 2d93108082298f3e5dea7ffba146bbcdf28653c2
Author: Caolán McNamara
Date: Thu Jan 12 15:08:15 2017 +
don't check every possible kde variant, startswith kde is good enough
Change-Id: I7fb9d22af32ad5bab2deedfc993e1ffaebd57111
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index fef9d4e..cd18eb3 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -848,10 +848,8 @@ static int getButtonPriority(const OString &rType)
const OUString &rEnv = Application::GetDesktopEnvironment();
if (rEnv.equalsIgnoreAsciiCase("windows") ||
-rEnv.equalsIgnoreAsciiCase("kde5") ||
-rEnv.equalsIgnoreAsciiCase("kde4") ||
rEnv.equalsIgnoreAsciiCase("tde") ||
-rEnv.equalsIgnoreAsciiCase("kde"))
+rEnv.startsWithIgnoreAsciiCase("kde"))
{
pOrder = &aSaveDiscardCancel[0];
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/extensions/post_GbuildToJson.mk |4 1 file changed, 4 insertions(+) New commits: commit 7a75b39273de47190b7a1fa20e0bcaca6d089033 Author: Michael Stahl Date: Thu Jan 12 15:33:57 2017 +0100 gbuild: make 3.81 doesn't currently work with gbuildtojson There is some problem with the pattern rule in post_GbuildToJson.mk being ignored, causing spurious workdir/GbuildToJson/Library/lib*.exports files with bogus content to be written; rather than trying to adapt that to 3.81 pattern rule evaluation, just refuse to run with 3.81, which is obsolete anyway. Change-Id: I492866464b309f8c475e34e8f311e42bf8736247 diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index a5f9ee2..d0e8611 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -9,6 +9,10 @@ ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),) +ifeq ($(MAKE_VERSION),3.81) +$(error make version 3.81 not supported for gbuildtojson; install newer make via LODE) +endif + # possibly recurse to ensure gbuildtojson was build before running the modded make gb_GbuildToJson_prep := $(shell $(MAKE) -f $(SRCDIR)/solenv/Makefile Executable_gbuildtojson) gb_FULLDEPS:= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/overrideparam.cxx | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
New commits:
commit 38d1c303e12d7f67e8e5eef78e912a4be879de74
Author: Stephan Bergmann
Date: Thu Jan 12 15:19:22 2017 +0100
Adapt loplugin:overrideparam to recent Clang trunk change
Change-Id: Ia372e39bc7e51f290a6d631bf0b81fd75f4fdc1d
diff --git a/compilerplugins/clang/overrideparam.cxx
b/compilerplugins/clang/overrideparam.cxx
index c9d836c..3febe4d 100644
--- a/compilerplugins/clang/overrideparam.cxx
+++ b/compilerplugins/clang/overrideparam.cxx
@@ -179,11 +179,20 @@ bool OverrideParam::hasSameDefaultParams(const
ParmVarDecl * parmVarDecl, const
{
return true;
}
-#if CLANG_VERSION >= 30900
-return false;
-#else
-return true; // clang3-8 doesn't have EvaluateAsFloat, so we can't be as
precise
-#endif
+return true;
+// for one, Clang 3.8 doesn't have EvaluateAsFloat; for another, since
+//
+// "PR23135: Don't instantiate constexpr functions referenced in
+// unevaluated operands where possible", default args are not
+// necessarily evaluated, so the above calls to EvaluateAsInt etc. may
+// fail (as they do e.g. for SfxViewShell::SetPrinter and derived
+// classes' 'SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL' arg,
+// include/sfx2/viewsh.hxx; what appears would help is to call
+// 'compiler.getSema().MarkDeclarationsReferencedInExpr()' on
+// defaultArgExpr and superDefaultArgExpr before any of the calls to
+// EvaluateAsInt etc., cf. the implementation of
+// Sema::CheckCXXDefaultArgExpr in Clang's lib/Sema/SemaExpr.cpp, but
+// that would probably have unwanted side-effects)
}
bool OverrideParam::evaluate(const Expr* expr, APSInt& x)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5205910212c25acffa25ccb10dc049537cd65fbc
Author: Pranav Kant
Date: Thu Jan 12 19:24:50 2017 +0530
loleaflet: Use tab here, not space
otherwise our linting tool will shout.
Change-Id: Ia43b0a4bfc3a1d3406a89e9bb71b05f884cce2a2
(cherry picked from commit fb967d998b64541223528dd19496597b2514aa43)
Reviewed-on: https://gerrit.libreoffice.org/32996
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index d1734e7..dd99292 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1369,7 +1369,7 @@ function updateCommandValues() {
}
map.on('updatetoolbarcommandvalues', function(e) {
- w2ui['toolbar-up'].refresh();
+ w2ui['toolbar-up'].refresh();
});
map.on('updateparts pagenumberchanged', function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit ff30d20c1ae3a30717123c267d52eb2b3105a1b7
Author: Caolán McNamara
Date: Thu Jan 12 14:03:43 2017 +
a11y crash on accessing disposed TabControl during close of impress
Change-Id: I3064eb136ed3a6a32acd64bfb2f6fbe31595e1cf
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 637e0b6..17762a1a 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -43,9 +43,14 @@ VCLXAccessibleTabControl::VCLXAccessibleTabControl(
VCLXWindow* pVCLXWindow )
:VCLXAccessibleComponent( pVCLXWindow )
{
m_pTabControl = static_cast< TabControl* >( GetWindow().get() );
-
-if ( m_pTabControl )
-m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(),
Reference< XAccessible >() );
+if (!m_pTabControl)
+return;
+if (m_pTabControl->isDisposed())
+{
+m_pTabControl.clear();
+return;
+}
+m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), Reference<
XAccessible >() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fb967d998b64541223528dd19496597b2514aa43
Author: Pranav Kant
Date: Thu Jan 12 19:24:50 2017 +0530
loleaflet: Use tab here, not space
otherwise our linting tool will shout.
Change-Id: Ia43b0a4bfc3a1d3406a89e9bb71b05f884cce2a2
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 8f15678..4186024 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1344,7 +1344,7 @@ function updateCommandValues() {
}
map.on('updatetoolbarcommandvalues', function(e) {
- w2ui['toolbar-up'].refresh();
+ w2ui['toolbar-up'].refresh();
});
map.on('updateparts pagenumberchanged', function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js |4
loleaflet/src/control/Toolbar.js |6 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit b1dabb4b818480fe107c0705a736d6b94289ec35
Author: Pranav Kant
Date: Thu Jan 12 19:10:12 2017 +0530
loleaflet: Avoid a race condition
There was a race condition here between our toolbar doing its
stuff and loolwsd sending us websocket messages, noticeable on
slow networks.
Change-Id: I5ae174e94561dd427d22389e443c80b2a6be4ec4
(cherry picked from commit 8afcc582bef39630b6e899bbd79b3f5ca7c348d6)
Reviewed-on: https://gerrit.libreoffice.org/32995
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 3572b28..d1734e7 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1368,6 +1368,10 @@ function updateCommandValues() {
}
}
+map.on('updatetoolbarcommandvalues', function(e) {
+ w2ui['toolbar-up'].refresh();
+});
+
map.on('updateparts pagenumberchanged', function (e) {
if (e.docType === 'text') {
var current = e.currentPage;
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 466d698..8d229f5 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -44,7 +44,11 @@ L.Map.include({
},
getToolbarCommandValues: function (command) {
- return this._docLayer._toolbarCommandValues[command];
+ if (this._docLayer) {
+ return this._docLayer._toolbarCommandValues[command];
+ }
+
+ return undefined;
},
downloadAs: function (name, format, options, id) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js |4
loleaflet/src/control/Toolbar.js |6 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 8afcc582bef39630b6e899bbd79b3f5ca7c348d6
Author: Pranav Kant
Date: Thu Jan 12 19:10:12 2017 +0530
loleaflet: Avoid a race condition
There was a race condition here between our toolbar doing its
stuff and loolwsd sending us websocket messages, noticeable on
slow networks.
Change-Id: I5ae174e94561dd427d22389e443c80b2a6be4ec4
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index b299611..8f15678 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1343,6 +1343,10 @@ function updateCommandValues() {
}
}
+map.on('updatetoolbarcommandvalues', function(e) {
+ w2ui['toolbar-up'].refresh();
+});
+
map.on('updateparts pagenumberchanged', function (e) {
if (e.docType === 'text') {
var current = e.currentPage;
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 466d698..8d229f5 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -44,7 +44,11 @@ L.Map.include({
},
getToolbarCommandValues: function (command) {
- return this._docLayer._toolbarCommandValues[command];
+ if (this._docLayer) {
+ return this._docLayer._toolbarCommandValues[command];
+ }
+
+ return undefined;
},
downloadAs: function (name, format, options, id) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/extensions/post_GbuildToJson.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 0373db40fd43de7a8badcf6c3d0b9b44a2e05891 Author: Michael Stahl Date: Thu Jan 12 14:21:18 2017 +0100 gbuild: fix "make gbuildtojson" on Mac OS X Fails because library has dep on GeneratedPackage_python3, so nerf the dep like the others. Change-Id: I050a0f50996ce4231eb966fb6b624908d2f1788c diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index 7a24869..a5f9ee2 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -97,6 +97,7 @@ $(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS += $(2) endef gb_LinkTarget_use_package = +gb_LinkTarget_use_generated_package = gb_LinkTarget_add_sdi_headers = gb_LinkTarget_use_external_project = gb_LinkTarget_add_scanners = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-design] Minutes of the Design Hangout: 2017-Jan-12
Hi 2017-01-12 14:03 GMT+01:00 Heiko Tietze : > Present: Jay, Tomazs, Kendy, Steve, Heiko > > Tickets > > * Make Breeze the default icon set on Windows >+ https://pirati.ca/display/a6551d712873888e843e54a74a8e772a61684afd >+ https://bugs.documentfoundation.org/show_bug.cgi?id=90194 >+ https://plus.google.com/107566594492891737454/posts/H6W86P19atW > + 60% Yes after one day >+ Yes (Tomazs) >+ No, because Breeze is not enough colorful and too thin (Jay, Kendy, > Heiko) >/keep it for now > In Win 7 tango fit's well. I don't know how it will fit in Win 10. I can't change the breeze icon geometry, but as everything is svg, color changing wouldn't be a problem to fit windows better. > * Installer icon >(last week) >+ https://bugs.documentfoundation.org/show_bug.cgi?id=103677 > https://bug-attachments.documentfoundation.org/ > attachment.cgi?id=128467 >+ Double-check if ico contains multiple images (Jay) >+ Tango is not really up-to-date and not suitable for Windows (Jay) >+ See what other installers use (Jay) >+ Revert change like Stuart mentioned (Jay) >+ Let's check other installers and decide next week what to do (Heiko) >(this week) >+ Andreas' solution is good (Kendy) >+ leave it as it is as the default is very close to what we have (Jay) >/ Make a test first with a nightly build that contains Andreas' > solution (Kendy) > I used tango icons for the installer, cause the installer is for windows and tango is the default icon set, so the default design language for windows. I can also make a proposal for another design language (breeze, galaxy, sifr, ...) but I wouldn't prefer to have an installer icon that fit's any LO design language. So say what you want and I will have a look if I can make it happen. cheers Andreas K ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Minutes of the Design Hangout: 2017-Jan-12
Present: Jay, Tomazs, Kendy, Steve, Heiko Tickets * Make Breeze the default icon set on Windows + https://pirati.ca/display/a6551d712873888e843e54a74a8e772a61684afd + https://bugs.documentfoundation.org/show_bug.cgi?id=90194 + https://plus.google.com/107566594492891737454/posts/H6W86P19atW + 60% Yes after one day + Yes (Tomazs) + No, because Breeze is not enough colorful and too thin (Jay, Kendy, Heiko) /keep it for now * Installer icon (last week) + https://bugs.documentfoundation.org/show_bug.cgi?id=103677 https://bug-attachments.documentfoundation.org/attachment.cgi?id=128467 + Double-check if ico contains multiple images (Jay) + Tango is not really up-to-date and not suitable for Windows (Jay) + See what other installers use (Jay) + Revert change like Stuart mentioned (Jay) + Let's check other installers and decide next week what to do (Heiko) (this week) + Andreas' solution is good (Kendy) + leave it as it is as the default is very close to what we have (Jay) / Make a test first with a nightly build that contains Andreas' solution (Kendy) * Button order in confirmation dialogs + https://bugs.documentfoundation.org/show_bug.cgi?id=104897 + Do we have a programmatical way to swap buttons? + https://www.nngroup.com/articles/ok-cancel-or-cancel-ok/ + Windows puts Ok first, Apple puts OK last + Gnome and KDE uses "Save/Discard/Cancel" or "Yes/No/Cancel" sequence + https://community.kde.org/KDE_Visual_Design_Group/HIG/Dialogs + http://vim-dev.vim.narkive.com/qFf5LUMj/gnome-hig-compliance-in-gvim-button-order-in-close-confirmation-dialogs-patch + But Gnome puts confirmation also last https://developer.gnome.org/hig/stable/dialogs.html.en + Caolan has a plan (for years); ticket is maybe a duplicate (Kendy) * Drop html export + https://bugs.documentfoundation.org/show_bug.cgi?id=66259 + just drop the html export options or kill the html export completely? + filters are working and function is useful but devs need to clean up the code mess (Kendy) + dialog is about exporting slides to images (Tomasz) + better go with svg export (Kendy) + drop the wizard (Tomasz, Kendy) (and suggest users to go with svg) + but keep the html export (Kendy) + make new single page html export an easy hack and export just slides with original images (Tomasz) + have a dialog with at least the option to export one or all pages (Heiko) + clean up the export(as) features in Impress/Draw (Tomasz); make it consistent signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/view/ipclient.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 69e0fa14ea8410e5dd2cb1a8dfcbc0ae1071dc90
Author: Tor Lillqvist
Date: Thu Jan 12 14:58:39 2017 +0200
Fix apparent mistake
Change-Id: I848c3e3229cc216dc1181893da32221b9d9f8274
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 3826646..69b16c0 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -932,7 +932,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
}
catch ( embed::UnreachableStateException& )
{
-if (nVerb == embed::EmbedVerbs::MS_OLEVERB_PRIMARY ||
nVerb == embed::EmbedVerbs::MS_OLEVERB_OPEN ||
embed::EmbedVerbs::MS_OLEVERB_SHOW)
+if (nVerb == embed::EmbedVerbs::MS_OLEVERB_PRIMARY ||
nVerb == embed::EmbedVerbs::MS_OLEVERB_OPEN || nVerb ==
embed::EmbedVerbs::MS_OLEVERB_SHOW)
{
// a workaround for the default verb, usually makes
sense for alien objects
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/drawdoc.hxx |7 +++
sd/source/core/drawdoc2.cxx | 37 +++
sd/source/ui/docshell/docshel2.cxx |5 ++
sd/source/ui/inc/DrawDocShell.hxx|8
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 17
5 files changed, 74 insertions(+)
New commits:
commit 14d05c9b852a0f94c6cbace7cd7887523a89d7d1
Author: Justin Luth
Date: Wed Dec 28 22:04:43 2016 +0300
tdf#64588 - prevent loss of non-uniquely-named slide
Although the UI prevents someone from renaming slides
so that two have the same name, it is still possible to
have such non-uniquely named pages apparently. Since drag/drop
uses the name to add a slide to the clipboard, it resulted
in duplicates of the first found instance of the slidename, and
loss of the similarly-named slides when they were dragged to
a new location.
Change-Id: I2986a7c6c3360162adf9430f645d0dfc73f1d4e2
Reviewed-on: https://gerrit.libreoffice.org/32481
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Thorsten Behrens
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 8c491cd..23a42ac 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -355,6 +355,13 @@ public:
SDRPAGE_NOTFOUND (=0x) when such a page does not exist.
*/
SAL_DLLPRIVATE sal_uInt16 GetPageByName(const OUString& rPgName, bool&
rbIsMasterPage ) const;
+/** checks, if the given name is a *unique* name for an *existing* slide
+
+@param rPageName the name of an existing slide
+
+@return true, if the name is unique and the slide exists
+*/
+bool IsPageNameUnique( const OUString& rPageName ) const;
SdPage*GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const;
sal_uInt16 GetSdPageCount(PageKind ePgKind) const;
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 747d316..190f5c0 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -184,6 +184,43 @@ sal_uInt16 SdDrawDocument::GetPageByName(const OUString&
rPgName, bool& rbIsMast
return nPageNum;
}
+bool SdDrawDocument::IsPageNameUnique( const OUString& rPgName ) const
+{
+sal_uInt16 nCount = 0;
+SdPage* pPage = nullptr;
+
+// Search all regular pages and all notes pages (handout pages are ignored)
+sal_uInt16 nPage = 0;
+sal_uInt16 nMaxPages = GetPageCount();
+while (nPage < nMaxPages)
+{
+pPage = const_cast(static_cast(GetPage(nPage)));
+
+if (pPage && pPage->GetName() == rPgName && pPage->GetPageKind() !=
PageKind::Handout)
+nCount++;
+
+nPage++;
+}
+
+// Search all master pages
+nPage = 0;
+nMaxPages = GetMasterPageCount();
+while (nPage < nMaxPages)
+{
+pPage = const_cast(static_cast(GetMasterPage(nPage)));
+
+if (pPage && pPage->GetName() == rPgName)
+nCount++;;
+
+nPage++;
+}
+
+if (nCount == 1)
+return true;
+else
+return false;
+}
+
SdPage* SdDrawDocument::GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const
{
return mpDrawPageListWatcher->GetSdPage(ePgKind, sal_uInt32(nPgNum));
diff --git a/sd/source/ui/docshell/docshel2.cxx
b/sd/source/ui/docshell/docshel2.cxx
index ecb95ba..af8320e 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -406,6 +406,11 @@ bool DrawDocShell::IsNewPageNameValid( OUString &
rInOutPageName, bool bResetStr
return bCanUseNewName;
}
+bool DrawDocShell::IsPageNameUnique( const OUString & rPageName ) const
+{
+return mpDoc->IsPageNameUnique(rPageName);
+}
+
IMPL_LINK( DrawDocShell, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool
)
{
OUString aNewName;
diff --git a/sd/source/ui/inc/DrawDocShell.hxx
b/sd/source/ui/inc/DrawDocShell.hxx
index 8d1ad05..ccb1395 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -183,6 +183,14 @@ public:
*/
boolIsNewPageNameValid( OUString & rInOutPageName,
bool bResetStringIfStandardName = false );
+/** checks, if the given name is a *unique* name for an *existing* slide
+
+@param rPageName the name of an existing slide
+
+@return true, if the name is unique and the slide exists
+*/
+boolIsPageNameUnique(const OUString& rPagName) const;
+
/** Return the reference device for the current document. When the
inherited implementation returns a device then this is passed to the
caller. Otherwise the returned value depends on the printer
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index cb73c3d..5014da6 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -3
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 168 commits - accessibility/inc accessibility/source android/Bootstrap android/source apple_remote/Library_AppleRemote.mk apple_remot
Rebased ref, commits from common ancestor:
commit 4c9357c4dbfb61144b46179aebbecfdb5c9b0e41
Author: Douglas Mencken
Date: Tue Jan 10 17:56:39 2017 -0500
( donât squash ~ yet? ) more about panes with tabs
No Change-Id, sorry
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index e9a9dc8..6b9200e 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -116,9 +116,8 @@ public:
voidSetTabPageSizePixel( const Size& rSize );
SizeGetTabPageSizePixel() const;
-// pixel offset for the tab items, default is (0,0)
-voidSetItemsOffset( const Point& rOffs );
-Point GetItemsOffset() const;
+// pixel offset for the tab items with ( zero, zero ) by default
+Point GetOffsetOfItems() const;
voidInsertPage( sal_uInt16 nPageId, const OUString& rText,
sal_uInt16 nPos = TAB_APPEND );
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index e82108e..c415934 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -89,9 +89,6 @@ ViewTabBar::ViewTabBar (
mpTabPage.reset(VclPtr::Create(mpTabControl.get()));
mpTabPage->Hide();
-// add some space before the tabitems
-mpTabControl->SetItemsOffset(Point(5, 3));
-
// Tunnel through the controller and use the ViewShellBase to obtain the
// view frame.
try
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index fb39272..62287cc 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -367,8 +367,8 @@ bool TabControl::ImplPlaceTabs( long nWidth )
if ( nWidth <= 0 )
return false;
-const long nOffsetX = 2 + GetItemsOffset().X();
-const long nOffsetY = 2 + GetItemsOffset().Y();
+const long nOffsetX = 2; /// + GetItemsOffset().X();
+const long nOffsetY = 2; /// + GetItemsOffset().Y();
// fdo#66435 throw Knuth/Tex minimum raggedness algorithm at the problem
// of single bare tab on lines of their own
@@ -388,7 +388,7 @@ bool TabControl::ImplPlaceTabs( long nWidth )
if ( ( mnMaxPageWidth > 0 ) && ( mnMaxPageWidth < nWidth ) )
nWidth = mnMaxPageWidth;
-nWidth -= GetItemsOffset().X();
+//nWidth -= GetItemsOffset().X();
const size_t magicMaxLines = 100; // magic number of maximum lines
@@ -401,10 +401,9 @@ bool TabControl::ImplPlaceTabs( long nWidth )
long nX = nOffsetX;
long nY = nOffsetY;
-sal_uInt16 nLines = 0; // number of lines
-sal_uInt16 nChosenLine = 0; // line which is active now
+size_t nLines = 0; // number of lines
-sal_uInt16 nIndex = 0;
+size_t nIndex = 0;
for( std::vector< ImplTabItem >::iterator it =
mpTabCtrlData->maItemList.begin() ;
it != mpTabCtrlData->maItemList.end() ;
++it, ++nIndex )
@@ -439,30 +438,24 @@ bool TabControl::ImplPlaceTabs( long nWidth )
it->mbFullVisible = true;
nLineWidths[ nLines ] += aSize.Width();
-if ( ( !maxLineWidth ) || ( nLineWidths[ nLines ] > maxLineWidth ) )
+if ( ( maxLineWidth == 0 ) || ( nLineWidths[ nLines ] > maxLineWidth )
)
maxLineWidth = nLineWidths[ nLines ];
nX += aSize.Width();
-
-if ( it->mnId == mnCurPageId )
-nChosenLine = nLines;
}
nLineFirstTabNums[ nLines + 1 ] = static_cast< sal_uInt16 >(
mpTabCtrlData->maItemList.size() );
const long firstTabXWhenAlignedLeft = 1 + ( ( origWidth - nWidth ) >> 1 );
-if ( nLines )
+if ( nLines > 0 )
{ // two or more lines
const long tabHeight = mpTabCtrlData->maItemList[0].maRect.Bottom() -
2;
-long nLineHeights[ nLines + 1 ];
+long nLineTops[ nLines + 1 ];
-for ( sal_uInt16 line = 0; line < nLines + 1; line++ )
+for ( size_t line = 0; line < nLines + 1; line++ )
{
-if ( line <= nChosenLine )
-nLineHeights[ line ] = tabHeight * ( nLines - ( nChosenLine -
line ) ) + GetItemsOffset().Y();
-else
-nLineHeights[ line ] = tabHeight * ( line - nChosenLine - 1 )
+ GetItemsOffset().Y();
+nLineTops[ line ] = tabHeight * ( line + 1 ); // +
GetItemsOffset().Y();
}
sal_uInt32 item = 0;
@@ -482,8 +475,8 @@ bool TabControl::ImplPlaceTabs( long nWidth )
bNewLine = true;
}
-it->maRect.Top() = nLineHeights[ lineN - 1 ];
-it->maRect.Bottom() = nLineHeights[ lineN - 1 ] + tabHeight;
+it->maRect.Top() = nLineTops[ lineN - 1 ];
+it->maRect.Bottom() = nLineTops[ lineN - 1 ] + tabHeight;
long lastTabOnPreviousLine = 0;
if ( lineN > 0 )
@@ -517,7 +510,7 @@ bool TabControl::ImplPlaceTabs( long nWidth )
}
}
else
-{ // only one line
+{ // t
[Libreoffice-commits] core.git: 4 commits - Makefile.in Repository.mk vcl/Executable_dxffuzzer.mk vcl/Executable_metfuzzer.mk vcl/Executable_ppmfuzzer.mk vcl/Module_vcl.mk vcl/workben
Makefile.in |2 -
Repository.mk |3 ++
vcl/Executable_dxffuzzer.mk | 47
vcl/Executable_metfuzzer.mk | 47
vcl/Executable_ppmfuzzer.mk | 47
vcl/Module_vcl.mk |3 ++
vcl/workben/dxffuzzer.cxx | 24 ++
vcl/workben/fftester.cxx| 44 -
vcl/workben/metfuzzer.cxx | 24 ++
vcl/workben/ppmfuzzer.cxx | 24 ++
10 files changed, 242 insertions(+), 23 deletions(-)
New commits:
commit ec6c0319a16f4163b123389775d9ff779fe5d9c2
Author: Caolán McNamara
Date: Thu Jan 12 11:43:59 2017 +
update symbols names to match current reality
Change-Id: Iba6dbec0ec1061e8953eed06a14632305bdb3e44
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index a89f014..d967541 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -173,9 +173,9 @@ try_again:
if (!pfnImport)
{
osl::Module aLibrary;
-aLibrary.loadRelative(&thisModule, "libicdlo.so");
+aLibrary.loadRelative(&thisModule, "libgielo.so");
pfnImport = reinterpret_cast(
-aLibrary.getFunctionSymbol("GraphicImport"));
+aLibrary.getFunctionSymbol("icdGraphicImport"));
aLibrary.release();
}
Graphic aGraphic;
@@ -190,9 +190,9 @@ try_again:
if (!pfnImport)
{
osl::Module aLibrary;
-aLibrary.loadRelative(&thisModule, "libidxlo.so");
+aLibrary.loadRelative(&thisModule, "libgielo.so");
pfnImport = reinterpret_cast(
-aLibrary.getFunctionSymbol("GraphicImport"));
+aLibrary.getFunctionSymbol("idxGraphicImport"));
aLibrary.release();
}
Graphic aGraphic;
@@ -207,9 +207,9 @@ try_again:
if (!pfnImport)
{
osl::Module aLibrary;
-aLibrary.loadRelative(&thisModule, "libimelo.so");
+aLibrary.loadRelative(&thisModule, "libgielo.so");
pfnImport = reinterpret_cast(
-aLibrary.getFunctionSymbol("GraphicImport"));
+aLibrary.getFunctionSymbol("imeGraphicImport"));
aLibrary.release();
}
Graphic aGraphic;
@@ -224,9 +224,9 @@ try_again:
if (!pfnImport)
{
osl::Module aLibrary;
-aLibrary.loadRelative(&thisModule, "libipblo.so");
+aLibrary.loadRelative(&thisModule, "libgielo.so");
pfnImport = reinterpret_cast(
-aLibrary.getFunctionSymbol("GraphicImport"));
+aLibrary.getFunctionSymbol("ipbGraphicImport"));
aLibrary.release();
}
Graphic aGraphic;
@@ -241,9 +241,9 @@ try_again:
if (!pfnImport)
{
osl::Module aLibrary;
-aLibrary.loadRelative(&thisModule, "libipdlo.so");
+aLibrary.loadRelative(&thisModule, "libgielo.so");
pfnImport = reinterpret_cast(
-aLibrary.getFunctionSymbol("GraphicImport"));
+aLibrary.getFunctionSymbol("ipdGraphicImport"));
aLibrary.release();
}
Graphic aGraphic;
@@ -258,9 +258,9 @@ try_again:
if (!pfnImport)
{
osl::Module aLibrary;
-aLibrary.loadRelative(&thisModule, "libipslo.so");
+aLibrary.loadRelative(&thisModule, "libgielo.so");
pfnImport = reinterpret_cast(
-aLibrary.getFunctionSymbol("GraphicImport"));
+aLibrary.getFunctionSymbol("ipsGraphicImport"));
aLibrary.release();
}
Graphic aGraphic;
@@ -275,9 +275,9 @@ try_again:
if (!pfnImport)
{
osl::Module aLibrary;
-aLibrary.loadRelative(&thisModule, "libiptlo.so");
+aLibrary.loadRelative(&thisModule, "libgielo.so");
pfnImport = reinterpret_cast(
-aLibrary.getFunctionSymbol("GraphicImport"));
+aLibrary.getFunctionSymbol("iptGraphicImport"));
aLibrary.release();
}
Graphic aGraphic;
@@ -29
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist
loleaflet/dist/menubar.css |4
1 file changed, 4 insertions(+)
New commits:
commit 72556d87a37a714d1c6c5aafc61114ad07562d98
Author: Pranav Kant
Date: Thu Jan 12 17:01:52 2017 +0530
loleaflet: Override fontsize in lo-menu class
We want to be consistent with our font in whole of the UI.
Change-Id: I102e66411e4fad8d2d49c1b113ac250807716a12
(cherry picked from commit fd619e969e372c57b40c7a6310abba8e55776e1f)
Signed-off-by: Andras Timar
diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index 69bd3b0..72c8926 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -28,6 +28,10 @@
line-height: 15px;
}
+.lo-menu ul a, .lo-menu ul a:hover, .lo-menu ul a:focus, .lo-menu ul a:active {
+font-size: 12px;
+}
+
.lo-menu a.disabled {
cursor: default;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/CompilerTest_compilerplugins_clang.mk solenv/gbuild
solenv/CompilerTest_compilerplugins_clang.mk |2 ++ solenv/gbuild/CompilerTest.mk|1 + 2 files changed, 3 insertions(+) New commits: commit a3dfe938ef0be9af3c37f9302bb7dc296362a1e3 Author: Stephan Bergmann Date: Thu Jan 12 11:38:02 2017 +0100 Allow CompilerTest_compilerplugins_clang to include css/uno/Reference.hxx Change-Id: Ib35d8fcc41e1c49bfef01c980b25c051190cb753 Reviewed-on: https://gerrit.libreoffice.org/32990 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/solenv/CompilerTest_compilerplugins_clang.mk b/solenv/CompilerTest_compilerplugins_clang.mk index 4934ae2..f01f8e3 100644 --- a/solenv/CompilerTest_compilerplugins_clang.mk +++ b/solenv/CompilerTest_compilerplugins_clang.mk @@ -22,4 +22,6 @@ $(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \ compilerplugins/clang/test/vclwidgets \ )) +$(eval $(call gb_CompilerTest_use_udk_api,compilerplugins_clang)) + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/CompilerTest.mk b/solenv/gbuild/CompilerTest.mk index 8a1ba58..4178b51 100644 --- a/solenv/gbuild/CompilerTest.mk +++ b/solenv/gbuild/CompilerTest.mk @@ -40,6 +40,7 @@ $(eval $(foreach method, \ add_objcobjects \ add_objcxxobject \ add_objcxxobjects \ +use_udk_api \ , \ $(call gb_CompilerTest__forward_to_Linktarget,$(method)) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Resizable wizards
On 01/10/2017 08:33 PM, Thorsten Wagner wrote: please keep in mind that resizable dialogs cause problems on OS X. In full screen mode they cover the whole display, because such windows are maximized by OS X in full screen mode. Non resizable dialogs are a prerequisite to keep LO usable in full screen mode on Macs. Is there a bugzilla issue for that? (I'd assume/hope that that's a problem we can address in VCL?) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: I have question in build step
Please mail such question to our mailing list (CC), where there are a lot more people available to help you. Did you install your windows version, with LODE and follow the instructions ? It looks as if you might have the wrong JDK version installed (e.g. 32bit instead of 64bit). rgds jan I > On 12 Jan 2017, at 11:42, 김광연 wrote: > > Running autogen in my windows 10 system, I met a problem. > I met error that says my system doesn't have JDK. But I installed JDK and > when I commend 'javec' in cygwin, it works. > And my virtual Debian system is still compiling libreoffice. > Please help me. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/menubar.css |4
1 file changed, 4 insertions(+)
New commits:
commit fd619e969e372c57b40c7a6310abba8e55776e1f
Author: Pranav Kant
Date: Thu Jan 12 17:01:52 2017 +0530
loleaflet: Override fontsize in lo-menu class
We want to be consistent with our font in whole of the UI.
Change-Id: I102e66411e4fad8d2d49c1b113ac250807716a12
diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index 69bd3b0..72c8926 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -28,6 +28,10 @@
line-height: 15px;
}
+.lo-menu ul a, .lo-menu ul a:hover, .lo-menu ul a:focus, .lo-menu ul a:active {
+font-size: 12px;
+}
+
.lo-menu a.disabled {
cursor: default;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/2.0.2-1'
Tag '2.0.2-1' created by Andras Timar at 2017-01-12 11:27 + 2.0.2-1 Changes since 2.0.1-26: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 55 +-
1 file changed, 42 insertions(+), 13 deletions(-)
New commits:
commit 11f20a2ec165bb32cd3fa3e5da2486abaae28d71
Author: Pranav Kant
Date: Thu Jan 12 16:33:35 2017 +0530
loleaflet: Update dropdowns on refresh everytime
Change-Id: I39071f1c6249e6ecf71684d3b93cc88f1f859510
(cherry picked from commit 1566ae634d08cb6d0b426d486ee5f1c8ed378b75)
loleaflet: Move this logic to updateCommandValues()
Change-Id: I64e96f87e56c1b14dd2085d552eebd40977cd7e9
(cherry picked from commit fac3c3aafcb5182c9f59eb6ba5131b6b5606704e)
Reviewed-on: https://gerrit.libreoffice.org/32993
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 84de90a..3572b28 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -436,6 +436,10 @@ function onColorPick(e, color) {
// edit/view mode, state from this object is read and then applied on
corresponding buttons
var formatButtons = {};
+var stylesSelectValue;
+var fontsSelectValue;
+var fontsizesSelectValue;
+
$(function () {
$('#toolbar-up-more').w2toolbar({
name: 'toolbar-up-more',
@@ -595,6 +599,8 @@ $(function () {
}
}
+ updateCommandValues();
+
insertTable();
}
});
@@ -1082,6 +1088,8 @@ map.on('commandstatechanged', function (e) {
.append($('')
.text(state));
}
+
+ stylesSelectValue = state;
$('.styles-select').val(state).trigger('change');
}
else if (commandName === '.uno:CharFontName') {
@@ -1099,6 +1107,7 @@ map.on('commandstatechanged', function (e) {
.append($('')
.text(state));
}
+ fontsSelectValue = state;
$('.fonts-select').val(state).trigger('change');
}
else if (commandName === '.uno:FontHeight') {
@@ -1117,6 +1126,7 @@ map.on('commandstatechanged', function (e) {
.append($('')
.text(state).val(state));
}
+ fontsizesSelectValue = state;
$('.fontsizes-select').val(state).trigger('change');
sortFontSizes();
}
@@ -1258,13 +1268,17 @@ map.on('search', function (e) {
}
});
-map.on('updatetoolbarcommandvalues', function (e) {
- // we need an empty option for the place holder to work
+function updateCommandValues() {
var data = [];
- var styles = [];
- var topStyles = [];
- if (e.commandName === '.uno:StyleApply') {
- var commands = e.commandValues.Commands;
+ // 1) For .uno:StyleApply
+ // we need an empty option for the place holder to work
+ if ($('.styles-select option').length === 0) {
+ var styles = [];
+ var topStyles = [];
+ var commandValues =
map.getToolbarCommandValues('.uno:StyleApply');
+ if (typeof commandValues === 'undefined')
+ return;
+ var commands = commandValues.Commands;
if (commands && commands.length > 0) {
// Inserts a separator element
data = data.concat({text:
'\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true});
@@ -1275,11 +1289,11 @@ map.on('updatetoolbarcommandvalues', function (e) {
}
if (map.getDocType() === 'text') {
- styles = e.commandValues.ParagraphStyles.slice(7, 19);
- topStyles = e.commandValues.ParagraphStyles.slice(0, 7);
+ styles = commandValues.ParagraphStyles.slice(7, 19);
+ topStyles = commandValues.ParagraphStyles.slice(0, 7);
}
else if (map.getDocType() === 'spreadsheet') {
- styles = e.commandValues.CellStyles;
+ styles = commandValues.CellStyles;
}
else if (map.getDocType() === 'presentation') {
// styles are not applied for presentation
@@ -1317,27 +1331,42 @@ map.on('updatetoolbarcommandvalues', function (e) {
data: data,
placeholder: _('Style')
});
+ $('.styles-select').val(stylesSelectValue).trigger('change');
$('.styles-select').on('select2:select', onStyleSelect);
}
- else if (e.commandName === '.uno:CharFontName') {
+
+ if ($('.fonts-select option').length === 0) {
+ // 2) For .uno:CharFontName
+ commandValues =
map.getTo
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/CommonSalLayout.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 77a0817cf46aace4b446d05af13c6905c7c6411a
Author: Douglas Mencken
Date: Sun Jan 8 15:04:12 2017 -0500
make the include of OpenGLHelper.hxx not global here
surround it like in pieces of code which actually uses it
Change-Id: Iac993553455248a2d2f999f857b781dbdb37acf5
Reviewed-on: https://gerrit.libreoffice.org/32852
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/vcl/source/gdi/CommonSalLayout.cxx
b/vcl/source/gdi/CommonSalLayout.cxx
index 2dd9925..3451478 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -19,7 +19,6 @@
#include "CommonSalLayout.hxx"
-#include
#include
#include
#include
@@ -39,6 +38,10 @@ T lround(T x)
}
#endif
+#ifdef _WIN32
+# include
+#endif
+
static hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void*
pUserData)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/guess.cxx | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
New commits:
commit 1c1747ac13a9d895df0fcba2fbb1bd266dccd74b
Author: Vitaliy Anderson
Date: Tue Dec 20 03:00:51 2016 -0500
tdf#104668 remove the difference between MSO and LO text alignment
Change-Id: Id1964d87f6f4ec3dbcd617af2251a321c50ec428
Reviewed-on: https://gerrit.libreoffice.org/32213
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
Reviewed-by: jan iversen
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index f9b24e0..e347013 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -73,6 +73,28 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor,
SwTextFormatInfo &rInf,
SwTwips nLineWidth = rInf.Width() - rInf.X();
sal_Int32 nMaxLen = rInf.GetText().getLength() - rInf.GetIdx();
+const SvxAdjust& rAdjust =
rInf.GetTextFrame()->GetTextNode()->GetSwAttrSet().GetAdjust().GetAdjust();
+
+// tdf#104668 space chars at the end should be cut
+if ( rAdjust == SVX_ADJUST_RIGHT || rAdjust == SVX_ADJUST_CENTER )
+{
+sal_Int32 nSpaceCnt = 0;
+for ( int i = (rInf.GetText().getLength() - 1); i >= rInf.GetIdx();
--i )
+{
+sal_Unicode cChar = rInf.GetText()[i];
+if ( cChar != CH_BLANK && cChar != CH_FULL_BLANK )
+break;
+++nSpaceCnt;
+}
+sal_Int32 nCharsCnt = nMaxLen - nSpaceCnt;
+if ( nSpaceCnt && nCharsCnt < rPor.GetLen() )
+{
+nMaxLen = nCharsCnt;
+if ( !nMaxLen )
+return true;
+}
+}
+
if ( rInf.GetLen() < nMaxLen )
nMaxLen = rInf.GetLen();
@@ -212,7 +234,6 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor,
SwTextFormatInfo &rInf,
nBreakPos = nCutPos;
sal_Int32 nX = nBreakPos;
-const SvxAdjust& rAdjust =
rInf.GetTextFrame()->GetTextNode()->GetSwAttrSet().GetAdjust().GetAdjust();
if ( rAdjust == SVX_ADJUST_LEFT )
{
// we step back until a non blank character has been found
@@ -423,7 +444,6 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor,
SwTextFormatInfo &rInf,
CHAR_SOFTHYPHEN == rInf.GetText()[ nBreakPos - 1 ] )
nBreakPos = rInf.GetIdx() - 1;
-const SvxAdjust& rAdjust =
rInf.GetTextFrame()->GetTextNode()->GetSwAttrSet().GetAdjust().GetAdjust();
if( rAdjust != SVX_ADJUST_LEFT )
{
// Delete any blanks at the end of a line, but be careful:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - embeddedobj/source filter/source include/svx sd/source sfx2/source slideshow/source svx/source
embeddedobj/source/msole/oleembed.cxx| 61 +--
filter/source/msfilter/escherex.cxx | 52 +--
include/svx/xbitmap.hxx |2
sd/source/filter/eppt/epptso.cxx |8 +--
sfx2/source/view/ipclient.cxx|2
slideshow/source/engine/shapes/shapeimporter.cxx | 39 +++---
svx/source/xml/xmlgrhlp.cxx | 17 +++---
svx/source/xoutdev/xattrbmp.cxx |6 +-
8 files changed, 119 insertions(+), 68 deletions(-)
New commits:
commit 75367918028dffb7a137d29644a7a6e1f7af7c9b
Author: Caolán McNamara
Date: Thu Jan 12 09:49:36 2017 +
in extremis dump Ole10Native payload and launch system viewer on it
so embedded plain text documents/source code/etc in word documents can be
viewed
by us under Linux
Change-Id: I19e19619070841fe097c70297adc2e8b96d1c581
diff --git a/embeddedobj/source/msole/oleembed.cxx
b/embeddedobj/source/msole/oleembed.cxx
index 91bc27c..c15962c 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -665,18 +665,25 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
namespace
{
#ifndef _WIN32
-bool lcl_CopyStream(const uno::Reference& xIn, const
uno::Reference& xOut)
+bool lcl_CopyStream(const uno::Reference& xIn, const
uno::Reference& xOut, sal_Int32 nMaxCopy = SAL_MAX_INT32)
{
+if (nMaxCopy == 0)
+return false;
+
const sal_Int32 nChunkSize = 4096;
uno::Sequence< sal_Int8 > aData(nChunkSize);
sal_Int32 nTotalRead = 0;
sal_Int32 nRead;
do
{
-nRead = xIn->readBytes(aData, nChunkSize);
+if (nTotalRead + aData.getLength() > nMaxCopy)
+{
+aData.realloc(nMaxCopy - nTotalRead);
+}
+nRead = xIn->readBytes(aData, aData.getLength());
nTotalRead += nRead;
xOut->writeBytes(aData);
-} while (nRead == nChunkSize);
+} while (nRead == nChunkSize && nTotalRead <= nMaxCopy);
return nTotalRead != 0;
}
#endif
@@ -716,6 +723,52 @@ namespace
bool bCopied = xCONTENTS.is() &&
lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream());
+if (!bCopied)
+{
+uno::Reference< io::XStream > xOle10Native;
+try
+{
+xNameContainer->getByName("\1Ole10Native") >>= xOle10Native;
+}
+catch (container::NoSuchElementException const&)
+{
+// ignore
+}
+if (xOle10Native.is())
+{
+const uno::Reference xIn =
xOle10Native->getInputStream();
+xIn->skipBytes(4); //size of the entire stream minus 4 bytes
+xIn->skipBytes(2); //word that represent the directory type
+uno::Sequence< sal_Int8 > aData(1);
+sal_Int32 nRead;
+do
+{
+nRead = xIn->readBytes(aData, 1);
+} while (nRead == 1 && aData[0] != 0); // file name plus
extension of the attachment null terminated
+do
+{
+nRead = xIn->readBytes(aData, 1);
+} while (nRead == 1 && aData[0] != 0); // Fully Qualified
File name with extension
+xIn->skipBytes(1); //single byte
+xIn->skipBytes(1); //single byte
+xIn->skipBytes(2); //Word that represent the directory type
+xIn->skipBytes(4); //len of string
+do
+{
+nRead = xIn->readBytes(aData, 1);
+} while (nRead == 1 && aData[0] != 0); // Actual string
representing the file path
+uno::Sequence< sal_Int8 > aLenData(4);
+xIn->readBytes(aLenData, 4); //len of attachment
+sal_uInt32 nLen = static_cast
+ ((sal_uInt32)aLenData[0]
++ ((sal_uInt32)aLenData[1] << 8)
++ ((sal_uInt32)aLenData[2] << 16)
++ ((sal_uInt32)aLenData[3] << 24));
+
+bCopied = lcl_CopyStream(xIn, xStream->getOutputStream(),
nLen);
+}
+}
+
uno::Reference< io::XSeekable > xSeekableStor(xObjectStream,
uno::UNO_QUERY);
if (xSeekableStor.is())
xSeekableStor->seek(0);
@@ -862,7 +915,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
}
}
-if ( m_aFilterName != "Text" && (!m_pOwnView ||
!m_pOwnView->Open()) )
+if (!m_pOwnView || !m_pOwnView->Open())
{
//Make a RO copy and see if the OS can find something to a
[Libreoffice-commits] online.git: 2 commits - loleaflet/src
loleaflet/src/layer/tile/CalcTileLayer.js|2 +-
loleaflet/src/layer/tile/ImpressTileLayer.js | 13 -
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 13fcb10f91dfbf5c7cc276996a765af8e814d050
Author: Tor Lillqvist
Date: Thu Jan 12 13:14:19 2017 +0200
Do the oldhash thing for Impress documents, too
(Copy-pasta here, too.)
Change-Id: I0327889d05a8d7294499849cb0a2b2dcca60ecff
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 496fa91..3f20f56 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -28,6 +28,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
var tilePositionsX = '';
var tilePositionsY = '';
+ var oldHashes = '';
var needsNewTiles = false;
for (var key in this._tiles) {
@@ -51,6 +52,15 @@ L.ImpressTileLayer = L.TileLayer.extend({
tilePositionsY += ',';
}
tilePositionsY += tileTopLeft.y;
+ if (oldHashes !== '') {
+ oldHashes += ',';
+ }
+ if (this._tiles[key].oldhash ===
undefined) {
+ oldHashes += '0';
+ }
+ else {
+ oldHashes +=
this._tiles[key].oldhash;
+ }
needsNewTiles = true;
if (this._debug) {
this._debugAddInvalidationData(this._tiles[key]);
@@ -73,7 +83,8 @@ L.ImpressTileLayer = L.TileLayer.extend({
'tileposx=' + tilePositionsX + ' ' +
'tileposy=' + tilePositionsY + ' ' +
'tilewidth=' + this._tileWidthTwips + ' ' +
- 'tileheight=' + this._tileHeightTwips;
+ 'tileheight=' + this._tileHeightTwips + ' ' +
+ 'oldhash=' + oldHashes;
this._map._socket.sendMessage(message, '');
if (this._debug) {
commit b35d708006a64bc13797e39646bdc51818a88872
Author: Tor Lillqvist
Date: Thu Jan 12 13:12:34 2017 +0200
Bin superfluous semicolon
Change-Id: I2319ef9badfa50f645af3bedd2a589de61f6d2b3
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index b120e16..02747de 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -100,7 +100,7 @@ L.CalcTileLayer = L.TileLayer.extend({
'tileposy=' + tilePositionsY + ' ' +
'tilewidth=' + this._tileWidthTwips + ' ' +
'tileheight=' + this._tileHeightTwips + ' ' +
- 'oldhash=' + oldHashes;;
+ 'oldhash=' + oldHashes;
this._map._socket.sendMessage(message, '');
if (this._debug) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit fac3c3aafcb5182c9f59eb6ba5131b6b5606704e
Author: Pranav Kant
Date: Thu Jan 12 16:44:36 2017 +0530
loleaflet: Move this logic to updateCommandValues()
Change-Id: I64e96f87e56c1b14dd2085d552eebd40977cd7e9
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 23d4284..b299611 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -616,10 +616,6 @@ $(function () {
}
updateCommandValues();
- if (fontsSelectValue){
-
$('.fontsizes-select').val(fontsizesSelectValue);
- updateFontSizeList(fontsSelectValue);
- }
insertTable();
}
@@ -1340,6 +1336,10 @@ function updateCommandValues() {
});
$('.fontsizes-select').on('select2:select', onFontSizeSelect);
+ if (fontsSelectValue) {
+ updateFontSizeList(fontsSelectValue);
+ }
+
$('.fontsizes-select').val(fontsizesSelectValue).trigger('change');
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/macosx-codesign-app-bundle |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d2f5da94188a7db8a5815130caadaccd806a1826
Author: Tor Lillqvist
Date: Thu Jan 12 13:09:42 2017 +0200
Update comment to match reality
Change-Id: I0b4ee6377aac984b7acf7085ac43cad3d088612d
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index c2a6db3f..7faeb4a 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -1,8 +1,8 @@
#!/bin/bash
-# Script to sign executables, dylibs and frameworks in an app bundle
-# plus the bundle itself. Called from
-# the test-install target in Makefile.in
+# Script to sign executables, dylibs and frameworks in an app bundle plus the
bundle itself. Called
+# from installer::simplepackage::create_package() in
solenv/bin/modules/installer/simplepackage.pm
+# and the test-install target in Makefile.in.
test `uname` = Darwin || { echo This is for OS X only; exit 1; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 62 ++
1 file changed, 43 insertions(+), 19 deletions(-)
New commits:
commit 1566ae634d08cb6d0b426d486ee5f1c8ed378b75
Author: Pranav Kant
Date: Thu Jan 12 16:33:35 2017 +0530
loleaflet: Update dropdowns on refresh everytime
Change-Id: I39071f1c6249e6ecf71684d3b93cc88f1f859510
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index d5fb89a..23d4284 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -441,6 +441,10 @@ function onColorPick(e, color) {
// edit/view mode, state from this object is read and then applied on
corresponding buttons
var formatButtons = {};
+var stylesSelectValue;
+var fontsSelectValue;
+var fontsizesSelectValue;
+
$(function () {
$('#toolbar-up-more').w2toolbar({
name: 'toolbar-up-more',
@@ -611,6 +615,12 @@ $(function () {
}
}
+ updateCommandValues();
+ if (fontsSelectValue){
+
$('.fontsizes-select').val(fontsizesSelectValue);
+ updateFontSizeList(fontsSelectValue);
+ }
+
insertTable();
}
});
@@ -1056,6 +1066,8 @@ map.on('commandstatechanged', function (e) {
.append($('')
.text(state));
}
+
+ stylesSelectValue = state;
$('.styles-select').val(state).trigger('change');
}
else if (commandName === '.uno:CharFontName') {
@@ -1073,6 +1085,7 @@ map.on('commandstatechanged', function (e) {
.append($('')
.text(state));
}
+ fontsSelectValue = state;
$('.fonts-select').val(state).trigger('change');
}
else if (commandName === '.uno:FontHeight') {
@@ -1091,6 +1104,7 @@ map.on('commandstatechanged', function (e) {
.append($('')
.text(state).val(state));
}
+ fontsizesSelectValue = state;
$('.fontsizes-select').val(state).trigger('change');
sortFontSizes();
}
@@ -1233,13 +1247,17 @@ map.on('search', function (e) {
}
});
-map.on('updatetoolbarcommandvalues', function (e) {
- // we need an empty option for the place holder to work
+function updateCommandValues() {
var data = [];
- var styles = [];
- var topStyles = [];
- if (e.commandName === '.uno:StyleApply') {
- var commands = e.commandValues.Commands;
+ // 1) For .uno:StyleApply
+ // we need an empty option for the place holder to work
+ if ($('.styles-select option').length === 0) {
+ var styles = [];
+ var topStyles = [];
+ var commandValues =
map.getToolbarCommandValues('.uno:StyleApply');
+ if (typeof commandValues === 'undefined')
+ return;
+ var commands = commandValues.Commands;
if (commands && commands.length > 0) {
// Inserts a separator element
data = data.concat({text:
'\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true});
@@ -1250,11 +1268,11 @@ map.on('updatetoolbarcommandvalues', function (e) {
}
if (map.getDocType() === 'text') {
- styles = e.commandValues.ParagraphStyles.slice(7, 19);
- topStyles = e.commandValues.ParagraphStyles.slice(0, 7);
+ styles = commandValues.ParagraphStyles.slice(7, 19);
+ topStyles = commandValues.ParagraphStyles.slice(0, 7);
}
else if (map.getDocType() === 'spreadsheet') {
- styles = e.commandValues.CellStyles;
+ styles = commandValues.CellStyles;
}
else if (map.getDocType() === 'presentation') {
// styles are not applied for presentation
@@ -1292,27 +1310,38 @@ map.on('updatetoolbarcommandvalues', function (e) {
data: data,
placeholder: _('Style')
});
+ $('.styles-select').val(stylesSelectValue).trigger('change');
$('.styles-select').on('select2:select', onStyleSelect);
}
- else if (e.commandName === '.uno:CharFontName') {
+
+ if ($('.fonts-select option').length === 0) {
+ // 2) For .uno:CharFontName
+ commandValues =
map.getToolbarCommandValues('.uno:CharFontName');
+ if (typeof commandValues === 'undefined') {
+ return;
+ }
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1120256f89b62eea3a28ecfd17d4f5e60778b420 Author: Olivier Date: Tue Jan 10 18:09:37 2017 -0200 Updated core Project: help 2550608f310dd5cba88967e2b1d7430d46bd1bcd No need to explain errors after user mistake. Change-Id: I986fcfffe790fe8cff3d209f514c5a34c7d28478 Reviewed-on: https://gerrit.libreoffice.org/32939 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/helpcontent2 b/helpcontent2 index 69cc05e..2550608 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 69cc05e42df703775a9716d8eb1767b1fd147336 +Subproject commit 2550608f310dd5cba88967e2b1d7430d46bd1bcd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/func_aggregate.xhp |1 - 1 file changed, 1 deletion(-) New commits: commit 2550608f310dd5cba88967e2b1d7430d46bd1bcd Author: Olivier Date: Tue Jan 10 18:09:37 2017 -0200 No need to explain errors after user mistake. Change-Id: I986fcfffe790fe8cff3d209f514c5a34c7d28478 Reviewed-on: https://gerrit.libreoffice.org/32939 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/source/text/scalc/01/func_aggregate.xhp b/source/text/scalc/01/func_aggregate.xhp index 5f77dae..9fba216 100644 --- a/source/text/scalc/01/func_aggregate.xhp +++ b/source/text/scalc/01/func_aggregate.xhp @@ -281,7 +281,6 @@ Array â obligatory argument. The array can be specified by the boundaries of the range, the name of the named range or the column label. For using column labels âAutomatically find columns and rows labelsâ function needs to be enabled. k â obligatory argument for the following functions: LARGE, SMALL, PERCENTILE.INC, QUARTILE.INC, PERCENTILE.EXC, QUARTILE.EXC. It is a numeric argument, which must correspond to the second argument of these functions. -If the k argument is necessary, but not specified, the function returns the error Err:511.If the Function and/or Option arguments are not specified correctly, the function returns the error Err:502. Examples ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: A Problem while building
Try reading what the error messages say. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - bin/pack-debug
bin/pack-debug |1 +
1 file changed, 1 insertion(+)
New commits:
commit b88bf43749b859506a97bdab7d3b62687400f5c9
Author: Andras Timar
Date: Thu Jan 12 11:54:44 2017 +0100
fix debug package of report builder
Change-Id: I331dfa58fb05c08423d7d8dd00cd799238338858
diff --git a/bin/pack-debug b/bin/pack-debug
index 4003049..60df442 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -256,6 +256,7 @@ do
/epm_gid_Module_Prg_Math_Bin.lst/{print"basis5.1-math"}
/epm_gid_Module_Prg_Wrt_Bin.lst/{print"basis5.1-writer"}
/epm_gid_Module_Pyuno.lst/{print"basis5.1-pyuno"}
+
/epm_gid_Module_Reportbuilder.lst/{print"basis5.1-extension-report-builder"}
/epm_gid_Module_Root_Brand.lst/{print"5.1"}
/epm_gid_Module_Root.lst/{print"basis5.1-core"}
/epm_gid_Module_Root_Ure_Hidden.lst/{print"5.1-ure"}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
A Problem while building
Actually I followed sequential steps to build libreoffice on my PC but what happened is when I used 'make' command I got an error . Hope I'll get a solution for it. If anyone knows please help me in solving it. Actually error is like this: sri@sri-Inspiron-3542:~$ cd libreoffice sri@sri-Inspiron-3542:~/libreoffice$ make sh -c /home/sri/libreoffice/autogen.sh Reading autogen.lastrun. Please rename it to autogen.input to avoid this message. Running ./configure with '--without-java --disable-postgresql-sdbc --disable-gstreamer --srcdir=/home/sri/libreoffice --enable-option-checking=fatal' configure: error: unrecognized options: --disable-gstreamer Error running configure at /home/sri/libreoffice/autogen.sh line 281. Makefile:51: recipe for target '/home/sri/libreoffice/config_host.mk' failed make: *** [/home/sri/libreoffice/config_host.mk] Error 2 sri@sri-Inspiron-3542:~/libreoffice$ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 10 commits - wizards/Package_access2base.mk wizards/source
wizards/Package_access2base.mk |1
wizards/source/access2base/Application.xba | 164 +-
wizards/source/access2base/Collect.xba |8
wizards/source/access2base/Compatible.xba| 10
wizards/source/access2base/Control.xba | 417 ---
wizards/source/access2base/DataDef.xba | 14
wizards/source/access2base/Database.xba | 26
wizards/source/access2base/Dialog.xba| 16
wizards/source/access2base/Event.xba |8
wizards/source/access2base/Field.xba | 12
wizards/source/access2base/Form.xba | 202 +++
wizards/source/access2base/L10N.xba |6
wizards/source/access2base/Module.xba| 720 +++
wizards/source/access2base/OptionGroup.xba | 10
wizards/source/access2base/PropertiesGet.xba |7
wizards/source/access2base/PropertiesSet.xba |7
wizards/source/access2base/Recordset.xba | 12
wizards/source/access2base/Root_.xba | 13
wizards/source/access2base/SubForm.xba | 199 +++
wizards/source/access2base/Test.xba |4
wizards/source/access2base/UtilProperty.xba | 183 +-
wizards/source/access2base/Utils.xba | 246 -
wizards/source/access2base/acConstants.xba | 21
wizards/source/access2base/script.xlb|1
24 files changed, 2111 insertions(+), 196 deletions(-)
New commits:
commit 9e634331a760bbca807741674d03f4c593915dd6
Author: Jean-Pierre Ledure
Date: Wed Dec 28 12:29:26 2016 +0100
Access2Base - Improve precision of query typing
Change-Id: I6c5246809cb533a2c69978008ea996392e2fbe6a
diff --git a/wizards/source/access2base/DataDef.xba
b/wizards/source/access2base/DataDef.xba
index 0b87055..bba8e85 100644
--- a/wizards/source/access2base/DataDef.xba
+++ b/wizards/source/access2base/DataDef.xba
@@ -490,10 +490,12 @@ Dim sSql As String, sVerb As String, iType As Integer
_PropertyGet = Query.Command
Case UCase("Type")
iType = 0
- sSql = Trim(UCase(Query.Command))
+ sSql = Utils._Trim(UCase(Query.Command))
sVerb = Split(sSql, " ")(0)
If sVerb = "SELECT" Then iType = iType +
dbQSelect
- If sVerb = "SELECT" And InStr(sSql, "
INTO ") > 0 Then iType = iType + dbQMakeTable
+ If sVerb = "SELECT" And InStr(sSql, "
INTO ") > 0 _
+ Or sVerb = "CREATE" And InStr(sSql, "
TABLE ") > 0 _
+ Then iType = iType + dbQMakeTable
If sVerb = "SELECT" And InStr(sSql, "
UNION ") > 0 Then iType = iType + dbQSetOperation
If Not Query.EscapeProcessing Then iType = iType +
dbQSQLPassThrough
If sVerb = "INSERT" Then iType = iType +
dbQAppend
commit e2a1e22288a4fbe0681a8e33d25816f80799e687
Author: Jean-Pierre Ledure
Date: Tue Dec 27 14:40:08 2016 +0100
Access2Base - Use Empty() builtin function
... i.o. uninitialized variable
Change-Id: I732705df11ea25c2b106d542f9e97f3f32cc9867
diff --git a/wizards/source/access2base/Application.xba
b/wizards/source/access2base/Application.xba
index 037d54b..46cb24a 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -734,13 +734,13 @@ Public Function Controls(ByVal Optional pvObject As
Variant, Optional ByVal pvIn
' If no pvIndex argument, return a Collection type
If _ErrorHandler() Then On Local Error Goto Error_Function
-Dim vObject As Object, vEMPTY As variant
+Dim vObject As Object
Const cstThisSub = "Controls"
Utils._SetCalledSub(cstThisSub)
If IsMissing(pvObject) Then Call _TraceArguments()
If IsNull(pvObject) Or IsEmpty(pvObject) Then Call _TraceArguments()
- Controls = vEMPTY
+ Controls = EMPTY
If VarType(pvObject) = vbString Then
Set vObject = Forms(pvObject)
diff --git a/wizards/source/access2base/Control.xba
b/wizards/source/access2base/Control.xba
index 9319895..859e446 100644
--- a/wizards/source/access2base/Control.xba
+++ b/wizards/source/access2base/Control.xba
@@ -1381,10 +1381,10 @@ REM
Private Function _PropertyGet(ByVal psProperty As String, ByVal Optional
pvIndex As Variant) As Variant
' Return property value of the psProperty property name
-Dim vEMPTY As Variant, iArg As Integer
+Dim iArg As Integer
If _ErrorHandler() Then On Local Error Goto Error_Function
Utils._SetCalledSub("Control.get" & psProperty)
- _PropertyGet = vEMPTY
+ _PropertyGet = EMPTY
'Check Index argument
Dim iArgNr As Integer
@@ -1759,7 +1759,7 @@ Dim vSelection As Variant, sSelectedText As String
If Not
Utils._hasUNOProper
Re: Resizable wizards
Hi Heiko, Eike, please keep in mind that resizable dialogs cause problems on OS X. In full screen mode they cover the whole display, because such windows are maximized by OS X in full screen mode. Non resizable dialogs are a prerequisite to keep LO usable in full screen mode on Macs. brgds Thorsten > On 10.01.2017, at 13:15, Eike Rathke wrote: > > Hi Heiko, > > On Sunday, 2017-01-08 11:10:13 +0100, Heiko Tietze wrote: > >> We decided [1] to go with non-resizable dialogs by default. However wizards >> such as Calc > Insert > Form Controls > List box (sabpilot) are still >> resizable. So I suggest to unset the resizable flag at >> svtools/uiconfig/ui/wizarddialog.ui. This would affect a lot of dialogs and >> maybe have unexpected results. Any thoughts? >> >> [1] https://listarchives.libreoffice.org/global/design/msg07373.html > > Make sure that derived dialogs > a) do not contain edit fields or list boxes or tabular grids, or > b) adjust those to be resizable again > > Eike > > P.S.: for some reason your PGP signature doesn't verify for the mail you > wrote. > > -- > LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. > GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A > Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ > Care about Free Software, support the FSFE https://fsfe.org/support/?erack > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/CalcTileLayer.js | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit e8f55142ef2bf5624e03d4b51cbe572fe983b71b
Author: Tor Lillqvist
Date: Thu Jan 12 12:17:27 2017 +0200
Do the oldhash thing for Calc documents, too
(Some serious copy-pasta here.)
Change-Id: Icb5a7b6783b75d67f00cfbdccbba8c402008ff99
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 39869a6..b120e16 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -44,6 +44,7 @@ L.CalcTileLayer = L.TileLayer.extend({
var tilePositionsX = '';
var tilePositionsY = '';
+ var oldHashes = '';
var needsNewTiles = false;
for (var key in this._tiles) {
@@ -67,6 +68,15 @@ L.CalcTileLayer = L.TileLayer.extend({
tilePositionsY += ',';
}
tilePositionsY += tileTopLeft.y;
+ if (oldHashes !== '') {
+ oldHashes += ',';
+ }
+ if (this._tiles[key].oldhash ===
undefined) {
+ oldHashes += '0';
+ }
+ else {
+ oldHashes +=
this._tiles[key].oldhash;
+ }
needsNewTiles = true;
if (this._debug) {
this._debugAddInvalidationData(this._tiles[key]);
@@ -89,7 +99,8 @@ L.CalcTileLayer = L.TileLayer.extend({
'tileposx=' + tilePositionsX + ' ' +
'tileposy=' + tilePositionsY + ' ' +
'tilewidth=' + this._tileWidthTwips + ' ' +
- 'tileheight=' + this._tileHeightTwips;
+ 'tileheight=' + this._tileHeightTwips + ' ' +
+ 'oldhash=' + oldHashes;;
this._map._socket.sendMessage(message, '');
if (this._debug) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit d1502fa918583f77926b0a2c49b7f183c3b6ab8d
Author: Pranav Kant
Date: Thu Jan 12 15:49:57 2017 +0530
loleaflet: Don't hide prev/next buttons for calc
Primary reason we are bringing it back is because in mobile mode
userlist icon goes to the right most edge of the screen which
leads to userlist popup not being shown (which seems to be the
bug in library we are using)
Change-Id: Ie5b93c41f54ffeeb8615f90fa0e71c74de5ed92c
(cherry picked from commit 83963d085739efbf2465952b6ec73782b12a80b5)
Reviewed-on: https://gerrit.libreoffice.org/32988
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 332601a..84de90a 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1361,12 +1361,7 @@ map.on('updateparts pagenumberchanged', function (e) {
toolbar.hide('deletepage');
}
- if (e.docType === 'spreadsheet') {
- toolbar.hide('prev');
- toolbar.hide('next');
- toolbar.hide('prevnextbreak');
- }
- else {
+ if (e.docType !== 'spreadsheet') {
if (current === 0) {
toolbar.disable('prev');
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/src
loleaflet/src/core/Socket.js |9 -
loleaflet/src/layer/tile/CalcTileLayer.js|1 +
loleaflet/src/layer/tile/ImpressTileLayer.js |1 +
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 6370143a4b935d97556036f9c02c88ae0d00d7a0
Author: Tor Lillqvist
Date: Thu Jan 12 11:38:28 2017 +0200
Slight re-factoring: introduce getParameterValue() function
I started changing the cases for all the parameters to use similar
code as for the 'hash=' one: Check the parameter name with
startsWith() instead of fragile substring() function call where the
length parameter must match the length of a string literal that the
substring() result is compared to.
But then I got bored and gave up. It would be even better to not have
to tediously check for all defined parameter names, but instead just
parse each parameter using the same code that sets the property whose
name we found. Except that we have special cases where the parameter
name in the protocol doesn't match our coresponding property name, and
those that consist of a list of comma-separated values.
Maybe we indeed should just switch to JSON (or some binary
representation of JSON or somesuch).
Change-Id: Ibcdb26d7228b75f6f23c186f0b17cb46a12f3cec
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 4e4c935b..9ba1ec5 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -7,6 +7,13 @@
L.Socket = L.Class.extend({
ProtocolVersionNumber: '0.1',
+ getParameterValue: function (s) {
+ var i = s.indexOf('=');
+ if (i === -1)
+ return undefined;
+ return s.substring(i+1);
+ },
+
initialize: function (map) {
this._map = map;
try {
@@ -603,7 +610,7 @@ L.Socket = L.Class.extend({
command.rendercount =
parseInt(tokens[i].substring(12));
}
else if (tokens[i].startsWith('hash=')) {
- command.hash =
tokens[i].substring(tokens[i].indexOf('=')+1);
+ command.hash =
this.getParameterValue(tokens[i]);
}
}
if (command.tileWidth && command.tileHeight &&
this._map._docLayer) {
commit 23db565b5b1aecff6ae6501250792e49ae35ed9a
Author: Tor Lillqvist
Date: Thu Jan 12 11:19:48 2017 +0200
Add Emacs mode lines
Change-Id: I208407f3017f71a4dfb2b86055a9bc639ee2f23c
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index cd4ed60..39869a6 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -1,3 +1,4 @@
+/* -*- js-indent-level: 8 -*- */
/*
* Calc tile layer is used to display a spreadsheet document
*/
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 3326fa2..496fa91 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -1,3 +1,4 @@
+/* -*- js-indent-level: 8 -*- */
/*
* Impress tile layer is used to display a presentation document
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: package/inc package/source
package/inc/ZipFile.hxx |2 +-
package/source/zipapi/ZipFile.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e442b7666761b4e38de2e3eb2b1ed04f54b095a8
Author: Thorsten Behrens
Date: Thu Jan 12 10:48:22 2017 +0100
package: fixup SAL_CALL removal
Change-Id: I3b688b660ef4374442b616cb5c8bb4cee9ef7cb7
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index eac5f0b..9d1a6da 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -103,7 +103,7 @@ public:
EntryHash& GetEntryHash() { return aEntries; }
void setInputStream ( const css::uno::Reference < css::io::XInputStream >&
xNewStream );
-css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData(
+css::uno::Reference< css::io::XInputStream > getRawData(
ZipEntry& rEntry,
const ::rtl::Reference < EncryptionData > &rData,
bool bDecrypt,
diff --git a/package/source/zipapi/ZipFile.cxx
b/package/source/zipapi/ZipFile.cxx
index e27b911..08d862a 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -598,7 +598,7 @@ uno::Reference< XInputStream > ZipFile::getRawData(
ZipEntry& rEntry,
return createUnbufferedStream ( aMutexHolder, rEntry, rData,
UNBUFF_STREAM_RAW, bIsEncrypted );
}
-uno::Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream(
+uno::Reference< XInputStream > ZipFile::getWrappedRawStream(
ZipEntry& rEntry,
const ::rtl::Reference< EncryptionData >& rData,
const OUString& aMediaType,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/main.css loleaflet/src
loleaflet/dist/loleaflet.css | 35 +-- loleaflet/dist/loleaflet.html | 31 ++ loleaflet/dist/menubar.css| 216 +++ loleaflet/dist/partsPreviewControl.css| 15 - loleaflet/dist/sm-simple.css | 287 -- loleaflet/dist/spreadsheet.css| 10 loleaflet/dist/toolbar.css| 25 -- loleaflet/dist/toolbar/toolbar.js | 137 +++- loleaflet/main.css|4 loleaflet/src/control/Control.Menubar.js | 26 ++ loleaflet/src/control/Control.PartsPreview.js |9 loleaflet/src/control/Permission.js |4 loleaflet/src/core/Browser.js |2 13 files changed, 438 insertions(+), 363 deletions(-) New commits: commit e4430591f720d1851599fa9f883382e31c25d9b2 Author: Pranav Kant Date: Mon Jan 9 12:58:54 2017 +0530 Mobilify, responsive loleaflet UI to adapt to smaller screens This is a cherry-pick of following commits: loleaflet: Add main-menu to main html rather than dynamically Change-Id: I3f3a8709104ee0805f509f2c1b5eae2194c5de72 (cherry picked from commit 3c1804e3b644befca8ca56200cf58b9b6a4aeafd) loleaflet: Set mobile mode if width < 768px Change-Id: I4732208d354b574218185c2693fd92d8e071307a (cherry picked from commit e3e814fbf5d9a092edc15c11ded6d34dbc05ca1f) loleaflet: Different css file for menubar Change-Id: Ic7cf8445c52d3a87de0631d6317674d959d60cf4 (cherry picked from commit d0e8d4544d32e0262a01193cbb989fbe7754c89e) loleaflet: New class lo-menu to override sm-simple theme We can now directly use sm-simple.css from node_modules in its pristine form and then use custom css rules to override to make it look like LO menu bar instead of directly making changes in sm-simple.css Change-Id: I0773ca27fdf549d5c7df0bc781dfc019225d7cb6 (cherry picked from commit da36bfc520b75b5dd68212b7b12703fcfaf39798) tdf#100329: Hide some toolbar buttons when screen width is low Most of these can easily be accessed from the menu bar. Lets keep only most commonly used and simple toolbar items here. Change-Id: If9ad379c6491b907a980e0ef5b4a46a60266fafe (cherry picked from commit da11a1fd94f472dae435fb4b887f02c5f6eb6b1b) loleaflet: Introduce div wrappers Change-Id: I19ae5daaa11e810b23a1d12b81c510ce96527ac7 (cherry picked from commit fac33f7a2fe1f6927cbe0fde04c06a1d2fcbcdf6) loleaflet: Get rid of all fixed position Change-Id: I104882d995722c14ddefeecf579d1233f37371d6 (cherry picked from commit bf7df9fa661ef99b2c9930b5a8ca7d5e3e6c6fa6) Remove irrelevant toolbars Change-Id: Ib8a8ea4fb597a5aaee802cb7ad04e893cd6eab75 (cherry picked from commit 4becb5b7e99b786c5ba0966a98509e4a8b513772) tdf#100329: responsive menubar floating on left Change-Id: I6089ed44a7920a79de7e89f1b0d884c2881d4c7c (cherry picked from commit 70bbe20f958420bb1017fa03dd5abebe2043d32f) loleaflet: No min-width, we want to mobilify Change-Id: Ifa52f03683c32939369f0ab97e456f10b954ccf9 (cherry picked from commit e7101b6f936838db53a7ea6ff1cc385774c7d6c9) loleaflet: On touch devices, don't disable dragging Change-Id: I722070a7768d89b7b861df4afc37f68098ca9321 (cherry picked from commit b8fae541847612c65970ee7f1f3e51aa899ef702) loleaflet: Fix close button alignment Change-Id: I0a63229f37e0ea1c8e3c770afac0527890c328e1 (cherry picked from commit 90d48ee3c436678faae91289d33a8f7bd0243545) loleaflet: Wrap slide sorter and related refactoring Slide sorter and presentation toolbar are now contained in a presentation-controls-wrapper and alignment values are now factored out and only present in the container now. Also, position the presentation-toolbar absolutely outside of container so that slidesorter scrollbar doesn't go behind the toolbar hindering some view of the slide thumbnails. This would also make the job of hiding/showing the whole control easier. Change-Id: I080e854906ef0635aba02cfeb687bf87463ef756 (cherry picked from commit b34f5a38a279871dd7094677435641c83c8eef43) Fix specificity and hide slide sorter for smaller screen width Using !important always is not a good idea. You can't override an !important with another !important and we have started to face such situations now where we want to adjust element's alignment based on media-screen width. Instead lets fix the specificity to make this work. .parts-preview-document or .spreadsheet-document would be 0-0-1-0. Use #document-container.parts-preview-document to increase its specificity to 0-1-1-0 so that we can do without the !important flag and use !important flag
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/SafeModeDialog.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 229d98e94a5d6b350c4d5fd5469be8e4a260a40c
Author: Katarina Behrens
Date: Wed Jan 11 14:47:47 2017 +0100
SafeModeDialog: set correct initial checkbox state
Change-Id: I3aa45ae4b02afd2ea8e1a5a427eb6f0f17219430
Reviewed-on: https://gerrit.libreoffice.org/32967
Reviewed-by: Katarina Behrens
Tested-by: Katarina Behrens
diff --git a/svx/source/dialog/SafeModeDialog.cxx
b/svx/source/dialog/SafeModeDialog.cxx
index b77b83f..abc2215 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -114,11 +114,10 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
// Disable restart btn until some checkbox is active
mpBtnRestart->Disable();
-// Check the first radio button and disable the other parts
+// Check the first radio button and call its handler,
+// it'll disable the relevant parts
mpRadioRestore->Check();
-mpBoxConfigure->Disable();
-mpBoxDeinstall->Disable();
-mpBoxReset->Disable();
+RadioBtnHdl( mpRadioRestore );
// Set URL for help button (module=safemode)
OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion="; +
utl::ConfigManager::getAboutBoxProductVersion() +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac download.lst writerperfect/qa
configure.ac |2 +-
download.lst |4 ++--
writerperfect/qa/unit/WpftCalcFilterTest.cxx |6 +-
writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123 |binary
4 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit fbbb4850dc12ccae3a2140814115e4cd7985b116
Author: David Tardon
Date: Wed Jan 11 15:22:18 2017 +0100
upload libwps 0.4.5
Change-Id: Ifab6f95d22d0d335d68bb367dca12a92b864cdd9
diff --git a/configure.ac b/configure.ac
index 24cb7a8..422b090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7836,7 +7836,7 @@
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.4])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.5])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index c28b972..46584d0 100644
--- a/download.lst
+++ b/download.lst
@@ -166,8 +166,8 @@ export WPD_TARBALL :=
libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
export WPG_MD5SUM := dfd066658ec9d2fb2262417039a8a1c3
export WPG_VERSION_MICRO := 1
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
-export WPS_MD5SUM := dcfd1d18bfa9818cf3ab21663ba857a3
-export WPS_VERSION_MICRO := 4
+export WPS_MD5SUM := 3807cbf177d15a69532e653476919d42
+export WPS_VERSION_MICRO := 5
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index ce79995..29c3111 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -35,9 +35,13 @@ void WpftCalcFilterTest::test()
{
{"Numbers_2.numbers", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
};
+const writerperfect::test::WpftOptionalMap_t aWpsOptional
+{
+{"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)},
+};
doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter",
"/writerperfect/qa/unit/data/calc/libmwaw/");
-doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter",
"/writerperfect/qa/unit/data/calc/libwps/");
+doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter",
"/writerperfect/qa/unit/data/calc/libwps/", aWpsOptional);
doTest("org.libreoffice.comp.Calc.NumbersImportFilter",
"/writerperfect/qa/unit/data/calc/libetonyek/", aEtonyekOptional);
doTest("org.libreoffice.comp.Calc.StarOfficeCalcImportFilter",
"/writerperfect/qa/unit/data/calc/libstaroffice/");
}
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123
new file mode 100755
index 000..fa21549
Binary files /dev/null and
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123 differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
