[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - xmloff/source
xmloff/source/text/XMLRedlineExport.cxx | 81
1 file changed, 51 insertions(+), 30 deletions(-)
New commits:
commit 094bbdcabc961e82de7534c5dfa7fa56df658a28
Author: Rosemary Sebastian
Date: Sun Jun 12 08:24:17 2016 +0530
The xml should not be nested
Change-Id: I8470808c7ac12fd8d61427cd2fadaa1dd13758ca
diff --git a/xmloff/source/text/XMLRedlineExport.cxx
b/xmloff/source/text/XMLRedlineExport.cxx
index ab1885f..f2dc166 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -492,42 +492,63 @@ void XMLRedlineExport::ExportChangeInfo(
aAny >>= sType;
if(sType == sFormat) // TODO: Find out if the style is inserted or deleted
to give the proper namespace
{
-SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DC,
- XML_TYPE, true, false );
-rExport.Characters("style");
-SvXMLElementExport aNameElem( rExport, XML_NAMESPACE_DC,
- XML_NAME, true, false );
-rExport.Characters("bold"); // TODO: Get the correct style name
-SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DC,
- XML_START, true, false );
-rExport.Characters("start"); // TODO: Get the correct start position
-SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DC,
- XML_END, true, false );
-rExport.Characters("end"); // TODO: Get the correct end position
+{
+SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DC,
+XML_TYPE, true, false );
+rExport.Characters("style");
+}
+{
+SvXMLElementExport aNameElem( rExport, XML_NAMESPACE_DC,
+XML_NAME, true, false );
+rExport.Characters("bold"); // TODO: Get the correct style name
+}
+{
+SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DC,
+XML_START, true, false );
+rExport.Characters("/"); // TODO: Get the correct start position
+}
+{
+SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DC,
+XML_END, true, false );
+rExport.Characters("/"); // TODO: Get the correct end position
+}
}
else if(sType == sInsert)
{
-SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DC,
- XML_TYPE, true, false );
-rExport.Characters("text"); // or paragraph TODO: Find a way to
distinguish text and paragraph changes
-SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DC,
- XML_START, true, false );
-rExport.Characters("start"); // TODO: Get the correct start position
(NumberingLevel for paragraph)
-SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DC,
- XML_END, true, false );
+{
+SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DC,
+XML_TYPE, true, false );
+rExport.Characters("text"); // or paragraph TODO: Find a way to
distinguish text and paragraph changes
+}
+{
+SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DC,
+XML_START, true, false );
+rExport.Characters("/"); // TODO: Get the correct start position
(NumberingLevel for paragraph)
+}
+{
+SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DC,
+XML_END, true, false );
+}
}
else if(sType == sDelete)
{
-SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DC,
- XML_TYPE, true, false );
-rExport.Characters("text"); // or paragraph TODO: Find a way to
distinguish text and paragraph changes
-SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DC,
- XML_START, true, false );
-rExport.Characters("start"); // TODO: Get the correct start position
-SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DC,
- XML_END, true, false );
-// TODO: Check if type is not paragraph
-rExport.Characters("end"); // TODO: Get the correct end position
+{
+SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DC,
+XML_TYPE, true, false );
+rExport.Characters("paragraph"); // or text TODO: Find a way to
distinguish text and paragraph changes
+}
+{
+SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_D
Re: Myssing link to libcomphelper.so on 5.2.0alpha1
On 19 May 2016 at 09:53, Tomáš Chvátal wrote: > Hi all, > > I am building libreoffice 5.2.0alpha1 and it fails to install properly the > sax library. > It links to libcomphelper.so instead of the libmerged as the libcomphelper > was integrated by > https://cgit.freedesktop.org/libreoffice/core/commit/?id=8668e044b27ca70de2e5b47741d5ccb2d4418ac4 Why do you need to install sax library? I don't have it in ./test-install - it's included in libmerged. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Open web page from dialog
I think this is usually done by invoking a command to the operating system. Cannot easily lookup how this is done right now It is likely os dependent. Sent from BlueMail On Jun 11, 2016, 3:24 PM, at 3:24 PM, "Jan Rheinländer" wrote: >Hi, > >is it possible to open a website in the user's preferred browser from a >dialog (or from a Basic macro, or through the UNO API)? > >I see that the "Help" - "About" dialog does this, but it is defined in >the source in Glade format, different to the Basic dialogs. > >Thanks for any ideas! > >Jan > >___ >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] core.git: 2 commits - sd/source vcl/source
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |5 +
sd/source/ui/view/viewshel.cxx |3 +--
vcl/source/window/paint.cxx |3 +--
3 files changed, 3 insertions(+), 8 deletions(-)
New commits:
commit aa3d649e5f4200551ec23edbc3d51734e5d94c47
Author: Caolán McNamara
Date: Sat Jun 11 21:26:29 2016 +0100
coverity#1362678 Dereference after null check
RelocateToWindow is only called by RelocateToParentWindow
RelocateToParentWindow is only called by RelocateToWindow and
ViewShellWrapper::relocateToAnchor
ViewShellWrapper::relocateToAnchor never passes nullptr as
its argument to RelocateToParentWindow
so presumably this can never be null
WriteFrameViewData was never called by that logic and
ReadFrameViewData was always called
Change-Id: Ida584b330d7c7539515a5e7287206f6469699b98
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 8fd5503..0b7ce99 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -292,11 +292,8 @@ bool SlideSorterViewShell::RelocateToParentWindow
(vcl::Window* pParentWindow)
if ( ! mpSlideSorter)
return false;
-if (pParentWindow == nullptr)
-WriteFrameViewData();
const bool bSuccess (mpSlideSorter->RelocateToWindow(pParentWindow));
-if (pParentWindow != nullptr)
-ReadFrameViewData(mpFrameView);
+ReadFrameViewData(mpFrameView);
return bSuccess;
}
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 07c2382..942f9a5 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1563,8 +1563,7 @@ bool ViewShell::RelocateToParentWindow (vcl::Window*
pParentWindow)
{
mpParentWindow = pParentWindow;
-if (mpParentWindow)
-mpParentWindow->SetBackground (Wallpaper());
+mpParentWindow->SetBackground (Wallpaper());
if (mpContentWindow.get() != nullptr)
mpContentWindow->SetParent(pParentWindow);
commit 110d3b3d405eded0f0eda8e0987be16f66152f32
Author: Caolán McNamara
Date: Sat Jun 11 21:13:46 2016 +0100
coverity#1362676 Dereference after null check
ImplGetDefaultWindow has to exist, its created if its not
Change-Id: I51364ef1a525856424c0b7afcd8c906d3eb73fb9
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index df2a543..96477e3 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1460,8 +1460,7 @@ void Window::PaintToDevice( OutputDevice* pDev, const
Point& rPos, const Size& /
if( ! mpWindowImpl->mbVisible )
{
vcl::Window* pTempParent = ImplGetDefaultWindow();
-if( pTempParent )
-pTempParent->EnableChildTransparentMode();
+pTempParent->EnableChildTransparentMode();
pRealParent = GetParent();
SetParent( pTempParent );
// trigger correct visibility flags for children
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: New Defects reported by Coverity Scan for LibreOffice
On Sat, 2016-06-11 at 11:17 -0700, scan-ad...@coverity.com wrote:
> Hi,
>
> Please find the latest report on new defect(s) introduced to
> LibreOffice found with Coverity Scan.
caolanm->erack: These two look odd to me, can you have a check.
C.
> *** CID 1362685: Uninitialized variables (UNINIT)
> /sc/source/core/data/dpobject.cxx: 1888 in
> ScDPObject::ParseFilters(rtl::OUString &,
> std::vector std::allocator> &,
> std::vector std::allocator>&, const
> rtl::OUString &)()
> 1882 {
> 1883 SvNumberFormatter* pFormatter = mpTableData-
> >GetCacheTable().getCache().GetNumberFormatter();
> 1884 if (pFormatter)
> 1885 {
> 1886 // Parse possible number from
> aQueryValueName and format
> 1887 // locale independent as aQueryValue.
> >
> > >
> > > >
> > > > CID 1362685: Uninitialized variables (UNINIT)
> > > > Declaring variable "nNumFormat" without initializer.
> 1888 sal_uInt32 nNumFormat;
> 1889 double fValue;
> 1890 if (pFormatter->IsNumberFormat(
> aQueryValueName, nNumFormat, fValue))
> 1891 aQueryValue =
> ScDPCache::GetLocaleIndependentFormattedString( fValue, *pFormatter,
> nNumFormat);
> 1892 }
> 1893 }
>
> ** CID 1362684: Uninitialized variables (UNINIT)
> /sc/source/core/tool/interpr2.cxx: 3363 in
> ScInterpreter::ScGetPivotData()()
>
>
> _
> ___
> *** CID 1362684: Uninitialized variables (UNINIT)
> /sc/source/core/tool/interpr2.cxx: 3363 in
> ScInterpreter::ScGetPivotData()()
> 3357 else
> 3358 {
> 3359 aFilters[i].MatchValueName =
> aSharedString.getString();
> 3360
> 3361 // Parse possible number from MatchValueName
> and format
> 3362 // locale independent as MatchValue.
> >
> > >
> > > >
> > > > CID 1362684: Uninitialized variables (UNINIT)
> > > > Declaring variable "nNumFormat" without initializer.
> 3363 sal_uInt32 nNumFormat;
> 3364 double fValue;
> 3365 if (pFormatter->IsNumberFormat(
> aFilters[i].MatchValueName, nNumFormat, fValue))
> 3366 aFilters[i].MatchValue =
> ScDPCache::GetLocaleIndependentFormattedString(
> 3367 fValue, *pFormatter,
> nNumFormat);
> 3368 else
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - lotuswordpro/source sd/source sfx2/source sw/source
lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx | 22 ---
sd/source/filter/eppt/pptx-text.cxx | 25 ++
sfx2/source/control/templateabstractview.cxx |2 -
sfx2/source/control/thumbnailview.cxx |2 -
sw/source/uibase/app/docstyle.cxx |5 ++-
5 files changed, 38 insertions(+), 18 deletions(-)
New commits:
commit 08c9c0a3ae3a34609f31da5c229dfaedacdd27d6
Author: Caolán McNamara
Date: Sat Jun 11 20:53:18 2016 +0100
coverity#1362681 Untrusted loop bound
and
coverity#1362682 Untrusted loop bound
Change-Id: I97eacad09abed4f91744b36f572761e43a3477fb
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index 51c8dec..39d1b3f 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -115,12 +115,12 @@ void
LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< rtl::ReferenceSeekRel(4);
//record count
-unsigned short nRecCount;
+unsigned short nRecCount(0);
m_pStream->ReadUInt16(nRecCount);
// selCount
m_pStream->SeekRel(2);
//boundrect
-unsigned short left,top,right,bottom;
+unsigned short left(0),top(0),right(0),bottom(0);
m_pStream->ReadUInt16(left);
m_pStream->ReadUInt16(top);
m_pStream->ReadUInt16(right);
@@ -222,6 +222,12 @@ void LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector<
rtl::Reference m_pStream->remainingSize())
+{
+SAL_WARN("lwp", "stream too short for claimed no of records");
+nRecCount = m_pStream->remainingSize();
+}
+
//load draw object
for (unsigned short i = 0; i < nRecCount; i++)
{
@@ -260,12 +266,12 @@ XFDrawGroup*
LwpSdwGroupLoaderV0102::CreateDrawGroupObject()
// topObj, botObj
m_pStream->SeekRel(4);
//record count
-unsigned short nRecCount;
+unsigned short nRecCount(0);
m_pStream->ReadUInt16(nRecCount);
// selCount
m_pStream->SeekRel(2);
//boundrect
-unsigned short left,top,right,bottom;
+unsigned short left(0),top(0),right(0),bottom(0);
m_pStream->ReadUInt16(left);
m_pStream->ReadUInt16(top);
m_pStream->ReadUInt16(right);
@@ -275,6 +281,12 @@ XFDrawGroup*
LwpSdwGroupLoaderV0102::CreateDrawGroupObject()
XFDrawGroup* pXFDrawGroup = new XFDrawGroup();
+if (nRecCount > m_pStream->remainingSize())
+{
+SAL_WARN("lwp", "stream too short for claimed no of records");
+nRecCount = m_pStream->remainingSize();
+}
+
//load draw object
for (unsigned short i = 0; i < nRecCount; i++)
{
@@ -303,7 +315,7 @@ XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject()
XFFrame* LwpSdwGroupLoaderV0102::CreateDrawObject()
{
//record type
-unsigned char recType;
+unsigned char recType(0);
m_pStream->ReadUChar(recType);
LwpDrawObj* pDrawObj = nullptr;
commit 51a09942d9f9b0d8ef9c24bff2ee1dc270e43d5e
Author: Caolán McNamara
Date: Sat Jun 11 20:44:38 2016 +0100
coverity#1362677 Unchecked dynamic_cast
Change-Id: Idf3819ef702c259c448a0c346a3fa1896f1088a2
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index 117c11e..45f 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -322,7 +322,7 @@ void TemplateAbstractView::RemoveDefaultTemplateIcon(const
OUString& rPath)
for (ThumbnailViewItem* pItem : mItemList)
{
TemplateViewItem* pViewItem = dynamic_cast(pItem);
-if(pViewItem->getPath().match(rPath))
+if (pViewItem && pViewItem->getPath().match(rPath))
{
pViewItem->showDefaultIcon(false);
Invalidate();
commit 7fa26f6a3948eb75abee63bd49f71ae9589fba69
Author: Caolán McNamara
Date: Sat Jun 11 20:36:01 2016 +0100
coverity#1202784 Division or modulo by zero
Change-Id: I8fda65d21ab0aed7ccc149a57272b337580374b0
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index d25e279..b510328 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -1098,7 +1098,7 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId )
bool bNewOut = IsReallyVisible() && IsUpdateMode();
// if necessary scroll to the visible area
-if ( mbScroll && nItemId )
+if (mbScroll && nItemId && mnCols)
{
sal_uInt16 nNewLine = (sal_uInt16)(nItemPos / mnCols);
if ( nNewLine < mnFirstLine )
commit b1578655f2a0cdf31d343a8ccec080783a8bcefc
Author: Caolán McNamara
Date: Sat Jun 11 20:32:21 2016 +0100
coverity#1362687 Uninitialized pointer field
and
coverity#1362688 Uninitialized pointer field
Change-Id: Ie9711dc7131ee41e4acd9d0a628
Open web page from dialog
Hi, is it possible to open a website in the user's preferred browser from a dialog (or from a Basic macro, or through the UNO API)? I see that the "Help" - "About" dialog does this, but it is defined in the source in Glade format, different to the Basic dialogs. Thanks for any ideas! Jan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
14 new defect(s) introduced to LibreOffice found with Coverity Scan.
3 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 14 of 14 defect(s)
** CID 1362689: Uninitialized members (UNINIT_CTOR)
/sd/source/filter/eppt/pptx-text.cxx: 70 in PortionObj::PortionObj(const
com::sun::star::uno::Reference &,
FontCollection &)()
*** CID 1362689: Uninitialized members (UNINIT_CTOR)
/sd/source/filter/eppt/pptx-text.cxx: 70 in PortionObj::PortionObj(const
com::sun::star::uno::Reference &,
FontCollection &)()
64 mpText ( nullptr ),
65 mpFieldEntry( nullptr )
66 {
67 mXPropSet = rXPropSet;
68
69 ImplGetPortionValues( rFontCollection );
>>> CID 1362689: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "meCharHeight" is not initialized in this
>>> constructor nor in any functions that it calls.
70 }
71
72 PortionObj::PortionObj(css::uno::Reference< css::text::XTextRange > &
rXTextRange,
73bool bLast, FontCollection& rFontCollection)
74 : meCharColor(css::beans::PropertyState_AMBIGUOUS_VALUE)
75 , meCharHeight(css::beans::PropertyState_AMBIGUOUS_VALUE)
** CID 1362688: Uninitialized members (UNINIT_CTOR)
/sw/source/uibase/app/docstyle.cxx: 485 in
SwDocStyleSheet::SwDocStyleSheet(SwDoc &, const rtl::OUString &,
SwDocStyleSheetPool *, SfxStyleFamily)()
*** CID 1362688: Uninitialized members (UNINIT_CTOR)
/sw/source/uibase/app/docstyle.cxx: 485 in
SwDocStyleSheet::SwDocStyleSheet(SwDoc &, const rtl::OUString &,
SwDocStyleSheetPool *, SfxStyleFamily)()
479 FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO, //
[21123
480 FN_COND_COLL, FN_COND_COLL, //
[22401
481 0),
482 bPhysical(false)
483 {
484 nHelpId = UCHAR_MAX;
>>> CID 1362688: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "pBoxFormat" is not initialized in this
>>> constructor nor in any functions that it calls.
485 }
486
487 SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) :
488 SfxStyleSheetBase(rOrg),
489 pCharFormat(rOrg.pCharFormat),
490 pColl(rOrg.pColl),
** CID 1362687: Uninitialized members (UNINIT_CTOR)
/sw/source/uibase/app/docstyle.cxx: 498 in
SwDocStyleSheet::SwDocStyleSheet(const SwDocStyleSheet&)()
*** CID 1362687: Uninitialized members (UNINIT_CTOR)
/sw/source/uibase/app/docstyle.cxx: 498 in
SwDocStyleSheet::SwDocStyleSheet(const SwDocStyleSheet&)()
492 pDesc(rOrg.pDesc),
493 pNumRule(rOrg.pNumRule),
494 rDoc(rOrg.rDoc),
495 aCoreSet(rOrg.aCoreSet),
496 bPhysical(rOrg.bPhysical)
497 {
>>> CID 1362687: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "pBoxFormat" is not initialized in this
>>> constructor nor in any functions that it calls.
498 }
499
500 SwDocStyleSheet::~SwDocStyleSheet()
501 {
502 }
503
** CID 1362686: Uninitialized variables (UNINIT)
/sd/source/filter/eppt/pptx-stylesheet.cxx: 83 in
PPTExCharSheet::SetStyleSheet(const
com::sun::star::uno::Reference &,
FontCollection &, int)()
*** CID 1362686: Uninitialized variables (UNINIT)
/sd/source/filter/eppt/pptx-stylesheet.cxx: 83 in
PPTExCharSheet::SetStyleSheet(const
com::sun::star::uno::Reference &,
FontCollection &, int)()
77 PPTExCharLevel& rLev = maCharLevel[ nLevel ];
78
79 if ( aPortionObj.meCharColor ==
css::beans::PropertyState_DIRECT_VALUE )
80 rLev.mnFontColor = aPortionObj.mnCharColor;
81 if ( aPortionObj.meCharEscapement ==
css::beans::PropertyState_DIRECT_VALUE )
82 rLev.mnEscapement = aPortionObj.mnCharEscapement;
>>> CID 1362686: Uninitialized variables (UNINIT)
>>> Using uninitialized value "aPortionObj.meCharHeight".
83 if ( aPortionObj.meCharHeight ==
css::beans::PropertyState_DIRECT_VALUE )
84 rLev.mnFontHeight = aPortionObj.mnCharHeight;
85 if ( aPortionObj.meFontName ==
css::beans::PropertyState_DIRECT_VALUE )
86 rLev.mnFont = aPortionObj.mnFont;
87 if ( aPortionObj.meAsianOrComplexFont ==
css::beans::PropertyState_DIRECT_VALUE )
88 rLev.mnAsianOrComplexFont =
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appcfg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8b135ba875a22a86d89f25bbc229cf2b7edcbe8c
Author: apurvapriyadarshi
Date: Sat Jun 11 03:48:46 2016 +0530
tdf#97087 Timers and idles should have programmer comprehensible, unique
names
Given unique name to a idles
Change-Id: I185bff390981923c98e0aa7189b058748c057108
Reviewed-on: https://gerrit.libreoffice.org/26182
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index c8134ba..65cabfe 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -109,7 +109,7 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const
SfxEventHint& rHint )
{
if( rHint.GetObjShell() )
StartListening( *rHint.GetObjShell() );
-pIdle = new Idle;
+pIdle = new Idle("SfxEventASyncer");
pIdle->SetIdleHdl( LINK(this, SfxEventAsyncer_Impl, IdleHdl) );
pIdle->SetPriority( SchedulerPriority::HIGHEST );
pIdle->Start();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e3/078772c4366e1bc09aa1fbbe0bdd80256ebb89
e3/078772c4366e1bc09aa1fbbe0bdd80256ebb89 |1 + 1 file changed, 1 insertion(+) New commits: commit bc4447011808ac3e09d4c810597041d631b637d8 Author: Caolán McNamara Date: Sat Jun 11 15:58:17 2016 +0100 Notes added by 'git notes add' diff --git a/e3/078772c4366e1bc09aa1fbbe0bdd80256ebb89 b/e3/078772c4366e1bc09aa1fbbe0bdd80256ebb89 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/e3/078772c4366e1bc09aa1fbbe0bdd80256ebb89 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - dc/8b714d2345e42b48a09cbd6affe74c6994b5fc
dc/8b714d2345e42b48a09cbd6affe74c6994b5fc |1 + 1 file changed, 1 insertion(+) New commits: commit 558be878c3d38c6fd80493044a8b361550ca9b07 Author: Caolán McNamara Date: Sat Jun 11 15:57:44 2016 +0100 Notes added by 'git notes add' diff --git a/dc/8b714d2345e42b48a09cbd6affe74c6994b5fc b/dc/8b714d2345e42b48a09cbd6affe74c6994b5fc new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/dc/8b714d2345e42b48a09cbd6affe74c6994b5fc @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - accessibility/source
accessibility/source/extended/AccessibleGridControl.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 652026f0e2f9c323229151e854ad6591791e098e
Author: Caolán McNamara
Date: Sat Jun 11 15:50:59 2016 +0100
Resolves: tdf#100272 row ally index is ROW_INVALID
which is < 0 so bad things happen, consider ROW_INVALID/COL_INVALID before
looking for a11y child at that index
Change-Id: I16a9d86879e1a894c63932705c056268e98db7aa
(cherry picked from commit 0f32ba56a1e775e8ecd6c827ebd48f7f2fb51c81)
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index 5c32dcf..5ba4001 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -345,7 +345,14 @@ void AccessibleGridControl::commitTableEvent(sal_Int16
_nEventId,const Any& _rNe
{
if(_nEventId == AccessibleEventId::ACTIVE_DESCENDANT_CHANGED)
{
-css::uno::Reference< css::accessibility::XAccessible > xChild =
m_xImpl->m_pTable->getAccessibleChild(m_aTable.GetCurrentRow()*m_aTable.GetColumnCount()+m_aTable.GetCurrentColumn());
+const sal_Int32 nCurrentRow = m_aTable.GetCurrentRow();
+const sal_Int32 nCurrentCol = m_aTable.GetCurrentColumn();
+css::uno::Reference< css::accessibility::XAccessible > xChild;
+if (nCurrentRow > -1 && nCurrentCol > -1)
+{
+sal_Int32 nColumnCount = m_aTable.GetColumnCount();
+xChild = m_xImpl->m_pTable->getAccessibleChild(nCurrentRow *
nCurrentCol + nColumnCount);
+}
m_xImpl->m_pTable->commitEvent(_nEventId,
makeAny(xChild),_rOldValue);
}
else if(_nEventId == AccessibleEventId::TABLE_MODEL_CHANGED)
___
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/extended/AccessibleGridControl.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 0f32ba56a1e775e8ecd6c827ebd48f7f2fb51c81
Author: Caolán McNamara
Date: Sat Jun 11 15:50:59 2016 +0100
Resolves: tdf#100272 row ally index is ROW_INVALID
which is < 0 so bad things happen, consider ROW_INVALID/COL_INVALID before
looking for a11y child at that index
Change-Id: I16a9d86879e1a894c63932705c056268e98db7aa
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index d647bc8..b51558c 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -345,7 +345,14 @@ void AccessibleGridControl::commitTableEvent(sal_Int16
_nEventId,const Any& _rNe
{
if(_nEventId == AccessibleEventId::ACTIVE_DESCENDANT_CHANGED)
{
-css::uno::Reference< css::accessibility::XAccessible > xChild =
m_xImpl->m_pTable->getAccessibleChild(m_aTable.GetCurrentRow()*m_aTable.GetColumnCount()+m_aTable.GetCurrentColumn());
+const sal_Int32 nCurrentRow = m_aTable.GetCurrentRow();
+const sal_Int32 nCurrentCol = m_aTable.GetCurrentColumn();
+css::uno::Reference< css::accessibility::XAccessible > xChild;
+if (nCurrentRow > -1 && nCurrentCol > -1)
+{
+sal_Int32 nColumnCount = m_aTable.GetColumnCount();
+xChild = m_xImpl->m_pTable->getAccessibleChild(nCurrentRow *
nCurrentCol + nColumnCount);
+}
m_xImpl->m_pTable->commitEvent(_nEventId,
makeAny(xChild),_rOldValue);
}
else if(_nEventId == AccessibleEventId::TABLE_MODEL_CHANGED)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 11 commits - lo.xcent.in Makefile.in registry/Module_registry.mk Repository.mk sw/qa sw/source vcl/Module_vcl.mk writerfilter/source
Makefile.in | 27 -
Repository.mk |6 +++-
lo.xcent.in |7 -
registry/Module_registry.mk |6 +++-
sw/qa/extras/ooxmlimport/data/tdf99074.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8 ++
sw/qa/extras/rtfexport/data/pgndec.rtf| 23 ++
sw/qa/extras/rtfexport/data/pgnlcltr.rtf | 23 ++
sw/qa/extras/rtfexport/data/pgnlcrm.rtf | 23 ++
sw/qa/extras/rtfexport/data/pgnucrm.rtf | 23 ++
sw/qa/extras/rtfexport/rtfexport.cxx | 24 ++
sw/source/uibase/uno/SwXDocumentSettings.cxx | 16
vcl/Module_vcl.mk |2 -
writerfilter/source/dmapper/DomainMapper.cxx | 16
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 +++
writerfilter/source/rtftok/rtfdocumentimpl.cxx| 28 ++
16 files changed, 214 insertions(+), 22 deletions(-)
New commits:
commit 278967e03360f78796ec7eff38c8dfd91e1ec107
Author: Miklos Vajna
Date: Sat Apr 23 20:34:57 2016 +0200
Related: tdf#65642 RTF filter: import \pgndec
This as a side effect also implements support for DOCX .
Reviewed-on: https://gerrit.libreoffice.org/24457
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit b94d753ac9e3894da055d31bbb7bb20e11b97b5a)
Change-Id: I747c3f610dc13f614b6f962c2a498c987765ebb6
diff --git a/sw/qa/extras/rtfexport/data/pgndec.rtf
b/sw/qa/extras/rtfexport/data/pgndec.rtf
new file mode 100644
index 000..7f38c69
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/pgndec.rtf
@@ -0,0 +1,23 @@
+{\rtf1
+\pard\plain \ltrpar\ql
\li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0
+{\field\fldedit
+{\*\fldinst
+{ PAGE \\* MERGEFORMAT }
+}
+{\fldrslt
+{1}
+}
+}
+\sect
+\sectd\pgnrestart\pgnlcrm\pgndec
+{\field\fldedit
+{\*\fldinst
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid525329 PAGE \\* MERGEFORMAT }
+}
+{\fldrslt
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1024\langfe1024\noproof\insrsid9597790
1}
+}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid13321744
+\par }
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 4a367a0..fb2b63b 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1009,6 +1009,12 @@ DECLARE_RTFEXPORT_TEST(testPgnlcrm, "pgnlcrm.rtf")
CPPUNIT_ASSERT_EQUAL(style::NumberingType::ROMAN_LOWER,
getProperty(getStyles("PageStyles")->getByName("Converted1"),
"NumberingType"));
}
+DECLARE_RTFEXPORT_TEST(testPgndec, "pgndec.rtf")
+{
+// The second page's numbering type: this was
style::NumberingType::ROMAN_LOWER.
+CPPUNIT_ASSERT_EQUAL(style::NumberingType::ARABIC,
getProperty(getStyles("PageStyles")->getByName("Converted1"),
"NumberingType"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 22a9653..f00326d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -969,6 +969,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
{
switch (nIntValue)
{
+case NS_ooxml::LN_Value_ST_NumberFormat_decimal:
+// 1, 2, ...
+
pSectionContext->SetPageNumberType(style::NumberingType::ARABIC);
+break;
case NS_ooxml::LN_Value_ST_NumberFormat_upperLetter:
// A, B, ...
pSectionContext->SetPageNumberType(style::NumberingType::CHARS_UPPER_LETTER_N);
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 42377c2..a809802 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3286,7 +3286,6 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword
nKeyword)
m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_formProt,
pValue);
}
break;
-case RTF_PGNDEC:
case RTF_PGNBIDIA:
case RTF_PGNBIDIB:
// These should be mapped to NS_ooxml::LN_EG_SectPrContents_pgNumType,
but dmapper has no API for that at the moment.
@@ -3628,6 +3627,12 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword
nKeyword)
lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
NS_ooxml::LN_EG_SectPrContents_pgNumType, NS_ooxml::LN_CT_PageNumber_fmt,
pIntValue);
}
break;
+case RTF_PGNDEC:
+{
+aut
Re: Update to Firebird 3.0
>> Tamás, take a look at >> >> commit 290bfcd2fdb44a52943f6fdc134d2565cbb83db3 >> Author: Andrzej J.R. Hunt >> Date: Thu Sep 5 10:24:35 2013 +0100 >> >> there used to be a commented out "check for tommath". But if firebird >> needs tommath, then indeed we need to add it to our externals. > > yes, Tamás needs to write some makefiles after all :) > > that will be a UnpackedTarball, possibly a ExternalProject (unless it's > one of those "header-only" things), possibly a Library (if it doesn't > build in any sane way with MSVC), probably a ExternalPackage (unless > it's completely statically linked). > > but we can keep it simple stick to the (above mentioned) comment and not > support the scenario with system tommath and bundled firebird, either > bundle both or take both from system. that means we likely don't need > to detect "tommath" in configure, unless it's exposed somehow by > firebird's public headers. There is an embedded tommath in firebird/extern/libtommath/, but Firebird uses this only for windows. ( in version 4.0 there is an option --with-builtin-tommath, which allows us to use it on Linux, but there is no option like that in 3.0). So iiuc I have to do something only for Linux (and Mac ?). Firebird doesn't build on linux without an installed tommath, it searches for a system library. Isn't there some package manager stuff for libreoffice, which installs libtommath on Linux/MAC just before installing libreoffice? Actually I don't understand the concept of the makefiles you mentioned. So these UnpackedTarball, ExternalProject etc. makefiles would make some kind of tommath.so file(s) to instdir/program from a tarball, right? But than how would we force the firebird files to use those so files instead of searching for system libraries? With a patch on the firebird source? Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 4 commits - scp2/source solenv/bin sysui/desktop vcl/win
scp2/source/ooo/common_brand.scp |4 -
solenv/bin/macosx-codesign-app-bundle | 123 +-
sysui/desktop/icons/main.icns |binary
vcl/win/source/window/salframe.cxx| 11 ++-
4 files changed, 73 insertions(+), 65 deletions(-)
New commits:
commit febb907d5d80d6727542ca049ee8f3632d0c891b
Author: Andras Timar
Date: Tue Mar 22 22:14:51 2016 +0100
Revert "tdf#95761 All Hotkeys with CTRL+ALT+ not worked"
This reverts commit 5deedec2ab708b841d0d696c8039c7fbcd4e62a7.
It is a bad idea to use Ctrl+Alt accelerator keys.
It fixes tdf#97908.
(cherry picked from commit df00c67da8e8701179dbe66efa00e4a795d51700)
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index fa53572..ea2abb2 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -3399,10 +3399,8 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
nModCode |= KEY_SHIFT;
if ( GetKeyState( VK_CONTROL ) & 0x8000 )
nModCode |= KEY_MOD1;
-if ( GetKeyState( VK_LMENU ) & 0x8000 )
+if ( GetKeyState( VK_MENU ) & 0x8000 )
nModCode |= KEY_MOD2;
-if ( GetKeyState( VK_RMENU ) & 0x8000 ) // this is the ALTGR-Key in this
case
-nModCode &= ~KEY_MOD1; // remove the Control flag
if ( (nMsg == WM_CHAR) || (nMsg == WM_SYSCHAR) )
{
@@ -3609,6 +3607,13 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
aKeyEvt.mnCode |= nModCode;
aKeyEvt.mnRepeat= nRepeat;
+if( (nModCode & (KEY_MOD1|KEY_MOD2)) == (KEY_MOD1|KEY_MOD2) &&
+aKeyEvt.mnCharCode )
+{
+ // this is actually AltGr and should not be handled as Alt
+ aKeyEvt.mnCode &= ~(KEY_MOD1|KEY_MOD2);
+}
+
bIgnoreCharMsg = bCharPeek ? TRUE : FALSE;
long nRet = pFrame->CallCallback( nEvent, &aKeyEvt );
// independent part only reacts on keyup but Windows does not
send
commit e0b3d1f1ee9fa315e3daf78c78e54c6681b93930
Author: Andras Timar
Date: Thu Mar 10 09:18:48 2016 +0100
OS X codesign
Change-Id: Ic2ea2851183ce2c0987c3e88113a03e73064a6b8
(cherry picked from commit 00191a2a634f6d4c9c9934afe163a6e4ae469286)
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index ff6397a..23fe2be 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -1,9 +1,8 @@
#!/bin/bash
-# Script to sign dylibs and frameworks in an app bundle plus the
-# bundle itself. Called from
-# installer::simplepackage::create_package() in
-# solenv/bin/modules/installer/simplepackage.pm
+# Script to sign executables, dylibs and frameworks in an app bundle
+# plus the bundle itself. Called from
+# the test-install target in Makefile.in
test `uname` = Darwin || { echo This is for OS X only; exit 1; }
@@ -19,91 +18,97 @@ for V in \
fi
done
-echo "codesigning using
MACSOX_CODESIGNING_IDENTITY=[${MACOSX_CODESIGNING_IDENTITY?}]"
-
APP_BUNDLE="$1"
+if test -n "$ENABLE_MACOSX_SANDBOX"; then
+# In a sandboxed build executables need the entitlements
+entitlements="--entitlements $BUILDDIR/lo.xcent"
+# We use --enable-canonical-installation-tree-structure so all
+# data files in Resources are included in the app bundle signature
+# through that. I think.
+other_files=''
+else
+# In a non-sandboxed build (distributed outside the App Store)
+# we traditionally have use --resource-rules. Let's not touch that?
+resource_rules="--resource-rules
$SRCDIR/setup_native/source/mac/CodesignRules.plist"
+# And there we then want to sign data files, too, hmm.
+other_files="\
+ -or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' \
+ -or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name
'LICENSE.html' \
+ -or -name '*.applescript' -or -name '*.odt'"
+fi
+
# Sign dylibs
#
-# Executables get signed right after linking, see
-# solenv/gbuild/platform/macosx.mk. But many of our dylibs are built
-# by ad-hoc or 3rd-party mechanisms, so we can't easily sign them
-# right after linking. So do it here.
-#
# The dylibs in the Python framework are called *.so. Go figure
#
# On Mavericks also would like to have data files signed...
# add some where it makes sense. Make a depth-first search to sign the contents
# of e.g. the spotlight plugin before attempting to sign the plugin itself
-find -d "$APP_BUNDLE" \( -name '*.dylib' -or -name '*.so' -or -name '*.fodt'
-or -name '*.odt' \
--or -name 'schema.strings' -or -name 'schema.xml' -or -name
'*.mdimporter' \
--or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name
'LICENSE.html' \
--or -name '*.applescript' \) ! -type l | grep -v
"LibreOfficePython\.framework" | \
+find "$APP_BUND
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 5 commits - Makefile.in scp2/source ure/Package_install.mk
Makefile.in |9 -
scp2/source/ooo/common_brand.scp |2 +-
scp2/source/ooo/file_ooo.scp |4 ++--
ure/Package_install.mk |2 ++
4 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 0199dc2d96cae13687032fb162d37f82f67f1871
Author: Andras Timar
Date: Sun May 17 11:39:44 2015 +0200
Don't put symlink to MacOS folder of sandboxed app
Conflicts:
ure/Package_install.mk
Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a
(cherry picked from commit 1f63dc5ebb0ededd358f97a785559588efd92cf7)
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 99801c7..e8b6515 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -14,7 +14,9 @@ $(eval $(call
gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,uno))
endif
ifeq (MACOSX,$(OS))
+ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
$(eval $(call
gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))
endif
+endif
# vim:set noet sw=4 ts=4:
commit 1255fffbcbe40928b1bf30e8b4f0a869d2bb
Author: Andras Timar
Date: Sun May 17 11:07:14 2015 +0200
Don't package unoinfo in case of Mac OS X like app structure
Change-Id: I517ed7ac43b0655c7e571e0b9fead32c4f2e7948
(cherry picked from commit d745e1dfd09a32efaea815ea4ac00059b956849f)
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a099194..f497c5d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -512,7 +512,7 @@ File gid_Brand_File_Desktophelper_Txt
End
#endif
-#if !defined WNT
+#if !defined WNT && !defined MACOSX
File gid_Brand_File_Bin_Unoinfo
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
commit 6237d6ac5f8c3d02546c9fdd3720719afc98e6a8
Author: Andras Timar
Date: Sun May 17 10:59:11 2015 +0200
Don't package gengal script in App Store case
Conflicts:
scp2/source/ooo/file_ooo.scp
Change-Id: Ia7002e5f56cad7efd264baa940ccc350ae5ee08c
(cherry picked from commit 7680527415f89e6c76101bdb257c27fe9b607b07)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 05c734c..2de4cfb 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -48,7 +48,7 @@ File gid_File_Basic_User_Standard
Name = "wizards_basicsrvstandard.filelist";
End
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
File gid_File_Script_Gengal
BIN_FILE_BODY;
commit e3ccf703a4b7ae3946e9f570d75d4033f8310bc2
Author: Andras Timar
Date: Fri May 15 17:05:17 2015 +0200
shell script in Contents/MacOS is not accepted
(cherry picked from commit 4ecd2dd60d1685255fdf947a7bdfea20eac68e65)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ab8daaf..05c734c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -91,7 +91,7 @@ End
#endif
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
Dir = FILELIST_DIR;
commit 8d8f6ab952b699756fc9a17f979933b311502770
Author: Andras Timar
Date: Mon May 11 22:26:29 2015 +0200
create empty .lproj directories for languages supported by OS X
The previous solution had problems. InfoPlist.strings were empty,
because localization has not been working since the CFBundleTypeIconFile
entries were removed from Info.plist. Icon file basename was the key
in documents.ulf. So we packages 0 bytes long files. The second problem
was that we used LibreOffice language codes, and OS X language codes are
different in some cases. This caused problems such as French strings on
English UI (e.g. Open/Save dialogs), because the system did not
recognize en-US.lproj and en-GB.lproj, and fell back to the next one: fr.
Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134
Conflicts:
Makefile.in
(cherry picked from commit e013f39a3fe928ea22cdde6e0da1c3fe8072c588)
diff --git a/Makefile.in b/Makefile.in
index 1df8ef3..7ceabf3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -304,14 +304,13 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj
directories.
- set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
- bn=`basename $$F .zip`; \
- lang=$${bn#InfoPlist_}; \
+#
+# Create Resources/*.lproj directories for languages supported by OS X
+ set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl
no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \
lproj=$(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
mkdir $$lproj; \
-
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - Makefile.in
Makefile.in |1 + 1 file changed, 1 insertion(+) New commits: commit baa24e0b94cfe34a2e65719c749b7a9ac4a72c07 Author: Tor Lillqvist Date: Tue Sep 9 10:35:51 2014 +0300 Remove potential old leftover before moving the app bundle Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f (cherry picked from commit 8adb16acb1aeccfacc39c2edb10d4f90374e8ff2) diff --git a/Makefile.in b/Makefile.in index 7a13f35..1df8ef3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -321,6 +321,7 @@ endif mac-app-store-package: test-install ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),) + rm -rf "$(MACOSX_APP_NAME).app" mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app" productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' ' '-').pkg else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - lo.xcent.in
lo.xcent.in |2 -- 1 file changed, 2 deletions(-) New commits: commit 3cec04b0d801b27a664f6f692ae265c466a4b06d Author: Tor Lillqvist Date: Tue Sep 23 14:57:52 2014 +0300 Seems that we don't need the com.apple.application-identifier after all Conflicts: lo.xcent.in Change-Id: I3bc499b15c31724dca2d49123dcdbec8dfd934f6 (cherry picked from commit e85145049d7f47e17fdc3eb7d502d1e4279d8db8) diff --git a/lo.xcent.in b/lo.xcent.in index ca636d7..9b1f028 100644 --- a/lo.xcent.in +++ b/lo.xcent.in @@ -2,8 +2,6 @@ http://www.apple.com/DTDs/PropertyList-1.0.dtd";> - com.apple.application-identifier - @MACOSX_BUNDLE_IDENTIFIER@ com.apple.security.app-sandbox com.apple.security.files.bookmarks.app-scope ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 14 commits - configure.ac cui/source desktop/source distro-configs/CPOSX.conf Makefile.in pyuno/Package_python_shell.mk Repository.mk
Makefile.in | 10
Repository.mk|4
configure.ac |2
cui/source/dialogs/about.cxx |2
desktop/source/app/officeipcthread.cxx |5
distro-configs/CPOSX.conf|1
pyuno/Package_python_shell.mk|4
scp2/source/ooo/scpaction_ooo.scp| 25
setup_native/source/packinfo/DS_Store|binary
setup_native/source/packinfo/VolumeIcon.icns |binary
setup_native/source/packinfo/osxdndinstall.png |binary
setup_native/source/packinfo/sla.r | 1428 +++
solenv/bin/macosx-codesign-app-bundle| 123 -
solenv/bin/modules/installer/simplepackage.pm| 14
sysui/desktop/freedesktop/freedesktop-menus.spec |3
sysui/desktop/icons/main.icns|binary
sysui/desktop/share/create_tree.sh |8
17 files changed, 1535 insertions(+), 94 deletions(-)
New commits:
commit dd647d591d43188602858c45bc6342f60b021a1f
Author: Tor Lillqvist
Date: Fri Sep 19 12:47:02 2014 +0300
Unzip the InfoPlist.strings files into correct locations
Not sure how useful it is to only provide translations for the ODF
document format names, though.
Change-Id: I22a2e5b896e077ca3067a30635f7cdf67c2f5e7c
(cherry picked from commit 16f62d80c38f3920a40fc078edecad905ba2b196)
(cherry picked from commit 4094a45c3b3c0c366e9ba9d51825f5627e21967d)
diff --git a/Makefile.in b/Makefile.in
index 86ce1e2..7a13f35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -304,9 +304,15 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# The InfoPlist_*.zip files in "bin" are totally pointless and should
-# not be there. I am too lazy at the moment to figure out how to
-# prevent them from ending up there.
+# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj
directories.
+ set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
+ bn=`basename $$F .zip`; \
+ lang=$${bn#InfoPlist_}; \
+ lproj=$(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
+ mkdir $$lproj; \
+ (cd $$lproj; unzip $$F); \
+ done
+# And remove the "bin" folder which should not be there
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle
$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
endif
commit 265aae6898d5359b207ab1984bab76861f9f977b
Author: Tor Lillqvist
Date: Mon Sep 15 21:50:35 2014 +0300
We don't want those bin/InfoPlist_*.zip files in the app bundle
(cherry picked from commit 7956d38fa3c0db77b9b2b41f870bd3587e3dc1af)
Conflicts:
Makefile.in
Change-Id: I29eefa599f175d98303fca8f5ccf1c8fe85b0bbc
(cherry picked from commit e3e3a1f3300975858caf4dff17ffb8775a6ef015)
diff --git a/Makefile.in b/Makefile.in
index 9803706..86ce1e2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -304,6 +304,10 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
+# The InfoPlist_*.zip files in "bin" are totally pointless and should
+# not be there. I am too lazy at the moment to figure out how to
+# prevent them from ending up there.
+ rm -rf $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle
$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
endif
endif
commit b36267edb632577ca5e6deb219d5da4d5b8e9bef
Author: Andras Timar
Date: Mon May 2 11:14:00 2016 +0200
do not localize Collabora Office URL
Change-Id: I1eb33d3ce649ff8ca1158e96fe6c6bc1a3ab75ea
(cherry picked from commit 9189450fa042526ee5380a2b9004b8a1a32a9e48)
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 38dad7f..3aed215 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -126,7 +126,7 @@ IMPL_LINK_TYPED( AboutDialog, HandleClick, Button*,
pButton, void )
else if ( aDialogButton == WEBSITE_BUTTON )
{
sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get();
-localizeWebserviceURI(sURL);
+// localizeWebserviceURI(sURL);
}
// If the URL is empty, don't do anything
commit 0ad525cf7838d8899447b1f6e642a9807ea22e36
Author: Tor Lillqvist
Date: Tue Jun 30 19:42:45 2015 +0300
tdf#92191: Don't use any IPC pipe in a sandboxed OS X app
Creating the pipe fails when sandboxed. This caused us to not start
the OfficeIPCThread,
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 6 commits - configure.ac icon-themes/galaxy instsetoo_native/CustomTarget_setup.mk instsetoo_native/inc_common instsetoo_native/util
configure.ac|6
icon-themes/galaxy/brand_cp/flat_logo.svg | 829
++
icon-themes/galaxy/brand_cp/intro.png |binary
icon-themes/galaxy/sfx2/res/logo.png|binary
instsetoo_native/CustomTarget_setup.mk |8
instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/util/openoffice.lst.in | 23
scp2/source/ooo/directory_ooo_macosx.scp|2
setup_native/source/packinfo/osxdndinstall.png |binary
solenv/bin/macosx-codesign-app-bundle | 124 -
solenv/bin/modules/installer/download.pm|2
solenv/bin/modules/installer/setupscript.pm |2
solenv/bin/modules/installer/windows/admin.pm |2
sysui/productlist.mk|4
15 files changed, 922 insertions(+), 80 deletions(-)
New commits:
commit dba11c86ac4bda84e2989a0463cea7d61e5a8e10
Author: Andras Timar
Date: Thu Oct 29 15:37:45 2015 +0100
OSX issues with space in product name
(cherry picked from commit 79f3a7bfefb8decd2d18df21d799f2d9241a44c3)
Change-Id: I0155372c8e5cd0eb91bfbea304190502cbf32e3c
diff --git a/configure.ac b/configure.ac
index fdc8927..bb57116 100644
--- a/configure.ac
+++ b/configure.ac
@@ -708,11 +708,12 @@ darwin*) # Mac OS X or iOS
test_cups=no
else
_os=Darwin
+ONEWORDPRODUCTNAME=`echo "${PRODUCTNAME// /}"`
if test -n "$LODE_HOME" ; then
mac_sanitize_path
AC_MSG_NOTICE([sanitized the PATH to $PATH])
fi
-INSTROOTSUFFIX=/$PRODUCTNAME.app/Contents
+INSTROOTSUFFIX=/$ONEWORDPRODUCTNAME.app/Contents
SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK
fi
enable_systray=no
@@ -12414,7 +12415,7 @@ else
fi
AC_SUBST(WITH_COMPAT_OOWRAPPERS)
-INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{print tolower($0)}'`
+INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{gsub(" ", "", $0);print
tolower($0)}'`
AC_MSG_CHECKING([for install dirname])
if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a
"$with_install_dirname" != "yes"; then
INSTALLDIRNAME="$with_install_dirname"
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp
b/scp2/source/ooo/directory_ooo_macosx.scp
index 0bc7bfd..b717460 100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -21,7 +21,7 @@
#ifdef MACOSX
Directory gid_Dir_Bundle
ParentID = PD_PROGDIR;
-HostName = "%PRODUCTNAME.app";
+HostName = "%ONEWORDPRODUCTNAME.app";
End
Directory gid_Dir_Bundle_Contents
commit 9ea41d8f915491653df47064edafda47a987fe80
Author: Andras Timar
Date: Thu Oct 29 20:55:39 2015 +0100
OSX DMG background image must be 72 DPI
Change-Id: I29be97c1a0e783abcf24720a7c5bc6c832e78eb3
(cherry picked from commit 2e324090e01db1ff059a57f3ecfbe8f2a6da2c77)
diff --git a/setup_native/source/packinfo/osxdndinstall.png
b/setup_native/source/packinfo/osxdndinstall.png
index 89d9976..af22449 100644
Binary files a/setup_native/source/packinfo/osxdndinstall.png and
b/setup_native/source/packinfo/osxdndinstall.png differ
commit 07d93f57b99c077d6b3062ddafea56e021122111
Author: Andras Timar
Date: Sun Sep 6 01:31:01 2015 -0700
hack to fix an MSP creation error
Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c
(cherry picked from commit ded9e51fda12d01e381a5353e6ee412ec89548ff)
diff --git a/solenv/bin/modules/installer/windows/admin.pm
b/solenv/bin/modules/installer/windows/admin.pm
index 6fb1858..9e2dcd1 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -296,6 +296,8 @@ sub create_directory_structure
{
if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} =
$targetdir; }
}
+# FIXME why is this hack needed? ERROR: Did not find full directory path
for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
+$fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"}
= $targetdir . $installer::globals::separator . "System";
return \%fullpathhash;
}
commit 34b62aa74bd67cd080b647929ca3efed1d8c8405
Author: Andras Timar
Date: Wed Oct 28 15:12:34 2015 +0100
Amended Collabora Office branding images
flat_logo.svg: transparency, bigger log, bigger text
logo.png: new, replacing green number 5
Change-Id: I314d28f33a148ff438dae8de4db7b08097318fe0
(cherry picked from commit 5d81503823f2405c2eaec97c98e432886863ce02)
diff --git a/icon-themes/galaxy/brand_cp/flat_logo.svg
b/icon-themes/gal
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 3 commits - instsetoo_native/util postprocess/CustomTarget_registry.mk readlicense_oo/docs vcl/generic
instsetoo_native/util/openoffice.lst.in |2
postprocess/CustomTarget_registry.mk|2
readlicense_oo/docs/readme.xrm | 201
vcl/generic/app/gensys.cxx | 18 --
4 files changed, 6 insertions(+), 217 deletions(-)
New commits:
commit fc3adf23236913624716bc2f6eef3af959a16b88
Author: Andras Timar
Date: Fri Mar 4 10:50:11 2016 +0100
fix README for Collabora Office
(cherry picked from commit 869d1d4702ebb8f27380c276da12c5da4ad6e47a)
Change-Id: I4892a36115f0ee5bedd1c87521535d60a4002252
diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 86ced6e..72b4ac9 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -17,206 +17,7 @@
${PRODUCTNAME}
${PRODUCTVERSION} ReadMe
- For the latest
updates to this readme file, see http://www.libreoffice.org/welcome/readme.html";>http://www.libreoffice.org/welcome/readme.html
- This file contains
important information about the ${PRODUCTNAME} software. You are recommended to
read this information very carefully before starting installation.
- The ${PRODUCTNAME}
community is responsible for the development of this product, and invites you
to consider participating as a community member. If you are a new user, you can
visit the ${PRODUCTNAME} site, where you will find lots of information about
the ${PRODUCTNAME} project and the communities that exist around it. Go to http://www.libreoffice.org/";>http://www.libreoffice.org/.
- Is ${PRODUCTNAME} Really
Free for Any User?
- ${PRODUCTNAME} is free for
use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as
many computers as you like, and use it for any purpose you like (including
commercial, government, public administration and educational use). For further
details see the license text packaged with this ${PRODUCTNAME} download.
- Why is ${PRODUCTNAME}
Free for Any User?
- You can use this copy of
${PRODUCTNAME} free of charge because individual contributors and corporate
sponsors have designed, developed, tested, translated, documented, supported,
marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today
- the world's leading Open Source productivity software for home and office.
- If you appreciate their
efforts, and would like to ensure that ${PRODUCTNAME} continues to be available
far into the future, please consider contributing to the project - see http://www.documentfoundation.org/contribution/";>http://www.documentfoundation.org/contribution/
for details. Everyone can make a contribution of some kind.
-
-
-
- Notes on
Installation
- ${PRODUCTNAME} requires a recent version of Java Runtime
Environment (JRE) for full functionality. JRE is not part of the ${PRODUCTNAME}
installation package, it should be installed separately.
- System
Requirements
-
-
-
- MacOSX 10.8 (Mountain Lion) or higher
-
-
-
-
-
-
- Microsoft Windows XP SP2, Vista, Windows 7, or Windows 8
-
-
- Please be aware that administrator rights are needed for the
installation process.
- Registration
of ${PRODUCTNAME} as default application for Microsoft Office formats can be
forced or suppressed by using the following command line switches with the
installer:
-
-
- REGISTER_ALL_MSO_TYPES=1 will force registration of
${PRODUCTNAME} as default application for Microsoft Office formats.
-
-
-
- REGISTER_NO_MSO_TYPES=1 will suppress registration of
${PRODUCTNAME} as default application for Microsoft Office formats.
-
-
-
-
- As a general rule,
you are recommended to install ${PRODUCTNAME} via the installation methods
recommended by your particular Linux distribution (such as the Ubuntu Software
Center, in the case of Ubuntu Linux). This is because it is usu
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/axes/VCartesianAxis.cxx | 34 -
chart2/source/view/axes/VCartesianAxis.hxx |7 -
2 files changed, 24 insertions(+), 17 deletions(-)
New commits:
commit 99226f343e4ad9ebcbb4e31c17d3fb706153e18b
Author: Jochen Nitschke
Date: Sun Jun 5 22:45:43 2016 +0200
try auto rotate tick labels only when useful tdf#99883
By default we try to fit as many tick labels as possible on an axis.
One way is (auto) rotating the labels at 45 degrees.
But rotating only works for horizontal axes with horizontal text or
vertical axes with vertical text, else rotated tick labels need more space.
Join the check for this prerequisite with isAutoStaggeringOfLabelsAllowed.
while here make isAutoStaggeringOfLabelsAllowed local
and wrap stuff in anonymous namespaces
Change-Id: I5784d0e5aa42ff90927e19d0bd2c6fed488d39f4
Reviewed-on: https://gerrit.libreoffice.org/25792
Reviewed-by: Jochen Nitschke
Tested-by: Jochen Nitschke
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 59a4972..97912a5 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -497,20 +497,21 @@ bool VCartesianAxis::isBreakOfLabelsAllowed(
//break only for horizontal axis
return bIsHorizontalAxis;
}
+namespace{
-bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed(
-const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis,
bool bIsVerticalAxis )
+bool canAutoAdjustLabelPlacement(
+const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis,
bool bIsVerticalAxis)
{
-if( rAxisLabelProperties.eStaggering != STAGGER_AUTO )
-return false;
+// joined prerequisite checks for auto rotate and auto stagger
if( rAxisLabelProperties.bOverlapAllowed )
return false;
-if( rAxisLabelProperties.bLineBreakAllowed ) //auto line break or auto
staggering, doing both automatisms they may conflict...
+if( rAxisLabelProperties.bLineBreakAllowed ) // auto line break may
conflict with...
return false;
if( !::rtl::math::approxEqual( rAxisLabelProperties.fRotationAngleDegree,
0.0 ) )
return false;
-//automatic staggering only for horizontal axis with horizontal text
-//or vertical axis with vertical text
+// automatic adjusting labels only works for
+// horizontal axis with horizontal text
+// or vertical axis with vertical text
if( bIsHorizontalAxis )
return !rAxisLabelProperties.bStackCharacters;
if( bIsVerticalAxis )
@@ -518,6 +519,18 @@ bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed(
return false;
}
+bool isAutoStaggeringOfLabelsAllowed(
+const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis,
bool bIsVerticalAxis )
+{
+if( rAxisLabelProperties.eStaggering != STAGGER_AUTO )
+return false;
+return canAutoAdjustLabelPlacement(rAxisLabelProperties,
bIsHorizontalAxis, bIsVerticalAxis);
+}
+
+// make clear that we check for auto rotation prerequisites
+const auto& isAutoRotatingOfLabelsAllowed = canAutoAdjustLabelPlacement;
+
+} // namespace
void VCartesianAxis::createAllTickInfosFromComplexCategories(
TickInfoArraysType& rAllTickInfos, bool bShiftedPosition )
{
//no minor tickmarks will be generated!
@@ -827,7 +840,8 @@ bool VCartesianAxis::createTextShapes(
{
// Compatibility option: starting from LibreOffice 5.1 the
rotated
// layout is preferred to staggering for axis labels.
-if( m_aAxisProperties.m_bTryStaggeringFirst ||
!(::rtl::math::approxEqual( rAxisLabelProperties.fRotationAngleDegree, 0.0 ) ) )
+if( !isAutoRotatingOfLabelsAllowed(rAxisLabelProperties,
bIsHorizontalAxis, bIsVerticalAxis)
+|| m_aAxisProperties.m_bTryStaggeringFirst )
{
bIsStaggered = true;
rAxisLabelProperties.eStaggering = STAGGER_EVEN;
@@ -844,7 +858,7 @@ bool VCartesianAxis::createTextShapes(
if (bOverlapsAfterAutoStagger)
{
// Staggering didn't solve the overlap.
-if( !rAxisLabelProperties.bOverlapAllowed &&
::rtl::math::approxEqual( rAxisLabelProperties.fRotationAngleDegree, 0.0 ) )
+if( isAutoRotatingOfLabelsAllowed(rAxisLabelProperties,
bIsHorizontalAxis, bIsVerticalAxis) )
{
// Try auto-rotating the labels at 45 degrees and
// start over. This rotation angle will be stored for
@@ -986,7 +1000,7 @@ bool VCartesianAxis::createTextShapesSimple(
if( doesOverlap( pLastVisibleNeighbourTickInfo->xTextShape,
pTickInfo->xTextShape, rAxisLabelProperties.fRotationAngleDegree ) )
{
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 2 commits - officecfg/registry setup_native/source
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 ++ setup_native/source/packinfo/packinfo_brand.txt|7 +++ setup_native/source/packinfo/packinfo_office.txt |2 ++ 3 files changed, 15 insertions(+) New commits: commit 895e91d8aeaf77dc38fe14ad165b6f7ad5272491 Author: Andras Timar Date: Sat Nov 28 17:09:59 2015 +0100 Ctrl+3 keyboard shortcut for Set Optimal Column Width in Calc Change-Id: I1e218a429b509fda35accc832d01fc1f12e8 (cherry picked from commit fc53041c0387388f1275abf7beefea4d80d5ee3b) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index ab773b6..30a67d8 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -531,6 +531,12 @@ .uno:NumberFormatScientific + + +I10N SHORTCUTS - NO TRANSLATE +.uno:SetOptimalColumnWidthDirect + + I10N SHORTCUTS - NO TRANSLATE commit ddb987c79a3852cfb552f10b1beca03f419879c2 Author: Andras Timar Date: Fri Oct 2 14:18:26 2015 +0200 provide libreoffice-writer, libreoffice-calc etc. metapackages Change-Id: Ibadbcb45eb0cacd8f26e7bfed3cff794a7ce88f1 (cherry picked from commit d151f43cdb0e7735d267115868a9dac9f45bb6b2) diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt index 4284ad0..cefb654 100644 --- a/setup_native/source/packinfo/packinfo_brand.txt +++ b/setup_native/source/packinfo/packinfo_brand.txt @@ -28,6 +28,7 @@ vendor = "The Document Foundation" description = "Brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice" End Start @@ -42,6 +43,7 @@ vendor = "The Document Foundation" description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-writer" End Start @@ -56,6 +58,7 @@ vendor = "The Document Foundation" description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-calc" End Start @@ -70,6 +73,7 @@ vendor = "The Document Foundation" description = "Impress brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-impress" End Start @@ -84,6 +88,7 @@ vendor = "The Document Foundation" description = "Draw brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-draw" End Start @@ -98,6 +103,7 @@ vendor = "The Document Foundation" description = "Math brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-math" End Start @@ -112,6 +118,7 @@ vendor = "The Document Foundation" description = "Base brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-base" End Start diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 8bc7ed8..e6564c3 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -48,6 +48,7 @@ vendor = "The Document Foundation" description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-evolution libreoffice-gnome" End Start @@ -95,6 +96,7 @@ vendor = "The Document Foundation" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-common" End Start ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 2 commits - distro-configs/CPLinux.conf distro-configs/CPOSX.conf distro-configs/CPWin32.conf distro-configs/CPWin32-MPL.conf extensi
distro-configs/CPLinux.conf | 45 +++ distro-configs/CPOSX.conf| 19 ++ distro-configs/CPWin32-MPL.conf | 31 ++ distro-configs/CPWin32.conf | 25 extensions/source/macosx/spotlight/mdimporter/Info.plist |4 - 5 files changed, 122 insertions(+), 2 deletions(-) New commits: commit ab091e20cafc0484c9b53debde428fb3fd0094f5 Author: Andras Timar Date: Fri Oct 17 15:12:31 2014 +0200 Collabora Office distro configs (cherry picked from commit eb38a29382aa012df6f8968ef8292f767f6a4d3a) Change-Id: Id643b47ba5870db52585f1d3406983be348a4608 diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf new file mode 100644 index 000..cc163fe --- /dev/null +++ b/distro-configs/CPLinux.conf @@ -0,0 +1,45 @@ +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--with-system-dicts +--with-myspell-dicts +--with-system-zlib +--without-system-poppler +--without-system-openssl +--without-system-libpng +--without-system-libxml +--without-system-jpeg +--without-system-jars +--without-system-postgresql +--without-junit +--with-help +--without-helppack-integration +--with-linker-hash-style=both +--with-fonts +--with-external-thes-dir=/usr/share/mythes +--with-external-hyph-dir=/usr/share/hyphen +--with-external-dict-dir=/usr/share/hunspell +--enable-dbus +--enable-extension-integration +--disable-odk +--enable-kde4 +--disable-gtk3 +--enable-gstreamer-0-10 +--disable-gstreamer-1-0 +--enable-evolution2 +--enable-gio +--enable-scripting-beanshell +--enable-scripting-javascript +--enable-ext-wiki-publisher +--enable-report-builder +--enable-ext-nlpsolver +--enable-ext-numbertext +--enable-ext-ct2n +--enable-epm +--enable-python=internal +--disable-online-update +--disable-dconf +--disable-randr-link +--enable-mergelibs +--with-package-format=deb rpm +--enable-release-build +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf new file mode 100644 index 000..bbb0154 --- /dev/null +++ b/distro-configs/CPOSX.conf @@ -0,0 +1,19 @@ +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--without-junit +--without-help +--with-myspell-dicts +--enable-extension-integration +--disable-online-update +--disable-odk +--enable-epm +--enable-ext-wiki-publisher +--enable-report-builder +--enable-ext-nlpsolver +--enable-ext-numbertext +--enable-ext-ct2n +--enable-release-build +--without-system-postgresql +--disable-gtk +--with-package-format=dmg +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin32-MPL.conf new file mode 100644 index 000..6accaed --- /dev/null +++ b/distro-configs/CPWin32-MPL.conf @@ -0,0 +1,31 @@ +--enable-mpl-subset +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--with-theme=tango +--without-help +--with-myspell-dicts +--without-system-mesa-headers +--without-system-postgresql +--without-junit +--without-helppack-integration +--enable-extension-integration +--enable-activex +--disable-online-update +--disable-odk +--disable-gtk +--disable-ext-wiki-publisher +--disable-report-builder +--disable-ext-nlpsolver +--disable-ext-numbertext +--disable-ext-ct2n +--disable-postgresql-sdbc +--disable-lotuswordpro +--disable-lpsolve +--with-webdav=serf +--enable-release-build +--with-package-format=msi +--enable-mergelibs +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW +--enable-windows-build-signing +--without-java +--disable-pdfimport diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf new file mode 100644 index 000..4e432bc --- /dev/null +++ b/distro-configs/CPWin32.conf @@ -0,0 +1,25 @@ +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--without-system-mesa-headers +--without-system-postgresql +--without-junit +--without-helppack-integration +--enable-extension-integration +--enable-activex +--disable-online-update +--disable-odk +--disable-gtk +--enable-scripting-beanshell +--enable-scripting-javascript +--enable-ext-wiki-publisher +--enable-report-builder +--enable-ext-nlpsolver +--enable-ext-numbertext +--enable-ext-ct2n +--enable-release-build +--with-help +--with-myspell-dicts +--with-package-format=msi +--enable-mergelibs +--with-lang=ar as ast bg b
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/opengl
vcl/opengl/gdiimpl.cxx | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 86fef4ea205f3001305a6122bfa127b196e2d345
Author: Tomaž Vajngerl
Date: Thu Jun 9 14:58:42 2016 +0900
tdf#99795 drawAlphaBitmap should scale the bitmap if necessary
drawAlphaBitmap didn't use a high quality scaler for scaling
the texture but used the default scaling method in OpenGL (either
GL_NEAREST or GL_LINEAR, whichever is defined when texture
is created) which are low quality scalers - especially when
downscaling textures.
Change-Id: I6236b2ee92b9e5044b176a40a444027072b09b58
(cherry picked from commit 19baa61e1d7b140b9e24717f7080617ab3d324d4)
Reviewed-on: https://gerrit.libreoffice.org/26100
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 39ae806..188db65 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -2144,12 +2144,25 @@ bool OpenGLSalGraphicsImpl::drawAlphaBitmap(
const OpenGLSalBitmap& rBitmap = static_cast(rSalBitmap);
const OpenGLSalBitmap& rAlpha = static_cast(rAlphaBitmap);
-OpenGLTexture& rTexture( rBitmap.GetTexture() );
-OpenGLTexture& rAlphaTex( rAlpha.GetTexture() );
+OpenGLTexture& rTexture(rBitmap.GetTexture());
+OpenGLTexture& rAlphaTexture(rAlpha.GetTexture());
VCL_GL_INFO( "::drawAlphaBitmap" );
PreDraw();
-DrawTextureWithMask( rTexture, rAlphaTex, rPosAry );
+
+if (rPosAry.mnSrcWidth != rPosAry.mnDestWidth ||
+rPosAry.mnSrcHeight != rPosAry.mnDestHeight)
+{
+basegfx::B2DPoint aNull(rPosAry.mnDestX,rPosAry.mnDestY);
+basegfx::B2DPoint aX(rPosAry.mnDestX + rPosAry.mnDestWidth,
rPosAry.mnDestY);
+basegfx::B2DPoint aY(rPosAry.mnDestX, rPosAry.mnDestY +
rPosAry.mnDestHeight);
+DrawTransformedTexture(rTexture, rAlphaTexture, aNull, aX, aY);
+}
+else
+{
+DrawTextureWithMask( rTexture, rAlphaTexture, rPosAry );
+}
+
PostDraw();
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx
vcl/unx/generic/gdi/x11cairotextrender.cxx | 18 ++
1 file changed, 18 insertions(+)
New commits:
commit c55d703ea00de67793765f8da7ca17dfb54281fc
Author: Caolán McNamara
Date: Tue Dec 15 12:35:05 2015 +
Related: tdf#99446 cairo text + xrender bodge
(cherry picked from commit 1d18db339242a535d956b7e944ad1488fd2b4fd8)
Change-Id: I926881bcfa4911f3d7f4899711be44a2f6d82026
Reviewed-on: https://gerrit.libreoffice.org/26087
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx
b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index 8734526..17cb462 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -42,6 +42,10 @@ struct _XRegion
BOX extents;
};
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
+#define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
+#endif
+
X11CairoTextRender::X11CairoTextRender(X11SalGraphics& rParent)
: mrParent(rParent)
{
@@ -78,6 +82,20 @@ cairo_t* X11CairoTextRender::getCairoContext()
cairo_t *cr = cairo_create(surface);
cairo_surface_destroy(surface);
+
+//rhbz#1283420 bodge to draw and undraw something which has the side effect
+//of making the mysterious xrender related problem go away
+if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 10, 0))
+{
+cairo_save(cr);
+cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
+cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
+cairo_rectangle(cr, 0, 0, 1, 1);
+cairo_fill_preserve(cr);
+cairo_fill(cr);
+cairo_restore(cr);
+}
+
return cr;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/source
cui/source/tabpages/textattr.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3a5ce16bc2a0f766a442cebc49d4c361f95cf91b
Author: Caolán McNamara
Date: Thu Jun 9 09:08:08 2016 +0100
Resolves: tdf#93135 can't resize shape with "resize shape to fit text"
These are regressions from...
commit 4a847bb4a2002d7f8f5854b7276ac67d369bdd3b
Date: Sun Aug 2 21:20:48 2015 +0200
tdf#93079: "resize shape to fit text" state can't be disabled
Wrong copy-paste
and
commit b2bae9b940fc34d2eecd7839e3cba1f41d111e87
Date: Thu Apr 9 23:38:47 2015 +0200
Related tdf#34467: Fit to Frame for text boxes is broken
Wrong Copy-paste
Its turns out that there is *no* SDRATTR_TEXT_AUTOGROWSIZE property.
Only a SDRATTR_TEXT_AUTOGROWHEIGHT property
e.g. see CustomShapeProperties::UpdateTextFrameStatus of
svx/source/sdr/properties/customshapeproperties.cxx
"change TextFrame flag when bResizeShapeToFitText changes (which is mapped
on
the item SDRATTR_TEXT_AUTOGROWHEIGHT for custom shapes, argh)"
So the inconsistency between
getting the itemstate of SDRATTR_TEXT_AUTOGROWSIZE
and then
setting/getting SDRATTR_TEXT_AUTOGROWHEIGHT
is better resolved by getting the itemstate of SDRATTR_TEXT_AUTOGROWHEIGHT
will have a follow up patch to remove SDRATTR_TEXT_AUTOGROWSIZE to show
its not used by anything
Change-Id: I8b8abde17c15761c621815ed2be62d6a8a5cd69a
(cherry picked from commit d1df071c3fc452817746a8daa13000d2df667aba)
(cherry picked from commit 65d1e5294c9f0d9300dbb92f6670cdcafa8a1ac2)
Reviewed-on: https://gerrit.libreoffice.org/26089
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 50cbcb5..a0ba1bb 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -204,9 +204,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
m_pTsbAutoGrowWidth->SaveValue();
// autogrowsize
-if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWSIZE ) !=
SfxItemState::DONTCARE )
+if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) !=
SfxItemState::DONTCARE )
{
-m_pTsbAutoGrowSize->SetState( static_cast(
rAttrs->Get( SDRATTR_TEXT_AUTOGROWSIZE ) ).
+m_pTsbAutoGrowSize->SetState( static_cast(
rAttrs->Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ).
GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
m_pTsbAutoGrowSize->EnableTriState( false );
}
@@ -384,7 +384,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
eState = m_pTsbAutoGrowSize->GetState();
if( m_pTsbAutoGrowSize->IsValueChangedFromSaved() )
{
-rAttrs->Put( makeSdrTextAutoGrowSizeItem ( TRISTATE_TRUE == eState ) );
+rAttrs->Put( makeSdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState )
);
}
eState = m_pTsbWordWrapText->GetState();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source
vcl/source/control/combobox.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 62a30dd22805eab1785703114ebf060a00cf9170
Author: Caolán McNamara
Date: Wed Jun 8 11:35:15 2016 +0100
Resolves: rhbz#1343766 a11y queries during dispose trigger combobox crashes
Change-Id: I29863ca95e64ccd31795f78c29c89ff35009d718
(cherry picked from commit f120abb446bf3f5230ed06a3b148654dde36bb94)
(cherry picked from commit f7b0cbf1df98a1c42fe25cfdbd9977fba78347c8)
Reviewed-on: https://gerrit.libreoffice.org/26057
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 94dc649..8abef91 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1029,11 +1029,15 @@ OUString ComboBox::GetEntry( sal_Int32 nPos ) const
sal_Int32 ComboBox::GetEntryCount() const
{
+if (!m_pImpl->m_pImplLB)
+return 0;
return m_pImpl->m_pImplLB->GetEntryList()->GetEntryCount() -
m_pImpl->m_pImplLB->GetEntryList()->GetMRUCount();
}
bool ComboBox::IsTravelSelect() const
{
+if (!m_pImpl->m_pImplLB)
+return false;
return m_pImpl->m_pImplLB->IsTravelSelect();
}
@@ -1052,6 +1056,8 @@ void ComboBox::EnableMultiSelection( bool bMulti )
bool ComboBox::IsMultiSelectionEnabled() const
{
+if (!m_pImpl->m_pImplLB)
+return false;
return m_pImpl->m_pImplLB->IsMultiSelectionEnabled();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source
sc/source/core/tool/interpr2.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 8118a7c30e02b96a9dde9da590892c498681227f
Author: Eike Rathke
Date: Thu Jun 9 14:43:44 2016 +0200
Resolves: tdf#100285 EASTERSUNDAY() check valid year between 1583 and 9956
Change-Id: I4b25f1eb8e3cf0236b69607bb9ab9b4c57ae918a
(cherry picked from commit 2c08ec226e771de10c8863b7f1cda016fea442d2)
Reviewed-on: https://gerrit.libreoffice.org/26109
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index ef2277a..2a35f83 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -282,6 +282,12 @@ void ScInterpreter::ScEasterSunday()
nYear = (sal_Int16) ::rtl::math::approxFloor( GetDouble() );
if ( nYear < 100 )
nYear = pFormatter->ExpandTwoDigitYear( nYear );
+if (nYear < 1583 || nYear > 9956)
+{
+// Valid Gregorian and maximum year constraints not met.
+PushIllegalArgument();
+return;
+}
// don't worry, be happy :)
int B,C,D,E,F,G,H,I,K,L,M,N,O;
N = nYear % 19;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sfx2/source
sfx2/source/appl/shutdownicon.cxx | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
New commits:
commit 63a54519f6cd3e0c22a1a24015002d07407ac37e
Author: Caolán McNamara
Date: Thu Jun 9 21:25:12 2016 +0100
Resolves: tdf#100181 quickstart crashes immediately without Quickstarter
Change-Id: I0257651b3841dea596077cfacbf7d69a20b04252
Reviewed-on: https://gerrit.libreoffice.org/26134
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit dfb2a8deab1324047a4ed81a131a1ef3552c3e8e)
(cherry picked from commit dd02cca2e64b061ddd5003ad0485dcbfae7f5ddf)
Reviewed-on: https://gerrit.libreoffice.org/26149
Reviewed-by: Markus Mohrhard
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 13e11cb..1802938 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -122,19 +122,16 @@ css::uno::Sequence SAL_CALL
ShutdownIcon::getSupportedServiceNames()
bool ShutdownIcon::bModalMode = false;
ShutdownIcon* ShutdownIcon::pShutdownIcon = nullptr;
-#if !defined( ENABLE_QUICKSTART_APPLET )
-// To remove conditionals
extern "C" {
static void disabled_initSystray() { }
static void disabled_deInitSystray() { }
}
-#endif
namespace {
boost::logic::tribool loaded(boost::logic::indeterminate);
-oslGenericFunction pInitSystray(nullptr);
-oslGenericFunction pDeInitSystray(nullptr);
+oslGenericFunction pInitSystray = disabled_initSystray;
+oslGenericFunction pDeInitSystray = disabled_deInitSystray;
bool LoadModule()
{
@@ -170,10 +167,6 @@ bool LoadModule()
loaded = true;
}
# endif // UNX
-#else
-pInitSystray = disabled_initSystray;
-pDeInitSystray = disabled_deInitSystray;
-loaded = false;
#endif // ENABLE_QUICKSTART_APPLET
}
assert(!boost::logic::indeterminate(loaded));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 63c693a09f9fc816c8d392d82855fab6f561392c
Author: Caolán McNamara
Date: Fri Jun 10 14:56:54 2016 +0100
Resolves: tdf#100275 makeMark may return null under some circumstances
Change-Id: If3b83413c028c6cd1c055e632b6f050ec7f2475d
(cherry picked from commit 5c1a1d1c66aff497702abc20df5832fa348f1008)
(cherry picked from commit 61a98b7bb14986f6c7c218effacabbe4b925f6b6)
Reviewed-on: https://gerrit.libreoffice.org/26166
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 2138bf3e6..7894515 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -253,9 +253,12 @@ namespace
aTmpPam,
pMark->GetName(),
IDocumentMarkAccess::GetType(*pMark));
-// Explicitly try to get exactly the same name as in the source
-// because NavigatorReminders, DdeBookmarks etc. ignore the
proposed name
-pDestDoc->getIDocumentMarkAccess()->renameMark(pNewMark,
pMark->GetName());
+if (pNewMark)
+{
+// Explicitly try to get exactly the same name as in the source
+// because NavigatorReminders, DdeBookmarks etc. ignore the
proposed name
+pDestDoc->getIDocumentMarkAccess()->renameMark(pNewMark,
pMark->GetName());
+}
// copying additional attributes for bookmarks or fieldmarks
::sw::mark::IBookmark* const pNewBookmark =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - instsetoo_native/CustomTarget_install.mk
instsetoo_native/CustomTarget_install.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 229a7cdac952bbea8263bb24b93a2456fc1a1b51 Author: Andras Timar Date: Tue Jun 3 11:29:52 2014 +0200 Multilingual Mac OS X DMG for Collabora Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2 (cherry picked from commit 561581cd39022e82a0bc961be7c2406dfb1b94f3) (cherry picked from commit 32e13ccac6422a96df47aca868e263db94cd) diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 0fb97da..bf23eb0 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -111,7 +111,7 @@ ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk endif else # LIBO_TEST_INSTALL - $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT)) + $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT MACOSX,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT)) ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT)) endif @@ -119,7 +119,7 @@ ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS))) $(foreach lang,$(gb_HELP_LANGS),\ $(call instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT))) endif -ifneq (WNT,$(OS)) +ifeq (,$(filter WNT MACOSX,$(OS))) $(foreach lang,$(instsetoo_native_WITH_LANG),\ $(call instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT))) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 4 commits - configure.ac download.lst external/more_fonts instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_
Makefile.fetch |1
configure.ac|2
download.lst|1
external/more_fonts/ExternalPackage_karla.mk| 19
external/more_fonts/Module_more_fonts.mk|2
external/more_fonts/UnpackedTarball_karla.mk| 14
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt | 10
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt | 10
instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt | 10
instsetoo_native/util/openoffice.lst.in | 14
postprocess/CustomTarget_registry.mk|2
readlicense_oo/Package_files.mk |4
readlicense_oo/license/EULA.odt |binary
readlicense_oo/license/EULA_en-US.rtf | 94
readlicense_oo/license/LICENSE | 26
readlicense_oo/license/LICENSE.fodt | 1258 -
readlicense_oo/license/LICENSE.html |10236
+-
scp2/source/ooo/common_brand.scp| 13
scp2/source/ooo/file_font_ooo.scp |3
scp2/source/ooo/module_hidden_ooo.scp |1
solenv/bin/modules/installer/windows/idtglobal.pm |2
21 files changed, 10875 insertions(+), 847 deletions(-)
New commits:
commit 63f4de72939a506c04d7f1b274e9c8fa09c4bb25
Author: Andras Timar
Date: Fri Apr 18 02:16:38 2014 -0700
Collabora Office EULA
Conflicts:
readlicense_oo/Package_files.mk
Change-Id: Ia380db465f5094216cb36526f6cc178043376356
(cherry picked from commit 2e8f1c8598c34a5cf0779f23fe66091115fa0fc6)
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 73f437c..1fa898d 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -9,7 +9,7 @@ Globals
REFERENCEOOOMAJORMINOR 4.1
WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@
UNIXBASISROOTNAME
libreoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
-HIDELICENSEDIALOG 1
+HIDELICENSEDIALOG 0
PACKAGEPREFIX
BASISPACKAGEPREFIX libobasis
UREPACKAGEPREFIX libreoffice
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 1f06bdd..1fa672d 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -17,11 +17,15 @@ endif
ifneq ($(OS),MACOSX)
$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,EULA.odt,EULA.odt))
+$(eval $(call
gb_Package_add_file,readlicense_oo_files,EULA_en-US.rtf,EULA_en-US.rtf))
$(eval $(call
gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.fodt))
$(eval $(call
gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
$(eval $(call
gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
else
$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE))
+$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/EULA.odt,EULA.odt))
+$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/EULA_en-US.rtf,EULA_en-US.rtf))
$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.fodt,LICENSE.fodt))
$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.html,LICENSE.html))
diff --git a/readlicense_oo/license/EULA.odt b/readlicense_oo/license/EULA.odt
new file mode 100644
index 000..6f888e9
Binary files /dev/null and b/readlicense_oo/license/EULA.odt differ
diff --git a/readlicense_oo/license/EULA_en-US.rtf
b/readlicense_oo/license/EULA_en-US.rtf
new file mode 100644
index 000..505a644
--- /dev/null
+++ b/readlicense_oo/license/EULA_en-US.rtf
@@ -0,0 +1,94 @@
+{\rtf1\ansi\ansicpg1250\deff0\deflang1038{\fonttbl{\f0\fnil\fprq8\fcharset0
Arial, Arial;}{\f1\fnil\fcharset0 Calibri;}}
+{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;\red51\green51\blue51;}
+{\*\generator Msftedit
5.41.21.2510;}\viewkind4\uc1\pard\qj\cf1\lang1169\b\f0\fs28 End User License
and Subscription Agreement\par
+\pard\qj Collabora Office (\ldblquote Software\rdblquote )\par
+\cf0\b0\f1\fs22\par
+\par
+\cf1\b\f0\fs20 An individual acting on their own behalf or on behalf of any
corporate entity which employs them or which they represent (\ldblquote an
Organisation\rdblquote ) represents that he or she has the authority to enter
into this
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - icon-themes/sifr
dev/null |binary 1 file changed New commits: commit acc6c9989fd942be3ec8e791ed1da45ec8e3afd4 Author: Adolfo Jayme Barrientos Date: Sat Jun 11 04:37:55 2016 -0500 tdf#83455 Remove color-inverted line images from Sifr Change-Id: I3cee31526c0789e059730f303250eae0e79bf166 (cherry picked from commit ffac8e3a483c84de2961784fceac2b21aa39a18c) Reviewed-on: https://gerrit.libreoffice.org/26183 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/icon-themes/sifr/svx/res/symphony/line1.png b/icon-themes/sifr/svx/res/symphony/line1.png deleted file mode 100644 index 5c68c66..000 Binary files a/icon-themes/sifr/svx/res/symphony/line1.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line10.png b/icon-themes/sifr/svx/res/symphony/line10.png deleted file mode 100644 index f958ffb..000 Binary files a/icon-themes/sifr/svx/res/symphony/line10.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line2.png b/icon-themes/sifr/svx/res/symphony/line2.png deleted file mode 100644 index 9b04e93..000 Binary files a/icon-themes/sifr/svx/res/symphony/line2.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line3.png b/icon-themes/sifr/svx/res/symphony/line3.png deleted file mode 100644 index 7d38e2c..000 Binary files a/icon-themes/sifr/svx/res/symphony/line3.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line4.png b/icon-themes/sifr/svx/res/symphony/line4.png deleted file mode 100644 index 6869638..000 Binary files a/icon-themes/sifr/svx/res/symphony/line4.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line5.png b/icon-themes/sifr/svx/res/symphony/line5.png deleted file mode 100644 index 0a7357d..000 Binary files a/icon-themes/sifr/svx/res/symphony/line5.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line6.png b/icon-themes/sifr/svx/res/symphony/line6.png deleted file mode 100644 index 2cf84cf..000 Binary files a/icon-themes/sifr/svx/res/symphony/line6.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line7.png b/icon-themes/sifr/svx/res/symphony/line7.png deleted file mode 100644 index 754b098..000 Binary files a/icon-themes/sifr/svx/res/symphony/line7.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line8.png b/icon-themes/sifr/svx/res/symphony/line8.png deleted file mode 100644 index 3ea181f..000 Binary files a/icon-themes/sifr/svx/res/symphony/line8.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line9.png b/icon-themes/sifr/svx/res/symphony/line9.png deleted file mode 100644 index e75c210..000 Binary files a/icon-themes/sifr/svx/res/symphony/line9.png and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - scp2/source
scp2/source/ooo/file_font_ooo.scp |2 ++ 1 file changed, 2 insertions(+) New commits: commit b55c5c4aef74dd05acd1f0d84c49067667dfc611 Author: Andras Timar Date: Thu Oct 24 16:29:23 2013 +0200 disable Liberation fonts on Windows Change-Id: Ief9ee02f78f08a3002cc3ced3b9da80fc855aeef (cherry picked from commit 88e971fe680b5509e749f5ff74e0d5098769) diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 3ff8daa..618b7b6 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -36,9 +36,11 @@ STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" ) // DejaVu fonts STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist") +#ifndef WNT // fdo#62764 - Libreration fonts reportedly cause BSOD on Win7 SP1 // Liberation fonts STD_FONT_FILELIST(gid_File_Fnt_LibSansNarrow, "fonts_liberation_narrow.filelist") STD_FONT_FILELIST(gid_File_Fnt_Liberation, "fonts_liberation.filelist") +#endif // Gentium fonts STD_FONT_FILELIST(gid_File_Fnt_Gentium, "fonts_gentium.filelist") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
dev/null |binary 1 file changed New commits: commit ffac8e3a483c84de2961784fceac2b21aa39a18c Author: Adolfo Jayme Barrientos Date: Sat Jun 11 04:37:55 2016 -0500 tdf#83455 Remove color-inverted line images from Sifr Change-Id: I3cee31526c0789e059730f303250eae0e79bf166 diff --git a/icon-themes/sifr/svx/res/symphony/line1.png b/icon-themes/sifr/svx/res/symphony/line1.png deleted file mode 100644 index 5c68c66..000 Binary files a/icon-themes/sifr/svx/res/symphony/line1.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line10.png b/icon-themes/sifr/svx/res/symphony/line10.png deleted file mode 100644 index f958ffb..000 Binary files a/icon-themes/sifr/svx/res/symphony/line10.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line2.png b/icon-themes/sifr/svx/res/symphony/line2.png deleted file mode 100644 index 9b04e93..000 Binary files a/icon-themes/sifr/svx/res/symphony/line2.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line3.png b/icon-themes/sifr/svx/res/symphony/line3.png deleted file mode 100644 index 7d38e2c..000 Binary files a/icon-themes/sifr/svx/res/symphony/line3.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line4.png b/icon-themes/sifr/svx/res/symphony/line4.png deleted file mode 100644 index 6869638..000 Binary files a/icon-themes/sifr/svx/res/symphony/line4.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line5.png b/icon-themes/sifr/svx/res/symphony/line5.png deleted file mode 100644 index 0a7357d..000 Binary files a/icon-themes/sifr/svx/res/symphony/line5.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line6.png b/icon-themes/sifr/svx/res/symphony/line6.png deleted file mode 100644 index 2cf84cf..000 Binary files a/icon-themes/sifr/svx/res/symphony/line6.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line7.png b/icon-themes/sifr/svx/res/symphony/line7.png deleted file mode 100644 index 754b098..000 Binary files a/icon-themes/sifr/svx/res/symphony/line7.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line8.png b/icon-themes/sifr/svx/res/symphony/line8.png deleted file mode 100644 index 3ea181f..000 Binary files a/icon-themes/sifr/svx/res/symphony/line8.png and /dev/null differ diff --git a/icon-themes/sifr/svx/res/symphony/line9.png b/icon-themes/sifr/svx/res/symphony/line9.png deleted file mode 100644 index e75c210..000 Binary files a/icon-themes/sifr/svx/res/symphony/line9.png and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/isleapyear.fods | 993 + 1 file changed, 993 insertions(+) New commits: commit fedd019fb2fb9c970ac550177e0f7ac238e73e95 Author: ZdenÄk Crhonek Date: Thu Jun 9 18:42:27 2016 +0200 add ISLEAPYEAR test case Change-Id: I439fc530250598b201d99ef20f64604ebbdf7263 Reviewed-on: https://gerrit.libreoffice.org/26126 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/isleapyear.fods b/sc/qa/unit/data/functions/fods/isleapyear.fods new file mode 100644 index 000..3bb1d04 --- /dev/null +++ b/sc/qa/unit/data/functions/fods/isleapyear.fods @@ -0,0 +1,993 @@ + + +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"> + 2016-06-09T18:41:04.909912512P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/86d84ae4bba0d4c45bc13232645318291a8aed75 + + + 0 + 0 + 25779 + 12192 + + + view1 + + + 2 + 8 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + 0 + 7 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + Sheet2 + 1241 + 0 + 100 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + cs + CZ + + + + + + en + US + + + + + + true + true + 3 + 1 + true + 1 + true + jQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg== + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + + + + + ( + + ) + + + + + + + + ( + + ) + + + + £ + + + + + - + £ + + + + + + £ + + + + + - + £ + + +
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/eomonth.fods | 998 1 file changed, 998 insertions(+) New commits: commit 2392ffcc128487e0711e33edf850b058f8ea749d Author: ZdenÄk Crhonek Date: Thu Jun 9 18:12:09 2016 +0200 add EOMONTH test case Change-Id: Ia0dfb7ad1b2aebb604b7ed62a197fdb8dcd9f5ad Reviewed-on: https://gerrit.libreoffice.org/26124 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/eomonth.fods b/sc/qa/unit/data/functions/fods/eomonth.fods new file mode 100644 index 000..7185933 --- /dev/null +++ b/sc/qa/unit/data/functions/fods/eomonth.fods @@ -0,0 +1,998 @@ + + +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"> + 2016-06-09T18:11:18.316353292P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/86d84ae4bba0d4c45bc13232645318291a8aed75 + + + 0 + 0 + 25779 + 12389 + + + view1 + + + 2 + 8 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + 4 + 15 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + Sheet1 + 1241 + 0 + 100 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + cs + CZ + + + + + + en + US + + + + + + true + true + 3 + 1 + true + 1 + true + jQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg== + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + + + + + ( + + ) + + + + + + + + ( + + ) + + + + £ + + + + + - + £ + + + + + + £ + + + + + - + £ + + + + + +
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 14 commits - avmedia/source chart2/source filter/source include/filter include/svtools include/svx include/vcl readlicense_oo/license
avmedia/source/framework/mediaplayer.cxx|9 chart2/source/controller/main/ChartWindow.cxx |2 chart2/source/view/main/ChartView.cxx |4 filter/source/msfilter/svdfppt.cxx |1 include/filter/msfilter/svdfppt.hxx |4 include/svtools/treelistentry.hxx |1 include/svx/svdotable.hxx |2 include/vcl/openglwin.hxx |6 readlicense_oo/license/CREDITS.fodt | 3034 sc/inc/orcusxml.hxx |5 sc/source/core/data/dpresfilter.cxx | 18 sc/source/filter/orcus/xmlcontext.cxx | 27 sc/source/ui/cctrl/checklistmenu.cxx| 135 - sc/source/ui/inc/checklistmenu.hxx | 44 sc/source/ui/miscdlgs/solverutil.cxx| 35 sd/qa/unit/tiledrendering/data/table-column.odp |binary sd/qa/unit/tiledrendering/tiledrendering.cxx| 89 svx/source/table/svdotable.cxx | 40 svx/source/table/tablecolumn.cxx|9 svx/source/table/tablecolumn.hxx|5 svx/source/table/tablelayouter.cxx | 29 svx/source/table/tablelayouter.hxx |2 svx/source/table/tablemodel.cxx |7 svx/source/table/tablemodel.hxx |2 svx/source/table/tableundo.cxx |3 sw/qa/extras/rtfimport/data/tdf50821.rtf| 10 sw/qa/extras/rtfimport/rtfimport.cxx|8 sw/source/core/layout/frmtool.cxx |2 unotools/source/config/historyoptions.cxx | 37 vcl/inc/unx/gtk/gtkframe.hxx|1 vcl/source/window/menufloatingwindow.cxx|6 vcl/source/window/openglwin.cxx | 46 vcl/unx/gtk3/gtk3gtkframe.cxx | 78 writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 34 files changed, 2052 insertions(+), 1653 deletions(-) New commits: commit 88c3ed5c2d017df572f5a5c90d17fcfb3507804b Author: Caolán McNamara Date: Thu Jun 9 17:02:14 2016 +0100 Resolves: tdf#100248 vcl menu scroll timer still active post dispose Change-Id: I8988a42e7e505c967661c4a5f3c1e4ef3fbc08e0 (cherry picked from commit f89b9d8b8064a2f323f5b3362f88cb873bad8fcc) (cherry picked from commit 7def34c0f013b0c9ac1b8ee39e800577bfa800e7) Reviewed-on: https://gerrit.libreoffice.org/26125 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 11ca1ad43cc2def184ff7629e3880ccab6b8a1f1) diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 2128f08..1cb95ed 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -100,6 +100,12 @@ void MenuFloatingWindow::doShutdown() } pMenu = nullptr; RemoveEventListener( LINK( this, MenuFloatingWindow, ShowHideListener ) ); + +aScrollTimer.Stop(); +aSubmenuCloseTimer.Stop(); +aSubmenuCloseTimer.Stop(); +aHighlightChangedTimer.Stop(); +aHighlightChangedTimer.Stop(); } } commit bcda6e863371792f48d46f035b04512f2fa04123 Author: Caolán McNamara Date: Thu Jun 9 11:48:19 2016 +0100 Resolves: rhbz#1344042 deb#826654 scale gtk3 smooth scaling events... to give traditional amounts of scroll on a single mouse wheel event ditch non smooth scroll events now seeing as apparently they are always available so the other types are irrelevent now if we get x and y scroll, then like macosx just dispatch x and y scroll events. Note: there seems to be a bug in the stack below us where the first scroll event after getting focus is one of a 0 x and y delta. Because we now check x and y against 0, we don't launch a scroll event in the case of a 0x0 scroll which stops us occasionally appearing to go backwards on the first scroll after getting focus. Which is the same thing I see on e.g. gedit, the first mouse wheel scroll after getting focus doesn't actually do anything. (cherry picked from commit 0159ef4fbfd23ba97b20f97eb0677564bebd4ee7) (cherry picked from commit 23ba7c6c05d6331815a05a01d657f5e30b3bc252) Change-Id: Iec8f2e4627cd84e3896270a0847a5c4907fa083f reported abs narrowing complaint Change-Id: Icd27fea97e720607263e5f8a2d233c462f979e1b (cherry picked from commit f75ead4293d3b9d63f2596d66c411c44c0c70f38) (cherry picked from commit 6ad72c9c613766aabc15abaa676f5647b724b12b) Reviewed-on: https://gerrit.libreoffice.org/26101 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit d0ccf67442a14a1d48435954865c42af744a5117) diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 1d8334c..eaa222f 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' -
0 files changed New commits: commit 9c90feeb3197b1e3d91b6dab96860cae6c22f1bd Author: Krunoslav Å ebetiÄ Date: Sun Apr 3 22:56:44 2016 +0200 Updated core Project: dictionaries 32be870d73b57f67697faf1f872e5cce7c9f38f1 Update Croatian dictionary - Corrected few words, added part of the speech, replaced some incomplete classes. - Added new author - Large update of AFF-file It was necessary to restructure the file to be able to do regular and systematic updates. Added new sections like ICONV, updated REP section, added quite a few sfx classes and more. - Changed 'Version value' field to 2016.04.03. Change-Id: I6d17729f52f4204e93342a35bfbcb60cdf8ce414 Reviewed-on: https://gerrit.libreoffice.org/23845 Reviewed-by: Kruno Reviewed-by: David Tardon Tested-by: David Tardon (cherry picked from commit de93f4fc07eba5fac0ae40bb45cc8e6acb331743) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'distro/collabora/cp-5.1'
New branch 'distro/collabora/cp-5.1' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' -
0 files changed New commits: commit f514745faf82acbca33d1727dad29749da28bda0 Author: Christian Lohmaier Date: Sat Apr 16 21:33:28 2016 +0200 Updated core Project: help 0115dc3ebecd36362fc6a1082738a5c8506c2ba9 remove doubled + in switchinline via pootle-feedback Change-Id: I9fcee24ad480d35a42fbcea00e4881ebbfa968dd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-5.1' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'distro/collabora/cp-5.1'
New branch 'distro/collabora/cp-5.1' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'distro/collabora/cp-5.1' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' -
0 files changed New commits: commit dd985a3934c859dd5b81652130e56430d5ceb153 Author: Christian Lohmaier Date: Tue May 31 23:40:28 2016 +0200 Updated core Project: translations 0e263bb2844639929901eec6d9643ba036a08a87 update translations for 5.1.4 rc1 and force-fix errors using pocheck Change-Id: Ie5bedb80db908a0279c44ed20b83dc93c4f63136 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'distro/collabora/cp-5.1'
New branch 'distro/collabora/cp-5.1' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-5.1' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
