[Libreoffice-bugs] [Bug 126466] PARAGRAPH STYLE DIALOG: Style Line Spacing doesn't remain as set
https://bugs.documentfoundation.org/show_bug.cgi?id=126466 Roman Kuznetsov <79045_79...@mail.ru> changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Roman Kuznetsov <79045_79...@mail.ru> --- https://gerrit.libreoffice.org/#/c/76069/ -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 107833] [META] Writer paragraph style bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=107833 Bug 107833 depends on bug 126466, which changed state. Bug 126466 Summary: PARAGRAPH STYLE DIALOG: Style Line Spacing doesn't remain as set https://bugs.documentfoundation.org/show_bug.cgi?id=126466 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 31491] 'Find & Replace' across multiple open documents across different LibO applications
https://bugs.documentfoundation.org/show_bug.cgi?id=31491 --- Comment #9 from Grey --- I would like to reopen this bug as we are almost at the release of V6.3 and after nine years since this enhancement has been requested it still has not been implemented. I don't think this is an "edge case" request; other text editors (BBEdit and Notepad++ come to mind) have this option. I see this bug report was closed because it was NEEDINFO'd. I would be more than willing to supply any pertaining info needed. Just ask. Please advise to whether I should file a new bug report. Thank you. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: cui/source editeng/source include/editeng
cui/source/inc/paragrph.hxx |3 +
cui/source/tabpages/paragrph.cxx | 12 -
editeng/source/items/paraitem.cxx | 89 --
include/editeng/editrids.hrc |8 +++
4 files changed, 98 insertions(+), 14 deletions(-)
New commits:
commit 5f5bfddf5fe8bbcd77dbb040d0bf77d595c90f30
Author: Jim Raykowski
AuthorDate: Sat Jul 20 13:17:06 2019 -0800
Commit: Jim Raykowski
CommitDate: Sat Jul 27 05:11:37 2019 +0200
tdf#94395 Show paragraph style line spacing in organizer contains
This patch provides functionality to SvxLineSpacingItem::GetPresentation
and also fixes tdf#126466
Change-Id: I9e0cb042c83c568051061de3467d402ef88cfdf4
Reviewed-on: https://gerrit.libreoffice.org/76069
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index bccaefeb6cac..35a9bea4b30c 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -90,10 +90,13 @@ private:
voidUpdateExample_Impl();
voidELRLoseFocus();
+DECL_LINK(LineDistPopupHdl_Impl, weld::ComboBox&, void);
DECL_LINK(LineDistHdl_Impl, weld::ComboBox&, void);
DECL_LINK(ModifyHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(AutoHdl_Impl, weld::ToggleButton&, void);
+bool m_bLineDistToggled = false;
+
protected:
virtual voidActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRCDeactivatePage( SfxItemSet* pSet ) override;
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index fb00c542c08c..0560ab0c0e2d 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -226,7 +226,8 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet*
rOutSet )
int nPos = m_xLineDist->get_active();
if ( nPos != -1 &&
- ( m_xLineDist->get_value_changed_from_saved() ||
+ ( m_bLineDistToggled ||
+ m_xLineDist->get_value_changed_from_saved() ||
m_xLineDistAtPercentBox->get_value_changed_from_saved() ||
m_xLineDistAtMetricBox->get_value_changed_from_saved() ) )
{
@@ -264,7 +265,8 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet*
rOutSet )
eState = GetItemSet().GetItemState( nWhich );
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_LINESPACE );
-if ( !pOld || !( *static_cast(pOld) ==
aSpacing ) ||
+if ( m_bLineDistToggled ||
+ !pOld || !( *static_cast(pOld) ==
aSpacing ) ||
SfxItemState::DONTCARE == eState )
{
rOutSet->Put( aSpacing );
@@ -789,6 +791,11 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl
LineDistHdl_Impl( *m_xLineDist );
}
+IMPL_LINK_NOARG(SvxStdParagraphTabPage, LineDistPopupHdl_Impl,
weld::ComboBox&, void)
+{
+m_bLineDistToggled = true;
+}
+
IMPL_LINK(SvxStdParagraphTabPage, LineDistHdl_Impl, weld::ComboBox&, rBox,
void)
{
switch (rBox.get_active())
@@ -863,6 +870,7 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ModifyHdl_Impl,
weld::MetricSpinButton&,
void SvxStdParagraphTabPage::Init_Impl()
{
+m_xLineDist->connect_popup_toggled(LINK(this, SvxStdParagraphTabPage,
LineDistPopupHdl_Impl));
m_xLineDist->connect_changed(LINK(this, SvxStdParagraphTabPage,
LineDistHdl_Impl));
Link aLink2 = LINK(this,
SvxStdParagraphTabPage, ELRLoseFocusHdl);
diff --git a/editeng/source/items/paraitem.cxx
b/editeng/source/items/paraitem.cxx
index 4cf9750f15ca..283ae8fab51b 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -48,6 +48,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -226,23 +227,87 @@ SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * )
const
return new SvxLineSpacingItem( *this );
}
-
bool SvxLineSpacingItem::GetPresentation
(
-SfxItemPresentation /*ePres*/,
-MapUnit /*eCoreUnit*/,
-MapUnit /*ePresUnit*/,
-OUString& rText, const IntlWrapper&
+SfxItemPresentation ePres,
+MapUnit eCoreUnit,
+MapUnit ePresUnit,
+OUString& rText, const IntlWrapper& rIntl
) const
{
-#ifdef DBG_UTIL
-rText = "SvxLineSpacingItem";
-#else
-rText.clear();
-#endif
-return false;
-}
+switch ( ePres )
+{
+case SfxItemPresentation::Nameless:
+case SfxItemPresentation::Complete:
+{
+switch( GetLineSpaceRule() )
+{
+case SvxLineSpaceRule::Auto:
+{
+SvxInterLineSpaceRule eInter = GetInterLineSpaceRule();
+switch( eInter )
+{
+// Default single line spacing
+case SvxInterLineSpaceRule::Off:
+rText = EditResId(RID_SVXITEMS_LINESPACING_SINGLE);
+
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |2 ++
include/vcl/window.hxx |4 ++--
vcl/source/gdi/impanmvw.cxx| 23 ++-
vcl/source/outdev/clipping.cxx |6 ++
vcl/source/window/clipping.cxx | 11 +--
5 files changed, 21 insertions(+), 25 deletions(-)
New commits:
commit 08995b6a764c9e387c94f6ce5faba2145b5512f9
Author: Chris Sherlock
AuthorDate: Sat Jul 13 23:32:28 2019 +1000
Commit: Michael Meeks
CommitDate: Sat Jul 27 03:45:06 2019 +0200
tdf#74702: remove GetOutDevType() from ImplAnimView
I have done a spot of refactoring - it turns out that the bits where we
save and reset the map mode during background saves should probably be
done in Window::SaveBackground(). As Window::SaveBackground() doesn't
need the animation size (maSzPix) I have rarrange the parameter order
so the Window function can ignore the parameter.
OutputDevice::SaveBackground() has been introduced as a virtual function
and now is overridden by Window for its own purposes - OutputDevice just
does a DrawOutDev(...) operation on the background.
Change-Id: Ifeffe9536c01d8e4737f6e39a4f3dd14ba418f4d
Reviewed-on: https://gerrit.libreoffice.org/76399
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 0b92e735914f..b18150cefd38 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -624,6 +624,8 @@ public:
voidSetBackground();
voidSetBackground( const Wallpaper& rBackground );
+virtual voidSaveBackground(VirtualDevice& rSaveDevice,
+ const Point& rPos, const Size&
rSize, const Size& rBackgroundSize) const;
const Wallpaper&GetBackground() const { return maBackground; }
boolIsBackground() const { return mbBackground; }
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 47c140e475ae..c1ac276f6327 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1184,8 +1184,8 @@ public:
ScrollBar* pHScrl,
ScrollBar* pVScrl
);
-voidSaveBackground( const Point& rPos,
const Size& rSize,
-VirtualDevice&
rSaveDevice ) const;
+voidSaveBackground(VirtualDevice&
rSaveDevice,
+ const Point& rPos,
const Size& rSize, const Size&) const override;
virtual const SystemEnvData*GetSystemData() const;
css::uno::Any GetSystemDataAny() const;
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index d16048f176e5..0537c349e0f3 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -75,17 +75,7 @@ ImplAnimView::ImplAnimView( Animation* pParent,
OutputDevice* pOut,
// save background
mpBackground->SetOutputSizePixel( maSzPix );
-
-if( mpRenderContext->GetOutDevType() == OUTDEV_WINDOW )
-{
-MapMode aTempMap( mpRenderContext->GetMapMode() );
-aTempMap.SetOrigin( Point() );
-mpBackground->SetMapMode( aTempMap );
-static_cast( mpRenderContext.get() )->SaveBackground(
maDispPt, maDispSz, *mpBackground );
-mpBackground->SetMapMode( MapMode() );
-}
-else
-mpBackground->DrawOutDev( Point(), maSzPix, maDispPt, maDispSz,
*mpRenderContext );
+mpRenderContext->SaveBackground(*mpBackground, maDispPt, maDispSz,
maSzPix);
// Initialize drawing to actual position
drawToPos( mpParent->ImplGetCurPos() );
@@ -317,16 +307,7 @@ void ImplAnimView::repaint()
{
const bool bOldPause = mbIsPaused;
-if( mpRenderContext->GetOutDevType() == OUTDEV_WINDOW )
-{
-MapMode aTempMap( mpRenderContext->GetMapMode() );
-aTempMap.SetOrigin( Point() );
-mpBackground->SetMapMode( aTempMap );
-static_cast( mpRenderContext.get() )->SaveBackground(
maDispPt, maDispSz, *mpBackground );
-mpBackground->SetMapMode( MapMode() );
-}
-else
-mpBackground->DrawOutDev( Point(), maSzPix, maDispPt, maDispSz,
*mpRenderContext );
+mpRenderContext->SaveBackground(*mpBackground, maDispPt, maDispSz,
maSzPix);
mbIsPaused = false;
drawToPos( mnActPos );
diff --git a/vcl/source/outdev/clipping.cxx b/vcl/source/outdev/clipping.cxx
index 9dad2667bb66..4a2750f274ff 100644
--- a/vcl/source/outdev/clipping.cxx
+++ b/vcl/source/outdev/clipping.cxx
@@ -36,6 +36,12 @@
#include
+void OutputDevice::SaveBackground(VirtualDevice& rSaveDevice,
+ const Point& rPos, const Size& rSize, const
Size& rBackgroundSize) const
+{
+
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/impanmvw.hxx| 18 +-
vcl/source/gdi/impanmvw.cxx | 74 ++--
2 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit f440c1d28b440135b162e0e22703110a23e18d92
Author: Chris Sherlock
AuthorDate: Fri Jul 26 21:50:40 2019 +1000
Commit: Michael Meeks
CommitDate: Sat Jul 27 03:08:25 2019 +0200
vcl: make ImpAnimView variables more clear
Change-Id: I58904862974c416cddbd996af7d38ce639f1eb78
Reviewed-on: https://gerrit.libreoffice.org/76398
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/vcl/inc/impanmvw.hxx b/vcl/inc/impanmvw.hxx
index 95aafb1001a4..69949e9252ce 100644
--- a/vcl/inc/impanmvw.hxx
+++ b/vcl/inc/impanmvw.hxx
@@ -48,7 +48,7 @@ private:
friend class Animation;
Animation* const mpParent;
-VclPtr mpOut;
+VclPtr mpRenderContext;
long constmnExtraData;
Point const maPt;
Point maDispPt;
@@ -62,10 +62,10 @@ private:
VclPtr mpRestore;
sal_uLong mnActPos;
DisposalmeLastDisposal;
-boolmbPause;
-boolmbMarked;
-bool const mbHMirr;
-bool const mbVMirr;
+boolmbIsPaused;
+boolmbIsMarked;
+bool const mbIsMirroredHorizontally;
+bool const mbIsMirroredVertically;
public:
~ImplAnimView();
@@ -86,11 +86,11 @@ private:
const Size& getOutSizePix() const { return maSzPix; }
-voidpause( bool bPause ) { mbPause = bPause; }
-boolisPause() const { return mbPause; }
+voidpause( bool bIsPaused ) { mbIsPaused = bIsPaused; }
+boolisPause() const { return mbIsPaused; }
-voidsetMarked( bool bMarked ) { mbMarked = bMarked; }
-boolisMarked() const { return mbMarked; }
+voidsetMarked( bool bIsMarked ) { mbIsMarked = bIsMarked; }
+boolisMarked() const { return mbIsMarked; }
};
#endif
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 00a658b9ed42..d16048f176e5 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -31,24 +31,24 @@ ImplAnimView::ImplAnimView( Animation* pParent,
OutputDevice* pOut,
sal_uLong nExtraData,
OutputDevice* pFirstFrameOutDev ) :
mpParent( pParent ),
-mpOut ( pFirstFrameOutDev ? pFirstFrameOutDev : pOut ),
+mpRenderContext ( pFirstFrameOutDev ? pFirstFrameOutDev : pOut ),
mnExtraData ( nExtraData ),
maPt( rPt ),
maSz( rSz ),
-maSzPix ( mpOut->LogicToPixel( maSz ) ),
-maClip ( mpOut->GetClipRegion() ),
+maSzPix ( mpRenderContext->LogicToPixel( maSz ) ),
+maClip ( mpRenderContext->GetClipRegion() ),
mpBackground( VclPtr::Create() ),
mpRestore ( VclPtr::Create() ),
meLastDisposal ( Disposal::Back ),
-mbPause ( false ),
-mbMarked( false ),
-mbHMirr ( maSz.Width() < 0 ),
-mbVMirr ( maSz.Height() < 0 )
+mbIsPaused ( false ),
+mbIsMarked ( false ),
+mbIsMirroredHorizontally ( maSz.Width() < 0 ),
+mbIsMirroredVertically ( maSz.Height() < 0 )
{
Animation::ImplIncAnimCount();
// Mirrored horizontally?
-if( mbHMirr )
+if( mbIsMirroredHorizontally )
{
maDispPt.setX( maPt.X() + maSz.Width() + 1 );
maDispSz.setWidth( -maSz.Width() );
@@ -61,7 +61,7 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice*
pOut,
}
// Mirrored vertically?
-if( mbVMirr )
+if( mbIsMirroredVertically )
{
maDispPt.setY( maPt.Y() + maSz.Height() + 1 );
maDispSz.setHeight( -maSz.Height() );
@@ -76,16 +76,16 @@ ImplAnimView::ImplAnimView( Animation* pParent,
OutputDevice* pOut,
// save background
mpBackground->SetOutputSizePixel( maSzPix );
-if( mpOut->GetOutDevType() == OUTDEV_WINDOW )
+if( mpRenderContext->GetOutDevType() == OUTDEV_WINDOW )
{
-MapMode aTempMap( mpOut->GetMapMode() );
+MapMode aTempMap( mpRenderContext->GetMapMode() );
aTempMap.SetOrigin( Point() );
mpBackground->SetMapMode( aTempMap );
-static_cast( mpOut.get() )->SaveBackground( maDispPt,
maDispSz, *mpBackground );
+static_cast( mpRenderContext.get() )->SaveBackground(
maDispPt, maDispSz, *mpBackground );
mpBackground->SetMapMode( MapMode() );
}
else
-mpBackground->DrawOutDev( Point(), maSzPix, maDispPt, maDispSz, *mpOut
);
+mpBackground->DrawOutDev( Point(), maSzPix, maDispPt, maDispSz,
*mpRenderContext );
// Initialize drawing to actual
[Libreoffice-bugs] [Bug 117199] FILEOPEN VSDX Grouping of shapes are not imported to LO Draw
https://bugs.documentfoundation.org/show_bug.cgi?id=117199 Bartosz changed: What|Removed |Added Summary|Objects in VSDX files are |FILEOPEN VSDX Grouping of |not treated as single |shapes are not imported to |objects in LO Draw |LO Draw -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 117199] Objects in VSDX files are not treated as single objects in LO Draw
https://bugs.documentfoundation.org/show_bug.cgi?id=117199 --- Comment #11 from Bartosz --- Created attachment 153004 --> https://bugs.documentfoundation.org/attachment.cgi?id=153004=edit Drawings with grouped and ungrouped shapes. It could be used for comparison -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/svx default_images/sw ooo_custom_images/classic
default_images/svx/res/slidezoomin_11.png |binary default_images/svx/res/slidezoomout_11.png |binary default_images/sw/res/point.png |binary default_images/sw/res/point_h.png |binary ooo_custom_images/classic/classic_images.tar.gz |binary 5 files changed New commits: commit f160722c9cd8052c1b0c92c0e00783a9fe765dfa Author: Matthias Seidel AuthorDate: Fri Jul 26 23:50:48 2019 + Commit: Matthias Seidel CommitDate: Fri Jul 26 23:50:48 2019 + Updated graphics for (navigation) point diff --git a/default_images/sw/res/point.png b/default_images/sw/res/point.png index c58a792d8959..1c3c29421a27 100644 Binary files a/default_images/sw/res/point.png and b/default_images/sw/res/point.png differ diff --git a/default_images/sw/res/point_h.png b/default_images/sw/res/point_h.png index 75426c941aa9..c39971ffa840 100644 Binary files a/default_images/sw/res/point_h.png and b/default_images/sw/res/point_h.png differ diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz index e9f8c1dd5ad3..c8f4085938e1 100644 Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ commit 16736eb5d0b408ff6068096e6751bd70c99c494e Author: Matthias Seidel AuthorDate: Fri Jul 26 23:23:53 2019 + Commit: Matthias Seidel CommitDate: Fri Jul 26 23:23:53 2019 + Updated graphics for zoom in/out diff --git a/default_images/svx/res/slidezoomin_11.png b/default_images/svx/res/slidezoomin_11.png index 1fb255901910..b39513376db5 100644 Binary files a/default_images/svx/res/slidezoomin_11.png and b/default_images/svx/res/slidezoomin_11.png differ diff --git a/default_images/svx/res/slidezoomout_11.png b/default_images/svx/res/slidezoomout_11.png index 131f45cfbe3e..c4fb23b27f67 100644 Binary files a/default_images/svx/res/slidezoomout_11.png and b/default_images/svx/res/slidezoomout_11.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 126555] UI: "Distribution…" menu is missing
https://bugs.documentfoundation.org/show_bug.cgi?id=126555 --- Comment #8 from Konstantin Kharlamov --- Actually, I just figured that even if you remove the option from Customize, it still appears if you select 3 or more objects. So, the magic switch to make it appear is having 3 objects selected. The wiki article casually mentions that this option may distribute 3 or more objects, but I guess it would be nice to make it explicit that this option does not appear otherwise. That makes sense, given it distributes objects relative to each other, and in a sense just 2 objects are always optimally distributed. But it's not at all immediately clear, e.g. when I just found it, I wasn't sure whether it takes into account distance to page edges (in which case distributing 2 objects would make sense), and couldn't test that either. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126555] UI: "Distribution…" menu is missing
https://bugs.documentfoundation.org/show_bug.cgi?id=126555 --- Comment #7 from Konstantin Kharlamov --- Okay, so, this is odd, but apparently it's not possible to edit the libreoffice page on the topic¹ unless you're logged in, and then there's no option to create an account (I'm not sure if it's just me: when I go to "Forgot password", it says my IP is blocked because there's an open proxy or something). Could anybody with an account edit it to be more up-to-date? 1: https://help.libreoffice.org/Common/Distribution -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/lok-clipboard' - 31 commits - desktop/qa desktop/source editeng/source include/LibreOfficeKit include/sfx2 include/vcl offapi/com qadevOOo/runner qadevO
Rebased ref, commits from common ancestor:
commit a1f6c29caef9031388d51944b0bc1282754122be
Author: Michael Meeks
AuthorDate: Thu Jul 25 19:02:47 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 19:19:57 2019 -0400
clipboard: repair unit test so they run in the lok mode.
SwTransferable::AddSupportedFormats needs kit to be active.
Change-Id: I5a0299fb72cbdc4e135185b57e3a1af5e32e8779
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 7ad2f1e45817..39be487931f3 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2635,6 +2635,9 @@ void DesktopLOKTest::testShowHideDialog()
void DesktopLOKTest::testComplexSelection()
{
+// needed for SwTransferable to cope with the selection.
+comphelper::LibreOfficeKit::setActive();
+
// Start with a blank text file and add contents.
LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
static const OString aText("hello world");
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 37f7899be01f..6e2ca6d37a07 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -878,7 +878,6 @@ ITiledRenderable*
getTiledRenderable(LibreOfficeKitDocument* pThis)
* we also need to ensure that this works for the first view which
* has no clear 'createView' called for it (unfortunately).
*/
-
rtl::Reference
forceSetClipboardForCurrentView(LibreOfficeKitDocument *pThis)
{
ITiledRenderable* pDoc = getTiledRenderable(pThis);
commit 2f6c74ad88047e682197d479c77beadab5c3e7d6
Author: Ashod Nakashian
AuthorDate: Mon Jul 22 19:00:23 2019 -0400
Commit: Michael Meeks
CommitDate: Fri Jul 26 19:19:57 2019 -0400
clipboard: log before erasing
Change-Id: I6d59cdd31c62bbc7db81ccb8985745f68d19cd28
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 7eefd09370d1..f44f4e9fed81 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -51,8 +51,8 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
auto it = gClipboards.get()->find(nViewId);
if (it != gClipboards.get()->end())
{
+SAL_INFO("lok", "Releasing clip: " << it->second.get() << " for
destroyed " << nViewId);
gClipboards.get()->erase(it);
-SAL_INFO("lok", "Released clip: " << it->second.get() << " for
destroyed " << nViewId);
}
}
}
commit 9a449868c2f9ab743bb242ba0794bcb30df08fdb
Author: Michael Meeks
AuthorDate: Tue Jul 23 09:49:11 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 19:19:57 2019 -0400
clipboard: check for null.
Change-Id: I07060035a9744642c98d4a0946695408dc0f6b42
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 3285965c846f..7eefd09370d1 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -37,7 +37,6 @@ rtl::Reference
LOKClipboardFactory::getClipboardForCurView()
return xClip;
}
-/// FIXME: should really copy and stash its content for a bit.
void LOKClipboardFactory::releaseClipboardForView(int nViewId)
{
osl::MutexGuard aGuard(gMutex);
@@ -47,7 +46,7 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
gClipboards.get()->clear();
SAL_INFO("lok", "Released all clipboards on doc destroy\n");
}
-else
+else if (gClipboards.get())
{
auto it = gClipboards.get()->find(nViewId);
if (it != gClipboards.get()->end())
commit 42cff5d9bd2f350ee00306e9895571ccd7d14e3d
Author: Michael Meeks
AuthorDate: Mon Jul 22 09:48:46 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 19:19:57 2019 -0400
lok: share more of the clipboard mime-type handling code.
Change-Id: I98fc9fa0fd1b5afa00c33b642d2d504eab0b62ba
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 17a9c5c54e4f..3285965c846f 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -189,20 +189,7 @@ LOKTransferable::LOKTransferable(const size_t nInCount,
const char** pInMimeType
m_aFlavors = css::uno::Sequence(nInCount);
for (size_t i = 0; i < nInCount; ++i)
{
-OUString aMimeType = OUString::fromUtf8(pInMimeTypes[i]);
-
-// cf. sot/source/base/exchange.cxx for these two exceptional types.
-if (aMimeType.startsWith("text/plain"))
-{
-aMimeType = "text/plain;charset=utf-16";
-m_aFlavors[i].DataType = cppu::UnoType::get();
-}
-else if (aMimeType == "application/x-libreoffice-tsvc")
-m_aFlavors[i].DataType = cppu::UnoType::get();
-else
-m_aFlavors[i].DataType =
cppu::UnoType>::get();
-m_aFlavors[i].MimeType = aMimeType;
-
[Libreoffice-bugs] [Bug 126555] UI: "Distribution…" menu is missing
https://bugs.documentfoundation.org/show_bug.cgi?id=126555 --- Comment #6 from Konstantin Kharlamov --- (In reply to Konstantin Kharlamov from comment #5) > Ah, I see, nvm: the option only appears when there's more than 3 items > selected. *three or more items selected. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126555] UI: "Distribution…" menu is missing
https://bugs.documentfoundation.org/show_bug.cgi?id=126555 --- Comment #5 from Konstantin Kharlamov --- (In reply to Konstantin Kharlamov from comment #4) > (In reply to V Stuart Foote from comment #2) > > Not missing, the button action is on resident on the Drawing toolbar (and > > several Notebook Bar panels) but it is available to add by customization to > > the Context menu. > > > > Done simply: > > > > Impress (or Draw) session, Tools -> Customize -> "Context menus" tab > > > > Select "Target" as 'Shape' via droplist (on opening it is pointint to 3D > > Object) > > > > In "Search" box type "distri", select the "Distribution" widget > > > > Use the "Add item" arrow to move the "Distribution" widget into the context > > menu. > > > > Use the "Move up"/"Move up" arrows to position where you prefer. > > > > OK out. May need to close Impress session at 6.2, immediate for current > > master/6.4 > > > > Context menu action is then available to distribute shapes via the popup > > "Distribution" dialog. > > I just did that, restarted, and menu is still missing. I can see it in > "Customize" below "Convert", but it's not in context menu. > > Also, I found the "Distribution" icon you mentioned on the drawing toolbar, > and it's grayed out when I select the rectangles. Does it behave for you > differently? Ah, I see, nvm: the option only appears when there's more than 3 items selected. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126555] UI: "Distribution…" menu is missing
https://bugs.documentfoundation.org/show_bug.cgi?id=126555 --- Comment #4 from Konstantin Kharlamov --- (In reply to V Stuart Foote from comment #2) > Not missing, the button action is on resident on the Drawing toolbar (and > several Notebook Bar panels) but it is available to add by customization to > the Context menu. > > Done simply: > > Impress (or Draw) session, Tools -> Customize -> "Context menus" tab > > Select "Target" as 'Shape' via droplist (on opening it is pointint to 3D > Object) > > In "Search" box type "distri", select the "Distribution" widget > > Use the "Add item" arrow to move the "Distribution" widget into the context > menu. > > Use the "Move up"/"Move up" arrows to position where you prefer. > > OK out. May need to close Impress session at 6.2, immediate for current > master/6.4 > > Context menu action is then available to distribute shapes via the popup > "Distribution" dialog. I just did that, restarted, and menu is still missing. I can see it in "Customize" below "Convert", but it's not in context menu. Also, I found the "Distribution" icon you mentioned on the drawing toolbar, and it's grayed out when I select the rectangles. Does it behave for you differently? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126572] connectors from draw/impress are not exported to .pptx
https://bugs.documentfoundation.org/show_bug.cgi?id=126572 andreas_k changed: What|Removed |Added CC||kain...@gmail.com --- Comment #1 from andreas_k --- Created attachment 153003 --> https://bugs.documentfoundation.org/attachment.cgi?id=153003=edit impress export pptx file the connectors are not saved. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126573] New: Add array functions in Calc: FILTER, SORT, SORTBY, UNIQUE, SEQUENCE, RANDARRAY
https://bugs.documentfoundation.org/show_bug.cgi?id=126573 Bug ID: 126573 Summary: Add array functions in Calc: FILTER, SORT, SORTBY, UNIQUE, SEQUENCE, RANDARRAY Product: LibreOffice Version: 6.2.5.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: gerry.trep...@googlemail.com Description: There are some array features in spreadsheets which recently have been added to Excel. These functions make lots of sense and they remind me of statistical software (e.g. Stata) which have very similar functions: FILTER, SORT, SORTBY, UNIQUE, SEQUENCE, RANDARRAY https://support.office.com/en-us/article/new-array-functions-003df6c7-1dcb-4388-8e2e-0fe77a0887bc?ui=en-US=en-US=US Steps to Reproduce: . Actual Results: . Expected Results: . Reproducible: Always User Profile Reset: No Additional Info: -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126572] New: connectors from draw/impress are not exported to .pptx
https://bugs.documentfoundation.org/show_bug.cgi?id=126572 Bug ID: 126572 Summary: connectors from draw/impress are not exported to .pptx Product: Document Liberation Project Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: libvisio Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: kain...@gmail.com Created attachment 153002 --> https://bugs.documentfoundation.org/attachment.cgi?id=153002=edit impress file if you draw shapes and connect them with connectors, the connectors are not visible. attached the impress file -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126557] Calc refresh of pivot table overwrites formatting and no undo
https://bugs.documentfoundation.org/show_bug.cgi?id=126557 m.a.riosv changed: What|Removed |Added CC||miguelangelrv@libreoffice.o ||rg --- Comment #5 from m.a.riosv --- Maybe the no undo can be a bug, but not that pivot table styles are applied con it's updated, this way it's how it works. As Oliver point same approximation can be done modifying pivot table styles. But seems the last solution it's broken e.g. modifying color background for a pivot table style works, but not number format that it's inherited from source cells. (LibreOffice 3.5.7.2 ) The last it's a regression from LibreOffice 3.3.0 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71058] EDITING: Cut and paste special with transposing does not shift formula links
https://bugs.documentfoundation.org/show_bug.cgi?id=71058 --- Comment #19 from Ralf --- The bug is still present without changes in version 6.3.0.2 (x64, Windows 10). -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 125767] Unable to drag and drop fields when creating a pivot table
https://bugs.documentfoundation.org/show_bug.cgi?id=125767 --- Comment #17 from zeem...@gmail.com --- Caolán McNamara - Thank you. Responding to Comment 16, I can confirm that on the impacted Chromebooks, gedit works (drag & drop) and as previously noted in Comment 11, earlier versions of LibreOffice work fine as well. I currently use LibreOffice 6.0.6.2 as that is the latest version I have found where the general drag and drop of cells, and Pivot Table layout dialog-box are both working in CALC. Given your Comment 15, I am wondering how I can figure out if there is some older gtk3 module on the affected systems that the latest LibreOffice is picking up instead of 3.22.11-1. I'm not enough of a linux wizard to know how to check that, but I do see a long list when I run dpkg -l *gtk3* -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/lok-clipboard' - 18 commits - desktop/qa desktop/source include/LibreOfficeKit sc/source sfx2/source sw/source vcl/source
Rebased ref, commits from common ancestor:
commit 111e7a59f7b415c21115e2eb31dc5e2a4e8ecb17
Author: Michael Meeks
AuthorDate: Thu Jul 25 19:02:47 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 16:38:39 2019 -0400
clipboard: repair unit test to be run in lok mode.
SwTransferable::AddSupporteFormats needs kit to be active.
Change-Id: I1e494edcb857399ca4e981fcf716d0204653ba3d
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 7ad2f1e45817..39be487931f3 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2635,6 +2635,9 @@ void DesktopLOKTest::testShowHideDialog()
void DesktopLOKTest::testComplexSelection()
{
+// needed for SwTransferable to cope with the selection.
+comphelper::LibreOfficeKit::setActive();
+
// Start with a blank text file and add contents.
LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
static const OString aText("hello world");
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 37f7899be01f..6e2ca6d37a07 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -878,7 +878,6 @@ ITiledRenderable*
getTiledRenderable(LibreOfficeKitDocument* pThis)
* we also need to ensure that this works for the first view which
* has no clear 'createView' called for it (unfortunately).
*/
-
rtl::Reference
forceSetClipboardForCurrentView(LibreOfficeKitDocument *pThis)
{
ITiledRenderable* pDoc = getTiledRenderable(pThis);
commit 06c9fe38702e6f9167392ebc50d0dff1164c371c
Author: Ashod Nakashian
AuthorDate: Mon Jul 22 19:00:23 2019 -0400
Commit: Michael Meeks
CommitDate: Fri Jul 26 16:38:38 2019 -0400
clipboard: log before erasing
Change-Id: I6d59cdd31c62bbc7db81ccb8985745f68d19cd28
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 7eefd09370d1..f44f4e9fed81 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -51,8 +51,8 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
auto it = gClipboards.get()->find(nViewId);
if (it != gClipboards.get()->end())
{
+SAL_INFO("lok", "Releasing clip: " << it->second.get() << " for
destroyed " << nViewId);
gClipboards.get()->erase(it);
-SAL_INFO("lok", "Released clip: " << it->second.get() << " for
destroyed " << nViewId);
}
}
}
commit 27127e3b168c7ae4cae827efb99b6338ea867f23
Author: Michael Meeks
AuthorDate: Tue Jul 23 09:49:11 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 16:38:37 2019 -0400
clipboard: check for null.
Change-Id: I07060035a9744642c98d4a0946695408dc0f6b42
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 3285965c846f..7eefd09370d1 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -37,7 +37,6 @@ rtl::Reference
LOKClipboardFactory::getClipboardForCurView()
return xClip;
}
-/// FIXME: should really copy and stash its content for a bit.
void LOKClipboardFactory::releaseClipboardForView(int nViewId)
{
osl::MutexGuard aGuard(gMutex);
@@ -47,7 +46,7 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
gClipboards.get()->clear();
SAL_INFO("lok", "Released all clipboards on doc destroy\n");
}
-else
+else if (gClipboards.get())
{
auto it = gClipboards.get()->find(nViewId);
if (it != gClipboards.get()->end())
commit 2749cb5ea4ca0d6cdd13bb7e38b958f5d3d59641
Author: Michael Meeks
AuthorDate: Mon Jul 22 09:48:46 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 16:38:36 2019 -0400
lok: share more of the clipboard mime-type handling code.
Change-Id: I98fc9fa0fd1b5afa00c33b642d2d504eab0b62ba
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 17a9c5c54e4f..3285965c846f 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -189,20 +189,7 @@ LOKTransferable::LOKTransferable(const size_t nInCount,
const char** pInMimeType
m_aFlavors = css::uno::Sequence(nInCount);
for (size_t i = 0; i < nInCount; ++i)
{
-OUString aMimeType = OUString::fromUtf8(pInMimeTypes[i]);
-
-// cf. sot/source/base/exchange.cxx for these two exceptional types.
-if (aMimeType.startsWith("text/plain"))
-{
-aMimeType = "text/plain;charset=utf-16";
-m_aFlavors[i].DataType = cppu::UnoType::get();
-}
-else if (aMimeType == "application/x-libreoffice-tsvc")
-m_aFlavors[i].DataType = cppu::UnoType::get();
-else
-m_aFlavors[i].DataType =
cppu::UnoType>::get();
-m_aFlavors[i].MimeType = aMimeType;
-
[Libreoffice-bugs] [Bug 126571] New: LO Writer CRASH when pasting a column to a table within LO Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=126571 Bug ID: 126571 Summary: LO Writer CRASH when pasting a column to a table within LO Writer Product: LibreOffice Version: 6.4.0.0.alpha0+ Master Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: adalbert.hans...@gmx.de This Crash happened in LibreOfficeWriter Version: 6.4.0.0.alpha0+ Build ID: 4248d759744f83a68d334a8b347124719a2886a8 CPU threads: 4; OS: Linux 4.4; UI render: default; VCL: gtk3; TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:master, Time: 2019-07-09_15:00:58 Locale: de-DE (de_DE.UTF-8); UI-Language: en-US Calc: threaded I had a document consisting of 196 paragraphs (ca 30 pages). Then I used Table>Convert>Text to table to make a table with one paragraph per cell (1 column), for this purpose I selected the paragraph marker for Separate Text At. Then I added a column left to the one column table. The purpose of this column is to number the paragraphs consecutively in this leftmost column. Then I added another column to the right in order to provide space to comment each cell in the middle. Then I adjusted the column width to meet my objectives. I tried to apply consecutive numbering to the first column. For this purpose I entered the numbers 1, 2, 3, 4, to the first four cells. Then I selected these cells and wanted to extend the numbering as one does in a spreadsheet application. Sometimes this is possible in tables which are part of a LO Writer document: Then the usual controls around the table show up like in a spreadsheet application like LibreOfficeCalc. However it did not do that. My next idea to apply consecutive ordering was to copy all cells to LibreOfficeCalc by selecting them all and using the clipboard. I added the numbers 1, 2, 3, 4 to the cells A1, …, A4. Then I selected these cells and extended the numbering downward to the end of the table (i.e. to A196 in my case). Then I did Ctl-C to copy this column to the clipboard. Formatting the whole LO Writer document had cost me quite some effort and I did not want to loose that. Therefore I tried to paste the clipboard to the table in the LO Writer document to the first column. For this purpose I first marked the first column. There was an empty paragraph in each of them. For some strange reason the cells had inherited the paragraph style from the (original) column right to it. But I did not want paragraphs with indentation or bullets there, therefore I first set them all to Default Style and also I specifically switched off any bullets for all the paragraphs in the first column. Then LO Writer crashed and showed me this message: Due to an error.LibreOgfficeDev crashed. All the files you were working on will now be saved. The next time LibreOfficeDev is launched, your files will be recovered automatically. The following files will be recovered (and it showed me the three files which were open in LibreOfficeDev at that moment). The next message was: Unfortunately it seems that LibreOfficeDev crashed when it was last run. You can help us to fix this issue by sending an anonymous report to the LibreOfficeDev crash reporting server. Then an option to restart LibreOfficeDev in safe mode (which I did not check). I selected “Send Crash Report”. The next thing was a crash report dialogue. I already complained about this type of dialogue earlier in https://bugs.documentfoundation.org/show_bug.cgi?id=126488 and showed a picture of it there. I hope the crash reporting server got the crash report and hopefully you can associate it with my bug report now. Unfortunately until now, nobody could tell me where to really find the crash dump file on my Xubuntu 16.04.4 computer. In fact, I was told there is no crash report on the type of version which I was using. However, there was this message! If I knew where the crash dump is, I would like to add it. Unfortunately the dialogue above did not even tell which kind of bug it was nor in which module it happened! So if anyone could please tell me which additional file is necessary to pin down this bug, I would like to provide it. But I can not provide the file with which the bug happened. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sfx2/source
sfx2/source/doc/objmisc.cxx | 29 -
1 file changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 0344b7684753876a3148a47d1e131a1b13595f63
Author: Caolán McNamara
AuthorDate: Fri Jul 26 13:25:31 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 26 22:36:12 2019 +0200
decode url escape codes and check each path segment
Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1
Reviewed-on: https://gerrit.libreoffice.org/76395
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 0e188b925784..8a6ff1b41611 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -43,6 +43,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -1347,7 +1349,32 @@ namespace
// don't allow LibreLogo to be used with our mouseover/etc dom-alike events
bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL)
{
-return
rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo");
+if (!rScriptURL.startsWith("vnd.sun.star.script:"))
+return false;
+
+// ensure URL Escape Codes are decoded
+css::uno::Reference uri(
+
css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())->parse(rScriptURL));
+css::uno::Reference sfUri(uri,
css::uno::UNO_QUERY);
+
+if (!sfUri.is())
+return false;
+
+OUString sScript = sfUri->getName();
+
+// check if any path portion matches LibreLogo and ban it if it does
+sal_Int32 nIndex = 0;
+do
+{
+OUString aToken = sScript.getToken(0, '/', nIndex);
+if (aToken.startsWithIgnoreAsciiCase("LibreLogo"))
+{
+return true;
+}
+}
+while (nIndex >= 0);
+
+return false;
}
ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >&
_rxScriptContext, const OUString& _rScriptURL,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 108743] [META] Find toolbar bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108743 V Stuart Foote changed: What|Removed |Added Depends on||126568 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=126568 [Bug 126568] Search bar MatchCase shortcut ~m does not work -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126568] Search bar MatchCase shortcut ~m does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=126568 V Stuart Foote changed: What|Removed |Added CC||mikekagan...@hotmail.com, ||momonas...@gmail.com Blocks|102847 |108743 See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=11 ||4557 --- Comment #2 from V Stuart Foote --- Apparently Match Case widget in the Find Bar is an odd tb control (ref 114557). Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=102847 [Bug 102847] [META] Quick Find, Search and Replace https://bugs.documentfoundation.org/show_bug.cgi?id=108743 [Bug 108743] [META] Find toolbar bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 102847] [META] Quick Find, Search and Replace
https://bugs.documentfoundation.org/show_bug.cgi?id=102847 V Stuart Foote changed: What|Removed |Added Depends on|126568 | Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=126568 [Bug 126568] Search bar MatchCase shortcut ~m does not work -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 114557] 'Match Case' checkbox in Find toolbar cannot be renamed and icon cannot be set
https://bugs.documentfoundation.org/show_bug.cgi?id=114557 V Stuart Foote changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=12 ||6568 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/IconThemeSelector.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 43b58a829b3ffdb6169cebe657fd00df69877a71
Author: Tor Lillqvist
AuthorDate: Fri Mar 29 16:32:01 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Jul 26 21:57:58 2019 +0200
Use the colibre icon theme in Online and apps
Change-Id: Idb79b3d4b1f14712f2e03d17fca6bec56f317edf
Reviewed-on: https://gerrit.libreoffice.org/76379
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/app/IconThemeSelector.cxx
b/vcl/source/app/IconThemeSelector.cxx
index ff2dcc52805a..bf3953b755ba 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
+
#include
#include
@@ -50,6 +52,9 @@ IconThemeSelector::IconThemeSelector()
/*static*/ OUString
IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString&
desktopEnvironment)
{
+if (comphelper::LibreOfficeKit::isActive())
+return OUString("colibre");
+
#ifdef _WIN32
(void)desktopEnvironment;
return OUString("colibre");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig
include/sfx2/printopt.hxx| 65 +++--
sfx2/source/dialog/printopt.cxx | 278 +++
sfx2/uiconfig/ui/optprintpage.ui | 11 -
3 files changed, 146 insertions(+), 208 deletions(-)
New commits:
commit caa14001431d9b2b50dae95c7539e1ec5d40c249
Author: Caolán McNamara
AuthorDate: Fri Jul 26 15:50:41 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 26 21:38:23 2019 +0200
weld SfxCommonPrintOptionsTabPage
Change-Id: I11fa5e3b39b7ab0142192c293205dc8e23caaa0c
Reviewed-on: https://gerrit.libreoffice.org/76386
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 996a32e45c27..87a8638174d0 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -35,47 +35,41 @@ class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage : public
SfxTabPage
{
private:
-VclPtrm_pPrinterOutputRB;
-VclPtrm_pPrintFileOutputRB;
-
-VclPtr m_pReduceTransparencyCB;
-VclPtrm_pReduceTransparencyAutoRB;
-VclPtrm_pReduceTransparencyNoneRB;
-
-VclPtr m_pReduceGradientsCB;
-VclPtrm_pReduceGradientsStripesRB;
-VclPtrm_pReduceGradientsColorRB;
-VclPtr m_pReduceGradientsStepCountNF;
-
-VclPtr m_pReduceBitmapsCB;
-VclPtrm_pReduceBitmapsOptimalRB;
-VclPtrm_pReduceBitmapsNormalRB;
-VclPtrm_pReduceBitmapsResolutionRB;
-VclPtrm_pReduceBitmapsResolutionLB;
-VclPtr m_pReduceBitmapsTransparencyCB;
-
-VclPtr m_pConvertToGreyscalesCB;
-
-VclPtr m_pPDFCB;
-
-VclPtr m_pPaperSizeCB;
-VclPtr m_pPaperOrientationCB;
-VclPtr m_pTransparencyCB;
+std::unique_ptr m_xPrinterOutputRB;
+std::unique_ptr m_xPrintFileOutputRB;
+std::unique_ptr m_xReduceTransparencyCB;
+std::unique_ptr m_xReduceTransparencyAutoRB;
+std::unique_ptr m_xReduceTransparencyNoneRB;
+std::unique_ptr m_xReduceGradientsCB;
+std::unique_ptr m_xReduceGradientsStripesRB;
+std::unique_ptr m_xReduceGradientsColorRB;
+std::unique_ptr m_xReduceGradientsStepCountNF;
+std::unique_ptr m_xReduceBitmapsCB;
+std::unique_ptr m_xReduceBitmapsOptimalRB;
+std::unique_ptr m_xReduceBitmapsNormalRB;
+std::unique_ptr m_xReduceBitmapsResolutionRB;
+std::unique_ptr m_xReduceBitmapsResolutionLB;
+std::unique_ptr m_xReduceBitmapsTransparencyCB;
+std::unique_ptr m_xConvertToGreyscalesCB;
+std::unique_ptr m_xPDFCB;
+std::unique_ptr m_xPaperSizeCB;
+std::unique_ptr m_xPaperOrientationCB;
+std::unique_ptr m_xTransparencyCB;
private:
PrinterOptions maPrinterOptions;
PrinterOptions maPrintFileOptions;
-DECL_DLLPRIVATE_LINK( ToggleOutputPrinterRBHdl,
RadioButton&, void );
-DECL_DLLPRIVATE_LINK( ToggleOutputPrintFileRBHdl,
RadioButton&, void);
+DECL_DLLPRIVATE_LINK( ToggleOutputPrinterRBHdl,
weld::ToggleButton&, void );
+DECL_DLLPRIVATE_LINK( ToggleOutputPrintFileRBHdl,
weld::ToggleButton&, void);
-DECL_DLLPRIVATE_LINK( ClickReduceTransparencyCBHdl,
Button*, void );
-DECL_DLLPRIVATE_LINK( ClickReduceGradientsCBHdl,
Button*, void );
-DECL_DLLPRIVATE_LINK( ClickReduceBitmapsCBHdl,
Button*, void );
+DECL_DLLPRIVATE_LINK( ClickReduceTransparencyCBHdl,
weld::Button&, void );
+DECL_DLLPRIVATE_LINK( ClickReduceGradientsCBHdl,
weld::Button&, void );
+DECL_DLLPRIVATE_LINK( ClickReduceBitmapsCBHdl,
weld::Button&, void );
-DECL_DLLPRIVATE_LINK(
ToggleReduceGradientsStripesRBHdl, RadioButton&, void );
-DECL_DLLPRIVATE_LINK(
ToggleReduceBitmapsResolutionRBHdl, RadioButton&, void );
+DECL_DLLPRIVATE_LINK(
ToggleReduceGradientsStripesRBHdl, weld::ToggleButton&, void );
+DECL_DLLPRIVATE_LINK(
ToggleReduceBitmapsResolutionRBHdl, weld::ToggleButton&, void );
SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions*
pCurrentOptions );
SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions );
@@ -87,13 +81,10 @@ protected:
public:
-SfxCommonPrintOptionsTabPage( vcl::Window* pParent,
const SfxItemSet& rSet );
+SfxCommonPrintOptionsTabPage(TabPageParent pParent,
const SfxItemSet& rSet);
virtual ~SfxCommonPrintOptionsTabPage() override;
-virtual voiddispose() override;
virtual boolFillItemSet( SfxItemSet* rSet ) override;
virtual voidReset( const SfxItemSet* rSet ) override;
-virtual vcl::Window*
[Libreoffice-commits] core.git: qadevOOo/tests
qadevOOo/tests/java/mod/_remotebridge/various.java | 40 -
1 file changed, 40 deletions(-)
New commits:
commit 130c2b80520b92353d9e1fc4626277bab9af3b6c
Author: Caolán McNamara
AuthorDate: Fri Jul 26 09:02:24 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 26 21:37:09 2019 +0200
cid#1448357 RV: Bad use of return value
Change-Id: I7bbc81e0b01e90c368a29ac505418471f640cdf6
Reviewed-on: https://gerrit.libreoffice.org/76360
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java
b/qadevOOo/tests/java/mod/_remotebridge/various.java
index c18d6a4ef1eb..21f3c0892955 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -76,44 +76,6 @@ public class various extends TestCase {
public XInterface bridge = null;
/**
- * Implementation of interface XInstanceProvider
- *
- * @see com.sun.star.bridge.XInstanceProvider
- */
-private static class MyInstanceProvider implements XInstanceProvider {
-/**
- * a MultiServiceFactory for creating instances
- *
- * @see com.sun.star.lang.MultiServiceFactory
- */
-private final XMultiServiceFactory xMSF;
-
-/**
- * Construct object with a MultiServiceFactory
- *
- * @see com.sun.star.lang.MultiServiceFactory
- */
-private MyInstanceProvider(XMultiServiceFactory xMSF) {
-this.xMSF = xMSF;
-}
-
-/**
- * get an instance by name
- */
-public Object getInstance(String aInstanceName)
-throws com.sun.star.container.NoSuchElementException
-{
-System.out.println(" Try to get "+aInstanceName);
-try {
-return xMSF.createInstance(aInstanceName);
-}
-catch(com.sun.star.uno.Exception e) {
-throw new StatusException("Unexpected exception", e);
-}
-}
-}
-
-/**
* Calls accept() method in a separate thread.
* Then stores exception thrown by call if it occurred, or
* return value.
@@ -196,8 +158,6 @@ public class various extends TestCase {
"com.sun.star.bridge.BridgeFactory") ;
xBrdgFctr = UnoRuntime.queryInterface(XBridgeFactory.class, oBrdg);
-// create own implementation of XInstanceProvider
-new MyInstanceProvider(xMSF);
// create waiting acceptor thread
accThread = new AcceptorThread(xAcctr);
accThread.start();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/tests
qadevOOo/tests/java/mod/_fwl/FilterFactory.java |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 8b533ac06c302c68ccc78552ab3b9ef578c3e8d9
Author: Caolán McNamara
AuthorDate: Fri Jul 26 09:10:34 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 26 21:24:03 2019 +0200
cid#1448221 RV: Bad use of return value
Change-Id: I3284cf35b28edc1fb08579f707bbf76fcde8b054
Reviewed-on: https://gerrit.libreoffice.org/76362
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
index 9d21625f331d..1ed9869b1832 100644
--- a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
+++ b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
@@ -79,11 +79,7 @@ public class FilterFactory extends TestCase {
// XNameContainer; XNameReplace
String filterName = filterNames[0];
-Object[] instance = null;
-new PropertyValue();
-instance = (Object[]) xNA.getByName(filterName);
-getPropertyValue
-(((PropertyValue[]) instance), "FilterService");
+Object[] instance = (Object[]) xNA.getByName(filterName);
log.println("adding INSTANCE 1 as obj relation to environment");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 102847] [META] Quick Find, Search and Replace
https://bugs.documentfoundation.org/show_bug.cgi?id=102847 V Stuart Foote changed: What|Removed |Added Depends on||126568 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=126568 [Bug 126568] Search bar MatchCase shortcut ~m does not work -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126568] Search bar MatchCase shortcut ~m does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=126568 V Stuart Foote changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=38 ||328 Blocks||102847 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=102847 [Bug 102847] [META] Quick Find, Search and Replace -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113869] [META] MS Office XML formats (pre-OOXML) bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=113869 Kohei Yoshida changed: What|Removed |Added Depends on||126515 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=126515 [Bug 126515] FILEOPEN: Cannot open XML (Excel) with style parent ref. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126515] FILEOPEN: Cannot open XML (Excel) with style parent ref.
https://bugs.documentfoundation.org/show_bug.cgi?id=126515 Kohei Yoshida changed: What|Removed |Added Blocks||113869 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=113869 [Bug 113869] [META] MS Office XML formats (pre-OOXML) bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/base/java_fat.java |2 --
1 file changed, 2 deletions(-)
New commits:
commit 51d95cb212cf94097267f84f82901ef757bc148d
Author: Caolán McNamara
AuthorDate: Fri Jul 26 09:00:26 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 26 20:57:58 2019 +0200
cid#1448386 RV: Bad use of return value
Change-Id: I91a344a1b106651a9cb0ae3005f98927bf1b7f7c
Reviewed-on: https://gerrit.libreoffice.org/76359
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/qadevOOo/runner/base/java_fat.java
b/qadevOOo/runner/base/java_fat.java
index c85103508cbe..bd21b0861752 100644
--- a/qadevOOo/runner/base/java_fat.java
+++ b/qadevOOo/runner/base/java_fat.java
@@ -142,8 +142,6 @@ public class java_fat implements TestBase {
continue;
}
-tCase.getObjectName();
-
for (int j = 0; j < entry.SubEntryCount; j++) {
DescEntry aSubEntry = entry.SubEntries[j];
final boolean bIsToTest = aSubEntry.isToTest;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/lok-clipboard' - 147 commits - basctl/source basic/source configure.ac connectivity/source cppu/source cui/inc cui/IwyuFilter_cui.yaml cui/Library_cui.m
Rebased ref, commits from common ancestor:
commit 6284669caee4bd11435a02f97c0407e97554eda9
Author: Michael Meeks
AuthorDate: Thu Jul 25 19:02:47 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 14:58:31 2019 -0400
clipboard: repair unit test to be run in lok mode.
SwTransferable::AddSupporteFormats needs kit to be active.
Change-Id: I1e494edcb857399ca4e981fcf716d0204653ba3d
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 7ad2f1e45817..39be487931f3 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2635,6 +2635,9 @@ void DesktopLOKTest::testShowHideDialog()
void DesktopLOKTest::testComplexSelection()
{
+// needed for SwTransferable to cope with the selection.
+comphelper::LibreOfficeKit::setActive();
+
// Start with a blank text file and add contents.
LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
static const OString aText("hello world");
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bcccf8fe2aa2..886670a7a035 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -878,7 +878,6 @@ ITiledRenderable*
getTiledRenderable(LibreOfficeKitDocument* pThis)
* we also need to ensure that this works for the first view which
* has no clear 'createView' called for it (unfortunately).
*/
-
rtl::Reference
forceSetClipboardForCurrentView(LibreOfficeKitDocument *pThis)
{
ITiledRenderable* pDoc = getTiledRenderable(pThis);
commit 1fe847804c0e55a58b1adfc50e0cb7bcd009e230
Author: Ashod Nakashian
AuthorDate: Mon Jul 22 19:00:23 2019 -0400
Commit: Michael Meeks
CommitDate: Fri Jul 26 14:58:30 2019 -0400
clipboard: log before erasing
Change-Id: I6d59cdd31c62bbc7db81ccb8985745f68d19cd28
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 7eefd09370d1..f44f4e9fed81 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -51,8 +51,8 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
auto it = gClipboards.get()->find(nViewId);
if (it != gClipboards.get()->end())
{
+SAL_INFO("lok", "Releasing clip: " << it->second.get() << " for
destroyed " << nViewId);
gClipboards.get()->erase(it);
-SAL_INFO("lok", "Released clip: " << it->second.get() << " for
destroyed " << nViewId);
}
}
}
commit 58b098af59c04b5b5e00ce8c44a1b4b31a4e48ae
Author: Michael Meeks
AuthorDate: Tue Jul 23 09:49:11 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 14:58:30 2019 -0400
clipboard: check for null.
Change-Id: I07060035a9744642c98d4a0946695408dc0f6b42
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 3285965c846f..7eefd09370d1 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -37,7 +37,6 @@ rtl::Reference
LOKClipboardFactory::getClipboardForCurView()
return xClip;
}
-/// FIXME: should really copy and stash its content for a bit.
void LOKClipboardFactory::releaseClipboardForView(int nViewId)
{
osl::MutexGuard aGuard(gMutex);
@@ -47,7 +46,7 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
gClipboards.get()->clear();
SAL_INFO("lok", "Released all clipboards on doc destroy\n");
}
-else
+else if (gClipboards.get())
{
auto it = gClipboards.get()->find(nViewId);
if (it != gClipboards.get()->end())
commit 50b9c21752c8fc19165c7224fb9312dccec4d21b
Author: Michael Meeks
AuthorDate: Mon Jul 22 09:48:46 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 14:58:30 2019 -0400
lok: share more of the clipboard mime-type handling code.
Change-Id: I98fc9fa0fd1b5afa00c33b642d2d504eab0b62ba
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 17a9c5c54e4f..3285965c846f 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -189,20 +189,7 @@ LOKTransferable::LOKTransferable(const size_t nInCount,
const char** pInMimeType
m_aFlavors = css::uno::Sequence(nInCount);
for (size_t i = 0; i < nInCount; ++i)
{
-OUString aMimeType = OUString::fromUtf8(pInMimeTypes[i]);
-
-// cf. sot/source/base/exchange.cxx for these two exceptional types.
-if (aMimeType.startsWith("text/plain"))
-{
-aMimeType = "text/plain;charset=utf-16";
-m_aFlavors[i].DataType = cppu::UnoType::get();
-}
-else if (aMimeType == "application/x-libreoffice-tsvc")
-m_aFlavors[i].DataType = cppu::UnoType::get();
-else
-m_aFlavors[i].DataType =
cppu::UnoType>::get();
-m_aFlavors[i].MimeType = aMimeType;
-
[Libreoffice-bugs] [Bug 126570] Animate GIF becomes static while playing an Impress presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=126570 Volga changed: What|Removed |Added Blocks||108438 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=108438 [Bug 108438] [META] Animated image bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108438] [META] Animated image bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108438 Volga changed: What|Removed |Added Depends on||126570 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=126570 [Bug 126570] Animate GIF becomes static while playing an Impress presentation -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126570] New: Animate GIF becomes static while playing an Impress presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=126570 Bug ID: 126570 Summary: Animate GIF becomes static while playing an Impress presentation Product: LibreOffice Version: 6.3.0.2 rc Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: shanshandehongx...@outlook.com Description: While I try to play an Impress presentation (.odp), I saw GIF doesn't work on screen. Steps to Reproduce: 1. Open attachment 147130 2. Press F5 to play Actual Results: Before I play the presentation, I can see an animation of playing violin works proper, but while I playing the presentation, it becomes a static image, the bow doesn't move. Expected Results: Animate GIF ahould works while playing an Impress presentation Reproducible: Always User Profile Reset: No Additional Info: 版本: 6.3.0.2 (x64) Build ID: 728469fa359ba8c83d812146293a0b0aa53945ba CPU 线程: 4; 操作系统: Windows 10.0; UI 渲染: 默认; VCL: win; 区域语言: zh-CN (zh_CN); UI 语言: zh-CN Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126569] Animate GIF becomes static while playing an Impress presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=126569 Volga changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |INVALID -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126568] Search bar MatchCase shortcut ~m does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=126568 V Stuart Foote changed: What|Removed |Added CC||vstuart.fo...@utsa.edu Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from V Stuart Foote --- Confirmed on Windows 10 Ent 64-bit en-US (1803) with Version: 6.4.0.0.alpha0+ (x86) Build ID: a675fe37abc134cc5cbf54385ca99c8d1417ce2b CPU threads: 8; OS: Windows 10.0; UI render: GL; VCL: win; TinderBox: Win-x86@42, Branch:master, Time: 2019-07-26_09:09:34 Locale: en-US (en_US); UI-Language: en-US Calc: CL IIUC the checkbox widget comes from the +H Find dialog, there the widget correctly responds to its accelerator. So, guess the the issue is difference in checkbox controls between dialog and toolbar instances. The to position, and to select the checkbox works--so not locked out of the tool. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 104238] [META] Impress image bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=104238 Bug 104238 depends on bug 126569, which changed state. Bug 126569 Summary: Animate GIF becomes static while playing an Impress presentation https://bugs.documentfoundation.org/show_bug.cgi?id=126569 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |INVALID -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108438] [META] Animated image bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108438 Bug 108438 depends on bug 126569, which changed state. Bug 126569 Summary: Animate GIF becomes static while playing an Impress presentation https://bugs.documentfoundation.org/show_bug.cgi?id=126569 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |INVALID -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126569] Animate GIF becomes static while playing an Impress presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=126569 --- Comment #1 from Volga --- Also reproduced with attachment 147130. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126569] Animate GIF becomes static while playing an Impress presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=126569 Volga changed: What|Removed |Added Blocks||104238, 108438 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=104238 [Bug 104238] [META] Impress image bugs and enhancements https://bugs.documentfoundation.org/show_bug.cgi?id=108438 [Bug 108438] [META] Animated image bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126013] Writer failed to load background from a DOC file
https://bugs.documentfoundation.org/show_bug.cgi?id=126013 --- Comment #5 from Volga --- This bug is still affect 版本: 6.3.0.2 (x64) Build ID: 728469fa359ba8c83d812146293a0b0aa53945ba CPU 线程: 4; 操作系统: Windows 10.0; UI 渲染: 默认; VCL: win; 区域语言: zh-CN (zh_CN); UI 语言: zh-CN Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/lok-clipboard' - 18 commits - desktop/qa desktop/source include/LibreOfficeKit sc/source sfx2/source sw/source vcl/source
Rebased ref, commits from common ancestor:
commit 5f61a29225f9d1826b65b373891250677396d4b6
Author: Michael Meeks
AuthorDate: Thu Jul 25 19:02:47 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 14:39:08 2019 -0400
clipboard: repair unit test to be run in lok mode.
SwTransferable::AddSupporteFormats needs the kit to be active.
Change-Id: I1e494edcb857399ca4e981fcf716d0204653ba3d
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 2d78696ca533..e265a200a103 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2635,6 +2635,9 @@ void DesktopLOKTest::testShowHideDialog()
void DesktopLOKTest::testComplexSelection()
{
+// needed for SwTransferable to cope with the selection.
+comphelper::LibreOfficeKit::setActive();
+
// Start with a blank text file and add contents.
LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
static const OString aText("hello world");
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5510c5847b2c..4c6d4fe57864 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -875,7 +875,6 @@ ITiledRenderable*
getTiledRenderable(LibreOfficeKitDocument* pThis)
* we also need to ensure that this works for the first view which
* has no clear 'createView' called for it (unfortunately).
*/
-
rtl::Reference
forceSetClipboardForCurrentView(LibreOfficeKitDocument *pThis)
{
ITiledRenderable* pDoc = getTiledRenderable(pThis);
commit aa15f2f33cdb8415c5b2126c75fcf8d531fb82b1
Author: Ashod Nakashian
AuthorDate: Mon Jul 22 19:00:23 2019 -0400
Commit: Michael Meeks
CommitDate: Fri Jul 26 14:36:10 2019 -0400
clipboard: log before erasing
Change-Id: I6d59cdd31c62bbc7db81ccb8985745f68d19cd28
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 7eefd09370d1..f44f4e9fed81 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -51,8 +51,8 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
auto it = gClipboards.get()->find(nViewId);
if (it != gClipboards.get()->end())
{
+SAL_INFO("lok", "Releasing clip: " << it->second.get() << " for
destroyed " << nViewId);
gClipboards.get()->erase(it);
-SAL_INFO("lok", "Released clip: " << it->second.get() << " for
destroyed " << nViewId);
}
}
}
commit 7d71f31e62d53931f0155a087ac47a93a55c138a
Author: Michael Meeks
AuthorDate: Tue Jul 23 09:49:11 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 14:36:09 2019 -0400
clipboard: check for null.
Change-Id: I07060035a9744642c98d4a0946695408dc0f6b42
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 3285965c846f..7eefd09370d1 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -37,7 +37,6 @@ rtl::Reference
LOKClipboardFactory::getClipboardForCurView()
return xClip;
}
-/// FIXME: should really copy and stash its content for a bit.
void LOKClipboardFactory::releaseClipboardForView(int nViewId)
{
osl::MutexGuard aGuard(gMutex);
@@ -47,7 +46,7 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
gClipboards.get()->clear();
SAL_INFO("lok", "Released all clipboards on doc destroy\n");
}
-else
+else if (gClipboards.get())
{
auto it = gClipboards.get()->find(nViewId);
if (it != gClipboards.get()->end())
commit 875ad258fbb7dc07f40f7c14684bea36350f8d81
Author: Michael Meeks
AuthorDate: Mon Jul 22 09:48:46 2019 +0100
Commit: Michael Meeks
CommitDate: Fri Jul 26 14:36:08 2019 -0400
lok: share more of the clipboard mime-type handling code.
Change-Id: I98fc9fa0fd1b5afa00c33b642d2d504eab0b62ba
diff --git a/desktop/source/lib/lokclipboard.cxx
b/desktop/source/lib/lokclipboard.cxx
index 17a9c5c54e4f..3285965c846f 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -189,20 +189,7 @@ LOKTransferable::LOKTransferable(const size_t nInCount,
const char** pInMimeType
m_aFlavors = css::uno::Sequence(nInCount);
for (size_t i = 0; i < nInCount; ++i)
{
-OUString aMimeType = OUString::fromUtf8(pInMimeTypes[i]);
-
-// cf. sot/source/base/exchange.cxx for these two exceptional types.
-if (aMimeType.startsWith("text/plain"))
-{
-aMimeType = "text/plain;charset=utf-16";
-m_aFlavors[i].DataType = cppu::UnoType::get();
-}
-else if (aMimeType == "application/x-libreoffice-tsvc")
-m_aFlavors[i].DataType = cppu::UnoType::get();
-else
-m_aFlavors[i].DataType =
cppu::UnoType>::get();
-m_aFlavors[i].MimeType = aMimeType;
-
[Libreoffice-bugs] [Bug 104238] [META] Impress image bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=104238 Volga changed: What|Removed |Added Depends on||126569 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=126569 [Bug 126569] Animate GIF becomes static while playing an Impress presentation -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126311] SPELL: af_ZA.aff quietly broken
https://bugs.documentfoundation.org/show_bug.cgi?id=126311 Julien Nabet changed: What|Removed |Added CC|serval2...@yahoo.fr | --- Comment #3 from Julien Nabet --- Sorry, I built hunspell with: ./configure CXXFLAGS='-g -O0 -Wall -Wextra -D_GLIBCXX_DEBUG' --with-warnings --with-ui --with-readline then I went in: /dictionaries/af_ZA launched: /./src/tools/hunspell -d af_ZA I just see: Hunspell 1.7.0 So don't know how to reproduce this. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108438] [META] Animated image bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108438 Volga changed: What|Removed |Added Depends on||126569 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=126569 [Bug 126569] Animate GIF becomes static while playing an Impress presentation -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126569] New: Animate GIF becomes static while playing an Impress presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=126569 Bug ID: 126569 Summary: Animate GIF becomes static while playing an Impress presentation Product: LibreOffice Version: 6.3.0.2 rc Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: shanshandehongx...@outlook.com Description: While I try to play an Impress presentation (.odp), I saw GIF doesn't work on screen. Steps to Reproduce: 1. Open attachment 152667 2. Press F5 to play Actual Results: Before I play the presentation, I can see an animation of playing violin works proper, but while I playing the presentation, it becomes a static image, the bow doesn't move. Expected Results: Animate GIF ahould works while playing an Impress presentation Reproducible: Always User Profile Reset: No Additional Info: 版本: 6.3.0.2 (x64) Build ID: 728469fa359ba8c83d812146293a0b0aa53945ba CPU 线程: 4; 操作系统: Windows 10.0; UI 渲染: 默认; VCL: win; 区域语言: zh-CN (zh_CN); UI 语言: zh-CN Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarController.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 4622d1766858e7be0615e99f9868d250076188ab
Author: Ashod Nakashian
AuthorDate: Sun Feb 3 10:53:21 2019 -0500
Commit: Noel Grandin
CommitDate: Fri Jul 26 20:38:02 2019 +0200
sfx2: LOK: better fit of sidebar decks
As the patch comment explains, the properties
deck needs to be rendered with height long
enough to avoid scrolling, but others would
be greedy in using up all the available height,
so we render them in more restricted space.
Change-Id: I361e653239e22a7be0e5d75505cdcde18f2367d3
Reviewed-on: https://gerrit.libreoffice.org/73524
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 7e1d9ab17bb9..95eba02296e6 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -407,13 +407,18 @@ void SidebarController::NotifyResize()
{
if (comphelper::LibreOfficeKit::isActive())
{
+// We want to let the layouter use up as much of the
+// height as necessary to make sure no scrollbar is
+// visible. This only works when there are no greedy
+// panes that fill up all available area. So we only
+// use this for the PropertyDeck, which has no such
+// panes, while most other do. This is fine, since
+// it's the PropertyDeck that really has many panes
+// that can collapse or expand. For others, limit
+// the height to something sensible.
+const sal_Int32 nExtHeight = (msCurrentDeckId ==
"PropertyDeck" ? 2000 : 600);
// No TabBar in LOK (use nWidth in full).
-// Use the minimum height that is large enough to let the
-// layouter expand the panes maximally (that have a minimal
-// height before the scrollbar is shown), so we never get
-// scrollbars (we want scrolling to be done on the rendered
-// image in the client, which is much faster).
-mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, 650);
+mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, nExtHeight);
}
else
mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth -
nTabBarDefaultWidth, nHeight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/sidebar/Deck.hxx |3 +++
sfx2/source/sidebar/Deck.cxx | 17 ++---
sfx2/source/sidebar/DeckLayouter.cxx |4 +---
sfx2/source/sidebar/SidebarController.cxx | 12 +++-
4 files changed, 25 insertions(+), 11 deletions(-)
New commits:
commit 53644c6d62002879431c36b9da5f6771e5234992
Author: Ashod Nakashian
AuthorDate: Fri Feb 1 10:56:46 2019 -0500
Commit: Noel Grandin
CommitDate: Fri Jul 26 20:30:36 2019 +0200
sfx2: LOK: resize the sidebar after layouting to avoid scrollbars
By resizing the deck we ensure that if the contents do not fit
in the existing height, they will after we expand to the minimum
height. Also, the minimum height is now the correct one.
This prevents seeing vertical scrollbar in LOK, which is very
slow and unfriendly, instead renders the full sidebar and lets
the client scroll, if necessary.
Change-Id: Idc2a622a65074b7afb26263624f2df0b5968f40d
Reviewed-on: https://gerrit.libreoffice.org/73523
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 410f17a22e82..5a3dabe7804a 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -82,6 +82,9 @@ public:
};
private:
+void RequestLayoutInternal();
+
+private:
const OUString msId;
sal_Int32 mnMinimalWidth;
sal_Int32 mnMinimalHeight;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 1e56a1516105..48f7291e8af7 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -168,7 +168,7 @@ void Deck::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& /*r
void Deck::DataChanged (const DataChangedEvent&)
{
-RequestLayout();
+RequestLayoutInternal();
}
bool Deck::EventNotify(NotifyEvent& rEvent)
@@ -244,10 +244,10 @@ void Deck::ResetPanels(const SharedPanelContainer&
rPanelContainer)
}
maPanels = rPanelContainer;
-RequestLayout();
+RequestLayoutInternal();
}
-void Deck::RequestLayout()
+void Deck::RequestLayoutInternal()
{
mnMinimalWidth = 0;
mnMinimalHeight = 0;
@@ -266,6 +266,17 @@ void Deck::RequestLayout()
}
}
+void Deck::RequestLayout()
+{
+RequestLayoutInternal();
+if (comphelper::LibreOfficeKit::isActive() && mnMinimalHeight > 0)
+{
+const Size aParentSize(GetParent()->GetSizePixel().Width(),
mnMinimalHeight);
+GetParent()->SetSizePixel(aParentSize);
+setPosSizePixel(0, 0, aParentSize.Width(), aParentSize.Height());
+}
+}
+
vcl::Window* Deck::GetPanelParentWindow()
{
return mpScrollContainer.get();
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source/sidebar/DeckLayouter.cxx
index a49f026df63a..b969dc91a8bb 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -177,9 +177,6 @@ tools::Rectangle LayoutPanels (
nTotalPreferredHeight += rItem.maLayoutSize.Preferred;
}
-// rMinimalHeight = nTotalMinimumHeight;
-rMinimalHeight = aBox.GetHeight();
-
if (nTotalMinimumHeight > nAvailableHeight
&& ! bShowVerticalScrollBar)
{
@@ -252,6 +249,7 @@ tools::Rectangle LayoutPanels (
const sal_Int32 nUsedHeight (PlacePanels(rLayoutItems, nWidth, eMode,
rScrollContainer));
aBox.AdjustTop(nUsedHeight );
+rMinimalHeight = nUsedHeight;
return aBox;
}
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index f099e5f7c5d2..7e1d9ab17bb9 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -405,13 +405,15 @@ void SidebarController::NotifyResize()
// Place the deck first.
if (bIsDeckVisible)
{
-// No TabBar in LOK.
if (comphelper::LibreOfficeKit::isActive())
{
-// The minimal deck height is unreliable because of
-// the fluid way the panels are stretched. Fix minimum
manually.
-// const sal_Int32 nMinimalHeight =
mpCurrentDeck->GetMinimalHeight();
-mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, 600);
+// No TabBar in LOK (use nWidth in full).
+// Use the minimum height that is large enough to let the
+// layouter expand the panes maximally (that have a minimal
+// height before the scrollbar is shown), so we never get
+// scrollbars (we want scrolling to be done on the rendered
+// image in the client, which is much faster).
+mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, 650);
}
else
mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth -
nTabBarDefaultWidth, nHeight);
___
Libreoffice-commits
[Libreoffice-bugs] [Bug 126568] New: Search bar MatchCase shortcut ~m does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=126568 Bug ID: 126568 Summary: Search bar MatchCase shortcut ~m does not work Product: LibreOffice Version: 6.2.4.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: tor...@yahoo.com In any Writer document, hit ^f to search. Search bar has a MatchCase option with M underlined but ineffective: ~m does nothing; only a mouse click toggles it. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarController.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 8ac95e67872d8834c12adf67f833d92b06dc3d70
Author: Ashod Nakashian
AuthorDate: Sun Dec 16 12:25:18 2018 -0500
Commit: Noel Grandin
CommitDate: Fri Jul 26 20:25:47 2019 +0200
sfx: LOK: fix the minimum height of sidebars
Change-Id: I29d4eb38c72db50061266f0cf0ace31bab690315
Reviewed-on: https://gerrit.libreoffice.org/73521
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index a0f9cbd1dae4..f099e5f7c5d2 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -408,11 +408,10 @@ void SidebarController::NotifyResize()
// No TabBar in LOK.
if (comphelper::LibreOfficeKit::isActive())
{
-const sal_Int32 nMinimalHeight =
mpCurrentDeck->GetMinimalHeight();
-if (nMinimalHeight > 0)
-mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth,
nMinimalHeight);
-else
-mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, nHeight);
+// The minimal deck height is unreliable because of
+// the fluid way the panels are stretched. Fix minimum
manually.
+// const sal_Int32 nMinimalHeight =
mpCurrentDeck->GetMinimalHeight();
+mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, 600);
}
else
mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth -
nTabBarDefaultWidth, nHeight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 104878] Impress works very slow with large sized GIF
https://bugs.documentfoundation.org/show_bug.cgi?id=104878 --- Comment #30 from Volga --- Repro with 版本: 6.3.0.2 (x64) Build ID: 728469fa359ba8c83d812146293a0b0aa53945ba CPU 线程: 4; 操作系统: Windows 10.0; UI 渲染: 默认; VCL: win; 区域语言: zh-CN (zh_CN); UI 语言: zh-CN Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarChildWindow.cxx | 68 ++---
1 file changed, 33 insertions(+), 35 deletions(-)
New commits:
commit d13e036ddc56bfdc9decccfa58e2e2b57eac765b
Author: Ashod Nakashian
AuthorDate: Fri Feb 1 10:55:05 2019 -0500
Commit: Noel Grandin
CommitDate: Fri Jul 26 20:26:00 2019 +0200
sfx2: avoid unnecessary dynamic_cast
And reformat.
Change-Id: If8a3dd4d16dfd51f8006d2d5d47951db30390fd8
Reviewed-on: https://gerrit.libreoffice.org/73522
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx
b/sfx2/source/sidebar/SidebarChildWindow.cxx
index ac0a68852ea9..678c5538aa0b 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -30,50 +30,48 @@ namespace sfx2 { namespace sidebar {
SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR);
-SidebarChildWindow::SidebarChildWindow (vcl::Window* pParentWindow, sal_uInt16
nId,
-SfxBindings* pBindings,
SfxChildWinInfo* pInfo)
-: SfxChildWindow(pParentWindow, nId),
- mbSidebarVisibleInLOK(pInfo && pInfo->aModule == "simpress")
+SidebarChildWindow::SidebarChildWindow(vcl::Window* pParentWindow, sal_uInt16
nId,
+ SfxBindings* pBindings,
SfxChildWinInfo* pInfo)
+: SfxChildWindow(pParentWindow, nId)
+, mbSidebarVisibleInLOK(pInfo && pInfo->aModule == "simpress")
{
-SetWindow(VclPtr::Create(pBindings, *this,
pParentWindow,
- WB_STDDOCKWIN |
WB_OWNERDRAWDECORATION |
- WB_CLIPCHILDREN |
WB_SIZEABLE |
- WB_3DLOOK |
WB_ROLLABLE));
+auto pDockWin = VclPtr::Create(
+pBindings, *this, pParentWindow, WB_STDDOCKWIN |
WB_OWNERDRAWDECORATION | WB_CLIPCHILDREN
+ | WB_SIZEABLE | WB_3DLOOK |
WB_ROLLABLE);
+SetWindow(pDockWin);
SetAlignment(SfxChildAlignment::RIGHT);
-GetWindow()->SetHelpId(HID_SIDEBAR_WINDOW);
-GetWindow()->SetOutputSizePixel(Size(GetDefaultWidth(GetWindow()), 450));
+pDockWin->SetHelpId(HID_SIDEBAR_WINDOW);
+pDockWin->SetOutputSizePixel(Size(GetDefaultWidth(pDockWin), 450));
-SfxDockingWindow* pDockingParent =
dynamic_cast(GetWindow());
-if (pDockingParent != nullptr)
+if (pInfo && pInfo->aExtraString.isEmpty() && pInfo->aModule != "sdraw"
+&& pInfo->aModule != "simpress")
{
-if (pInfo && pInfo->aExtraString.isEmpty() && pInfo->aModule !=
"sdraw" && pInfo->aModule != "simpress")
-{
-// When this is the first start (never had the sidebar open yet),
-// default to non-expanded sidebars in Writer and Calc.
-//
-// HACK: unfortunately I haven't found a clean solution to do
-// this, so do it this way:
-//
-pDockingParent->SetSizePixel(Size(TabBar::GetDefaultWidth() *
GetWindow()->GetDPIScaleFactor(),
-pDockingParent->GetSizePixel().Height()));
-}
-pDockingParent->Initialize(pInfo);
+// When this is the first start (never had the sidebar open yet),
+// default to non-expanded sidebars in Writer and Calc.
+//
+// HACK: unfortunately I haven't found a clean solution to do
+// this, so do it this way:
+//
+pDockWin->SetSizePixel(Size(TabBar::GetDefaultWidth() *
GetWindow()->GetDPIScaleFactor(),
+pDockWin->GetSizePixel().Height()));
+}
+
+pDockWin->Initialize(pInfo);
-if (comphelper::LibreOfficeKit::isActive())
-{
-// Undock sidebar in LOK to allow for resizing freely
-// (i.e. when the client window is resized) and collapse
-// it so the client can open it on demand.
-pDockingParent->SetFloatingSize(
-Size(TabBar::GetDefaultWidth() *
GetWindow()->GetDPIScaleFactor(),
- pDockingParent->GetSizePixel().Height()));
-pDockingParent->SetFloatingMode(true);
-}
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Undock sidebar in LOK to allow for resizing freely
+// (i.e. when the client window is resized) and collapse
+// it so the client can open it on demand.
+pDockWin->SetFloatingSize(Size(TabBar::GetDefaultWidth() *
GetWindow()->GetDPIScaleFactor(),
+ pDockWin->GetSizePixel().Height()));
+pDockWin->SetFloatingMode(true);
}
+
SetHideNotDelete(true);
-GetWindow()->Show();
+pDockWin->Show();
}
sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window const * pWindow)
___
Libreoffice-commits mailing list
[Libreoffice-commits] core.git: include/sfx2 sd/source sfx2/source
include/sfx2/sidebar/Sidebar.hxx | 10 ++
sd/source/ui/view/ViewShellImplementation.cxx |2 +-
sd/source/ui/view/drviews2.cxx|2 +-
sfx2/source/sidebar/Sidebar.cxx | 22 ++
4 files changed, 34 insertions(+), 2 deletions(-)
New commits:
commit 682a91a9c8822a6cfb5377b26facea2572f34027
Author: Ashod Nakashian
AuthorDate: Sun Dec 9 17:27:48 2018 -0500
Commit: Noel Grandin
CommitDate: Fri Jul 26 20:17:22 2019 +0200
sfx: LOK: toggle sidebar decks
Change-Id: I0559a2a4ae041bc61cf3a2d5979656a7941f4b02
Reviewed-on: https://gerrit.libreoffice.org/73518
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index 427acf9c6c8b..30244f9988b1 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -44,6 +44,16 @@ public:
const OUString& rsPanelId,
const css::uno::Reference& rxFrame, bool bFocus =
false);
+/** Switch to the deck that contains the specified panel and toggle
+the visibility of the panel (expanded and scrolled into the
+visible area when visible)
+Note that most of the work is done asynchronously and that
+this function probably returns before the requested panel is visible.
+*/
+static void TogglePanel (
+const OUString& rsPanelId,
+const css::uno::Reference& rxFrame);
+
static bool IsPanelVisible(
const OUString& rsPanelId,
const css::uno::Reference& rxFrame);
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx
b/sd/source/ui/view/ViewShellImplementation.cxx
index a7d67677277e..b36d7d197c9f 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -122,7 +122,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
mrViewShell.GetDrawView()->SdrEndTextEdit();
mrViewShell.GetDrawView()->UnmarkAll();
mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
-sfx2::sidebar::Sidebar::ShowPanel(
+sfx2::sidebar::Sidebar::TogglePanel(
"SdLayoutsPanel",
mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface());
break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 34fcc56b2243..7076ff93e1fe 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3208,7 +3208,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
else if (nSId == SID_MASTER_SLIDES_PANEL)
panelId = "SdAllMasterPagesPanel";
-::sfx2::sidebar::Sidebar::ShowPanel(
+::sfx2::sidebar::Sidebar::TogglePanel(
panelId,
GetViewFrame()->GetFrame().GetFrameInterface());
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index 855da3113a36..ed12c0829302 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -51,6 +51,28 @@ void Sidebar::ShowPanel (
pController->GetFocusManager().GrabFocusPanel();
}
+void Sidebar::TogglePanel (
+const OUString& rsPanelId,
+const css::uno::Reference& rxFrame)
+{
+SidebarController* pController =
SidebarController::GetSidebarControllerForFrame(rxFrame);
+if (!pController)
+return;
+
+std::shared_ptr xPanelDescriptor =
pController->GetResourceManager()->GetPanelDescriptor(rsPanelId);
+
+if (!xPanelDescriptor)
+return;
+
+// This should be a lot more sophisticated:
+// - Make the deck switching asynchronous
+// - Make sure to use a context that really shows the panel
+
+// All that is not necessary for the current use cases so lets
+// keep it simple for the time being.
+pController->OpenThenToggleDeck(xPanelDescriptor->msDeckId);
+}
+
bool Sidebar::IsPanelVisible(
const OUString& rsPanelId,
const css::uno::Reference& rxFrame)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sd/source sfx2/source
include/sfx2/sidebar/SidebarController.hxx | 13 +---
sd/source/ui/view/drviewse.cxx |5 +
sfx2/source/sidebar/SidebarController.cxx| 86 +++
sfx2/source/sidebar/SidebarDockingWindow.cxx |3
4 files changed, 88 insertions(+), 19 deletions(-)
New commits:
commit 80eb913d5944e88297b0734991bcf6c1cfb34463
Author: Ashod Nakashian
AuthorDate: Wed Dec 12 03:01:31 2018 -0500
Commit: Noel Grandin
CommitDate: Fri Jul 26 20:22:05 2019 +0200
sfx: LOK: notify clients of the sidebar state
Change-Id: I35b174c3a5e302ce52ee4063fa71d47feffab624
Reviewed-on: https://gerrit.libreoffice.org/73520
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/sidebar/SidebarController.hxx
b/include/sfx2/sidebar/SidebarController.hxx
index d6c8d54f7e8a..286036b6f141 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
@@ -63,9 +64,8 @@ class SFX2_DLLPUBLIC SidebarController
public SidebarControllerInterfaceBase
{
public:
-static rtl::Reference create(
-SidebarDockingWindow* pParentWindow,
-const css::uno::Reference& rxFrame);
+static rtl::Reference create(SidebarDockingWindow*
pParentWindow,
+const SfxViewFrame*
pViewFrame);
virtual ~SidebarController() override;
SidebarController(const SidebarController&) = delete;
SidebarController& operator=( const SidebarController& ) = delete;
@@ -168,14 +168,13 @@ public:
void setMaximumWidth(sal_Int32 nMaximumWidth) { mnMaximumSidebarWidth =
nMaximumWidth; }
private:
-SidebarController(
-SidebarDockingWindow* pParentWindow,
-const css::uno::Reference& rxFrame);
+SidebarController(SidebarDockingWindow* pParentWindow, const SfxViewFrame*
pViewFrame);
VclPtr mpCurrentDeck;
VclPtr mpParentWindow;
-VclPtr mpTabBar;
+const SfxViewFrame* mpViewFrame;
css::uno::Reference mxFrame;
+VclPtr mpTabBar;
Context maCurrentContext;
Context maRequestedContext;
css::uno::Reference mxCurrentController;
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 924b27aeb4bb..d825e4fc0c84 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -27,6 +27,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1031,6 +1032,10 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_MASTERPAGE: // BASIC
{
+if (comphelper::LibreOfficeKit::isActive())
+
GetViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
+
".uno:SlideMasterPage=true");
+
// AutoLayouts needs to be finished
GetDoc()->StopWorkStartupDelay();
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 83ff4c5354c6..a0f9cbd1dae4 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -52,6 +52,7 @@
#include
#include
#include
+#include
#include
#include
@@ -72,6 +73,32 @@ namespace
const static char gsReadOnlyCommandName[] = ".uno:EditDoc";
const static sal_Int32 gnWidthCloseThreshold (70);
const static sal_Int32 gnWidthOpenThreshold (40);
+
+std::string UnoNameFromDeckId(const OUString& rsDeckId)
+{
+if (rsDeckId == "SdCustomAnimationDeck")
+return ".uno:CustomAnimation";
+
+if (rsDeckId == "PropertyDeck")
+return ".uno:ModifyPage";
+
+if (rsDeckId == "SdLayoutsDeck")
+return ".uno:ModifyPage";
+
+if (rsDeckId == "SdSlideTransitionDeck")
+return ".uno:SlideChangeWindow";
+
+if (rsDeckId == "SdAllMasterPagesDeck")
+return ".uno:MasterSlidesPanel";
+
+if (rsDeckId == "SdMasterPagesDeck")
+return ".uno:MasterSlidesPanel";
+
+if (rsDeckId == "GalleryDeck")
+return ".uno:Gallery";
+
+return "";
+}
}
namespace sfx2 { namespace sidebar {
@@ -95,17 +122,18 @@ namespace {
SidebarController::SidebarController (
SidebarDockingWindow* pParentWindow,
-const css::uno::Reference& rxFrame)
+const SfxViewFrame* pViewFrame)
: SidebarControllerInterfaceBase(m_aMutex),
mpCurrentDeck(),
mpParentWindow(pParentWindow),
+ mpViewFrame(pViewFrame),
+ mxFrame(pViewFrame->GetFrame().GetFrameInterface()),
mpTabBar(VclPtr::Create(
mpParentWindow,
- rxFrame,
+ mxFrame,
[this](const OUString& rsDeckId) { return
this->OpenThenToggleDeck(rsDeckId); },
[this](const tools::Rectangle& rButtonBox,const
::std::vector& rMenuData) {
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/sidebar/Deck.hxx |2 ++
include/sfx2/sidebar/DeckLayouter.hxx |1 +
sfx2/source/sidebar/Deck.cxx |4 +++-
sfx2/source/sidebar/DeckLayouter.cxx | 27 +++
sfx2/source/sidebar/SidebarController.cxx | 27 ---
5 files changed, 45 insertions(+), 16 deletions(-)
New commits:
commit a6f6a76d6018fd342646982f6e252c8562ebd254
Author: Ashod Nakashian
AuthorDate: Mon Dec 10 00:29:31 2018 -0500
Commit: Noel Grandin
CommitDate: Fri Jul 26 20:19:09 2019 +0200
sfx: LOK: don't shrink sidebar height below minimum
This avoids scrolling within the sidebar and makes
it possible to scroll the rendred sidebar image
in the client, which is more responsive and lighter.
Change-Id: I0713c699ba82bfc5fe503c9351402c67aef4494e
Reviewed-on: https://gerrit.libreoffice.org/73519
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 22ecb71536d0..410f17a22e82 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -69,6 +69,7 @@ public:
static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation);
sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
+sal_Int32 GetMinimalHeight() const { return mnMinimalHeight; }
class ScrollContainerWindow : public vcl::Window
{
@@ -83,6 +84,7 @@ public:
private:
const OUString msId;
sal_Int32 mnMinimalWidth;
+sal_Int32 mnMinimalHeight;
SharedPanelContainer maPanels;
VclPtr mpTitleBar;
VclPtr mpScrollClipWindow;
diff --git a/include/sfx2/sidebar/DeckLayouter.hxx
b/include/sfx2/sidebar/DeckLayouter.hxx
index 1208fb94c164..0d9c7c2b90f4 100644
--- a/include/sfx2/sidebar/DeckLayouter.hxx
+++ b/include/sfx2/sidebar/DeckLayouter.hxx
@@ -35,6 +35,7 @@ namespace DeckLayouter
void LayoutDeck (
const tools::Rectangle& rContentArea,
sal_Int32& rMinimalWidth,
+sal_Int32& rMinimalHeight,
SharedPanelContainer& rPanels,
vcl::Window& pDeckTitleBar,
vcl::Window& pScrollClipWindow,
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index f26a643a083a..1e56a1516105 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -49,6 +49,7 @@ Deck::Deck(const DeckDescriptor& rDeckDescriptor,
vcl::Window* pParentWindow,
: Window(pParentWindow, 0)
, msId(rDeckDescriptor.msId)
, mnMinimalWidth(0)
+, mnMinimalHeight(0)
, maPanels()
, mpTitleBar(VclPtr::Create(rDeckDescriptor.msTitle, this,
rCloserAction))
, mpScrollClipWindow(VclPtr::Create(this))
@@ -249,8 +250,9 @@ void Deck::ResetPanels(const SharedPanelContainer&
rPanelContainer)
void Deck::RequestLayout()
{
mnMinimalWidth = 0;
+mnMinimalHeight = 0;
-DeckLayouter::LayoutDeck(GetContentArea(), mnMinimalWidth, maPanels,
+DeckLayouter::LayoutDeck(GetContentArea(), mnMinimalWidth,
mnMinimalHeight, maPanels,
*GetTitleBar(), *mpScrollClipWindow,
*mpScrollContainer,
*mpFiller, *mpVerticalScrollBar);
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source/sidebar/DeckLayouter.cxx
index 591602ccf93a..a49f026df63a 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -57,13 +57,19 @@ namespace {
sal_Int32 mnWeight;
bool mbShowTitleBar;
-LayoutItem()
-:
mpPanel(),maLayoutSize(0,0,0),mnDistributedHeight(0),mnWeight(0),mbShowTitleBar(true)
-{}
+LayoutItem(const VclPtr& rPanel)
+: mpPanel(rPanel)
+, maLayoutSize(0, 0, 0)
+, mnDistributedHeight(0)
+, mnWeight(0)
+, mbShowTitleBar(true)
+{
+}
};
tools::Rectangle LayoutPanels (
const tools::Rectangle& rContentArea,
sal_Int32& rMinimalWidth,
+sal_Int32& rMinimalHeight,
::std::vector& rLayoutItems,
vcl::Window& rScrollClipWindow,
vcl::Window& rScrollContainer,
@@ -103,6 +109,7 @@ namespace {
void DeckLayouter::LayoutDeck (
const tools::Rectangle& rContentArea,
sal_Int32& rMinimalWidth,
+sal_Int32& rMinimalHeight,
SharedPanelContainer& rPanels,
vcl::Window& rDeckTitleBar,
vcl::Window& rScrollClipWindow,
@@ -118,14 +125,14 @@ void DeckLayouter::LayoutDeck (
{
// Prepare the layout item container.
::std::vector aLayoutItems;
-aLayoutItems.resize(rPanels.size());
-for (sal_Int32 nIndex(0),nCount(rPanels.size()); nIndex& rLayoutItems,
vcl::Window& rScrollClipWindow,
vcl::Window& rScrollContainer,
@@ -169,6 +177,8 @@ tools::Rectangle LayoutPanels (
nTotalPreferredHeight += rItem.maLayoutSize.Preferred;
}
+// rMinimalHeight = nTotalMinimumHeight;
+
[Libreoffice-bugs] [Bug 126539] Assertion error when rejecting tracked change with two paragraphs
https://bugs.documentfoundation.org/show_bug.cgi?id=126539 Julien Nabet changed: What|Removed |Added Status|UNCONFIRMED |NEW Keywords||haveBacktrace Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126539] Assertion error when rejecting tracked change with two paragraphs
https://bugs.documentfoundation.org/show_bug.cgi?id=126539 --- Comment #1 from Julien Nabet --- Created attachment 153001 --> https://bugs.documentfoundation.org/attachment.cgi?id=153001=edit bt with debug symbols On pc Debian x86-64 with master sources updated today, I could reproduce this. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126515] FILEOPEN: Cannot open XML (Excel) with style parent ref.
https://bugs.documentfoundation.org/show_bug.cgi?id=126515 raal changed: What|Removed |Added CC||libreoff...@kohei.us --- Comment #3 from raal --- This seems to have begun at the below commit. Adding Cc: to Kohei Yoshida ; Could you possibly take a look at this one? Thanks de19941f7613db5dc62e0f0903ad9f523f3d2a16 is the first bad commit commit de19941f7613db5dc62e0f0903ad9f523f3d2a16 Author: Jenkins Build User Date: Mon Dec 18 07:57:01 2017 +0100 source sha:152c79ee2be2374334202dc738a8f011e47845c7 author Kohei Yoshida 2017-12-03 21:25:53 -0500 committer Kohei Yoshida 2017-12-18 02:30:39 +0100 commit 152c79ee2be2374334202dc738a8f011e47845c7 (patch) treea9dca320422e3afa66f6ed94d0ef1b0ca5899027 parent 99210a149c859fcd683870b280adaeeffd1250e4 (diff) Initial step on enabling the orcus-based Excel 2003 XML filter. Still some work remains in the orcus interface implementation code in sc. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126515] FILEOPEN: Cannot open XML (Excel) with style parent ref.
https://bugs.documentfoundation.org/show_bug.cgi?id=126515 raal changed: What|Removed |Added Keywords||bibisected, bisected -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126515] FILEOPEN: Cannot open XML (Excel) with style parent ref.
https://bugs.documentfoundation.org/show_bug.cgi?id=126515 raal changed: What|Removed |Added Ever confirmed|0 |1 CC||r...@post.cz Status|UNCONFIRMED |NEW Keywords||regression --- Comment #2 from raal --- Confirm with Version: 6.4.0.0.alpha0+ Build ID: 47a774fbef8c224e4853de3fdd0230b9442bb716 CPU threads: 4; OS: Linux 4.15; UI render: default; VCL: gtk3; bit not in Version: 4.1.0.0.alpha1+ Build ID: 863d38fbfa4fb4861e476828c46410602100919 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/btlr-frame.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 15 ++
sw/source/filter/ww8/docxattributeoutput.cxx |4 -
sw/source/filter/ww8/docxsdrexport.cxx | 65 ---
sw/source/filter/ww8/docxsdrexport.hxx |2
5 files changed, 19 insertions(+), 67 deletions(-)
New commits:
commit e7da02efd9e8b0d1d4d70e9aa9562b3424a61aea
Author: Miklos Vajna
AuthorDate: Thu Jul 25 21:28:04 2019 +0200
Commit: Miklos Vajna
CommitDate: Fri Jul 26 19:33:43 2019 +0200
sw btlr writing mode: DOCX export of Writer textframes
Do it the same way as tbrl is already handled.
(cherry picked from commit 6a4b7d1e658b4515ec9a2fe3604dd4ead4c0fec8)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
sw/source/filter/ww8/docxsdrexport.cxx
Change-Id: I7daad962c6349874357c38801c15adadfe8c3a50
Reviewed-on: https://gerrit.libreoffice.org/76385
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/btlr-frame.odt
b/sw/qa/extras/ooxmlexport/data/btlr-frame.odt
new file mode 100644
index ..31cb03849c53
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/btlr-frame.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index d0250213ccd1..8ccc2bc68100 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -174,6 +174,21 @@ DECLARE_OOXMLEXPORT_TEST(testTbrlFrameVml,
"tbrl-frame-vml.docx")
}
}
+DECLARE_OOXMLEXPORT_TEST(testBtlrFrame, "btlr-frame.odt")
+{
+if (!mbExported)
+{
+return;
+}
+
+uno::Reference xPropertySet(getShape(1),
uno::UNO_QUERY);
+comphelper::SequenceAsHashMap
aGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
+// Without the accompanying fix in place, this test would have failed with
'Expected:
+// -270; Actual: 0', i.e. the writing direction of the frame was lost.
+CPPUNIT_ASSERT_EQUAL(static_cast(-270),
+ aGeometry["TextPreRotateAngle"].get());
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf116371, "tdf116371.odt")
{
// Make sure the rotation is exported correctly, and size not distorted
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index e8e57496a387..69c0e5f3e578 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1346,6 +1346,8 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame const*
pParentFrame, int nAncho
const SvxFrameDirectionItem& rDirection = rFrameFormat.GetFrameDir();
if (rDirection.GetValue() == SvxFrameDirection::Vertical_RL_TB)
m_pImpl->m_pBodyPrAttrList->add(XML_vert, "vert");
+else if (rDirection.GetValue() == SvxFrameDirection::Vertical_LR_BT)
+m_pImpl->m_pBodyPrAttrList->add(XML_vert, "vert270");
m_pImpl->m_bFlyFrameGraphic = true;
m_pImpl->m_rExport.WriteText();
commit c89f2db14a2b3dc2153d75996f87bbb2167afbd9
Author: Miklos Vajna
AuthorDate: Thu Jul 18 21:27:51 2019 +0200
Commit: Miklos Vajna
CommitDate: Fri Jul 26 19:33:29 2019 +0200
sw btlr writing mode: remove not needed checkFrameBtlr() in the DOCX export
Now that the DOCX import doesn't create this and instead uses the proper
writing mode (neither VML nor drawingmL).
(cherry picked from commit ab0df471915c5d54e8a3e8556de12afdfa541b3c)
Conflicts:
sw/source/filter/ww8/docxsdrexport.cxx
Change-Id: I560c710866de8fb2f90d681e8cfc2d82afb1a327
Reviewed-on: https://gerrit.libreoffice.org/76384
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ea3bb3800e69..cfc98d6e9391 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7300,8 +7300,8 @@ void DocxAttributeOutput::CharIdctHint( const
SfxPoolItem& )
void DocxAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
{
-// Not rotated or we the rotation already handled?
-if ( !rRotate.GetValue() || m_rExport.SdrExporter().getFrameBtLr())
+// Not rotated?
+if ( !rRotate.GetValue())
return;
AddToAttrList( m_pEastAsianLayoutAttrList, FSNS( XML_w, XML_vert ), "true"
);
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index d40e2a786c70..e8e57496a387 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -150,7 +150,6 @@ struct DocxSdrExport::Impl
rtl::Reference m_pFlyAttrList;
rtl::Reference m_pTextboxAttrList;
OStringBuffer m_aTextFrameStyle;
-bool m_bFrameBtLr;
bool m_bDrawingOpen;
bool
[Libreoffice-commits] core.git: ridljar/com udkapi/com unotools/source xmloff/dtd xmloff/inc xmloff/source
ridljar/com/sun/star/uno/Enum.java |2 +-
udkapi/com/sun/star/container/XEnumerableMap.idl|6 +++---
unotools/source/config/viewoptions.cxx |2 +-
xmloff/dtd/chart.mod|2 +-
xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx |4 ++--
xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx |4 ++--
xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx |4 ++--
xmloff/inc/XMLRectangleMembersHandler.hxx |4 ++--
xmloff/source/core/xmlimp.cxx |4 ++--
xmloff/source/draw/propimp0.cxx |2 +-
xmloff/source/draw/shapeexport.cxx |8
xmloff/source/draw/ximpcustomshape.cxx |2 +-
xmloff/source/draw/ximpshap.cxx |6 +++---
xmloff/source/forms/elementexport.cxx |2 +-
xmloff/source/forms/elementimport.cxx |4 ++--
xmloff/source/forms/elementimport.hxx |4 ++--
xmloff/source/forms/formattributes.hxx | 18 +-
xmloff/source/forms/formcellbinding.hxx |2 +-
xmloff/source/forms/layerexport.cxx |2 +-
xmloff/source/forms/layerexport.hxx |2 +-
xmloff/source/forms/propertyexport.cxx |2 +-
xmloff/source/forms/propertyexport.hxx |4 ++--
xmloff/source/forms/propertyimport.hxx |2 +-
xmloff/source/style/xmlimppr.cxx|2 +-
xmloff/source/text/XMLRedlineExport.cxx |2 +-
xmloff/source/text/XMLRedlineExport.hxx |4 ++--
xmloff/source/text/XMLTextFrameContext.cxx |2 +-
xmloff/source/text/txtimp.cxx |2 +-
xmloff/source/text/txtimppr.cxx |2 +-
xmloff/source/text/txtparaimphint.hxx |2 +-
xmloff/source/text/txtstyli.cxx |2 +-
xmloff/source/transform/DocumentTContext.hxx|2 +-
xmloff/source/transform/FormPropOASISTContext.cxx |2 +-
xmloff/source/transform/IgnoreTContext.hxx |4 ++--
xmloff/source/transform/MetaTContext.hxx|2 +-
xmloff/source/transform/PersAttrListTContext.hxx|4 ++--
xmloff/source/transform/TransformerBase.cxx |2 +-
xmloff/source/transform/TransformerContext.hxx |4 ++--
38 files changed, 65 insertions(+), 65 deletions(-)
New commits:
commit 937440b65368e832a9e9fba92dfdb2efec4e06b5
Author: Andrea Gelmini
AuthorDate: Fri Jul 26 15:18:52 2019 +0200
Commit: Andrea Gelmini
CommitDate: Fri Jul 26 18:50:35 2019 +0200
Fix typos
Change-Id: I60261b937215340d2eb6f439234e99a300b0e189
Reviewed-on: https://gerrit.libreoffice.org/76380
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini
diff --git a/ridljar/com/sun/star/uno/Enum.java
b/ridljar/com/sun/star/uno/Enum.java
index 90ac08ead25a..f18015d9558d 100644
--- a/ridljar/com/sun/star/uno/Enum.java
+++ b/ridljar/com/sun/star/uno/Enum.java
@@ -32,7 +32,7 @@ public abstract class Enum {
private final int m_value;
/**
- * Constructs a enum value.
+ * Constructs an enum value.
* @param value the integer value of this enum value.
*/
protected Enum(int value) {
diff --git a/udkapi/com/sun/star/container/XEnumerableMap.idl
b/udkapi/com/sun/star/container/XEnumerableMap.idl
index 1be6ec8a4e38..06d982447069 100644
--- a/udkapi/com/sun/star/container/XEnumerableMap.idl
+++ b/udkapi/com/sun/star/container/XEnumerableMap.idl
@@ -54,7 +54,7 @@ module com { module sun { module star { module container {
*/
interface XEnumerableMap : XMap
{
-/** creates a enumerator for the keys of the map
+/** creates an enumerator for the keys of the map
@param Isolated
controls whether the newly create enumerator should be isolated
from the map.
@@ -65,7 +65,7 @@ interface XEnumerableMap : XMap
XEnumeration createKeyEnumeration( [in] boolean Isolated )
raises ( ::com::sun::star::lang::NoSupportException );
-/** creates a enumerator for the values of the map
+/** creates an enumerator for the values of the map
@param Isolated
controls whether the newly create enumerator should be isolated
from the map.
@@ -76,7 +76,7 @@ interface XEnumerableMap : XMap
XEnumeration createValueEnumeration( [in] boolean Isolated )
raises ( ::com::sun::star::lang::NoSupportException );
-/** creates a enumerator for the key-value pairs of the map
+/** creates an enumerator for the key-value pairs of the map
The elements returned by the enumerator are instances of
com::sun::star::beans::Pair,
holding the key-value-pairs which are part of the map.
diff --git a/unotools/source/config/viewoptions.cxx
b/unotools/source/config/viewoptions.cxx
index b88fddf630d3..b7cfc9e063c3 100644
---
[Libreoffice-commits] core.git: extras/source include/vcl sw/uiconfig vcl/source
extras/source/glade/libreoffice-catalog.xml.in |6
include/vcl/NotebookBarAddonsMerger.hxx| 11 -
sw/uiconfig/swriter/ui/notebookbar.ui | 203 -
vcl/source/window/NotebookBarAddonsMerger.cxx | 94 ---
vcl/source/window/builder.cxx | 11 -
5 files changed, 288 insertions(+), 37 deletions(-)
New commits:
commit 7b0dd98941911c686c0d127810d1c333df5026c3
Author: Sumit Chauhan
AuthorDate: Thu Jul 25 02:51:10 2019 +0530
Commit: Szymon Kłos
CommitDate: Fri Jul 26 18:36:08 2019 +0200
Extension support for gtkmenuItem and notebookbar.ui file added for writer
Change-Id: I65a07fbef7726cdaa9061ebf2227fbedd725d4db
Reviewed-on: https://gerrit.libreoffice.org/76278
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 655e5b8dbe1f..3cf70cfc456f 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -363,5 +363,11 @@
+
+
diff --git a/include/vcl/NotebookBarAddonsMerger.hxx
b/include/vcl/NotebookBarAddonsMerger.hxx
index c3b9998c7750..fde1196e4a63 100644
--- a/include/vcl/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/NotebookBarAddonsMerger.hxx
@@ -24,12 +24,15 @@
#include
#include
#include
+#include
#include
#include
#include
#include
#include
+class PopupMenu;
+
struct NotebookBarAddonsItem
{
Image aImage;
@@ -59,12 +62,14 @@ struct AddonNotebookBarItem
class NotebookBarAddonsMerger
{
public:
-NotebookBarAddonsMerger(vcl::Window* pParent,
-const css::uno::Reference&
rFrame,
-const NotebookBarAddonsItem&
aNotebookBarAddonsItem);
+NotebookBarAddonsMerger();
+~NotebookBarAddonsMerger();
static void MergeNotebookBarAddons(vcl::Window* pParent,
const
css::uno::Reference& rFrame,
const NotebookBarAddonsItem&
aNotebookBarAddonsItem);
+static void MergeNotebookBarMenuAddons(PopupMenu* pPopupMenu, sal_Int16
nItemId,
+ const OString& sItemIdName,
+ NotebookBarAddonsItem&
aNotebookBarAddonsItem);
};
#endif
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index f6935d190cab..c2ea3f405612 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1,9 +1,33 @@
-
+
+
+True
+False
+
+
+True
+False
+AddonCommand
+
+
+
+
+True
+False
+
+
+
+
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+
+
+
True
False
@@ -17314,6 +17338,175 @@
+
+True
+False
+
+
+True
+False
+end
+center
+True
+
+
+True
+False
+center
+True
+vertical
+
+
+E_xtension
+True
+True
+False
+False
+end
+center
+True
+none
+True
+
+
+False
+True
+0
+
+
+
+
+True
+True
+end
+True
+both-horiz
+False
+1
+
+
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+
+
+False
+True
+
+
+
+
+False
+True
+1
+
+
[Libreoffice-bugs] [Bug 126508] Crash and document recovery on option change of view -> icon style
https://bugs.documentfoundation.org/show_bug.cgi?id=126508 V Stuart Foote changed: What|Removed |Added Priority|medium |highest Severity|normal |major --- Comment #5 from V Stuart Foote --- Adjusting importance per QA guide, still needs a bibisect... -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |4 +---
sw/source/filter/ww8/docxattributeoutput.hxx |3 ---
2 files changed, 1 insertion(+), 6 deletions(-)
New commits:
commit c1fde0fb9ad90aca779dc3a58b5225ca2b66a1f8
Author: Noel Grandin
AuthorDate: Fri Mar 8 16:21:53 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Jul 26 18:37:13 2019 +0200
loplugin:singlevalfields
(cherry picked from commit bd4d702054d65b8e907c54835c579f14278e5899)
Change-Id: I7f9ff0fc58adf51eae7fef5ce925b91b8d1f4922
Reviewed-on: https://gerrit.libreoffice.org/76383
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Noel Grandin
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5254c445d7f1..ea3bb3800e69 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3696,7 +3696,6 @@ void DocxAttributeOutput::EndTableCell(sal_uInt32 nCell)
m_pSerializer->endElementNS( XML_w, XML_tc );
-m_bBtLr = false;
m_tableReference->m_bTableCellOpen = false;
m_tableReference->m_bTableCellParaSdtOpen = false;
}
@@ -7302,7 +7301,7 @@ void DocxAttributeOutput::CharIdctHint( const
SfxPoolItem& )
void DocxAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
{
// Not rotated or we the rotation already handled?
-if ( !rRotate.GetValue() || m_bBtLr ||
m_rExport.SdrExporter().getFrameBtLr())
+if ( !rRotate.GetValue() || m_rExport.SdrExporter().getFrameBtLr())
return;
AddToAttrList( m_pEastAsianLayoutAttrList, FSNS( XML_w, XML_vert ), "true"
);
@@ -9336,7 +9335,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
, const FSHelperPtr
m_nextFontId( 1 ),
m_tableReference(new TableReference()),
m_bIgnoreNextFill(false),
- m_bBtLr(false),
m_pTableStyleExport(new DocxTableStyleExport(rExport.m_pDoc,
pSerializer)),
m_bParaBeforeAutoSpacing(false),
m_bParaAfterAutoSpacing(false),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 201d0f1a31d6..7bbb2554a96d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -911,9 +911,6 @@ private:
/// If FormatBox() already handled fill style / gradient.
bool m_bIgnoreNextFill;
-/// Is fake rotation detected, so rotation with 90 degrees should be
ignored in this cell?
-bool m_bBtLr;
-
editeng::WordPageMargins m_pageMargins;
std::shared_ptr m_pTableStyleExport;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objmisc.cxx | 29 -
1 file changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 7942929685fafb0f9c82feb8da7279e5103c87f0
Author: Caolán McNamara
AuthorDate: Fri Jul 26 13:25:31 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 26 18:00:25 2019 +0200
decode url escape codes and check each path segment
Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1
Reviewed-on: https://gerrit.libreoffice.org/76378
Reviewed-by: Stephan Bergmann
Tested-by: Jenkins
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 3bbf59ccb91a..5ecfad4faf8e 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -43,6 +43,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -1347,7 +1349,32 @@ namespace
// don't allow LibreLogo to be used with our mouseover/etc dom-alike events
bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL)
{
-return
rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo");
+if (!rScriptURL.startsWith("vnd.sun.star.script:"))
+return false;
+
+// ensure URL Escape Codes are decoded
+css::uno::Reference uri(
+
css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())->parse(rScriptURL));
+css::uno::Reference sfUri(uri,
css::uno::UNO_QUERY);
+
+if (!sfUri.is())
+return false;
+
+OUString sScript = sfUri->getName();
+
+// check if any path portion matches LibreLogo and ban it if it does
+sal_Int32 nIndex = 0;
+do
+{
+OUString aToken = sScript.getToken(0, '/', nIndex);
+if (aToken.startsWithIgnoreAsciiCase("LibreLogo"))
+{
+return true;
+}
+}
+while (nIndex >= 0);
+
+return false;
}
ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >&
_rxScriptContext, const OUString& _rScriptURL,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 125372] FILEOPEN: LibreOffice freeze opening document (with many hints/tracked changes)
https://bugs.documentfoundation.org/show_bug.cgi?id=125372 Cor Nouws changed: What|Removed |Added CC||c...@nouenoff.nl Summary|FILEOPEN: LibreOffice |FILEOPEN: LibreOffice |freeze opening document |freeze opening document ||(with many hints/tracked ||changes) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fupage.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit f9190ae607a5766a087b8ed5d7ac29ec8a3272c9 Author: Caolán McNamara AuthorDate: Fri Jul 26 09:22:53 2019 +0100 Commit: Caolán McNamara CommitDate: Fri Jul 26 17:36:27 2019 +0200 cid#1448362 silence Dereference null return value Change-Id: I6b24a10bb2cd67d9750702a43d15162fb5347d76 Reviewed-on: https://gerrit.libreoffice.org/76366 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index ac3512ad5165..ae543ff9464f 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -370,7 +370,9 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, SfxRequest& rReq) } // if the background for this page was set to invisible, the background-object has to be deleted, too. -if( ( pTempSet->GetItem( XATTR_FILLSTYLE )->GetValue() == drawing::FillStyle_NONE ) || +const XFillStyleItem* pTempFillStyleItem = pTempSet->GetItem(XATTR_FILLSTYLE); +assert(pTempFillStyleItem); +if( ( pTempFillStyleItem->GetValue() == drawing::FillStyle_NONE ) || ( ( pTempSet->GetItemState( XATTR_FILLSTYLE ) == SfxItemState::DEFAULT ) && ( aMergedAttr.GetItem( XATTR_FILLSTYLE )->GetValue() == drawing::FillStyle_NONE ) ) ) mbPageBckgrdDeleted = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 126567] New: WRITER - Bug to save a style inf .docx format
https://bugs.documentfoundation.org/show_bug.cgi?id=126567 Bug ID: 126567 Summary: WRITER - Bug to save a style inf .docx format Product: LibreOffice Version: 6.2.5.2 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: joachim.mag...@gmail.com Description: Under WRITER. When I create a style into a .docx file the configuration of style doesn't save correctly Expl : I create a style with this configuration : Background : grey Border : black / 0,80 pt Shadow of border : grey 3 / 0,20 cm After I save the file and close it, I open it a new time. But the style configuration have change : Background : grey Border : black / **0,75 pt** Shadow of border : **black** / **0,05 cm** I don't have this problem with .ODT file. Environnement test : Ubuntu 18.04 2 version of libre office - 6.0.??? (i forget sorry) - 6.2.5.2 Steps to Reproduce: 1.With a .docx file, Create a style with shadow of border and specific configuration (color/blod of shadow) 2.Save and close the file 3.Open the File Actual Results: The style configuration is change Expected Results: The style configuration doen't change between the close and the opened .docx file Reproducible: Always User Profile Reset: Yes OpenGL enabled: Yes Additional Info: Version: 6.2.5.2 Build ID: 1ec314fa52f458adc18c4f025c545a4e8b22c159 Threads CPU : 4; OS : Linux 4.18; UI Render : par défaut; VCL: gtk3; Locale : fr-FR (fr_FR.UTF-8); Langue IHM : fr-FR Calc: threaded Sorry for my bad english -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: svtools/source
svtools/source/uno/unoevent.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f501519a2d14684c63edbfcfa3362cddad9f4ec9
Author: Caolán McNamara
AuthorDate: Fri Jul 26 09:19:52 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 26 17:24:11 2019 +0200
cid#1448414 silence Explicit null dereferenced
Change-Id: Ia9ddcf960e2bef2ea8db72018602302dc6914bb5
Reviewed-on: https://gerrit.libreoffice.org/76364
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index ab955e46489e..dfd43f93d46a 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -456,7 +456,7 @@ SvMacroTableEventDescriptor::SvMacroTableEventDescriptor(
const SvEventDescription* pSupportedMacroItems) :
SvDetachedEventDescriptor(pSupportedMacroItems)
{
-assert(pSupportedMacroItems);
+assert(mpSupportedMacroItems);
for(sal_Int16 i = 0; mpSupportedMacroItems[i].mnEvent !=
SvMacroItemId::NONE; i++)
{
const SvMacroItemId nEvent = mpSupportedMacroItems[i].mnEvent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/BulletAndPositionDlg.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 008a98d7cac16277dd88959339f172e11df74fba Author: Caolán McNamara AuthorDate: Fri Jul 26 09:36:27 2019 +0100 Commit: Caolán McNamara CommitDate: Fri Jul 26 17:05:00 2019 +0200 cid#1448222 Out-of-bounds read possibly gold Change-Id: I170d9ae52e7e2b2869655d6649496fce8661a20b Reviewed-on: https://gerrit.libreoffice.org/76368 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index 05f59426a2df..265274c1ff4d 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -525,6 +525,7 @@ void SvxBulletAndPositionDlg::InitControls() nNumberingType = SVX_NUM_NUMBER_NONE; bAllLevel = false; bSameDistBorderNum = false; +bSameIndent = false; bSameBulRelSize = false; bSameBulColor = false; bSameStart = false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
We'd like to continue the production of the 32-bit deb packages
Hi! Greetings from the Escuelas Linux team. We are small Linux distribution that can be downloaded from https://sourceforge.net/projects/escuelaslinux/. Some more references about our activity can be found by doing an Internet search, or on own Facebook account, escuelas.linux We still provide a 32-bit edition of our distro, because among our users there are a lot of low-income public schools, in which are still in use old computers with about 512 MB to a 1 GB of RAM. That amount of RAM would make running a Linux 64-bit system awfully slow, so we have to accommodate to the needs and possibilities of what is available in poor areas, those in which even having an old computer is still somehow a luxury. We perfectly understand that TDF releasing 32-bit Linux LibreOffice packages was not worth anymore, given the small amount of downloads. Certainly some of those downloads were made by us, as we only required one download of a given LibreOffice version to have it installed in our distro and be used in hundreds of computers. A lot of those computers could not even be traceable, since there are no Internet connection in poor or remote schools. But we believe that even if we reported who and where are those schools, that would be still a small amount to be worth the effort and resources required to match the bigger amounts of downloads that seems to be receiving the LibreOffice 32-bit Windows counterpart. Given that TDF ended the provision of Linux 32-bit distribution neutral binaries, but not the 32-bit compatibility, we would like to step up to produce by ourselves the 32-bit distribution neutral deb packages from LibreOffice 6.3 and up. We are not aware of other distros or volunteers releasing the most recent LibreOffice version to date (6.3) as 32-bit distribution independent binaries. Recently, the official LibreOffice Blog published instructions about how to compile LibreOffice on Linux. However, we’d like to be able not only to compile LibreOffice, but we would like to learn how to be able to produce by ourselves the same set of 32-bit distribution-independent deb packages that were compressed as a .tar.gz, that is, the LibreOffice binaries (LibreOffice_?.?.?_Linux_x86-_deb.tar.gz), the translated user interface (the LibreOffice_?.?.?_Linux_x86-_deb_langpack_??.tar.gz) and the offline help (LibreOffice_?.?.?_Linux_x86-_deb_helppack_??.tar.gz). As for the user interface and the offline packages, our main focus would be Spanish language. On the download section is always available the following source code packages: libreoffice-?.?.?.?.tar.xz libreoffice-dictionaries-?.?.?.?.tar.xz libreoffice-help-?.?.?.?.tar.xz libreoffice-translations-?.?.?.?.tar.xz But, given our inexperience, we don’t know how to use this source packages to produce the same set of 32-bit deb packages as were previously provided by TDF. Since LibreOffice is distributed in a lot of languages, we guess that the user interface and offline packages are not created manually one by one by hand, some useful scripts could have been created to automate as far as possible those tasks. So, we respectfully ask for some pointers and steps required to reach this goal. In this way, we might be able to continue the production of the 32-bit deb packages, freeing TDF of that burden as planned but, at the same time, we could provide those packages for the parties that could be still interested in them. We could not be able to support rpm-based binaries though, someone else would have to step up if there's a need for that. Please let us know if this request of help is feasible for the Developer(s) that are responsible of the LibreOffice packaging. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/moduldl2.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9369b2d0d01b6c7c406e8dc2f30836a6ca624787
Author: Caolán McNamara
AuthorDate: Fri Jul 26 09:14:15 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 26 16:58:32 2019 +0200
cid#1292911 Big parameter passed by value
Change-Id: I3698fc4d8e556f75641cf951da87a9acbf81af78
Reviewed-on: https://gerrit.libreoffice.org/76363
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/basctl/source/basicide/moduldl2.cxx
b/basctl/source/basicide/moduldl2.cxx
index 515cbc55aa67..e999f4622189 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -595,7 +595,7 @@ void LibPage::InsertLib()
Sequence< OUString > aFiles = xFP->getSelectedFiles();
INetURLObject aURLObj( aFiles[0] );
INetURLObject aModURLObj( aURLObj );
-INetURLObject aDlgURLObj( aURLObj );
+std::shared_ptr xDlgURLObj(new INetURLObject(aURLObj));
OUString aBase = aURLObj.getBase();
OUString aModBase( "script" );
@@ -604,7 +604,7 @@ void LibPage::InsertLib()
if ( aBase == aModBase || aBase == aDlgBase )
{
aModURLObj.setBase( aModBase );
-aDlgURLObj.setBase( aDlgBase );
+xDlgURLObj->setBase( aDlgBase );
}
Reference< XSimpleFileAccess3 > xSFA(
SimpleFileAccess::create(comphelper::getProcessComponentContext()) );
@@ -615,7 +615,7 @@ void LibPage::InsertLib()
xModLibContImport =
script::DocumentScriptLibraryContainer::createWithURL(xContext, aModURL);
}
-OUString aDlgURL( aDlgURLObj.GetMainURL(
INetURLObject::DecodeMechanism::NONE ) );
+OUString aDlgURL( xDlgURLObj->GetMainURL(
INetURLObject::DecodeMechanism::NONE ) );
if ( xSFA->exists( aDlgURL ) )
{
xDlgLibContImport =
script::DocumentDialogLibraryContainer::createWithURL(xContext, aDlgURL);
@@ -669,7 +669,7 @@ void LibPage::InsertLib()
if ( aExtension != aLibExtension && aExtension != aContExtension )
xLibDlg->EnableReference(false);
-weld::DialogController::runAsync(xLibDlg, [aContExtension, aDlgURLObj,
aExtension, aLibExtension, aModURLObj, xLibDlg, xDlgLibContImport,
xModLibContImport, this](sal_Int32 nResult)
+weld::DialogController::runAsync(xLibDlg, [aContExtension, xDlgURLObj,
aExtension, aLibExtension, aModURLObj, xLibDlg, xDlgLibContImport,
xModLibContImport, this](sal_Int32 nResult)
{
if (!nResult )
return;
@@ -847,7 +847,7 @@ void LibPage::InsertLib()
if ( bReference )
{
// storage URL
-INetURLObject aDlgStorageURLObj( aDlgURLObj );
+INetURLObject aDlgStorageURLObj( *xDlgURLObj );
if ( aExtension == aContExtension )
{
sal_Int32 nCount =
aDlgStorageURLObj.getSegmentCount();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 105013] time of digital signature is zero in File > Properties > General
https://bugs.documentfoundation.org/show_bug.cgi?id=105013 Oliver Brinzing changed: What|Removed |Added CC||oliver.brinz...@gmx.de --- Comment #10 from Oliver Brinzing --- reproducible with LO 6.1.6.3 but no longer with: Version: 6.2.5.2 (x64) Build ID: 1ec314fa52f458adc18c4f025c545a4e8b22c159 CPU threads: 4; OS: Windows 10.0; UI render: default; VCL: win; Locale: de-DE (de_DE); UI-Language: en-US -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126552] calc subtraction imprecision
https://bugs.documentfoundation.org/show_bug.cgi?id=126552 Aron Budea changed: What|Removed |Added Resolution|--- |NOTABUG Status|REOPENED|RESOLVED --- Comment #7 from Aron Budea --- There's no issue here, please read the linked wikipedia article on floating point operations. Thank you. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 97694] Base macros cannot be digitally signed
https://bugs.documentfoundation.org/show_bug.cgi?id=97694 Oliver Brinzing changed: What|Removed |Added CC||oliver.brinz...@gmx.de --- Comment #9 from Oliver Brinzing --- reproducible with: Version: 6.2.5.2 (x64) Build ID: 1ec314fa52f458adc18c4f025c545a4e8b22c159 CPU threads: 4; OS: Windows 10.0; UI render: default; VCL: win; Locale: de-DE (de_DE); UI-Language: en-US Calc: -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92825] [META] Update help for all menu changes
https://bugs.documentfoundation.org/show_bug.cgi?id=92825 V Stuart Foote changed: What|Removed |Added Depends on||126555 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=126555 [Bug 126555] UI: "Distribution…" menu is missing -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/lib/MultiMethodTest.java |1 -
1 file changed, 1 deletion(-)
New commits:
commit 986e4f94b802f9f603c5e744f69f2dc14b4d91f3
Author: Caolán McNamara
AuthorDate: Fri Jul 26 09:03:04 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 26 16:38:31 2019 +0200
cid#1448350 RV: Bad use of return value
Change-Id: Ib8fb2c0e4cbee4cab739beaa273d588e8723ff12
Reviewed-on: https://gerrit.libreoffice.org/76361
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java
b/qadevOOo/runner/lib/MultiMethodTest.java
index 45ef58eb3054..81a87f3f47de 100644
--- a/qadevOOo/runner/lib/MultiMethodTest.java
+++ b/qadevOOo/runner/lib/MultiMethodTest.java
@@ -138,7 +138,6 @@ public class MultiMethodTest
this.tRes = new TestResult();
Class testedClass;
-getInterfaceName();
System.out.print("checking: [" + entry.longName + "]");
// defining a name of the class corresponding to the tested interface
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 126555] UI: "Distribution…" menu is missing
https://bugs.documentfoundation.org/show_bug.cgi?id=126555 V Stuart Foote changed: What|Removed |Added Status|RESOLVED|NEW Component|Impress |Documentation Resolution|NOTABUG |--- Blocks||92825 Ever confirmed|0 |1 CC||olivier.hallot@libreoffice. ||org --- Comment #3 from V Stuart Foote --- Also, Distribution is on the main menus for Draw and Impress with ellipsis indicating the popup dialog. Draw -> Shape menu Impress -> Format menu That Wiki help dates from 2011. But the online & local help articles [1][2] need do need to be updated. So, it is a valid documentation issue... => NEW =-ref-= [1] https://help.libreoffice.org/6.2/en-US/text/shared/01/0536.html [2] https://help.libreoffice.org/6.2/en-US/text/sdraw/guide/align_arrange.html Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=92825 [Bug 92825] [META] Update help for all menu changes -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92825] [META] Update help for all menu changes
https://bugs.documentfoundation.org/show_bug.cgi?id=92825 Bug 92825 depends on bug 126555, which changed state. Bug 126555 Summary: UI: "Distribution…" menu is missing https://bugs.documentfoundation.org/show_bug.cgi?id=126555 What|Removed |Added Status|RESOLVED|NEW Resolution|NOTABUG |--- -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126544] in DOCX files, some styles's "text direction" appears Right-to-Left or Left-to-Right depending on User Interface Language
https://bugs.documentfoundation.org/show_bug.cgi?id=126544 --- Comment #3 from eladh...@gmail.com --- Bug still present in: Version: 6.3.0.2 Build ID: 728469fa359ba8c83d812146293a0b0aa53945ba CPU threads: 4; OS: Linux 4.4; UI render: default; VCL: gtk3; Locale: he-IL (he_IL.UTF-8); UI-Language: en-US -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126543] Hebrew interface menus appear on the left, though act as though they're on the right
https://bugs.documentfoundation.org/show_bug.cgi?id=126543 --- Comment #3 from eladh...@gmail.com --- The bug ISN'T present in: Version: 6.3.0.2 Build ID: 728469fa359ba8c83d812146293a0b0aa53945ba CPU threads: 4; OS: Linux 4.4; UI render: default; VCL: gtk3; Locale: he-IL (he_IL.UTF-8); UI-Language: en-US -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - uui/source
uui/source/ids.src | 173 ++---
1 file changed, 73 insertions(+), 100 deletions(-)
New commits:
commit b40aa0ad86a48d66e7f77c88bba02c3882cd71e5
Author: Matthias Seidel
AuthorDate: Fri Jul 26 12:07:57 2019 +
Commit: Matthias Seidel
CommitDate: Fri Jul 26 12:07:57 2019 +
Cleaned up whitespace
diff --git a/uui/source/ids.src b/uui/source/ids.src
index 1fb5966df48a..4220fab53006 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -29,12 +29,12 @@
String RID_KEEP_PASSWORD
{
-Text [ en-US ] = "~Remember password until end of session";
+Text [ en-US ] = "~Remember password until end of session" ;
};
String RID_SAVE_PASSWORD
{
-Text [ en-US ] = "~Remember password";
+Text [ en-US ] = "~Remember password" ;
};
@@ -52,379 +52,352 @@ Resource RID_UUI_ERRHDL
{
String (ERRCODE_UUI_IO_ABORT & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The operation executed on $(ARG1) was aborted.";
+Text [ en-US ] = "The operation executed on $(ARG1) was aborted." ;
};
String (ERRCODE_UUI_IO_ACCESSDENIED & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Access to $(ARG1) was denied.";
+Text [ en-US ] = "Access to $(ARG1) was denied." ;
};
String (ERRCODE_UUI_IO_ALREADYEXISTS & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "$(ARG1) already exists.";
+Text [ en-US ] = "$(ARG1) already exists." ;
};
String (ERRCODE_UUI_IO_TARGETALREADYEXISTS & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Target already exists.";
+Text [ en-US ] = "Target already exists." ;
};
String (ERRCODE_UUI_IO_MODULESIZEEXCEEDED & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "You are about to save/export a password protected
basic library containing module(s) \n$(ARG1)\nwhich are too large to store in
binary format. If you wish users that don't have access to the library password
to be able to run macros in those module(s) you must split those modules into a
number of smaller modules. Do you wish to continue to save/export this
library?" ;
+Text [ en-US ] = "You are about to save/export a password protected
basic library containing module(s)\n$(ARG1)\nwhich are too large to store in
binary format. If you wish users that don't have access to the library password
to be able to run macros in those module(s) you must split those modules into a
number of smaller modules. Do you wish to continue to save/export this
library?" ;
};
String (ERRCODE_UUI_IO_BADCRC & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The data from $(ARG1) has an incorrect checksum.";
+Text [ en-US ] = "The data from $(ARG1) has an incorrect checksum." ;
};
String (ERRCODE_UUI_IO_CANTCREATE & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The object $(ARG1) cannot be created in directory
$(ARG2).";
+Text [ en-US ] = "The object $(ARG1) cannot be created in directory
$(ARG2)." ;
};
String (ERRCODE_UUI_IO_CANTREAD & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Data of $(ARG1) could not be read.";
+Text [ en-US ] = "Data of $(ARG1) could not be read." ;
};
String (ERRCODE_UUI_IO_CANTSEEK & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The seek operation on $(ARG1) could not be
performed.";
+Text [ en-US ] = "The seek operation on $(ARG1) could not be
performed." ;
};
String (ERRCODE_UUI_IO_CANTTELL & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The tell operation on $(ARG1) could not be
performed.";
+Text [ en-US ] = "The tell operation on $(ARG1) could not be
performed." ;
};
String (ERRCODE_UUI_IO_CANTWRITE & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Data for $(ARG1) could not be written.";
+Text [ en-US ] = "Data for $(ARG1) could not be written." ;
};
String (ERRCODE_UUI_IO_CURRENTDIR & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Action impossible: $(ARG1) is the current
directory.";
+Text [ en-US ] = "Action impossible: $(ARG1) is the current
directory." ;
};
String (ERRCODE_UUI_IO_NOTREADY & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "$(ARG1) is not ready.";
+Text [ en-US ] = "$(ARG1) is not ready." ;
};
String (ERRCODE_UUI_IO_NOTSAMEDEVICE & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Action impossible: $(ARG1) and $(ARG2) are different
devices (drives).";
+Text [ en-US ] = "Action impossible: $(ARG1) and $(ARG2) are different
devices (drives)." ;
};
String (ERRCODE_UUI_IO_GENERAL & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "General input/output error while accessing $(ARG1).";
+Text [ en-US ] = "General input/output error while accessing $(ARG1)."
;
};
String (ERRCODE_UUI_IO_INVALIDACCESS & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "An attempt was made
[Libreoffice-bugs] [Bug 126555] UI: "Distribution…" menu is missing
https://bugs.documentfoundation.org/show_bug.cgi?id=126555 V Stuart Foote changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG CC||vstuart.fo...@utsa.edu --- Comment #2 from V Stuart Foote --- Not missing, the button action is on resident on the Drawing toolbar (and several Notebook Bar panels) but it is available to add by customization to the Context menu. Done simply: Impress (or Draw) session, Tools -> Customize -> "Context menus" tab Select "Target" as 'Shape' via droplist (on opening it is pointint to 3D Object) In "Search" box type "distri", select the "Distribution" widget Use the "Add item" arrow to move the "Distribution" widget into the context menu. Use the "Move up"/"Move up" arrows to position where you prefer. OK out. May need to close Impress session at 6.2, immediate for current master/6.4 Context menu action is then available to distribute shapes via the popup "Distribution" dialog. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 74 ---
1 file changed, 42 insertions(+), 32 deletions(-)
New commits:
commit cba5cd06c8ffd8628ae3d39efe715a5d8b3ac7e7
Author: Noel Grandin
AuthorDate: Fri Jul 26 12:49:10 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Jul 26 16:01:31 2019 +0200
add some error checking to the UI file loading
so we error out early when we have a bug in the file name, or a bug in
the id, instead of triggering a SIGSEGV much later on
Change-Id: Iacde09df620acdd8ae86321d38e8ce0c99715d42
Reviewed-on: https://gerrit.libreoffice.org/76375
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index af20ca70ca06..a472537c2bfd 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -10433,7 +10433,9 @@ public:
osl::FileBase::getSystemPathFromFileURL(aUri, aPath);
m_pBuilder = gtk_builder_new();
m_nNotifySignalId = g_signal_connect_data(G_OBJECT(m_pBuilder),
"notify", G_CALLBACK(signalNotify), this, nullptr, G_CONNECT_AFTER);
-gtk_builder_add_from_file(m_pBuilder, OUStringToOString(aPath,
RTL_TEXTENCODING_UTF8).getStr(), nullptr);
+auto rc = gtk_builder_add_from_file(m_pBuilder,
OUStringToOString(aPath, RTL_TEXTENCODING_UTF8).getStr(), nullptr);
+assert(rc && "could not load UI file");
+(void) rc;
m_pObjectList = gtk_builder_get_objects(m_pBuilder);
g_slist_foreach(m_pObjectList, postprocess, this);
@@ -10486,9 +10488,17 @@ public:
gtk_container_add(GTK_CONTAINER(m_pParentWidget), pWidget);
}
+static GObject* builder_get_object(GtkBuilder* pBuilder, const OString )
+{
+auto pObject = gtk_builder_get_object(pBuilder, id.getStr());
+SAL_WARN_IF(!pObject, "vcl.gtk", "could not load object '" << id << "'
from UI file");
+assert(pObject && "could not load GTK object");
+return pObject;
+}
+
virtual std::unique_ptr weld_message_dialog(const
OString , bool bTakeOwnership) override
{
-GtkMessageDialog* pMessageDialog =
GTK_MESSAGE_DIALOG(gtk_builder_get_object(m_pBuilder, id.getStr()));
+GtkMessageDialog* pMessageDialog =
GTK_MESSAGE_DIALOG(builder_get_object(m_pBuilder, id));
if (!pMessageDialog)
return nullptr;
gtk_window_set_transient_for(GTK_WINDOW(pMessageDialog),
GTK_WINDOW(gtk_widget_get_toplevel(m_pParentWidget)));
@@ -10497,7 +10507,7 @@ public:
virtual std::unique_ptr weld_about_dialog(const OString
, bool bTakeOwnership) override
{
-GtkAboutDialog* pAboutDialog =
GTK_ABOUT_DIALOG(gtk_builder_get_object(m_pBuilder, id.getStr()));
+GtkAboutDialog* pAboutDialog =
GTK_ABOUT_DIALOG(builder_get_object(m_pBuilder, id));
if (!pAboutDialog)
return nullptr;
gtk_window_set_transient_for(GTK_WINDOW(pAboutDialog),
GTK_WINDOW(gtk_widget_get_toplevel(m_pParentWidget)));
@@ -10506,7 +10516,7 @@ public:
virtual std::unique_ptr weld_dialog(const OString , bool
bTakeOwnership) override
{
-GtkDialog* pDialog = GTK_DIALOG(gtk_builder_get_object(m_pBuilder,
id.getStr()));
+GtkDialog* pDialog = GTK_DIALOG(builder_get_object(m_pBuilder, id));
if (!pDialog)
return nullptr;
if (m_pParentWidget)
@@ -10516,13 +10526,13 @@ public:
virtual std::unique_ptr weld_window(const OString , bool
bTakeOwnership) override
{
-GtkWindow* pWindow = GTK_WINDOW(gtk_builder_get_object(m_pBuilder,
id.getStr()));
+GtkWindow* pWindow = GTK_WINDOW(builder_get_object(m_pBuilder, id));
return pWindow ? std::make_unique(pWindow, this,
bTakeOwnership) : nullptr;
}
virtual std::unique_ptr weld_widget(const OString , bool
bTakeOwnership) override
{
-GtkWidget* pWidget = GTK_WIDGET(gtk_builder_get_object(m_pBuilder,
id.getStr()));
+GtkWidget* pWidget = GTK_WIDGET(builder_get_object(m_pBuilder, id));
if (!pWidget)
return nullptr;
auto_add_parentless_widgets_to_container(pWidget);
@@ -10531,7 +10541,7 @@ public:
virtual std::unique_ptr weld_container(const OString ,
bool bTakeOwnership) override
{
-GtkContainer* pContainer =
GTK_CONTAINER(gtk_builder_get_object(m_pBuilder, id.getStr()));
+GtkContainer* pContainer =
GTK_CONTAINER(builder_get_object(m_pBuilder, id));
if (!pContainer)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pContainer));
@@ -10540,7 +10550,7 @@ public:
virtual std::unique_ptr weld_frame(const OString , bool
bTakeOwnership) override
{
-GtkFrame* pFrame = GTK_FRAME(gtk_builder_get_object(m_pBuilder,
id.getStr()));
+GtkFrame* pFrame = GTK_FRAME(builder_get_object(m_pBuilder, id));
if (!pFrame)
[Libreoffice-commits] core.git: package/qa swext/mediawiki
package/qa/storages/RegressionTest_i27773.java |2
+-
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java |2
+-
swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java |4
++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 3e7badd7755385b98c8564b0ec89d356ff3dc00d
Author: Andrea Gelmini
AuthorDate: Tue Jul 23 19:57:24 2019 +0200
Commit: Julien Nabet
CommitDate: Fri Jul 26 16:00:12 2019 +0200
Fix typo
"noncommited"
Change-Id: Ia22431edf221d3824d84512f0e77dbb1758f35cd
Reviewed-on: https://gerrit.libreoffice.org/75982
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/package/qa/storages/RegressionTest_i27773.java
b/package/qa/storages/RegressionTest_i27773.java
index ac592d965766..2348a809ce90 100644
--- a/package/qa/storages/RegressionTest_i27773.java
+++ b/package/qa/storages/RegressionTest_i27773.java
@@ -168,7 +168,7 @@ public class RegressionTest_i27773 implements StorageTest {
return false;
-// copy all the changed and noncommited substorages
+// copy all the changed and noncommitted substorages
// and dispose them
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index 573a6dd75b11..3d1bee21e735 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -208,7 +208,7 @@ public final class WikiEditorImpl extends WeakBase
throw new com.sun.star.uno.RuntimeException();
}
-m_aSettings.loadConfiguration(); // throw away all the
noncommited changes
+m_aSettings.loadConfiguration(); // throw away all the
noncommitted changes
// show the send dialog
aSendDialog = new WikiPropDialog( m_xContext,
"vnd.sun.star.script:WikiEditor.SendToMediaWiki?location=application", this );
aSendDialog.fillWikiList();
diff --git
a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
index c3a1f462a89f..c35246be4d9c 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
@@ -233,11 +233,11 @@ public final class WikiOptionsEventHandlerImpl extends
WeakBase
m_xDialog = UnoRuntime.queryInterface( XDialog.class,
xWindow );
m_xControlContainer = UnoRuntime.queryInterface(
XControlContainer.class, m_xDialog );
m_aSettings = Settings.getSettings( m_xContext );
-m_aSettings.loadConfiguration(); // throw away all the
noncommited changes
+m_aSettings.loadConfiguration(); // throw away all the
noncommitted changes
InitStrings();
}
else if ( m_aSettings != null )
-m_aSettings.loadConfiguration(); // throw away all the
noncommited changes
+m_aSettings.loadConfiguration(); // throw away all the
noncommitted changes
RefreshView();
CheckButtonState();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/filter
include/filter/msfilter/escherex.hxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bf10c88d382681b7c7979302060999b6ee996187
Author: Andrea Gelmini
AuthorDate: Thu Jul 25 00:19:52 2019 +0200
Commit: Julien Nabet
CommitDate: Fri Jul 26 15:58:29 2019 +0200
Fix typo
Change-Id: Id01f3ef311e2fccc5fafa51d4fe19c0012f91345
Reviewed-on: https://gerrit.libreoffice.org/75560
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index fe66f986fea0..729e98835a63 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -56,7 +56,7 @@ namespace tools {
class PolyPolygon;
}
-/*Record Name FBT-Value Instance Contents
Wrd Exl PPt Ver*/
+/*Record Name FBT-Value Instance Contents
Wrd Exl PPT Ver*/
// In the Microsoft documentation the naming scheme is msofbt... instead of
ESCHER_...
#define ESCHER_DggContainer 0xF000u /*
per-document data X X X
*/
#define ESCHER_Dgg 0xF006u /* an FDGG
and several FIDCLs X X X 0 */
@@ -980,7 +980,7 @@ public:
/** Creates and returns a new shape identifier, updates the internal shape
counters and registers the identifier in the DGG cluster table.
@param nDrawingId Drawing identifier has to be passed to be able to
-generate shape identifiers for multiple drawings simultaniously. */
+generate shape identifiers for multiple drawings simultaneously. */
sal_uInt32 GenerateShapeId( sal_uInt32 nDrawingId, bool bIsInSpgr
);
/** Returns the number of shapes in the current drawing, based on number of
calls to the GenerateShapeId() function. */
@@ -1208,7 +1208,7 @@ public:
/// Called if an ESCHER_Prop_lTxid shall be written
virtual sal_uInt32 QueryTextID( const css::uno::Reference<
css::drawing::XShape >&, sal_uInt32 nShapeId );
-// add an dummy rectangle shape into the escher stream
+// add a dummy rectangle shape into the escher stream
sal_uInt32 AddDummyShape();
static const SdrObject* GetSdrObject( const css::uno::Reference<
css::drawing::XShape >& rXShape );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/dockwin.hxx |2 +-
sfx2/source/sidebar/SidebarController.cxx | 14 +-
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit eef4898f463c552a1e378e7ca7426fbec91d6873
Author: Ashod Nakashian
AuthorDate: Sat Dec 8 11:50:28 2018 -0500
Commit: Noel Grandin
CommitDate: Fri Jul 26 15:29:47 2019 +0200
sfx: LOK: no sidebar tabbar
Change-Id: I210df42fec4404ed9629c9b1c24c78b680212214
Reviewed-on: https://gerrit.libreoffice.org/73517
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 95be9d6444dc..c57d171e7e03 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -90,7 +90,7 @@ public:
const tools::Rectangle&GetInnerRect() const{
return aInnerRect; }
const tools::Rectangle&GetOuterRect() const{
return aOuterRect; }
SfxBindings&GetBindings() const { return
*pBindings; }
-sal_uInt16 GetType() const { return
pMgr->GetType(); }
+sal_uInt16 GetType() const { return
pMgr->GetType(); }
SfxChildAlignment GetAlignment() const{ return
pMgr->GetAlignment(); }
voidSetAlignment(SfxChildAlignment eAlign) {
pMgr->SetAlignment(eAlign); }
const Size& GetFloatingSize() const { return
aFloatSize; }
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index b2094e04631b..7261b12eeb82 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -340,7 +340,7 @@ void SidebarController::NotifyResize()
}
vcl::Window* pParentWindow = mpTabBar->GetParent();
-sal_Int32 nTabBarDefaultWidth = TabBar::GetDefaultWidth() *
mpTabBar->GetDPIScaleFactor();
+const sal_Int32 nTabBarDefaultWidth = TabBar::GetDefaultWidth() *
mpTabBar->GetDPIScaleFactor();
const sal_Int32 nWidth (pParentWindow->GetSizePixel().Width());
const sal_Int32 nHeight (pParentWindow->GetSizePixel().Height());
@@ -372,13 +372,17 @@ void SidebarController::NotifyResize()
else // attach the Sidebar towards the right-side of screen
{
nDeckX = 0;
-nTabX = nWidth-nTabBarDefaultWidth;
+nTabX = nWidth - nTabBarDefaultWidth;
}
// Place the deck first.
if (bIsDeckVisible)
{
-mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth -
nTabBarDefaultWidth, nHeight);
+// No TabBar in LOK.
+if (comphelper::LibreOfficeKit::isActive())
+mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, nHeight);
+else
+mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth -
nTabBarDefaultWidth, nHeight);
mpCurrentDeck->Show();
mpCurrentDeck->RequestLayout();
}
@@ -387,8 +391,8 @@ void SidebarController::NotifyResize()
// Now place the tab bar.
mpTabBar->setPosSizePixel(nTabX, 0, nTabBarDefaultWidth, nHeight);
-mpTabBar->Show();
-
+if (!comphelper::LibreOfficeKit::isActive())
+mpTabBar->Show(); // Don't show TabBar in LOK.
}
// Determine if the closer of the deck can be shown.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 126566] New: option page "Security/Macro Security/Trusted Sources": columns are hidden
https://bugs.documentfoundation.org/show_bug.cgi?id=126566 Bug ID: 126566 Summary: option page "Security/Macro Security/Trusted Sources": columns are hidden Product: LibreOffice Version: 6.2.5.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: UI Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: oliver.brinz...@gmx.de Created attachment 153000 --> https://bugs.documentfoundation.org/attachment.cgi?id=153000=edit Trusted Certificates please have a look at the attachment: the columns "Issued to" and "Issued by" are hidden by default -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/sidebar/SidebarDockingWindow.hxx |3 +++
sfx2/source/sidebar/SidebarController.cxx | 16 +---
sfx2/source/sidebar/SidebarDockingWindow.cxx | 15 ++-
3 files changed, 30 insertions(+), 4 deletions(-)
New commits:
commit b01f4eb13e15d5149379561e9608bed5d670271b
Author: Ashod Nakashian
AuthorDate: Tue Nov 27 09:26:27 2018 -0500
Commit: Noel Grandin
CommitDate: Fri Jul 26 15:22:23 2019 +0200
LOK: sidebar: publish notifications to the correct view
The ViewShell, which represents the view in question and therefore
which view gets the window notifications, is incorrect when
the sidebar is first created upon creating/attaching a new view.
This leads us to a workaround to make sure that we publish
notifications to the correct view.
We also have to hide the sidebar instead of closing because
the workaround wouldn't work when re-creating the sidebar
on an existing view. See comments in code.
Change-Id: I9d3be901688291b04d634b68e1e20c7add77381f
Reviewed-on: https://gerrit.libreoffice.org/73516
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx
b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index 5e54f00b53ad..e54d55f2b791 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx
@@ -23,6 +23,8 @@
#include
+class SfxViewShell;
+
namespace svt { class AcceleratorExecute; }
namespace sfx2 { namespace sidebar {
@@ -65,6 +67,7 @@ private:
void DoDispose();
const bool mbSidebarVisibleInLOK;
+const SfxViewShell* mpOldViewShell;
};
} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index bbdb1a4c8c67..b2094e04631b 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1076,10 +1076,20 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*,
pMenu, bool)
case MID_HIDE_SIDEBAR:
{
-const util::URL aURL (Tools::GetURL(".uno:Sidebar"));
-Reference xDispatch (Tools::GetDispatch(mxFrame,
aURL));
-if (xDispatch.is())
+if (!comphelper::LibreOfficeKit::isActive())
+{
+const util::URL aURL(Tools::GetURL(".uno:Sidebar"));
+Reference
xDispatch(Tools::GetDispatch(mxFrame, aURL));
+if (xDispatch.is())
xDispatch->dispatch(aURL,
Sequence());
+}
+else
+{
+// In LOK we don't really destroy the sidebar when "closing";
+// we simply hide it. This is because recreating it is
problematic
+// See notes in SidebarDockingWindow::NotifyResize().
+RequestCloseDeck();
+}
break;
}
default:
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index a12bb6f4d12e..f76e71fc2d45 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -43,6 +43,7 @@ SidebarDockingWindow::SidebarDockingWindow(SfxBindings*
pSfxBindings, SidebarChi
, mpSidebarController()
, mbIsReadyToDrag(false)
, mbSidebarVisibleInLOK(rChildWindow.IsSidebarVisibleInLOK())
+, mpOldViewShell(SfxViewShell::Current())
{
// Get the XFrame from the bindings.
if (pSfxBindings==nullptr || pSfxBindings->GetDispatcher()==nullptr)
@@ -113,7 +114,19 @@ void SidebarDockingWindow::NotifyResize()
{
if (comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current() &&
mbSidebarVisibleInLOK)
{
-if (mpSidebarController.is() && !GetLOKNotifier())
+// When a new view is attached, and Sidebar is created
(SidebarDockingWindow is constructed),
+// unfortunately we still have the *old* ViewShell (and ViewFrame).
This happens because
+// we get multiple NotifyResize are called while
SfxBaseController::ConnectSfxFrame_Impl
+// goes through the motions of creating and attaching a new frame/view.
+// Problem is that once we SetLOKNotifier on a window, we can't change
it. So we better
+// set the correct one. Worse, if we set the old one, we will change
the sidebar of the
+// wrong view, messing things up badly for the users.
+// Knowing the above, we wait until the dust settles, by observing
when the ViewShell is
+// changed from the time we were created.
+// Note: this means we *cannot* create a sidebar post attaching a new
view because the
+// ViewShell will not change, and therefore we will never
SetLOKNotifier. To avoid that
+// we hide sidebars instead of closing (see OnMenuItemSelected in
SidebarController).
+if (mpSidebarController.is() &&
[Libreoffice-commits] core.git: libreofficekit/qa
libreofficekit/qa/gtktiledviewer/gtv-application.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 3cb02bcee8d5f5550952967f9d40475d2f08b61b
Author: Ashod Nakashian
AuthorDate: Mon Apr 29 22:21:39 2019 -0400
Commit: Noel Grandin
CommitDate: Fri Jul 26 15:20:28 2019 +0200
gtktiledviewer: provide activation function
This fixes the gtktiledviewer on some distros/gtk
versions that require an activation function to be
provided.
Change-Id: I95fb3ed4e92e27d9c725ca38b4cb5a4f8af51771
Reviewed-on: https://gerrit.libreoffice.org/71588
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/76373
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index 15e5f15f1697..7481076778eb 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -28,6 +28,12 @@ getPrivate(GtvApplication* app)
}
static void
+gtv_application_activate(GApplication*)
+{
+// If this isn't provided, some GTK versions fail to run us at all.
+}
+
+static void
gtv_application_open(GApplication* app, GFile** file, gint /*nFiles*/, const
gchar* /*hint*/)
{
// TODO: add some option to create a new view for existing document
@@ -145,6 +151,7 @@ gtv_application_handle_local_options(GApplication* app,
GVariantDict* options)
static void
gtv_application_class_init(GtvApplicationClass* klass)
{
+G_APPLICATION_CLASS(klass)->activate = gtv_application_activate;
G_APPLICATION_CLASS(klass)->open = gtv_application_open;
G_APPLICATION_CLASS(klass)->handle_local_options =
gtv_application_handle_local_options;
G_OBJECT_CLASS(klass)->dispose = gtv_application_dispose;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/filtergrouping.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 008d3af39e7339c004b03d40cd865f85e925bf35 Author: Andrea Gelmini AuthorDate: Fri Jul 19 20:43:50 2019 +0200 Commit: Noel Grandin CommitDate: Fri Jul 26 15:04:50 2019 +0200 Fix typo Change-Id: I4ef49f18dd1cf864cc875f12740e027e5e1c1de9 Reviewed-on: https://gerrit.libreoffice.org/75981 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index d8a65266a061..0701c5c62f77 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -60,7 +60,7 @@ namespace sfx2 Some general words about what's going on here In our file open dialog, usually we display every filter we know. That's how it was before: every filter -lead to an own line in the filter list box, e.g. "StarWriter 5.0 Dokument" or "Microsoft Word 97". +lead to an own line in the filter list box, e.g. "StarWriter 5.0 Document" or "Microsoft Word 97". But then the PM came. And everything changed @@ -76,7 +76,7 @@ namespace sfx2 is a matter of this implementation. We only do this grouping and suggest it to the FilePicker service ... Now for the second concept: -Thinking about it (and that's what the PM did), both "StarWriter 5.0 Dokument" and "Microsoft Word 97" +Thinking about it (and that's what the PM did), both "StarWriter 5.0 Document" and "Microsoft Word 97" describe a text document. It's a text. It's of no interest for the user that one of the texts was saved in MS' format, and one in our own format. So in a first step, we want to have a filter entry "Text documents". This would cover both above-mentioned ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 126528] [LocalHelp] Add Python info inside "Organize macros" help page
https://bugs.documentfoundation.org/show_bug.cgi?id=126528 Olivier Hallot changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |olivier.hallot@libreoffice. |desktop.org |org -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
