[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/inc sc/source
sc/inc/document.hxx |2 -
sc/source/filter/excel/xeescher.cxx | 57 +++-
2 files changed, 51 insertions(+), 8 deletions(-)
New commits:
commit 5d1ab09936040689b96fc724d4ada13385131a55
Author: Noel Grandin
Date: Mon Nov 30 14:50:14 2015 +0200
tdf#8 - FILESAVE: Saving an XLSX file freezes Calc
Change-Id: I7abbb1cc5056f33458257afe28ed933e2d3c378d
(cherry picked from commit 343e405f18a51abd6d386072ad33978fa83b8b31)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 781db63..4720d34 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -693,7 +693,7 @@ public:
voidSetPendingRowHeights( SCTAB nTab, bool bSet );
SC_DLLPUBLIC void SetLayoutRTL( SCTAB nTab, bool bRTL );
SC_DLLPUBLIC bool IsLayoutRTL( SCTAB nTab ) const;
-boolIsNegativePage( SCTAB nTab ) const;
+SC_DLLPUBLIC bool IsNegativePage( SCTAB nTab ) const;
SC_DLLPUBLIC void SetScenario( SCTAB nTab, bool bFlag );
SC_DLLPUBLIC bool IsScenario( SCTAB nTab ) const;
SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, OUString& rComment,
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index cbaf7c2..6e04a38 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -159,15 +159,15 @@ static void lcl_WriteAnchorVertex(
sax_fastparser::FSHelperPtr rComments, Rectan
static void lcl_GetFromTo( const XclExpRoot& rRoot, const Rectangle &aRect,
sal_Int32 nTab, Rectangle &aFrom, Rectangle &aTo )
{
-bool bTo = false;
sal_Int32 nCol = 0, nRow = 0;
sal_Int32 nColOff = 0, nRowOff= 0;
-while(true)
+const bool bRTL = rRoot.GetDocRef().IsNegativePage( nTab );
+if (!bRTL)
{
-Rectangle r = rRoot.GetDocRef().GetMMRect( nCol,nRow,nCol,nRow,nTab );
-if( !bTo )
+while(true)
{
+Rectangle r = rRoot.GetDocRef().GetMMRect(
nCol,nRow,nCol,nRow,nTab );
if( r.Left() <= aRect.Left() )
{
nCol++;
@@ -182,11 +182,38 @@ static void lcl_GetFromTo( const XclExpRoot& rRoot, const
Rectangle &aRect, sal_
{
aFrom = Rectangle( nCol-1, static_cast(HMM2XL( nColOff
)),
nRow-1, static_cast(HMM2XL( nRowOff
)) );
-bTo=true;
+break;
}
}
-if( bTo )
+}
+else
+{
+while(true)
{
+Rectangle r = rRoot.GetDocRef().GetMMRect(
nCol,nRow,nCol,nRow,nTab );
+if( r.Left() >= aRect.Left() )
+{
+nCol++;
+nColOff = r.Left() - aRect.Left();
+}
+if( r.Top() <= aRect.Top() )
+{
+nRow++;
+nRowOff = aRect.Top() - r.Top();
+}
+if( r.Left() < aRect.Left() && r.Top() > aRect.Top() )
+{
+aFrom = Rectangle( nCol-1, static_cast(HMM2XL( nColOff
)),
+ nRow-1, static_cast(HMM2XL( nRowOff
)) );
+break;
+}
+}
+}
+if (!bRTL)
+{
+while(true)
+{
+Rectangle r = rRoot.GetDocRef().GetMMRect(
nCol,nRow,nCol,nRow,nTab );
if( r.Right() < aRect.Right() )
nCol++;
if( r.Bottom() < aRect.Bottom() )
@@ -199,7 +226,23 @@ static void lcl_GetFromTo( const XclExpRoot& rRoot, const
Rectangle &aRect, sal_
}
}
}
-return;
+else
+{
+while(true)
+{
+Rectangle r = rRoot.GetDocRef().GetMMRect(
nCol,nRow,nCol,nRow,nTab );
+if( r.Right() >= aRect.Right() )
+nCol++;
+if( r.Bottom() < aRect.Bottom() )
+nRow++;
+if( r.Right() < aRect.Right() && r.Bottom() >= aRect.Bottom() )
+{
+aTo = Rectangle( nCol, static_cast(HMM2XL( r.Left() -
aRect.Right() )),
+ nRow, static_cast(HMM2XL(
aRect.Bottom() - r.Top() )));
+break;
+}
+}
+}
}
// Escher client anchor ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source
sc/source/ui/formdlg/dwfunctr.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 3d5f762b49253f4758824e883d1a429f09001b99
Author: Noel Grandin
Date: Tue Dec 1 08:32:58 2015 +0200
tdf#95990 - Calc is crashed when you double click on function in Sideba
The problem arises because we can dispose ourselves like so:
/home/noel/libo3/sc/source/ui/formdlg/dwfunctr.cxx:176
/home/noel/libo3/vcl/source/outdev/outdev.cxx:202
(this=0x252c548) at /home/noel/libo3/include/vcl/vclptr.hxx:206
(this=0x252c4c0) at
/home/noel/libo3/sfx2/source/sidebar/SidebarPanelBase.cxx:85
(this=0x252c4c0) at /home/noel/libo3/cppuhelper/source/implbase.cxx:109
cppu::WeakComponentImplHelper5::dispose (this=0x252c4c0) at
/home/noel/libo3/include/cppuhelper/compbase5.hxx:60
at /home/noel/libo3/sfx2/source/sidebar/Panel.cxx:88
/home/noel/libo3/vcl/source/outdev/outdev.cxx:202
(this=0x21dbbd0) at /home/noel/libo3/include/vcl/vclptr.hxx:206
(this=0x23c9a10, rPanels=std::__debug::vector of length 1, capacity 1 =
{...}) at /home/noel/libo3/sfx2/source/sidebar/Deck.cxx:205
(this=0x2068b00, rDeckId="ScFunctionsDeck") at
/home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:631
(this=0x2068b00, rDeckId="ScFunctionsDeck", bForceCreate=false)
at /home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:566
(this=0x2068b00, rDeckDescriptor=..., rContext=...) at
/home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:690
sfx2::sidebar::SidebarController::UpdateConfigurations (this=0x2068b00)
at /home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:500
sfx2::sidebar::SidebarController::notifyContextChangeEvent
(this=0x2068b00, rEvent=...) at
/home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:275
namespace)::ContextChangeEventMultiplexer::BroadcastEventToSingleContainer
(this=0x207bad0, rEventObject=...,
rxEventFocus=uno::Reference to (ScTabViewObj *) 0x1d9d120) at
/home/noel/libo3/framework/source/services/ContextChangeEventMultiplexer.cxx:286
namespace)::ContextChangeEventMultiplexer::broadcastContextChangeEvent
(this=0x207bad0, rEventObject=...,
rxEventFocus=uno::Reference to (ScTabViewObj *) 0x1d9d120) at
/home/noel/libo3/framework/source/services/ContextChangeEventMultiplexer.cxx:265
sfx2::sidebar::ContextChangeBroadcaster::BroadcastContextChange
(this=0x23f0e50, rxFrame=uno::Reference to ((anonymous namespace)::Frame
*) 0x17d1798,
rsModuleName="com.sun.star.sheet.SpreadsheetDocument",
rsContextName="EditCell") at
/home/noel/libo3/sfx2/source/sidebar/ContextChangeBroadcaster.cxx:99
sfx2::sidebar::ContextChangeBroadcaster::Activate (this=0x23f0e50,
rxFrame=uno::Reference to ((anonymous namespace)::Frame *) 0x17d1798)
at
/home/noel/libo3/sfx2/source/sidebar/ContextChangeBroadcaster.cxx:51
(this=0x2190490, bIsActivated=true) at
/home/noel/libo3/sfx2/source/control/shell.cxx:729
/home/noel/libo3/sfx2/source/control/shell.cxx:378
pFrame=0x1d5dea0, bMDI=true) at
/home/noel/libo3/sfx2/source/control/shell.cxx:331
/home/noel/libo3/sfx2/source/control/dispatch.cxx:1503
/home/noel/libo3/sfx2/source/control/dispatch.cxx:158
rShell=...) at /home/noel/libo3/sfx2/source/view/viewsh.cxx:1420
(this=0x1d61fe0, eOST=OST_Editing, bForce=false) at
/home/noel/libo3/sc/source/ui/view/tabvwsh4.cxx:809
pView=0x1d685c0, bActive=true) at
/home/noel/libo3/sc/source/ui/view/tabvwsh4.cxx:753
rBC=..., rHint=...) at
/home/noel/libo3/sc/source/ui/view/tabvwsh5.cxx:195
pEditEngine=0x20570d0, rCursorPos=...) at
/home/noel/libo3/sc/source/ui/docshell/docsh3.cxx:78
eNewMode=SC_INPUT_TABLE, pInitText=0x0) at
/home/noel/libo3/sc/source/ui/app/inputhdl.cxx:2339
eMode=SC_INPUT_TABLE, pInitText=0x0) at
/home/noel/libo3/sc/source/ui/app/scmod.cxx:1404
/home/noel/libo3/sc/source/ui/formdlg/dwfunctr.cxx:826
(this=0x23d29a0) at
/home/noel/libo3/sc/source/ui/formdlg/dwfunctr.cxx:962
(instance=0x23d29a0, data=...) at
/home/noel/libo3/sc/source/ui/formdlg/dwfunctr.cxx:960
data=...) at /home/noel/libo3/include/tools/link.hxx:84
(__closure=0x7fff3ec0) at
/home/noel/libo3/vcl/source/control/lstbox.cxx:973
ListBox::DoubleClick():: >::_M_invoke(const std::_Any_data &)
(__functor=...) at /usr/include/c++/5/functional:1871
(this=0x7fff3ec0) at /usr/include/c++/5/functional:2271
Control::ImplCallEventListenersAndHandler(unsigned long,
std::function) (this=0x23e6260, nEvent=1109, callHandler=...)
at /home/noel/libo3/vcl/source/control/ctrl.cxx:333
/home/noel/libo3/vcl/source/control/lstbox.cxx:973
at /home/noel/libo3/vcl/source/control/lstbox.cxx:294
(instance=0x23e6260, data=0x23fd160) at
/home/noel/libo3/vcl/source/control/lstbox.cxx:292
(this=0x23fd4a0, data=0x23fd160)
[Libreoffice-commits] core.git: sc/source
sc/source/ui/formdlg/dwfunctr.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit f34b4844473d08c0c264ba4453a875e32f5c326b
Author: Noel Grandin
Date: Tue Dec 1 08:32:58 2015 +0200
tdf#95990 - Calc is crashed when you double click on function in Sideba
The problem arises because we can dispose ourselves like so:
/home/noel/libo3/sc/source/ui/formdlg/dwfunctr.cxx:176
/home/noel/libo3/vcl/source/outdev/outdev.cxx:202
(this=0x252c548) at /home/noel/libo3/include/vcl/vclptr.hxx:206
(this=0x252c4c0) at
/home/noel/libo3/sfx2/source/sidebar/SidebarPanelBase.cxx:85
(this=0x252c4c0) at /home/noel/libo3/cppuhelper/source/implbase.cxx:109
cppu::WeakComponentImplHelper5::dispose (this=0x252c4c0) at
/home/noel/libo3/include/cppuhelper/compbase5.hxx:60
at /home/noel/libo3/sfx2/source/sidebar/Panel.cxx:88
/home/noel/libo3/vcl/source/outdev/outdev.cxx:202
(this=0x21dbbd0) at /home/noel/libo3/include/vcl/vclptr.hxx:206
(this=0x23c9a10, rPanels=std::__debug::vector of length 1, capacity 1 =
{...}) at /home/noel/libo3/sfx2/source/sidebar/Deck.cxx:205
(this=0x2068b00, rDeckId="ScFunctionsDeck") at
/home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:631
(this=0x2068b00, rDeckId="ScFunctionsDeck", bForceCreate=false)
at /home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:566
(this=0x2068b00, rDeckDescriptor=..., rContext=...) at
/home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:690
sfx2::sidebar::SidebarController::UpdateConfigurations (this=0x2068b00)
at /home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:500
sfx2::sidebar::SidebarController::notifyContextChangeEvent
(this=0x2068b00, rEvent=...) at
/home/noel/libo3/sfx2/source/sidebar/SidebarController.cxx:275
namespace)::ContextChangeEventMultiplexer::BroadcastEventToSingleContainer
(this=0x207bad0, rEventObject=...,
rxEventFocus=uno::Reference to (ScTabViewObj *) 0x1d9d120) at
/home/noel/libo3/framework/source/services/ContextChangeEventMultiplexer.cxx:286
namespace)::ContextChangeEventMultiplexer::broadcastContextChangeEvent
(this=0x207bad0, rEventObject=...,
rxEventFocus=uno::Reference to (ScTabViewObj *) 0x1d9d120) at
/home/noel/libo3/framework/source/services/ContextChangeEventMultiplexer.cxx:265
sfx2::sidebar::ContextChangeBroadcaster::BroadcastContextChange
(this=0x23f0e50, rxFrame=uno::Reference to ((anonymous namespace)::Frame
*) 0x17d1798,
rsModuleName="com.sun.star.sheet.SpreadsheetDocument",
rsContextName="EditCell") at
/home/noel/libo3/sfx2/source/sidebar/ContextChangeBroadcaster.cxx:99
sfx2::sidebar::ContextChangeBroadcaster::Activate (this=0x23f0e50,
rxFrame=uno::Reference to ((anonymous namespace)::Frame *) 0x17d1798)
at
/home/noel/libo3/sfx2/source/sidebar/ContextChangeBroadcaster.cxx:51
(this=0x2190490, bIsActivated=true) at
/home/noel/libo3/sfx2/source/control/shell.cxx:729
/home/noel/libo3/sfx2/source/control/shell.cxx:378
pFrame=0x1d5dea0, bMDI=true) at
/home/noel/libo3/sfx2/source/control/shell.cxx:331
/home/noel/libo3/sfx2/source/control/dispatch.cxx:1503
/home/noel/libo3/sfx2/source/control/dispatch.cxx:158
rShell=...) at /home/noel/libo3/sfx2/source/view/viewsh.cxx:1420
(this=0x1d61fe0, eOST=OST_Editing, bForce=false) at
/home/noel/libo3/sc/source/ui/view/tabvwsh4.cxx:809
pView=0x1d685c0, bActive=true) at
/home/noel/libo3/sc/source/ui/view/tabvwsh4.cxx:753
rBC=..., rHint=...) at
/home/noel/libo3/sc/source/ui/view/tabvwsh5.cxx:195
pEditEngine=0x20570d0, rCursorPos=...) at
/home/noel/libo3/sc/source/ui/docshell/docsh3.cxx:78
eNewMode=SC_INPUT_TABLE, pInitText=0x0) at
/home/noel/libo3/sc/source/ui/app/inputhdl.cxx:2339
eMode=SC_INPUT_TABLE, pInitText=0x0) at
/home/noel/libo3/sc/source/ui/app/scmod.cxx:1404
/home/noel/libo3/sc/source/ui/formdlg/dwfunctr.cxx:826
(this=0x23d29a0) at
/home/noel/libo3/sc/source/ui/formdlg/dwfunctr.cxx:962
(instance=0x23d29a0, data=...) at
/home/noel/libo3/sc/source/ui/formdlg/dwfunctr.cxx:960
data=...) at /home/noel/libo3/include/tools/link.hxx:84
(__closure=0x7fff3ec0) at
/home/noel/libo3/vcl/source/control/lstbox.cxx:973
ListBox::DoubleClick():: >::_M_invoke(const std::_Any_data &)
(__functor=...) at /usr/include/c++/5/functional:1871
(this=0x7fff3ec0) at /usr/include/c++/5/functional:2271
Control::ImplCallEventListenersAndHandler(unsigned long,
std::function) (this=0x23e6260, nEvent=1109, callHandler=...)
at /home/noel/libo3/vcl/source/control/ctrl.cxx:333
/home/noel/libo3/vcl/source/control/lstbox.cxx:973
at /home/noel/libo3/vcl/source/control/lstbox.cxx:294
(instance=0x23e6260, data=0x23fd160) at
/home/noel/libo3/vcl/source/control/lstbox.cxx:292
(this=0x23fd4a0, data=0x23fd160)
[Bug 54169] LibO doesn’t obey OS setting “only show the accelerator underline when the Alt key is being pressed”
https://bugs.documentfoundation.org/show_bug.cgi?id=54169 tommy27 changed: What|Removed |Added Version|4.4.0.0.alpha0+ Master |Inherited From OOo --- Comment #20 from tommy27 --- it's still reproducible under Win8.1 x64 using LibO 5.0.3.1 and recent LibO 5.1.0.0 daily build. accelerators underlines are always shown even if the "hide accelerators until Alt key is pressed" option is set. see: http://bit.ly/1Iyej2O anyway this has always been like that since I see the same behaviour in LibO 3.3.3, OOo 3.3.0 and AOO 4.1.0 so the bug is inherited from OOo. updating version field. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/com
wizards/com/sun/star/wizards/db/FieldColumn.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d46d79f2261eb6be2fb74254f09520f5ef2baa88
Author: Damjan Jovanovic
Date: Tue Dec 1 03:42:43 2015 +
Calculate substring indexes properly, avoiding an unnecessary
IndexOutOfBoundsException.
Patch by: me
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java
b/wizards/com/sun/star/wizards/db/FieldColumn.java
index 7a44f86..a33af66 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -138,7 +138,7 @@ public class FieldColumn
*/
private String getOnlyFieldName(String _DisplayFieldName, String
_CommandName)
{
-return _DisplayFieldName.substring(_CommandName.length() + 1,
_DisplayFieldName.length());
+return _DisplayFieldName.substring(_CommandName.length() + 1);
}
public static String composeDisplayFieldName(String _sCommandName, String
_sFieldName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'feature/calc-rowcolumn-selection'
New branch 'feature/calc-rowcolumn-selection' available with the following commits: commit 264761ca18406b414080ccae31554b8ea1128dfd Author: Andrzej Hunt Date: Mon Nov 30 12:15:52 2015 -0800 loleaflet: add column/row-header selection support commit b45e3fa5becf8fcbf106cb6b944c8f4709563d43 Author: Andrzej Hunt Date: Mon Nov 30 12:14:33 2015 -0800 loolwsd: add support for postMouseEvent's targetwindow commit 49cddd1efb93d8f03a1696f64cf79f96839e1d6b Author: Andrzej Hunt Date: Mon Nov 30 12:15:07 2015 -0800 loolwsd: update bundled headers ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/saveasmenucontroller.cxx | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 5a3b930b30149fbcaac246726a0f547527161429
Author: Maxim Monastirsky
Date: Tue Dec 1 00:48:55 2015 +0200
Save Remote File isn't supported in all modules
so don't add it there to the save dropdown.
Change-Id: Iee604cc15616080266f7192ac451f04830ba1bb8
diff --git a/framework/source/uielement/saveasmenucontroller.cxx
b/framework/source/uielement/saveasmenucontroller.cxx
index 2f42146..5c9a934 100644
--- a/framework/source/uielement/saveasmenucontroller.cxx
+++ b/framework/source/uielement/saveasmenucontroller.cxx
@@ -83,7 +83,19 @@ void SaveAsMenuController::impl_setPopupMenu()
if ( pVCLPopupMenu )
{
pVCLPopupMenu->InsertItem( ".uno:SaveAs", m_xFrame );
-pVCLPopupMenu->InsertItem( ".uno:SaveAsRemote", m_xFrame );
+
+// Add Save Remote File command only where it's supported.
+css::uno::Reference< css::frame::XDispatchProvider >
xDispatchProvider( m_xFrame, css::uno::UNO_QUERY );
+if ( xDispatchProvider.is() )
+{
+css::util::URL aTargetURL;
+aTargetURL.Complete = ".uno:SaveAsRemote";
+m_xURLTransformer->parseStrict( aTargetURL );
+
+css::uno::Reference< css::frame::XDispatch > xDispatch(
xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ) );
+if ( xDispatch.is() )
+pVCLPopupMenu->InsertItem( aTargetURL.Complete, m_xFrame );
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - framework/source
framework/source/services/autorecovery.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 85a4677c201c3957db55ddd66506526d908e7947 Author: Stephan Bergmann Date: Mon Nov 30 11:38:21 2015 +0100 rhbz#1286416: Be more resilient during auto-recovery attempts ...called from within the signal handler, so any bets are off Change-Id: Iedb5c7bc8d08350e5f3e3118c6713f5c25b238b6 (cherry picked from commit 9b3ca276dae6f8d4f337c78e64ed6b7f7e7662ef) Reviewed-on: https://gerrit.libreoffice.org/20282 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 8b75271..b05fdc3 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2480,6 +2480,8 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame return; css::uno::Reference< css::frame::XFrame > xFrame = xController->getFrame(); +if (!xFrame.is()) +return; css::uno::Reference< css::frame::XDesktop > xDesktop (xFrame->getCreator(), css::uno::UNO_QUERY); if (!xDesktop.is()) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 754990128f19e3279a3b06bc768ea2954621
Author: Caolán McNamara
Date: Mon Nov 30 16:42:15 2015 +
gtk3: implement GetIndicatorState
(cherry picked from commit 503864037b2f6b73979f46d11df5d365b81f9dcf)
(cherry picked from commit 6408b735283751cf6cacb8c758b99a2d90a9868a)
Change-Id: I006c739a9dc876dd9ec83375f76fd1343b39557a
Reviewed-on: https://gerrit.libreoffice.org/20312
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index a28c144..0e58788 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -3047,8 +3047,19 @@ KeyIndicatorState GtkSalFrame::GetIndicatorState()
#if !GTK_CHECK_VERSION(3,0,0)
return GetGtkSalData()->GetGtkDisplay()->GetIndicatorState();
#else
-g_warning ("missing get indicator state");
-return KeyIndicatorState::NONE;
+KeyIndicatorState nState = KeyIndicatorState::NONE;
+
+GdkKeymap *pKeyMap = gdk_keymap_get_for_display(getGdkDisplay());
+
+if (gdk_keymap_get_caps_lock_state(pKeyMap))
+nState |= KeyIndicatorState::CAPSLOCK;
+if (gdk_keymap_get_num_lock_state(pKeyMap))
+nState |= KeyIndicatorState::NUMLOCK;
+#if GTK_CHECK_VERSION(3,18,0)
+if (gdk_keymap_get_scroll_lock_state(pKeyMap))
+nState |= KeyIndicatorState::SCROLLLOCK;
+#endif
+return nState;
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/headless
vcl/headless/svpgdi.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 81aeddfd6ae6f760fd11d73091b5891882dc1d62 Author: Caolán McNamara Date: Mon Nov 30 15:29:03 2015 + gtk3: glitches because yours truly cannot tell x from y (cherry picked from commit 2ca429e781cba94608e9838e2c1c50f1e8632b90) (cherry picked from commit 9401a065d0d53b31427f85a936ef53244ac8a6b8) Change-Id: I3b8620a4d8bffeb5e0558c35cb3a063238c12ba5 Reviewed-on: https://gerrit.libreoffice.org/20311 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 06030d9..cc4baab 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -144,11 +144,11 @@ namespace double x1, y1, x2, y2; cairo_clip_extents(cr, &x1, &y1, &x2, &y2); -extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1; +extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1; cairo_region_t *region = cairo_region_create_rectangle(&extents); cairo_fill_extents(cr, &x1, &y1, &x2, &y2); -extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1; +extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1; cairo_region_intersect_rectangle(region, &extents); cairo_region_get_extents(region, &extents); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |4 1 file changed, 4 deletions(-) New commits: commit e7c78e67292ad93c6a4a0772d8b06a0e6e7d26c8 Author: Paolo Bernardi Date: Mon Nov 30 15:43:27 2015 +0100 Removed unused code found by cppcheck Change-Id: I495c40af12a0f16b7f1b13736405489677b582af Reviewed-on: https://gerrit.libreoffice.org/20304 Tested-by: Jenkins Reviewed-by: Riccardo Magliocchetti diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 019d6e0..430be20 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1532,10 +1532,6 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt // creating SdrCustomShapeGeometryItem typedef std::vector< beans::PropertyValue > PropVec; -typedef PropVec::iterator PropVecIter; -PropVecIter aIter; -PropVecIter aEnd; - // aPropVec will be filled with all PropertyValues PropVec aPropVec; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpgdi.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bd781238696d99c2c9c7378c28435f08c3adf451
Author: Caolán McNamara
Date: Mon Nov 30 20:20:12 2015 +
my intent is to provide a define for cairo < 1.10.0
Change-Id: Ib102b257aa9bf183409c1ab99f61ee63d653cbed
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index f79fd0b..622c3d2 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -64,10 +64,10 @@ rDevice
#endif
}
-#define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
-
#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
+#define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
+
struct cairo_rectangle_int_t
{
double x;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/36b658d38930b8aca7e16f7a6b286ca1b3e7a215/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) New commits: commit cd8a295444690b9c0dfb43ee4de01bf6ffeb1aa1 Author: Stephan Bergmann Date: Mon Nov 30 20:16:53 2015 +0100 loplugin:vclwidgets Change-Id: I520e27de82f11cc3c44c0e059ad60f3edaa4c370 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 49a1ef1..c6da34c 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1566,12 +1566,14 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/, if (!aSearchedFontName.equals(aFontName.toUtf8().getStr())) continue; -VirtualDevice aDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT); +auto aDevice( +VclPtr::Create( +nullptr, Size(1, 1), DeviceFormat::DEFAULT)); ::Rectangle aRect; vcl::Font aFont(rInfo); aFont.SetSize(Size(0, 25)); -aDevice.SetFont(aFont); -aDevice.GetTextBoundRect(aRect, aFontName); +aDevice->SetFont(aFont); +aDevice->GetTextBoundRect(aRect, aFontName); int nFontWidth = aRect.BottomRight().X() + 1; *pFontWidth = nFontWidth; int nFontHeight = aRect.BottomRight().Y() + 1; @@ -1581,11 +1583,11 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/, memset(pBuffer, 0, nFontWidth * nFontHeight * 4); boost::shared_array aBuffer(pBuffer, NoDelete< sal_uInt8 >()); -aDevice.SetBackground(Wallpaper(COL_TRANSPARENT)); -aDevice.SetOutputSizePixelScaleOffsetAndBuffer( +aDevice->SetBackground(Wallpaper(COL_TRANSPARENT)); +aDevice->SetOutputSizePixelScaleOffsetAndBuffer( Size(nFontWidth, nFontHeight), Fraction(1.0), Point(), aBuffer, nullptr); -aDevice.DrawText(Point(0,0), aFontName); +aDevice->DrawText(Point(0,0), aFontName); return pBuffer; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/backtrace.c |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 5adaf30d7403dab3f81f2efc457bfb78e0e49f7b
Author: Stephan Bergmann
Date: Mon Nov 30 20:05:58 2015 +0100
Fix Mac build
Change-Id: I3ec80e4a64c98b97ab3157dd37614a7c56802d79
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 340b507..a8177e6 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -209,8 +209,6 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
#include
#include "backtrace.h"
-typedef unsigned ptrdiff_t;
-
/* glib backtrace is only available on MacOsX 10.5 or higher
so we do it on our own */
@@ -251,12 +249,12 @@ void backtrace_symbols_fd( void **buffer, int size, int
fd )
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+fprintf( fp, "%s+0x%tx", dli.dli_fname, offset );
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+fprintf( fp, "(%s+0x%tx)", dli.dli_sname, offset );
}
}
fprintf( fp, "[0x%x]\n", (unsigned int)*pFramePtr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sysui/desktop
sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml| 17 ++ sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml| 16 + sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml| 17 ++ sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml | 16 + sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml | 17 ++ 5 files changed, 53 insertions(+), 30 deletions(-) New commits: commit 35d929f42b074a75eb344b623ea74e548ca72fb0 Author: Rene Engelhard Date: Mon Nov 30 18:16:42 2015 +0100 fix/update AppData files - make XML tags follow (uptodate) spec 18:23 libreoffice-draw.desktop => libreoffice-draw.desktop 18:23 => - fix license - add working url/screenshot URLs diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml index 8c6390c..6338a37 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml @@ -1,7 +1,9 @@ - -libreoffice-base.desktop -CC0 + +libreoffice-base.desktop +MPL-2.0 +LibreOffice Base +database manaager part of the LibreOffice productivity suite Base is a powerful database manager, part of the LibreOffice productivity suite. @@ -22,9 +24,12 @@ In addition, the built-in support for JDBC- and ODBC-standard drivers allows you to connect to virtually any other existing database engine as well. -http://www.libreoffice.org/features/base/ +http://www.libreoffice.org/discover/base/ -http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Base/Screenshot-87.png +http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png +http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-80.png +The Document Foundation +The Document Foundation libreoffice_at_lists.freedesktop.org - + diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml index 7652fa4..b8beb71 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml @@ -1,7 +1,9 @@ - -libreoffice-calc.desktop -CC0 + +libreoffice-calc.desktop +MPL-2.0 +LibreOffice Calc +spreadsheet program of the LibreOffice productivity suite Calc is a powerful and extensible spreadsheet program, part of the LibreOffice @@ -16,9 +18,11 @@ can easily share spreadsheets with users of other popular office suites without worrying about compatibility. -http://www.libreoffice.org/features/calc/ +http://www.libreoffice.org/discover/calc/ -http://en.wikipedia.org/wiki/File:LibreOffice_Calc_4.0.1_screenshot.png +http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png +The Document Foundation +The Document Foundation libreoffice_at_lists.freedesktop.org - + diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml index 0bb1fb7..2868598 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml @@ -1,7 +1,9 @@ - -libreoffice-draw.desktop -CC0 + +libreoffice-draw.desktop +MPL-2.0 +LibreOffice Draw +graphics editor part of the LibreOffice productivity suite LibreOffice Draw is an easy-to-use graphics editor, which empowers you to create @@ -21,9 +23,12 @@ can easily share drawings with users of other popular office suites without worrying about compatibility. -http://www.libreoffice.org/features/draw/ +http://www.libreoffice.org/discover/draw/ -http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Draw/Screenshot-68.png +http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png +http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-03-Square-fdo75097.png +The Document Foundation +The Document Foundation libreoffice_at_lists.freedesktop.org - + diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml index 04f8ffb..ccb0e92 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml @@ -1,7 +1,9 @@ - -libreoffice-impress.desktop -CC0 + +libreoffice-impress.desktop +MPL-2.0 +LibreOffice Impress +presentation program of the LibreOffice productivity suite Impress is a presentation program and part of the LibreOffice productivity suite. @@ -17,9 +19,11 @@ can easily share presentations with users of other popular office suites without worrying about compatibility. -http://www.libreoffice.org/feat
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml| 17 ++ sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml| 16 + sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml| 17 ++ sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml | 16 + sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml | 17 ++ 5 files changed, 53 insertions(+), 30 deletions(-) New commits: commit 4a2dc0e4b0fcd0ce0f1c1013f927e94621429da6 Author: Rene Engelhard Date: Mon Nov 30 18:16:42 2015 +0100 fix/update AppData files - make XML tags follow (uptodate) spec 18:23 libreoffice-draw.desktop => libreoffice-draw.desktop 18:23 => - fix license - add working url/screenshot URLs diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml index 8c6390c..6338a37 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml @@ -1,7 +1,9 @@ - -libreoffice-base.desktop -CC0 + +libreoffice-base.desktop +MPL-2.0 +LibreOffice Base +database manaager part of the LibreOffice productivity suite Base is a powerful database manager, part of the LibreOffice productivity suite. @@ -22,9 +24,12 @@ In addition, the built-in support for JDBC- and ODBC-standard drivers allows you to connect to virtually any other existing database engine as well. -http://www.libreoffice.org/features/base/ +http://www.libreoffice.org/discover/base/ -http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Base/Screenshot-87.png +http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png +http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-80.png +The Document Foundation +The Document Foundation libreoffice_at_lists.freedesktop.org - + diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml index 7652fa4..b8beb71 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml @@ -1,7 +1,9 @@ - -libreoffice-calc.desktop -CC0 + +libreoffice-calc.desktop +MPL-2.0 +LibreOffice Calc +spreadsheet program of the LibreOffice productivity suite Calc is a powerful and extensible spreadsheet program, part of the LibreOffice @@ -16,9 +18,11 @@ can easily share spreadsheets with users of other popular office suites without worrying about compatibility. -http://www.libreoffice.org/features/calc/ +http://www.libreoffice.org/discover/calc/ -http://en.wikipedia.org/wiki/File:LibreOffice_Calc_4.0.1_screenshot.png +http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png +The Document Foundation +The Document Foundation libreoffice_at_lists.freedesktop.org - + diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml index 0bb1fb7..2868598 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml @@ -1,7 +1,9 @@ - -libreoffice-draw.desktop -CC0 + +libreoffice-draw.desktop +MPL-2.0 +LibreOffice Draw +graphics editor part of the LibreOffice productivity suite LibreOffice Draw is an easy-to-use graphics editor, which empowers you to create @@ -21,9 +23,12 @@ can easily share drawings with users of other popular office suites without worrying about compatibility. -http://www.libreoffice.org/features/draw/ +http://www.libreoffice.org/discover/draw/ -http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Draw/Screenshot-68.png +http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png +http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-03-Square-fdo75097.png +The Document Foundation +The Document Foundation libreoffice_at_lists.freedesktop.org - + diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml index 04f8ffb..ccb0e92 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml @@ -1,7 +1,9 @@ - -libreoffice-impress.desktop -CC0 + +libreoffice-impress.desktop +MPL-2.0 +LibreOffice Impress +presentation program of the LibreOffice productivity suite Impress is a presentation program and part of the LibreOffice productivity suite. @@ -17,9 +19,11 @@ can easily share presentations with users of other popular office suites without worrying about compatibility. -http://www.libreoffice.org/feat
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gtksalframe.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 10f59f5fab9ddd60c4863e671738cc3c33747651
Author: Michael Meeks
Date: Mon Nov 30 14:03:16 2015 +
vcl: fix further un-initialized boolean.
Change-Id: I8775e56260346a80e466a7c48c19f50f9796b52f
Reviewed-on: https://gerrit.libreoffice.org/20306
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 10ddfdd..791e04e 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -495,6 +495,7 @@ void GtkSalFrame::doKeyCallback( guint state,
GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
: m_nXScreen( getDisplay()->GetDefaultXScreen() )
, m_pGraphics(nullptr)
+, m_bGraphics(false)
{
getDisplay()->registerFrame( this );
m_bDefaultPos = true;
@@ -509,6 +510,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent,
SalFrameStyleFlags nStyle )
GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
: m_nXScreen( getDisplay()->GetDefaultXScreen() )
, m_pGraphics(nullptr)
+, m_bGraphics(false)
{
getDisplay()->registerFrame( this );
// permanently ignore errors from our unruly children ...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/backtrace.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa326746ba70b0302f11533a5cf36daaa6235d04 Author: Damjan Jovanovic Date: Thu Nov 26 19:02:59 2015 + fix the value of FRAME_PTR_OFFSET in backtrace.c and diagnose.c - it's 3 because of the EBP/RBP register's position in the jmp_buf (https://github.com/freebsd/freebsd/blob/master/lib/libc/amd64/gen/_setjmp.S and https://github.com/freebsd/freebsd/blob/master/lib/libc/i386/gen/_setjmp.S). Patch by: me (cherry picked from commit 87451f66edfa425e51289ac6f12ee110d7109a02) Change-Id: I5f18cd9145f90db351c124c6f914411f1ffc2a83 diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c index 43a13d8..340b507 100644 --- a/sal/osl/unx/backtrace.c +++ b/sal/osl/unx/backtrace.c @@ -138,7 +138,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) #include #include "backtrace.h" -#define FRAME_PTR_OFFSET 1 +#define FRAME_PTR_OFFSET 3 #define FRAME_OFFSET 0 int backtrace( void **buffer, int max_frames ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 87/451f66edfa425e51289ac6f12ee110d7109a02
87/451f66edfa425e51289ac6f12ee110d7109a02 |1 + 1 file changed, 1 insertion(+) New commits: commit 1a6283ec09bf5eb461a5e3a48f250bfd208e8425 Author: Caolán McNamara Date: Mon Nov 30 17:31:17 2015 + Notes added by 'git notes add' diff --git a/87/451f66edfa425e51289ac6f12ee110d7109a02 b/87/451f66edfa425e51289ac6f12ee110d7109a02 new file mode 100644 index 000..c46e393 --- /dev/null +++ b/87/451f66edfa425e51289ac6f12ee110d7109a02 @@ -0,0 +1 @@ +merged as: fa326746ba70b0302f11533a5cf36daaa6235d04 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 24/e9542bcfaec3b49e5e825bf36d4bf524d69080 e0/e462a3e64576be14a4341f4dc4a2d56f22fa2a
24/e9542bcfaec3b49e5e825bf36d4bf524d69080 |1 + e0/e462a3e64576be14a4341f4dc4a2d56f22fa2a |1 + 2 files changed, 2 insertions(+) New commits: commit bd89d762fcc9e4ddf65b963eb059117f34b07b2a Author: Caolán McNamara Date: Mon Nov 30 17:27:48 2015 + Notes added by 'git notes add' diff --git a/24/e9542bcfaec3b49e5e825bf36d4bf524d69080 b/24/e9542bcfaec3b49e5e825bf36d4bf524d69080 new file mode 100644 index 000..f5a9fd4 --- /dev/null +++ b/24/e9542bcfaec3b49e5e825bf36d4bf524d69080 @@ -0,0 +1 @@ +merged as: 0bd3aa40f5095e13d10f73076d8528178d146664 commit ea9a8666a8b899247b363c8a53397dd5af3b7f32 Author: Caolán McNamara Date: Mon Nov 30 17:27:35 2015 + Notes added by 'git notes add' diff --git a/e0/e462a3e64576be14a4341f4dc4a2d56f22fa2a b/e0/e462a3e64576be14a4341f4dc4a2d56f22fa2a new file mode 100644 index 000..2404a26 --- /dev/null +++ b/e0/e462a3e64576be14a4341f4dc4a2d56f22fa2a @@ -0,0 +1 @@ +merged as: 7a93f5348007ab1ce52e65cd3811032f31839689 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sal/osl
sal/osl/unx/backtrace.c |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 7a93f5348007ab1ce52e65cd3811032f31839689
Author: Damjan Jovanovic
Date: Fri Nov 27 04:01:03 2015 +
Use the ptrdiff_t printf format code for backtracing on FreeBSD.
Patch by: me
(cherry picked from commit e0e462a3e64576be14a4341f4dc4a2d56f22fa2a)
Change-Id: I1c59b2b631dbfd508d85abb774f27187ded47c17
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 522cb6f..43a13d8 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/types.h"
+
#ifdef SOLARIS
#include
@@ -177,20 +179,12 @@ void backtrace_symbols_fd( void **buffer, int size, int
fd )
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-#if defined X86_64
-fprintf( fp, "%s+0x%lx", dli.dli_fname, offset );
-#else
-fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
-#endif
+fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname,
offset );
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-#if defined X86_64
-fprintf( fp, "(%s+0x%lx)", dli.dli_sname, offset );
-#else
-fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
-#endif
+fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)",
dli.dli_sname, offset );
}
}
fprintf( fp, "[0x%p]\n", *pFramePtr );
commit 0bd3aa40f5095e13d10f73076d8528178d146664
Author: Pedro Giffuni
Date: Wed Nov 25 22:08:04 2015 +
i66807 - Fix GCC warning in backtrace.c
The Bugzilla issue has another fix for sparc but I have no way ot test it.
(cherry picked from commit 24e9542bcfaec3b49e5e825bf36d4bf524d69080)
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 1b664d6..522cb6f 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -177,15 +177,23 @@ void backtrace_symbols_fd( void **buffer, int size, int
fd )
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
+#if defined X86_64
+fprintf( fp, "%s+0x%lx", dli.dli_fname, offset );
+#else
fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+#endif
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
+#if defined X86_64
+fprintf( fp, "(%s+0x%lx)", dli.dli_sname, offset );
+#else
fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+#endif
}
}
-fprintf( fp, "[0x%x]\n", *pFramePtr );
+fprintf( fp, "[0x%p]\n", *pFramePtr );
}
fflush( fp );
fclose( fp );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/backtrace.h |2 --
1 file changed, 2 deletions(-)
New commits:
commit a1a8aa8ef80066dd2fbabbf136dde874c864db8b
Author: Damjan Jovanovic
Date: Thu Nov 26 18:33:01 2015 +
Fix the stack frame layout for backtraces on FreeBSD.
Patch by: me
(cherry picked from commit 0faee39deac292694d036d753b7dc1c4513e045f)
diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
index c7fb992..35d2543 100644
--- a/sal/osl/unx/backtrace.h
+++ b/sal/osl/unx/backtrace.h
@@ -34,8 +34,6 @@ void backtrace_symbols_fd( void **buffer, int size, int fd );
#if defined (FREEBSD) || defined (NETBSD) || defined (OPENBSD) || \
defined (DRAGONFLY)
struct frame {
-longarg0[8];
-longarg1[6];
struct frame *fr_savfp;
longfr_savpc;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0f/aee39deac292694d036d753b7dc1c4513e045f
0f/aee39deac292694d036d753b7dc1c4513e045f |1 + 1 file changed, 1 insertion(+) New commits: commit 02f8391e137ce19e3c45e7d923d01b0c38398fec Author: Caolán McNamara Date: Mon Nov 30 17:22:23 2015 + Notes added by 'git notes add' diff --git a/0f/aee39deac292694d036d753b7dc1c4513e045f b/0f/aee39deac292694d036d753b7dc1c4513e045f new file mode 100644 index 000..14558a3 --- /dev/null +++ b/0f/aee39deac292694d036d753b7dc1c4513e045f @@ -0,0 +1 @@ +merged as: a1a8aa8ef80066dd2fbabbf136dde874c864db8b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0b/ad09dcce5b9fcb8524617db6f937db3adf0e75
0b/ad09dcce5b9fcb8524617db6f937db3adf0e75 |1 + 1 file changed, 1 insertion(+) New commits: commit fbb3c9cf9b75f83883b166c9f8cfafb13f8f97bf Author: Caolán McNamara Date: Mon Nov 30 17:10:04 2015 + Notes added by 'git notes add' diff --git a/0b/ad09dcce5b9fcb8524617db6f937db3adf0e75 b/0b/ad09dcce5b9fcb8524617db6f937db3adf0e75 new file mode 100644 index 000..f6f5f12 --- /dev/null +++ b/0b/ad09dcce5b9fcb8524617db6f937db3adf0e75 @@ -0,0 +1 @@ +prefer: f6012f6c5d40857ea7a9490da90ae5541d859563 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 44/7564d554092424ea839aad8870aeab65c9a05e
44/7564d554092424ea839aad8870aeab65c9a05e |1 + 1 file changed, 1 insertion(+) New commits: commit 1fab6f312593d4ff34fb7a770dc073a8fd52 Author: Caolán McNamara Date: Mon Nov 30 17:12:07 2015 + Notes added by 'git notes add' diff --git a/44/7564d554092424ea839aad8870aeab65c9a05e b/44/7564d554092424ea839aad8870aeab65c9a05e new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/44/7564d554092424ea839aad8870aeab65c9a05e @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ae/df0b56773481bf22546ab318667cb9c08ae7c5
ae/df0b56773481bf22546ab318667cb9c08ae7c5 |1 + 1 file changed, 1 insertion(+) New commits: commit e4c40ff557c899fe81ccd4448fd1219d61ae7e6d Author: Caolán McNamara Date: Mon Nov 30 17:11:32 2015 + Notes added by 'git notes add' diff --git a/ae/df0b56773481bf22546ab318667cb9c08ae7c5 b/ae/df0b56773481bf22546ab318667cb9c08ae7c5 new file mode 100644 index 000..5e3805c --- /dev/null +++ b/ae/df0b56773481bf22546ab318667cb9c08ae7c5 @@ -0,0 +1 @@ +prefer: 17f68a9ea17f42757a124651a86bb04ee57f34f9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0e/eb0d8792eca2c675a50eb1a8e4a498a49ced8f
0e/eb0d8792eca2c675a50eb1a8e4a498a49ced8f |1 + 1 file changed, 1 insertion(+) New commits: commit 8da68cdaa2aff4cc0bb29b10ea2ecbe11c4a069b Author: Caolán McNamara Date: Mon Nov 30 17:10:47 2015 + Notes added by 'git notes add' diff --git a/0e/eb0d8792eca2c675a50eb1a8e4a498a49ced8f b/0e/eb0d8792eca2c675a50eb1a8e4a498a49ced8f new file mode 100644 index 000..58a713c --- /dev/null +++ b/0e/eb0d8792eca2c675a50eb1a8e4a498a49ced8f @@ -0,0 +1 @@ +prefer: d021bb4dae80a194c196c8885bc5125b78476bd8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7b/5545df3acb137244a5d7aabb44b8edf5f0b7d7
7b/5545df3acb137244a5d7aabb44b8edf5f0b7d7 |1 + 1 file changed, 1 insertion(+) New commits: commit 5f0fd6d84998c8f70dabcaf156f65675df818298 Author: Caolán McNamara Date: Mon Nov 30 17:05:58 2015 + Notes added by 'git notes add' diff --git a/7b/5545df3acb137244a5d7aabb44b8edf5f0b7d7 b/7b/5545df3acb137244a5d7aabb44b8edf5f0b7d7 new file mode 100644 index 000..bac2cc0 --- /dev/null +++ b/7b/5545df3acb137244a5d7aabb44b8edf5f0b7d7 @@ -0,0 +1 @@ +prefer: 33f400da4a78cbbc40fe20beedad5a7ca756cfbe ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7d/9f9181d1b541146c18667826fad40abed5d171
7d/9f9181d1b541146c18667826fad40abed5d171 |1 + 1 file changed, 1 insertion(+) New commits: commit 32577760f6c9267ee6347b7061e3b7f06d9d54e0 Author: Caolán McNamara Date: Mon Nov 30 17:06:20 2015 + Notes added by 'git notes add' diff --git a/7d/9f9181d1b541146c18667826fad40abed5d171 b/7d/9f9181d1b541146c18667826fad40abed5d171 new file mode 100644 index 000..7673ba9 --- /dev/null +++ b/7d/9f9181d1b541146c18667826fad40abed5d171 @@ -0,0 +1 @@ +prefer: 5ac84ff884b491df4631d78b3c4ba74eddb0b1a5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5e/b9efa7e3aadc229d2ae260601aa05abfed0076
5e/b9efa7e3aadc229d2ae260601aa05abfed0076 |1 + 1 file changed, 1 insertion(+) New commits: commit 933171650270c49108f2286058f2fdd05217260c Author: Caolán McNamara Date: Mon Nov 30 17:06:48 2015 + Notes added by 'git notes add' diff --git a/5e/b9efa7e3aadc229d2ae260601aa05abfed0076 b/5e/b9efa7e3aadc229d2ae260601aa05abfed0076 new file mode 100644 index 000..31c99fb --- /dev/null +++ b/5e/b9efa7e3aadc229d2ae260601aa05abfed0076 @@ -0,0 +1 @@ +prefer: 9f5e82598fc3d145b83d5c6df0f7b5668408608e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 27/45e1f81d68f78e531a59c9679b3d974746e45a
27/45e1f81d68f78e531a59c9679b3d974746e45a |1 + 1 file changed, 1 insertion(+) New commits: commit 4ddf2963379e50f59e4727d79057404763cd6f5f Author: Caolán McNamara Date: Mon Nov 30 17:05:17 2015 + Notes added by 'git notes add' diff --git a/27/45e1f81d68f78e531a59c9679b3d974746e45a b/27/45e1f81d68f78e531a59c9679b3d974746e45a new file mode 100644 index 000..8dfd73a --- /dev/null +++ b/27/45e1f81d68f78e531a59c9679b3d974746e45a @@ -0,0 +1 @@ +prefer: 17d42fdfdf1428b1e48dfab9f71a759b8c767ec4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 61/5911a2ebab730102a728549d5007b44a0ec209
61/5911a2ebab730102a728549d5007b44a0ec209 |1 + 1 file changed, 1 insertion(+) New commits: commit 71392b4d542d4d53300b1a9132569ca781f64133 Author: Caolán McNamara Date: Mon Nov 30 17:04:35 2015 + Notes added by 'git notes add' diff --git a/61/5911a2ebab730102a728549d5007b44a0ec209 b/61/5911a2ebab730102a728549d5007b44a0ec209 new file mode 100644 index 000..d58319f --- /dev/null +++ b/61/5911a2ebab730102a728549d5007b44a0ec209 @@ -0,0 +1 @@ +prefer: b1231b5ed214d449347d69bc3d29616377655d20 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx
vcl/unx/gtk/gtksalframe.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 010775e037cd09c3a0fd7bad0bed6b881205e9dd Author: Caolán McNamara Date: Mon Nov 30 17:02:07 2015 + gtk3: scroll lock only available in >= 3.18.0 Change-Id: I1c22873c7dc989637ef4d12bf5a08395383e3779 (cherry picked from commit 4d3c91ee82de53589924ca72c22a745ffba6e6af) diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 4a9fa43..3b39a3c 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -2794,8 +2794,10 @@ KeyIndicatorState GtkSalFrame::GetIndicatorState() nState |= KeyIndicatorState::CAPSLOCK; if (gdk_keymap_get_num_lock_state(pKeyMap)) nState |= KeyIndicatorState::NUMLOCK; +#if GTK_CHECK_VERSION(3,18,0) if (gdk_keymap_get_scroll_lock_state(pKeyMap)) nState |= KeyIndicatorState::SCROLLLOCK; +#endif return nState; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gtksalframe.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 4d3c91ee82de53589924ca72c22a745ffba6e6af Author: Caolán McNamara Date: Mon Nov 30 17:02:07 2015 + gtk3: scroll lock only available in >= 3.18.0 Change-Id: I1c22873c7dc989637ef4d12bf5a08395383e3779 diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 64994bf..10ddfdd 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -2778,8 +2778,10 @@ KeyIndicatorState GtkSalFrame::GetIndicatorState() nState |= KeyIndicatorState::CAPSLOCK; if (gdk_keymap_get_num_lock_state(pKeyMap)) nState |= KeyIndicatorState::NUMLOCK; +#if GTK_CHECK_VERSION(3,18,0) if (gdk_keymap_get_scroll_lock_state(pKeyMap)) nState |= KeyIndicatorState::SCROLLLOCK; +#endif return nState; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bb/bba78518a700ed7fc9c25d232543ea49a605ec
bb/bba78518a700ed7fc9c25d232543ea49a605ec |1 + 1 file changed, 1 insertion(+) New commits: commit a47fc95478a8d27c5ffcb42877179b1b3e887c6e Author: Caolán McNamara Date: Mon Nov 30 16:59:29 2015 + Notes added by 'git notes add' diff --git a/bb/bba78518a700ed7fc9c25d232543ea49a605ec b/bb/bba78518a700ed7fc9c25d232543ea49a605ec new file mode 100644 index 000..48f4baf --- /dev/null +++ b/bb/bba78518a700ed7fc9c25d232543ea49a605ec @@ -0,0 +1 @@ +prefer: 059dfe015f2b44eaf8126c1a747e6d4407dda131 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpgdi.cxx | 68 +++-
1 file changed, 45 insertions(+), 23 deletions(-)
New commits:
commit 1f2af3fb22a0a3be36fe8bc93f843ad7c2e3b7b8
Author: Caolán McNamara
Date: Mon Nov 30 15:55:26 2015 +
gtk3: handle 'standard' invert like quartz does
e.g. the blinking cursor in writer
Change-Id: I43b98556d07deb097d55565dbbb9af95cb102353
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index f5f807e..f79fd0b 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -64,18 +64,22 @@ rDevice
#endif
}
-namespace
-{
+#define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
+
#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
-struct cairo_rectangle_int_t
-{
-double x;
-double y;
-double width;
-double height;
-};
+
+struct cairo_rectangle_int_t
+{
+double x;
+double y;
+double width;
+double height;
+};
+
#endif
+namespace
+{
cairo_rectangle_int_t getFillDamage(cairo_t* cr)
{
cairo_rectangle_int_t extents;
@@ -1196,16 +1200,17 @@ void SvpSalGraphics::invert( long nX, long nY, long
nWidth, long nHeight, SalInv
{
SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled
SAL_INVERT_TRACKFRAME");
}
-else if ( nFlags & SAL_INVERT_50 )
+else
{
-if (cairo_t* cr = getCairoContext())
+if (m_aDrawMode == basebmp::DrawMode::XOR)
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert unhandled XOR (?)");
+else
{
-assert(m_aDevice->isTopDown());
+cairo_t* cr = getCairoContext();
+assert(cr && m_aDevice->isTopDown());
clipRegion(cr);
-cairo_pattern_t *pattern = create_stipple();
-
cairo_rectangle_int_t extents;
basebmp::IBitmapDeviceDamageTrackerSharedPtr
xDamageTracker(m_aDevice->getDamageTracker());
@@ -1217,22 +1222,39 @@ void SvpSalGraphics::invert( long nX, long nY, long
nWidth, long nHeight, SalInv
cairo_clip(cr);
cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
-cairo_mask(cr, pattern);
-cairo_pattern_destroy(pattern);
+
+if (nFlags & SAL_INVERT_50)
+{
+cairo_pattern_t *pattern = create_stipple();
+cairo_mask(cr, pattern);
+cairo_pattern_destroy(pattern);
+}
+else
+{
+if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 10, 0))
+{
+cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
+}
+else
+{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, archaic
cairo");
+cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
+}
+cairo_paint(cr);
+}
cairo_surface_flush(cairo_get_target(cr));
cairo_destroy(cr); // unref
+if (xDamageTracker)
+{
+xDamageTracker->damaged(basegfx::B2IBox(extents.x, extents.y,
extents.x + extents.width,
+extents.y +
extents.height));
+}
+
return;
}
-else
-SAL_WARN("vcl.gdi", "SvpSalGraphics::invert unhandled XOR (?)");
}
-else
-{
-SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled
SAL_INVERT_TRACKFRAME");
-}
-
basegfx::B2DPolygon aRect = basegfx::tools::createPolygonFromRect(
basegfx::B2DRectangle( nX, nY, nX+nWidth, nY+nHeight ) );
basegfx::B2DPolyPolygon aPolyPoly( aRect );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4d/01e7b5dc3eed1c13566f7707b462b586ec0396
4d/01e7b5dc3eed1c13566f7707b462b586ec0396 |1 + 1 file changed, 1 insertion(+) New commits: commit ed28d04e0a3a5fa4dc41bc58c2698cb444e5c891 Author: Caolán McNamara Date: Mon Nov 30 16:56:15 2015 + Notes added by 'git notes add' diff --git a/4d/01e7b5dc3eed1c13566f7707b462b586ec0396 b/4d/01e7b5dc3eed1c13566f7707b462b586ec0396 new file mode 100644 index 000..9805d9c --- /dev/null +++ b/4d/01e7b5dc3eed1c13566f7707b462b586ec0396 @@ -0,0 +1 @@ +prefer: e3193eb37a2fa75261746c1bdea836889d71a55f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 62/ded0e4d32f2b958dc4f609bfb2969f834cb86b
62/ded0e4d32f2b958dc4f609bfb2969f834cb86b |1 + 1 file changed, 1 insertion(+) New commits: commit e21d3dbb2336ee421ae0ccea26c2b0a41fd36eb1 Author: Caolán McNamara Date: Mon Nov 30 16:55:40 2015 + Notes added by 'git notes add' diff --git a/62/ded0e4d32f2b958dc4f609bfb2969f834cb86b b/62/ded0e4d32f2b958dc4f609bfb2969f834cb86b new file mode 100644 index 000..29d11ff --- /dev/null +++ b/62/ded0e4d32f2b958dc4f609bfb2969f834cb86b @@ -0,0 +1 @@ +prefer: 2e367c0ae9a91a428222d229869785b26b739a63 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 55/7a4f2916e511fbd49025eded878b0bd9dc3500
55/7a4f2916e511fbd49025eded878b0bd9dc3500 |1 + 1 file changed, 1 insertion(+) New commits: commit 2ab5ed1e54096f7187e280ff38c2fd81f1e8fb97 Author: Caolán McNamara Date: Mon Nov 30 16:54:31 2015 + Notes added by 'git notes add' diff --git a/55/7a4f2916e511fbd49025eded878b0bd9dc3500 b/55/7a4f2916e511fbd49025eded878b0bd9dc3500 new file mode 100644 index 000..842b803 --- /dev/null +++ b/55/7a4f2916e511fbd49025eded878b0bd9dc3500 @@ -0,0 +1 @@ +prefer: 8f210c26c53cf5480819d983e57977d531422ff1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cb/7f2453763ffe5b3995227bb864deb8b7b14cba
cb/7f2453763ffe5b3995227bb864deb8b7b14cba |1 + 1 file changed, 1 insertion(+) New commits: commit 6b4fb7f01b2f5604a7f3934569882278fbaa94a8 Author: Caolán McNamara Date: Mon Nov 30 16:53:03 2015 + Notes added by 'git notes add' diff --git a/cb/7f2453763ffe5b3995227bb864deb8b7b14cba b/cb/7f2453763ffe5b3995227bb864deb8b7b14cba new file mode 100644 index 000..803c2c1 --- /dev/null +++ b/cb/7f2453763ffe5b3995227bb864deb8b7b14cba @@ -0,0 +1 @@ +prefer: ecdf4e2b90d664655f3cee1364b38218492e9ea6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 64/8ba742f8f3439efc3a0e215ad008fe66f8c855
64/8ba742f8f3439efc3a0e215ad008fe66f8c855 |1 + 1 file changed, 1 insertion(+) New commits: commit 2d2f498077af96440c3411028cd945369df6f2f0 Author: Caolán McNamara Date: Mon Nov 30 16:52:16 2015 + Notes added by 'git notes add' diff --git a/64/8ba742f8f3439efc3a0e215ad008fe66f8c855 b/64/8ba742f8f3439efc3a0e215ad008fe66f8c855 new file mode 100644 index 000..c3499d6 --- /dev/null +++ b/64/8ba742f8f3439efc3a0e215ad008fe66f8c855 @@ -0,0 +1 @@ +prefer: 17605133e01c7a58d5e2f10c441bf67582ae4898 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f1/54a24da794c7f26c7638eee859ce14136e90fc
f1/54a24da794c7f26c7638eee859ce14136e90fc |1 + 1 file changed, 1 insertion(+) New commits: commit e1420c40d2c4fbef6a5d3b64af947e891c1c2170 Author: Caolán McNamara Date: Mon Nov 30 16:50:25 2015 + Notes added by 'git notes add' diff --git a/f1/54a24da794c7f26c7638eee859ce14136e90fc b/f1/54a24da794c7f26c7638eee859ce14136e90fc new file mode 100644 index 000..c9f9e8a --- /dev/null +++ b/f1/54a24da794c7f26c7638eee859ce14136e90fc @@ -0,0 +1 @@ +prefer: 293890e0d07d0f28cd10bfe7c2bf53865dbfb1fc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9a/9cfba842e248c8d3d4731ee875f7fc90a66b8f
9a/9cfba842e248c8d3d4731ee875f7fc90a66b8f |1 + 1 file changed, 1 insertion(+) New commits: commit dd784c186bfa7826ced25885ce470195e1b15355 Author: Caolán McNamara Date: Mon Nov 30 16:46:45 2015 + Notes added by 'git notes add' diff --git a/9a/9cfba842e248c8d3d4731ee875f7fc90a66b8f b/9a/9cfba842e248c8d3d4731ee875f7fc90a66b8f new file mode 100644 index 000..1cd7931 --- /dev/null +++ b/9a/9cfba842e248c8d3d4731ee875f7fc90a66b8f @@ -0,0 +1 @@ +prefer: 0a181c9aa28f1e1315e31623c1f04e774d300ec3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx
vcl/unx/gtk/gtksalframe.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 6408b735283751cf6cacb8c758b99a2d90a9868a
Author: Caolán McNamara
Date: Mon Nov 30 16:42:15 2015 +
gtk3: implement GetIndicatorState
Change-Id: I006c739a9dc876dd9ec83375f76fd1343b39557a
(cherry picked from commit 503864037b2f6b73979f46d11df5d365b81f9dcf)
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 923581d..4a9fa43 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2786,8 +2786,18 @@ KeyIndicatorState GtkSalFrame::GetIndicatorState()
#if !GTK_CHECK_VERSION(3,0,0)
return GetGtkSalData()->GetGtkDisplay()->GetIndicatorState();
#else
-g_warning ("missing get indicator state");
-return KeyIndicatorState::NONE;
+KeyIndicatorState nState = KeyIndicatorState::NONE;
+
+GdkKeymap *pKeyMap = gdk_keymap_get_for_display(getGdkDisplay());
+
+if (gdk_keymap_get_caps_lock_state(pKeyMap))
+nState |= KeyIndicatorState::CAPSLOCK;
+if (gdk_keymap_get_num_lock_state(pKeyMap))
+nState |= KeyIndicatorState::NUMLOCK;
+if (gdk_keymap_get_scroll_lock_state(pKeyMap))
+nState |= KeyIndicatorState::SCROLLLOCK;
+
+return nState;
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/source vcl/unx
vcl/source/window/seleng.cxx |2 +-
vcl/source/window/toolbox.cxx |6 --
vcl/source/window/toolbox2.cxx |6 --
vcl/unx/gtk/gtksalframe.cxx| 14 --
4 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit 503864037b2f6b73979f46d11df5d365b81f9dcf
Author: Caolán McNamara
Date: Mon Nov 30 16:42:15 2015 +
gtk3: implement GetIndicatorState
Change-Id: I006c739a9dc876dd9ec83375f76fd1343b39557a
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index b465404..64994bf 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2770,8 +2770,18 @@ KeyIndicatorState GtkSalFrame::GetIndicatorState()
#if !GTK_CHECK_VERSION(3,0,0)
return GetGtkSalData()->GetGtkDisplay()->GetIndicatorState();
#else
-g_warning ("missing get indicator state");
-return KeyIndicatorState::NONE;
+KeyIndicatorState nState = KeyIndicatorState::NONE;
+
+GdkKeymap *pKeyMap = gdk_keymap_get_for_display(getGdkDisplay());
+
+if (gdk_keymap_get_caps_lock_state(pKeyMap))
+nState |= KeyIndicatorState::CAPSLOCK;
+if (gdk_keymap_get_num_lock_state(pKeyMap))
+nState |= KeyIndicatorState::NUMLOCK;
+if (gdk_keymap_get_scroll_lock_state(pKeyMap))
+nState |= KeyIndicatorState::SCROLLLOCK;
+
+return nState;
#endif
}
commit a4e58b509828d806513217efc03134845629cccd
Author: Caolán McNamara
Date: Mon Nov 30 16:18:35 2015 +
silence ReleaseMouse warning
Change-Id: I615b4877ab29075ed45149259260acfb2563cad8
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 69b220b..6aefea1 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -280,7 +280,7 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent&
rMEvt )
void SelectionEngine::ReleaseMouse()
{
-if (!pWin)
+if (!pWin || !pWin->IsMouseCaptured())
return;
pWin->ReleaseMouse();
}
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 4105b58..311d12e 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1251,7 +1251,8 @@ void ImplTBDragMgr::Dragging( const Point& rPos )
void ImplTBDragMgr::EndDragging( bool bOK )
{
mpDragBox->HideTracking();
-mpDragBox->ReleaseMouse();
+if (mpDragBox->IsMouseCaptured())
+mpDragBox->ReleaseMouse();
mpDragBox->mbDragging = false;
mbShowDragRect = false;
Application::RemoveAccel( &maAccel );
@@ -3346,7 +3347,8 @@ void ToolBox::ImplFloatControl( bool bStart,
FloatingWindow* pFloatWindow )
mbDrag = false;
EndTracking();
-ReleaseMouse();
+if (IsMouseCaptured())
+ReleaseMouse();
}
else
{
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index dddb65f..2bcb44e 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1335,7 +1335,8 @@ void ToolBox::EndSelection()
if (mnCurPos != TOOLBOX_ITEM_NOTFOUND)
InvalidateItem(mnCurPos);
EndTracking();
-ReleaseMouse();
+if (IsMouseCaptured())
+ReleaseMouse();
Deactivate();
}
@@ -1378,7 +1379,8 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool
bDown, bool bRelease )
mbDrag = false;
mbSelection = false;
EndTracking();
-ReleaseMouse();
+if (IsMouseCaptured())
+ReleaseMouse();
Deactivate();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gtksalframe.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c2f13bd8dff4526cdfca2eef7770feae3da8bf3a Author: Stephan Bergmann Date: Mon Nov 30 17:24:10 2015 +0100 loplugin:nullptr Change-Id: Ie296794db2d259ea9973a2042a93200c0f93d259 diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 62b0e06..b465404 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -923,7 +923,7 @@ GtkSalFrame::~GtkSalFrame() g_object_unref( G_OBJECT( m_pForeignTopLevel) ); delete m_pGraphics; -m_pGraphics = NULL; +m_pGraphics = nullptr; } void GtkSalFrame::moveWindow( long nX, long nY ) @@ -1171,7 +1171,7 @@ void GtkSalFrame::InitCommon() m_aSystemData.pShellWidget = m_aSystemData.pWidget; m_bGraphics = false; -m_pGraphics = NULL; +m_pGraphics = nullptr; // fake an initial geometry, gets updated via configure event or SetPosSize if( m_bDefaultPos || m_bDefaultSize ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes12' - cui/source cui/uiconfig officecfg/registry sc/inc sc/source
cui/source/options/optopencl.cxx | 19
cui/source/options/optopencl.hxx |1
cui/uiconfig/ui/optopenclpage.ui | 18
officecfg/registry/schema/org/openoffice/Office/Common.xcs |7
sc/inc/calcconfig.hxx |1
sc/inc/scmatrix.hxx| 19
sc/source/core/data/formulacell.cxx|3
sc/source/core/tool/calcconfig.cxx |6
sc/source/core/tool/formulagroup.cxx | 223 -
sc/source/core/tool/scmatrix.cxx | 511 -
sc/source/core/tool/token.cxx | 10
11 files changed, 442 insertions(+), 376 deletions(-)
New commits:
commit f55d76b8a6d9f5a218f100620da29c7ea4ed00e9
Author: Jan Holesovsky
Date: Mon Nov 30 12:49:02 2015 +0100
Test commit: S/W Interpreter including the UI changes.
Change-Id: Ia23c360a0db1ee2c8f6bfd8b31657405d97fcd9c
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 71cd281..db1470e 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -35,7 +35,8 @@
#include
#include
-#include "cuires.hrc"
+#include
+#include
#include "optopencl.hxx"
#include
@@ -43,6 +44,7 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
SfxTabPage(pParent, "OptOpenCLPage", "cui/ui/optopenclpage.ui", &rSet),
maConfig(OpenCLConfig::get())
{
+get(mpUseSwInterpreter, "useswinterpreter");
get(mpUseOpenCL, "useopencl");
get(mpBlackListTable, "blacklist");
get(mpBlackListFrame,"blacklistframe");
@@ -60,6 +62,8 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
get(mpVendor,"vendor");
get(mpDrvVersion,"driverversion");
+
mpUseSwInterpreter->Check(officecfg::Office::Common::Misc::UseSwInterpreter::get());
+
mpUseOpenCL->Check(maConfig.mbUseOpenCL);
mpUseOpenCL->SetClickHdl(LINK(this, SvxOpenCLTabPage, EnableOpenCLHdl));
@@ -116,6 +120,7 @@ void SvxOpenCLTabPage::dispose()
mpBlackList.disposeAndClear();
mpWhiteList.disposeAndClear();
+mpUseSwInterpreter.clear();
mpUseOpenCL.clear();
mpBlackListFrame.clear();
mpBlackListTable.clear();
@@ -146,6 +151,15 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
bool bModified = false;
std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
+if (mpUseSwInterpreter->IsValueChangedFromSaved())
+{
+
officecfg::Office::Common::Misc::UseSwInterpreter::set(mpUseSwInterpreter->IsChecked(),
batch);
+bModified = true;
+
+ScopedVclPtrInstance aWarnBox(this,
CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO);
+aWarnBox->Execute();
+}
+
if (mpUseOpenCL->IsValueChangedFromSaved())
maConfig.mbUseOpenCL = mpUseOpenCL->IsChecked();
@@ -195,6 +209,9 @@ void SvxOpenCLTabPage::Reset( const SfxItemSet* )
{
maConfig = OpenCLConfig::get();
+
mpUseSwInterpreter->Check(officecfg::Office::Common::Misc::UseSwInterpreter::get());
+mpUseSwInterpreter->SaveValue();
+
mpUseOpenCL->Check(maConfig.mbUseOpenCL);
mpUseOpenCL->SaveValue();
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index fe91fe1..10dc30b 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -31,6 +31,7 @@ class SvxOpenCLTabPage : public SfxTabPage
private:
OpenCLConfig maConfig;
+VclPtr mpUseSwInterpreter;
VclPtr mpUseOpenCL;
VclPtr mpBlackListFrame;
diff --git a/cui/uiconfig/ui/optopenclpage.ui b/cui/uiconfig/ui/optopenclpage.ui
index 89ac882..2cad763 100644
--- a/cui/uiconfig/ui/optopenclpage.ui
+++ b/cui/uiconfig/ui/optopenclpage.ui
@@ -26,6 +26,22 @@
vertical
12
+
+Allow use of
Software Interpreter (even when OpenCL is not available)
+True
+True
+False
+True
+0
+True
+
+
+False
+True
+0
+
+
+
Allow use of
OpenCL
True
@@ -38,7 +54,7 @@
False
True
-0
+1
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index d693fc7..800ac71 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5642,6 +5642,13 @@
Linux//Advanced Micro Devices, Inc\.//1445\.5
\(sse2,av
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/headless
vcl/headless/svpgdi.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9401a065d0d53b31427f85a936ef53244ac8a6b8 Author: Caolán McNamara Date: Mon Nov 30 15:29:03 2015 + gtk3: glitches because yours truly cannot tell x from y (cherry picked from commit 2ca429e781cba94608e9838e2c1c50f1e8632b90) Change-Id: I3b8620a4d8bffeb5e0558c35cb3a063238c12ba5 diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 2eb8317..cb83265 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -156,12 +156,12 @@ namespace double x1, y1, x2, y2; cairo_clip_extents(cr, &x1, &y1, &x2, &y2); -extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1; +extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1; #if CAIRO_VERSION_MAJOR > 1 || (CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR >= 10) cairo_region_t *region = cairo_region_create_rectangle(&extents); cairo_fill_extents(cr, &x1, &y1, &x2, &y2); -extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1; +extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1; cairo_region_intersect_rectangle(region, &extents); cairo_region_get_extents(region, &extents); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/headless vcl/unx
vcl/headless/svpgdi.cxx |8
vcl/unx/gtk/gtksalframe.cxx | 19 ++-
2 files changed, 14 insertions(+), 13 deletions(-)
New commits:
commit 2ca429e781cba94608e9838e2c1c50f1e8632b90
Author: Caolán McNamara
Date: Mon Nov 30 15:29:03 2015 +
gtk3: glitches because yours truly cannot tell x from y
Change-Id: I3b8620a4d8bffeb5e0558c35cb3a063238c12ba5
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index de916e7..f5f807e 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -82,13 +82,13 @@ namespace
double x1, y1, x2, y2;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height
= y2-y1;
+extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height
= y2-y1;
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
cairo_region_t *region = cairo_region_create_rectangle(&extents);
cairo_fill_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height
= y2-y1;
+extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height
= y2-y1;
cairo_region_intersect_rectangle(region, &extents);
cairo_region_get_extents(region, &extents);
@@ -104,13 +104,13 @@ namespace
double x1, y1, x2, y2;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height
= y2-y1;
+extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height
= y2-y1;
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
cairo_region_t *region = cairo_region_create_rectangle(&extents);
cairo_stroke_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height
= y2-y1;
+extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height
= y2-y1;
cairo_region_intersect_rectangle(region, &extents);
cairo_region_get_extents(region, &extents);
commit 0ae6d3da5f0016ac4924d3b9e668d0ae2a341e37
Author: Caolán McNamara
Date: Mon Nov 30 13:50:16 2015 +
Resolves: rhbz#1285380 get menus working under wayland
use GDK_WINDOW_TYPE_HINT_POPUP_MENU hint for menus
and set hints after widget is realized
and set gtk_window_set_transient_for menus too
then you get menus and tooltips apparently in the right place
Change-Id: I116d821d4eff480503348b8ff1fb8f4f247b4c1f
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index c5c01a4..62b0e06 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -1392,6 +1392,15 @@ void GtkSalFrame::Init( SalFrame* pParent,
SalFrameStyleFlags nStyle )
if( m_pParent && m_pParent->m_pWindow && ! isChild() )
gtk_window_set_screen( GTK_WINDOW(m_pWindow), gtk_window_get_screen(
GTK_WINDOW(m_pParent->m_pWindow) ) );
+if (m_pParent)
+{
+if (!(m_pParent->m_nStyle & SalFrameStyleFlags::PLUG))
+gtk_window_set_transient_for( GTK_WINDOW(m_pWindow),
GTK_WINDOW(m_pParent->m_pWindow) );
+m_pParent->m_aChildren.push_back( this );
+}
+
+InitCommon();
+
// set window type
bool bDecoHandling =
! isChild() &&
@@ -1432,17 +1441,9 @@ void GtkSalFrame::Init( SalFrame* pParent,
SalFrameStyleFlags nStyle )
#endif
gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
gtk_window_set_gravity( GTK_WINDOW(m_pWindow), GDK_GRAVITY_STATIC );
-if( m_pParent && ! (m_pParent->m_nStyle & SalFrameStyleFlags::PLUG) )
-gtk_window_set_transient_for( GTK_WINDOW(m_pWindow),
GTK_WINDOW(m_pParent->m_pWindow) );
}
else if( (nStyle & SalFrameStyleFlags::FLOAT) )
-{
-gtk_window_set_type_hint( GTK_WINDOW(m_pWindow),
GDK_WINDOW_TYPE_HINT_UTILITY );
-}
-if( m_pParent )
-m_pParent->m_aChildren.push_back( this );
-
-InitCommon();
+gtk_window_set_type_hint( GTK_WINDOW(m_pWindow),
GDK_WINDOW_TYPE_HINT_POPUP_MENU );
if( eWinType == GTK_WINDOW_TOPLEVEL )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source
sc/source/filter/excel/xestyle.cxx |8
sc/source/filter/excel/xetable.cxx |4 ++--
sc/source/filter/inc/xestyle.hxx | 12 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 5659b30f1b59991cb9610e6bdea88a3de4c140b0
Author: Eike Rathke
Date: Mon Nov 30 16:07:46 2015 +0100
number format keys are sal_uInt32, so use it
Change-Id: I0adf5f443ed3348ca0b975bd64bd4a293ff30f79
(cherry picked from commit 2c1c6df24060a08f7b6c49874c0e8a86a32e1dfd)
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 55ebdcf..3f82655 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1373,7 +1373,7 @@ XclExpNumFmtBuffer::~XclExpNumFmtBuffer()
{
}
-sal_uInt16 XclExpNumFmtBuffer::Insert( sal_uLong nScNumFmt )
+sal_uInt16 XclExpNumFmtBuffer::Insert( sal_uInt32 nScNumFmt )
{
XclExpNumFmtVec::const_iterator aIt =
::std::find_if( maFormatMap.begin(), maFormatMap.end(),
XclExpNumFmtPred( nScNumFmt ) );
@@ -1433,14 +1433,14 @@ void XclExpNumFmtBuffer::WriteFormatRecord(
XclExpStream& rStrm, const XclExpNum
namespace {
-OUString GetNumberFormatCode(XclRoot& rRoot, const sal_uInt16 nScNumFmt,
SvNumberFormatter* pFormatter, NfKeywordTable* pKeywordTable)
+OUString GetNumberFormatCode(XclRoot& rRoot, const sal_uInt32 nScNumFmt,
SvNumberFormatter* pFormatter, NfKeywordTable* pKeywordTable)
{
return rRoot.GetFormatter().GetFormatStringForExcel( nScNumFmt,
*pKeywordTable, *pFormatter);
}
}
-OUString XclExpNumFmtBuffer::GetFormatCode( sal_uInt16 nScNumFmt )
+OUString XclExpNumFmtBuffer::GetFormatCode( sal_uInt32 nScNumFmt )
{
return GetNumberFormatCode( *this, nScNumFmt, mxFormatter.get(),
mpKeywordTable.get() );
}
@@ -3027,7 +3027,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
const SfxPoolItem *pPoolItem = nullptr;
if( rSet.GetItemState( ATTR_VALUE_FORMAT, true,
&pPoolItem ) == SfxItemState::SET )
{
-sal_uLong nScNumFmt = static_cast< const
SfxUInt32Item* >(pPoolItem)->GetValue();
+sal_uInt32 nScNumFmt = static_cast< const
SfxUInt32Item* >(pPoolItem)->GetValue();
sal_Int32 nXclNumFmt =
GetRoot().GetNumFmtBuffer().Insert(nScNumFmt);
pNumFormat = new XclExpNumFmt( nScNumFmt,
nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, mxFormatter.get(),
mpKeywordTable.get() ));
}
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 3c85323..866c9ab 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -821,12 +821,12 @@ XclExpFormulaCell::XclExpFormulaCell(
XclExpNumFmtBuffer& rNumFmtBfr = rRoot.GetNumFmtBuffer();
// current cell number format
-sal_uLong nScNumFmt = pPattern ?
+sal_uInt32 nScNumFmt = pPattern ?
GETITEMVALUE( pPattern->GetItemSet(), SfxUInt32Item,
ATTR_VALUE_FORMAT, sal_uLong ) :
rNumFmtBfr.GetStandardFormat();
// alternative number format passed to XF buffer
-sal_uLong nAltScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND;
+sal_uInt32 nAltScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND;
/* Xcl doesn't know Boolean number formats, we write
"TRUE";"FALSE" (language dependent). Don't do it for automatic
formula formats, because Excel gets them right. */
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 41e4d00..f2c4461 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -268,11 +268,11 @@ private:
/** Stores a core number format index with corresponding Excel format index. */
struct XclExpNumFmt
{
-sal_uLong mnScNumFmt; /// Core index of the number format.
+sal_uInt32 mnScNumFmt; /// Core index of the number format.
sal_uInt16 mnXclNumFmt;/// Resulting Excel format index.
OUStringmaNumFmtString; /// format string
-inline explicit XclExpNumFmt( sal_uLong nScNumFmt, sal_uInt16
nXclNumFmt, const OUString& rFrmt ) :
+inline explicit XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16
nXclNumFmt, const OUString& rFrmt ) :
mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt
), maNumFmtString( rFrmt ) {}
void SaveXml( XclExpXmlStream& rStrm );
@@ -289,12 +289,12 @@ public:
virtual ~XclExpNumFmtBuffer();
/** Returns the core index of the current standard number format. */
-inline sal_uLongGetStandardFormat() const { return mnStdFmt; }
+inline sal_uInt32 GetStandardFormat() const { return mnStdFmt; }
/** Inserts a number format into the format buffer.
@param nScNumFmt The core index of the number format.
[Libreoffice-commits] core.git: include/sal
include/sal/log-areas.dox |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5e2455c6b170f5110c889296ff0b7ee9d7a87076 Author: Stephan Bergmann Date: Mon Nov 30 16:24:16 2015 +0100 Keep items sorted Change-Id: Ifa66e63e67d6ae0a6453d86634e2aa998c442adc diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 310fb12..f640089 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -431,8 +431,8 @@ certain functionality. @li @c vcl.osx @li @c vcl.osx.print @li @c vcl.quartz -@li @c vcl.screensaverinhibitor @li @c vcl.schedule - scheduler / main-loop information +@li @c vcl.screensaverinhibitor @li @c vcl.scrollbar - Scroll Bars @li @c vcl.sm - Session Manager @li @c vcl.unity ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 36/e754282d58c9028f4348dd543cb99a73220e99
36/e754282d58c9028f4348dd543cb99a73220e99 |1 + 1 file changed, 1 insertion(+) New commits: commit 1ab5ad73fa545283fd7d32eec06141ee64ca662f Author: Stephan Bergmann Date: Mon Nov 30 16:12:19 2015 +0100 Notes added by 'git notes add' diff --git a/36/e754282d58c9028f4348dd543cb99a73220e99 b/36/e754282d58c9028f4348dd543cb99a73220e99 new file mode 100644 index 000..9dcba64 --- /dev/null +++ b/36/e754282d58c9028f4348dd543cb99a73220e99 @@ -0,0 +1 @@ +prefer: 8e71d9400bd350d63723c5489ddaadb3d3610baf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xestyle.cxx |8
sc/source/filter/excel/xetable.cxx |4 ++--
sc/source/filter/inc/xestyle.hxx | 12 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 2c1c6df24060a08f7b6c49874c0e8a86a32e1dfd
Author: Eike Rathke
Date: Mon Nov 30 16:07:46 2015 +0100
number format keys are sal_uInt32, so use it
Change-Id: I0adf5f443ed3348ca0b975bd64bd4a293ff30f79
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 55ebdcf..3f82655 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1373,7 +1373,7 @@ XclExpNumFmtBuffer::~XclExpNumFmtBuffer()
{
}
-sal_uInt16 XclExpNumFmtBuffer::Insert( sal_uLong nScNumFmt )
+sal_uInt16 XclExpNumFmtBuffer::Insert( sal_uInt32 nScNumFmt )
{
XclExpNumFmtVec::const_iterator aIt =
::std::find_if( maFormatMap.begin(), maFormatMap.end(),
XclExpNumFmtPred( nScNumFmt ) );
@@ -1433,14 +1433,14 @@ void XclExpNumFmtBuffer::WriteFormatRecord(
XclExpStream& rStrm, const XclExpNum
namespace {
-OUString GetNumberFormatCode(XclRoot& rRoot, const sal_uInt16 nScNumFmt,
SvNumberFormatter* pFormatter, NfKeywordTable* pKeywordTable)
+OUString GetNumberFormatCode(XclRoot& rRoot, const sal_uInt32 nScNumFmt,
SvNumberFormatter* pFormatter, NfKeywordTable* pKeywordTable)
{
return rRoot.GetFormatter().GetFormatStringForExcel( nScNumFmt,
*pKeywordTable, *pFormatter);
}
}
-OUString XclExpNumFmtBuffer::GetFormatCode( sal_uInt16 nScNumFmt )
+OUString XclExpNumFmtBuffer::GetFormatCode( sal_uInt32 nScNumFmt )
{
return GetNumberFormatCode( *this, nScNumFmt, mxFormatter.get(),
mpKeywordTable.get() );
}
@@ -3027,7 +3027,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
const SfxPoolItem *pPoolItem = nullptr;
if( rSet.GetItemState( ATTR_VALUE_FORMAT, true,
&pPoolItem ) == SfxItemState::SET )
{
-sal_uLong nScNumFmt = static_cast< const
SfxUInt32Item* >(pPoolItem)->GetValue();
+sal_uInt32 nScNumFmt = static_cast< const
SfxUInt32Item* >(pPoolItem)->GetValue();
sal_Int32 nXclNumFmt =
GetRoot().GetNumFmtBuffer().Insert(nScNumFmt);
pNumFormat = new XclExpNumFmt( nScNumFmt,
nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, mxFormatter.get(),
mpKeywordTable.get() ));
}
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 3c85323..866c9ab 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -821,12 +821,12 @@ XclExpFormulaCell::XclExpFormulaCell(
XclExpNumFmtBuffer& rNumFmtBfr = rRoot.GetNumFmtBuffer();
// current cell number format
-sal_uLong nScNumFmt = pPattern ?
+sal_uInt32 nScNumFmt = pPattern ?
GETITEMVALUE( pPattern->GetItemSet(), SfxUInt32Item,
ATTR_VALUE_FORMAT, sal_uLong ) :
rNumFmtBfr.GetStandardFormat();
// alternative number format passed to XF buffer
-sal_uLong nAltScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND;
+sal_uInt32 nAltScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND;
/* Xcl doesn't know Boolean number formats, we write
"TRUE";"FALSE" (language dependent). Don't do it for automatic
formula formats, because Excel gets them right. */
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 41e4d00..f2c4461 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -268,11 +268,11 @@ private:
/** Stores a core number format index with corresponding Excel format index. */
struct XclExpNumFmt
{
-sal_uLong mnScNumFmt; /// Core index of the number format.
+sal_uInt32 mnScNumFmt; /// Core index of the number format.
sal_uInt16 mnXclNumFmt;/// Resulting Excel format index.
OUStringmaNumFmtString; /// format string
-inline explicit XclExpNumFmt( sal_uLong nScNumFmt, sal_uInt16
nXclNumFmt, const OUString& rFrmt ) :
+inline explicit XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16
nXclNumFmt, const OUString& rFrmt ) :
mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt
), maNumFmtString( rFrmt ) {}
void SaveXml( XclExpXmlStream& rStrm );
@@ -289,12 +289,12 @@ public:
virtual ~XclExpNumFmtBuffer();
/** Returns the core index of the current standard number format. */
-inline sal_uLongGetStandardFormat() const { return mnStdFmt; }
+inline sal_uInt32 GetStandardFormat() const { return mnStdFmt; }
/** Inserts a number format into the format buffer.
@param nScNumFmt The core index of the number format.
@return The resulting Excel format index. */
-sal_uInt16
Paolo Bernardi license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/mdnsresponder
external/mdnsresponder/UnpackedTarball_mDNSResponder.mk |4
external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 | 83 ++
2 files changed, 87 insertions(+)
New commits:
commit 111f34acca8520e8d6ec6115ca59bb06cf8b4a91
Author: Michael Stahl
Date: Mon Nov 30 15:43:58 2015 +0100
mDNSResponder: add "Use proper return type for DNSServiceRefSockFD"
... as a patch after the commit was erroneously removed while moving
mDNSResponder to external.
Change-Id: I52cd03d94f5c633cd274a111653f947a33cd6140
diff --git a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk
b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk
index 9b436b2..009901a 100644
--- a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk
+++ b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk
@@ -11,4 +11,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,mDNSResponder))
$(eval $(call
gb_UnpackedTarball_set_tarball,mDNSResponder,$(MDNSRESPONDER_TARBALL)))
+$(eval $(call gb_UnpackedTarball_add_patches,mDNSResponder,\
+ external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1
b/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1
new file mode 100644
index 000..e2840f5
--- /dev/null
+++ b/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1
@@ -0,0 +1,83 @@
+commit 77838efb0748689ee77007a92d9a01e03e6dbdb7
+Author: Stephan Bergmann
+AuthorDate: Fri Nov 27 22:40:23 2015 +0100
+Commit: Stephan Bergmann
+CommitDate: Sat Nov 28 14:00:07 2015 +0100
+
+Use proper return type for DNSServiceRefSockFD
+
+...which is e.g. unsigned long long for Windows 64-bit (and declaring the
+function in dns_sd.h is not necessary, and the dnssd_sock_t typedef is not
known
+there)
+
+Change-Id: Iaa0eb03a83b76200204ba905313bcc27b5007b39
+
+diff --git a/mDNSShared/dns_sd.h b/mDNSShared/dns_sd.h
+index 31daaeb..faaa741 100644
+--- a/mDNSShared/dns_sd.h
b/mDNSShared/dns_sd.h
+@@ -741,33 +741,6 @@ DNSServiceErrorType DNSSD_API DNSServiceGetProperty
+ *
+
*/
+
+-/* DNSServiceRefSockFD()
+- *
+- * Access underlying Unix domain socket for an initialized DNSServiceRef.
+- * The DNS Service Discovery implementation uses this socket to communicate
between the client and
+- * the mDNSResponder daemon. The application MUST NOT directly read from or
write to this socket.
+- * Access to the socket is provided so that it can be used as a kqueue event
source, a CFRunLoop
+- * event source, in a select() loop, etc. When the underlying event
management subsystem (kqueue/
+- * select/CFRunLoop etc.) indicates to the client that data is available for
reading on the
+- * socket, the client should call DNSServiceProcessResult(), which will
extract the daemon's
+- * reply from the socket, and pass it to the appropriate application
callback. By using a run
+- * loop or select(), results from the daemon can be processed asynchronously.
Alternatively,
+- * a client can choose to fork a thread and have it loop calling
"DNSServiceProcessResult(ref);"
+- * If DNSServiceProcessResult() is called when no data is available for
reading on the socket, it
+- * will block until data does become available, and then process the data and
return to the caller.
+- * When data arrives on the socket, the client is responsible for calling
DNSServiceProcessResult(ref)
+- * in a timely fashion -- if the client allows a large backlog of data to
build up the daemon
+- * may terminate the connection.
+- *
+- * sdRef: A DNSServiceRef initialized by any of the DNSService
calls.
+- *
+- * return value:The DNSServiceRef's underlying socket descriptor, or -1 on
+- * error.
+- */
+-
+-int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef);
+-
+-
+ /* DNSServiceProcessResult()
+ *
+ * Read a reply from the daemon, calling the appropriate application
callback. This call will
+diff --git a/mDNSShared/dnssd_clientstub.c b/mDNSShared/dnssd_clientstub.c
+index c38197c..c6b50a2 100644
+--- a/mDNSShared/dnssd_clientstub.c
b/mDNSShared/dnssd_clientstub.c
+@@ -799,7 +799,7 @@ cleanup:
+ return err;
+ }
+
+-int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef)
++dnssd_sock_t DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef)
+ {
+ if (!sdRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRefSockFD
called with NULL DNSServiceRef"); return dnssd_InvalidSocket; }
+
+@@ -816,7 +816,7 @@ int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef)
+ return dnssd_InvalidSocket;
+ }
+
+-return (int) sdRef->sockfd;
++return sdRef->sockfd;
+ }
+
+ #if _DNS_SD_LIBDISPATCH
+@@ -2025,7 +2025,7 @@ DNSServiceErrorType DNSSD_API DNSServiceSetDispatchQueue
+ dispatch_queue_t queue
+ )
+ {
+-int dnssd_fd = DNSServiceRefSoc
[Libreoffice-commits] core.git: oox/source
oox/source/docprop/docprophandler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6f59c81bca61a01457cb9c8d00510ed418c755b4
Author: Miklos Vajna
Date: Mon Nov 30 15:04:35 2015 +0100
oox: better warning message on unhandled element in docprophandler
Change-Id: I7ddd5290134ae3cc3b9f7427055537e79919b480
diff --git a/oox/source/docprop/docprophandler.cxx
b/oox/source/docprop/docprophandler.cxx
index c5d89b9..420d783 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -312,7 +312,7 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement(
::sal_Int32 nElement, const
}
else
{
-OSL_FAIL( "For now unexpected tags are ignored!" );
+SAL_WARN("oox", "OOXMLDocPropHandler::startFastElement: unknown
element " << getBaseToken(nElement));
}
if ( m_nInBlock == SAL_MAX_INT32 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source
cui/source/inc/autocdlg.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 85cabc28b9a762a884972a857a6ac6f70e4bcb56 Author: Jan-Marek Glogowski Date: Mon Nov 30 15:14:35 2015 +0100 cui: GCC 4.6 still doesn't do "override" But you can use SAL_OVERRIDE instead. Change-Id: I2697593606ef3ff63f923e364d0ea7e5661b1b3a Reviewed-on: https://gerrit.libreoffice.org/20297 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 4302e0a..fc2a823 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -187,7 +187,7 @@ class AutoCorrEdit : public Edit sal_Int32 m_nCol; bool bSpaces; -void dispose() override; +void dispose() SAL_OVERRIDE; public: AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - compilerplugins/clang
compilerplugins/clang/badstatics.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 5f20d614b7be2a2b5a1dad31695d441a40213e2e Author: Stephan Bergmann Date: Thu Nov 26 09:58:15 2015 +0100 Adapt whitelisted names ...after 49c2b9808df8a6b197dec666dfc0cda6321a4306 "bin/rename-sw-abbreviations.sh" Change-Id: I90cec551bdc52ea4d76dd9e32b45692e8a3be70f (cherry picked from commit 88309564142eecc86e4d30a917032637d5c48e2b) diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx index 394c33e..5900f49 100644 --- a/compilerplugins/clang/badstatics.cxx +++ b/compilerplugins/clang/badstatics.cxx @@ -126,10 +126,10 @@ public: || name == "s_pVout" // _FrmFinit() || name == "s_pPaintQueue" // SwPaintQueue::Remove() || name == "gProp" // only owned (VclPtr) member cleared again -|| name == "g_pColumnCacheLastTabFrm" // not owning -|| name == "g_pColumnCacheLastCellFrm" // not owning -|| name == "g_pRowCacheLastTabFrm" // not owning -|| name == "g_pRowCacheLastCellFrm" // not owning +|| name == "g_pColumnCacheLastTabFrame" // not owning +|| name == "g_pColumnCacheLastCellFrame" // not owning +|| name == "g_pRowCacheLastTabFrame" // not owning +|| name == "g_pRowCacheLastCellFrame" // not owning || name == "g_OszCtrl" // SwCrsrOszControl::Exit() || name == "g_pSpellIter" // SwEditShell::SpellEnd() || name == "g_pConvIter" // SwEditShell::SpellEnd() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - drawinglayer/source
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit b0c13c4927c536e845614f1e7a171b7eed680f35 Author: Michael Stahl Date: Mon Nov 30 15:07:50 2015 +0100 try to fix MSVC build Because i'm an idiot i pushed a commit without looking at the jenkins build failure... Change-Id: I8e7a02d6c1d20c2231288ea050986064f1f814c8 diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx index ba55f41..7c66c2c 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx @@ -27,6 +27,8 @@ #include #include +#include + // buffered VDev usage ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/Connection.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7c057880e5bfdbb1720cfce2ba0551f8d5d366c9 Author: Stephan Bergmann Date: Mon Nov 30 15:02:11 2015 +0100 protected -> private Change-Id: I43d4da8301d9a0c9cc4d48c38c9945551ddc0151 diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index f1954ad..29784dd 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -76,7 +76,7 @@ namespace connectivity * Only relevant for embedded dbs. */ static const OUString our_sDBLocation; -protected: + ::osl::Mutexm_aMutex; TTypeInfoVector m_aTypeInfo;// vector containing an entry ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/headless
vcl/headless/svpgdi.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 4260045035cc90179406da7c13a323d069d47089 Author: Caolán McNamara Date: Mon Nov 30 13:58:31 2015 + fix build, default operator will do Change-Id: I27888bdb0b14434e161e8dc3bd481eb372959ad8 (cherry picked from commit 8bf1ddc61619e40891e5351815892d865d1a3323) diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index c1a5116..2eb8317 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -945,7 +945,6 @@ void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv cairo_clip(cr); cairo_set_source_rgb(cr, 1.0, 1.0, 1.0); -cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE); cairo_mask(cr, pattern); cairo_pattern_destroy(pattern); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpgdi.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 8bf1ddc61619e40891e5351815892d865d1a3323 Author: Caolán McNamara Date: Mon Nov 30 13:58:31 2015 + fix build, default operator will do Change-Id: I27888bdb0b14434e161e8dc3bd481eb372959ad8 diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 2d98b26..de916e7 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1217,7 +1217,6 @@ void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv cairo_clip(cr); cairo_set_source_rgb(cr, 1.0, 1.0, 1.0); -cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE); cairo_mask(cr, pattern); cairo_pattern_destroy(pattern); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - drawinglayer/source
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 33 +++---
1 file changed, 28 insertions(+), 5 deletions(-)
New commits:
commit 43697500af7649ef74cf6bf4bb78abe2e99fed63
Author: Caolán McNamara
Date: Fri Nov 27 16:10:10 2015 +
Resolves: rhbz#1283426 using vdevs based on now dead physical devs is unsafe
This is the same problem that
commit 133e04fc1a870c0aad207e82eefeeeceaba5dc6d
Author: Caolán McNamara
Date: Wed Jun 17 09:23:32 2015 +0100
Resolves: tdf#91880 Invalidate graphics when the gtk window is destroyed
not just when the GtkSalFrame is dtored
tried to fix, but that just made it more unlikely to fail
(cherry picked from commit 26c32cfee9fc9a769adba19f455e4d6c13b6d89d)
(cherry picked from commit aab8bed7c0c0cf4d72af7d8a9d84316280887417)
Change-Id: Icba750c787adb6cd5c5ed0874ef07e6201c4cf25
Reviewed-on: https://gerrit.libreoffice.org/20231
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 93919c0..ba55f41 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -43,6 +43,11 @@ namespace
// allocated/used buffers (remembered to allow deleting them in
destructor)
aBuffersmaUsedBuffers;
+// remember what outputdevice was the template passed to
VirtualDevice::Create
+// so we can test if that OutputDevice was disposed before reusing a
+// virtualdevice because that isn't safe to do at least for Gtk2
+std::map< VclPtr, VclPtr >
maDeviceTemplates;
+
public:
VDevBuffer();
virtual ~VDevBuffer();
@@ -88,14 +93,14 @@ namespace
if (nBits == 0)
nBits = rOutDev.GetBitCount();
+bool bOkay(false);
if(!maFreeBuffers.empty())
{
-bool bOkay(false);
aBuffers::iterator aFound(maFreeBuffers.end());
for(aBuffers::iterator a(maFreeBuffers.begin()); a !=
maFreeBuffers.end(); ++a)
{
-OSL_ENSURE(*a, "Empty pointer in VDevBuffer (!)");
+assert(*a && "Empty pointer in VDevBuffer (!)");
if(nBits == (*a)->GetBitCount())
{
@@ -145,10 +150,25 @@ namespace
{
pRetval = *aFound;
maFreeBuffers.erase(aFound);
+}
+}
-if(bOkay)
+if (pRetval)
+{
+// found a suitable cached virtual device, but the
+// outputdevice it was based on has been disposed,
+// drop it and create a new one instead as reusing
+// such devices is unsafe under at least Gtk2
+if (maDeviceTemplates[pRetval]->isDisposed())
+{
+maDeviceTemplates.erase(pRetval);
+pRetval = nullptr;
+}
+else
+{
+if (bOkay)
{
-if(bClear)
+if (bClear)
{
pRetval->Erase(Rectangle(0, 0, rSizePixel.getWidth(),
rSizePixel.getHeight()));
}
@@ -164,6 +184,7 @@ namespace
if(!pRetval)
{
pRetval = VclPtr::Create(rOutDev, nBits);
+maDeviceTemplates[pRetval] = &rOutDev;
pRetval->SetOutputSizePixel(rSizePixel, bClear);
}
else
@@ -197,7 +218,9 @@ namespace
while(!maFreeBuffers.empty())
{
-(*(maFreeBuffers.end() - 1)).disposeAndClear();
+aBuffers::iterator aLastOne(maFreeBuffers.end() - 1);
+maDeviceTemplates.erase(*aLastOne);
+aLastOne->disposeAndClear();
maFreeBuffers.pop_back();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idlc/inc idlc/source
idlc/inc/idlc/fehelper.hxx | 13 ++---
idlc/source/fehelper.cxx | 14 +++---
idlc/source/parser.y | 12 ++--
3 files changed, 11 insertions(+), 28 deletions(-)
New commits:
commit 0555447cd09fa2851e51cd63543ebc7db0a72a1a
Author: Stephan Bergmann
Date: Mon Nov 30 14:53:59 2015 +0100
FD_complex is unused
...since 8e71d9400bd350d63723c5489ddaadb3d3610baf "Remove UNOIDL 'array' and
'union' vaporware from idlc"
Change-Id: Id4cdef900667cdac466a41e47c189e2d25a62065
diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx
index 6256648..1af6456 100644
--- a/idlc/inc/idlc/fehelper.hxx
+++ b/idlc/inc/idlc/fehelper.hxx
@@ -27,23 +27,14 @@
class FeDeclarator
{
public:
-// Enum to denote types of declarators
-enum DeclaratorType
-{
-FD_simple, // Simple declarator
-FD_complex // Complex declarator (complex_part field used)
-};
-
-FeDeclarator(const OString& name, DeclaratorType declType, AstDeclaration*
pComplPart);
+FeDeclarator(const OString& name);
virtual ~FeDeclarator();
const OString& getName()
{ return m_name; }
bool checkType(AstDeclaration const * pType);
-AstType const * compose(AstDeclaration const * pDecl);
+static AstType const * compose(AstDeclaration const * pDecl);
private:
-AstDeclaration* m_pComplexPart;
OString m_name;
-DeclaratorType m_declType;
};
typedef ::std::list< FeDeclarator* > FeDeclList;
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index 4e4c549..704c953 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -21,10 +21,8 @@
#include
#include "idlc/idlc.hxx"
-FeDeclarator::FeDeclarator(const OString& name, DeclaratorType declType,
AstDeclaration* pComplPart)
-: m_pComplexPart(pComplPart)
-, m_name(name)
-, m_declType(declType)
+FeDeclarator::FeDeclarator(const OString& name)
+: m_name(name)
{
}
@@ -47,8 +45,6 @@ bool FeDeclarator::checkType(AstDeclaration const * type)
AstType const * FeDeclarator::compose(AstDeclaration const * pDecl)
{
-const AstType*pType;
-
if ( pDecl == nullptr )
{
return nullptr;
@@ -58,11 +54,7 @@ AstType const * FeDeclarator::compose(AstDeclaration const *
pDecl)
ErrorHandler::noTypeError(pDecl);
return nullptr;
}
-pType = static_cast(pDecl);
-if (m_declType == FD_simple || m_pComplexPart == nullptr)
-return pType;
-
-return nullptr; // return through this statement should not happen
+return static_cast(pDecl);
}
FeInheritanceHeader::FeInheritanceHeader(
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index c449aa7..8296ac4 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -733,7 +733,7 @@ attribute :
AstInterface * scope = static_cast< AstInterface * >(
idlc()->scopes()->top());
AstAttribute * attr = new AstAttribute(
-$1, $4->compose($2), $4->getName(), scope);
+$1, FeDeclarator::compose($2), $4->getName(), scope);
delete $4;
AstInterface::DoubleMemberDeclarations doubleMembers(
scope->checkMemberClashes(attr));
@@ -1053,7 +1053,7 @@ parameter :
*/
if ( pScope && $5 && $8 )
{
-AstType const * pType = $8->compose($5);
+AstType const * pType = FeDeclarator::compose($5);
if ( pType )
{
if (pScope->isConstructor() && $2 != DIR_IN) {
@@ -1570,7 +1570,7 @@ property :
continue;
}
-pType = pDecl->compose($2);
+pType = FeDeclarator::compose($2);
if ( !pType )
{
@@ -2047,7 +2047,7 @@ type_declarator :
continue;
}
-pType = pDecl->compose($1);
+pType = FeDeclarator::compose($1);
if ( !pType )
{
@@ -2122,7 +2122,7 @@ declarator :
checkIdentifier($1);
}
-$$ = new FeDeclarator(*$1, FeDeclarator::FD_simple, NULL);
+$$ = new FeDeclarator(*$1);
delete $1;
}
;
@@ -2556,7 +2556,7 @@ member :
continue;
}
-pType = pDecl->compose($1);
+pType = FeDeclarator::compose($1);
if ( !pType )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 11 commits - extensions/source instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk RepositoryExternal.mk solenv/gbuild v
RepositoryExternal.mk| 17 - extensions/source/update/feed/updatefeed.cxx | 20 instsetoo_native/CustomTarget_setup.mk |9 - instsetoo_native/Package_setup.mk|1 - solenv/gbuild/Gallery.mk |5 + solenv/gbuild/gbuild.help.txt|3 +++ solenv/gbuild/platform/macosx.mk |4 ++-- vcl/opengl/win/WinDeviceInfo.cxx |4 ++-- vcl/source/outdev/font.cxx |6 ++ vcl/source/outdev/text.cxx | 14 +- xmlsecurity/source/xmlsec/saxhelper.cxx |2 +- 11 files changed, 48 insertions(+), 37 deletions(-) New commits: commit 1d554c22c27189773dce3890b05ee64048f79016 Author: Michael Stahl Date: Fri Nov 27 12:49:34 2015 +0100 fix build tool dependencies on INSTROOT files These should generally be INSTROOT_FOR_BUILD instead; also gengal only had the URE's services.rdb (twice) but not the basis layer one. Change-Id: If9cab809296fd66c1785562c5e5be6b2569d179c (cherry picked from commit 4e6b4fbac4d3e1cbbb486aa26940f484a1cb65d1) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 994348f..2a80542 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3715,10 +3715,9 @@ endef define gb_Executable__register_climaker $(call gb_Executable_add_runtime_dependencies,climaker,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(call gb_Rdb_get_target_for_build,ure/services) \ - $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ + $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ - $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) + $(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) ) endef @@ -3746,6 +3745,7 @@ gb_Gallery__UNO_COMPONENTS := \ unoxml/source/service/unoxml # This is used to determine what we need for 'build' platform. +# FIXME: the library target should be for build too define gb_Executable__register_gengal $(call gb_Executable_add_runtime_dependencies,gengal,\ $(foreach component,$(gb_Gallery__UNO_COMPONENTS) \ @@ -3756,8 +3756,8 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\ $(call gb_Package_get_target_for_build,postprocess_registry) \ $(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \ $(call gb_Package_get_target_for_build,instsetoo_native_setup) \ - $(call gb_Rdb_get_target_for_build,ure/services) \ - $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ + $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ + $(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \ $(call gb_UnoApi_get_target,offapi) \ $(call gb_UnoApi_get_target,udkapi) \ ) @@ -3796,8 +3796,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \ $(call gb_Rdb_get_target_for_build,saxparser) \ - $(call gb_Rdb_get_target_for_build,ure/services) \ - $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ + $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -3809,8 +3808,7 @@ endef define gb_Executable__register_uno $(call gb_Executable_add_runtime_dependencies,uno,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(call gb_Rdb_get_target_for_build,ure/services) \ - $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ + $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ ) endef commit 4f354617ff8c31e62025e2743635d113a6413e16 Author: Michael Stahl Date: Fri Nov 27 12:16:47 2015 +0100 Revert "gengal: create an ini / rc file - to bootstrap services properly." This reverts commit 795c61e052671d4de6a3b9cf77f9c0ad117e064d. but what is 795c61e052671d4de6a3b9cf77f9c0ad117e064d supposed to help anyway? on all platforms, gengal should already get URE_BOOTSTRAP set, either via redirectrc, or via extendApplicationEnvironment() sberg_: so ... you mean that gengal.rc is actually unnecessary, and that the problem was caused by a missing dep on Package_instsetoo_native_setup ? I'm pretty sure a missing gengal ini-file was a red herring Change-Id: I50ebc360e0e5c75c16f8407cbac6a54753fca272 Reviewed-on: https://gerrit.libreoffice.org/20226 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 5c4ca57923a5409b96b1ac999f6b89c53e52829e) diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 3edf1b8..e4cdd53 100644 --- a/instsetoo_native/CustomT
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk |6 ++ solenv/gbuild/platform/windows.mk |5 - 2 files changed, 6 insertions(+), 5 deletions(-) New commits: commit 686611019fee67e130452ad0b4abe50647d948fb Author: Noel Grandin Date: Mon Nov 30 15:20:40 2015 +0200 move disabling of LNK4217 since it's Visual Studio specific, not Windows-specific Change-Id: I740b392f1aa9ff9c534b0e2fe021de7f93495e4c diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 478726a..6ff3880 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -262,6 +262,12 @@ gb_LinkTarget_LDFLAGS := \ $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \ $(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB) \ +# Prevent warning spamming +# Happens because of the way we link our unit tests with our libraries. +gb_LinkTarget_LDFLAGS += \ + /ignore:4217 + + gb_DEBUGINFO_FLAGS := -Zi ifeq ($(VCVER),120) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 42cb134..a2e621d 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -50,9 +50,4 @@ gb_Executable_LAYER := \ # empty to avoid --warn-undefined-functions gb_Library__set_soversion_script_platform = -# Prevent warning spamming -# Happens because of the way we link our unit tests with our libraries. -gb_LinkTarget_LDFLAGS += \ - /ignore:4217 - # vim:set noexpandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source
vcl/source/app/scheduler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 124f5535097b3e109483936ebc9393531401af8b
Author: Noel Grandin
Date: Thu Nov 26 09:26:13 2015 +0200
loplugin:redundantcast
Change-Id: I3fd7b6f8215bdd9e482cc81522a70cabc0080c4f
(cherry picked from commit ce5024ad52f38df064610bdba0409896b6f912c7)
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index e176866..9450393 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -256,7 +256,7 @@ sal_uInt64 Scheduler::CalculateMinimumTimeout( bool
&bHasActiveIdles )
{
Scheduler::ImplStartTimer(nMinPeriod, true);
SAL_INFO("vcl.schedule", "Calculated minimum timeout as " <<
nMinPeriod << " and " <<
- (const char *)(bHasActiveIdles ? "has active idles" : "no
idles"));
+ (bHasActiveIdles ? "has active idles" : "no idles"));
}
return nMinPeriod;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/gbuild.help.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 21f40d6f9460d378059d136afcdae3a56b98cb5d Author: Michael Stahl Date: Mon Nov 30 10:31:58 2015 +0100 gbuild: fix typo in help Change-Id: I6e65f70848eb466c7c08fcffb478a2963b91cdb6 diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index a0ef94de..aead63d 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -78,7 +78,7 @@ AVAILABLE TARGETS o Library o Package o Pagein - o PythonTest_pytests + o PythonTest o Pyuno o Rdb o StaticLibrary ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: lost calc feature in LO
Hi Andreas,
On Friday, 2015-11-27 08:14:01 +0100, Andreas Baier wrote:
> having started work at LHMuenchen in the development departement with focus
> on LibreOffice under LiMux/kubuntu my current task is to reactivate a
> deactivated feature within calc which again is supposed to allow DDE link in
> addition to the newer and current external file link.
Could you please elaborate what exactly you think would be
the "deactivated feature"?
> Though the construction of DDE link still works, as long as I replace file
> link functionality.
> But otherwise the additional switch DDE link vs. file link rises to become a
> problem to me where to place the switch in the depth.
> I did not find a single or definite interface for all the selections to
> insert a value and the still existent decision is controlled not only by a
> define
> SotClipboardFormatId::LINK
> but at least a text string
> OUString aExtraBits("calc:extref")
> and some other hidden data.
> I would be glad to obtain a hint where to find some more locations of
> decision. Can anyone help me ?
Sorry, I'm lost, I don't know what you are up to.
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack
signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac download.lst external/mdnsresponder external/Module_external.mk Makefile.fetch RepositoryExternal.mk sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk sd/sour
Makefile.fetch |1 RepositoryExternal.mk | 12 configure.ac|5 download.lst|2 external/Module_external.mk |1 external/mdnsresponder/Makefile |7 external/mdnsresponder/Module_mdnsresponder.mk | 20 external/mdnsresponder/README |4 external/mdnsresponder/StaticLibrary_mDNSResponder.mk | 37 external/mdnsresponder/UnpackedTarball_mDNSResponder.mk | 14 sd/CppunitTest_sd_uimpress.mk |1 sd/Library_sd.mk|9 sd/source/ui/remotecontrol/WINNetworkService.cxx|1 sd/source/ui/remotecontrol/WINNetworkService.hxx|2 sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h | 1213 sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c| 2978 sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h| 1576 -- sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c| 319 - sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.h| 90 sd/source/ui/remotecontrol/mDNSResponder/dllmain.c | 113 sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h | 2459 - sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c | 366 - sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c | 2219 sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c| 161 sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h| 222 25 files changed, 105 insertions(+), 11727 deletions(-) New commits: commit 9ec0e6d9cbb0b61e5cf37917baee31f2af1a2897 Author: Michael Stahl Date: Fri Nov 27 23:54:40 2015 +0100 sd: replace embedded mDNSResponder code with proper external tarball The diff against the 379.37 release is 2500 lines, one of which actually does anything at runtime (missing va_end()). Change-Id: I1824e61fd4ac6c3ce28084913a2661134a03fd51 Reviewed-on: https://gerrit.libreoffice.org/20248 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/Makefile.fetch b/Makefile.fetch index 8b2da4e..cbc51b2 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -165,6 +165,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \ $(call fetch_Optional,MARIADB,MARIADB_TARBALL) \ $(call fetch_Optional,MDDS,MDDS_TARBALL) \ + $(call fetch_Optional,MDNSRESPONDER,MDNSRESPONDER_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CALADEA_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CARLITO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_DEJAVU_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2c00a33..cba5316 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2442,6 +2442,18 @@ gb_LinkTarget__use_coinmp := endif # ENABLE_COINMP +ifneq (,$(filter MDNSRESPONDER,$(BUILD_TYPE))) + +define gb_LinkTarget__use_mDNSResponder +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,mDNSResponder)/mDNSShared \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_use_static_libraries,$(1),mDNSResponder) +endef + +endif # MDNSRESPONDER + ifeq ($(ENABLE_GIO),TRUE) define gb_LinkTarget__use_gio diff --git a/configure.ac b/configure.ac index 9a13921..eb569d1 100644 --- a/configure.ac +++ b/configure.ac @@ -11805,7 +11805,10 @@ AC_SUBST(CAIRO_LIBS) dnl === dnl Test whether to use avahi dnl === -if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_avahi" = "yes"; then +if test "$_os" = "WINNT"; then +# Windows uses bundled mDNSResponder +BUILD_TYPE="$BUILD_TYPE MDNSRESPONDER" +elif test "$_os" != "Darwin" -a "$enable_avahi" = "yes"; then PKG_CHECK_MODULES([AVAHI], [avahi-client >= 0.6.10], [ENABLE_AVAHI="TRUE"]) AC_DEFINE(HAVE_FEATURE_AVAHI) diff --git a/download.lst b/download.lst index 8774343..0201a61e 100755 --- a/download.lst +++ b/download.lst @@ -95,6 +95,8 @@ export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz export MDDS_MD5SUM := 74e0a81c5af4137285fe6a52217f71e4 export MDDS_TARBALL := mdds_1.0.0.tar.bz2 +export MDNSRESPONDER_MD5SUM := dd557e1058b51ac2f29cd01d67be0145 +export MDNSRESPONDER_TARBALL := mDNSResponder-379.37.tar.gz export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41 export MSPUB_TARBALL := libmspub-0.1.2.tar
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/windows.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 883321e141906f5dad47f0021a2fa8cadc3b9a01 Author: Noel Grandin Date: Mon Nov 30 13:37:15 2015 +0200 remove LNK4217 warning spam from Windows build it just makes the build error logs harder to read. it's not like we are ever going to fix it. Change-Id: I26be4deb7b72d142fcee62ea3eee2dd0bd607716 Reviewed-on: https://gerrit.libreoffice.org/20284 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index a2e621d..42cb134 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -50,4 +50,9 @@ gb_Executable_LAYER := \ # empty to avoid --warn-undefined-functions gb_Library__set_soversion_script_platform = +# Prevent warning spamming +# Happens because of the way we link our unit tests with our libraries. +gb_LinkTarget_LDFLAGS += \ + /ignore:4217 + # vim:set noexpandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/document.hxx |2 -
sc/source/filter/excel/xeescher.cxx | 57 +++-
2 files changed, 51 insertions(+), 8 deletions(-)
New commits:
commit 343e405f18a51abd6d386072ad33978fa83b8b31
Author: Noel Grandin
Date: Mon Nov 30 14:50:14 2015 +0200
tdf#8 - FILESAVE: Saving an XLSX file freezes Calc
Change-Id: I7abbb1cc5056f33458257afe28ed933e2d3c378d
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 781db63..4720d34 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -693,7 +693,7 @@ public:
voidSetPendingRowHeights( SCTAB nTab, bool bSet );
SC_DLLPUBLIC void SetLayoutRTL( SCTAB nTab, bool bRTL );
SC_DLLPUBLIC bool IsLayoutRTL( SCTAB nTab ) const;
-boolIsNegativePage( SCTAB nTab ) const;
+SC_DLLPUBLIC bool IsNegativePage( SCTAB nTab ) const;
SC_DLLPUBLIC void SetScenario( SCTAB nTab, bool bFlag );
SC_DLLPUBLIC bool IsScenario( SCTAB nTab ) const;
SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, OUString& rComment,
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index cbaf7c2..6e04a38 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -159,15 +159,15 @@ static void lcl_WriteAnchorVertex(
sax_fastparser::FSHelperPtr rComments, Rectan
static void lcl_GetFromTo( const XclExpRoot& rRoot, const Rectangle &aRect,
sal_Int32 nTab, Rectangle &aFrom, Rectangle &aTo )
{
-bool bTo = false;
sal_Int32 nCol = 0, nRow = 0;
sal_Int32 nColOff = 0, nRowOff= 0;
-while(true)
+const bool bRTL = rRoot.GetDocRef().IsNegativePage( nTab );
+if (!bRTL)
{
-Rectangle r = rRoot.GetDocRef().GetMMRect( nCol,nRow,nCol,nRow,nTab );
-if( !bTo )
+while(true)
{
+Rectangle r = rRoot.GetDocRef().GetMMRect(
nCol,nRow,nCol,nRow,nTab );
if( r.Left() <= aRect.Left() )
{
nCol++;
@@ -182,11 +182,38 @@ static void lcl_GetFromTo( const XclExpRoot& rRoot, const
Rectangle &aRect, sal_
{
aFrom = Rectangle( nCol-1, static_cast(HMM2XL( nColOff
)),
nRow-1, static_cast(HMM2XL( nRowOff
)) );
-bTo=true;
+break;
}
}
-if( bTo )
+}
+else
+{
+while(true)
{
+Rectangle r = rRoot.GetDocRef().GetMMRect(
nCol,nRow,nCol,nRow,nTab );
+if( r.Left() >= aRect.Left() )
+{
+nCol++;
+nColOff = r.Left() - aRect.Left();
+}
+if( r.Top() <= aRect.Top() )
+{
+nRow++;
+nRowOff = aRect.Top() - r.Top();
+}
+if( r.Left() < aRect.Left() && r.Top() > aRect.Top() )
+{
+aFrom = Rectangle( nCol-1, static_cast(HMM2XL( nColOff
)),
+ nRow-1, static_cast(HMM2XL( nRowOff
)) );
+break;
+}
+}
+}
+if (!bRTL)
+{
+while(true)
+{
+Rectangle r = rRoot.GetDocRef().GetMMRect(
nCol,nRow,nCol,nRow,nTab );
if( r.Right() < aRect.Right() )
nCol++;
if( r.Bottom() < aRect.Bottom() )
@@ -199,7 +226,23 @@ static void lcl_GetFromTo( const XclExpRoot& rRoot, const
Rectangle &aRect, sal_
}
}
}
-return;
+else
+{
+while(true)
+{
+Rectangle r = rRoot.GetDocRef().GetMMRect(
nCol,nRow,nCol,nRow,nTab );
+if( r.Right() >= aRect.Right() )
+nCol++;
+if( r.Bottom() < aRect.Bottom() )
+nRow++;
+if( r.Right() < aRect.Right() && r.Bottom() >= aRect.Bottom() )
+{
+aTo = Rectangle( nCol, static_cast(HMM2XL( r.Left() -
aRect.Right() )),
+ nRow, static_cast(HMM2XL(
aRect.Bottom() - r.Top() )));
+break;
+}
+}
+}
}
// Escher client anchor ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source sfx2/source
desktop/source/lib/init.cxx | 26 +++---
sfx2/source/control/unoctitm.cxx | 14 +-
2 files changed, 24 insertions(+), 16 deletions(-)
New commits:
commit b8627ad4db379bfa5b9411aaccb1663d7c66c933
Author: Mihai Varga
Date: Mon Nov 30 14:45:27 2015 +0200
LOK: get state change feedback for more uno commands
I've also ordered them alphabetically so we can read them easier.
Change-Id: Ia332f1662a91de4a4068f0056a3d969fe978a744
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d2f14de..49a1ef1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -661,23 +661,27 @@ static void doc_iniUnoCommands ()
{
OUString sUnoCommands[] =
{
+OUString(".uno:BackColor"),
OUString(".uno:Bold"),
-OUString(".uno:Italic"),
-OUString(".uno:Underline"),
-OUString(".uno:Strikeout"),
+OUString(".uno:CenterPara"),
+OUString(".uno:CharFontName"),
+OUString(".uno:DecrementIndent"),
OUString(".uno:DefaultBullet"),
OUString(".uno:DefaultNumbering"),
+OUString(".uno:FontColor"),
+OUString(".uno:FontHeight"),
+OUString(".uno:IncrementIndent"),
+OUString(".uno:Italic"),
+OUString(".uno:JustifyPara"),
+OUString(".uno:OutlineFont"),
OUString(".uno:LeftPara"),
-OUString(".uno:CenterPara"),
OUString(".uno:RightPara"),
-OUString(".uno:JustifyPara"),
-OUString(".uno:IncrementIndent"),
-OUString(".uno:DecrementIndent"),
-OUString(".uno:CharFontName"),
-OUString(".uno:FontHeight"),
+OUString(".uno:Shadowed"),
+OUString(".uno:SubScript"),
+OUString(".uno:SuperScript"),
+OUString(".uno:Strikeout"),
OUString(".uno:StyleApply"),
-OUString(".uno:FontColor"),
-OUString(".uno:BackColor")
+OUString(".uno:Underline")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index cb3050a..efb7026 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1064,15 +1064,19 @@ void
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
aBuffer.append("=");
if (aEvent.FeatureURL.Path == "Bold" ||
-aEvent.FeatureURL.Path == "Italic" ||
-aEvent.FeatureURL.Path == "Underline" ||
-aEvent.FeatureURL.Path == "Strikeout" ||
+aEvent.FeatureURL.Path == "CenterPara" ||
aEvent.FeatureURL.Path == "DefaultBullet" ||
aEvent.FeatureURL.Path == "DefaultNumbering" ||
+aEvent.FeatureURL.Path == "Italic" ||
+aEvent.FeatureURL.Path == "JustifyPara" ||
aEvent.FeatureURL.Path == "LeftPara" ||
-aEvent.FeatureURL.Path == "CenterPara" ||
+aEvent.FeatureURL.Path == "OutlineFont" ||
aEvent.FeatureURL.Path == "RightPara" ||
-aEvent.FeatureURL.Path == "JustifyPara")
+aEvent.FeatureURL.Path == "Shadowed" ||
+aEvent.FeatureURL.Path == "SubScript" ||
+aEvent.FeatureURL.Path == "SuperScript" ||
+aEvent.FeatureURL.Path == "Strikeout" ||
+aEvent.FeatureURL.Path == "Underline")
{
bool bTemp = false;
aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/mmeeks/opengl-backbuffer' - 858 commits - accessibility/inc accessibility/source android/source avmedia/source basctl/source basctl/uiconfig basebmp/inc
Rebased ref, commits from common ancestor:
commit c6d3598f2fb9e5f46f5df2c997ac7c09813ee7b9
Author: Michael Meeks
Date: Fri Nov 27 18:56:54 2015 +
vcl: move begin/end paint counting to SalGraphics where it fits nicely.
Also elide dupliate swap / flushes - if no rendering occurred between times.
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 36efe03..92d4d11 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -248,7 +248,6 @@ private:
public:
vcl::Region maClipRegion;
-int mnPainting;
// Don't hold references to ourselves:
OpenGLContext *mpPrevContext;
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 2bf3f07..68a5170 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -612,8 +612,9 @@ public:
*/
class PaintScope {
VclPtr mpDev;
+void*mpDebug;
public:
-PaintScope(OutputDevice *);
+explicit PaintScope(OutputDevice *);
~PaintScope();
void flush();
};
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 87000c3..d280743 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -347,12 +347,8 @@ public:
virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const
Gradient& rGradient) override;
-virtual OpenGLContext *beginPaint() override;
-virtual void endPaint() override;
-
/// flush contents of the back-buffer to the screen & swap.
-void flushAndSwap();
-private:
+virtual void flush() override;
};
#endif
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 14fb2fa..c8ae6b2 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -253,6 +253,13 @@ public:
{ return m_pProc ? long(m_pProc( m_pWindow,
const_cast(this), nEvent, pEvent )) : 0; }
bool PaintsBlocked() const { return m_bPaintsBlocked; }
+
+// track painting, and flush when its done.
+voidBeginPaint();
+voidEndPaint();
+sal_uInt32 GetPaintNesting() { return m_nPaintNesting; }
+private:
+sal_uInt32 m_nPaintNesting;
};
#endif // INCLUDED_VCL_INC_SALFRAME_HXX
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 62f714f..045ae48 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -438,11 +438,11 @@ public:
sal_uInt8 nTransparency,
const OutputDevice *pOutDev );
-virtual OpenGLContext *BeginPaint() { return nullptr; }
-virtual voidEndPaint() { }
-
virtual SystemGraphicsData GetGraphicsData() const = 0;
+/// Push any pending rendering to the screen.
+virtual voidFlush();
+
#if ENABLE_CAIRO_CANVAS
/// Check whether cairo will work
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index 1a1c3ef..7a6858f 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -212,8 +212,8 @@ public:
virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const
Gradient& rGradient) = 0;
-virtual OpenGLContext *beginPaint() { return nullptr; }
-virtual void endPaint() { }
+/// flush and hence render any pending rendering commands
+virtual void flush() { }
};
#endif
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index ea7da0b..9212a99 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -263,9 +263,6 @@ public:
virtual css::uno::Any
GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const
basegfx::B2ISize& rSize) const override;
virtual SystemFontData GetSysFontData( int nFallbackLevel ) const
override;
-virtual OpenGLContext *BeginPaint() override;
-virtual voidEndPaint() override;
-
bool TryRenderCachedNativeControl(ControlCacheKey& aControlCacheKey,
int nX, int nY);
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 25a416b..4fb8414 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -436,9 +436,6 @@ public:
virtual SystemGraphicsData GetGraphicsData() const override;
-virtual OpenGLContext *BeginPaint() override;
-virtual void EndPaint() override;
-
/// Update settings based on the platform values
static void updateSettingsNative( AllSettings& rSettings );
};
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index a87c05c..b21eb12 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -154,6 +154,10 @@ void OpenGLSalGraphicsImpl::Init()
mpContext->ReleaseFramebuffer( maOffscreenTex );
}
maOffscreenTex = OpenGLTexture();
+SAL_DEBUG("paint: " << this << " size mismatch - delete texture " <<
+
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gtksalframe.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2d49006f7cb04d7b3b71481f1f3aecf0f6d70dff
Author: Caolán McNamara
Date: Mon Nov 30 12:01:07 2015 +
uninitialized m_pGraphics -> cppcanvas_emfplus kaboom
Change-Id: I370f63ed12e187684332112b9510a9892a665129
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 6da958d..c5c01a4 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -494,6 +494,7 @@ void GtkSalFrame::doKeyCallback( guint state,
GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
: m_nXScreen( getDisplay()->GetDefaultXScreen() )
+, m_pGraphics(nullptr)
{
getDisplay()->registerFrame( this );
m_bDefaultPos = true;
@@ -507,6 +508,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent,
SalFrameStyleFlags nStyle )
GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
: m_nXScreen( getDisplay()->GetDefaultXScreen() )
+, m_pGraphics(nullptr)
{
getDisplay()->registerFrame( this );
// permanently ignore errors from our unruly children ...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: smoketest/Executable_libtest.mk
smoketest/Executable_libtest.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 367dc08f9a7e34fe108c289a59548716e9abdf54 Author: Tor Lillqvist Date: Mon Nov 30 13:52:34 2015 +0200 Use -ldl -pthread only on Linux Change-Id: I968449ac3c12011cb32bf9c29db66ad2ae4553f1 diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk index 3b3bd16..4ba29ee 100644 --- a/smoketest/Executable_libtest.mk +++ b/smoketest/Executable_libtest.mk @@ -17,10 +17,12 @@ $(eval $(call gb_Executable_use_libraries,libtest,\ $(gb_UWINAPI) \ )) +ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_libs,libtest,\ -ldl \ -pthread \ )) +endif $(eval $(call gb_Executable_add_exception_objects,libtest,\ smoketest/libtest \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/frame.hxx | 183 +--
1 file changed, 91 insertions(+), 92 deletions(-)
New commits:
commit ac95a8b2e9e68111a24aa20c04eb18fba4a5c6e9
Author: Stephan Bergmann
Date: Mon Nov 30 12:30:35 2015 +0100
Move uses of SwFrame pointer-to-member after definition of class SwFrame
...to avoid trouble with MSVC's pointer-to-member model, where the details
of a
pointer-to-member depend on details of the pointed-to class type.
Change-Id: Id5b3be1696794d23fbad96f047d114e27395b134
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 12bc2c6..e942315 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -94,98 +94,6 @@ typedef struct _xmlTextWriter *xmlTextWriterPtr;
#define FRM_HEADFOOT0x0018
#define FRM_BODYFTNC0x00a0
-class SwFrame;
-typedef long (SwFrame:: *SwFrameGet)() const;
-typedef bool (SwFrame:: *SwFrameMax)( long );
-typedef void (SwFrame:: *SwFrameMakePos)( const SwFrame*, const SwFrame*, bool
);
-typedef long (*SwOperator)( long, long );
-typedef void (SwFrame:: *SwFrameSet)( long, long );
-
-struct SwRectFnCollection
-{
-SwRectGet fnGetTop;
-SwRectGet fnGetBottom;
-SwRectGet fnGetLeft;
-SwRectGet fnGetRight;
-SwRectGet fnGetWidth;
-SwRectGet fnGetHeight;
-SwRectPoint fnGetPos;
-
-SwRectSet fnSetTop;
-SwRectSet fnSetBottom;
-SwRectSet fnSetLeft;
-SwRectSet fnSetRight;
-SwRectSet fnSetWidth;
-SwRectSet fnSetHeight;
-
-SwRectSet fnSubTop;
-SwRectSet fnAddBottom;
-SwRectSet fnSubLeft;
-SwRectSet fnAddRight;
-SwRectSet fnAddWidth;
-SwRectSet fnAddHeight;
-
-SwRectSet fnSetPosX;
-SwRectSet fnSetPosY;
-
-SwFrameGet fnGetTopMargin;
-SwFrameGet fnGetBottomMargin;
-SwFrameGet fnGetLeftMargin;
-SwFrameGet fnGetRightMargin;
-SwFrameSet fnSetXMargins;
-SwFrameSet fnSetYMargins;
-SwFrameGet fnGetPrtTop;
-SwFrameGet fnGetPrtBottom;
-SwFrameGet fnGetPrtLeft;
-SwFrameGet fnGetPrtRight;
-SwRectDist fnTopDist;
-SwRectDist fnBottomDist;
-SwFrameMax fnSetLimit;
-SwRectMax fnOverStep;
-
-SwRectSetPosfnSetPos;
-SwFrameMakePos fnMakePos;
-SwOperator fnXDiff;
-SwOperator fnYDiff;
-SwOperator fnYInc;
-
-SwRectSetTwice fnSetLeftAndWidth;
-SwRectSetTwice fnSetTopAndHeight;
-};
-
-typedef SwRectFnCollection* SwRectFn;
-
-extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
-#define SWRECTFN( pFrame )bool bVert = pFrame->IsVertical(); \
-bool bRev = pFrame->IsReverse(); \
-bool bVertL2R = pFrame->IsVertLR(); \
-SwRectFn fnRect = bVert ? \
-( bRev ? fnRectVL2R : ( bVertL2R ?
fnRectVertL2R : fnRectVert ) ): \
-( bRev ? fnRectB2T : fnRectHori );
-#define SWRECTFNX( pFrame ) bool bVertX = pFrame->IsVertical(); \
-bool bRevX = pFrame->IsReverse(); \
-bool bVertL2RX = pFrame->IsVertLR(); \
-SwRectFn fnRectX = bVertX ? \
-( bRevX ? fnRectVL2R : ( bVertL2RX ?
fnRectVertL2R : fnRectVert ) ): \
-( bRevX ? fnRectB2T : fnRectHori );
-#define SWREFRESHFN( pFrame ) { if( bVert != pFrame->IsVertical() || \
- bRev != pFrame->IsReverse() ) \
-bVert = pFrame->IsVertical(); \
-bRev = pFrame->IsReverse(); \
-bVertL2R = pFrame->IsVertLR(); \
-fnRect = bVert ? \
-( bRev ? fnRectVL2R : ( bVertL2R ?
fnRectVertL2R : fnRectVert ) ): \
-( bRev ? fnRectB2T : fnRectHori ); }
-#define SWRECTFN2( pFrame ) bool bVert = pFrame->IsVertical(); \
-bool bVertL2R = pFrame->IsVertLR(); \
-bool bNeighb = pFrame->IsNeighbourFrame(); \
-SwRectFn fnRect = bVert == bNeighb ? \
-fnRectHori : ( bVertL2R ? fnRectVertL2R :
fnRectVert );
-
-#define POS_DIFF( aFrame1, aFrame2 ) \
-( (aFrame1.*fnRect->fnGetTop)() != (aFrame2.*fnRect->fnGetTop)()
|| \
-(aFrame1.*fnRect->fnGetLeft)() != (aFrame2.*fnRect->fnGetLeft)() )
-
// for GetNextLeaf/GetPrevLeaf.
enum MakePageType
{
@@ -1173,6 +1081,97 @@ public:
}
};
+typedef long (SwFrame:: *SwFrameGet)() const;
+typedef bool (SwFrame:: *SwFrameMax)( long );
+typedef void (SwFrame:: *SwFrameMakePos)( const SwFrame*, const SwFrame*, bool
);
+typedef long (*SwOperator
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx | 16 ---
vcl/unx/gtk/gtksalframe.cxx | 93 ---
2 files changed, 37 insertions(+), 72 deletions(-)
New commits:
commit ef242ae01047f6b8a0a9012e4e40509dd1c03145
Author: Michael Meeks
Date: Mon Nov 30 11:04:01 2015 +
vcl: move gtk+ to sharing the same SalGraphics per SalFrame.
This makes the code consistent with other: Mac, Unx, Windows
backends, and allows us to cache an OpenGL back-buffer on the
SalGraphics - as per Mac.
The lifecycle of a SalFrame and a SalGraphics should be
consistent for real OS graphics now.
Change-Id: I11fea2ce1c1386b1c6b0161a718e5c909c81612c
Reviewed-on: https://gerrit.libreoffice.org/20283
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 472aae7..d1203a3 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -62,19 +62,6 @@ typedef ::Window GdkNativeWindow;
class GtkSalFrame : public SalFrame, public X11WindowProvider
{
-static const int nMaxGraphics = 2;
-
-struct GraphicsHolder
-{
-GtkSalGraphics* pGraphics;
-boolbInUse;
-GraphicsHolder()
-: pGraphics( nullptr ),
- bInUse( false )
-{}
-~GraphicsHolder();
-};
-
struct IMHandler
{
@@ -187,7 +174,8 @@ class GtkSalFrame : public SalFrame, public
X11WindowProvider
std::list< GtkSalFrame* > m_aChildren;
GdkWindowState m_nState;
SystemEnvData m_aSystemData;
-GraphicsHolder m_aGraphics[ nMaxGraphics ];
+GtkSalGraphics *m_pGraphics;
+boolm_bGraphics;
sal_uInt16 m_nKeyModifiers;
GdkCursor *m_pCurrentCursor;
GdkVisibilityState m_nVisibility;
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 923581d..6da958d 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -492,11 +492,6 @@ void GtkSalFrame::doKeyCallback( guint state,
CallCallback( SALEVENT_KEYUP, &aEvent );
}
-GtkSalFrame::GraphicsHolder::~GraphicsHolder()
-{
-delete pGraphics;
-}
-
GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
: m_nXScreen( getDisplay()->GetDefaultXScreen() )
{
@@ -845,15 +840,13 @@ void GtkSalFrame::EnsureAppMenuWatch()
void GtkSalFrame::InvalidateGraphics()
{
-for (unsigned int i = 0; i < SAL_N_ELEMENTS(m_aGraphics); ++i)
+if( m_pGraphics )
{
-if( !m_aGraphics[i].pGraphics )
-continue;
#if !GTK_CHECK_VERSION(3,0,0)
-m_aGraphics[i].pGraphics->SetDrawable( None, m_nXScreen );
-m_aGraphics[i].pGraphics->SetWindow(nullptr);
+m_pGraphics->SetDrawable( None, m_nXScreen );
+m_pGraphics->SetWindow(nullptr);
#endif
-m_aGraphics[i].bInUse = false;
+m_bGraphics = false;
}
}
@@ -926,6 +919,9 @@ GtkSalFrame::~GtkSalFrame()
g_object_unref( G_OBJECT( m_pForeignParent ) );
if( m_pForeignTopLevel )
g_object_unref( G_OBJECT( m_pForeignTopLevel) );
+
+delete m_pGraphics;
+m_pGraphics = NULL;
}
void GtkSalFrame::moveWindow( long nX, long nY )
@@ -1172,6 +1168,9 @@ void GtkSalFrame::InitCommon()
m_aSystemData.pAppContext = nullptr;
m_aSystemData.pShellWidget = m_aSystemData.pWidget;
+m_bGraphics = false;
+m_pGraphics = NULL;
+
// fake an initial geometry, gets updated via configure event or SetPosSize
if( m_bDefaultPos || m_bDefaultSize )
{
@@ -1596,45 +1595,32 @@ void GtkSalFrame::SetExtendedFrameStyle( SalExtStyle
nStyle )
SalGraphics* GtkSalFrame::AcquireGraphics()
{
-if( m_pWindow )
+if( m_bGraphics )
+return nullptr;
+
+if( !m_pGraphics )
{
-for( int i = 0; i < nMaxGraphics; i++ )
-{
-if( ! m_aGraphics[i].bInUse )
-{
-m_aGraphics[i].bInUse = true;
-if( ! m_aGraphics[i].pGraphics )
-{
#if GTK_CHECK_VERSION(3,0,0)
-m_aGraphics[i].pGraphics = new GtkSalGraphics( this,
m_pWindow );
-if( !m_aFrame.get() )
-{
-AllocateFrame();
-TriggerPaintEvent();
-}
-m_aGraphics[i].pGraphics->setDevice( m_aFrame );
+m_pGraphics = new GtkSalGraphics( this, m_pWindow );
+if( !m_aFrame.get() )
+{
+AllocateFrame();
+TriggerPaintEvent();
+}
+m_pGraphics->setDevice( m_aFrame );
#else // common case:
-m_aGraphics[i].pGraphics = new GtkSalGraphics( this,
m_pWindow, m_nXScreen );
+m_pGraphics = new GtkSalGraphics( this, m_pWi
[Libreoffice-commits] core.git: dtrans/source
dtrans/source/win32/ftransl/ftransl.cxx | 300
dtrans/source/win32/ftransl/ftransl.hxx | 20 --
2 files changed, 154 insertions(+), 166 deletions(-)
New commits:
commit 268e4e90f9696998333026ac45b52c4f349d0069
Author: Noel Grandin
Date: Mon Nov 30 13:03:32 2015 +0200
allocate and initialise FormatEntry table at compile-time
no need to init this at runtime, it's purely static data
Change-Id: I73ff5b0d8f273d7ee925f485f3ed712f117f5b40
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx
b/dtrans/source/win32/ftransl/ftransl.cxx
index 968c2f6..6a17ca4 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -69,25 +69,35 @@ namespace MODULE_PRIVATE
}
}
-FormatEntry::FormatEntry()
+struct FormatEntry
{
-}
+ FormatEntry() {}
+
+ FormatEntry(
+const char *mime_content_type,
+const char *human_presentable_name,
+const char *native_format_name,
+CLIPFORMAT std_clipboard_format_id,
+css::uno::Type const & cppu_type
+);
+
+css::datatransfer::DataFlavor aDataFlavor;
+OUString aNativeFormatName;
+sal_Int32 aStandardFormatId;
+};
FormatEntry::FormatEntry(
-const char* mime_content_type,
-const char* human_presentable_name,
-const char* native_format_name,
+const char *mime_content_type,
+const char *human_presentable_name,
+const char *native_format_name,
CLIPFORMAT std_clipboard_format_id,
css::uno::Type const & cppu_type)
+ : aDataFlavor( OUString::createFromAscii(mime_content_type),
OUString::createFromAscii(human_presentable_name), cppu_type)
{
-aDataFlavor.MimeType =
OUString::createFromAscii(mime_content_type);
-aDataFlavor.HumanPresentableName =
OUString::createFromAscii(human_presentable_name);
-aDataFlavor.DataType = cppu_type;
-
if (native_format_name)
-aNativeFormatName = OUString::createFromAscii(native_format_name);
+aNativeFormatName = OUString::createFromAscii(native_format_name);
else
-aNativeFormatName = OUString::createFromAscii(human_presentable_name);
+aNativeFormatName = OUString::createFromAscii(human_presentable_name);
aStandardFormatId = std_clipboard_format_id;
}
@@ -97,7 +107,6 @@ FormatEntry::FormatEntry(
CDataFormatTranslator::CDataFormatTranslator( const Reference<
XComponentContext >& rxContext ) :
m_xContext( rxContext )
{
-initTranslationTable( );
}
Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const
DataFlavor& aDataFlavor )
@@ -212,258 +221,257 @@ Sequence< OUString > SAL_CALL
CDataFormatTranslator::getSupportedServiceNames( )
// format number we can stop if we find the first
// CF_INVALID
-void SAL_CALL CDataFormatTranslator::initTranslationTable()
-{
+static const std::vector< FormatEntry > g_TranslTable {
//SotClipboardFormatId::DIF
-
m_TranslTable.push_back(FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"",
"DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT));
+FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"",
"DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT),
// SotClipboardFormatId::BITMAP
// #i124085# CF_DIBV5 disabled, leads to problems at export. To fully
support, using
// an own mime-type may be necessary. I have tried that, but saw no real
advantages
// with different apps when exchanging bitmap-based data. So, disabled for
now. At
// the same time increased png format exchange for better interoperability
-
//m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"",
"Bitmap", "Bitmap", CF_DIBV5, CPPUTYPE_DEFAULT));
+//
FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"",
"Bitmap", "Bitmap", CF_DIBV5, CPPUTYPE_DEFAULT),
-
m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"",
"Bitmap", "Bitmap", CF_DIB, CPPUTYPE_DEFAULT));
-
m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"",
"Bitmap", "Bitmap", CF_BITMAP, CPPUTYPE_DEFAULT));
+
FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"",
"Bitmap", "Bitmap", CF_DIB, CPPUTYPE_DEFAULT),
+
FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"",
"Bitmap", "Bitmap", CF_BITMAP, CPPUTYPE_DEFAULT),
// SotClipboardFormatId::STRING
-m_TranslTable.push_back(FormatEntry("text/plain;charset=utf-16",
"Unicode-Text", "", CF_UNICODETEXT, CppuType_String));
+FormatEntry("text/plain;charset=utf-16", "Unicode-Text", "",
CF_UNICODETEXT, CppuType_String),
// Format Locale - for internal use
-
m_TranslTable.push_back(FormatEntry("application/x-openoffice-locale;windows_formatname=\"Locale\"",
"Locale", "Locale", CF_LOCALE, CPP
[Libreoffice-commits] online.git: 7 commits - loleaflet/reference.html loleaflet/src loolwsd/bundled loolwsd/LOOLSession.cpp loolwsd/LOOLSession.hpp loolwsd/protocol.txt loolwsd/TileCache.cpp loolwsd/
loleaflet/reference.html| 47
loleaflet/src/control/Toolbar.js|8 +
loleaflet/src/core/Socket.js|5
loleaflet/src/layer/tile/TileLayer.js | 11 +
loolwsd/LOOLSession.cpp | 93
loolwsd/LOOLSession.hpp |6 +
loolwsd/TileCache.cpp | 29
loolwsd/TileCache.hpp |6 +
loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h |6 +
loolwsd/protocol.txt|5
10 files changed, 213 insertions(+), 3 deletions(-)
New commits:
commit 5b1471aaf05d60164bc0016955cca1c1063c6427
Author: Mihai Varga
Date: Mon Nov 30 12:59:37 2015 +0200
loolwsd: update the bundled headers
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 5189cca..a78c0aa 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -202,6 +202,12 @@ struct _LibreOfficeKitDocumentClass
int (*getView) (LibreOfficeKitDocument* pThis);
/// @see lok::Document::getViews().
int (*getViews) (LibreOfficeKitDocument* pThis);
+
+/// @see lok::Document::renderFont().
+unsigned char* (*renderFont) (LibreOfficeKitDocument* pThis,
+ const char* pFontName,
+ int* pFontWidth,
+ int* pFontHeight);
#endif // LOK_USE_UNSTABLE_API
};
commit e1b0e3dce92d66a258570c011ed171454119e4b3
Author: Mihai Varga
Date: Mon Nov 30 12:58:41 2015 +0200
loolwsd: update renderFont png encoding
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index b0ef846..9708131 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -1117,17 +1117,16 @@ void ChildProcessSession::sendFontRendering(const char*
/*buffer*/, int /*length
pixmap = _loKitDocument->pClass->renderFont(_loKitDocument,
decodedFont.c_str(), &width, &height);
std::cout << Util::logPrefix() << "renderFont called, font[" << font << "]
rendered in " << double(timestamp.elapsed())/1000 << "ms" << std::endl;
-if (pixmap != NULL) {
-if (!Util::encodePNGAndAppendToBuffer(pixmap, width, height, output))
+if (pixmap != nullptr) {
+if (!Util::encodePNGAndAppendToBuffer(pixmap, width, height, output,
LOK_TILEMODE_RGBA))
{
sendTextFrame("error: cmd=renderfont kind=failure");
delete[] pixmap;
return;
}
+delete[] pixmap;
}
-delete[] pixmap;
-
sendBinaryFrame(output.data(), output.size());
}
commit b78fd2c68a635250db44c636220854a7b1bfdf68
Author: Mihai Varga
Date: Fri Nov 27 16:16:27 2015 +0200
loleaflet: renderfont command handler
diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 9996b4c..9c80699 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -1636,6 +1636,12 @@ var map = L.map('map', {
undefined
Applies a style from a style family.
+
+ renderFont(
+fontName)
+ undefined
+Renders the given font in the smallest rectangle it can fit
in.
+
Page oriented
@@ -1752,6 +1758,11 @@ var map = L.map('map', {
Fired when the url for the pdf export is ready.
+ renderfont
+ RenderFontEvent
+ Fired when the font rendering is ready.
+
+
search
SearchEvent
Fired when the search result is ready.
@@ -1976,6 +1987,26 @@ var map = L.map('map', {
+RenderFontEvent
+
+
+
+ property
+ type
+ description
+
+
+ font
+String
+ Font name.
+
+
+ img
+String
+ The image data URL.
+
+
+
SearchEvent
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 4ff4d17..4f05b43 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -104,5 +104,9 @@ L.Map.include({
}
};
L.Socket.sendMessage('uno .uno:EnterString ' +
JSON.stringify(command));
+ },
+
+ renderFont: function (fontName) {
+ L.Socket.sendMessage('renderfont font=' +
window.encodeURIComponent(fontName));
}
});
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index fe47c65..744ca6f 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -85,7 +85,7 @@ L.Socket = {
textMsg = String.fromCharCode.apply(null,
[Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit
desktop/source/lib/init.cxx | 53 ++
include/LibreOfficeKit/LibreOfficeKit.h |6 +++
include/LibreOfficeKit/LibreOfficeKit.hxx | 12 ++
3 files changed, 71 insertions(+)
New commits:
commit 24d981998b5859c7601d5c804e0ee70c5fec280f
Author: Mihai Varga
Date: Fri Nov 27 16:19:09 2015 +0200
LOK: renderFont method
Renders the given font in a virtual output device. For now it iterates
over a list of fonts until it finds the one that matches the requested
font.
Change-Id: Ie4ecc3a1441519840d8f4f4a890e92670759b4fc
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8682ce8..d2f14de 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -364,6 +364,10 @@ static void doc_destroyView(LibreOfficeKitDocument* pThis,
int nId);
static void doc_setView(LibreOfficeKitDocument* pThis, int nId);
static int doc_getView(LibreOfficeKitDocument* pThis);
static int doc_getViews(LibreOfficeKitDocument* pThis);
+static unsigned char* doc_renderFont(LibreOfficeKitDocument* pThis,
+ const char *pFontName,
+ int* pFontWidth,
+ int* pFontHeight);
LibLODocument_Impl::LibLODocument_Impl(const uno::Reference
&xComponent)
: mxComponent(xComponent)
@@ -385,6 +389,7 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference
setPart = doc_setPart;
m_pDocumentClass->getPartName = doc_getPartName;
m_pDocumentClass->setPartMode = doc_setPartMode;
+m_pDocumentClass->renderFont = doc_renderFont;
m_pDocumentClass->paintTile = doc_paintTile;
m_pDocumentClass->getTileMode = doc_getTileMode;
m_pDocumentClass->getDocumentSize = doc_getDocumentSize;
@@ -1536,6 +1541,54 @@ static int doc_getViews(LibreOfficeKitDocument*
/*pThis*/)
return SfxLokHelper::getViews();
}
+unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/,
+const char* pFontName,
+int* pFontWidth,
+int* pFontHeight)
+{
+OString aSearchedFontName(pFontName);
+SfxObjectShell* pDocSh = SfxObjectShell::Current();
+const SvxFontListItem* pFonts = static_cast(
+pDocSh->GetItem(SID_ATTR_CHAR_FONTLIST));
+const FontList* pList = pFonts ? pFonts->GetFontList() : nullptr;
+
+if ( pList )
+{
+sal_uInt16 nFontCount = pList->GetFontNameCount();
+for (sal_uInt16 i = 0; i < nFontCount; ++i)
+{
+const vcl::FontInfo& rInfo = pList->GetFontName(i);
+OUString aFontName = rInfo.GetName();
+if (!aSearchedFontName.equals(aFontName.toUtf8().getStr()))
+continue;
+
+VirtualDevice aDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
+::Rectangle aRect;
+vcl::Font aFont(rInfo);
+aFont.SetSize(Size(0, 25));
+aDevice.SetFont(aFont);
+aDevice.GetTextBoundRect(aRect, aFontName);
+int nFontWidth = aRect.BottomRight().X() + 1;
+*pFontWidth = nFontWidth;
+int nFontHeight = aRect.BottomRight().Y() + 1;
+*pFontHeight = nFontHeight;
+
+unsigned char* pBuffer = static_cast(malloc(4 *
nFontWidth * nFontHeight));
+memset(pBuffer, 0, nFontWidth * nFontHeight * 4);
+boost::shared_array aBuffer(pBuffer, NoDelete<
sal_uInt8 >());
+
+aDevice.SetBackground(Wallpaper(COL_TRANSPARENT));
+aDevice.SetOutputSizePixelScaleOffsetAndBuffer(
+Size(nFontWidth, nFontHeight), Fraction(1.0), Point(),
+aBuffer, nullptr);
+aDevice.DrawText(Point(0,0), aFontName);
+
+return pBuffer;
+}
+}
+return nullptr;
+}
+
static char* lo_getError (LibreOfficeKit *pThis)
{
LibLibreOffice_Impl* pLib = static_cast(pThis);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index 5189cca..a78c0aa 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -202,6 +202,12 @@ struct _LibreOfficeKitDocumentClass
int (*getView) (LibreOfficeKitDocument* pThis);
/// @see lok::Document::getViews().
int (*getViews) (LibreOfficeKitDocument* pThis);
+
+/// @see lok::Document::renderFont().
+unsigned char* (*renderFont) (LibreOfficeKitDocument* pThis,
+ const char* pFontName,
+ int* pFontWidth,
+ int* pFontHeight);
#endif // LOK_USE_UNSTABLE_API
};
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 5e86101..2855f8b 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -376,6 +376,18 @@ public:
{
return mpDoc->pClass->getViews(mpDoc);
}
+
+
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 6d101b6296962b444f535eeb2ff37580dc9bb60c
Author: László Németh
Date: Sat Nov 28 02:33:34 2015 +0100
tdf#94689 fix crash on new file, close file, open file
partially cherry-picked from the
commit 187445b2d2885ced92be37ffb11cd2a9bb11f8d6
Change-Id: I9e74fb41448c6be0b8daa6c0f8a0e207be0be6d6
Reviewed-on: https://gerrit.libreoffice.org/20250
Tested-by: Jenkins
Reviewed-by: jan iversen
Reviewed-by: Michael Meeks
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 9afa3f5..ae82afc 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -229,6 +229,7 @@ void SAL_CALL SidebarController::notifyContextChangeEvent
(const css::ui::Contex
{
maAsynchronousDeckSwitch.CancelRequest();
maContextChangeUpdate.RequestCall();
+UpdateConfigurations();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build build tools only
On Mon, Nov 30, 2015 at 11:02 AM, Michael Stahl wrote: Thank you for prompt and - I hope - helpful comments > On 28.11.2015 21:15, Andreas Müller wrote: >> Hi, >> >> Since a while I am trying to build libreoffice with yocto [1][2] >> cross-build system for my embedded devices. >> When building with yocto there are two temporary sysroots: One native >> for all the binaries run on build host during build and one for the >> cross target to link against the libraries. >> What causes me trouble for a while is native saxparser. > >> * compile by something like (inspired by make target cross-toolset) >> make -f Makefile.gbuild build-tools >> * install all binaries an their libs manually into native sysroot > > why do you want to install the build tools? that's another manual step > that nobody else is currently doing, so you'll going to have to maintain > it yourself when things change. Agreed but I think that's necessary: In yocto builds we have two separate sysroots native & cross. For each of them we have separated build steps. As far as I know (I haven't seen that or managed to do so) there is no chance to build native binaries from cross build step. To access native tools during cross build they must be installed in native sysroot. > >> From what I've seen so far there are many binaries used during cross >> build seem to work as expected. >> >> saxparser fails with (patch attached causing more detailed error message) >> ERROR: component context fails to supply service >> 'com.sun.star.xml.sax.Parser' of type 'com.sun.star.xml.sax.XParser' > > it fails to create a UNO service, which according to "git grep > com.sun.star.xml.sax.Parser | grep \\.component" is from > sax/source/expatwrap/expwrap.component, which according to git grep > "gb_Library_set_componentfile.*expwrap" is sax/Library_expwrap.mk aka > libexpwraplo.so. > I think this and Stephan's hints (at least saxparser.rdb is not accessible during my cross build - and I was not aware of URE_MORE_SERVICES environment var - so my gdb sessions missed that) are good hooks to continue. Will give those a try tonight - implementing liberoffice in yocto is just a hobby for fun.. Andreas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/qa
basic/qa/cppunit/test_scanner.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 88ab9d4aa09a8ce09fa4d03faefa32e57c530746 Author: Stephan Bergmann Date: Mon Nov 30 11:49:15 2015 +0100 Get order of expected/actual args to CPPUNIT_ASSERT_EQUAL right Change-Id: I0fa26417630991c6d07b5412fb579f9c222d09a6 diff --git a/basic/qa/cppunit/test_scanner.cxx b/basic/qa/cppunit/test_scanner.cxx index ec5836e..af2ea88 100644 --- a/basic/qa/cppunit/test_scanner.cxx +++ b/basic/qa/cppunit/test_scanner.cxx @@ -118,14 +118,14 @@ namespace CPPUNIT_ASSERT(symbols.empty()); symbols = getSymbols(source2); -CPPUNIT_ASSERT_EQUAL(symbols.size(), size_t(1)); -CPPUNIT_ASSERT_EQUAL(symbols[0].text, cr); -CPPUNIT_ASSERT_EQUAL(symbols[0].type, SbxVARIANT); +CPPUNIT_ASSERT_EQUAL(size_t(1), symbols.size()); +CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type); symbols = getSymbols(source3); -CPPUNIT_ASSERT_EQUAL(symbols.size(), size_t(1)); -CPPUNIT_ASSERT_EQUAL(symbols[0].text, cr); -CPPUNIT_ASSERT_EQUAL(symbols[0].type, SbxVARIANT); +CPPUNIT_ASSERT_EQUAL(size_t(1), symbols.size()); +CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type); symbols = getSymbols(source4); CPPUNIT_ASSERT(symbols.size() == 1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - framework/source
framework/source/services/autorecovery.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 57e0c5452af102a5a58f92a6d20e88b9b1def862 Author: Stephan Bergmann Date: Mon Nov 30 11:38:21 2015 +0100 rhbz#1286416: Be more resilient during auto-recovery attempts ...called from within the signal handler, so any bets are off Change-Id: Iedb5c7bc8d08350e5f3e3118c6713f5c25b238b6 (cherry picked from commit 9b3ca276dae6f8d4f337c78e64ed6b7f7e7662ef) diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 9194db4..26e174a 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2475,6 +2475,8 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame return; css::uno::Reference< css::frame::XFrame > xFrame = xController->getFrame(); +if (!xFrame.is()) +return; css::uno::Reference< css::frame::XDesktop > xDesktop (xFrame->getCreator(), css::uno::UNO_QUERY); if (!xDesktop.is()) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/services/autorecovery.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 9b3ca276dae6f8d4f337c78e64ed6b7f7e7662ef Author: Stephan Bergmann Date: Mon Nov 30 11:38:21 2015 +0100 rhbz#1286416: Be more resilient during auto-recovery attempts ...called from within the signal handler, so any bets are off Change-Id: Iedb5c7bc8d08350e5f3e3118c6713f5c25b238b6 diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 9194db4..26e174a 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2475,6 +2475,8 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame return; css::uno::Reference< css::frame::XFrame > xFrame = xController->getFrame(); +if (!xFrame.is()) +return; css::uno::Reference< css::frame::XDesktop > xDesktop (xFrame->getCreator(), css::uno::UNO_QUERY); if (!xDesktop.is()) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/headless
vcl/headless/svpgdi.cxx | 66 ++--
1 file changed, 64 insertions(+), 2 deletions(-)
New commits:
commit 442d064188a2d50406e485d033accfffe4bd54e9
Author: Caolán McNamara
Date: Mon Nov 30 10:22:46 2015 +
gtk3: implement SAL_INVERT_50 rectangle case
missing stipple effect around slides in layout panel
Change-Id: I8a55c6bda1e742e105ba22e4566658099ea16f46
(cherry picked from commit a80dea3e77c2a8465cdd309c5f740fb8102dd826)
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0f89c03..c1a5116 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -900,9 +900,69 @@ SalColor SvpSalGraphics::getPixel( long nX, long nY )
return aColor.toInt32();
}
-void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight,
SalInvert /*nFlags*/ )
+namespace
{
-// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
+cairo_pattern_t * create_stipple()
+{
+static unsigned char data[16] = { 0xFF, 0xFF, 0x00, 0x00,
+ 0xFF, 0xFF, 0x00, 0x00,
+ 0x00, 0x00, 0xFF, 0xFF,
+ 0x00, 0x00, 0xFF, 0xFF };
+cairo_surface_t* surface = cairo_image_surface_create_for_data(data,
CAIRO_FORMAT_A8, 4, 4, 4);
+cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
+cairo_surface_destroy(surface);
+cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
+cairo_pattern_set_filter(pattern, CAIRO_FILTER_NEAREST);
+return pattern;
+}
+}
+
+void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight,
SalInvert nFlags )
+{
+// FIXME: handle SAL_INVERT_TRACKFRAME
+if ( nFlags & SAL_INVERT_TRACKFRAME )
+{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled
SAL_INVERT_TRACKFRAME");
+}
+else if ( nFlags & SAL_INVERT_50 )
+{
+if (cairo_t* cr = getCairoContext())
+{
+assert(m_aDevice->isTopDown());
+
+clipRegion(cr);
+
+cairo_pattern_t *pattern = create_stipple();
+
+cairo_rectangle_int_t extents;
+basebmp::IBitmapDeviceDamageTrackerSharedPtr
xDamageTracker(m_aDevice->getDamageTracker());
+
+cairo_rectangle(cr, nX, nY, nWidth, nHeight);
+
+if (xDamageTracker)
+extents = getFillDamage(cr);
+
+cairo_clip(cr);
+
+cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
+cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
+cairo_mask(cr, pattern);
+cairo_pattern_destroy(pattern);
+
+cairo_surface_flush(cairo_get_target(cr));
+cairo_destroy(cr); // unref
+
+return;
+}
+else
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert unhandled XOR (?)");
+}
+else
+{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled
SAL_INVERT_TRACKFRAME");
+}
+
+
basegfx::B2DPolygon aRect = basegfx::tools::createPolygonFromRect(
basegfx::B2DRectangle( nX, nY, nX+nWidth, nY+nHeight ) );
basegfx::B2DPolyPolygon aPolyPoly( aRect );
basegfx::B2IBox aDestRange( nX, nY, nX + nWidth, nY + nHeight );
@@ -915,6 +975,8 @@ void SvpSalGraphics::invert( long nX, long nY, long nWidth,
long nHeight, SalInv
void SvpSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert /*nFlags*/ )
{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled points case");
+
// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
basegfx::B2DPolygon aPoly;
aPoly.append( basegfx::B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/source vcl/headless
sd/source/ui/func/fupoor.cxx |6 +--
vcl/headless/svpgdi.cxx | 66 +--
2 files changed, 67 insertions(+), 5 deletions(-)
New commits:
commit 7dcbc5708aec6672ddc3ba6ed000421f56e651ac
Author: Caolán McNamara
Date: Mon Nov 30 10:33:58 2015 +
silence mouse release warning
Change-Id: Ie3c6da36f1c462080f78e8713e9e5dcd228fbacf
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index fb896ce..34b35ab 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -116,15 +116,15 @@ void FuPoor::Deactivate()
aDragTimer.Stop();
aScrollTimer.Stop();
aDelayToScrollTimer.Stop ();
-bScrollable =
-bDelayActive = false;
+bScrollable = bDelayActive = false;
if (pDialog)
{
pDialog->Hide();
}
-if (mpWindow) mpWindow->ReleaseMouse ();
+if (mpWindow && mpWindow->IsMouseCaptured())
+mpWindow->ReleaseMouse();
}
void FuPoor::SetWindow(::sd::Window* pWin)
commit a80dea3e77c2a8465cdd309c5f740fb8102dd826
Author: Caolán McNamara
Date: Mon Nov 30 10:22:46 2015 +
gtk3: implement SAL_INVERT_50 rectangle case
missing stipple effect around slides in layout panel
Change-Id: I8a55c6bda1e742e105ba22e4566658099ea16f46
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 6ad1458..2d98b26 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1172,9 +1172,69 @@ SalColor SvpSalGraphics::getPixel( long nX, long nY )
return aColor.toInt32();
}
-void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight,
SalInvert /*nFlags*/ )
+namespace
{
-// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
+cairo_pattern_t * create_stipple()
+{
+static unsigned char data[16] = { 0xFF, 0xFF, 0x00, 0x00,
+ 0xFF, 0xFF, 0x00, 0x00,
+ 0x00, 0x00, 0xFF, 0xFF,
+ 0x00, 0x00, 0xFF, 0xFF };
+cairo_surface_t* surface = cairo_image_surface_create_for_data(data,
CAIRO_FORMAT_A8, 4, 4, 4);
+cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
+cairo_surface_destroy(surface);
+cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
+cairo_pattern_set_filter(pattern, CAIRO_FILTER_NEAREST);
+return pattern;
+}
+}
+
+void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight,
SalInvert nFlags )
+{
+// FIXME: handle SAL_INVERT_TRACKFRAME
+if ( nFlags & SAL_INVERT_TRACKFRAME )
+{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled
SAL_INVERT_TRACKFRAME");
+}
+else if ( nFlags & SAL_INVERT_50 )
+{
+if (cairo_t* cr = getCairoContext())
+{
+assert(m_aDevice->isTopDown());
+
+clipRegion(cr);
+
+cairo_pattern_t *pattern = create_stipple();
+
+cairo_rectangle_int_t extents;
+basebmp::IBitmapDeviceDamageTrackerSharedPtr
xDamageTracker(m_aDevice->getDamageTracker());
+
+cairo_rectangle(cr, nX, nY, nWidth, nHeight);
+
+if (xDamageTracker)
+extents = getFillDamage(cr);
+
+cairo_clip(cr);
+
+cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
+cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
+cairo_mask(cr, pattern);
+cairo_pattern_destroy(pattern);
+
+cairo_surface_flush(cairo_get_target(cr));
+cairo_destroy(cr); // unref
+
+return;
+}
+else
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert unhandled XOR (?)");
+}
+else
+{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled
SAL_INVERT_TRACKFRAME");
+}
+
+
basegfx::B2DPolygon aRect = basegfx::tools::createPolygonFromRect(
basegfx::B2DRectangle( nX, nY, nX+nWidth, nY+nHeight ) );
basegfx::B2DPolyPolygon aPolyPoly( aRect );
basegfx::B2IBox aDestRange( nX, nY, nX + nWidth, nY + nHeight );
@@ -1187,6 +1247,8 @@ void SvpSalGraphics::invert( long nX, long nY, long
nWidth, long nHeight, SalInv
void SvpSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert /*nFlags*/ )
{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled points case");
+
// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
basegfx::B2DPolygon aPoly;
aPoly.append( basegfx::B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 42346, which changed state. Bug 42346 Summary: FILESAVE: Cross-references to certain numbered items (object, graphic, table) turn to plain text on export to .doc or .docx (works OK for headings and bookmarks) https://bugs.documentfoundation.org/show_bug.cgi?id=42346 What|Removed |Added Status|RESOLVED|NEW Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d154f8e229cbe05bf40b685d5bdbdd4774906f76 Author: Yousuf Philips Date: Thu Nov 12 18:43:21 2015 +0400 Add 'Edit Points' toolbar to View > Toolbar menu in writer Change-Id: Ia38f80f1e1cfda64aa4219346949135c6904ee77 Reviewed-on: https://gerrit.libreoffice.org/19930 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky (cherry picked from commit a4c8322d2cdd752d299aaeb8a9e9d8d7d665572c) Reviewed-on: https://gerrit.libreoffice.org/20277 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index f4d8360..d710e22 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -188,7 +188,7 @@ true - true + false true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/uiconfig sw/uiconfig
sc/uiconfig/scalc/toolbar/starshapes.xml |2 +- sc/uiconfig/scalc/toolbar/symbolshapes.xml |4 ++-- sw/uiconfig/swriter/toolbar/symbolshapes.xml |4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 96319f4591e58db2e29901751c90fd8430536ce5 Author: Yousuf Philips Date: Thu Nov 26 00:22:24 2015 +0400 Fix wrong use of toolbarseperator in shape toolbars Change-Id: I812db6b6d2217435bec1b7daf13823747d820585 Reviewed-on: https://gerrit.libreoffice.org/20183 Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky (cherry picked from commit 371eed1eca3620b106070bea98b165e552ac3763) Reviewed-on: https://gerrit.libreoffice.org/20278 diff --git a/sc/uiconfig/scalc/toolbar/starshapes.xml b/sc/uiconfig/scalc/toolbar/starshapes.xml index cb7cf6d..cc9cfd6 100644 --- a/sc/uiconfig/scalc/toolbar/starshapes.xml +++ b/sc/uiconfig/scalc/toolbar/starshapes.xml @@ -24,7 +24,7 @@ - + diff --git a/sc/uiconfig/scalc/toolbar/symbolshapes.xml b/sc/uiconfig/scalc/toolbar/symbolshapes.xml index f981c14..b206982 100644 --- a/sc/uiconfig/scalc/toolbar/symbolshapes.xml +++ b/sc/uiconfig/scalc/toolbar/symbolshapes.xml @@ -24,14 +24,14 @@ - + - + diff --git a/sw/uiconfig/swriter/toolbar/symbolshapes.xml b/sw/uiconfig/swriter/toolbar/symbolshapes.xml index f981c14..b206982 100644 --- a/sw/uiconfig/swriter/toolbar/symbolshapes.xml +++ b/sw/uiconfig/swriter/toolbar/symbolshapes.xml @@ -24,14 +24,14 @@ - + - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build build tools only
On 28.11.2015 21:15, Andreas Müller wrote: > Hi, > > Since a while I am trying to build libreoffice with yocto [1][2] > cross-build system for my embedded devices. > When building with yocto there are two temporary sysroots: One native > for all the binaries run on build host during build and one for the > cross target to link against the libraries. > What causes me trouble for a while is native saxparser. > * compile by something like (inspired by make target cross-toolset) > make -f Makefile.gbuild build-tools > * install all binaries an their libs manually into native sysroot why do you want to install the build tools? that's another manual step that nobody else is currently doing, so you'll going to have to maintain it yourself when things change. > From what I've seen so far there are many binaries used during cross > build seem to work as expected. > > saxparser fails with (patch attached causing more detailed error message) > ERROR: component context fails to supply service > 'com.sun.star.xml.sax.Parser' of type 'com.sun.star.xml.sax.XParser' it fails to create a UNO service, which according to "git grep com.sun.star.xml.sax.Parser | grep \\.component" is from sax/source/expatwrap/expwrap.component, which according to git grep "gb_Library_set_componentfile.*expwrap" is sax/Library_expwrap.mk aka libexpwraplo.so. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/export/drawingml.cxx | 38 --
1 file changed, 36 insertions(+), 2 deletions(-)
New commits:
commit c7b2d473e32af9b2dad4f294105505084ee0a1f6
Author: Rosemary
Date: Thu Nov 19 21:48:47 2015 +0530
export date and time fields in impress
only those fields that are currently implemented
in editeng/source/items/flditem.cxx and also match
with those in the specification are exported
Change-Id: I542cb0f827e161005e55452b5b6961dc642cd4e7
Reviewed-on: https://gerrit.libreoffice.org/20062
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
Reviewed-by: Katarina Behrens
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 8c90ffa..f990212 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -81,10 +81,13 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
+
using namespace ::css;
using namespace ::css::beans;
using namespace ::css::drawing;
@@ -1494,10 +1497,42 @@ OUString DrawingML::GetFieldValue( css::uno::Reference<
css::text::XTextRange >
GET( aFieldValue, Representation)
}
+else if(aFieldKind == "Date")
+{
+sal_Int32 nNumFmt = -1;
+rXPropSet->getPropertyValue(UNO_TC_PROP_NUMFORMAT) >>=
nNumFmt;
+switch(nNumFmt)
+{
+case SVXDATEFORMAT_STDSMALL:
+case SVXDATEFORMAT_A: aFieldValue = "datetime"; //
13/02/96
+ break;
+case SVXDATEFORMAT_B: aFieldValue = "datetime1"; //
13/02/1996
+ break;
+case SVXDATEFORMAT_STDBIG:
+case SVXDATEFORMAT_D: aFieldValue = "datetime3"; // 13
February 1996
+ break;
+}
+}
+else if(aFieldKind == "ExtTime")
+{
+sal_Int32 nNumFmt = -1;
+rXPropSet->getPropertyValue(UNO_TC_PROP_NUMFORMAT) >>=
nNumFmt;
+switch(nNumFmt)
+{
+case SVXTIMEFORMAT_STANDARD:
+case SVXTIMEFORMAT_24_HMS: aFieldValue =
"datetime11"; // 13:49:38
+break;
+case SVXTIMEFORMAT_24_HM: aFieldValue =
"datetime10"; // 13:49
+break;
+case SVXTIMEFORMAT_12_HM: aFieldValue =
"datetime12"; // 01:49 PM
+break;
+case SVXTIMEFORMAT_12_HMS: aFieldValue =
"datetime13"; // 01:49:38 PM
+break;
+}
+}
}
}
}
-
return aFieldValue;
}
@@ -1568,7 +1603,6 @@ void DrawingML::WriteRun( Reference< XTextRange > rRun )
Reference< XPropertySet > xPropSet( rRun, uno::UNO_QUERY );
WriteRunProperties( xPropSet, bIsURLField );
-
mpFS->startElementNS( XML_a, XML_t, FSEND );
mpFS->writeEscaped( sText );
mpFS->endElementNS( XML_a, XML_t );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLPropertySet.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e565fe8d040c61f5491f3df13665735fb8d9d84 Author: Stephan Bergmann Date: Mon Nov 30 10:55:47 2015 +0100 loplugin:override Change-Id: I0a79e1376c65a2d06e37ac5d6e0aa9f66234d753 diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx index 39c68e2..a74bcfc 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx @@ -69,7 +69,7 @@ public: OOXMLTable(); virtual ~OOXMLTable(); -void resolve(Table & rTable); +void resolve(Table & rTable) override; void add(ValuePointer_t pPropertySet); OOXMLTable * clone() const; private: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit 75892872496175d71b4ad02c1a477dc9f463d803 Author: jan iversen Date: Sat Nov 28 14:12:17 2015 +0100 check for missing COMSPEC variable in cygwin. Cygwin unsets the COMSPEC environment variable on some installations. This is due to an error reported first time in 2005, but not solved. There are no exact pattern when this happens, in this case it happened on 2 windows 8.1 VM installations (one private one azure). added check in configure.ac to alert the user earlier COMSPEC is used in sal/osl to start processes and as such vital, and in some perl scripts, therefore hardcoding to e.g. cmd32.exe (or the power shell) is not an option. Limited check to work only for cygwin. Change-Id: I52bb6667c52560ed1a239ac301811605b8cddcbf Reviewed-on: https://gerrit.libreoffice.org/20255 Tested-by: Jenkins Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/configure.ac b/configure.ac index 71f2037..9a13921 100644 --- a/configure.ac +++ b/configure.ac @@ -282,6 +282,10 @@ if test "$build_os" = "cygwin"; then PathFormat "$BUILDDIR" BUILDDIR="$formatted_path" x_Cygwin= +AC_MSG_CHECKING(for explicit COMSPEC) +if test -z "$COMSPEC"; then +AC_MSG_ERROR([COMSPEC not set in Environment, please set it an rerun]) +fi fi AC_SUBST(SRC_ROOT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk solenv/gbuild
RepositoryExternal.mk| 35 +++ solenv/gbuild/Gallery.mk | 14 -- 2 files changed, 7 insertions(+), 42 deletions(-) New commits: commit 628d84d9a82bd2759faf869d7a28233538094578 Author: Michael Stahl Date: Fri Nov 27 12:22:14 2015 +0100 gbuild: remove gb_Gallery__UNO_COMPONENTS and gb_Gallery__make_env_args These are presumably a relic from pre-INSTDIR days: gengal should find all this stuff via redirect.rc, fundamental.rc and services.rdb. The UNO services should be found via services.rdb too after the dependency was added in the previous commit. Change-Id: I3d452acc7c4b05f254bef936c4f18a2ea8615cf8 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2a80542..2c00a33 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3727,29 +3727,10 @@ $(call gb_Executable_add_runtime_dependencies,cppumaker,\ ) endef -gb_Gallery__UNO_COMPONENTS := \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - drawinglayer/drawinglayer \ - framework/util/fwk \ - i18npool/util/i18npool \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sfx2/util/sfx \ - svgio/svgio \ - svx/util/svx \ - svx/util/svxcore \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unoxml/source/service/unoxml - # This is used to determine what we need for 'build' platform. # FIXME: the library target should be for build too define gb_Executable__register_gengal $(call gb_Executable_add_runtime_dependencies,gengal,\ - $(foreach component,$(gb_Gallery__UNO_COMPONENTS) \ - ,$(call gb_ComponentTarget_get_target_for_build,$(component))) \ $(call gb_AllLangResTarget_get_target,ofa) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,postprocess_images) \ diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 2ce708d..d08fe69 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -14,19 +14,6 @@ gb_Gallery_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.pl gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery -# BRAND_BASE_DIR is for resource files -define gb_Gallery__make_env_args -"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD))" \ -"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry)" \ -"-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,ure/services)) \ - $(foreach item,$(gb_Gallery__UNO_COMPONENTS),\ - $(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item" \ -"-env:UNO_TYPES=$(foreach item,offapi udkapi,\ - $(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item" \ --env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD)) \ --env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)) -endef - define gb_Gallery__command $(call gb_Output_announce,$(2),$(true),GAL,1) $(call gb_Helper_abbreviate_dirs,\ @@ -37,7 +24,6 @@ $(call gb_Helper_abbreviate_dirs,\ SAL_USE_VCLPLUGIN=svp \ )) \ $(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \ - $(call gb_Gallery__make_env_args) \ --build-tree \ --destdir $(GALLERY_BASEDIR) \ --name "$(GALLERY_NAME)" \ commit 4e6b4fbac4d3e1cbbb486aa26940f484a1cb65d1 Author: Michael Stahl Date: Fri Nov 27 12:49:34 2015 +0100 fix build tool dependencies on INSTROOT files These should generally be INSTROOT_FOR_BUILD instead; also gengal only had the URE's services.rdb (twice) but not the basis layer one. Change-Id: If9cab809296fd66c1785562c5e5be6b2569d179c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 994348f..2a80542 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3715,10 +3715,9 @@ endef define gb_Executable__register_climaker $(call gb_Executable_add_runtime_dependencies,climaker,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(call gb_Rdb_get_target_for_build,ure/services) \ - $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ + $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ - $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) + $(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) ) endef @@ -3746,6 +3745,7 @@ gb_Gallery__UNO_COMPONENTS := \ unoxml/source/service/unoxml # This is used to determine what we need for 'build' platform. +# FIXME: the library target should be for build too define gb_Executable__regi
Re: Build build tools only
On Sat, Nov 28, 2015 at 09:15:22PM +0100, Andreas Müller wrote: > I would really appreciate help on this as I have the feeling I am > close to full build.. Did you notice the 'cross-toolset' target in the Makefile that builds everything that is needed during the build? That's how the Android cross-compilation works. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: 3 commits - loolwsd/configure.ac loolwsd/Makefile.am
loolwsd/Makefile.am |2 +- loolwsd/configure.ac |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 449e772b29191a540c716b1cf7776a65d03423da Author: Andras Timar Date: Mon Nov 30 10:07:12 2015 +0100 loolwsd: bump version after tarball diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index dd77d60..ab699dd 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.4.14], [libreoff...@collabora.com]) +AC_INIT([loolwsd], [1.4.15], [libreoff...@collabora.com]) AM_INIT_AUTOMAKE([1.11 silent-rules]) commit 7418c981c6efc7b73dab751e0d14e164fd2bbc62 Author: Andras Timar Date: Mon Nov 30 10:07:01 2015 +0100 loolwsd: bump version before tarball diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index caab4b7..dd77d60 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.4.13], [libreoff...@collabora.com]) +AC_INIT([loolwsd], [1.4.14], [libreoff...@collabora.com]) AM_INIT_AUTOMAKE([1.11 silent-rules]) commit 5fdef755db915cc88727809891e64a9cfbd0fb8b Author: Andras Timar Date: Mon Nov 30 10:06:40 2015 +0100 loolwsd: add Png.hpp to tarball diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am index be1bcb4..357986d 100644 --- a/loolwsd/Makefile.am +++ b/loolwsd/Makefile.am @@ -14,7 +14,7 @@ connect_SOURCES = Connect.cpp Util.cpp LOOLProtocol.cpp lokitclient_SOURCES = LOKitClient.cpp Util.cpp -noinst_HEADERS = LOKitHelper.hpp LOOLProtocol.hpp LOOLSession.hpp LOOLWSD.hpp LoadTest.hpp MessageQueue.hpp TileCache.hpp Util.hpp \ +noinst_HEADERS = LOKitHelper.hpp LOOLProtocol.hpp LOOLSession.hpp LOOLWSD.hpp LoadTest.hpp MessageQueue.hpp TileCache.hpp Util.hpp Png.hpp \ bundled/include/LibreOfficeKit/LibreOfficeKit.h bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \ bundled/include/LibreOfficeKit/LibreOfficeKitInit.h bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/Makefile
loleaflet/Makefile |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1141f3bb81aad276e60883f91335ca1c2cd9d806
Author: Andras Timar
Date: Mon Nov 30 09:57:30 2015 +0100
loleaflet: bump version after tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4043f17..3d0554a 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.4.16
+VERSION=1.4.17
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit b813249a050c5c97851d4c6ef752f7f50a105de1
Author: Andras Timar
Date: Mon Nov 30 09:54:57 2015 +0100
loleaflet: bump version before tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4d230d8..4043f17 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.4.15
+VERSION=1.4.16
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
