[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde4/KDESalGraphics.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 762151c35990dcd46c42816f22618c4e6c3a5625 Author: Isamu Mogi saturda...@gmail.com Date: Fri May 24 09:27:26 2013 +0900 vcl: Add sink effect (QStyle::State_Sunken) to menubar on KDE A selected menubar item of cleanlooks, gtk+ and plastique styles becomes closer to standard looks by passing QStyle::State_Sunken with QStyle::CE_MenuBarItem to QStyle::drawControl(). It is currently not documented on QT developmet resources. But these styles interpret that. Change-Id: Ic7835bf0bf7af374ebdf8330d15b462d056de8a5 Reviewed-on: https://gerrit.libreoffice.org/4017 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index a9115ee..2e9e33f 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -300,6 +300,9 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, if ( nControlState CTRL_STATE_ROLLOVER ) option.state |= QStyle::State_Selected; +if ( nControlState CTRL_STATE_SELECTED ) // Passing State_Sunken is currently not documented. +option.state |= QStyle::State_Sunken; // But some kinds of QStyle interpret it. + draw( QStyle::CE_MenuBarItem, option, m_image, vclStateValue2StateFlag(nControlState, value) ); } ___ 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/kde4/KDESalGraphics.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 97852d41dd3c7a9c08fdf0d6f0340536e9e3dcae
Author: Isamu Mogi saturda...@gmail.com
Date: Fri May 24 20:12:23 2013 +0900
vcl: Implement drawing CTRL_MENUBAR and PART_MENU_ITEM on KDE
Currently, menubar's background is drawn in window's background color
and no menubar's specific background color. To fix this, The patch
calls QStyle::drawControl() with QStyle::CE_MenuBarEmptyArea.
Change-Id: I89b9decc016a926a0f00b9663ec1a5bce81daac1
Reviewed-on: https://gerrit.libreoffice.org/4025
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 2e9e33f..5434e7c 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -308,6 +308,9 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType
type, ControlPart part,
}
else if (part == PART_ENTIRE_CONTROL)
{
+QStyleOptionMenuItem option;
+draw( QStyle::CE_MenuBarEmptyArea, option, m_image,
+ vclStateValue2StateFlag(nControlState, value) );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-1] fix fdo#64872 infinite loop saving as doc
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4028 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4028 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] vcl: Add sink effect (QStyle::State_Sunken) to menubar on KD...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4017 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4017 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7835bf0bf7af374ebdf8330d15b462d056de8a5 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Isamu Mogi saturda...@gmail.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] vcl: Implement drawing CTRL_MENUBAR and PART_MENU_ITEM on KD...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4025 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4025 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89b9decc016a926a0f00b9663ec1a5bce81daac1 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Isamu Mogi saturda...@gmail.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/polynomialregression'
New branch 'feature/polynomialregression' available with the following commits: commit e14195e9aea32b48755186b99a9de5a4c7480e52 Author: Tomaž Vajngerl qui...@gmail.com Date: Mon May 27 08:10:36 2013 +0200 Slight cleanup in polynomial curve calculation Change-Id: Ifc1b923e633beedce9ad27847f3c5c1298ee812e commit 9cd9407e47a9d122540453f28a87c7934d1d52f1 Author: Tomaž Vajngerl qui...@gmail.com Date: Mon May 27 08:02:37 2013 +0200 fdo#35712 polynomial and moving average regression lines - added polynomial and moving average to the dialog - implemented moving average and polynomal RegressionCurveCalculator - added icon for polynomial regression curve - prepare icon for moving average regression curve - degree parameter for polynomial regression curve - period parameter for moving average regression curve - limit the curve to max and min x value - added extrapolation Change-Id: I4ebb8dc23a3aff285b999e115fdda20ab11910a5 ___ 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/kde/salnativewidgets-kde.cxx | 18 --
vcl/unx/kde4/KDESalFrame.cxx | 15 +--
vcl/unx/kde4/KDESalGraphics.cxx |3 ++-
3 files changed, 23 insertions(+), 13 deletions(-)
New commits:
commit 8645239c91dbd7d56691ccdc91118d24eb7df1bc
Author: Isamu Mogi saturda...@gmail.com
Date: Fri May 24 09:47:20 2013 +0900
vcl: Check SH_MenuBar_MouseTracking when menubar is drawn on KDE
If QStyle::SH_MenuBar_MouseTracking is 0, it makes a mouse rollover
effect minimize. By this, a menubar item of CDE and Motif styles becomes
closer to standard behavior.
Change-Id: I87dccbd30bf7b9f0d82d1a6e67355c1b25d22dc8
Reviewed-on: https://gerrit.libreoffice.org/4018
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx
b/vcl/unx/kde/salnativewidgets-kde.cxx
index 85b9a14..e1923ac 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -777,7 +777,8 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
int nMenuItem = ( nStyle QStyle::Style_Enabled )?
m_nMenuBarEnabledItem: m_nMenuBarDisabledItem;
QMenuItem *pMenuItem = static_castQMenuBar*( pWidget
)-findItem( nMenuItem );
-if ( nStyle QStyle::Style_MouseOver )
+if ( ( nStyle QStyle::Style_MouseOver )
+ kapp-style().styleHint( QStyle::SH_MenuBar_MouseTracking )
)
nStyle |= QStyle::Style_Active;
if ( nStyle QStyle::Style_Selected )
@@ -1984,9 +1985,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
aStyleSettings.SetMenuBarTextColor( aMenuFore );
aStyleSettings.SetMenuColor( aMenuBack );
aStyleSettings.SetMenuBarColor( aMenuBack );
-
aStyleSettings.SetMenuHighlightColor( toColor ( qMenuCG.highlight() )
);
-aStyleSettings.SetMenuBarRolloverColor( toColor ( qMenuCG.highlight()
) );
// Menu items higlight text color, theme specific
if ( kapp-style().inherits( HighContrastStyle ) ||
@@ -2002,15 +2001,22 @@ void KDESalFrame::UpdateSettings( AllSettings
rSettings )
// set special menubar higlight text color
if ( kapp-style().inherits( HighContrastStyle ) )
-{
ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = toColor(
qMenuCG.highlightedText() );
-aStyleSettings.SetMenuBarRolloverTextColor( toColor(
qMenuCG.highlightedText() ) );
+else
+ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = aMenuFore;
+
+// set menubar rollover color
+if ( kapp-style().styleHint( QStyle::SH_MenuBar_MouseTracking ) )
+{
+aStyleSettings.SetMenuBarRolloverColor( toColor (
qMenuCG.highlight() ) );
+aStyleSettings.SetMenuBarRolloverTextColor(
ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor );
}
else
{
-ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = aMenuFore;
+aStyleSettings.SetMenuBarRolloverColor( aMenuBack );
aStyleSettings.SetMenuBarRolloverTextColor( aMenuFore );
}
+
// Font
aFont = toFont( pMenuBar-font(),
rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetMenuFont( aFont );
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index fee3ff1..be1fb61 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -301,21 +301,24 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
style.SetMenuBarTextColor( aMenuFore );
style.SetMenuColor( aMenuBack );
style.SetMenuBarColor( aMenuBack );
-
style.SetMenuHighlightColor( toColor ( qMenuCG.color(
QPalette::Highlight ) ) );
-style.SetMenuBarRolloverColor( toColor ( qMenuCG.color(
QPalette::Highlight ) ) );
-
style.SetMenuHighlightTextColor( aMenuFore );
// set special menubar higlight text color
if ( kapp-style()-inherits( HighContrastStyle ) )
-{
ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = toColor(
qMenuCG.color( QPalette::HighlightedText ) );
-style.SetMenuBarRolloverTextColor( toColor( qMenuCG.color(
QPalette::HighlightedText ) ) );
+else
+ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = aMenuFore;
+
+// set menubar rollover color
+if ( pMenuBar-style()-styleHint( QStyle::SH_MenuBar_MouseTracking ) )
+{
+style.SetMenuBarRolloverColor( toColor ( qMenuCG.color(
QPalette::Highlight ) ) );
+style.SetMenuBarRolloverTextColor(
ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor );
}
else
{
-ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = aMenuFore;
+style.SetMenuBarRolloverColor( aMenuBack );
[PUSHED] vcl: Check SH_MenuBar_MouseTracking when menubar is drawn on...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4018 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4018 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I87dccbd30bf7b9f0d82d1a6e67355c1b25d22dc8 Gerrit-PatchSet: 10 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Isamu Mogi saturda...@gmail.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sandbox building libreoffice
Hi, On Wed, May 22, 2013 at 01:19:10AM +0800, Tem Pora wrote: What is the best way to organize the set up for this type of sandboxing and testing? Any pointers in this directions are also welcome. There are already good tools for doing such work in chroots provided by the Debian/Ubuntu developer tools with pbuilder and sbuild: https://wiki.ubuntu.com/PbuilderHowto http://wiki.debian.org/sbuild Both work on both Ubuntu and Debian. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sw/source
sw/source/core/layout/anchoreddrawobject.cxx | 10 -- sw/source/core/layout/anchoredobject.cxx |9 - sw/source/core/layout/atrfrm.cxx | 26 -- 3 files changed, 45 deletions(-) New commits: commit e978e839501eb3f69173d13537b7b2e67b72af6d Author: Miklos Vajna vmik...@suse.cz Date: Sun May 26 17:12:57 2013 +0200 sw: unused includes in atrfrm Change-Id: Ia57b28ed60ca8c9a4b9c2abf1e2ba2f8ed92 diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index cf5a03e..b4fe34b 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -17,32 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include hintids.hxx -#include com/sun/star/text/RelOrientation.hpp -#include com/sun/star/text/VertOrientation.hpp -#include com/sun/star/text/HorizontalAdjust.hpp -#include com/sun/star/text/DocumentStatistic.hpp -#include com/sun/star/text/HoriOrientation.hpp -#include com/sun/star/text/HoriOrientationFormat.hpp -#include com/sun/star/text/NotePrintMode.hpp -#include com/sun/star/text/SizeType.hpp -#include com/sun/star/text/VertOrientationFormat.hpp #include com/sun/star/text/WrapTextMode.hpp -#include com/sun/star/text/XTextFrame.hpp #include com/sun/star/text/TextContentAnchorType.hpp -#include com/sun/star/text/InvalidTextContentException.hpp #include com/sun/star/container/XIndexContainer.hpp #include com/sun/star/text/TextGridMode.hpp -#include com/sun/star/awt/Size.hpp #include svtools/unoimap.hxx -#include svtools/unoevent.hxx -#include basic/sbxvar.hxx #include svtools/imap.hxx #include svtools/imapobj.hxx -#include editeng/ulspitem.hxx -#include editeng/lrspitem.hxx -#include svx/svdmodel.hxx -#include svx/svdpage.hxx #include unosett.hxx #include unostyle.hxx #include fmtclds.hxx @@ -53,28 +34,23 @@ #include fmtfsize.hxx #include fmtfordr.hxx #include fmtsrnd.hxx -#include fmtanchr.hxx #include fmtlsplt.hxx #include fmtrowsplt.hxx #include fmtftntx.hxx #include fmteiro.hxx #include fmturl.hxx #include fmtcnct.hxx -#include node.hxx #include section.hxx #include fmtline.hxx #include tgrditem.hxx #include hfspacingitem.hxx -#include doc.hxx #include IDocumentUndoRedo.hxx #include pagefrm.hxx #include rootfrm.hxx #include cntfrm.hxx #include crsrsh.hxx -#include pam.hxx #include dflyobj.hxx #include dcontact.hxx -#include flyfrm.hxx #include frmtool.hxx #include flyfrms.hxx #include pagedesc.hxx @@ -89,13 +65,11 @@ #include SwStyleNameMapper.hxx #include editeng/brushitem.hxx #include svtools/grfmgr.hxx -#include cmdid.h #include unomid.h #include comcore.hrc #include svx/svdundo.hxx // #111827# #include sortedobjs.hxx #include HandleAnchorNodeChg.hxx -#include svl/cjkoptions.hxx #include switerator.hxx #include pagedeschint.hxx #ifndef NDEBUG commit a689d8cf7af0e7fce4c767d1e92067cc84767c0d Author: Miklos Vajna vmik...@suse.cz Date: Sun May 26 17:01:47 2013 +0200 sw: unused includes in anchoredobject Change-Id: Ic7034ed384448a273517f3bf9795adfbbcaeba7b diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index ab4a193..b737998 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -17,25 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include anchoredobject.hxx -#include pam.hxx -#include frame.hxx #include txtfrm.hxx -#include frmfmt.hxx -#include fmtanchr.hxx #include fmtornt.hxx // -- #i28701# #include doc.hxx #include fmtsrnd.hxx -#include svx/svdobj.hxx #include dcontact.hxx #include editeng/ulspitem.hxx #include editeng/lrspitem.hxx #include sortedobjs.hxx #include pagefrm.hxx -#include frmatr.hxx -// -- #i3317# -#include colfrm.hxx // -- #i35911# #include layouter.hxx commit 7621888c0a68c62fce94c2301c9911b7064304d2 Author: Miklos Vajna vmik...@suse.cz Date: Sun May 26 16:56:25 2013 +0200 sw: unused includes in anchoreddrawobject Change-Id: I57fdc7413c5caf09dbe279b502d94e36a46d5f64 diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 62a3dea..af9b41c 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -17,13 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include anchoreddrawobject.hxx -#include svx/svdobj.hxx #include dcontact.hxx #include rootfrm.hxx #include pagefrm.hxx -#include cntfrm.hxx -#include doc.hxx #include tocntntanchoredobjectposition.hxx #include tolayoutanchoredobjectposition.hxx #include frmtool.hxx @@ -33,12 +29,6 @@ // -- #i32795# // template class std::vector #include vector -#include tools/gen.hxx - -// -- #i28749# -#include com/sun/star/text/PositionLayoutDir.hpp -// -- #i44559# -#include ndtxt.hxx using namespace ::com::sun::star;
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/swfont.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6e6b028164176e39219dccbe1b84380b10b6e64f Author: Khaled Hosny khaledho...@eglug.org Date: Sat May 25 14:33:46 2013 +0200 Fix fdo#64685 - Superscript broken in master After f22006dc6ac34a35a060e15466cf6b2d2058617d the position member of SwDrawTextInfo is no longer a pointer, so changing the passed Point after calling SetPos() has no effect, but some code seems to be relying on it being pointer. Moving SetPos() to after changing the point seems to do the trick, but there may be other similarly broken code like SwSubFont::_DrawStretchText() below. Change-Id: I2f563c1543ff7bff68e573f69fce39694181b370 Reviewed-on: https://gerrit.libreoffice.org/4032 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 02b5add..068fd71 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -850,12 +850,12 @@ void SwSubFont::_DrawText( SwDrawTextInfo rInf, const sal_Bool bGrey ) SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()-GetLanguage() ); Point aPos( rInf.GetPos() ); -const Point rOld = rInf.GetPos(); -rInf.SetPos( aPos ); if( GetEscapement() ) CalcEsc( rInf, aPos ); +const Point rOld = rInf.GetPos(); +rInf.SetPos( aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); if( IsCapital() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 64685, which changed state. Bug 64685 Summary: Superscript broken in master https://bugs.freedesktop.org/show_bug.cgi?id=64685 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix fdo#64685 - Superscript broken in master
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4032 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4032 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f563c1543ff7bff68e573f69fce39694181b370 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Khaled Hosny khaledho...@eglug.org Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/txtnode/swfont.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0c0e7f1bd48d1a89ccdba3f5e773186123943e43 Author: Khaled Hosny khaledho...@eglug.org Date: Sat May 25 14:33:46 2013 +0200 Fix fdo#64685 - Superscript broken in master After f22006dc6ac34a35a060e15466cf6b2d2058617d the position member of SwDrawTextInfo is no longer a pointer, so changing the passed Point after calling SetPos() has no effect, but some code seems to be relying on it being pointer. Moving SetPos() to after changing the point seems to do the trick, but there may be other similarly broken code like SwSubFont::_DrawStretchText() below. Change-Id: I2f563c1543ff7bff68e573f69fce39694181b370 Reviewed-on: https://gerrit.libreoffice.org/4032 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com (cherry picked from commit 6e6b028164176e39219dccbe1b84380b10b6e64f) Signed-off-by: David Tardon dtar...@redhat.com diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 02b5add..068fd71 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -850,12 +850,12 @@ void SwSubFont::_DrawText( SwDrawTextInfo rInf, const sal_Bool bGrey ) SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()-GetLanguage() ); Point aPos( rInf.GetPos() ); -const Point rOld = rInf.GetPos(); -rInf.SetPos( aPos ); if( GetEscapement() ) CalcEsc( rInf, aPos ); +const Point rOld = rInf.GetPos(); +rInf.SetPos( aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); if( IsCapital() ) ___ 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/rtftok/rtfdocumentimpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bfb93ffc6d72d22a833acf9d8c9d166153dad7c0
Author: Urmas davian...@gmail.com
Date: Mon May 27 09:49:55 2013 +0200
fdo#64671 Some special RTF characters were not skipped correctly
Some special characters, like { and }, were not skipped when they
occured as a replacement character for \uN keyword.
Change-Id: I19b66a290cd9880924774fa89bb29df280e44a3c
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a5e3f75..fcd0ef5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -887,7 +887,7 @@ int RTFDocumentImpl::resolveChars(char ch)
bool bUnicodeChecked = false;
bool bSkipped = false;
-while(!Strm().IsEof() ch != '{' ch != '}' ch != '\\')
+while(!Strm().IsEof() (m_aStates.top().nInternalState == INTERNAL_HEX
|| (ch != '{' ch != '}' ch != '\\')))
{
if (m_aStates.top().nInternalState == INTERNAL_HEX || (ch != 0x0d
ch != 0x0a))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] fdo#64671: FILESAVE: Documents containing Ž are mangled in RTF format
Hi Urmas, Thanks for your patch! It caused a compiler warning: writerfilter/source/rtftok/rtfdocumentimpl.cxx: In member function ‘int writerfilter::rtftok::RTFDocumentImpl::resolveChars(char)’: writerfilter/source/rtftok/rtfdocumentimpl.cxx:891:70: warning: suggest parentheses around ‘’ within ‘||’ [-Wparentheses] I just pushed a slightly cleaned up version. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc
sw/inc/fmtcol.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 168ed77568ed3d530bc38300c721634521a2ecd9 Author: Stephan Bergmann sberg...@redhat.com Date: Mon May 27 09:59:19 2013 +0200 Include frmatr.hxx instead of directly format.hxx ...as otherwise this can result in inline function [...] used but never defined [-Werror] for SwFmt::GetULSpace and SwFmt::GetLRSpace. Change-Id: I9de3422953b38c978af1e7d2fc07398b83236ed6 diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 3ff4e2e..0d7f5ad 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -20,7 +20,7 @@ #define _FMTCOL_HXX #include swdllapi.h -#include format.hxx +#include frmatr.hxx #include swtypes.hxx // For MAXLEVEL. #include boost/ptr_container/ptr_vector.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit de53a817ac97049dc7a2aa2ab54e934259d9abf7 Author: Andras Timar ati...@suse.com Date: Mon May 27 10:37:03 2013 +0200 Updated core Project: translations 40e56fe83f5a05f8c87821d0c30ef1585b601fc8 diff --git a/translations b/translations index 7db61e0..40e56fe 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 7db61e0f23b962f97e9246e0a8fb60e47fff0ac9 +Subproject commit 40e56fe83f5a05f8c87821d0c30ef1585b601fc8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ce6d8975a26370daf8a5713a0e3aebc421e1d2a6 Author: Andras Timar ati...@suse.com Date: Mon May 27 10:37:03 2013 +0200 Updated core Project: translations d11e5eb5bb5336d228600f71ecfffef888aab2ac diff --git a/translations b/translations index 95ad094..d11e5eb 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 95ad094a5398f83e05fade22a13a6fefe3307129 +Subproject commit d11e5eb5bb5336d228600f71ecfffef888aab2ac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
REMINDER: Release 4.0.4.1 from libreoffice-4-0 branch
Hi, please note that the commit deadline for 4.0.4.1, aka rc1, is on today, May 27, 2013. The tag and branch libreoffice-4-0-4 is going to be created tomorrow. Only commits with 3 reviewers will be allowed for that branch. See also http://wiki.documentfoundation.org/ReleasePlan#4.0_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr PS: Please, help with reviewing pending commits. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfimport/data/fdo64671.rtf |3 +++
sw/qa/extras/rtfimport/rtfimport.cxx |8
2 files changed, 11 insertions(+)
New commits:
commit ec8e012e980c88c8f24a7de44e44d0319bae2801
Author: Miklos Vajna vmik...@suse.cz
Date: Mon May 27 10:44:01 2013 +0200
testcase for bfb93ffc6d72d22a833acf9d8c9d166153dad7c0
Change-Id: If61739d54cb2572f20b118a2cf56ab2bd0f306e5
diff --git a/sw/qa/extras/rtfimport/data/fdo64671.rtf
b/sw/qa/extras/rtfimport/data/fdo64671.rtf
new file mode 100644
index 000..385dca4
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo64671.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+\u381\'7d
+\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c0ceabc..5aadfa6 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -136,6 +136,7 @@ public:
void testFdo42109();
void testFdo62977();
void testN818997();
+void testFdo64671();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -261,6 +262,7 @@ void Test::run()
{fdo42109.rtf, Test::testFdo42109},
{fdo62977.rtf, Test::testFdo62977},
{n818997.rtf, Test::testN818997},
+{fdo64671.rtf, Test::testFdo64671},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1240,6 +1242,12 @@ void Test::testN818997()
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
+void Test::testFdo64671()
+{
+// Additional '}' was inserted before the special character.
+getRun(getParagraph(1), 1, OUString(\xC5\xBD, 2, RTL_TEXTENCODING_UTF8));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] inscldlg.ui widget
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4049
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/4049/1
inscldlg.ui widget
Change-Id: Ia931e330303e9f5baf7ae92a8d69bc460327425d
---
M sc/source/ui/inc/inscldlg.hxx
M sc/source/ui/inc/miscdlgs.hrc
M sc/source/ui/miscdlgs/inscldlg.cxx
M sc/source/ui/src/miscdlgs.src
A sc/uiconfig/scalc/ui/insertcells.ui
5 files changed, 218 insertions(+), 107 deletions(-)
diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx
index f6a5ed9..008206d 100644
--- a/sc/source/ui/inc/inscldlg.hxx
+++ b/sc/source/ui/inc/inscldlg.hxx
@@ -32,14 +32,10 @@
class ScInsertCellDlg : public ModalDialog
{
private:
-FixedLine aFlFrame;
-RadioButton aBtnCellsDown;
-RadioButton aBtnCellsRight;
-RadioButton aBtnInsRows;
-RadioButton aBtnInsCols;
-OKButtonaBtnOk;
-CancelButtonaBtnCancel;
-HelpButton aBtnHelp;
+RadioButton* m_pBtnCellsDown;
+RadioButton* m_pBtnCellsRight;
+RadioButton* m_pBtnInsRow;
+RadioButton* m_pBtnInsCol;
public:
ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove =
false );
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 9efabdc..c65428a 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -37,11 +37,6 @@
#define FL_FRAME112
#define STR_BTN_CLOSE 200
-// Insert Cell Dialog
-#define BTN_CELLSDOWN 11
-#define BTN_CELLSRIGHT 12
-#define BTN_INSROWS 16
-#define BTN_INSCOLS 17
// Insert Contents Dialog
#define BTN_INSALL 20
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx
b/sc/source/ui/miscdlgs/inscldlg.cxx
index 56e72e7..0d522c8 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -34,42 +34,36 @@
//==
ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) :
-ModalDialog ( pParent, ScResId( RID_SCDLG_INSCELL ) ),
-//
-aFlFrame( this, ScResId( FL_FRAME ) ),
-aBtnCellsDown ( this, ScResId( BTN_CELLSDOWN ) ),
-aBtnCellsRight ( this, ScResId( BTN_CELLSRIGHT ) ),
-aBtnInsRows ( this, ScResId( BTN_INSROWS ) ),
-aBtnInsCols ( this, ScResId( BTN_INSCOLS ) ),
-aBtnOk ( this, ScResId( BTN_OK ) ),
-aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
-aBtnHelp( this, ScResId( BTN_HELP ) )
+ModalDialog ( pParent, InsertCellsDialog,
modules/scalc/ui/insertcells.ui)
{
+get(m_pBtnCellsDown, down);
+get(m_pBtnCellsRight, right);
+get(m_pBtnInsRow, rows);
+get(m_pBtnInsCol, cols);
+
if (bDisallowCellMove)
{
-aBtnCellsDown.Disable();
-aBtnCellsRight.Disable();
-aBtnInsRows.Check();
+m_pBtnCellsDown-Disable();
+m_pBtnCellsRight-Disable();
+m_pBtnInsRow-Check();
switch(nInsItemChecked)
{
-case 2: aBtnInsRows .Check();break;
-case 3: aBtnInsCols .Check();break;
-default:aBtnInsRows .Check();break;
+case 2: m_pBtnInsRow-Check();break;
+case 3: m_pBtnInsCol-Check();break;
+default:m_pBtnInsRow-Check();break;
}
}
else
{
switch(nInsItemChecked)
{
-case 0: aBtnCellsDown .Check();break;
-case 1: aBtnCellsRight.Check();break;
-case 2: aBtnInsRows .Check();break;
-case 3: aBtnInsCols .Check();break;
+case 0: m_pBtnCellsDown-Check();break;
+case 1: m_pBtnCellsRight-Check();break;
+case 2: m_pBtnInsRow-Check();break;
+case 3: m_pBtnInsCol-Check();break;
}
}
-//-
-FreeResource();
}
//
@@ -78,22 +72,22 @@
{
InsCellCmd nReturn = INS_NONE;
-if ( aBtnCellsDown.IsChecked() )
+if ( m_pBtnCellsDown-IsChecked() )
{
nInsItemChecked=0;
nReturn = INS_CELLSDOWN;
}
-else if ( aBtnCellsRight.IsChecked())
+else if ( m_pBtnCellsRight-IsChecked())
{
nInsItemChecked=1;
nReturn = INS_CELLSRIGHT;
}
-else if ( aBtnInsRows.IsChecked() )
+else if ( m_pBtnInsRow-IsChecked() )
{
nInsItemChecked=2;
nReturn = INS_INSROWS;
}
-else if ( aBtnInsCols.IsChecked() )
+else if ( m_pBtnInsCol-IsChecked() )
{
nInsItemChecked=3;
nReturn = INS_INSCOLS;
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index 798a375..74f7ea1 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -19,74 +19,6 @@
#include miscdlgs.hrc
-ModalDialog RID_SCDLG_INSCELL
-{
-OutputSize = TRUE ;
-HelpId =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 515495acadd9c7bafb682eb9a5adac9422ceadc2 Author: Petr Mladek pmla...@suse.cz Date: Mon May 27 10:45:38 2013 +0200 bump product version to 4.1.0.0.beta1+ Change-Id: I9994b3069e52e4d087c15ddb5fc7767b9fb2a6fe diff --git a/configure.ac b/configure.ac index 10782ff..889d4e7 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.0.0.alpha1+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.0.0.beta1+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source include/filter sd/source vcl/source
filter/source/msfilter/escherex.cxx | 73 +++
include/filter/msfilter/escherex.hxx |7 +++
sd/source/filter/eppt/epptso.cxx | 15 ++-
sd/source/filter/ppt/pptin.cxx |2
vcl/source/control/field.cxx | 22 +++---
5 files changed, 86 insertions(+), 33 deletions(-)
New commits:
commit c05c16635b15a47591faa737947c2dce3dcb863e
Author: Sun Ying suny...@apache.org
Date: Mon Sep 10 01:56:28 2012 +
Resolves: #i119753# fix audio video object lost when save .ppt file
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
(cherry picked from commit fbb7e8d8957877922f2f3a971e88685589f43939)
Conflicts:
filter/inc/filter/msfilter/escherex.hxx
filter/source/msfilter/escherex.cxx
Change-Id: I545a9e95c23cfba0cc918c9c4243528570734b2d
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 4c8fec0..68bd12d 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -18,6 +18,7 @@
*/
#include eschesdo.hxx
+#include svx/svdomedia.hxx
#include svx/xflftrit.hxx
#include filter/msfilter/escherex.hxx
#include svx/unoapi.hxx
@@ -1283,38 +1284,60 @@ sal_Bool
EscherPropertyContainer::CreateOLEGraphicProperties(
if ( pGraphic )
{
GraphicObject aGraphicObject( *pGraphic );
-OString aUniqueId( aGraphicObject.GetUniqueID() );
-if ( !aUniqueId.isEmpty() )
-{
-AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
-uno::Reference beans::XPropertySet aXPropSet( rXShape,
uno::UNO_QUERY );
+bRetValue = CreateGraphicProperties( rXShape,aGraphicObject );
+}
+}
+}
+return bRetValue;
+}
-if ( pGraphicProvider pPicOutStrm pShapeBoundRect
aXPropSet.is() )
-{
-::com::sun::star::uno::Any aAny;
-::com::sun::star::awt::Rectangle* pVisArea = NULL;
-if ( EscherPropertyValueHelper::GetPropertyValue(
aAny, aXPropSet, OUString( VisibleArea ) ) )
-{
-pVisArea = new ::com::sun::star::awt::Rectangle;
-aAny = (*pVisArea);
-}
-Rectangle aRect( Point( 0, 0 ),
pShapeBoundRect-GetSize() );
-sal_uInt32 nBlibId = pGraphicProvider-GetBlibID(
*pPicOutStrm, aUniqueId, aRect, pVisArea, NULL );
-if ( nBlibId )
-{
-AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
-ImplCreateGraphicAttributes( aXPropSet, nBlibId,
sal_False );
-bRetValue = sal_True;
-}
-delete pVisArea;
-}
-}
+sal_Bool EscherPropertyContainer::CreateGraphicProperties( const
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShape
rXShape, const GraphicObject rGraphicObj )
+{
+sal_BoolbRetValue = sal_False;
+OString aUniqueId( rGraphicObj.GetUniqueID() );
+if ( !aUniqueId.isEmpty() )
+{
+AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
+uno::Reference beans::XPropertySet aXPropSet( rXShape,
uno::UNO_QUERY );
+
+if ( pGraphicProvider pPicOutStrm pShapeBoundRect
aXPropSet.is() )
+{
+::com::sun::star::uno::Any aAny;
+::com::sun::star::awt::Rectangle* pVisArea = NULL;
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet,
OUString(VisibleArea ) ) )
+{
+pVisArea = new ::com::sun::star::awt::Rectangle;
+aAny = (*pVisArea);
}
+Rectangle aRect( Point( 0, 0 ), pShapeBoundRect-GetSize() );
+sal_uInt32 nBlibId = pGraphicProvider-GetBlibID( *pPicOutStrm,
aUniqueId, aRect, pVisArea, NULL );
+if ( nBlibId )
+{
+AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
+ImplCreateGraphicAttributes( aXPropSet, nBlibId, sal_False );
+bRetValue = sal_True;
+}
+delete pVisArea;
}
}
return bRetValue;
}
+sal_Bool EscherPropertyContainer::CreateMediaGraphicProperties(
+const ::com::sun::star::uno::Reference ::com::sun::star::drawing::XShape
rXShape )
+{
+sal_BoolbRetValue = sal_False;
+if ( rXShape.is() )
+{
+SdrObject* pSdrMedia( GetSdrObjectFromXShape( rXShape ) ); // SJ:
leaving unoapi, because currently there is
+if ( pSdrMedia pSdrMedia-ISA( SdrMediaObj ) ) // no
access to the native graphic object
+{
+GraphicObject aGraphicObject(
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - eb/34ba3c343807201c62a49a19d7616e1011c118 fb/b7e8d8957877922f2f3a971e88685589f43939
eb/34ba3c343807201c62a49a19d7616e1011c118 |1 + fb/b7e8d8957877922f2f3a971e88685589f43939 |1 + 2 files changed, 2 insertions(+) New commits: commit ce21def4ffd18d13960c25ec831de4f49500c6e0 Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 10:23:44 2013 +0100 Notes added by 'git notes add' diff --git a/eb/34ba3c343807201c62a49a19d7616e1011c118 b/eb/34ba3c343807201c62a49a19d7616e1011c118 new file mode 100644 index 000..368c40d --- /dev/null +++ b/eb/34ba3c343807201c62a49a19d7616e1011c118 @@ -0,0 +1 @@ +merged as: ba8485a9c87a5feca3c2673af532e73ecf517b69 commit 2b214eed17407b2a78b00a9ce6b0673312c894e0 Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 10:23:33 2013 +0100 Notes added by 'git notes add' diff --git a/fb/b7e8d8957877922f2f3a971e88685589f43939 b/fb/b7e8d8957877922f2f3a971e88685589f43939 new file mode 100644 index 000..9774aca --- /dev/null +++ b/fb/b7e8d8957877922f2f3a971e88685589f43939 @@ -0,0 +1 @@ +merged as: c05c16635b15a47591faa737947c2dce3dcb863e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/setsdkenv_unix|2 +- odk/config/setsdkenv_windows.bat |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ae6a7df73b6e279b315417e2a15a8d9a2117e9f3 Author: Stephan Bergmann sberg...@redhat.com Date: Mon May 27 11:22:50 2013 +0200 Typo (and don't shout at me) Change-Id: Id5ad3af1fd70de6b0e9d2640d12011362e7c34ef diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix index 38ab222..85925fe 100755 --- a/odk/config/setsdkenv_unix +++ b/odk/config/setsdkenv_unix @@ -62,7 +62,7 @@ else echo echo * echo * You have to configure your SDK environment first before you can -echo * can use it! The configuration has to be done only once. +echo * use it. The configuration has to be done only once. echo * echo echo diff --git a/odk/config/setsdkenv_windows.bat b/odk/config/setsdkenv_windows.bat index ac1a559..a7b0079 100755 --- a/odk/config/setsdkenv_windows.bat +++ b/odk/config/setsdkenv_windows.bat @@ -52,7 +52,7 @@ if not exist %OO_USER_SDKENV_SCRIPT%. ( echo ** echo * echo * You have to configure your SDK environment first before you can - echo * can use it! The configuration has to be done only once. + echo * use it. The configuration has to be done only once. echo * echo ** echo. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on||65022 --- Comment #23 from Petr Mladek pmla...@suse.cz --- Add 65022: crash when selecting Format - Paragraph/Page. It is basic operation. -- 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-4-1' - odk/config
odk/config/setsdkenv_unix|2 +- odk/config/setsdkenv_windows.bat |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 3288e3a2c3e2f6f4596d45d18cb06cd955d147fd Author: Stephan Bergmann sberg...@redhat.com Date: Mon May 27 11:22:50 2013 +0200 Typo (and don't shout at me) Change-Id: Id5ad3af1fd70de6b0e9d2640d12011362e7c34ef (cherry picked from commit ae6a7df73b6e279b315417e2a15a8d9a2117e9f3) diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix index 38ab222..85925fe 100755 --- a/odk/config/setsdkenv_unix +++ b/odk/config/setsdkenv_unix @@ -62,7 +62,7 @@ else echo echo * echo * You have to configure your SDK environment first before you can -echo * can use it! The configuration has to be done only once. +echo * use it. The configuration has to be done only once. echo * echo echo diff --git a/odk/config/setsdkenv_windows.bat b/odk/config/setsdkenv_windows.bat index ac1a559..a7b0079 100755 --- a/odk/config/setsdkenv_windows.bat +++ b/odk/config/setsdkenv_windows.bat @@ -52,7 +52,7 @@ if not exist %OO_USER_SDKENV_SCRIPT%. ( echo ** echo * echo * You have to configure your SDK environment first before you can - echo * can use it! The configuration has to be done only once. + echo * use it. The configuration has to be done only once. echo * echo ** echo. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote cui/uiconfig reportdesign/source svx/uiconfig
android/sdremote/res/values/strings.xml |4 ++--
cui/uiconfig/ui/colorpage.ui |2 +-
reportdesign/source/core/resource/strings.src |2 +-
svx/uiconfig/ui/redlineviewpage.ui|2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 23cafa4aca8ed197fbec8b5edac0fba4435db2cd
Author: Andras Timar ati...@suse.com
Date: Mon May 27 11:31:48 2013 +0200
fix typos reported by localizers
Change-Id: I0b9a36f0c6f081ff35f0b8bc6e420d881036576c
diff --git a/android/sdremote/res/values/strings.xml
b/android/sdremote/res/values/strings.xml
index 324d852..816deae 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -17,7 +17,7 @@
string name=clock_timer_resumeResume/string
string name=options_autodeclineDecline Calls/string
string name=helpHelp/string
-string name=ConnectionFailedHelp#1 Verify Impress is running \n#2 For
Bluetooth user, enable \Preference\-\LibreOffice
Impress\-\General\-\Enable remote control\\n#3 For WiFi user, tick
\Preferece\-\LibreOffice\-\Advanced\-\Enable Experimental Features\ \n
/string
+string name=ConnectionFailedHelp#1 Verify Impress is running \n#2 For
Bluetooth user, enable \Preferences\-\LibreOffice
Impress\-\General\-\Enable remote control\\n#3 For WiFi user, tick
\Preferences\-\LibreOffice\-\Advanced\-\Enable Experimental Features\
\n /string
string name=options_descriptionAutomatically decline all incoming
calls./string
string name=options_volumeswitchingVolume Switching/string
string name=options_volumeswitching_descriptonChange slides using
volume buttons/string
@@ -53,7 +53,7 @@
string name=addserver_cancelCancel/string
string name=reconnect_description1Your connection has been
dropped./string
string name=reconnect_description2Please try to reconnect/string
-string name=wifiAlertMsgThis is still an experimental feature. You
need to \enable experimental features\ in
\Preference\-\LibreOffice\-\Advanced\ on your computer. \nThe use over
Bluetooth is recommended./string
+string name=wifiAlertMsgThis is still an experimental feature. You
need to \enable experimental features\ in
\Preferences\-\LibreOffice\-\Advanced\ on your computer. \nThe use over
Bluetooth is recommended./string
string-array name=countdown_values
item 5:00/item
item 10:00/item
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index e190e4d..4a16e76 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -206,7 +206,7 @@
property name=id_column1/property
items
item translatable=yesRGB/item
- item translatable=yesCYMK/item
+ item translatable=yesCMYK/item
/items
child internal-child=accessible
object class=AtkObject id=modellb-atkobject
diff --git a/reportdesign/source/core/resource/strings.src
b/reportdesign/source/core/resource/strings.src
index d161f29..8ac0dd7 100644
--- a/reportdesign/source/core/resource/strings.src
+++ b/reportdesign/source/core/resource/strings.src
@@ -56,7 +56,7 @@ String RID_STR_REPORT_FOOTER
String RID_STR_PROPERTY_CHANGE_NOT_ALLOWED
{
-Text [ en-US ] = The name '#1' already exists and can not be asssigned
again.;
+Text [ en-US ] = The name '#1' already exists and cannot be assigned
again.;
};
String RID_STR_ERROR_WRONG_ARGUMENT
diff --git a/svx/uiconfig/ui/redlineviewpage.ui
b/svx/uiconfig/ui/redlineviewpage.ui
index d5e538e..2d817e9 100644
--- a/svx/uiconfig/ui/redlineviewpage.ui
+++ b/svx/uiconfig/ui/redlineviewpage.ui
@@ -30,7 +30,7 @@
object class=GtkLabel id=position
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=label translatable=yesPostion/property
+property name=label translatable=yesPosition/property
/object
packing
property name=expandFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - android/sdremote cui/uiconfig reportdesign/source svx/uiconfig
android/sdremote/res/values/strings.xml |4 ++--
cui/uiconfig/ui/colorpage.ui |2 +-
reportdesign/source/core/resource/strings.src |2 +-
svx/uiconfig/ui/redlineviewpage.ui|2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 8d4e5e7938f7008bc3f973cc8158a39cbd1a5bdb
Author: Andras Timar ati...@suse.com
Date: Mon May 27 11:31:48 2013 +0200
fix typos reported by localizers
Change-Id: I0b9a36f0c6f081ff35f0b8bc6e420d881036576c
diff --git a/android/sdremote/res/values/strings.xml
b/android/sdremote/res/values/strings.xml
index 324d852..816deae 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -17,7 +17,7 @@
string name=clock_timer_resumeResume/string
string name=options_autodeclineDecline Calls/string
string name=helpHelp/string
-string name=ConnectionFailedHelp#1 Verify Impress is running \n#2 For
Bluetooth user, enable \Preference\-\LibreOffice
Impress\-\General\-\Enable remote control\\n#3 For WiFi user, tick
\Preferece\-\LibreOffice\-\Advanced\-\Enable Experimental Features\ \n
/string
+string name=ConnectionFailedHelp#1 Verify Impress is running \n#2 For
Bluetooth user, enable \Preferences\-\LibreOffice
Impress\-\General\-\Enable remote control\\n#3 For WiFi user, tick
\Preferences\-\LibreOffice\-\Advanced\-\Enable Experimental Features\
\n /string
string name=options_descriptionAutomatically decline all incoming
calls./string
string name=options_volumeswitchingVolume Switching/string
string name=options_volumeswitching_descriptonChange slides using
volume buttons/string
@@ -53,7 +53,7 @@
string name=addserver_cancelCancel/string
string name=reconnect_description1Your connection has been
dropped./string
string name=reconnect_description2Please try to reconnect/string
-string name=wifiAlertMsgThis is still an experimental feature. You
need to \enable experimental features\ in
\Preference\-\LibreOffice\-\Advanced\ on your computer. \nThe use over
Bluetooth is recommended./string
+string name=wifiAlertMsgThis is still an experimental feature. You
need to \enable experimental features\ in
\Preferences\-\LibreOffice\-\Advanced\ on your computer. \nThe use over
Bluetooth is recommended./string
string-array name=countdown_values
item 5:00/item
item 10:00/item
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index e190e4d..4a16e76 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -206,7 +206,7 @@
property name=id_column1/property
items
item translatable=yesRGB/item
- item translatable=yesCYMK/item
+ item translatable=yesCMYK/item
/items
child internal-child=accessible
object class=AtkObject id=modellb-atkobject
diff --git a/reportdesign/source/core/resource/strings.src
b/reportdesign/source/core/resource/strings.src
index d161f29..8ac0dd7 100644
--- a/reportdesign/source/core/resource/strings.src
+++ b/reportdesign/source/core/resource/strings.src
@@ -56,7 +56,7 @@ String RID_STR_REPORT_FOOTER
String RID_STR_PROPERTY_CHANGE_NOT_ALLOWED
{
-Text [ en-US ] = The name '#1' already exists and can not be asssigned
again.;
+Text [ en-US ] = The name '#1' already exists and cannot be assigned
again.;
};
String RID_STR_ERROR_WRONG_ARGUMENT
diff --git a/svx/uiconfig/ui/redlineviewpage.ui
b/svx/uiconfig/ui/redlineviewpage.ui
index d5e538e..2d817e9 100644
--- a/svx/uiconfig/ui/redlineviewpage.ui
+++ b/svx/uiconfig/ui/redlineviewpage.ui
@@ -30,7 +30,7 @@
object class=GtkLabel id=position
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=label translatable=yesPostion/property
+property name=label translatable=yesPosition/property
/object
packing
property name=expandFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Timur gti...@gmail.com changed: What|Removed |Added Depends on|46060 | --- Comment #154 from Timur gti...@gmail.com --- Bug 46060 - Writer corrupts DOCX file containing TOC, recovery not possible with Office 2010 - shouldn't be here, rather on MAB 3.6, so I move it there. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Timur gti...@gmail.com changed: What|Removed |Added Depends on||46060 --- Comment #225 from Timur gti...@gmail.com --- I move here Bug 46060 - Writer corrupts DOCX file containing TOC, recovery not possible with Office 2010 - from MAB 4.0. -- 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
Polynomial and moving average regression lines for chart
Hi, I have implemented the polynomial and moving average regression curves (trend lines) for chart. I have pushed the changes to a feature branch feature/polynomialregression so please test it if you are interested. The work is still ongoing but I want some feedback. Currently implemented is: - calculating of polynomial and moving average curve - limited the curve calculation to min and max X value. - properties degree and period for regression curve - added extrapolation - extended the trend line dialog (but it would be better to convert it to the new dialog infrastructure but this is a lot of work) Still missing: - intercept - finish changes to dialog - changing import/export filters to support - revise the proposal to extend ODF I have made some changes to the IDL files so probably this is an API change (It is my first time changing a IDL so I don't know what to do in this case). Can somebody take a look at it? The enum ChartRegressionCurveType (offapi/com/sun/star/chart/ChartRegressionCurveType.idl) represents the various types of regression lines. Polynomial type was already in (however it was deprecated) but I also need to add MOVING_AVERAGE type. If I add it, compilation fails - do I have to do something else? ChartRegressionCurveType is only used in chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx and it does not influence the current functionality (but might be a problem with filters). Any suggestions/opinions welcome. If I will progress fast enough I will also propose this as a late feature for 4.1 however there were quite some changes. Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Polynomial and moving average regression lines for chart
Hey Tomaž, 2013/5/27 Tomaž Vajngerl qui...@gmail.com: Hi, I have implemented the polynomial and moving average regression curves (trend lines) for chart. I have pushed the changes to a feature branch feature/polynomialregression so please test it if you are interested. The work is still ongoing but I want some feedback. Awesome that finally someone is going to work on this feature. Currently implemented is: - calculating of polynomial and moving average curve - limited the curve calculation to min and max X value. - properties degree and period for regression curve - added extrapolation - extended the trend line dialog (but it would be better to convert it to the new dialog infrastructure but this is a lot of work) We can try to find someone doing the work in glade so that it would be just adapting the code which I can quickly do if necessary. Still missing: - intercept - finish changes to dialog - changing import/export filters to support - revise the proposal to extend ODF I have made some changes to the IDL files so probably this is an API change (It is my first time changing a IDL so I don't know what to do in this case). Can somebody take a look at it? I will do but chart is a bit special. There should be no changes to published interfaces in com/sun/star/chart and all changes should be made to the unpublished ones in com/sun/star/chart2. This means in your case that you must duplicate some of the exisiting enums into chart2 and extend them there. The enum ChartRegressionCurveType (offapi/com/sun/star/chart/ChartRegressionCurveType.idl) represents the various types of regression lines. Polynomial type was already in (however it was deprecated) but I also need to add MOVING_AVERAGE type. If I add it, compilation fails - do I have to do something else? ChartRegressionCurveType is only used in chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx and it does not influence the current functionality (but might be a problem with filters). As mentioned above com/sun/star/chart should not be changed even with our relaxed requirements for API changes. All the changes for charts should go into chart2 as the old chart API is stable, used outside of LibO and on its way to become deprecated. However this also means to adapt the corresponding import/export code as it surely uses the chart API and not the new chart2 API for this feature. I'll have a closer look later today. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - filter/source include/filter sd/source
filter/source/msfilter/escherex.cxx | 73 +++
include/filter/msfilter/escherex.hxx |7 +++
sd/source/filter/eppt/epptso.cxx | 15 ++-
sd/source/filter/ppt/pptin.cxx |2
4 files changed, 71 insertions(+), 26 deletions(-)
New commits:
commit b3faed955fa4e0c7e3b1f6843bfb81f15edc2826
Author: Sun Ying suny...@apache.org
Date: Mon Sep 10 01:56:28 2012 +
Resolves: #i119753# fix audio video object lost when save .ppt file
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
(cherry picked from commit fbb7e8d8957877922f2f3a971e88685589f43939)
Conflicts:
filter/inc/filter/msfilter/escherex.hxx
filter/source/msfilter/escherex.cxx
Change-Id: I545a9e95c23cfba0cc918c9c4243528570734b2d
(cherry picked from commit c05c16635b15a47591faa737947c2dce3dcb863e)
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 4c8fec0..68bd12d 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -18,6 +18,7 @@
*/
#include eschesdo.hxx
+#include svx/svdomedia.hxx
#include svx/xflftrit.hxx
#include filter/msfilter/escherex.hxx
#include svx/unoapi.hxx
@@ -1283,38 +1284,60 @@ sal_Bool
EscherPropertyContainer::CreateOLEGraphicProperties(
if ( pGraphic )
{
GraphicObject aGraphicObject( *pGraphic );
-OString aUniqueId( aGraphicObject.GetUniqueID() );
-if ( !aUniqueId.isEmpty() )
-{
-AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
-uno::Reference beans::XPropertySet aXPropSet( rXShape,
uno::UNO_QUERY );
+bRetValue = CreateGraphicProperties( rXShape,aGraphicObject );
+}
+}
+}
+return bRetValue;
+}
-if ( pGraphicProvider pPicOutStrm pShapeBoundRect
aXPropSet.is() )
-{
-::com::sun::star::uno::Any aAny;
-::com::sun::star::awt::Rectangle* pVisArea = NULL;
-if ( EscherPropertyValueHelper::GetPropertyValue(
aAny, aXPropSet, OUString( VisibleArea ) ) )
-{
-pVisArea = new ::com::sun::star::awt::Rectangle;
-aAny = (*pVisArea);
-}
-Rectangle aRect( Point( 0, 0 ),
pShapeBoundRect-GetSize() );
-sal_uInt32 nBlibId = pGraphicProvider-GetBlibID(
*pPicOutStrm, aUniqueId, aRect, pVisArea, NULL );
-if ( nBlibId )
-{
-AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
-ImplCreateGraphicAttributes( aXPropSet, nBlibId,
sal_False );
-bRetValue = sal_True;
-}
-delete pVisArea;
-}
-}
+sal_Bool EscherPropertyContainer::CreateGraphicProperties( const
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShape
rXShape, const GraphicObject rGraphicObj )
+{
+sal_BoolbRetValue = sal_False;
+OString aUniqueId( rGraphicObj.GetUniqueID() );
+if ( !aUniqueId.isEmpty() )
+{
+AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
+uno::Reference beans::XPropertySet aXPropSet( rXShape,
uno::UNO_QUERY );
+
+if ( pGraphicProvider pPicOutStrm pShapeBoundRect
aXPropSet.is() )
+{
+::com::sun::star::uno::Any aAny;
+::com::sun::star::awt::Rectangle* pVisArea = NULL;
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet,
OUString(VisibleArea ) ) )
+{
+pVisArea = new ::com::sun::star::awt::Rectangle;
+aAny = (*pVisArea);
}
+Rectangle aRect( Point( 0, 0 ), pShapeBoundRect-GetSize() );
+sal_uInt32 nBlibId = pGraphicProvider-GetBlibID( *pPicOutStrm,
aUniqueId, aRect, pVisArea, NULL );
+if ( nBlibId )
+{
+AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
+ImplCreateGraphicAttributes( aXPropSet, nBlibId, sal_False );
+bRetValue = sal_True;
+}
+delete pVisArea;
}
}
return bRetValue;
}
+sal_Bool EscherPropertyContainer::CreateMediaGraphicProperties(
+const ::com::sun::star::uno::Reference ::com::sun::star::drawing::XShape
rXShape )
+{
+sal_BoolbRetValue = sal_False;
+if ( rXShape.is() )
+{
+SdrObject* pSdrMedia( GetSdrObjectFromXShape( rXShape ) ); // SJ:
leaving unoapi, because currently there is
+if ( pSdrMedia pSdrMedia-ISA( SdrMediaObj ) ) // no
access to the native graphic object
+{
+GraphicObject aGraphicObject(
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst |8
solenv/inc/minor.mk |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit d0e63997b0d9c40424367f1500138893789c9121
Author: Andras Timar ati...@suse.com
Date: Mon May 27 12:18:27 2013 +0200
Bump for 3.6-24
Change-Id: Ie86956ae5b6187b08a264f15e190df74c887aa3f
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 67faf1f..4ccf2a3 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 23
+WINDOWSPATCHLEVEL 24
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-523
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-524
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-523
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-524
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-523
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-524
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 9dcc6c8..96af42b 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=360
-RSCREVISION=360m1(Build:523)
-BUILD=523
+RSCREVISION=360m1(Build:524)
+BUILD=524
LAST_MINOR=m1
SOURCEVERSION=OOO360
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9b845493125e34e6bd5e7b0df35f21853f7d240d Author: Tor Lillqvist t...@iki.fi Date: Mon May 27 13:16:57 2013 +0300 Plain make hopefully works fine too Might make it a little bit easier for new contributors. Change-Id: If4475c1ea7f55c34971beecd7573aaaf545e7106 diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj index eb1d1f3..3209332 100644 --- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj @@ -368,7 +368,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = cd ../../.. /opt/lo/bin/make ios; + shellScript = cd ../../.. make ios; }; /* End PBXShellScriptBuildPhase section */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Wrong embedded window size with LibreOffice when try to use xEmbed in java app
On 05/24/2013 12:03 AM, Fernando Digitaldoc wrote: Well, is really same case: https://issues.apache.org/ooo/show_bug.cgi?id=106352 “run the OOoBeanViewer demo from the ooo sdk with -Dsun.awt.xembedserver=true with jdk1.6.0_11 linux i586 expected result: openoffice should use the whole space it is supposed to use actual result: it uses only 200x200 pixels” But, we using in test LibreOffice 3.5 or 3.6 .. and too use java 6.35 or another. Can be reproduced by example: https://dl.dropboxusercontent.com/u/30314039/JavaCallLibreOfficeWeb.rar So I can reproduce with a recent LibreOffice master build on Fedora 18 x86_64, using java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64 that running the SDK's examples/DevelopersGuide/OfficeBean with an additional -Dsun.awt.xembedserver=true shows a cropped LO window, while running it without that additional -Dsun.awt.xembedserver=true works fine. But I have no idea where in the code (LibreOffice side bean, toolkit, and vcl modules; or JRE side) things go wrong. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: framework/source
framework/source/services/backingwindow.cxx | 191 +---
framework/source/services/backingwindow.hxx | 19 +-
2 files changed, 73 insertions(+), 137 deletions(-)
New commits:
commit 174e32567f410e9049e9856629896ae6a798d752
Author: Ariel Constenla-Haile arie...@apache.org
Date: Sat May 25 22:10:24 2013 +
Recent files menu in the StartModule should be the same as in the menubar
(cherry picked from commit cbf0812a9bcd4287af1f5db0f2c30caf1508baa6)
Conflicts:
framework/source/services/backingwindow.cxx
framework/source/services/backingwindow.hxx
Change-Id: I49dc11e1cf9bd6831c16e53d24a131de4d565373
diff --git a/framework/source/services/backingwindow.cxx
b/framework/source/services/backingwindow.cxx
index 5f03d48..7dab8c9 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -46,6 +46,8 @@
#include comphelper/sequenceashashmap.hxx
#include comphelper/configurationhelper.hxx
+#include toolkit/awt/vclxmenu.hxx
+
#include cppuhelper/implbase1.hxx
#include rtl/strbuf.hxx
@@ -61,7 +63,7 @@
#include com/sun/star/task/XJobExecutor.hpp
#include com/sun/star/util/XStringWidth.hpp
#include com/sun/star/util/URLTransformer.hpp
-
+#include com/sun/star/frame/PopupMenuControllerFactory.hpp
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
@@ -69,6 +71,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace framework;
+#define RECENT_FILE_LIST.uno:RecentFileList
+
#define WRITER_URL private:factory/swriter
#define CALC_URLprivate:factory/scalc
#define IMPRESS_WIZARD_URL private:factory/simpress?slot=6686
@@ -149,15 +153,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
mnHideExternalLinks( 0 ),
mpAccExec( NULL ),
mnBtnPos( 120 ),
-mnBtnTop( 150 ),
-mpRecentMenu( NULL )
+mnBtnTop( 150 )
{
mnColumnWidth[0] = mnColumnWidth[1] = 0;
mnTextColumnWidth[0] = mnTextColumnWidth[1] = 0;
try
{
-Referencelang::XMultiServiceFactory xConfig =
configuration::theDefaultProvider::get(
comphelper::getProcessComponentContext() );
+mxContext.set( ::comphelper::getProcessComponentContext(),
uno::UNO_SET_THROW );
+Referencelang::XMultiServiceFactory xConfig =
configuration::theDefaultProvider::get( mxContext );
SequenceAny args(1);
PropertyValue val(
nodepath,
@@ -172,9 +176,20 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
Any value( xNameAccess-getByName(StartCenterHideExternalLinks)
);
mnHideExternalLinks = value.getsal_Int32();
}
+
+mxPopupMenuFactory.set(
+frame::PopupMenuControllerFactory::create( mxContext ) );
+// TODO If there is no PopupMenuController, the button should be a
nomral one not a MenuButton
+if ( mxPopupMenuFactory-hasController(
+OUString( RECENT_FILE_LIST ) ,
OUString(com.sun.star.frame.StartModule) ) )
+{
+mxPopupMenu.set(
mxContext-getServiceManager()-createInstanceWithContext(
+OUString( com.sun.star.awt.PopupMenu ), mxContext ),
uno::UNO_QUERY_THROW );
+}
}
-catch (const Exception)
+catch (const Exception e)
{
+SAL_WARN( fwk, BackingWindow - caught an exception! e.Message
);
}
OUString aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
@@ -244,8 +259,24 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
BackingWindow::~BackingWindow()
{
maToolbox.RemoveEventListener( LINK( this, BackingWindow,
WindowEventListener ) );
-delete mpRecentMenu;
delete mpAccExec;
+
+if( mxPopupMenuController.is() )
+{
+Reference lang::XComponent xComponent( mxPopupMenuController,
UNO_QUERY );
+if( xComponent.is() )
+{
+try
+{
+xComponent-dispose();
+}
+catch (...)
+{}
+}
+mxPopupMenuController.clear();
+}
+mxPopupMenuFactory.clear();
+mxPopupMenu.clear();
}
void BackingWindow::GetFocus()
@@ -282,117 +313,40 @@ IMPL_LINK( BackingWindow, WindowEventListener,
VclSimpleEvent*, pEvent )
void BackingWindow::prepareRecentFileMenu()
{
-if( ! mpRecentMenu )
-mpRecentMenu = new PopupMenu();
-mpRecentMenu-Clear();
-maRecentFiles.clear();
-
-// get recent file list and dispatch arguments
-Sequence Sequence PropertyValue aHistoryList(
SvtHistoryOptions().GetList( ePICKLIST ) );
-
-sal_Int32 nPickListMenuItems = ( aHistoryList.getLength() 99 ) ? 99 :
aHistoryList.getLength();
+if( ! mxPopupMenu.is() )
+return;
-if( ( nPickListMenuItems 0 ) )
+if ( !mxPopupMenuController.is() )
{
-maRecentFiles.reserve( nPickListMenuItems );
-for ( sal_Int32 i = 0; i nPickListMenuItems; i++
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cb/f0812a9bcd4287af1f5db0f2c30caf1508baa6
cb/f0812a9bcd4287af1f5db0f2c30caf1508baa6 |1 + 1 file changed, 1 insertion(+) New commits: commit b0e0eb30b375a3ec9ff45a6a7dd1ab1201a04d64 Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 11:45:28 2013 +0100 Notes added by 'git notes add' diff --git a/cb/f0812a9bcd4287af1f5db0f2c30caf1508baa6 b/cb/f0812a9bcd4287af1f5db0f2c30caf1508baa6 new file mode 100644 index 000..75bd10a --- /dev/null +++ b/cb/f0812a9bcd4287af1f5db0f2c30caf1508baa6 @@ -0,0 +1 @@ +merged as: 174e32567f410e9049e9856629896ae6a798d752 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: imports of screen shots
Hi Grog, On Thu, May 23, 2013 at 02:00:08PM +0100, Grog grog.foo...@geokinetics.com wrote: It would be nice if there was a mechanism to take a screen shot and put it straight into presentations on linux, as opposed to the current way that I can see which is..use (say) ksnapshot', save file, import file into libreoffice impress..on the linux side of life...i.e. intergrate the grabbing of screens/windows into the libreoffice frame work. Obviously I apologise if I have not seen this in the latest code. But it would save a lot of work for people who need to do this kind of thing. This list is in general about discussing code, patches, etc. -- not the right place to request features. Though, given you mentioned ksnapshot, I guess you're on KDE: there after you make the screenshot, you can just use the Copy button, then Paste in Impress to avoid having to save the file on the disk. I believe this is easy enough, and filling the clipboard with a screenshot is really a task for the system, not LO itself. Best, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Compilation flag --disable-gconf
On Tue, 2013-05-21 at 17:21 +0200, Saulo Aldighieri Moraes wrote: Hello, I am trying to find out what kind of functionally will be missed after remove GConf with compilation flag: --disable-gconf Maybe lock-down support as sabayon integration for building profiles for people? lockdown depends on gconf yes, additional things that won't be there any more are fairly minor, e.g. getting the default user's name and the default proxy settings and so on. You can see the list in shell/source/backends/gconfbe/gconfaccess.cxx C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/engine3d/camera3d.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 17f21e6bcc5283c5485cc42344610e8125547c0f Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon May 27 13:00:40 2013 +0200 reintroduce removed line, fdo#62402 This line was removed with dd3e879cfdacbc8b9fff7556ae2d8698a22e9235 but is needed. Special thanks to Joren for bibisecting and bisecting. Change-Id: Id2b3de4098db75571006e6e62b77efe8c491b06f diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx index 115e384..533b456 100644 --- a/svx/source/engine3d/camera3d.cxx +++ b/svx/source/engine3d/camera3d.cxx @@ -117,6 +117,8 @@ void Camera3D::SetBankAngle(double fAngle) } // Calculate from aDiff to uppwards pointing View-Up-Vector +// duplicated line is intentional! +aPrj = aPrj.getPerpendicular(aDiff); aPrj = aPrj.getPerpendicular(aDiff); aDiff.normalize(); ___ 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' - fe/549458ef04384ba777e4a36f34b68efc5b8b6d
fe/549458ef04384ba777e4a36f34b68efc5b8b6d |1 + 1 file changed, 1 insertion(+) New commits: commit 173e74b32a8b3e886ebc829edd375768506198fb Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 12:11:53 2013 +0100 Notes added by 'git notes add' diff --git a/fe/549458ef04384ba777e4a36f34b68efc5b8b6d b/fe/549458ef04384ba777e4a36f34b68efc5b8b6d new file mode 100644 index 000..0d004f9 --- /dev/null +++ b/fe/549458ef04384ba777e4a36f34b68efc5b8b6d @@ -0,0 +1 @@ +merged as: ee0ecef811d445e2a3bf54710707713478e61fad ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source sw/source
filter/source/msfilter/msdffimp.cxx |2 -
sw/source/filter/ww8/wrtw8esh.cxx | 57 +++-
2 files changed, 57 insertions(+), 2 deletions(-)
New commits:
commit ee0ecef811d445e2a3bf54710707713478e61fad
Author: Lei De Bin le...@apache.org
Date: Mon Aug 20 00:48:42 2012 +
Resolves: #i120158# fix picture shadow lost after saved as doc in some case
Reported by: Yan Ji
Patch by: Chen Zuo Jun
Review by: Lei De Bin (cherry picked from commit
fe549458ef04384ba777e4a36f34b68efc5b8b6d)
Conflicts:
filter/source/msfilter/msdffimp.cxx
sw/source/filter/ww8/wrtw8esh.cxx
Change-Id: I863ea7193f3dee563a892a6d857ee2385f58a862
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index cc2dbf6..23c95fe 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2616,7 +2616,7 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn,
SfxItemSet rSet, DffObj
break;
}
}
-if ( ( ( nLineFlags 0x08 ) == 0 ) ( ( nFillFlags 0x10 ) == 0 )
) // if there is no fillstyle and linestyle
+if ( ( ( nLineFlags 0x08 ) == 0 ) ( ( nFillFlags 0x10 ) == 0 )
( rObjData.eShapeType != mso_sptPictureFrame ))// if there is no
fillstyle and linestyle
bHasShadow = sal_False;
// we are turning shadow off.
if ( bHasShadow )
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 5e7add3..be4f594 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -44,6 +44,7 @@
#include svx/svdoole2.hxx
#include editeng/editeng.hxx
#include editeng/flditem.hxx
+#include editeng/shaditem.hxx
#include unotools/ucbstreamhelper.hxx
#include svx/fmglob.hxx
#include svx/svdouno.hxx
@@ -92,7 +93,6 @@
#include fstream
#include unotools/streamwrap.hxx
-
using ::editeng::SvxBorderLine;
using namespace com::sun::star;
using namespace sw::util;
@@ -1793,6 +1793,61 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const
SwFrmFmt rFmt,
rPropOpt.AddOpt( ESCHER_Prop_dxTextLeft, 0 );
rPropOpt.AddOpt( ESCHER_Prop_dxTextRight, 0 );
}
+const SwAttrSet rAttrSet = rFmt.GetAttrSet();
+if (SFX_ITEM_ON == rAttrSet.GetItemState(RES_BOX, false, pItem))
+{
+const SvxBoxItem* pBox = (const SvxBoxItem*)pItem;
+if( pBox )
+{
+const SfxPoolItem* pShadItem;
+if (SFX_ITEM_ON
+== rAttrSet.GetItemState(RES_SHADOW, true, pShadItem))
+{
+const SvxShadowItem* pSI = (const SvxShadowItem*)pShadItem;
+
+const sal_uInt16 nCstScale = 635;// unit scale between
SODC and MS Word
+const sal_uInt32 nShadowType = 131074;// shadow type of ms
word. need to set the default value.
+
+sal_uInt32 nColor = (sal_uInt32)(pSI-GetColor().GetColor()) ;
+sal_uInt32 nOffX = pSI-GetWidth() * nCstScale;
+sal_uInt32 nOffY = pSI-GetWidth() * nCstScale;
+sal_uInt32 nShadow = nShadowType;
+
+SvxShadowLocation eLocation = pSI-GetLocation();
+if( (eLocation!=SVX_SHADOW_NONE) (pSI-GetWidth()!=0) )
+{
+switch( eLocation )
+{
+case SVX_SHADOW_TOPLEFT:
+{
+nOffX = -nOffX;
+nOffY = -nOffY;
+}
+break;
+case SVX_SHADOW_TOPRIGHT:
+{
+nOffY = -nOffY;
+}
+break;
+case SVX_SHADOW_BOTTOMLEFT:
+{
+nOffX = -nOffX;
+}
+break;
+case SVX_SHADOW_BOTTOMRIGHT:
+break;
+default:
+break;
+}
+
+rPropOpt.AddOpt( DFF_Prop_shadowColor,
wwUtility::RGBToBGR((nColor)));
+rPropOpt.AddOpt( DFF_Prop_shadowOffsetX,nOffX );
+rPropOpt.AddOpt( DFF_Prop_shadowOffsetY,nOffY );
+rPropOpt.AddOpt( DFF_Prop_fshadowObscured, nShadow );
+}
+}
+}
+}
// SwWW8ImplReader::Read_GrafLayer() imports these as opaque
// unconditionally, so if both are true, don't export the property.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - oox/source svx/source
oox/source/export/chartexport.cxx |6 +++--- svx/source/engine3d/camera3d.cxx |2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) New commits: commit 7855cd6704c864911d97b73f8c46d712975ec9b5 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon May 27 02:08:56 2013 +0200 respect element order in OOXML chart export, related fdo#63114 Change-Id: I591a63c38ab18b03a2f86428defbdac0cb96a1c0 (cherry picked from commit 54fbbc20b8397a8362f5a0878744c3a082464713) diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index c52a3b1..b654001 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1530,15 +1530,15 @@ void ChartExport::exportSeries( Reference chart2::XChartType xChartType, sal_ } } +// export data points +exportDataPoints( uno::Reference beans::XPropertySet ( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength ); + // export data labels // Excel does not like our current data label export // for scatter charts if( eChartType != chart::TYPEID_SCATTER eChartType != chart::TYPEID_BAR ) exportDataLabels( uno::Reference beans::XPropertySet ( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength ); -// export data points -exportDataPoints( uno::Reference beans::XPropertySet ( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength ); - //export error bars here Reference XPropertySet xSeriesPropSet( xSource, uno::UNO_QUERY ); Reference XPropertySet xErrorBarYProps; commit 6b715afe5fac84078677ce2227d2cc783f9ab243 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon May 27 13:00:40 2013 +0200 reintroduce removed line, fdo#62402 This line was removed with dd3e879cfdacbc8b9fff7556ae2d8698a22e9235 but is needed. Special thanks to Joren for bibisecting and bisecting. Change-Id: Id2b3de4098db75571006e6e62b77efe8c491b06f (cherry picked from commit 17f21e6bcc5283c5485cc42344610e8125547c0f) diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx index 115e384..533b456 100644 --- a/svx/source/engine3d/camera3d.cxx +++ b/svx/source/engine3d/camera3d.cxx @@ -117,6 +117,8 @@ void Camera3D::SetBankAngle(double fAngle) } // Calculate from aDiff to uppwards pointing View-Up-Vector +// duplicated line is intentional! +aPrj = aPrj.getPerpendicular(aDiff); aPrj = aPrj.getPerpendicular(aDiff); aDiff.normalize(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/filter/ww8/writerwordglue.cxx |2 ++
sw/source/filter/ww8/wrtw8sty.cxx | 28 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
New commits:
commit d414e84c438f0b0dd935d1ba1d351f7af27d49a8
Author: Luke Deller l...@deller.id.au
Date: Fri May 3 00:32:22 2013 +1000
Fix style renaming confusion in ww8 filter (solves fdo#63603)
(cherry pick my fix from master 2d3d942683d1cce738eab09b58e4fd693d5e7241)
- Mapping LO default style to Word Normal style for docx output used a
hard coded style name, so it broke when LO's default style was renamed
in 4.0 (plus it would never have worked for non-English languages)
- This renaming did not cater for nameclashes, leading to fdo#63603
- Similar renaming when importing doc styles did cater for nameclashes,
but had a minor bug in that
Change-Id: Icd4f27fb1760f0c1ca068c742c48ebcd71d1eb15
Reviewed-on: https://gerrit.libreoffice.org/4039
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 12e9a1c..663e1e1 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -296,11 +296,13 @@ namespace myImplHelpers
aName.InsertAscii(WW- , 0);
sal_Int32 nI = 1;
+String aBaseName = aName;
while (
0 != (pColl = maHelper.GetStyle(aName))
(nI SAL_MAX_INT32)
)
{
+aName = aBaseName;
aName += String::CreateFromInt32(nI++);
}
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index d837181..b0371ff 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -526,8 +526,32 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16
nPos )
GetStyleData( pFmt, bFmtColl, nBase, nWwNext );
String aName = pFmt-GetName();
-if ( aName.EqualsAscii( Default ) )
-aName = rtl::OUString(Normal);
+// We want to map LO's default style to Word's Normal style.
+// Word looks for this specific style name when reading docx files.
+// (It must be the English word regardless of language settings)
+if ( nPos == 0 ) {
+assert( pFmt-GetPoolFmtId() == RES_POOLCOLL_STANDARD );
+aName = OUString(Normal);
+} else if (aName.EqualsIgnoreCaseAscii(Normal)) {
+// If LO has a style named Normal(!) rename it to something
unique
+aName.InsertAscii(LO- , 0);
+String aBaseName = aName;
+// Check if we still have a clash, in which case we add a suffix
+for ( int nSuffix = 0; ; ++nSuffix ) {
+bool clash=false;
+for ( int n = 1; n nUsedSlots; ++n )
+if ( pFmtA[n]
+ pFmtA[n]-GetName().EqualsIgnoreCaseAscii(aName) )
+{
+clash = true;
+break;
+}
+if (!clash)
+break;
+aName = aBaseName;
+aName += OUString::number(++nSuffix);
+}
+}
m_rExport.AttrOutput().StartStyle( aName, bFmtColl,
nBase, nWwNext, GetWWId( *pFmt ), nPos,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] Fix style renaming confusion in ww8 filter (solves fdo#63603...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4039 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4039 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd4f27fb1760f0c1ca068c742c48ebcd71d1eb15 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b3/8a51d67373daf9a45a4701e7c760c7b3571a66
b3/8a51d67373daf9a45a4701e7c760c7b3571a66 |1 + 1 file changed, 1 insertion(+) New commits: commit c83fa87bb9d39b6b47792f14be9847ef5ebe438c Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 12:29:24 2013 +0100 Notes added by 'git notes add' diff --git a/b3/8a51d67373daf9a45a4701e7c760c7b3571a66 b/b3/8a51d67373daf9a45a4701e7c760c7b3571a66 new file mode 100644 index 000..7a09272 --- /dev/null +++ b/b3/8a51d67373daf9a45a4701e7c760c7b3571a66 @@ -0,0 +1 @@ +merged as: eaad3098c605390b9312e37aa05dd8288ea81888 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/uiconfig chart2/uiconfig dbaccess/uiconfig framework/uiconfig sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig
basctl/uiconfig/basicide/toolbar/standardbar.xml |2 +- chart2/uiconfig/toolbar/standardbar.xml|4 ++-- dbaccess/uiconfig/dbapp/toolbar/toolbar.xml|4 ++-- framework/uiconfig/startmodule/toolbar/standardbar.xml |2 +- sc/uiconfig/scalc/toolbar/standardbar.xml |2 +- sd/uiconfig/sdraw/toolbar/standardbar.xml |2 +- sd/uiconfig/simpress/toolbar/standardbar.xml |2 +- starmath/uiconfig/smath/toolbar/standardbar.xml|2 +- sw/uiconfig/sglobal/toolbar/standardbar.xml|2 +- sw/uiconfig/sweb/toolbar/standardbar.xml |2 +- sw/uiconfig/swform/toolbar/standardbar.xml |2 +- sw/uiconfig/swreport/toolbar/standardbar.xml |2 +- sw/uiconfig/swriter/toolbar/standardbar.xml|2 +- sw/uiconfig/swxform/toolbar/standardbar.xml|2 +- 14 files changed, 16 insertions(+), 16 deletions(-) New commits: commit eaad3098c605390b9312e37aa05dd8288ea81888 Author: Ariel Constenla-Haile arie...@apache.org Date: Sat May 25 22:11:30 2013 + Make .uno:Open a drop-down toolbar item (cherry picked from commit b38a51d67373daf9a45a4701e7c760c7b3571a66) Conflicts: chart2/uiconfig/toolbar/standardbar.xml dbaccess/uiconfig/dbapp/toolbar/toolbar.xml sc/uiconfig/scalc/toolbar/standardbar.xml sd/uiconfig/sdraw/toolbar/standardbar.xml starmath/uiconfig/smath/toolbar/standardbar.xml sw/uiconfig/sglobal/toolbar/standardbar.xml sw/uiconfig/sweb/toolbar/standardbar.xml sw/uiconfig/swform/toolbar/standardbar.xml sw/uiconfig/swreport/toolbar/standardbar.xml sw/uiconfig/swriter/toolbar/standardbar.xml sw/uiconfig/swxform/toolbar/standardbar.xml Change-Id: Iac0c7e8e474e8d217ca4daf47232019c64ca888f diff --git a/basctl/uiconfig/basicide/toolbar/standardbar.xml b/basctl/uiconfig/basicide/toolbar/standardbar.xml index 1dc2675..9dec388 100644 --- a/basctl/uiconfig/basicide/toolbar/standardbar.xml +++ b/basctl/uiconfig/basicide/toolbar/standardbar.xml @@ -20,7 +20,7 @@ toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar toolbar:toolbaritem xlink:href=.uno:OpenUrl toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:AddDirect toolbar:style=dropdown/ - toolbar:toolbaritem xlink:href=.uno:Open/ + toolbar:toolbaritem xlink:href=.uno:Open toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:Save/ toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false/ toolbar:toolbarseparator/ diff --git a/chart2/uiconfig/toolbar/standardbar.xml b/chart2/uiconfig/toolbar/standardbar.xml index a7dee53..eef05bd 100644 --- a/chart2/uiconfig/toolbar/standardbar.xml +++ b/chart2/uiconfig/toolbar/standardbar.xml @@ -20,7 +20,7 @@ toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar toolbar:toolbaritem xlink:href=.uno:AddDirect toolbar:text= toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:NewDoc toolbar:text= toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:Open toolbar:text=/ + toolbar:toolbaritem xlink:href=.uno:Open toolbar:text= toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:Save toolbar:text=/ toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:text= toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:text=/ @@ -36,4 +36,4 @@ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:Undo toolbar:text=/ toolbar:toolbaritem xlink:href=.uno:Redo toolbar:text=/ -/toolbar:toolbar \ No newline at end of file +/toolbar:toolbar diff --git a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml index cb5a7bb..ef5dfba 100644 --- a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml +++ b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml @@ -20,7 +20,7 @@ toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar toolbar:toolbaritem xlink:href=.uno:OpenUrl toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:AddDirect toolbar:text= toolbar:style=dropdown/ - toolbar:toolbaritem xlink:href=.uno:Open toolbar:text=/ + toolbar:toolbaritem xlink:href=.uno:Open toolbar:text= toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:Save toolbar:text=/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:Copy toolbar:text=/ @@ -33,4 +33,4 @@ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:HelpIndex toolbar:text=/ toolbar:toolbaritem xlink:href=.uno:ExtendedHelp toolbar:visible=false/ -/toolbar:toolbar \ No newline at end of file +/toolbar:toolbar diff --git a/framework/uiconfig/startmodule/toolbar/standardbar.xml b/framework/uiconfig/startmodule/toolbar/standardbar.xml index
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c1/954d6e72071c12aa4eda412d4370a22f91f787
c1/954d6e72071c12aa4eda412d4370a22f91f787 |1 + 1 file changed, 1 insertion(+) New commits: commit 0b6c173560296ade244cdc7ad176ef86a1d61722 Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 12:34:46 2013 +0100 Notes added by 'git notes add' diff --git a/c1/954d6e72071c12aa4eda412d4370a22f91f787 b/c1/954d6e72071c12aa4eda412d4370a22f91f787 new file mode 100644 index 000..297cb43 --- /dev/null +++ b/c1/954d6e72071c12aa4eda412d4370a22f91f787 @@ -0,0 +1 @@ +merged as: f77388c643399af7852e59fb0c3fd1da3795ea44 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/hicontrast officecfg/registry
icon-themes/galaxy/cmd/lc_autopilotmenu.png |binary icon-themes/galaxy/cmd/sc_autopilotmenu.png |binary icon-themes/hicontrast/cmd/lch_autopilotmenu.png |binary icon-themes/hicontrast/cmd/sch_autopilotmenu.png |binary officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 +++ 5 files changed, 3 insertions(+) New commits: commit f77388c643399af7852e59fb0c3fd1da3795ea44 Author: Ariel Constenla-Haile arie...@apache.org Date: Sat May 25 22:11:47 2013 + Add an icon for .uno:AutoPilotMenu (cherry picked from commit c1954d6e72071c12aa4eda412d4370a22f91f787) Conflicts: officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu Change-Id: I623febfcbdb642fe4b5b0b42e7e89054e3db45de diff --git a/icon-themes/galaxy/cmd/lc_autopilotmenu.png b/icon-themes/galaxy/cmd/lc_autopilotmenu.png new file mode 100644 index 000..ff5ec86 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_autopilotmenu.png differ diff --git a/icon-themes/galaxy/cmd/sc_autopilotmenu.png b/icon-themes/galaxy/cmd/sc_autopilotmenu.png new file mode 100644 index 000..ed92277 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_autopilotmenu.png differ diff --git a/icon-themes/hicontrast/cmd/lch_autopilotmenu.png b/icon-themes/hicontrast/cmd/lch_autopilotmenu.png new file mode 100644 index 000..9dbb8b6 Binary files /dev/null and b/icon-themes/hicontrast/cmd/lch_autopilotmenu.png differ diff --git a/icon-themes/hicontrast/cmd/sch_autopilotmenu.png b/icon-themes/hicontrast/cmd/sch_autopilotmenu.png new file mode 100644 index 000..4611aed Binary files /dev/null and b/icon-themes/hicontrast/cmd/sch_autopilotmenu.png differ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 74fbeeb..92955f5 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2968,6 +2968,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-US~Wizards/value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:OutlineCollapse oor:op=replace prop oor:name=Label oor:type=xs:string ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 4 commits - include/vcl vcl/aqua vcl/source vcl/unx vcl/win
include/vcl/menu.hxx |2 -
include/vcl/settings.hxx | 10 ++
vcl/aqua/source/window/salframe.cxx |1
vcl/source/app/settings.cxx |6 +++
vcl/source/window/menu.cxx| 42 --
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +++-
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |2 +
vcl/unx/kde/salnativewidgets-kde.cxx | 17 +-
vcl/unx/kde4/KDESalFrame.cxx | 14 +++-
vcl/unx/kde4/KDESalGraphics.cxx | 10 ++
vcl/win/source/gdi/salnativewidgets-luna.cxx | 21 +++--
vcl/win/source/window/salframe.cxx|3 +
12 files changed, 118 insertions(+), 18 deletions(-)
New commits:
commit c891d0b3d8810815bdb1ed4fe793bb10ff7c541b
Author: Isamu Mogi saturda...@gmail.com
Date: Fri May 24 09:47:20 2013 +0900
vcl: Check SH_MenuBar_MouseTracking when menubar is drawn on KDE
If QStyle::SH_MenuBar_MouseTracking is 0, it makes a mouse rollover
effect minimize. By this, a menubar item of CDE and Motif styles becomes
closer to standard behavior.
Change-Id: I87dccbd30bf7b9f0d82d1a6e67355c1b25d22dc8
Reviewed-on: https://gerrit.libreoffice.org/4018
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx
b/vcl/unx/kde/salnativewidgets-kde.cxx
index 85b9a14..e1923ac 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -777,7 +777,8 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
int nMenuItem = ( nStyle QStyle::Style_Enabled )?
m_nMenuBarEnabledItem: m_nMenuBarDisabledItem;
QMenuItem *pMenuItem = static_castQMenuBar*( pWidget
)-findItem( nMenuItem );
-if ( nStyle QStyle::Style_MouseOver )
+if ( ( nStyle QStyle::Style_MouseOver )
+ kapp-style().styleHint( QStyle::SH_MenuBar_MouseTracking )
)
nStyle |= QStyle::Style_Active;
if ( nStyle QStyle::Style_Selected )
@@ -1984,9 +1985,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
aStyleSettings.SetMenuBarTextColor( aMenuFore );
aStyleSettings.SetMenuColor( aMenuBack );
aStyleSettings.SetMenuBarColor( aMenuBack );
-
aStyleSettings.SetMenuHighlightColor( toColor ( qMenuCG.highlight() )
);
-aStyleSettings.SetMenuBarRolloverColor( toColor ( qMenuCG.highlight()
) );
// Menu items higlight text color, theme specific
if ( kapp-style().inherits( HighContrastStyle ) ||
@@ -2002,15 +2001,22 @@ void KDESalFrame::UpdateSettings( AllSettings
rSettings )
// set special menubar higlight text color
if ( kapp-style().inherits( HighContrastStyle ) )
-{
ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = toColor(
qMenuCG.highlightedText() );
-aStyleSettings.SetMenuBarRolloverTextColor( toColor(
qMenuCG.highlightedText() ) );
+else
+ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = aMenuFore;
+
+// set menubar rollover color
+if ( kapp-style().styleHint( QStyle::SH_MenuBar_MouseTracking ) )
+{
+aStyleSettings.SetMenuBarRolloverColor( toColor (
qMenuCG.highlight() ) );
+aStyleSettings.SetMenuBarRolloverTextColor(
ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor );
}
else
{
-ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = aMenuFore;
+aStyleSettings.SetMenuBarRolloverColor( aMenuBack );
aStyleSettings.SetMenuBarRolloverTextColor( aMenuFore );
}
+
// Font
aFont = toFont( pMenuBar-font(),
rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetMenuFont( aFont );
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index fee3ff1..be1fb61 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -301,21 +301,24 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
style.SetMenuBarTextColor( aMenuFore );
style.SetMenuColor( aMenuBack );
style.SetMenuBarColor( aMenuBack );
-
style.SetMenuHighlightColor( toColor ( qMenuCG.color(
QPalette::Highlight ) ) );
-style.SetMenuBarRolloverColor( toColor ( qMenuCG.color(
QPalette::Highlight ) ) );
-
style.SetMenuHighlightTextColor( aMenuFore );
// set special menubar higlight text color
if ( kapp-style()-inherits( HighContrastStyle ) )
-{
ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = toColor(
qMenuCG.color( QPalette::HighlightedText ) );
-style.SetMenuBarRolloverTextColor( toColor( qMenuCG.color(
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/inc sc/source
sc/inc/arealink.hxx|2 +-
sc/source/ui/docshell/arealink.cxx |7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 5651e793d2a55e3ab7f4e731252d7c678f1e37c0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon May 27 13:36:16 2013 +0200
range names need to be checked upper case, fdo#64031
Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 43ebeac..60670b4 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -41,7 +41,7 @@ private:
boolbAddUndo;
boolbInCreate;
boolbDoInsert; // is set to FALSE for first update
-bool FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const String
rAreaName );
+bool FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const OUString
rAreaName );
public:
TYPEINFO();
diff --git a/sc/source/ui/docshell/arealink.cxx
b/sc/source/ui/docshell/arealink.cxx
index 5c5e725..6409fbd 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -190,13 +190,14 @@ bool ScAreaLink::IsEqual( const String rFile, const
String rFilter, const Stri
}
// find a range with name rAreaName in pSrcDoc, return it in rRange
-bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const
String rAreaName )
+bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const
OUString rAreaName )
{
bool bFound = false;
+OUString aUpperName = ScGlobal::pCharClass-uppercase(rAreaName);
ScRangeName* pNames = pSrcDoc-GetRangeName();
if (pNames) // benannte Bereiche
{
-const ScRangeData* p = pNames-findByUpperName(rAreaName);
+const ScRangeData* p = pNames-findByUpperName(aUpperName);
if (p p-IsValidReference(rRange))
bFound = true;
}
@@ -205,7 +206,7 @@ bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument*
pSrcDoc, const Strin
ScDBCollection* pDBColl = pSrcDoc-GetDBCollection();
if (pDBColl)
{
-const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(ScGlobal::pCharClass-uppercase(rAreaName));
+const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(aUpperName);
if (pDB)
{
SCTAB nTab;
___
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/arealink.hxx|2 +-
sc/source/ui/docshell/arealink.cxx |7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit d1ea2722b0d13632818142b84fa7989fb9d5085f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon May 27 13:36:16 2013 +0200
range names need to be checked upper case, fdo#64031
Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 43ebeac..60670b4 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -41,7 +41,7 @@ private:
boolbAddUndo;
boolbInCreate;
boolbDoInsert; // is set to FALSE for first update
-bool FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const String
rAreaName );
+bool FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const OUString
rAreaName );
public:
TYPEINFO();
diff --git a/sc/source/ui/docshell/arealink.cxx
b/sc/source/ui/docshell/arealink.cxx
index 5c5e725..6409fbd 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -190,13 +190,14 @@ bool ScAreaLink::IsEqual( const String rFile, const
String rFilter, const Stri
}
// find a range with name rAreaName in pSrcDoc, return it in rRange
-bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const
String rAreaName )
+bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const
OUString rAreaName )
{
bool bFound = false;
+OUString aUpperName = ScGlobal::pCharClass-uppercase(rAreaName);
ScRangeName* pNames = pSrcDoc-GetRangeName();
if (pNames) // benannte Bereiche
{
-const ScRangeData* p = pNames-findByUpperName(rAreaName);
+const ScRangeData* p = pNames-findByUpperName(aUpperName);
if (p p-IsValidReference(rRange))
bFound = true;
}
@@ -205,7 +206,7 @@ bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument*
pSrcDoc, const Strin
ScDBCollection* pDBColl = pSrcDoc-GetDBCollection();
if (pDBColl)
{
-const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(ScGlobal::pCharClass-uppercase(rAreaName));
+const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(aUpperName);
if (pDB)
{
SCTAB nTab;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo64671.rtf |3 +++
sw/qa/extras/rtfimport/rtfimport.cxx |8
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit c95cf9d8e07c37c9cdbc01c40532e77f742066f2
Author: Miklos Vajna vmik...@suse.cz
Date: Mon May 27 10:44:01 2013 +0200
testcase for bfb93ffc6d72d22a833acf9d8c9d166153dad7c0
Change-Id: If61739d54cb2572f20b118a2cf56ab2bd0f306e5
(cherry picked from commit ec8e012e980c88c8f24a7de44e44d0319bae2801)
diff --git a/sw/qa/extras/rtfimport/data/fdo64671.rtf
b/sw/qa/extras/rtfimport/data/fdo64671.rtf
new file mode 100644
index 000..385dca4
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo64671.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+\u381\'7d
+\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c0ceabc..5aadfa6 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -136,6 +136,7 @@ public:
void testFdo42109();
void testFdo62977();
void testN818997();
+void testFdo64671();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -261,6 +262,7 @@ void Test::run()
{fdo42109.rtf, Test::testFdo42109},
{fdo62977.rtf, Test::testFdo62977},
{n818997.rtf, Test::testN818997},
+{fdo64671.rtf, Test::testFdo64671},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1240,6 +1242,12 @@ void Test::testN818997()
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
+void Test::testFdo64671()
+{
+// Additional '}' was inserted before the special character.
+getRun(getParagraph(1), 1, OUString(\xC5\xBD, 2, RTL_TEXTENCODING_UTF8));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 25f70433aa0f1c9d98fc92cb2d896e8e887bfb4b
Author: Urmas davian...@gmail.com
Date: Mon May 27 09:49:55 2013 +0200
fdo#64671 Some special RTF characters were not skipped correctly
Some special characters, like { and }, were not skipped when they
occured as a replacement character for \uN keyword.
Change-Id: I19b66a290cd9880924774fa89bb29df280e44a3c
(cherry picked from commit bfb93ffc6d72d22a833acf9d8c9d166153dad7c0)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a5e3f75..fcd0ef5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -887,7 +887,7 @@ int RTFDocumentImpl::resolveChars(char ch)
bool bUnicodeChecked = false;
bool bSkipped = false;
-while(!Strm().IsEof() ch != '{' ch != '}' ch != '\\')
+while(!Strm().IsEof() (m_aStates.top().nInternalState == INTERNAL_HEX
|| (ch != '{' ch != '}' ch != '\\')))
{
if (m_aStates.top().nInternalState == INTERNAL_HEX || (ch != 0x0d
ch != 0x0a))
{
___
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/filter/ww8/ww8par5.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit f9a3a8a41dc448d551405c53d17f67e9ad1928dc
Author: Jian Hong Cheng chen...@apache.org
Date: Wed Aug 29 04:27:52 2012 +
Fix issue #i120654: Number range variable filed shows in AOO
* sw/source/filter/ww8/ww8par5.cxx
MS Word Binary compatibility
Patch by: Jane Kang,kangjane2...@gmail.com
Found by: Yan Ji,yanji...@gmail.com
Review by: Jian Hong Cheng,chen...@apache.org
(cherry picked from commit 720fc77527377968a45631d1c6a711b4cae02d39)
Change-Id: I428fadd46bbd5b57081e35dcbfd6bb0c10c08282
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 8cfdeed..163f9b8 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1524,6 +1524,8 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*,
String rStr )
{
String aSequenceName;
String aBook;
+bool bHidden= false;
+bool bFormat= false;
bool bCountOn = true;
String sStart;
SvxExtNumType eNumFormat = SVX_NUM_ARABIC;
@@ -1541,9 +1543,12 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*,
String rStr )
break;
case 'h':
+if( !bFormat )
+bHidden = true; // Hidden-Flag aktivieren
break;
case '*':
+bFormat = true; // Format-Flag aktivieren
nRet = aReadParam.SkipToNextToken();
if( -2 == nRet !(
aReadParam.GetResult().EqualsAscii(MERGEFORMAT) ||
aReadParam.GetResult().EqualsAscii(CHARFORMAT) ))
eNumFormat = GetNumTypeFromName( aReadParam.GetResult() );
@@ -1576,6 +1581,10 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*,
String rStr )
SwSetExpFieldType( rDoc, aSequenceName,
nsSwGetSetExpType::GSE_SEQ ) );
SwSetExpField aFld( pFT, aEmptyStr, eNumFormat );
+//#i120654# Add bHidden for /h flag (/h: Hide the field result.)
+if (bHidden)
+aFld.SetSubType(aFld.GetSubType() |
nsSwExtendedSubType::SUB_INVISIBLE);
+
if (sStart.Len())
aFld.SetFormula( ( aSequenceName += '=' ) += sStart );
else if (!bCountOn)
___
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' - 72/0fc77527377968a45631d1c6a711b4cae02d39
72/0fc77527377968a45631d1c6a711b4cae02d39 |1 + 1 file changed, 1 insertion(+) New commits: commit b391f41632ebd134d6b14b02cb6e0bc67d91339c Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 12:54:39 2013 +0100 Notes added by 'git notes add' diff --git a/72/0fc77527377968a45631d1c6a711b4cae02d39 b/72/0fc77527377968a45631d1c6a711b4cae02d39 new file mode 100644 index 000..276ab54 --- /dev/null +++ b/72/0fc77527377968a45631d1c6a711b4cae02d39 @@ -0,0 +1 @@ +merged as: f9a3a8a41dc448d551405c53d17f67e9ad1928dc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] range names need to be checked upper case, fdo#64031
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4050
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/4050/1
range names need to be checked upper case, fdo#64031
Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94
---
M sc/source/ui/docshell/arealink.cxx
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sc/source/ui/docshell/arealink.cxx
b/sc/source/ui/docshell/arealink.cxx
index 84d30be..ee322d5 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -193,10 +193,11 @@
bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const
String rAreaName )
{
bool bFound = false;
+rtl::OUString aUpperName = ScGlobal::pCharClass-uppercase(rAreaName);
ScRangeName* pNames = pSrcDoc-GetRangeName();
if (pNames) // benannte Bereiche
{
-const ScRangeData* p = pNames-findByUpperName(rAreaName);
+const ScRangeData* p = pNames-findByUpperName(aUpperName);
if (p p-IsValidReference(rRange))
bFound = true;
}
@@ -205,7 +206,7 @@
ScDBCollection* pDBColl = pSrcDoc-GetDBCollection();
if (pDBColl)
{
-const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(ScGlobal::pCharClass-uppercase(rAreaName));
+const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(aUpperName);
if (pDB)
{
SCTAB nTab;
--
To view, visit https://gerrit.libreoffice.org/4050
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo64671.rtf |3 +++
sw/qa/extras/rtfimport/rtfimport.cxx |8
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 6226fcc4166f2a8e3c7f2016d423372e9e4a3d0b
Author: Urmas davian...@gmail.com
Date: Mon May 27 09:49:55 2013 +0200
fdo#64671 Some special RTF characters were not skipped correctly
Some special characters, like { and }, were not skipped when they
occured as a replacement character for \uN keyword.
(cherry picked from commits bfb93ffc6d72d22a833acf9d8c9d166153dad7c0 and
ec8e012e980c88c8f24a7de44e44d0319bae2801)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Signed-off-by: Miklos Vajna vmik...@suse.cz
Change-Id: I19b66a290cd9880924774fa89bb29df280e44a3c
diff --git a/sw/qa/extras/rtfimport/data/fdo64671.rtf
b/sw/qa/extras/rtfimport/data/fdo64671.rtf
new file mode 100644
index 000..385dca4
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo64671.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+\u381\'7d
+\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index bbac478..2e99c27 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -148,6 +148,7 @@ public:
void testFdo61193();
void testFdo63023();
void testFdo62977();
+void testFdo64671();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -266,6 +267,7 @@ void Test::run()
{hello.rtf, Test::testFdo61193},
{fdo63023.rtf, Test::testFdo63023},
{fdo62977.rtf, Test::testFdo62977},
+{fdo64671.rtf, Test::testFdo64671},
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1222,6 +1224,12 @@ void Test::testFdo62977()
getRun(getParagraph(1), 1,
OUString(\xE5\xB9\xB4\xEF\xBC\x94\xE6\x9C\x88, 9, RTL_TEXTENCODING_UTF8));
}
+void Test::testFdo64671()
+{
+// Additional '}' was inserted before the special character.
+getRun(getParagraph(1), 1, OUString(\xC5\xBD, 2, RTL_TEXTENCODING_UTF8));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 056ac08..e06bace 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -879,7 +879,7 @@ int RTFDocumentImpl::resolveChars(char ch)
bool bUnicodeChecked = false;
bool bSkipped = false;
-while(!Strm().IsEof() ch != '{' ch != '}' ch != '\\')
+while(!Strm().IsEof() (m_aStates.top().nInternalState == INTERNAL_HEX
|| (ch != '{' ch != '}' ch != '\\')))
{
if (m_aStates.top().nInternalState == INTERNAL_HEX || (ch != 0x0d
ch != 0x0a))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] liborcus: #include needed boost headers (libreoffice-4-0 build failure)
According to its AUTHORS file, orcus seems to be developed by us, but it the tarball does not give a homepage / contact point, it does not seem to be in freedesktop git, ... So I throw my patch here and someone will catch it... Build failure for me of libreoffice-4-0 branch on just-released Debian 7.0 wheezy: uses boost::noncopyable, but does not #include the boost header that defines it. -- Lionel --- orcus/src/liborcus/dom_tree.cpp~ 2012-11-28 13:21:10.0 +0100 +++ orcus/src/liborcus/dom_tree.cpp 2013-05-27 13:48:34.0 +0200 @@ -33,6 +33,7 @@ #include iostream #include sstream +#include boost/utility.hpp using namespace std; ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6a/88a21257124d953637c4b8ead9c9771e15b899
6a/88a21257124d953637c4b8ead9c9771e15b899 |1 + 1 file changed, 1 insertion(+) New commits: commit d4bdffb5d68f7962fa03193d71c24f03158eb479 Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 13:01:31 2013 +0100 Notes added by 'git notes add' diff --git a/6a/88a21257124d953637c4b8ead9c9771e15b899 b/6a/88a21257124d953637c4b8ead9c9771e15b899 new file mode 100644 index 000..884a657 --- /dev/null +++ b/6a/88a21257124d953637c4b8ead9c9771e15b899 @@ -0,0 +1 @@ +merged as: 982462ac5c6df0c85ba6a0b3fbdaa80b38a94882 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - forms/source slideshow/source
forms/source/xforms/model.hxx|2 +-
slideshow/source/engine/activities/activitiesfactory.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 982462ac5c6df0c85ba6a0b3fbdaa80b38a94882
Author: Herbert Dürr h...@apache.org
Date: Tue Apr 16 11:41:34 2013 +
eliminate type ambiguity for std::accumulate() invocation
else clang/libc++ cannot decide between bool and a reference into a
bit-vector
specialization
(cherry picked from commit 6a88a21257124d953637c4b8ead9c9771e15b899)
Change-Id: I694bbad82b1a05ebe86c5c941f3ac85c71f5fc9e
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx
b/slideshow/source/engine/activities/activitiesfactory.cxx
index 2354e51..530a8fe 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -557,7 +557,7 @@ public:
// interpolate between nIndex and nIndex+1 values
(*mpAnim)(
getPresentationValue(
-accumulate( maValues.back(),
+accumulateValueType( maValues.back(),
mbCumulative ? nRepeatCount : 0,
maInterpolator( maValues[ nIndex ],
maValues[ nIndex+1 ],
@@ -577,7 +577,7 @@ public:
// this is discrete, thus no lerp here.
(*mpAnim)(
getPresentationValue(
-accumulate( maValues.back(),
+accumulateValueType( maValues.back(),
mbCumulative ? nRepeatCount : 0,
maValues[ nFrame ] ) ) );
}
commit d133d8f0dfaaab53af225d3f667b14ee02aa21fc
Author: Herbert Dürr h...@apache.org
Date: Fri Apr 26 12:43:44 2013 +
make sure class MIP is complete before it is used
(cherry picked from commit c8ed66993a98faa4730d507903f110dc80c61445)
Conflicts:
forms/source/xforms/model.hxx
Change-Id: Iec9e999b1568ad422ea2118c04b77bdbfd75
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index a2d83b6..f68522c 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -28,6 +28,7 @@
#include com/sun/star/lang/XUnoTunnel.hpp
#include com/sun/star/uno/Reference.hxx
+#include mip.hxx
#include map
@@ -46,7 +47,6 @@ namespace com { namespace sun { namespace star
} } }
namespace xforms
{
-class MIP;
class BindingCollection;
class SubmissionCollection;
class InstanceCollection;
___
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' - c8/ed66993a98faa4730d507903f110dc80c61445
c8/ed66993a98faa4730d507903f110dc80c61445 |1 + 1 file changed, 1 insertion(+) New commits: commit 54c993b7c0e1d159067bd49a4d11930c821267b4 Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 13:01:41 2013 +0100 Notes added by 'git notes add' diff --git a/c8/ed66993a98faa4730d507903f110dc80c61445 b/c8/ed66993a98faa4730d507903f110dc80c61445 new file mode 100644 index 000..483722a --- /dev/null +++ b/c8/ed66993a98faa4730d507903f110dc80c61445 @@ -0,0 +1 @@ +merged as: d133d8f0dfaaab53af225d3f667b14ee02aa21fc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotools/source
unotools/source/misc/fontcvt.cxx | 86 +++
1 file changed, 43 insertions(+), 43 deletions(-)
New commits:
commit 13635ca1ec3aba641c93a2199cfe7406c98e3f17
Author: Sean Young s...@mess.org
Date: Thu May 16 22:17:36 2013 +0100
The MT Extra font mapping is incomplete
Many points are missing. Replace entire table with the mapping provided by
the original creator. Note that point 0xe7 (Apple Logo) is not in unicode
so no mapping is provided for that.
http://www.dessci.com/en/support/mathtype/tech/encodings/mtextra.htm
Change-Id: I05acd36772ae6432614ff3b284e43b86049bed66
Reviewed-on: https://gerrit.libreoffice.org/4036
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index ed34a5b..67cf552 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -648,39 +648,39 @@ static const sal_Unicode aMonotypeSortsTab[224] =
static const sal_Unicode aMTExtraTab[224] =
{
// F020
-0x0020, 0, 0,0xE095,
-0xE091,0xE096,0x02D9, 0,
-0xE093, 0, 0, 0,
+0x0020, 0, 0,0x0300,
+0x0302,0x0303,0x0307, 0,
+0x2323,0x2322, 0, 0,
0, 0, 0, 0,
// F030
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
-0x25C1, 0,0x25B7, 0,
+ 0,0xEC00,0xEC01,0xEC02,
+0xEC03,0xEC0B,0xEC04,0xEC05,
+0xEC06, 0,0x223C,0x2243,
+0x22B2,0x226A,0x22B3,0x226B,
// F040
- 0, 0,0x2210,0x019b,
- 0, 0, 0, 0,
- 0,0x2229, 0,0xE08B,
+0x225C,0x2259,0x2250,0x2210,
+0x019B,0xEC0E,0xEC0F,0xEC10,
+0xEC11,0x2229,0x2127,0x2026,
0x22EF,0x22EE,0x22F0,0x22F1,
// F050
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
+0x2225,0x2235,0x2221,0x,
+ 0,0x222A,0x25B3,0x25A1,
+0x25AD,0x25B1,0x2197,0x2199,
+0xEB05,0x2198,0x2196,0xEB06,
// F060
-0xE095, 0,0xE25C,0xE4BA,
- 0, 0,0x210F, 0,
- 0, 0, 0, 0,
-0x2113,0x2213, 0,0x00B0,
+0x2035,0x21A6,0x2195,0x21D5,
+0x25CB,0x2299,0x227B,0xE98F,
+0x210F,0xEE00,0xEE01, 0,
+0x2113,0x2213,0xFFFD,0x2218,
// F070
- 0, 0,0xE098, 0,
- 0,0xE097, 0, 0,
- 0, 0, 0,0xE081,
- 0,0xE082, 0, 0,
+0x227A,0xEB1A,0x20D7,0x20D6,
+0x20E1,0xEB00,0x20D1,0x20D0,
+0xEB19, 0, 0,0xFE38,
+0xEC0C,0xFE37,0xEC0D, 0,
// F080
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
+0x21C4,0xEB01,0xEB02,0x21CC,
+0xEB03,0xEB04,0x21C0,0x21BD,
+0xF8E7, 0, 0, 0,
0, 0, 0, 0,
// F090
0, 0, 0, 0,
@@ -688,35 +688,35 @@ static const sal_Unicode aMTExtraTab[224] =
0, 0, 0, 0,
0, 0, 0, 0,
// F0a0
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
+ 0,0x211D,0x2124,0x2102,
+0x211A,0x2115, 0,0x301A,
+0x301B,0xEC22,0xEC23,0xEC24,
+0xEC25,0xEC26,0xEC27, 0,
// F0b0
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
+0xEE04,0xEE05,0xEE06, 0,
+ 0,0xEE07,0xEE08,0xEE09,
+ 0, 0,0xEE0A,0xEE0B,
+0xEE0C, 0, 0, 0,
// F0c0
- 0, 0, 0, 0,
+0xEE0D,
[PATCH] fdo#51296 Helptext added for hyperlinks, hlinks behave as i...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4051
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/4051/1
fdo#51296 Helptext added for hyperlinks, hlinks behave as in writer
Added prefixed of ctrl+click to open hyperlink to hlinks depending on the
security setting. Now clicking links behave as in writer.
Change-Id: I87d0fecb6268463cd99478b70eb081ed958976be
---
M sc/inc/globstr.hrc
M sc/source/core/data/global.cxx
M sc/source/ui/src/globstr.src
M sc/source/ui/view/gridwin5.cxx
4 files changed, 72 insertions(+), 17 deletions(-)
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 7dc6cd6..d053da6 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -673,7 +673,10 @@
#define STR_FUN_TEXT_SELECTION_COUNT546
-#define STR_COUNT 547
+#define STR_CTRLCLICKHYPERLINK 548
+#define STR_CLICKHYPERLINK 549
+
+#define STR_COUNT 560
#endif
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 95084a9..a34b1de 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -925,20 +925,20 @@
// aufgerufen, darum stimmen pScActiveViewShell und nScClickMouseModifier.
//SvtSecurityOptions to access Libreoffice global security parameters
SvtSecurityOptions aSecOpt;
-bool bProceedHyperlink = false;
-if ( (nScClickMouseModifier KEY_MOD1) aSecOpt.IsOptionSet(
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK )) // control-click - into new
window
+bool bCtrlClickHappened = (nScClickMouseModifier KEY_MOD1);
+bool bCtrlClickSecOption = aSecOpt.IsOptionSet(
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+if( bCtrlClickHappened !( bCtrlClickSecOption ) )
{
-//Ctrl key is pressed and ctrl+click hyperlink security control is set
-bProceedHyperlink = true;
-}
-else if( !aSecOpt.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK )
)
-{
-//ctrl+click hyperlink security control is disabled just click will do
-bProceedHyperlink = true;
-}
-if ( !bProceedHyperlink )
+//return since ctrl+click happened when the
+//ctrl+click security option was disabled, link should not open
return;
-
+}
+else if( !( bCtrlClickHappened ) bCtrlClickSecOption )
+{
+//ctrl+click did not happen; only click happened maybe with some
+//other key combo. and security option is set, so return
+return;
+}
SfxStringItem aUrl( SID_FILE_NAME, rURL );
SfxStringItem aTarget( SID_TARGETNAME, rTarget );
aTarget.SetValue(OUString(_blank));
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index b9ffd2a..9ab25c1 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2065,6 +2065,14 @@
{
Text [ en-US ] = Invalid condition. ;
};
+String STR_CTRLCLICKHYPERLINK
+{
+Text [ en-US ] = ctrl+click to open hyperlink:;
+};
+String STR_CLICKHYPERLINK
+{
+Text [ en-US ] = click to open hyperlink:;
+};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 7055c22..7253feb 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -31,6 +31,7 @@
#include sfx2/viewfrm.hxx
#include unotools/localedatawrapper.hxx
+#include unotools/securityoptions.hxx
#include viewuno.hxx
#include AccessibleDocument.hxx
@@ -49,7 +50,8 @@
#include tabvwsh.hxx
#include userdat.hxx
#include postit.hxx
-
+#include global.hxx
+#include globstr.hrc
// ---
bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard )
@@ -237,16 +239,25 @@
void ScGridWindow::RequestHelp(const HelpEvent rHEvt)
{
+//To know whether to prefix STR_CTRLCLICKHYERLINK or STR_CLICKHYPERLINK
+//to hyperlink tooltips/help text
+SvtSecurityOptions aSecOpt;
+//using sal_bool not bool because it seems so prominent
+//stores state of ctrl click security setting
+sal_Bool bCtrlClickHlink = aSecOpt.IsOptionSet(
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+//Global string STR_CTRLCLICKHYPERLINK i.e, ctrl+click to open hyperlink:
+OUString aCtrlClickHlinkStr = ScGlobal::GetRscString(
STR_CTRLCLICKHYPERLINK );
+//Global string STR_CLICKHYPERLINK i.e, click to open hyperlink
+//could have just used this and made STR_CTRLCLICKHYPERLINK by prefixing
+//ctrl+ to it; But don't know if 'ctrl' needs localization?
+OUString aClickHlinkStr = ScGlobal::GetRscString( STR_CLICKHYPERLINK );
sal_Bool bDone = false;
sal_Bool bHelpEnabled = ( rHEvt.GetMode() ( HELPMODE_BALLOON |
HELPMODE_QUICK ) ) != 0;
SdrView* pDrView = pViewData-GetScDrawView();
-
sal_Bool bDrawTextEdit = false;
if
[PUSHED] The MT Extra font mapping is incomplete
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4036 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4036 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05acd36772ae6432614ff3b284e43b86049bed66 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sean Young s...@mess.org Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED libreoffice-4-0] fdo#51296 Patch modifies ctrl+click behaviour to be like wri...
Akash Shetye has abandoned this change. Change subject: fdo#51296 Patch modifies ctrl+click behaviour to be like writer. .. Patch Set 1: Abandoned Abandoning this patch see https://gerrit.libreoffice.org/#/c/4051/ which does the same thing plus adds helptext to hyperlinks. -- To view, visit https://gerrit.libreoffice.org/4029 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2754b0c3d977208e28daa25502145bb29c3ef4c8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Akash Shetye shetyeak...@gmail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@suse.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev3.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 4c831dd9e53163d75073c627c774f59fdaf9e874
Author: Sean Young s...@mess.org
Date: Sun May 19 13:38:33 2013 +0100
fdo#64632 If a Symbol font is missing, ensure that conversion is done
ImplDevFontList::ImplFindByFont() will nearly always return a font, so
we do not go through the code path which sets up conversion.
Change-Id: Ice361f183c9f42aa562d4caab1d589417ad3fc9a
Reviewed-on: https://gerrit.libreoffice.org/4037
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 1900093..a4fde37 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2309,6 +2309,13 @@ ImplFontEntry* ImplFontCache::GetFontEntry(
ImplDevFontList* pFontList,
maFontInstanceList[ aFontSelData ] = pEntry;
}
+// We might have selected a non-symbol font as a fallback for a
+// symbol font. Ensure that conversion is done
+if (aFontSelData.IsSymbolFont() !pEntry-maMetric.IsSymbolFont()
!pEntry-mpConversion)
+{
+pEntry-mpConversion = ConvertChar::GetRecodeData(
aFontSelData.maTargetName, aFontSelData.maSearchName );
+}
+
mpFirstEntry = pEntry;
return pEntry;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#64632 If a Symbol font is missing, ensure that conversio...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4037 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4037 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice361f183c9f42aa562d4caab1d589417ad3fc9a Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sean Young s...@mess.org Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help on meanings of SDI fields
Hi Rodolfo, here's a list of attributes with a short description: http://wiki.openoffice.org/wiki/Framework/Article/Implementation_of_the_Dispatch_API_In_SFX2 Thomas On 27.05.2013 01:10, Rodolfo wrote: I need some help with .SDI definition syntax. Could anyone clarify me for these fields? Specially for AutoUpdate, Container and Readonly field. Example: 854 SfxBoolItem ToolBox SID_TOOLBOX 855 856 [ 857 /* flags: */ 858 AutoUpdate = FALSE, 859 Cachable = Cachable, 860 FastCall = FALSE, 861 HasCoreId = FALSE, 862 HasDialog = FALSE, 863 ReadOnlyDoc = FALSE, 864 Toggle = FALSE, 865 Container = FALSE, 866 RecordAbsolute = FALSE, 867 RecordPerSet; 868 Synchron; 869 870 Readonly = FALSE, 871 872 /* config: */ 873 AccelConfig = TRUE, 874 MenuConfig = TRUE, 875 StatusBarConfig = FALSE, 876 ToolBoxConfig = TRUE, 877 GroupId = GID_VIEW; 878 ] (from: http://opengrok.libreoffice.org/xref/core/starmath/sdi/smath.sdi#931 ) Regards, Rodolfo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/xml/xmltbli.cxx | 26 ++
1 file changed, 6 insertions(+), 20 deletions(-)
New commits:
commit e94c8521041259d36aaadcadb9e42ca729a3812b
Author: Luke Deller l...@deller.id.au
Date: Thu May 23 02:05:36 2013 +1000
fix fdo#64872 infinite loop saving as doc
When loading from odt, table cells which are covered (due to merging of
cells) are replaced with an empty cell by
SwXMLTableContext::ReplaceWithEmptyCell. However if there is a sequence
of cells covered from above then their replacements are accidentally
inserted in reverse order, which produces this infinite loop problem when
saving as doc.
The reverse ordering in SwXMLTableContext::ReplaceWithEmptyCell was because
the insert position came from SwXMLTableContext::GetPrevStartNode which was
very careful to skip previous covered cells. However those cells have
already been replaced with an empty cell so they should not be skipped.
Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363
Reviewed-on: https://gerrit.libreoffice.org/4008
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 9cc801f..e0a214f 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1804,29 +1804,15 @@ const SwStartNode *SwXMLTableContext::GetPrevStartNode(
sal_uInt32 nRow,
// The last cell is the right one here.
pPrevCell = GetCell( pRows-size()-1U, GetColumnCount()-1UL );
}
-else if( 0UL == nRow )
+else if( nCol 0UL )
{
-// There are no vertically merged cells within the first row, so the
-// previous cell is the right one always.
-if( nCol 0UL )
-pPrevCell = GetCell( nRow, nCol-1UL );
+// The previous cell in this row.
+pPrevCell = GetCell( nRow, nCol-1UL );
}
-else
+else if( nRow 0UL )
{
-// If there is a previous cell in the current row that is not spanned
-// from the previous row, its the right one.
-const SwXMLTableRow_Impl *pPrevRow = (*pRows)[(sal_uInt16)nRow-1U];
-sal_uInt32 i = nCol;
-while( !pPrevCell i 0UL )
-{
-i--;
-if( 1UL == pPrevRow-GetCell( i )-GetRowSpan() )
-pPrevCell = GetCell( nRow, i );
-}
-
-// Otherwise, the last cell from the previous row is the right one.
-if( !pPrevCell )
-pPrevCell = pPrevRow-GetCell( GetColumnCount()-1UL );
+// The last cell from the previous row.
+pPrevCell = GetCell( nRow-1UL, GetColumnCount()-1UL );
}
const SwStartNode *pSttNd = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fix fdo#64872 infinite loop saving as doc
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4008 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4008 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help on meanings of SDI fields
Hi Thomas. Thank you. I see some properties are obsolets. HasCoreId HasDialog RecordAbsolute Readonly That wiki article was edited in 2010. So, it should be safe to delete these. Should we do it? Regards, Rodolfo 2013/5/27 Thomas Arnhold thomas-l...@arnhold.org: Hi Rodolfo, here's a list of attributes with a short description: http://wiki.openoffice.org/wiki/Framework/Article/Implementation_of_the_Dispatch_API_In_SFX2 Thomas On 27.05.2013 01:10, Rodolfo wrote: I need some help with .SDI definition syntax. Could anyone clarify me for these fields? Specially for AutoUpdate, Container and Readonly field. Example: 854 SfxBoolItem ToolBox SID_TOOLBOX 855 856 [ 857 /* flags: */ 858 AutoUpdate = FALSE, 859 Cachable = Cachable, 860 FastCall = FALSE, 861 HasCoreId = FALSE, 862 HasDialog = FALSE, 863 ReadOnlyDoc = FALSE, 864 Toggle = FALSE, 865 Container = FALSE, 866 RecordAbsolute = FALSE, 867 RecordPerSet; 868 Synchron; 869 870 Readonly = FALSE, 871 872 /* config: */ 873 AccelConfig = TRUE, 874 MenuConfig = TRUE, 875 StatusBarConfig = FALSE, 876 ToolBoxConfig = TRUE, 877 GroupId = GID_VIEW; 878 ] (from: http://opengrok.libreoffice.org/xref/core/starmath/sdi/smath.sdi#931 ) Regards, Rodolfo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev3.cxx | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 376830eb55eedf2ca31b431dd27ea9ce0df9b2f8
Author: Caolán McNamara caol...@redhat.com
Date: Mon May 27 13:29:23 2013 +0100
Generalize the check for a recode table
I think we can distill this down to a if the source or target
is a symbol font check for a recode table
Change-Id: I6c674f10d9f1ab7fbe7274abfafb9082bae88218
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index a4fde37..3281557 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2287,8 +2287,9 @@ ImplFontEntry* ImplFontCache::GetFontEntry(
ImplDevFontList* pFontList,
// create a new logical font instance from this physical font face
pEntry = pFontData-CreateFontInstance( aFontSelData );
-// if we found a different symbol font we need a symbol conversion
table
-if( pFontData-IsSymbolFont() )
+// if we're subtituting from or to a symbol font we may need a symbol
+// conversion table
+if( pFontData-IsSymbolFont() || aFontSelData.IsSymbolFont() )
{
if( aFontSelData.maTargetName != aFontSelData.maSearchName )
pEntry-mpConversion = ConvertChar::GetRecodeData(
aFontSelData.maTargetName, aFontSelData.maSearchName );
@@ -2309,13 +2310,6 @@ ImplFontEntry* ImplFontCache::GetFontEntry(
ImplDevFontList* pFontList,
maFontInstanceList[ aFontSelData ] = pEntry;
}
-// We might have selected a non-symbol font as a fallback for a
-// symbol font. Ensure that conversion is done
-if (aFontSelData.IsSymbolFont() !pEntry-maMetric.IsSymbolFont()
!pEntry-mpConversion)
-{
-pEntry-mpConversion = ConvertChar::GetRecodeData(
aFontSelData.maTargetName, aFontSelData.maSearchName );
-}
-
mpFirstEntry = pEntry;
return pEntry;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] liborcus: #include needed boost headers (libreoffice-4-0 build failure)
Hi, On Mon, May 27, 2013 at 02:00:17PM +0200, Lionel Elie Mamane wrote: According to its AUTHORS file, orcus seems to be developed by us, but it the tarball does not give a homepage / contact point, it does not seem to be in freedesktop git, ... So I throw my patch here and someone will catch it... That's already there in newer orcuses (0.5.x) which is used in -4-1/master. And it was fixed in master/-4-1 with http://cgit.freedesktop.org/libreoffice/core/commit/?id=faf72664d11deaa570a0f8c7e702ff07bf5914c8 before liborcus was upgraded. That commit should probably just be cherry-picked to -4-0. Build failure for me of libreoffice-4-0 branch on just-released Debian 7.0 wheezy: uses boost::noncopyable, but does not #include the boost header that defines it. But yeah, we should include it. Either with a local patch or with a new liborcus 0.3.x... Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63351 make use of ZoomSlider in StarMath
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4053
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/4053/1
fdo#63351 make use of ZoomSlider in StarMath
In collaboration with Marcos Souza marcos.souza@gmail.com :)
Includes some reordering of the statusbar: Zoom and ZoomSlider right,
left field with automatic size adjustment.
Change-Id: Ibfb1eab1abef7b026eeb7fd7c0a778c433c9e208
---
M starmath/sdi/smslots.sdi
M starmath/source/smdll.cxx
M starmath/source/typemap.cxx
M starmath/source/view.cxx
M starmath/uiconfig/smath/statusbar/statusbar.xml
5 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 7104423..5db0d63 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -283,6 +283,11 @@
ExecMethod = Execute ;
StateMethod = GetState ;
]
+SID_ATTR_ZOOMSLIDER
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
//idlpp kein Menueeintrag , also keine Texte
SID_TEXTSTATUS //idlpp ole : no , status : no
[
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index e25dca4..f1a1bc6 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -21,6 +21,7 @@
#include svx/svxids.hrc
#include svx/modctrl.hxx
#include svx/zoomctrl.hxx
+#include svx/zoomsliderctrl.hxx
#include sfx2/docfac.hxx
#include svx/lboxctrl.hxx
#include sfx2/docfile.hxx
@@ -67,6 +68,7 @@
SmViewShell::RegisterFactory(1);
SvxZoomStatusBarControl::RegisterControl(SID_ATTR_ZOOM, pModule);
+SvxZoomSliderControl::RegisterControl(SID_ATTR_ZOOMSLIDER, pModule);
SvxModifyControl::RegisterControl(SID_TEXTSTATUS, pModule);
SvxUndoRedoControl::RegisterControl(SID_UNDO, pModule);
SvxUndoRedoControl::RegisterControl(SID_REDO, pModule);
diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx
index c53224d..2d354f7 100644
--- a/starmath/source/typemap.cxx
+++ b/starmath/source/typemap.cxx
@@ -21,6 +21,7 @@
#include svl/stritem.hxx
#include svl/eitem.hxx
#include sfx2/zoomitem.hxx
+#include svx/zoomslideritem.hxx
#include svx/svxids.hrc
#include svl/slstitm.hxx
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index d144dde..ee6a1a3 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -51,6 +51,7 @@
#include svl/undo.hxx
#include svl/whiter.hxx
#include svx/dialogs.hrc
+#include svx/zoomslideritem.hxx
#include editeng/editeng.hxx
#include svx/svxdlg.hxx
#include sfx2/zoomitem.hxx
@@ -613,7 +614,10 @@
SetTotalSize();
SmViewShell *pViewSh = GetView();
if (pViewSh)
+{
pViewSh-GetViewFrame()-GetBindings().Invalidate(SID_ATTR_ZOOM);
+pViewSh-GetViewFrame()-GetBindings().Invalidate(SID_ATTR_ZOOMSLIDER);
+}
Invalidate();
}
@@ -1853,6 +1857,19 @@
}
break;
+case SID_ATTR_ZOOMSLIDER:
+{
+const SfxItemSet *pArgs = rReq.GetArgs();
+const SfxPoolItem* pItem;
+
+if ( pArgs SFX_ITEM_SET ==
pArgs-GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, pItem ) )
+{
+const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem
*)pItem)-GetValue();
+aGraphic.SetZoom( nCurrentZoom );
+}
+}
+break;
+
case SID_TOOLBOX:
{
GetViewFrame()-ToggleChildWindow(
SmToolBoxWrapper::GetChildWindowId() );
@@ -1936,6 +1953,15 @@
rSet.DisableItem( nWh );
break;
+case SID_ATTR_ZOOMSLIDER :
+{
+const sal_uInt16 nCurrentZoom = aGraphic.GetZoom();
+SvxZoomSliderItem aZoomSliderItem( nCurrentZoom, MINZOOM,
MAXZOOM );
+aZoomSliderItem.AddSnappingPoint( 100 );
+rSet.Put( aZoomSliderItem );
+}
+break;
+
case SID_NEXTERR:
case SID_PREVERR:
case SID_NEXTMARK:
diff --git a/starmath/uiconfig/smath/statusbar/statusbar.xml
b/starmath/uiconfig/smath/statusbar/statusbar.xml
index 134507e..3c00de9 100644
--- a/starmath/uiconfig/smath/statusbar/statusbar.xml
+++ b/starmath/uiconfig/smath/statusbar/statusbar.xml
@@ -18,8 +18,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
statusbar:statusbar xmlns:statusbar=http://openoffice.org/2001/statusbar;
xmlns:xlink=http://www.w3.org/1999/xlink;
- statusbar:statusbaritem xlink:href=.uno:TextStatus statusbar:align=left
statusbar:width=300/
- statusbar:statusbaritem xlink:href=.uno:Zoom statusbar:align=center
statusbar:width=54/
+ statusbar:statusbaritem xlink:href=.uno:TextStatus statusbar:align=left
statusbar:autosize=true statusbar:width=300/
statusbar:statusbaritem xlink:href=.uno:ModifiedStatus
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9/
[Libreoffice-commits] core.git: sc/source
sc/source/filter/dif/difimp.cxx | 39 ++-
sc/source/filter/inc/dif.hxx|2 +-
2 files changed, 15 insertions(+), 26 deletions(-)
New commits:
commit 7d01bed2e663e19b2387d5427036afea0ff4fa4f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon May 27 14:59:42 2013 +0200
we need a reference to the DifParser.aData, fdo#64920
regression from 6191fa0847ac5b27083efe1a8c6cd84d080a638c
Change-Id: If7fc18e7d0bcbf1075a0ecdb1c0dcf3d207f1bda
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 816b221..feab974 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -61,7 +61,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream
rIn, ScDocument* pDoc,
boolbSyntErrWarn = false;
boolbOverflowWarn = false;
-OUString aData = aDifParser.aData;
+OUString aData = aDifParser.aData;
boolbData = false;
rIn.Seek( 0 );
@@ -377,7 +377,7 @@ TOPIC DifParser::GetNextTopic( void )
if( aLine.getLength() 2 )
aData = aLine.copy( 1, aLine.getLength() - 2 );
else
-aData.Erase();
+aData = OUString();
eS = S_END;
break;
case S_END:
@@ -400,20 +400,14 @@ TOPIC DifParser::GetNextTopic( void )
}
-static void lcl_DeEscapeQuotesDif( String rString )
+static void lcl_DeEscapeQuotesDif( OUString rString )
{
// Special handling for DIF import: Escaped (duplicated) quotes are
resolved.
// Single quote characters are left in place because older versions didn't
// escape quotes in strings (and Excel doesn't when using the clipboard).
// The quotes around the string are removed before this function is
called.
-static const sal_Unicode aDQ[] = { '', '', 0 };
-xub_StrLen nPos = 0;
-while ( (nPos = rString.Search( aDQ, nPos )) != STRING_NOTFOUND )
-{
-rString.Erase( nPos, 1 );
-++nPos;
-}
+rString = rString.replaceAll(\\, \);
}
// Determine if passed in string is numeric data and set fVal/nNumFormat if so
@@ -501,9 +495,9 @@ bool DifParser::LookAhead()
DATASET DifParser::GetNextDataset( void )
{
-DATASET eRet = D_UNKNOWN;
-OUString aLine;
-const sal_Unicode* pAktBuffer;
+DATASET eRet = D_UNKNOWN;
+OUString aLine;
+const sal_Unicode* pAktBuffer;
ReadNextLine( aLine );
@@ -533,15 +527,14 @@ DATASET DifParser::GetNextDataset( void )
ReadNextLine( aTmpLine );
if ( eRet == D_SYNT_ERROR )
{ // for broken records write #ERR: data to cell
-OUString aTmp = #ERR: + OUString( pAktBuffer ) + (;
-OSL_ENSURE( aTmpLine.getLength() = STRING_MAXLEN -
aTmp.getLength() - 1, GetNextDataset(): line doesn't fit into data);
-aTmp += aTmpLine + );
-aData = aTmp;
+OUStringBuffer aTmp(#ERR: );
+aTmp.append(pAktBuffer).append( ();
+aTmp.append(aTmpLine).append(')');
+aData = aTmp.makeStringAndClear();
eRet = D_STRING;
}
else
{
-OSL_ENSURE( aTmpLine.getLength() = STRING_MAXLEN,
GetNextDataset(): line doesn't fit into data);
aData = aTmpLine;
}
}
@@ -563,7 +556,6 @@ DATASET DifParser::GetNextDataset( void )
// Single line string
if( nLineLength = 2 pLine[nLineLength - 1] == '' )
{
-OSL_ENSURE( aLine.getLength() - 2 =
STRING_MAXLEN, GetNextDataset(): line doesn't fit into data);
aData = aLine.copy( 1, nLineLength - 2 );
lcl_DeEscapeQuotesDif( aData );
eRet = D_STRING;
@@ -572,12 +564,11 @@ DATASET DifParser::GetNextDataset( void )
else
{
// Multiline string
-OSL_ENSURE( aLine.getLength() - 1 = STRING_MAXLEN,
GetNextDataset(): line doesn't fit into data);
aData = aLine.copy( 1 );
bool bContinue = true;
while ( bContinue )
{
-aData.Append( '\n' );
+aData = aData + \n;
bContinue = !rIn.IsEof() ReadNextLine( aLine );
if( bContinue )
{
@@ -588,13 +579,11 @@ DATASET DifParser::GetNextDataset( void )
bContinue = !LookAhead();
if( bContinue )
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/filter/dif/difimp.cxx | 42 +---
sc/source/filter/inc/dif.hxx|2 -
2 files changed, 15 insertions(+), 29 deletions(-)
New commits:
commit 670ff6a6d2f39754fb9a39b6cd0757b4ffa39136
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon May 27 14:59:42 2013 +0200
we need a reference to the DifParser.aData, fdo#64920
regression from 6191fa0847ac5b27083efe1a8c6cd84d080a638c
Change-Id: If7fc18e7d0bcbf1075a0ecdb1c0dcf3d207f1bda
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 734253a..feab974 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -61,7 +61,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream
rIn, ScDocument* pDoc,
boolbSyntErrWarn = false;
boolbOverflowWarn = false;
-OUString aData = aDifParser.aData;
+OUString aData = aDifParser.aData;
boolbData = false;
rIn.Seek( 0 );
@@ -377,7 +377,7 @@ TOPIC DifParser::GetNextTopic( void )
if( aLine.getLength() 2 )
aData = aLine.copy( 1, aLine.getLength() - 2 );
else
-aData.Erase();
+aData = OUString();
eS = S_END;
break;
case S_END:
@@ -400,20 +400,14 @@ TOPIC DifParser::GetNextTopic( void )
}
-static void lcl_DeEscapeQuotesDif( String rString )
+static void lcl_DeEscapeQuotesDif( OUString rString )
{
// Special handling for DIF import: Escaped (duplicated) quotes are
resolved.
// Single quote characters are left in place because older versions didn't
// escape quotes in strings (and Excel doesn't when using the clipboard).
// The quotes around the string are removed before this function is
called.
-static const sal_Unicode aDQ[] = { '', '', 0 };
-xub_StrLen nPos = 0;
-while ( (nPos = rString.Search( aDQ, nPos )) != STRING_NOTFOUND )
-{
-rString.Erase( nPos, 1 );
-++nPos;
-}
+rString = rString.replaceAll(\\, \);
}
// Determine if passed in string is numeric data and set fVal/nNumFormat if so
@@ -501,9 +495,9 @@ bool DifParser::LookAhead()
DATASET DifParser::GetNextDataset( void )
{
-DATASET eRet = D_UNKNOWN;
-OUString aLine;
-const sal_Unicode* pAktBuffer;
+DATASET eRet = D_UNKNOWN;
+OUString aLine;
+const sal_Unicode* pAktBuffer;
ReadNextLine( aLine );
@@ -533,18 +527,14 @@ DATASET DifParser::GetNextDataset( void )
ReadNextLine( aTmpLine );
if ( eRet == D_SYNT_ERROR )
{ // for broken records write #ERR: data to cell
-String aTmp( RTL_CONSTASCII_USTRINGPARAM( #ERR: ));
-aTmp += pAktBuffer;
-aTmp.AppendAscii( ( );
-OSL_ENSURE( aTmpLine.getLength() = STRING_MAXLEN -
aTmp.Len() - 1, GetNextDataset(): line doesn't fit into data);
-aTmp += aTmpLine;
-aTmp += sal_Unicode(')');
-aData = aTmp;
+OUStringBuffer aTmp(#ERR: );
+aTmp.append(pAktBuffer).append( ();
+aTmp.append(aTmpLine).append(')');
+aData = aTmp.makeStringAndClear();
eRet = D_STRING;
}
else
{
-OSL_ENSURE( aTmpLine.getLength() = STRING_MAXLEN,
GetNextDataset(): line doesn't fit into data);
aData = aTmpLine;
}
}
@@ -566,7 +556,6 @@ DATASET DifParser::GetNextDataset( void )
// Single line string
if( nLineLength = 2 pLine[nLineLength - 1] == '' )
{
-OSL_ENSURE( aLine.getLength() - 2 =
STRING_MAXLEN, GetNextDataset(): line doesn't fit into data);
aData = aLine.copy( 1, nLineLength - 2 );
lcl_DeEscapeQuotesDif( aData );
eRet = D_STRING;
@@ -575,12 +564,11 @@ DATASET DifParser::GetNextDataset( void )
else
{
// Multiline string
-OSL_ENSURE( aLine.getLength() - 1 = STRING_MAXLEN,
GetNextDataset(): line doesn't fit into data);
aData = aLine.copy( 1 );
bool bContinue = true;
while ( bContinue )
{
-aData.Append( '\n' );
+aData = aData + \n;
bContinue = !rIn.IsEof() ReadNextLine( aLine );
if( bContinue )
{
@@ -591,13 +579,11 @@ DATASET DifParser::GetNextDataset( void )
[PATCH libreoffice-4-0] we need a reference to the DifParser.aData, fdo#64920
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4054
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/4054/1
we need a reference to the DifParser.aData, fdo#64920
regression from 6191fa0847ac5b27083efe1a8c6cd84d080a638c
Change-Id: If7fc18e7d0bcbf1075a0ecdb1c0dcf3d207f1bda
---
M sc/source/filter/dif/difimp.cxx
M sc/source/filter/inc/dif.hxx
2 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 4487915..dfc68a3 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -61,7 +61,7 @@
sal_BoolbSyntErrWarn = false;
sal_BoolbOverflowWarn = false;
-rtl::OUString aData = aDifParser.aData;
+rtl::OUString aData = aDifParser.aData;
sal_BoolbData = false;
rIn.Seek( 0 );
@@ -372,7 +372,7 @@
if( aLine.getLength() 2 )
aData = aLine.copy( 1, aLine.getLength() - 2 );
else
-aData.Erase();
+aData = OUString();
eS = S_END;
break;
case S_END:
@@ -395,20 +395,14 @@
}
-static void lcl_DeEscapeQuotesDif( String rString )
+static void lcl_DeEscapeQuotesDif( OUString rString )
{
// Special handling for DIF import: Escaped (duplicated) quotes are
resolved.
// Single quote characters are left in place because older versions didn't
// escape quotes in strings (and Excel doesn't when using the clipboard).
// The quotes around the string are removed before this function is
called.
-static const sal_Unicode aDQ[] = { '', '', 0 };
-xub_StrLen nPos = 0;
-while ( (nPos = rString.Search( aDQ, nPos )) != STRING_NOTFOUND )
-{
-rString.Erase( nPos, 1 );
-++nPos;
-}
+rString = rString.replaceAll(\\, \);
}
// Determine if passed in string is numeric data and set fVal/nNumFormat if so
@@ -528,18 +522,14 @@
ReadNextLine( aTmpLine );
if ( eRet == D_SYNT_ERROR )
{ // for broken records write #ERR: data to cell
-String aTmp( RTL_CONSTASCII_USTRINGPARAM( #ERR: ));
-aTmp += pAktBuffer;
-aTmp.AppendAscii( ( );
-OSL_ENSURE( aTmpLine.getLength() = STRING_MAXLEN -
aTmp.Len() - 1, GetNextDataset(): line doesn't fit into data);
-aTmp += aTmpLine;
-aTmp += sal_Unicode(')');
-aData = aTmp;
+OUStringBuffer aTmp(#ERR: );
+aTmp.append(pAktBuffer).append( ();
+aTmp.append(aTmpLine).append(')');
+aData = aTmp.makeStringAndClear();
eRet = D_STRING;
}
else
{
-OSL_ENSURE( aTmpLine.getLength() = STRING_MAXLEN,
GetNextDataset(): line doesn't fit into data);
aData = aTmpLine;
}
}
@@ -561,7 +551,6 @@
// Single line string
if( nLineLength = 2 pLine[nLineLength - 1] == '' )
{
-OSL_ENSURE( aLine.getLength() - 2 =
STRING_MAXLEN, GetNextDataset(): line doesn't fit into data);
aData = aLine.copy( 1, nLineLength - 2 );
lcl_DeEscapeQuotesDif( aData );
eRet = D_STRING;
@@ -570,12 +559,11 @@
else
{
// Multiline string
-OSL_ENSURE( aLine.getLength() - 1 = STRING_MAXLEN,
GetNextDataset(): line doesn't fit into data);
aData = aLine.copy( 1 );
bool bContinue = true;
while ( bContinue )
{
-aData.Append( '\n' );
+aData = aData + \n;
bContinue = !rIn.IsEof() ReadNextLine( aLine );
if( bContinue )
{
@@ -586,13 +574,11 @@
bContinue = !LookAhead();
if( bContinue )
{
-OSL_ENSURE( aLine.getLength() =
STRING_MAXLEN - aData.Len(), GetNextDataset(): line doesn't fit into data);
-aData.Append( aLine );
+aData = aData + aLine;
}
else if( pLine[nLineLength - 1] == '' )
{
-OSL_ENSURE( nLineLength - 1 =
STRING_MAXLEN - aData.Len(),
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk|1
sc/source/ui/inc/inscldlg.hxx | 12 --
sc/source/ui/inc/miscdlgs.hrc |5
sc/source/ui/miscdlgs/inscldlg.cxx | 46 +++-
sc/source/ui/src/miscdlgs.src | 68
sc/uiconfig/scalc/ui/insertcells.ui | 194
6 files changed, 219 insertions(+), 107 deletions(-)
New commits:
commit bfc0609a4c5c73533b31f2581963160abe57df5e
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date: Mon May 27 11:58:45 2013 +0300
inscldlg.ui widget
Change-Id: Ia931e330303e9f5baf7ae92a8d69bc460327425d
Reviewed-on: https://gerrit.libreoffice.org/4049
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 1f77cdd..cf715ff 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/headerdialog \
sc/uiconfig/scalc/ui/headerfootercontent \
sc/uiconfig/scalc/ui/headerfooterdialog \
+ sc/uiconfig/scalc/ui/insertcells \
sc/uiconfig/scalc/ui/insertname \
sc/uiconfig/scalc/ui/insertsheet \
sc/uiconfig/scalc/ui/leftfooterdialog \
diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx
index f6a5ed9..008206d 100644
--- a/sc/source/ui/inc/inscldlg.hxx
+++ b/sc/source/ui/inc/inscldlg.hxx
@@ -32,14 +32,10 @@
class ScInsertCellDlg : public ModalDialog
{
private:
-FixedLine aFlFrame;
-RadioButton aBtnCellsDown;
-RadioButton aBtnCellsRight;
-RadioButton aBtnInsRows;
-RadioButton aBtnInsCols;
-OKButtonaBtnOk;
-CancelButtonaBtnCancel;
-HelpButton aBtnHelp;
+RadioButton* m_pBtnCellsDown;
+RadioButton* m_pBtnCellsRight;
+RadioButton* m_pBtnInsRow;
+RadioButton* m_pBtnInsCol;
public:
ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove =
false );
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 9efabdc..c65428a 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -37,11 +37,6 @@
#define FL_FRAME112
#define STR_BTN_CLOSE 200
-// Insert Cell Dialog
-#define BTN_CELLSDOWN 11
-#define BTN_CELLSRIGHT 12
-#define BTN_INSROWS 16
-#define BTN_INSCOLS 17
// Insert Contents Dialog
#define BTN_INSALL 20
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx
b/sc/source/ui/miscdlgs/inscldlg.cxx
index 56e72e7..0d522c8 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -34,42 +34,36 @@ static sal_uInt8 nInsItemChecked=0;
//==
ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) :
-ModalDialog ( pParent, ScResId( RID_SCDLG_INSCELL ) ),
-//
-aFlFrame( this, ScResId( FL_FRAME ) ),
-aBtnCellsDown ( this, ScResId( BTN_CELLSDOWN ) ),
-aBtnCellsRight ( this, ScResId( BTN_CELLSRIGHT ) ),
-aBtnInsRows ( this, ScResId( BTN_INSROWS ) ),
-aBtnInsCols ( this, ScResId( BTN_INSCOLS ) ),
-aBtnOk ( this, ScResId( BTN_OK ) ),
-aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
-aBtnHelp( this, ScResId( BTN_HELP ) )
+ModalDialog ( pParent, InsertCellsDialog,
modules/scalc/ui/insertcells.ui)
{
+get(m_pBtnCellsDown, down);
+get(m_pBtnCellsRight, right);
+get(m_pBtnInsRow, rows);
+get(m_pBtnInsCol, cols);
+
if (bDisallowCellMove)
{
-aBtnCellsDown.Disable();
-aBtnCellsRight.Disable();
-aBtnInsRows.Check();
+m_pBtnCellsDown-Disable();
+m_pBtnCellsRight-Disable();
+m_pBtnInsRow-Check();
switch(nInsItemChecked)
{
-case 2: aBtnInsRows .Check();break;
-case 3: aBtnInsCols .Check();break;
-default:aBtnInsRows .Check();break;
+case 2: m_pBtnInsRow-Check();break;
+case 3: m_pBtnInsCol-Check();break;
+default:m_pBtnInsRow-Check();break;
}
}
else
{
switch(nInsItemChecked)
{
-case 0: aBtnCellsDown .Check();break;
-case 1: aBtnCellsRight.Check();break;
-case 2: aBtnInsRows .Check();break;
-case 3: aBtnInsCols .Check();break;
+case 0: m_pBtnCellsDown-Check();break;
+case 1: m_pBtnCellsRight-Check();break;
+case 2: m_pBtnInsRow-Check();break;
+case 3: m_pBtnInsCol-Check();break;
}
}
-//-
-FreeResource();
}
//
@@ -78,22 +72,22 @@ InsCellCmd ScInsertCellDlg::GetInsCellCmd() const
{
InsCellCmd nReturn = INS_NONE;
-if ( aBtnCellsDown.IsChecked() )
+
[PUSHED] inscldlg.ui widget
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4049 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4049 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia931e330303e9f5baf7ae92a8d69bc460327425d Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8bcb6c33c1d1c221deb0ebee54d4d537d55b74f2 Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 14:19:46 2013 +0100 Updated core Project: help 56fb45d986561dde4a9675a2bd7495b7feb1df32 diff --git a/helpcontent2 b/helpcontent2 index 9d59948..56fb45d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9d599487454a75a8076f2e40eace959ac58824fb +Subproject commit 56fb45d986561dde4a9675a2bd7495b7feb1df32 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |4 source/text/scalc/01/0402.xhp | 23 --- 2 files changed, 12 insertions(+), 15 deletions(-) New commits: commit 56fb45d986561dde4a9675a2bd7495b7feb1df32 Author: Caolán McNamara caol...@redhat.com Date: Mon May 27 14:19:46 2013 +0100 update help ids for insert cells .ui conversion Change-Id: Ia4278cc9930e8a8abc05639520770c336ca3f752 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index c9b18f9..e1ca3e4 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6754,10 +6754,6 @@ sc_RadioButton_RID_SCDLG_FILLSERIES_BTN_MONTH,1493516824, sc_RadioButton_RID_SCDLG_FILLSERIES_BTN_RIGHT,1493516803, sc_RadioButton_RID_SCDLG_FILLSERIES_BTN_TOP,1493516804, sc_RadioButton_RID_SCDLG_FILLSERIES_BTN_YEAR,1493516825, -sc_RadioButton_RID_SCDLG_INSCELL_BTN_CELLSDOWN,1493402123, -sc_RadioButton_RID_SCDLG_INSCELL_BTN_CELLSRIGHT,1493402124, -sc_RadioButton_RID_SCDLG_INSCELL_BTN_INSCOLS,1493402129, -sc_RadioButton_RID_SCDLG_INSCELL_BTN_INSROWS,1493402128, sc_RadioButton_RID_SCDLG_INSCONT_BTN_MV_DOWN,1493434918, sc_RadioButton_RID_SCDLG_INSCONT_BTN_MV_NONE,1493434917, sc_RadioButton_RID_SCDLG_INSCONT_BTN_MV_RIGHT,1493434919, diff --git a/source/text/scalc/01/0402.xhp b/source/text/scalc/01/0402.xhp index bde245b..8983be8 100644 --- a/source/text/scalc/01/0402.xhp +++ b/source/text/scalc/01/0402.xhp @@ -34,7 +34,8 @@ bookmark_valueinserting; cells/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/.uno:InsertCell id=bm_id6503296 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:InsertCell id=bm_id3147264 localize=false/paragraph role=heading id=hd_id3156023 xml-lang=en-US level=1 l10n=U oldref=1 Insert Cells/paragraph +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/insertcells/InsertCellsDialog id=bm_id3147264 localize=false/ +paragraph role=heading id=hd_id3156023 xml-lang=en-US level=1 l10n=U oldref=1 Insert Cells/paragraph paragraph role=paragraph id=par_id3150542 xml-lang=en-US l10n=U oldref=2variable id=zelleneinfuegentextahelp hid=.uno:InsertCellOpens theemph Insert Cells /emphdialog, in which you can insert new cells according to the options that you specify./ahelp /variable You can delete cells by choosing link href=text/scalc/01/0216.xhp name=Edit - Delete CellsemphEdit - Delete Cells/emph/link./paragraph section id=howtoget @@ -43,23 +44,23 @@ paragraph role=heading id=hd_id3153768 xml-lang=en-US level=2 l10n=U oldref=3Selection/paragraph paragraph role=paragraph id=par_id3149262 xml-lang=en-US l10n=U oldref=4This area contains the options available for inserting cells into a sheet. The cell quantity and position is defined by selecting a cell range in the sheet beforehand./paragraph bookmark xml-lang=en-US branch=hid/.uno:InsertCellsDown id=bm_id6210706 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:InsertCellsDown id=bm_id3152578 localize=false/ -bookmark xml-lang=en-US branch=hid/sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSDOWN id=bm_id3145271 localize=false/paragraph role=heading id=hd_id3146120 xml-lang=en-US level=3 l10n=U oldref=5Shift cells down/paragraph -paragraph role=paragraph id=par_id3152596 xml-lang=en-US l10n=U oldref=6variable id=zellenuntentextahelp hid=SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_CELLSDOWNMoves the contents of the selected range downward when cells are inserted./ahelp +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/insertcells/down id=bm_id3152578 localize=false/ +paragraph role=heading id=hd_id3146120 xml-lang=en-US level=3 l10n=U oldref=5Shift cells down/paragraph +paragraph role=paragraph id=par_id3152596 xml-lang=en-US l10n=U oldref=6variable id=zellenuntentextahelp hid=modules/scalc/ui/insertcells/downMoves the contents of the selected range downward when cells are inserted./ahelp /variable/paragraph embed href=text/scalc/00/0404.xhp#syzellenunten/ bookmark xml-lang=en-US branch=hid/.uno:InsertCellsRight id=bm_id7689959 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:InsertCellsRight id=bm_id3151118 localize=false/ -bookmark xml-lang=en-US branch=hid/sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSRIGHT id=bm_id3147348 localize=false/paragraph role=heading id=hd_id3147434 xml-lang=en-US level=3 l10n=U oldref=7Shift cells right/paragraph -paragraph role=paragraph id=par_id3144764 xml-lang=en-US l10n=U oldref=8variable id=zellenrechtstextahelp hid=SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_CELLSRIGHTMoves the contents of the selected range to the right when cells are inserted./ahelp +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/insertcells/right id=bm_id3147348 localize=false/ +paragraph role=heading id=hd_id3147434 xml-lang=en-US level=3 l10n=U oldref=7Shift cells right/paragraph +paragraph role=paragraph id=par_id3144764 xml-lang=en-US l10n=U oldref=8variable id=zellenrechtstextahelp hid=modules/scalc/ui/insertcells/rightMoves the contents of the selected range
[PATCH libreoffice-4-0] fix backport error in commit for fdo#63603 (style renaming)
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4055
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/4055/1
fix backport error in commit for fdo#63603 (style renaming)
Change-Id: I5c78bf7055b32f730fea651a134d1a4439e85fcb
---
M sw/source/filter/ww8/wrtw8sty.cxx
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index b0371ff..f5370ea 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -531,7 +531,7 @@
// (It must be the English word regardless of language settings)
if ( nPos == 0 ) {
assert( pFmt-GetPoolFmtId() == RES_POOLCOLL_STANDARD );
-aName = OUString(Normal);
+aName = rtl::OUString(Normal);
} else if (aName.EqualsIgnoreCaseAscii(Normal)) {
// If LO has a style named Normal(!) rename it to something
unique
aName.InsertAscii(LO- , 0);
@@ -549,7 +549,7 @@
if (!clash)
break;
aName = aBaseName;
-aName += OUString::number(++nSuffix);
+aName += OUString::valueOf(sal_Int32(++nSuffix));
}
}
--
To view, visit https://gerrit.libreoffice.org/4055
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c78bf7055b32f730fea651a134d1a4439e85fcb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Luke Deller lukedell...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - liborcus/liborcus_0.1.0-boost-include.patch.1 liborcus/UnpackedTarball_orcus.mk
liborcus/UnpackedTarball_orcus.mk |4
liborcus/liborcus_0.1.0-boost-include.patch.1 | 26 ++
2 files changed, 30 insertions(+)
New commits:
commit 183eedf58862d7ab69746ad65b5487af99a2b650
Author: Stephan Bergmann sberg...@redhat.com
Date: Sun Feb 17 11:49:34 2013 +0100
Missing include in liborcus when building against Boost 1.53.0
Change-Id: Ie6c944d53d6e2fcdd161f674e32c9fbfd761d844
diff --git a/liborcus/UnpackedTarball_orcus.mk
b/liborcus/UnpackedTarball_orcus.mk
index 3375c95..436f795 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -18,6 +18,10 @@ orcus_patches :=
orcus_patches += liborcus_0.1.0-configure.patch
# disable boost auto lib in MSVC build
orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
+# https://gitorious.org/orcus/orcus/merge_requests/2#
+# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
+# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2:
+orcus_patches += liborcus_0.1.0-boost-include.patch.1
$(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
diff --git a/liborcus/liborcus_0.1.0-boost-include.patch.1
b/liborcus/liborcus_0.1.0-boost-include.patch.1
new file mode 100644
index 000..07558b0
--- /dev/null
+++ b/liborcus/liborcus_0.1.0-boost-include.patch.1
@@ -0,0 +1,26 @@
+From f60d6eecee72349993a392a9a63ddf3383d3b8c8 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann sberg...@redhat.com
+Date: Sat, 16 Feb 2013 13:25:44 +0100
+Subject: [PATCH] Missing include boost/noncopyable.hpp
+
+(at least when compiling against Boost 1.53.0)
+---
+ src/liborcus/dom_tree.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/liborcus/dom_tree.cpp b/src/liborcus/dom_tree.cpp
+index ecf7beb..14725ad 100644
+--- a/src/liborcus/dom_tree.cpp
b/src/liborcus/dom_tree.cpp
+@@ -34,6 +34,8 @@
+ #include iostream
+ #include sstream
+
++#include boost/noncopyable.hpp
++
+ using namespace std;
+
+ namespace orcus {
+--
+1.8.1.2
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/README
writerfilter/README | 12 1 file changed, 8 insertions(+), 4 deletions(-) New commits: commit aad5113e34bd1bb79f667d23097a508c5f3b4ca6 Author: Miklos Vajna vmik...@suse.cz Date: Mon May 27 15:38:23 2013 +0200 writerfilter: update README Change-Id: Icd098ab4efcd307c83fe42d2f5815b48d1bff669 diff --git a/writerfilter/README b/writerfilter/README index 21687e34..17ba617 100644 --- a/writerfilter/README +++ b/writerfilter/README @@ -3,14 +3,18 @@ The writerfilter module contains import filters for Writer, using its UNO API. Import filter for docx, doc and rtf. == Module contents == + * documentation * inc: global headers (can be included by other modules) - * prj: information for dmake * qa: unittests and subsequenttests * source: the filters themselves + * util: UNO passive registration config == Source contents == - * dmapper: the domain mapper, hiding UNO from the tokenizers - * doctok: incomplete ww8 (.doc) tokenizer - * filter: the uno filter service implementations + * dmapper: the domain mapper, hiding UNO from the tokenizers, used by DOCX and RTF import + * doctok: incomplete and unused ww8 (.doc) tokenizer + * filter: the UNO filter service implementations, invoked by UNO and calling + the dmapper + one of the tokenizers + * odiapi * ooxml: the docx tokenizer + * resourcemodel * rtftok: the rtf tokenizer ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/filter/ww8/wrtw8sty.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a2df328ded9771e3589c4f123ab64048279690f Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon May 27 15:39:02 2013 +0200 fix backport (OUString::number - valueOf) Change-Id: I19920a19543a5dde1761711a736090e56c3254f6 diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index b0371ff..36ee09b 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -549,7 +549,7 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos ) if (!clash) break; aName = aBaseName; -aName += OUString::number(++nSuffix); +aName += OUString::valueOf(sal_Int32(++nSuffix)); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/inc sc/source
sc/inc/chartlis.hxx |2 ++
sc/source/core/tool/chartlis.cxx |5 +
sc/source/ui/unoobj/chartuno.cxx |1 +
3 files changed, 8 insertions(+)
New commits:
commit 92dc9cb50d2d7ebff6fb591d265589ef5f22dc1b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon May 27 01:42:46 2013 +0200
remove chart listener when chart is deleted, fdo#64639
Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef
Reviewed-on: https://gerrit.libreoffice.org/4045
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 788c326..e32a1f0 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -171,6 +171,8 @@ public:
const ScChartListener* findByName(const rtl::OUString rName) const;
bool hasListeners() const;
+void removeByName(const OUString rName);
+
const ListenersType getListeners() const;
ListenersType getListeners();
StringSetType getNonOleObjectNames();
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 67da747..712c60a404 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -469,6 +469,11 @@ void ScChartListenerCollection::insert(ScChartListener*
pListener)
maListeners.insert(aName, pListener);
}
+void ScChartListenerCollection::removeByName(const rtl::OUString rName)
+{
+maListeners.erase(rName);
+}
+
ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString
rName)
{
ListenersType::iterator it = maListeners.find(rName);
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 8072f3b..092ddce 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -298,6 +298,7 @@ void SAL_CALL ScChartsObj::removeByName( const
rtl::OUString aName )
if (pObj)
{
ScDocument* pDoc = pDocShell-GetDocument();
+pDoc-GetChartListenerCollection()-removeByName(aName);
ScDrawLayer* pModel = pDoc-GetDrawLayer(); // ist nicht 0
SdrPage* pPage = pModel-GetPage(static_castsal_uInt16(nTab));//
ist nicht 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/inc sc/source
sc/inc/chartlis.hxx |2 ++
sc/source/core/tool/chartlis.cxx |5 +
sc/source/ui/unoobj/chartuno.cxx |1 +
3 files changed, 8 insertions(+)
New commits:
commit 231707c7ae06ca6dcfc1a8d62472d8a1e18a2b73
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon May 27 01:42:46 2013 +0200
remove chart listener when chart is deleted, fdo#64639
Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef
Reviewed-on: https://gerrit.libreoffice.org/4046
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 8ca2760..791efef 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -181,6 +181,8 @@ public:
const ScChartListener* findByName(const rtl::OUString rName) const;
bool hasListeners() const;
+void removeByName(const OUString rName);
+
const ListenersType getListeners() const;
ListenersType getListeners();
StringSetType getNonOleObjectNames();
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index d49fdeb..55239a0 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -486,6 +486,11 @@ void ScChartListenerCollection::insert(ScChartListener*
pListener)
maListeners.insert(aName, pListener);
}
+void ScChartListenerCollection::removeByName(const rtl::OUString rName)
+{
+maListeners.erase(rName);
+}
+
ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString
rName)
{
ListenersType::iterator it = maListeners.find(rName);
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 4996586..71bc893 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -309,6 +309,7 @@ void SAL_CALL ScChartsObj::removeByName( const
rtl::OUString aName )
if (pObj)
{
ScDocument* pDoc = pDocShell-GetDocument();
+pDoc-GetChartListenerCollection()-removeByName(aName);
ScDrawLayer* pModel = pDoc-GetDrawLayer(); // ist nicht 0
SdrPage* pPage = pModel-GetPage(static_castsal_uInt16(nTab));//
ist nicht 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/filter/ww8/wrtw8sty.cxx |2 +-
sw/source/filter/xml/xmltbli.cxx | 26 ++
2 files changed, 7 insertions(+), 21 deletions(-)
New commits:
commit b571605129426a1bf8eb7c9e9927785f8a9a5305
Author: Luke Deller l...@deller.id.au
Date: Thu May 23 02:05:36 2013 +1000
fix fdo#64872 infinite loop saving as doc
When loading from odt, table cells which are covered (due to merging of
cells) are replaced with an empty cell by
SwXMLTableContext::ReplaceWithEmptyCell. However if there is a sequence
of cells covered from above then their replacements are accidentally
inserted in reverse order, which produces this infinite loop problem when
saving as doc.
The reverse ordering in SwXMLTableContext::ReplaceWithEmptyCell was because
the insert position came from SwXMLTableContext::GetPrevStartNode which was
very careful to skip previous covered cells. However those cells have
already been replaced with an empty cell so they should not be skipped.
Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index 36ee09b..f5370ea 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -531,7 +531,7 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16
nPos )
// (It must be the English word regardless of language settings)
if ( nPos == 0 ) {
assert( pFmt-GetPoolFmtId() == RES_POOLCOLL_STANDARD );
-aName = OUString(Normal);
+aName = rtl::OUString(Normal);
} else if (aName.EqualsIgnoreCaseAscii(Normal)) {
// If LO has a style named Normal(!) rename it to something
unique
aName.InsertAscii(LO- , 0);
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 6cd2cdc..50d5e99 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1807,29 +1807,15 @@ const SwStartNode *SwXMLTableContext::GetPrevStartNode(
sal_uInt32 nRow,
// The last cell is the right one here.
pPrevCell = GetCell( pRows-size()-1U, GetColumnCount()-1UL );
}
-else if( 0UL == nRow )
+else if( nCol 0UL )
{
-// There are no vertically merged cells within the first row, so the
-// previous cell is the right one always.
-if( nCol 0UL )
-pPrevCell = GetCell( nRow, nCol-1UL );
+// The previous cell in this row.
+pPrevCell = GetCell( nRow, nCol-1UL );
}
-else
+else if( nRow 0UL )
{
-// If there is a previous cell in the current row that is not spanned
-// from the previous row, its the right one.
-const SwXMLTableRow_Impl *pPrevRow = (*pRows)[(sal_uInt16)nRow-1U];
-sal_uInt32 i = nCol;
-while( !pPrevCell i 0UL )
-{
-i--;
-if( 1UL == pPrevRow-GetCell( i )-GetRowSpan() )
-pPrevCell = GetCell( nRow, i );
-}
-
-// Otherwise, the last cell from the previous row is the right one.
-if( !pPrevCell )
-pPrevCell = pPrevRow-GetCell( GetColumnCount()-1UL );
+// The last cell from the previous row.
+pPrevCell = GetCell( nRow-1UL, GetColumnCount()-1UL );
}
const SwStartNode *pSttNd = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] remove chart listener when chart is deleted, fdo#64639
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4045 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4045 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] remove chart listener when chart is deleted, fdo#64639
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4046 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4046 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fix fdo#64872 infinite loop saving as doc
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4026 -- To view, visit https://gerrit.libreoffice.org/4026 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Luke Deller lukedell...@gmail.com Gerrit-Reviewer: Luke Deller lukedell...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/docshell/arealink.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a8fb2124310e9f21ca75f2a39b95cdf021173e36
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon May 27 13:36:16 2013 +0200
range names need to be checked upper case, fdo#64031
Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94
Reviewed-on: https://gerrit.libreoffice.org/4050
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sc/source/ui/docshell/arealink.cxx
b/sc/source/ui/docshell/arealink.cxx
index 84d30be..ee322d5 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -193,10 +193,11 @@ bool ScAreaLink::IsEqual( const String rFile, const
String rFilter, const Stri
bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const
String rAreaName )
{
bool bFound = false;
+rtl::OUString aUpperName = ScGlobal::pCharClass-uppercase(rAreaName);
ScRangeName* pNames = pSrcDoc-GetRangeName();
if (pNames) // benannte Bereiche
{
-const ScRangeData* p = pNames-findByUpperName(rAreaName);
+const ScRangeData* p = pNames-findByUpperName(aUpperName);
if (p p-IsValidReference(rRange))
bFound = true;
}
@@ -205,7 +206,7 @@ bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument*
pSrcDoc, const Strin
ScDBCollection* pDBColl = pSrcDoc-GetDBCollection();
if (pDBColl)
{
-const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(ScGlobal::pCharClass-uppercase(rAreaName));
+const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(aUpperName);
if (pDB)
{
SCTAB nTab;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] range names need to be checked upper case, fdo#64031
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4050 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4050 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: boost/boost.3780.aliasing.patch boost/boost.4510.warnings.patch boost/boost.gcc47679.patch hsqldb/patches hunspell/hunspell-1.3.2-overflow.patch nss/nss.patch solenv/gb
boost/boost.3780.aliasing.patch|2 +-
boost/boost.4510.warnings.patch|2 +-
boost/boost.gcc47679.patch |2 +-
hsqldb/patches/jdbc-4.1.patch |2 +-
hunspell/hunspell-1.3.2-overflow.patch |4 ++--
nss/nss.patch |6 +++---
solenv/gbuild/UnpackedTarball.mk |2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit f60af9ca6b6a66693d08ec08253f8d38a47d0050
Author: Tor Lillqvist t...@iki.fi
Date: Mon May 27 15:29:30 2013 +0300
Use a maximum fuzz factor of 1 for our patches to 3rd-party code
Change-Id: Id4639f1b0eefe5d433c84f48b7a1093fa17a3ba4
diff --git a/boost/boost.3780.aliasing.patch b/boost/boost.3780.aliasing.patch
index f279e33..d9cff1b 100644
--- a/boost/boost.3780.aliasing.patch
+++ b/boost/boost.3780.aliasing.patch
@@ -1,6 +1,6 @@
--- misc/boost_1_44_0/boost/function/function_base.hpp
+++ misc/build/boost_1_44_0/boost/function/function_base.hpp
-@@ -314,15 +322,15 @@
+@@ -314,17 +322,17 @@
{
if (op == clone_functor_tag || op == move_functor_tag) {
const functor_type* in_functor =
diff --git a/boost/boost.4510.warnings.patch b/boost/boost.4510.warnings.patch
index 826c570..11fdace 100644
--- a/boost/boost.4510.warnings.patch
+++ b/boost/boost.4510.warnings.patch
@@ -1,8 +1,8 @@
--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
+++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
@@ -56,6 +56,13 @@
- } // namespace detail
+ } // namespace detail
+// MSVC 2008 produces 2 warnings default constructor could not be generated
+// here that run over ~100 lines :(
diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
index 72ab15a..e62a874 100644
--- a/boost/boost.gcc47679.patch
+++ b/boost/boost.gcc47679.patch
@@ -40,7 +40,7 @@
+++ misc/build/boost_1_44_0/boost/optional/optional.hpp2011-04-05
13:19:01.223587256 +0100
@@ -31,6 +31,8 @@
- #include boost/optional/optional_fwd.hpp
+ #include boost/optional/optional_fwd.hpp
+#include string.h
+
diff --git a/hsqldb/patches/jdbc-4.1.patch b/hsqldb/patches/jdbc-4.1.patch
index 68180a2..782f446 100644
--- a/hsqldb/patches/jdbc-4.1.patch
+++ b/hsqldb/patches/jdbc-4.1.patch
@@ -272,8 +272,8 @@
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08
15:14:42.802123563 +
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08
15:47:35.872635595 +
@@ -1608,4 +1608,16 @@
- throw new UnsupportedOperationException(Not supported yet.);
}
+ */
//#endif JAVA6
+
+//#ifdef JAVA7
diff --git a/hunspell/hunspell-1.3.2-overflow.patch
b/hunspell/hunspell-1.3.2-overflow.patch
index 46d4c67..8500b48 100644
--- a/hunspell/hunspell-1.3.2-overflow.patch
+++ b/hunspell/hunspell-1.3.2-overflow.patch
@@ -6,9 +6,9 @@
+#include limits
+
+ #include vector
+
#include affixmgr.hxx
- #include affentry.hxx
- #include langnum.hxx
@@ -4000,7 +4002,10 @@
case 3: {
np++;
diff --git a/nss/nss.patch b/nss/nss.patch
index ca81061..728f79f 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -13,7 +13,7 @@
+++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk 2010-06-11
16:35:54.966185975 +0200
@@ -39,8 +39,12 @@
- DEFAULT_COMPILER = cc
+ DEFAULT_COMPILER = gcc
-CC= gcc
-CCC = g++
@@ -88,8 +88,8 @@
# INCLUDES += -I/usr/include -Y/usr/include/linux
@@ -158,8 +161,13 @@
- #
- CPU_TAG = _$(CPU_ARCH)
+ endif
+ endif
+ifeq ($(SYSTEM_ZLIB),YES)
+# Currently (3.12.4) only the tools modutil and signtool are linked with libz
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index a62b42a..011b682 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
for p in $(UNPACKED_PATCHES); do \
pl=$(UNPACKED_PATCHLEVEL); \
s=$${p##*.}; case $$s in [0-9]$(CLOSE_PAREN)
pl=$$s; ;; esac ; \
- $(GNUPATCH) -f -s -p$$pl $$p; \
+ $(GNUPATCH) -f -s -p$$pl --fuzz=1 $$p; \
if test $$? -ne 0; then echo Patch FAILED:
$$p; exit 1; fi;\
done \
) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED libreoffice-4-0] fix backport error in commit for fdo#63603 (style renaming)
Miklos Vajna has abandoned this change. Change subject: fix backport error in commit for fdo#63603 (style renaming) .. Patch Set 1: Abandoned Merged as part of https://gerrit.libreoffice.org/#/c/4026/ -- To view, visit https://gerrit.libreoffice.org/4055 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I5c78bf7055b32f730fea651a134d1a4439e85fcb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Luke Deller lukedell...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 65022, which changed state. Bug 65022 Summary: Format - Paragraph/Page = Silent Crash https://bugs.freedesktop.org/show_bug.cgi?id=65022 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ceaa3b6025546896ac18e16f5aee789b1b3e94ec Author: Andras Timar ati...@suse.com Date: Mon May 27 16:12:32 2013 +0200 Updated core Project: translations f3546694e706114bcccd978f444f0800a382dbf9 diff --git a/translations b/translations index 40e56fe..f354669 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 40e56fe83f5a05f8c87821d0c30ef1585b601fc8 +Subproject commit f3546694e706114bcccd978f444f0800a382dbf9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
