[Libreoffice-commits] core.git: 4 commits - accessibility/source basctl/source cppcanvas/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/so
accessibility/source/extended/accessiblelistbox.cxx |2 basctl/source/basicide/baside2b.cxx |6 basctl/source/basicide/bastype2.cxx |2 basctl/source/basicide/macrodlg.cxx |2 cppcanvas/source/inc/outdevstate.hxx |4 cppcanvas/source/mtfrenderer/implrenderer.cxx |6 cui/source/customize/acccfg.cxx |2 cui/source/customize/cfg.cxx |2 cui/source/customize/macropg.cxx |2 cui/source/dialogs/hangulhanjadlg.cxx |2 cui/source/dialogs/iconcdlg.cxx |2 cui/source/dialogs/linkdlg.cxx|2 cui/source/dialogs/scriptdlg.cxx |2 cui/source/options/dbregister.cxx |2 cui/source/options/fontsubs.cxx |2 cui/source/options/optpath.cxx|2 cui/source/options/treeopt.cxx|2 cui/source/tabpages/chardlg.cxx |2 cui/source/tabpages/macroass.cxx |2 dbaccess/source/ui/app/AppDetailPageHelper.cxx|2 dbaccess/source/ui/app/AppDetailView.cxx |2 dbaccess/source/ui/app/AppIconControl.cxx |2 dbaccess/source/ui/dlg/adtabdlg.cxx |4 dbaccess/source/ui/dlg/indexdialog.cxx|2 dbaccess/source/ui/dlg/sqlmessage.cxx |2 dbaccess/source/ui/dlg/tablespage.cxx |2 dbaccess/source/ui/misc/WNameMatch.cxx|2 dbaccess/source/ui/querydesign/TableWindow.cxx|2 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |2 desktop/source/app/app.cxx| 22 +- desktop/source/app/officeipcthread.cxx| 14 - drawinglayer/source/primitive2d/metafileprimitive2d.cxx |6 drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx | 12 - drawinglayer/source/primitive2d/texteffectprimitive2d.cxx | 18 +- drawinglayer/source/primitive2d/textprimitive2d.cxx |2 drawinglayer/source/processor2d/vclprocessor2d.cxx| 10 - editeng/source/editeng/editsel.cxx|2 editeng/source/editeng/eerdll.cxx |2 editeng/source/editeng/impedit4.cxx |6 editeng/source/items/textitem.cxx | 12 - editeng/source/outliner/outliner.cxx |2 editeng/source/rtf/rtfitem.cxx|4 extensions/source/propctrlr/selectlabeldialog.cxx |2 extensions/source/propctrlr/taborder.cxx |2 filter/source/flash/swfwriter1.cxx|6 filter/source/msfilter/svdfppt.cxx|2 filter/source/svg/svgwriter.cxx |8 - filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |2 include/drawinglayer/primitive2d/texteffectprimitive2d.hxx| 12 - include/editeng/charreliefitem.hxx|6 include/vcl/fntstyle.hxx |2 include/vcl/seleng.hxx|2 include/vcl/svapp.hxx | 78 +- reportdesign/source/ui/dlg/AddField.cxx |2 reportdesign/source/ui/dlg/Navigator.cxx |2 reportdesign/source/ui/misc/UITools.cxx |2 sc/source/core/data/docpool.cxx |2 sc/source/filter/xml/xmlcelli.cxx |2 sc/source/ui/condformat/condformatmgr.cxx |2 sc/source/ui/dbgui/tpsubt.cxx |2 sc/source/ui/miscdlgs/acredlin.cxx|2 sc/source/ui/miscdlgs/conflictsdlg.cxx|2 sc/source/ui/miscdlgs/sharedocdlg.cxx |2
[Libreoffice-commits] core.git: framework/source include/vcl vcl/source
framework/source/services/frame.cxx |2 +-
include/vcl/svapp.hxx |8
vcl/source/app/svapp.cxx|4 ++--
vcl/source/window/dialog.cxx|6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 12aafb69fab3c7f91aa727ace19c1df7c53edd64
Author: Noel Grandin
Date: Sun May 29 13:14:41 2016 +0200
Convert DialogCancelMode to scoped enum
Change-Id: I7aca03334c6609a8729bbc88ada6ecce4309c21d
Reviewed-on: https://gerrit.libreoffice.org/25607
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/services/frame.cxx
b/framework/source/services/frame.cxx
index 279e261..1dbd723 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2133,7 +2133,7 @@ void SAL_CALL Frame::disposing()
// (b) Don't forget to save the old value of IsDialogCancelEnabled()
to
// restore it afterwards (to not kill headless mode).
Application::DialogCancelMode old = Application::GetDialogCancelMode();
-Application::SetDialogCancelMode( Application::DIALOG_CANCEL_SILENT );
+Application::SetDialogCancelMode( Application::DialogCancelMode::Silent );
// We should be alone for ever and further dispose calls are rejected by
lines before ...
// I hope it :-)
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 7d190b9..ae11418 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -232,10 +232,10 @@ private:
class VCL_DLLPUBLIC Application
{
public:
-enum DialogCancelMode {
-DIALOG_CANCEL_OFF, ///< do not automatically cancel dialogs
-DIALOG_CANCEL_SILENT, ///< silently cancel any dialogs
-DIALOG_CANCEL_FATAL ///< cancel any dialogs by std::abort
+enum class DialogCancelMode {
+Off, ///< do not automatically cancel dialogs
+Silent, ///< silently cancel any dialogs
+Fatal ///< cancel any dialogs by std::abort
};
/** @name Initialization
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index be670e0..7fc4d4c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1500,7 +1500,7 @@ void Application::SetDialogCancelMode( DialogCancelMode
mode )
bool Application::IsDialogCancelEnabled()
{
-return ImplGetSVData()->maAppData.meDialogCancel != DIALOG_CANCEL_OFF;
+return ImplGetSVData()->maAppData.meDialogCancel != DialogCancelMode::Off;
}
void Application::SetSystemWindowMode( SystemWindowFlags nMode )
@@ -1658,7 +1658,7 @@ const LocaleDataWrapper&
Application::GetAppLocaleDataWrapper()
void Application::EnableHeadlessMode( bool dialogsAreFatal )
{
SetDialogCancelMode(
-dialogsAreFatal ? DIALOG_CANCEL_FATAL : DIALOG_CANCEL_SILENT );
+dialogsAreFatal ? DialogCancelMode::Fatal : DialogCancelMode::Silent );
}
bool Application::IsHeadlessModeEnabled()
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e7c9992..d26c584 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -803,16 +803,16 @@ bool Dialog::ImplStartExecuteModal()
switch ( Application::GetDialogCancelMode() )
{
-case Application::DIALOG_CANCEL_OFF:
+case Application::DialogCancelMode::Off:
break;
-case Application::DIALOG_CANCEL_SILENT:
+case Application::DialogCancelMode::Silent:
SAL_INFO(
"vcl",
"Dialog \"" << ImplGetDialogText(this).getStr()
<< "\"cancelled in silent mode");
return false;
default: // default cannot happen
-case Application::DIALOG_CANCEL_FATAL:
+case Application::DialogCancelMode::Fatal:
std::abort();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl sfx2/source vcl/source
include/vcl/texteng.hxx |2 +-
sfx2/source/doc/saveastemplatedlg.cxx |1 +
vcl/source/edit/texteng.cxx | 22 +++---
vcl/source/edit/vclmedit.cxx |6 +++---
4 files changed, 16 insertions(+), 15 deletions(-)
New commits:
commit f3fd69585db35dd0ba229b080705927733e8f949
Author: Noel Grandin
Date: Sun May 29 13:07:44 2016 +0200
Convert TxtAlign to scoped enum
Change-Id: I1f2c631fd77b772ccbf0763d168048fee8f3c910
Reviewed-on: https://gerrit.libreoffice.org/25606
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 3a5c3c9..fc2f173 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -70,7 +70,7 @@ namespace i18n {
class LocaleDataWrapper;
-enum TxtAlign { TXTALIGN_LEFT, TXTALIGN_CENTER, TXTALIGN_RIGHT };
+enum class TxtAlign { Left, Center, Right };
typedef std::vector TextViews;
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index df1de5b..05e2e73 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -79,7 +79,7 @@ TextEngine::TextEngine()
, mnCurTextWidth {-1}
, mnCurTextHeight {0}
, mnDefTab {0}
-, meAlign {TXTALIGN_LEFT}
+, meAlign {TxtAlign::Left}
, mbIsFormatting {false}
, mbFormatted {false}
, mbUpdate {true}
@@ -1608,9 +1608,9 @@ void TextEngine::CreateAndInsertEmptyLine( sal_uInt32
nPara )
aTmpLine.SetStart( pNode->GetText().getLength() );
aTmpLine.SetEnd( aTmpLine.GetStart() );
-if ( ImpGetAlign() == TXTALIGN_CENTER )
+if ( ImpGetAlign() == TxtAlign::Center )
aTmpLine.SetStartX( (short)(mnMaxTextWidth / 2) );
-else if ( ImpGetAlign() == TXTALIGN_RIGHT )
+else if ( ImpGetAlign() == TxtAlign::Right )
aTmpLine.SetStartX( (short)mnMaxTextWidth );
else
aTmpLine.SetStartX( mpDoc->GetLeftMargin() );
@@ -2283,7 +2283,7 @@ bool TextEngine::CreateLines( sal_uInt32 nPara )
ImpBreakLine( nPara, pLine, pPortion, nPortionStart,
nRemainingWidth );
}
-if ( ( ImpGetAlign() == TXTALIGN_CENTER ) || ( ImpGetAlign() ==
TXTALIGN_RIGHT ) )
+if ( ( ImpGetAlign() == TxtAlign::Center ) || ( ImpGetAlign() ==
TxtAlign::Right ) )
{
// adjust
long nTextWidth = 0;
@@ -2295,9 +2295,9 @@ bool TextEngine::CreateLines( sal_uInt32 nPara )
const long nSpace = mnMaxTextWidth - nTextWidth;
if ( nSpace > 0 )
{
-if ( ImpGetAlign() == TXTALIGN_CENTER )
+if ( ImpGetAlign() == TxtAlign::Center )
pLine->SetStartX( (sal_uInt16)(nSpace / 2) );
-else// TXTALIGN_RIGHT
+else// TxtAlign::Right
pLine->SetStartX( (sal_uInt16)nSpace );
}
}
@@ -2841,7 +2841,7 @@ void TextEngine::SetRightToLeft( bool bR2L )
if ( mbRightToLeft != bR2L )
{
mbRightToLeft = bR2L;
-meAlign = bR2L ? TXTALIGN_RIGHT : TXTALIGN_LEFT;
+meAlign = bR2L ? TxtAlign::Right : TxtAlign::Left;
FormatFullDoc();
UpdateViews();
}
@@ -2997,10 +2997,10 @@ TxtAlign TextEngine::ImpGetAlign() const
TxtAlign eAlign = meAlign;
if ( IsRightToLeft() )
{
-if ( eAlign == TXTALIGN_LEFT )
-eAlign = TXTALIGN_RIGHT;
-else if ( eAlign == TXTALIGN_RIGHT )
-eAlign = TXTALIGN_LEFT;
+if ( eAlign == TxtAlign::Left )
+eAlign = TxtAlign::Right;
+else if ( eAlign == TxtAlign::Right )
+eAlign = TxtAlign::Left;
}
return eAlign;
}
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 7f25066..cf224ce 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -338,11 +338,11 @@ void ImpVclMEdit::SetAlign( WinBits nWinStyle )
mpTextWindow->GetTextEngine()->SetRightToLeft( bRTL );
if ( nWinStyle & WB_CENTER )
-mpTextWindow->GetTextEngine()->SetTextAlign( TXTALIGN_CENTER );
+mpTextWindow->GetTextEngine()->SetTextAlign( TxtAlign::Center );
else if ( nWinStyle & WB_RIGHT )
-mpTextWindow->GetTextEngine()->SetTextAlign( !bRTL ? TXTALIGN_RIGHT :
TXTALIGN_LEFT );
+mpTextWindow->GetTextEngine()->SetTextAlign( !bRTL ? TxtAlign::Right :
TxtAlign::Left );
else if ( nWinStyle & WB_LEFT )
-mpTextWindow->GetTextEngine()->SetTextAlign( !bRTL ? TXTALIGN_LEFT :
TXTALIGN_RIGHT );
+mpTextWindow->GetTextEngine()->SetTextAlign( !bRTL ? TxtAlign::Left :
TxtAlign::Right );
}
void ImpVclMEdit::SetModified( bool bMod )
commit 395db598591edc123148770de42dac30bf505296
Author: Akshay Deep
Date: Sat May 28 20:52:34 2016 +0530
Resolves: Error when overwriting a template in Template Save As Dialog
After overwriting a template, overwritten template does not exist in the
template
[Libreoffice-commits] core.git: include/vcl toolkit/source vcl/source
include/vcl/throbber.hxx | 12 ++--
toolkit/source/controls/spinningprogress.cxx |2 +-
vcl/source/control/throbber.cxx | 26 +-
3 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 92bad2a3d97586dc1127580e1d5a002679105149
Author: Noel Grandin
Date: Sun May 29 13:00:07 2016 +0200
Convert ImageSet to scoped enum
Change-Id: I9957435f769957d76e95248914a422e82019e22d
Reviewed-on: https://gerrit.libreoffice.org/25604
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx
index 898fee4..1ab8ce6 100644
--- a/include/vcl/throbber.hxx
+++ b/include/vcl/throbber.hxx
@@ -31,18 +31,18 @@
class VCL_DLLPUBLIC Throbber : public ImageControl
{
public:
-enum ImageSet
+enum class ImageSet
{
/// no (default) images at all
-IMAGES_NONE,
+NONE,
/// automatically decide between different image sets, depending on
what fits best the actual size
-IMAGES_AUTO,
+Auto,
/// default images, 16x16 pixels
-IMAGES_16_PX,
+N16px,
/// default images, 32x32 pixels
-IMAGES_32_PX,
+N32px,
/// default images, 64x64 pixels
-IMAGES_64_PX,
+N64px,
};
public:
diff --git a/toolkit/source/controls/spinningprogress.cxx
b/toolkit/source/controls/spinningprogress.cxx
index 76b36f0..73fd74f 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -61,7 +61,7 @@ protected:
{
Throbber::ImageSet aImageSets[] =
{
-Throbber::IMAGES_16_PX, Throbber::IMAGES_32_PX,
Throbber::IMAGES_64_PX
+Throbber::ImageSet::N16px, Throbber::ImageSet::N32px,
Throbber::ImageSet::N64px
};
for ( size_t i=0; i < SAL_N_ELEMENTS(aImageSets); ++i )
{
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 0830774..a263093 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -45,7 +45,7 @@ Throbber::Throbber( vcl::Window* i_parentWindow, WinBits
i_style )
,mbRepeat( true )
,mnStepTime( 100 )
,mnCurStep( 0 )
-,meImageSet( IMAGES_AUTO )
+,meImageSet( ImageSet::Auto )
{
maWaitTimer.SetTimeout( mnStepTime );
maWaitTimer.SetTimeoutHdl( LINK( this, Throbber, TimeOutHdl ) );
@@ -70,7 +70,7 @@ namespace
::std::vector< Image > lcl_loadImageSet( const Throbber::ImageSet
i_imageSet )
{
::std::vector< Image > aImages;
-ENSURE_OR_RETURN( i_imageSet != Throbber::IMAGES_NONE,
"lcl_loadImageSet: illegal image set", aImages );
+ENSURE_OR_RETURN( i_imageSet != Throbber::ImageSet::NONE,
"lcl_loadImageSet: illegal image set", aImages );
const Reference< css::uno::XComponentContext > aContext(
::comphelper::getProcessComponentContext() );
const Reference< XGraphicProvider > xGraphicProvider(
css::graphic::GraphicProvider::create(aContext) );
@@ -98,23 +98,23 @@ void Throbber::Resize()
{
ImageControl::Resize();
-if ( meImageSet == IMAGES_AUTO )
+if ( meImageSet == ImageSet::Auto )
initImages();
}
void Throbber::initImages()
{
-if ( meImageSet == IMAGES_NONE )
+if ( meImageSet == ImageSet::NONE )
return;
try
{
::std::vector< ::std::vector< Image > > aImageSets;
-if ( meImageSet == IMAGES_AUTO )
+if ( meImageSet == ImageSet::Auto )
{
-aImageSets.push_back( lcl_loadImageSet( IMAGES_16_PX ) );
-aImageSets.push_back( lcl_loadImageSet( IMAGES_32_PX ) );
-aImageSets.push_back( lcl_loadImageSet( IMAGES_64_PX ) );
+aImageSets.push_back( lcl_loadImageSet( ImageSet::N16px ) );
+aImageSets.push_back( lcl_loadImageSet( ImageSet::N32px ) );
+aImageSets.push_back( lcl_loadImageSet( ImageSet::N64px ) );
}
else
{
@@ -200,11 +200,11 @@ void Throbber::setImageList( ::std::vector< Image >
const& i_images )
size_t index = 0;
switch ( i_imageSet )
{
-case IMAGES_16_PX: index = 0; break;
-case IMAGES_32_PX: index = 1; break;
-case IMAGES_64_PX: index = 2; break;
-case IMAGES_NONE:
-case IMAGES_AUTO:
+case ImageSet::N16px: index = 0; break;
+case ImageSet::N32px: index = 1; break;
+case ImageSet::N64px: index = 2; break;
+case ImageSet::NONE:
+case ImageSet::Auto:
OSL_ENSURE( false, "Throbber::getDefaultImageURLs: illegal image set!"
);
return aImageURLs;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extensions/source include/vcl vcl/source
extensions/source/bibliography/general.cxx |2 +-
include/vcl/field.hxx | 13 +++--
include/vcl/vclenum.hxx| 10 +-
vcl/source/control/field2.cxx | 16
vcl/source/window/layout.cxx | 20 ++--
vcl/source/window/window.cxx |4 ++--
vcl/source/window/window2.cxx | 10 +-
7 files changed, 38 insertions(+), 37 deletions(-)
New commits:
commit 06cb2df4dba489d83c44babc2b36f91ec9fde5c9
Author: Noel Grandin
Date: Sun May 29 12:52:29 2016 +0200
Convert VclAlign to scoped enum
Change-Id: I03718cc63ec5c1260ebd599bddb1a787ca8f5788
Reviewed-on: https://gerrit.libreoffice.org/25603
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/extensions/source/bibliography/general.cxx
b/extensions/source/bibliography/general.cxx
index 2e42225..14c256a 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -505,7 +505,7 @@ uno::Reference< awt::XControlModel >
BibGeneralPage::AddXControl(
vcl::Window* pWindow =
VCLUnoHelper::GetWindow(xControl->getPeer());
pWindow->set_grid_top_attach(rLabel.get_grid_top_attach());
pWindow->set_grid_left_attach(rLabel.get_grid_left_attach()+1);
-pWindow->set_valign(VCL_ALIGN_CENTER);
+pWindow->set_valign(VclAlign::Center);
rLabel.set_mnemonic_widget(pWindow);
if (&rLabel == pTitleFT)
pWindow->set_grid_width(3);
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 8dcafe1..d6d9180 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -99,12 +99,12 @@ inline bool operator !=(const ItalicMatrix& a, const
ItalicMatrix& b)
return a.xx != b.xx || a.xy != b.xy || a.yx != b.yx || a.yy != b.yy;
}
-enum VclAlign
+enum class VclAlign
{
-VCL_ALIGN_FILL,
-VCL_ALIGN_START,
-VCL_ALIGN_END,
-VCL_ALIGN_CENTER
+Fill,
+Start,
+End,
+Center
};
enum class VclPackType
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 5e82e4a..b099a96 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -56,7 +56,7 @@ void VclContainer::setLayoutAllocation(vcl::Window &rChild,
const Point &rAllocP
VclAlign eValign = rChild.get_valign();
//typical case
-if (eHalign == VCL_ALIGN_FILL && eValign == VCL_ALIGN_FILL)
+if (eHalign == VclAlign::Fill && eValign == VclAlign::Fill)
{
setLayoutPosSize(rChild, rAllocPos, rChildAlloc);
return;
@@ -68,19 +68,19 @@ void VclContainer::setLayoutAllocation(vcl::Window &rChild,
const Point &rAllocP
switch (eHalign)
{
-case VCL_ALIGN_FILL:
+case VclAlign::Fill:
break;
-case VCL_ALIGN_START:
+case VclAlign::Start:
if (aChildPreferredSize.Width() < rChildAlloc.Width())
aChildSize.Width() = aChildPreferredSize.Width();
break;
-case VCL_ALIGN_END:
+case VclAlign::End:
if (aChildPreferredSize.Width() < rChildAlloc.Width())
aChildSize.Width() = aChildPreferredSize.Width();
aChildPos.X() += rChildAlloc.Width();
aChildPos.X() -= aChildSize.Width();
break;
-case VCL_ALIGN_CENTER:
+case VclAlign::Center:
if (aChildPreferredSize.Width() < aChildSize.Width())
aChildSize.Width() = aChildPreferredSize.Width();
aChildPos.X() += (rChildAlloc.Width() - aChildSize.Width()) / 2;
@@ -89,19 +89,19 @@ void VclContainer::setLayoutAllocation(vcl::Window &rChild,
const Point &rAllocP
switch (eValign)
{
-case VCL_ALIGN_FILL:
+case VclAlign::Fill:
break;
-case VCL_ALIGN_START:
+case VclAlign::Start:
if (aChildPreferredSize.Height() < rChildAlloc.Height())
aChildSize.Height() = aChildPreferredSize.Height();
break;
-case VCL_ALIGN_END:
+case VclAlign::End:
if (aChildPreferredSize.Height() < rChildAlloc.Height())
aChildSize.Height() = aChildPreferredSize.Height();
aChildPos.Y() += rChildAlloc.Height();
aChildPos.Y() -= aChildSize.Height();
break;
-case VCL_ALIGN_CENTER:
+case VclAlign::Center:
if (aChildPreferredSize.Height() < aChildSize.Height())
aChildSize.Height() = aChildPreferredSize.Height();
aChildPos.Y() += (rChildAlloc.Height() - aChildSize.Height()) / 2;
@@ -2171,7 +2171,7 @@ short MessageDialog::Execute()
}
m_pImage->set_grid_left_attach(0);
m_pImage->set_grid_top_attach(0);
-m_pImage->set_valign(VCL_ALIGN_S
[Libreoffice-commits] core.git: drawinglayer/source include/vcl svx/source vcl/osx vcl/source vcl/unx
drawinglayer/source/texture/texture3d.cxx |6 +-
include/vcl/bitmapex.hxx |8 +--
svx/source/svdraw/svdfmtf.cxx |4 -
vcl/osx/salinst.cxx |4 -
vcl/source/gdi/bitmapex.cxx | 62 +++---
vcl/source/gdi/dibtools.cxx | 17
vcl/source/gdi/pdfwriter_impl.cxx |6 +-
vcl/source/image/Image.cxx|2
vcl/source/outdev/bitmap.cxx |6 +-
vcl/unx/generic/window/salframe.cxx |8 +--
10 files changed, 62 insertions(+), 61 deletions(-)
New commits:
commit 6a5a2350c1c4924dd3fe92c8a3016c8c8ca1c275
Author: Noel Grandin
Date: Sun May 29 12:35:04 2016 +0200
convert TransparentType to scoped enum
Change-Id: I25ec59fd41b5aa8741a9e864b5204481a84c3ba6
Reviewed-on: https://gerrit.libreoffice.org/25601
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/drawinglayer/source/texture/texture3d.cxx
b/drawinglayer/source/texture/texture3d.cxx
index a3915d5..4e4d19b 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -117,11 +117,11 @@ namespace drawinglayer
{
switch(maBitmapEx.GetTransparentType())
{
-case TRANSPARENT_NONE:
+case TransparentType::NONE:
{
break;
}
-case TRANSPARENT_COLOR:
+case TransparentType::Color:
{
const BitmapColor aBitmapColor(mpReadBitmap->GetColor(rY,
rX));
@@ -132,7 +132,7 @@ namespace drawinglayer
break;
}
-case TRANSPARENT_BITMAP:
+case TransparentType::Bitmap:
{
OSL_ENSURE(mpReadTransparence, "OOps, transparence type
Bitmap, but no read access created in the constructor (?)");
const BitmapColor
aBitmapColor(mpReadTransparence->GetPixel(rY, rX));
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 28e1d89..fd2c9a7 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -33,11 +33,11 @@ namespace com { namespace sun { namespace star { namespace
rendering {
class XBitmapCanvas;
} } } }
-enum TransparentType
+enum class TransparentType
{
-TRANSPARENT_NONE,
-TRANSPARENT_COLOR,
-TRANSPARENT_BITMAP
+NONE,
+Color,
+Bitmap
};
class VCL_DLLPUBLIC BitmapEx
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 31d488b..f2f186e 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1586,11 +1586,11 @@ void
ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct)
{
aOldMask = aBitmapEx.GetAlpha();
}
-else if(TRANSPARENT_BITMAP ==
aBitmapEx.GetTransparentType())
+else if(TransparentType::Bitmap ==
aBitmapEx.GetTransparentType())
{
aOldMask = aBitmapEx.GetMask();
}
-else if(TRANSPARENT_COLOR ==
aBitmapEx.GetTransparentType())
+else if(TransparentType::Color ==
aBitmapEx.GetTransparentType())
{
aOldMask =
aBitmapEx.GetBitmap().CreateMask(aBitmapEx.GetTransparentColor());
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 3bbff24..31b1542 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -1052,7 +1052,7 @@ CGImageRef CreateCGImage( const Image& rImage )
else
xImage = pSalBmp->CreateCroppedImage( 0, 0, pSalBmp->mnWidth,
pSalBmp->mnHeight );
}
-else if( aBmpEx.GetTransparentType() == TRANSPARENT_BITMAP )
+else if( aBmpEx.GetTransparentType() == TransparentType::Bitmap )
{
Bitmap aMask( aBmpEx.GetMask() );
QuartzSalBitmap* pMaskBmp =
static_cast(aMask.ImplGetImpBitmap()->ImplGetSalBitmap());
@@ -1061,7 +1061,7 @@ CGImageRef CreateCGImage( const Image& rImage )
else
xImage = pSalBmp->CreateCroppedImage( 0, 0, pSalBmp->mnWidth,
pSalBmp->mnHeight );
}
-else if( aBmpEx.GetTransparentType() == TRANSPARENT_COLOR )
+else if( aBmpEx.GetTransparentType() == TransparentType::Color )
{
Color aTransColor( aBmpEx.GetTransparentColor() );
SalColor nTransColor = MAKE_SALCOLOR( aTransColor.GetRed(),
aTransColor.GetGreen(), aTransColor.GetBlue() );
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index ed911d0..220c716 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -49,7 +49,7 @@
using namespace ::com::sun::star;
BitmapEx::BitmapEx() :
-eTransparent( TRANSPARENT_NONE ),
+eTransparent( TransparentType::NONE ),
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/wmf/enhwmf.cxx |2 -
vcl/source/filter/wmf/winmtf.cxx | 49 +++
vcl/source/filter/wmf/winmtf.hxx | 19 ---
vcl/source/filter/wmf/winwmf.cxx |7 +++--
4 files changed, 41 insertions(+), 36 deletions(-)
New commits:
commit 98d09839353325afefea2dad549b1f9adf10aea1
Author: Noel Grandin
Date: Fri May 27 15:40:53 2016 +0200
Convert MTF R2 constants to scoped enum
Change-Id: I9c18e5bbbd176cf5276000e43f4c3a993e4e0d87
Reviewed-on: https://gerrit.libreoffice.org/25545
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index ebb42cf..152bdfc 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -808,7 +808,7 @@ bool EnhWMFReader::ReadEnhWMF()
case EMR_SETROP2 :
{
pWMF->ReadUInt32( nDat32 );
-pOut->SetRasterOp( nDat32 );
+pOut->SetRasterOp( (WMFRasterOp)nDat32 );
}
break;
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 2228bbc..663267a 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -846,8 +846,9 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) :
maLatestLineStyle.aLineColor = Color( 0x12, 0x34, 0x56 );
maLatestFillStyle.aFillColor = Color( 0x12, 0x34, 0x56 );
-mnRop = R2_BLACK + 1;
-SetRasterOp( R2_BLACK );
+mnRop = WMFRasterOp::Black;
+meRasterOp = ROP_OVERPAINT;
+mpGDIMetaFile->AddAction( new MetaRasterOpAction( ROP_OVERPAINT ) );
}
WinMtfOutput::~WinMtfOutput()
@@ -917,30 +918,30 @@ void WinMtfOutput::UpdateFillStyle()
}
}
-sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp )
+WMFRasterOp WinMtfOutput::SetRasterOp( WMFRasterOp nRasterOp )
{
-sal_uInt32 nRetROP = mnRop;
+WMFRasterOp nRetROP = mnRop;
if ( nRasterOp != mnRop )
{
mnRop = nRasterOp;
-if ( mbNopMode && ( nRasterOp != R2_NOP ) )
-{ // changing modes from R2_NOP so set pen and brush
+if ( mbNopMode && ( nRasterOp != WMFRasterOp::Nop ) )
+{ // changing modes from WMFRasterOp::Nop so set pen and brush
maFillStyle = m_NopFillStyle;
maLineStyle = m_NopLineStyle;
mbNopMode = false;
}
switch( nRasterOp )
{
-case R2_NOT:
+case WMFRasterOp::Not:
meRasterOp = ROP_INVERT;
break;
-case R2_XORPEN:
+case WMFRasterOp::XorPen:
meRasterOp = ROP_XOR;
break;
-case R2_NOP:
+case WMFRasterOp::Nop:
{
meRasterOp = ROP_OVERPAINT;
if( !mbNopMode )
@@ -1637,7 +1638,7 @@ void WinMtfOutput::ResolveBitmapActions(
BSaveStructList_impl& rSaveList )
if ( (nUsed & 1) && (( nUsed & 2 ) == 0) && nWinRop != PATINVERT )
{ // patterns aren't well supported yet
-sal_uInt32 nOldRop = SetRasterOp( ROP_OVERPAINT ); // in this
case nRasterOperation is either 0 or 0xff
+WMFRasterOp nOldRop = SetRasterOp( WMFRasterOp::NONE ); // in
this case nRasterOperation is either 0 or 0xff
UpdateFillStyle();
DrawRect( aRect, false );
SetRasterOp( nOldRop );
@@ -1695,7 +1696,7 @@ void WinMtfOutput::ResolveBitmapActions(
BSaveStructList_impl& rSaveList )
if ( !bDrawn )
{
Push();
-sal_uInt32 nOldRop = SetRasterOp( R2_COPYPEN );
+WMFRasterOp nOldRop = SetRasterOp( WMFRasterOp::CopyPen );
Bitmap aBitmap( pSave->aBmpEx.GetBitmap() );
sal_uInt32 nOperation = ( nRasterOperation & 0xf );
switch( nOperation )
@@ -1709,16 +1710,16 @@ void WinMtfOutput::ResolveBitmapActions(
BSaveStructList_impl& rSaveList )
}
else
{
-SetRasterOp( R2_XORPEN );
+SetRasterOp( WMFRasterOp::XorPen );
ImplDrawBitmap( aPos, aSize, aBitmap );
-SetRasterOp( R2_COPYPEN );
+SetRasterOp( WMFRasterOp::CopyPen );
Bitmap aMask( aBitmap );
aMask.Invert();
BitmapEx aBmpEx( aBitmap, aMask );
ImplDrawBitmap( aPos, aSize, aBmpEx );
if ( nOperation == 0x1 )
{
-SetRasterOp( R2_NOT );
+
[Libreoffice-commits] core.git: include/vcl slideshow/source vcl/source
include/vcl/animate.hxx| 12 --
slideshow/source/engine/shapes/gdimtftools.cxx | 28 +
vcl/source/gdi/animate.cxx |7 --
3 files changed, 2 insertions(+), 45 deletions(-)
New commits:
commit b0950b157859c63561958d894f3363ccc9cad8c4
Author: Noel Grandin
Date: Sat May 28 19:48:41 2016 +0200
Remove CycleMode enum
to never takes any value other than NORMAL
Change-Id: I9558ee8864537c695ce1172a0cfad421d5f591ee
Reviewed-on: https://gerrit.libreoffice.org/25587
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 73cc12d..3c67aa6 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -34,15 +34,6 @@ enum class Disposal
Previous
};
-enum CycleMode
-{
-CYCLE_NOT,
-CYCLE_NORMAL,
-CYCLE_FALLBACK,
-CYCLE_REVERS,
-CYCLE_REVERS_FALLBACK
-};
-
struct VCL_DLLPUBLIC AnimationBitmap
{
BitmapExaBmpEx;
@@ -131,8 +122,6 @@ public:
voidSetLoopCount( const sal_uLong nLoopCount );
voidResetLoopCount();
-CycleMode GetCycleMode() const { return meCycleMode; }
-
voidSetNotifyHdl( const Link& rLink ) {
maNotifyLink = rLink; }
const Link& GetNotifyHdl() const { return maNotifyLink; }
@@ -190,7 +179,6 @@ private:
longmnLoopCount;
longmnLoops;
size_t mnPos;
-CycleMode meCycleMode;
boolmbIsInAnimation;
boolmbLoopTerminated;
boolmbIsWaiting;
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx
b/slideshow/source/engine/shapes/gdimtftools.cxx
index eb63351..e47d1bd 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -291,32 +291,8 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames&
o_rFrames,
pVDevMask->SetOutputSizePixel( aAnimSize );
pVDevMask->EnableMapMode( false );
-switch( aAnimation.GetCycleMode() )
-{
-case CYCLE_NOT:
-o_rLoopCount = 1;
-o_eCycleMode = CYCLE_LOOP;
-break;
-
-case CYCLE_FALLBACK:
-// FALLTHROUGH intended
-case CYCLE_NORMAL:
-o_rLoopCount = aAnimation.GetLoopCount();
-o_eCycleMode = CYCLE_LOOP;
-break;
-
-case CYCLE_REVERS:
-// FALLTHROUGH intended
-case CYCLE_REVERS_FALLBACK:
-o_rLoopCount = aAnimation.GetLoopCount();
-o_eCycleMode = CYCLE_PINGPONGLOOP;
-break;
-
-default:
-ENSURE_OR_RETURN_FALSE(false,
- "getAnimationFromGraphic(): Unexpected case" );
-break;
-}
+o_rLoopCount = aAnimation.GetLoopCount();
+o_eCycleMode = CYCLE_LOOP;
for( sal_uInt16 i=0, nCount=aAnimation.Count(); iGetChecksum(), aBCOA );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source cui/source include/formula include/sfx2 include/svl reportdesign/source sc/source sd/source sfx2/source svl/source sw/source
connectivity/source/drivers/mork/MDriver.hxx |4 -
cui/source/inc/iconcdlg.hxx |2
include/formula/IFunctionDescription.hxx |1
include/sfx2/frmdescr.hxx|2
include/sfx2/templateabstractview.hxx|2
include/sfx2/templatedlg.hxx |2
include/svl/undo.hxx | 51 -
reportdesign/source/ui/dlg/Formula.cxx |3
reportdesign/source/ui/inc/Formula.hxx |1
sc/source/filter/inc/biffinputstream.hxx | 13 ---
sc/source/filter/inc/defnamesbuffer.hxx |4 -
sc/source/filter/inc/formulabuffer.hxx |7 -
sc/source/filter/inc/stylesbuffer.hxx|3
sc/source/filter/oox/biffinputstream.cxx | 14 ---
sc/source/filter/oox/defnamesbuffer.cxx |2
sc/source/filter/oox/formulabuffer.cxx | 10 --
sc/source/filter/oox/stylesbuffer.cxx| 23 --
sc/source/ui/formdlg/formula.cxx |6 -
sc/source/ui/inc/formula.hxx |1
sc/source/ui/inc/undobase.hxx|2
sc/source/ui/inc/undodraw.hxx|2
sc/source/ui/undo/undobase.cxx |8 --
sc/source/ui/undo/undodraw.cxx |8 --
sd/source/ui/view/outlview.cxx | 41 --
sfx2/source/appl/sfxpicklist.cxx | 19 -
sfx2/source/control/templateabstractview.cxx | 23 --
sfx2/source/doc/frmdescr.cxx |5 -
sfx2/source/doc/templatedlg.cxx | 20 -
sfx2/source/inc/sfxpicklist.hxx | 12 ---
svl/source/undo/undo.cxx | 102 ---
sw/source/uibase/sidebar/PageFooterPanel.cxx | 13 +--
sw/source/uibase/sidebar/PageFooterPanel.hxx |9 --
sw/source/uibase/sidebar/PageFormatPanel.cxx | 13 +--
sw/source/uibase/sidebar/PageFormatPanel.hxx | 10 --
sw/source/uibase/sidebar/PageStylesPanel.cxx | 13 +--
sw/source/uibase/sidebar/PageStylesPanel.hxx |9 --
sw/source/uibase/sidebar/SwPanelFactory.cxx |6 -
37 files changed, 22 insertions(+), 444 deletions(-)
New commits:
commit 77d5491e15c96b5864fccd3ffc3d6a7b90e93367
Author: Noel Grandin
Date: Fri May 27 14:20:35 2016 +0200
loplugin:unusedmethods
Change-Id: I08e9bb65b2530148b80c67f01d51e594fc698acb
Reviewed-on: https://gerrit.libreoffice.org/25543
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/drivers/mork/MDriver.hxx
b/connectivity/source/drivers/mork/MDriver.hxx
index d926579..c5cc3fc 100644
--- a/connectivity/source/drivers/mork/MDriver.hxx
+++ b/connectivity/source/drivers/mork/MDriver.hxx
@@ -34,10 +34,6 @@ class MorkDriver:
{
public:
explicit MorkDriver(const css::uno::Reference< css::uno::XComponentContext
>& context);
-static OUString getImplementationName_Static()
-throw(css::uno::RuntimeException);
-static css::uno::Sequence< OUString > getSupportedServiceNames_Static()
-throw (css::uno::RuntimeException);
const css::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&
getFactory(){return m_xFactory;}
const OUString& getProfilePath() {return m_sProfilePath;}
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 131e4d0..dafd1ab 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -77,8 +77,6 @@ private:
protected:
IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString&
rUIXMLDescription, const SfxItemSet &rAttrSet );
-sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return
pSet->GetPool()->GetWhich( nSlot ); }
-
public:
virtual ~IconChoicePage();
virtual voiddispose() override;
diff --git a/include/formula/IFunctionDescription.hxx
b/include/formula/IFunctionDescription.hxx
index 7fb02c5..42aaa99 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -131,7 +131,6 @@ namespace formula
virtual void clear() = 0;
virtual void deleteFormData() = 0;
-virtual void setReferenceInput(const FormEditData* _pData) = 0;
virtual IFunctionManager* getFunctionManager() = 0;
virtual ::std::unique_ptr convertToTokenArray(const
css::uno::Sequence< css::sheet::FormulaToken >& _aTokenList) = 0;
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 8c88401..8d6f462 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -89,9 +89,7 @@ public:
voidSetActualURL( const INetURLObject& rURL );
voidSetActualURL( const OUString& rURL );
voidSetReadOnly( bool bSet ) { bReadOnly = bSet;}
-boolIsReadOnly( ) const { return bReadOnly;}
voidSetEditable( bool bSet );
-boolIsEditable() const;
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/AnnotationWin.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 12868914a39b0e8fb32f63d1307c1bb1c535fb9c Author: Justin Luth Date: Mon May 30 07:10:25 2016 +0300 tdf#99870 writer: don't delete selection with delete-comment When using the keyboard to select text and then deleting a comment, all the text between the cursor and the comment would also be deleted. (Not necessarily the selected text, but everything from the point or the mark would be included in the delete.) Change-Id: Id15a00d112d118227bc4a34b5102bb09d8d167b0 Reviewed-on: https://gerrit.libreoffice.org/25216 Reviewed-by: Justin Luth Tested-by: Jenkins diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 8c03679..17bc48e 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -158,6 +158,7 @@ void SwAnnotationWin::Delete() SwSidebarWin::Delete(); // we delete the field directly, the Mgr cleans up the PostIt by listening GrabFocusToDocument(); +DocView().GetWrtShellPtr()->ClearMark(); DocView().GetWrtShellPtr()->DelRight(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: getting close to the 30000 RESOLVED bugs milestone
Tommy wrote: take a look here: http://tinyurl.com/ze4qyhj the count is now 29970 I know we already passed the 30K FIXED milestone if we count the CLOSED and VERIFIED bugs as well... anyway it's getting time to celebrate this new achievement soon... cheers, Tommy I wonder if we can identify who's gonna close the 3th bug It would be nice to give him/her a badge about this mileston. Tommy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/document.hxx|1 -
starmath/source/document.cxx | 21 +
starmath/source/unomodel.cxx |3 +--
3 files changed, 10 insertions(+), 15 deletions(-)
New commits:
commit e71ab23aa3c1a645b383beafe848d06ed08d8838
Author: Takeshi Abe
Date: Sat May 28 09:32:03 2016 +0900
starmath: Drop redundant IsFormulaArranged() check
as ArrangeFormula() itself checks bIsFormulaArranged,
and does nothing if it's on.
Change-Id: Icc76208f6881d4de99e88feae5f19d7e8890e4e9
Reviewed-on: https://gerrit.libreoffice.org/25570
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index e52fa19..499bd56 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -156,7 +156,6 @@ public:
static void SaveSymbols();
voidArrangeFormula();
-boolIsFormulaArranged() const { return bIsFormulaArranged;
}
//Access for the View. This access is not for the OLE-case!
//and for the communication with the SFX!
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 8028a02..4646d03 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -215,8 +215,7 @@ void SmDocShell::SetFormat(SmFormat& rFormat)
OUString SmDocShell::GetAccessibleText()
{
-if (!IsFormulaArranged())
-ArrangeFormula();
+ArrangeFormula();
if (aAccText.isEmpty())
{
OSL_ENSURE( pTree, "Tree missing" );
@@ -244,7 +243,7 @@ void SmDocShell::Parse()
void SmDocShell::ArrangeFormula()
{
-if (IsFormulaArranged())
+if (bIsFormulaArranged)
return;
// Only for the duration of the existence of this object the correct
settings
@@ -402,8 +401,7 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point
&rPosition, bool bDrawSel
Parse();
OSL_ENSURE(pTree, "Sm : NULL pointer");
-if (!IsFormulaArranged())
-ArrangeFormula();
+ArrangeFormula();
// Problem: What happens to WYSIWYG? While we're active inplace, we don't
have a reference
// device and aren't aligned to that either. So now there can be a
difference between the
@@ -460,8 +458,7 @@ Size SmDocShell::GetSize()
if (pTree)
{
-if (!IsFormulaArranged())
-ArrangeFormula();
+ArrangeFormula();
aRet = pTree->GetSize();
if ( !aRet.Width() )
@@ -783,7 +780,7 @@ bool SmDocShell::Save()
{
if (!pTree)
Parse();
-if( pTree && !IsFormulaArranged() )
+if( pTree )
ArrangeFormula();
Reference xModel(GetModel());
@@ -843,7 +840,7 @@ bool SmDocShell::SaveAs( SfxMedium& rMedium )
{
if (!pTree)
Parse();
-if( pTree && !IsFormulaArranged() )
+if( pTree )
ArrangeFormula();
Reference xModel(GetModel());
@@ -862,7 +859,7 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
{
if( !pTree )
Parse();
-if( pTree && !IsFormulaArranged() )
+if( pTree )
ArrangeFormula();
const OUString& rFltName = pFlt->GetFilterName();
@@ -893,7 +890,7 @@ bool SmDocShell::writeFormulaOoxml(
{
if( !pTree )
Parse();
-if( pTree && !IsFormulaArranged() )
+if( pTree )
ArrangeFormula();
SmOoxmlExport aEquation(pTree, version, documentType);
return aEquation.ConvertFromStarMath( pSerializer );
@@ -903,7 +900,7 @@ void SmDocShell::writeFormulaRtf(OStringBuffer& rBuffer,
rtl_TextEncoding nEncod
{
if (!pTree)
Parse();
-if (pTree && !IsFormulaArranged())
+if (pTree)
ArrangeFormula();
SmRtfExport aEquation(pTree);
aEquation.ConvertFromStarMath(rBuffer, nEncoding);
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 8a57d01..1207228 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -896,8 +896,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry
**ppEntries, Any *pValu
pDocSh->Parse();
if ( pDocSh->GetFormulaTree() )
{
-if ( !pDocSh->IsFormulaArranged() )
-pDocSh->ArrangeFormula();
+pDocSh->ArrangeFormula();
*pValue <<= static_cast(
pDocSh->GetFormulaTree()->GetFormulaBaseline() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash reporting for TDF builds
Hey Riccardo, On Sun, May 29, 2016 at 4:38 PM, Riccardo Magliocchetti < riccardo.magliocche...@gmail.com> wrote: > Hello Markus, > > Il 29/05/2016 13:11, Markus Mohrhard ha scritto: > >> ** Server (code at https://github.com/mmohrhard/crash ) >> >> automated a few workflows (currently the processing is async and needs to >> be >> done manually) >> > > Do you have more details for this item? > > > Everything in the processor/views.py is part of these tasks. The ones that currently come to my mind are transformation from uploaded to processed crash and generation of the crash count numbers for the main page. For each of them we need a python script that calls them and add the script with a cron job. Another task that might need similar handling but is not implemented at all yet is to delete symbols of old releases. Does that make sense to you? Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loolwsd/ChildSession.cpp
loolwsd/ChildSession.cpp |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit c24ee3669ff0c7167d83f82276a228dbbe19188f
Author: Henry Castro
Date: Sun May 29 20:34:24 2016 -0400
loolwsd: deallocates more memory
diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index ca0d430..59f96f7 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -652,7 +652,9 @@ bool ChildSession::sendFontRendering(const char*
/*buffer*/, int /*length*/, Str
Timestamp timestamp;
int width, height;
-std::unique_ptr
pixmap(_loKitDocument->renderFont(decodedFont.c_str(), &width, &height));
+unsigned char* ptrFont = _loKitDocument->renderFont(decodedFont.c_str(),
&width, &height);
+std::unique_ptr pixmap(ptrFont);
+std::free(ptrFont);
Log::trace("renderFont [" + font + "] rendered in " +
std::to_string(timestamp.elapsed()/1000.) + "ms");
if (!pixmap ||
@@ -708,7 +710,9 @@ bool ChildSession::getPartPageRectangles(const char*
/*buffer*/, int /*length*/)
if (_multiView)
_loKitDocument->setView(_viewId);
-sendTextFrame("partpagerectangles: " +
std::string(_loKitDocument->getPartPageRectangles()));
+char* partPage = _loKitDocument->getPartPageRectangles();
+sendTextFrame("partpagerectangles: " + std::string(partPage));
+std::free(partPage);
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source
formula/source/core/api/token.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a2bca302f8299d70f77952110fb4ccfa4b258c2 Author: Julien Nabet Date: Sun May 29 21:49:08 2016 +0200 cid#1362174, 1362177: USE_AFTER_FREE+resource leak due to copypasta Change-Id: Icd903335fdef3921781e2f16e98a0e10bda31e3f Reviewed-on: https://gerrit.libreoffice.org/25641 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index beec153..360449f 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1469,7 +1469,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( const MissingConvention & } if (pOcds != &aOpCodeDcountStack[0]) -delete [] pOcas; +delete [] pOcds; if (pOcas != &aOpCodeAddressStack[0]) delete [] pOcas; if (pCtx != &aCtx[0]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash reporting for TDF builds
Markus Mohrhard wrote: > so I managed to land the crash reporting that I presented during my FOSDEM > talk finally in time for the 5.2 release. > Hey Moggi, so first off - this is just awesome. Thanks a whole bloody lot! > The idea is that you can add important information as key value pairs and > they will be available together with the crash report on the server. Some > information that area already part of the minidump are the OS, the CPU, the > loaded modules. Keep in mind that you should only collect the information > that are really necessary. > > Some information that we might want to select in the future: > > OpenCL info if OpenCL is use > did we crash inside of our OpenGL code > loaded extensions > This indeed all sounds quite useful. Just a very quiet, cautionary word of warning: I would sleep a bit better if we could all agree on a four eyes principle (i.e. mandatory reviews) for anything that adds new information to the crash report. It's sometimes not immediately obvious, but e.g. extension & path names, font sets etc (and who knows what else we'll come up with) can reveal quite intimate information about an installation environment. For the record, the feature & crash dumps as it is look perfectly sane. And again, thanks so much. This is a great addition to LibreOffice, I used to use the Sun-internal crash reporter that unforunately went down with that company, and it was invaluable. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/src
loleaflet/src/control/Control.Menubar.js |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit af02723f90fa22d7a7673f443495ff8abcd839d6
Author: Andras Timar
Date: Mon May 30 00:43:04 2016 +0200
loleaflet: bccu#1856 disable View - Full screen on Edge, too
(cherry picked from commit a4c8ceb1ac766cfb3a6b1cd5e044d43a5d145a7d)
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index d3d04d3..eeaebd8 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -191,11 +191,12 @@ L.Control.Menubar = L.Control.extend({
var ua = window.navigator.userAgent;
var msie = ua.indexOf('MSIE '); // IE 10 or older
var trident = ua.indexOf('Trident/'); // IE 11
+ var edge = ua.indexOf('Edge/'); // Microsoft Edge
$(items).each(function() {
var aItem = this;
var type = $(aItem).data('type');
var id = $(aItem).data('id');
- if (id === 'fullscreen' && (msie > 0 || trident > 0)) {
// Full screen works weirdly on IE 11
+ if (id === 'fullscreen' && (msie > 0 || trident > 0 ||
edge > 0)) { // Full screen works weirdly on IE 11 and on Edge
$(aItem).addClass('disabled');
var index =
self.options.allowedViewModeActions.indexOf('fullscreen');
if (index > 0) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a4c8ceb1ac766cfb3a6b1cd5e044d43a5d145a7d
Author: Andras Timar
Date: Mon May 30 00:43:04 2016 +0200
loleaflet: bccu#1856 disable View - Full screen on Edge, too
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 5eab099..332be66 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -191,11 +191,12 @@ L.Control.Menubar = L.Control.extend({
var ua = window.navigator.userAgent;
var msie = ua.indexOf('MSIE '); // IE 10 or older
var trident = ua.indexOf('Trident/'); // IE 11
+ var edge = ua.indexOf('Edge/'); // Microsoft Edge
$(items).each(function() {
var aItem = this;
var type = $(aItem).data('type');
var id = $(aItem).data('id');
- if (id === 'fullscreen' && (msie > 0 || trident > 0)) {
// Full screen works weirdly on IE 11
+ if (id === 'fullscreen' && (msie > 0 || trident > 0 ||
edge > 0)) { // Full screen works weirdly on IE 11 and on Edge
$(aItem).addClass('disabled');
var index =
self.options.allowedViewModeActions.indexOf('fullscreen');
if (index > 0) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/src
loleaflet/src/control/Control.Menubar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ae8d7292ddaf936b237f9a66887d34b28256013e
Author: Andras Timar
Date: Mon May 30 00:29:47 2016 +0200
loleaflet: fix js lint error
(cherry picked from commit 6b57831673a2b25395b90c0061a15c9c9870b7c0)
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 39bed65..d3d04d3 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -198,7 +198,7 @@ L.Control.Menubar = L.Control.extend({
if (id === 'fullscreen' && (msie > 0 || trident > 0)) {
// Full screen works weirdly on IE 11
$(aItem).addClass('disabled');
var index =
self.options.allowedViewModeActions.indexOf('fullscreen');
- if(index > 0) {
+ if (index > 0) {
self.options.allowedViewModeActions.splice(index, 1);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6b57831673a2b25395b90c0061a15c9c9870b7c0
Author: Andras Timar
Date: Mon May 30 00:29:47 2016 +0200
loleaflet: fix js lint error
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 18cd0ab..5eab099 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -198,7 +198,7 @@ L.Control.Menubar = L.Control.extend({
if (id === 'fullscreen' && (msie > 0 || trident > 0)) {
// Full screen works weirdly on IE 11
$(aItem).addClass('disabled');
var index =
self.options.allowedViewModeActions.indexOf('fullscreen');
- if(index > 0) {
+ if (index > 0) {
self.options.allowedViewModeActions.splice(index, 1);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c4378a4b6e1424f823affe90cf21b727cfc7d167
Author: Henry Castro
Date: Sun May 29 17:17:25 2016 -0400
loleaflet: bccu#1804 Style listbox does not get css styling
(cherry picked from commit 2731e1fc0226f180a170860da26027028b655e2d)
loleaflet: bccu#1804 related: do not try to localize user defined style
names
(cherry picked from commit 1395d604dd2b071f052c42b89866d33e0d43764e)
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index eeb79d9..58605f6 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -849,7 +849,8 @@ map.on('updatetoolbarcommandvalues', function (e) {
var outlineLevel =
style.split('outline')[1];
localeStyle =
'Outline'.toLocaleString() + ' ' + outlineLevel;
} else {
- localeStyle =
L.Styles.styleMappings[style].toLocaleString();
+ localeStyle =
L.Styles.styleMappings[style];
+ localeStyle = localeStyle === undefined
? style : localeStyle.toLocaleString();
}
data = data.concat({id: style, text:
localeStyle});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js |2 +-
loleaflet/src/control/Styles.js |6 +-
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 1395d604dd2b071f052c42b89866d33e0d43764e
Author: Andras Timar
Date: Mon May 30 00:13:19 2016 +0200
loleaflet: bccu#1804 related: do not try to localize user defined style
names
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index e5f77a2..58605f6 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -850,7 +850,7 @@ map.on('updatetoolbarcommandvalues', function (e) {
localeStyle =
'Outline'.toLocaleString() + ' ' + outlineLevel;
} else {
localeStyle =
L.Styles.styleMappings[style];
- localeStyle = localeStyle === undefined
? style.toLocaleString() : localeStyle.toLocaleString();
+ localeStyle = localeStyle === undefined
? style : localeStyle.toLocaleString();
}
data = data.concat({id: style, text:
localeStyle});
diff --git a/loleaflet/src/control/Styles.js b/loleaflet/src/control/Styles.js
index 1dda56b..609dd88 100644
--- a/loleaflet/src/control/Styles.js
+++ b/loleaflet/src/control/Styles.js
@@ -276,11 +276,7 @@ L.Styles = {
'List 2':'List 2',
'List 3':'List 3',
'List 4':'List 4',
- 'List 5':'List 5',
- 'New Chapter':'New Chapter',
- 'Guide Name':'Guide Name',
- 'Heading Note':'Heading Note',
- 'Text Note':'Text Note'
+ 'List 5':'List 5'
},
// For impress documents, LOK STATE_CHANGED callback return these
internal names
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sfx2/source sw/source vcl/source
sfx2/source/appl/appopen.cxx |5 ++---
sw/source/uibase/sidebar/PageMarginPanel.cxx |4
vcl/source/opengl/OpenGLContext.cxx |1 +
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 2ad5055145201efe5a244656a0715b391149e825
Author: Caolán McNamara
Date: Sun May 29 21:18:26 2016 +0100
coverity#1362173 Dereference after null check
Change-Id: I75c6f6fba947ac56c198afdef9b5ad078a76cdc5
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index e5ff943..4f1d71c 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -450,14 +450,13 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
SfxObjectShell* pCurrentShell = SfxObjectShell::Current();
Reference xModel;
-
if(pCurrentShell)
xModel = pCurrentShell->GetModel();
ScopedVclPtrInstance< SfxTemplateManagerDlg > aTemplDlg;
-if(xModel.is())
-aTemplDlg->setDocumentModel(pCurrentShell->GetModel());
+if (xModel.is())
+aTemplDlg->setDocumentModel(xModel);
int nRet = aTemplDlg->Execute();
if ( nRet == RET_OK )
commit b5ff87efd8b1ecf7d06b64a76ae70c7942aba91c
Author: Caolán McNamara
Date: Sun May 29 21:16:26 2016 +0100
coverity#1362175 Uninitialized scalar field
Change-Id: Ia2da9cc6a2e2f6c5f3f85c2ad3d95fb1adad6225
diff --git a/sw/source/uibase/sidebar/PageMarginPanel.cxx
b/sw/source/uibase/sidebar/PageMarginPanel.cxx
index b6e5a9e..0575408 100644
--- a/sw/source/uibase/sidebar/PageMarginPanel.cxx
+++ b/sw/source/uibase/sidebar/PageMarginPanel.cxx
@@ -61,6 +61,10 @@ PageMarginPanel::PageMarginPanel(
mpBindings(pBindings),
meFUnit(),
meUnit(),
+mnPageLeftMargin(0),
+mnPageRightMargin(0),
+mnPageTopMargin(0),
+mnPageBottomMargin(0),
mpPageLRMarginItem( new SvxLongLRSpaceItem( 0, 0, SID_ATTR_PAGE_LRSPACE )
),
mpPageULMarginItem( new SvxLongULSpaceItem( 0, 0, SID_ATTR_PAGE_ULSPACE )
),
maSwPageLRControl(SID_ATTR_PAGE_LRSPACE, *pBindings, *this),
commit 6f5a6d1668e0a0a9db9099a17bde769f128ef0ed
Author: Caolán McNamara
Date: Sun May 29 21:15:05 2016 +0100
coverity#1362019 Uninitialized scalar variable
Change-Id: I18d913fc6e0131f0c31c9d0cfe0f39e1161035eb
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index ea90537..3503017 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -412,6 +412,7 @@ void OpenGLContext::reset()
SystemWindowData OpenGLContext::generateWinData(vcl::Window* /*pParent*/, bool
/*bRequestLegacyContext*/)
{
SystemWindowData aWinData;
+memset(&aWinData, 0, sizeof(aWinData));
aWinData.nSize = sizeof(aWinData);
return aWinData;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js |3 ++-
loleaflet/src/control/Styles.js |6 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 2731e1fc0226f180a170860da26027028b655e2d
Author: Henry Castro
Date: Sun May 29 17:17:25 2016 -0400
loleaflet: bccu#1804 Style listbox does not get css styling
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index eeb79d9..e5f77a2 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -849,7 +849,8 @@ map.on('updatetoolbarcommandvalues', function (e) {
var outlineLevel =
style.split('outline')[1];
localeStyle =
'Outline'.toLocaleString() + ' ' + outlineLevel;
} else {
- localeStyle =
L.Styles.styleMappings[style].toLocaleString();
+ localeStyle =
L.Styles.styleMappings[style];
+ localeStyle = localeStyle === undefined
? style.toLocaleString() : localeStyle.toLocaleString();
}
data = data.concat({id: style, text:
localeStyle});
diff --git a/loleaflet/src/control/Styles.js b/loleaflet/src/control/Styles.js
index 609dd88..1dda56b 100644
--- a/loleaflet/src/control/Styles.js
+++ b/loleaflet/src/control/Styles.js
@@ -276,7 +276,11 @@ L.Styles = {
'List 2':'List 2',
'List 3':'List 3',
'List 4':'List 4',
- 'List 5':'List 5'
+ 'List 5':'List 5',
+ 'New Chapter':'New Chapter',
+ 'Guide Name':'Guide Name',
+ 'Heading Note':'Heading Note',
+ 'Text Note':'Text Note'
},
// For impress documents, LOK STATE_CHANGED callback return these
internal names
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/qa
sax/qa/cppunit/xmlimport.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit fe4e6a9b104173ba7310ff481fcf931d1d6f8601
Author: Stephan Bergmann
Date: Sun May 29 23:06:22 2016 +0200
loplugin:unreffun
Change-Id: I31e62926ddfddc8bbdab681a55cdc381d3275794
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index 0ba32c1..bf7cd15 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -69,7 +69,6 @@ private:
public:
TestDocumentHandler() {}
-OUString getString() { return m_aStr; }
// XDocumentHandler
virtual void SAL_CALL startDocument() throw (xml::sax::SAXException,
RuntimeException, std::exception) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' -
0 files changed New commits: commit 4b07829ded22503e6a91b00989eb5a104128ed31 Author: László Németh Date: Sun May 29 22:29:08 2016 +0200 empty commit (first proc. idle after start) Change-Id: Ic0c32c71818e952a97ee881a9d9cdc52ab6dfefc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/src
loleaflet/src/control/Control.Menubar.js | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit dab8207bd741edc9e7f9fb25c41a426a90701eb5
Author: Andras Timar
Date: Sun May 29 22:10:22 2016 +0200
loleaflet: bccu#1836 disable View - Full screen menu item in IE11
(cherry picked from commit c0098e5edde1ff0767b35e17f233ca9afcf53296)
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index d6c63ea..39bed65 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -188,10 +188,20 @@ L.Control.Menubar = L.Control.extend({
_beforeShow: function(e, menu) {
var self = e.data.self;
var items =
$(menu).children().children('a').not('.has-submenu');
+ var ua = window.navigator.userAgent;
+ var msie = ua.indexOf('MSIE '); // IE 10 or older
+ var trident = ua.indexOf('Trident/'); // IE 11
$(items).each(function() {
var aItem = this;
var type = $(aItem).data('type');
var id = $(aItem).data('id');
+ if (id === 'fullscreen' && (msie > 0 || trident > 0)) {
// Full screen works weirdly on IE 11
+ $(aItem).addClass('disabled');
+ var index =
self.options.allowedViewModeActions.indexOf('fullscreen');
+ if(index > 0) {
+
self.options.allowedViewModeActions.splice(index, 1);
+ }
+ }
if (!map._editlock) {
var found = false;
for (var i in
self.options.allowedViewModeActions) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit c0098e5edde1ff0767b35e17f233ca9afcf53296
Author: Andras Timar
Date: Sun May 29 22:10:22 2016 +0200
loleaflet: bccu#1836 disable View - Full screen menu item in IE11
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index c1459a0..18cd0ab 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -188,10 +188,20 @@ L.Control.Menubar = L.Control.extend({
_beforeShow: function(e, menu) {
var self = e.data.self;
var items =
$(menu).children().children('a').not('.has-submenu');
+ var ua = window.navigator.userAgent;
+ var msie = ua.indexOf('MSIE '); // IE 10 or older
+ var trident = ua.indexOf('Trident/'); // IE 11
$(items).each(function() {
var aItem = this;
var type = $(aItem).data('type');
var id = $(aItem).data('id');
+ if (id === 'fullscreen' && (msie > 0 || trident > 0)) {
// Full screen works weirdly on IE 11
+ $(aItem).addClass('disabled');
+ var index =
self.options.allowedViewModeActions.indexOf('fullscreen');
+ if(index > 0) {
+
self.options.allowedViewModeActions.splice(index, 1);
+ }
+ }
if (!map._editlock) {
var found = false;
for (var i in
self.options.allowedViewModeActions) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
5 new defect(s) introduced to LibreOffice found with Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 5 of 5 defect(s)
** CID 1362177: Memory - corruptions (USE_AFTER_FREE)
/formula/source/core/api/token.cxx: 1474 in
formula::FormulaTokenArray::RewriteMissing(const formula::MissingConvention &)()
*** CID 1362177: Memory - corruptions (USE_AFTER_FREE)
/formula/source/core/api/token.cxx: 1474 in
formula::FormulaTokenArray::RewriteMissing(const formula::MissingConvention &)()
1468 }
1469 }
1470
1471 if (pOcds != &aOpCodeDcountStack[0])
1472 delete [] pOcas;
1473 if (pOcas != &aOpCodeAddressStack[0])
>>> CID 1362177: Memory - corruptions (USE_AFTER_FREE)
>>> Calling "operator delete[]" frees pointer "pOcas" which has already
>>> been freed. [Note: The source code implementation of the function has been
>>> overridden by a builtin model.]
1474 delete [] pOcas;
1475 if (pCtx != &aCtx[0])
1476 delete [] pCtx;
1477
1478 return pNewArr;
1479 }
** CID 1362176: Uninitialized members (UNINIT_CTOR)
/framework/source/uiconfiguration/imagemanagerimpl.cxx: 525 in
framework::ImageManagerImpl::ImageManagerImpl(const
com::sun::star::uno::Reference &,
cppu::OWeakObject *, bool)()
*** CID 1362176: Uninitialized members (UNINIT_CTOR)
/framework/source/uiconfiguration/imagemanagerimpl.cxx: 525 in
framework::ImageManagerImpl::ImageManagerImpl(const
com::sun::star::uno::Reference &,
cppu::OWeakObject *, bool)()
519 {
520 for ( vcl::ImageType n : o3tl::enumrange() )
521 {
522 m_pUserImageList[n] = nullptr;
523 m_bUserImageListModified[n] = false;
524 }
>>> CID 1362176: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member field "m_pUserImageList.detail_values" is not
>>> initialized in this constructor nor in any functions that it calls.
525 }
526
527 ImageManagerImpl::~ImageManagerImpl()
528 {
529 clear();
530 }
** CID 1362175: Uninitialized members (UNINIT_CTOR)
/sw/source/uibase/sidebar/PageMarginPanel.cxx: 77 in
sw::sidebar::PageMarginPanel::PageMarginPanel(vcl::Window *, const
com::sun::star::uno::Reference &, SfxBindings
*)()
*** CID 1362175: Uninitialized members (UNINIT_CTOR)
/sw/source/uibase/sidebar/PageMarginPanel.cxx: 77 in
sw::sidebar::PageMarginPanel::PageMarginPanel(vcl::Window *, const
com::sun::star::uno::Reference &, SfxBindings
*)()
71 get(mpLeftMarginEdit, "leftmargin");
72 get(mpRightMarginEdit, "rightmargin");
73 get(mpTopMarginEdit, "topmargin");
74 get(mpBottomMarginEdit, "bottommargin");
75
76 Initialize();
>>> CID 1362175: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "mnPageBottomMargin" is not initialized in this
>>> constructor nor in any functions that it calls.
77 }
78
79 PageMarginPanel::~PageMarginPanel()
80 {
81 disposeOnce();
82 }
** CID 1362174: Resource leaks (RESOURCE_LEAK)
/formula/source/core/api/token.cxx: 1478 in
formula::FormulaTokenArray::RewriteMissing(const formula::MissingConvention &)()
*** CID 1362174: Resource leaks (RESOURCE_LEAK)
/formula/source/core/api/token.cxx: 1478 in
formula::FormulaTokenArray::RewriteMissing(const formula::MissingConvention &)()
1472 delete [] pOcas;
1473 if (pOcas != &aOpCodeAddressStack[0])
1474 delete [] pOcas;
1475 if (pCtx != &aCtx[0])
1476 delete [] pCtx;
1477
>>> CID 1362174: Resource leaks (RESOURCE_LEAK)
>>> Variable "pOcds" going out of scope leaks the storage it points to.
1478 return pNewArr;
1479 }
1480
1481 bool FormulaTokenArray::MayReferenceFollow()
1482 {
1483 if ( pCode && nLen > 0 )
** CID 1362173: Null pointer dereferences (FORWARD_NULL)
/sfx2/source/appl/appopen.cxx: 454 in
SfxApplication::NewDocExec_Impl(SfxRequest &)()
*** CID 1362173: Null pointer dereferences (FORWARD_NULL)
/sfx2/source/appl/appopen.cxx: 454 in
SfxApplication::NewDocExec_Impl(SfxRequest &)()
448 bool bNewWin = false;
449 vcl::Window* pTopWin = GetTopWindow();
450
451 SfxObjectShell* pCurrentShell = SfxObjectShell::Current();
Re: Jenkins coverage (Android and clang plugins)
On Fri, May 20, 2016 at 8:03 AM, Miklos Vajna wrote:
> Hi Norbert,
>
> - building with the clang plugins enabled (on Linux, the OS X one is not
> capable for running the plugins; dbgutil, product would not bring much
> benefit)
I installed clang and llvm
clang comes as version 3.4.2 (tags/RELEASE_34/dot2-final) on centos 7
saddly the plugings thing use api that are not in there
namely
FunctionDecl::params
which lead to
build CXX] compilerplugins/clang/unusedfields.cxx
/home/tdf/lode/dev/core/compilerplugins/clang/unusedfields.cxx:127:58:
error: no member named 'params' in 'clang::FunctionDecl'
for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) {
^
It is one thing to activate clang-plugin, it is another to maintains a
set of manual packages on all build slaves
Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - cui/source
cui/source/dialogs/cuicharmap.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f0e35cb2fb6f0f595d44c7a7c01ddaf60b19d642 Author: Caolán McNamara Date: Sun May 29 20:26:12 2016 +0100 Resolves: tdf#97839 a single character may be more than 1 utf-16 code points Change-Id: Iba2460bfb9335615796db3f5e233b870a8d63339 (cherry picked from commit 847cdd8efd0662d61d288a4d944edc30e864d145) diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index dc582d6..dff40ae 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -518,7 +518,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) else m_pShowText->SetText( aOUStr ); -m_pShowText->SetSelection( Selection( nPos + 1 ) ); +m_pShowText->SetSelection(Selection(nPos + aOUStr.getLength())); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/cuicharmap.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 847cdd8efd0662d61d288a4d944edc30e864d145 Author: Caolán McNamara Date: Sun May 29 20:26:12 2016 +0100 Resolves: tdf#97839 a single character may be more than 1 utf-16 code points Change-Id: Iba2460bfb9335615796db3f5e233b870a8d63339 diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index dc582d6..dff40ae 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -518,7 +518,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) else m_pShowText->SetText( aOUStr ); -m_pShowText->SetSelection( Selection( nPos + 1 ) ); +m_pShowText->SetSelection(Selection(nPos + aOUStr.getLength())); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/svmain.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cc6599137796797772b3395c79b35af48e368cce
Author: Stephan Bergmann
Date: Sun May 29 20:56:20 2016 +0200
loplugin:simplifybool
Change-Id: I4a07ec3eb9ab3d01c6104346a9bd9654bdcb1efe
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 69ab53b..2ebb805 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -304,7 +304,7 @@ bool InitVCL()
pSVData->maGDIData.mpScreenFontCache= new ImplFontCache;
pSVData->maGDIData.mpGrfConverter = new GraphicConverter;
-g_bIsLeanException = getenv("LO_LEAN_EXCEPTION") ? true : false;
+g_bIsLeanException = getenv("LO_LEAN_EXCEPTION") != nullptr;
// Set exception handler
pExceptionHandler = osl_addSignalHandler(VCLExceptionSignal_impl, nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLSession.hpp loolwsd/PrisonerSession.cpp
loolwsd/LOOLSession.hpp |4 ++--
loolwsd/PrisonerSession.cpp |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e7078ef49b9007866b2b60b23fb2bd859a9fcb68
Author: Ashod Nakashian
Date: Sun May 29 12:03:26 2016 -0400
loolwsd: keep private things private
Reviewed-on: https://gerrit.libreoffice.org/25619
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit 95b4807e05d0edd8caaa191b2230e363f15523bb)
Change-Id: I8fff570c9033bdc5694cec5a7056e9efc9de967a
Reviewed-on: https://gerrit.libreoffice.org/25624
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index 35c4690..5746d38 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -114,8 +114,7 @@ protected:
return peer->sendBinaryFrame(buffer, length);
}
-// Fields common to sessions in master and jailed processes:
-
+private:
// Our kind signifies to what we are connected to.
const Kind _kind;
@@ -126,6 +125,7 @@ protected:
// jailed process, the websocket to the parent.
std::shared_ptr _ws;
+protected:
// The actual URL, also in the child, even if the child never accesses
that.
std::string _docURL;
diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index 487fb7f..75ba2cf 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -257,6 +257,7 @@ bool PrisonerSession::shutdownPeer(Poco::UInt16 statusCode,
const std::string& m
{
peer->shutdown(statusCode, message);
}
+
return peer != nullptr;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/PrisonerSession.cpp
loolwsd/PrisonerSession.cpp | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit c4ae6da86fe821ee8826861167b695a7fd200577
Author: Ashod Nakashian
Date: Sun May 29 12:00:09 2016 -0400
loolwsd: bccu#1687 - leaking loolkit processes
When conversion fails we still have to put
something in the save-as queue to avoid
hanging WSD forever.
Reviewed-on: https://gerrit.libreoffice.org/25618
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit 0c6887c744fcd811728de43a971ee9c964d86e8e)
Change-Id: Ibc518bc922ee40f579a71e07571b21d9e633d998
Reviewed-on: https://gerrit.libreoffice.org/25623
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index 2a2fb8a..487fb7f 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -135,7 +135,16 @@ bool PrisonerSession::_handleInput(const char *buffer, int
length)
{
// Rewrite file:// URLs, as they are visible to the outside world.
const Path path(_docBroker->getJailRoot(),
url.substr(filePrefix.length()));
-url = filePrefix + path.toString().substr(1);
+if (Poco::File(path).exists())
+{
+url = filePrefix + path.toString().substr(1);
+}
+else
+{
+// Blank for failure.
+Log::debug("SaveAs produced no output, producing blank url.");
+url.clear();
+}
}
peer->setSaveAsUrl(url);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 055ab8d317b48d7ef2b7bcc4278cfbd6e19a996d
Author: Andras Timar
Date: Sun May 29 18:24:59 2016 +0200
loleaflet: typo dcoument->document
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index d6c63ea..c1459a0 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -157,7 +157,7 @@ L.Control.Menubar = L.Control.extend({
return;
}
- // Add dcoument specific menu
+ // Add document specific menu
var docType = this._map.getDocType();
if (docType === 'text') {
this._initializeMenu(this.options.text);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/MasterProcessSession.cpp
loolwsd/MasterProcessSession.cpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 95b4807e05d0edd8caaa191b2230e363f15523bb
Author: Ashod Nakashian
Date: Sun May 29 12:03:26 2016 -0400
loolwsd: don't use a peer's null websocket
Change-Id: I8fff570c9033bdc5694cec5a7056e9efc9de967a
Reviewed-on: https://gerrit.libreoffice.org/25619
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 31aa772..93fcbd0 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -661,10 +661,11 @@ void MasterProcessSession::forwardToPeer(const char
*buffer, int length)
bool MasterProcessSession::shutdownPeer(Poco::UInt16 statusCode, const
std::string& message)
{
auto peer = _peer.lock();
-if (peer && !peer->isCloseFrame())
+if (peer && !peer->isCloseFrame() && peer->_ws)
{
peer->_ws->shutdown(statusCode, message);
}
+
return peer != nullptr;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLWSD.cpp loolwsd/MasterProcessSession.cpp
loolwsd/LOOLWSD.cpp |1 -
loolwsd/MasterProcessSession.cpp | 12 +++-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 0c6887c744fcd811728de43a971ee9c964d86e8e
Author: Ashod Nakashian
Date: Sun May 29 12:00:09 2016 -0400
loolwsd: bccu#1687 - leaking loolkit processes
When conversion fails we still have to put
something in the save-as queue to avoid
hanging WSD forever.
Change-Id: Ibc518bc922ee40f579a71e07571b21d9e633d998
Reviewed-on: https://gerrit.libreoffice.org/25618
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index db561d0..404f576 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -389,7 +389,6 @@ private:
Log::trace(docKey + ", ws_sessions++: " +
std::to_string(sessionsCount));
lock.unlock();
-Log::trace(docKey + ", ws_sessions++: " +
std::to_string(sessionsCount));
// Wait until the client has connected with a prison
socket.
waitBridgeCompleted(session);
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index c62ef32..31aa772 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -157,8 +157,18 @@ bool MasterProcessSession::_handleInput(const char
*buffer, int length)
{
// Rewrite file:// URLs, as they are visible to the
outside world.
const Path path(_docBroker->getJailRoot(),
url.substr(filePrefix.length()));
-url = filePrefix + path.toString().substr(1);
+if (Poco::File(path).exists())
+{
+url = filePrefix + path.toString().substr(1);
+}
+else
+{
+// Blank for failure.
+Log::debug("SaveAs produced no output, producing
blank url.");
+url.clear();
+}
}
+
peer->_saveAsQueue.put(url);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLWSD.cpp
loolwsd/LOOLWSD.cpp |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2d4b9d57c630780e91490cf1bb408724a62b8a11
Author: Ashod Nakashian
Date: Thu May 19 20:28:54 2016 -0400
loolwsd: replenish children on finishing a prisoner socket thread
Change-Id: Id6b1a12439431819910f6c5c99cb630b48c87805
Reviewed-on: https://gerrit.libreoffice.org/25234
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit f3a1e6e81e8419f42ef039f8ecd7eba332908d2d)
Reviewed-on: https://gerrit.libreoffice.org/25617
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index c414c0f..db561d0 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1051,6 +1051,8 @@ public:
Admin::instance().rmDoc(docKey, sessionId);
}
+// Replenish.
+prespawnChildren();
Log::debug("Thread finished.");
}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/Common.hpp loolwsd/LOOLWSD.cpp
loolwsd/Common.hpp |2 +-
loolwsd/LOOLWSD.cpp | 24 +---
2 files changed, 14 insertions(+), 12 deletions(-)
New commits:
commit dc27c46727f26d570338eb8d1dee12b2f1dc8c51
Author: Ashod Nakashian
Date: Thu May 12 10:43:13 2016 -0400
loolwsd: better child management
Change-Id: I0de190619008834f096517bd1cfafcdc83261f47
Reviewed-on: https://gerrit.libreoffice.org/24933
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit de5f77c00fca275361a403f222e8025eaa3b346c)
Reviewed-on: https://gerrit.libreoffice.org/25616
diff --git a/loolwsd/Common.hpp b/loolwsd/Common.hpp
index caa3ce0..f0be984 100644
--- a/loolwsd/Common.hpp
+++ b/loolwsd/Common.hpp
@@ -17,7 +17,7 @@ constexpr int MAX_SESSIONS = 1024;
constexpr int DEFAULT_CLIENT_PORT_NUMBER = 9980;
constexpr int DEFAULT_MASTER_PORT_NUMBER = 9981;
constexpr int WSD_SLEEP_SECS = 2;
-constexpr int CHILD_TIMEOUT_SECS = 10;
+constexpr int CHILD_TIMEOUT_SECS = 4;
constexpr int POLL_TIMEOUT_MS = 1000;
constexpr int COMMAND_TIMEOUT_MS = 5000;
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index eff2fea..c414c0f 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -149,7 +149,7 @@ static bool NoCapsForKit = false;
static std::vector> newChildren;
static std::mutex newChildrenMutex;
static std::condition_variable newChildrenCV;
-static std::chrono::steady_clock::time_point lastForkRequestTime;
+static std::chrono::steady_clock::time_point lastForkRequestTime =
std::chrono::steady_clock::now();
static std::map> docBrokers;
static std::mutex docBrokersMutex;
// Sessions to pre-spawned child processes that have connected but are not yet
assigned a
@@ -194,13 +194,7 @@ static void prespawnChildren()
return;
}
-const auto duration = (std::chrono::steady_clock::now() -
lastForkRequestTime);
-if
(std::chrono::duration_cast(duration).count() <=
CHILD_TIMEOUT_SECS * 1000)
-{
-// Not enough time passed to balance children.
-return;
-}
-
+// Do the cleanup first.
for (int i = newChildren.size() - 1; i >= 0; --i)
{
if (!newChildren[i]->isAlive())
@@ -209,6 +203,13 @@ static void prespawnChildren()
}
}
+const auto duration = (std::chrono::steady_clock::now() -
lastForkRequestTime);
+if
(std::chrono::duration_cast(duration).count() <=
CHILD_TIMEOUT_SECS * 1000)
+{
+// Not enough time passed to balance children.
+return;
+}
+
const int available = newChildren.size();
int balance = LOOLWSD::NumPreSpawnedChildren;
balance -= available;
@@ -263,11 +264,11 @@ static std::shared_ptr getNewChild()
Log::debug("getNewChild: Returning new child [" +
std::to_string(child->getPid()) + "].");
return child;
}
-
-Log::debug("getNewChild: No live child, forking more.");
}
+
+Log::debug("getNewChild: No live child, forking more.");
}
-while
(chrono::duration_cast(chrono::steady_clock::now() -
startTime).count() < CHILD_TIMEOUT_SECS * 2000);
+while
(chrono::duration_cast(chrono::steady_clock::now() -
startTime).count() < CHILD_TIMEOUT_SECS * 4000);
Log::debug("getNewChild: Timed out while waiting for new child.");
return nullptr;
@@ -1454,6 +1455,7 @@ Process::PID LOOLWSD::createForKit()
Log::info("Launching forkit process: " + forKitPath + " " +
Poco::cat(std::string(" "), args.begin(), args.end()));
+lastForkRequestTime = std::chrono::steady_clock::now();
ProcessHandle child = Process::launch(forKitPath, args);
return child.id();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLForKit.cpp
loolwsd/LOOLForKit.cpp | 44 ++--
1 file changed, 26 insertions(+), 18 deletions(-)
New commits:
commit 7f2fd2427098e431fcc45febbf0473b99281cef2
Author: Ashod Nakashian
Date: Thu May 19 20:27:24 2016 -0400
loolwsd: more frequent zombie reaping in forkit
Change-Id: I10d859880cfd933c38572852f506eedf603e8fad
Reviewed-on: https://gerrit.libreoffice.org/25232
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit 6ce9868a9c3555a2aa848da53bbc1a14f642d468)
Reviewed-on: https://gerrit.libreoffice.org/25615
diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index f0e5dc3..4ff57cf 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -112,6 +112,26 @@ private:
}
};
+/// Check if some previously forked kids have died.
+static void cleanupChildren()
+{
+Process::PID exitedChildPid;
+int status;
+while ((exitedChildPid = waitpid(-1, &status, WNOHANG)) > 0)
+{
+if (childJails.find(exitedChildPid) != childJails.end())
+{
+Log::info("Child " + std::to_string(exitedChildPid) + " has
exited, removing its jail '" + childJails[exitedChildPid] + "'");
+Util::removeFile(childJails[exitedChildPid], true);
+childJails.erase(exitedChildPid);
+}
+else
+{
+Log::error("Unknown child " + std::to_string(exitedChildPid) + "
has exited");
+}
+}
+}
+
static int createLibreOfficeKit(const std::string& childRoot,
const std::string& sysTemplate,
const std::string& loTemplate,
@@ -142,26 +162,10 @@ static int createLibreOfficeKit(const std::string&
childRoot,
else
{
// Parent
-
-// Check if some previously forked kids have died
-Process::PID exitedChildPid;
-int status;
-while ((exitedChildPid = waitpid(-1, &status, WNOHANG)) > 0)
-{
-if (childJails.find(exitedChildPid) != childJails.end())
-{
-Log::info("Child " + std::to_string(exitedChildPid) + " has
exited, removing its jail '" + childJails[exitedChildPid] + "'");
-Util::removeFile(childJails[exitedChildPid], true);
-childJails.erase(exitedChildPid);
-}
-else
-{
-Log::error("Unknown child " + std::to_string(exitedChildPid) +
" has exited");
-}
-}
-
if (pid < 0)
+{
Log::syserror("Fork failed.");
+}
else
{
Log::info("Forked kit [" + std::to_string(pid) + "].");
@@ -343,6 +347,10 @@ int main(int argc, char** argv)
// If we need to spawn more, retry later.
ForkCounter = (newInstances >= ForkCounter ? 0 : ForkCounter -
newInstances);
}
+else
+{
+cleanupChildren();
+}
}
close(pipeFd);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/ChildProcessSession.cpp loolwsd/LOKitHelper.hpp
loolwsd/ChildProcessSession.cpp | 11 +++
loolwsd/LOKitHelper.hpp |9 +++--
2 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 4f08267fe7af7bcac663b7aad18cbbc7dc750439
Author: Henry Castro
Date: Wed May 25 00:32:00 2016 -0400
loolwsd: deallocates memory previously allocated by malloc
(cherry picked from commit bf1a4705e4d343b4a6031e85d8d3644decf3ddac)
Change-Id: I70e2542b6c992694d7bc8df178eea34d363f303c
Reviewed-on: https://gerrit.libreoffice.org/25614
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 21c2aad..bf3b11b 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -397,13 +397,13 @@ bool ChildProcessSession::_handleInput(const char
*buffer, int length)
if (tokens[0] == "dummymsg")
{
-// Just to update the activity of view-only mode
+// Just to update the activity of a view-only client.
return true;
}
else if (tokens[0] == "canceltiles")
{
-// this command makes sense only on the command queue level, nothing
-// to do here
+// This command makes sense only on the command queue level.
+// Shouldn't get this here.
return true;
}
else if (tokens[0] == "commandvalues")
@@ -566,6 +566,7 @@ bool ChildProcessSession::_handleInput(const char *buffer,
int length)
assert(false);
}
}
+
return true;
}
@@ -697,7 +698,9 @@ bool ChildProcessSession::getCommandValues(const char*
/*buffer*/, int /*length*
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
-sendTextFrame("commandvalues: " +
std::string(_loKitDocument->pClass->getCommandValues(_loKitDocument,
command.c_str(;
+char* ptrValues = _loKitDocument->pClass->getCommandValues(_loKitDocument,
command.c_str());
+sendTextFrame("commandvalues: " + std::string(ptrValues));
+std::free(ptrValues);
return true;
}
diff --git a/loolwsd/LOKitHelper.hpp b/loolwsd/LOKitHelper.hpp
index cfc3fec..46d40b1 100644
--- a/loolwsd/LOKitHelper.hpp
+++ b/loolwsd/LOKitHelper.hpp
@@ -107,6 +107,7 @@ namespace LOKitHelper
inline
std::string documentStatus(LibreOfficeKitDocument *loKitDocument)
{
+char* ptrValue;
assert(loKitDocument && "null loKitDocument");
const auto type =
static_cast(loKitDocument->pClass->getDocumentType(loKitDocument));
@@ -128,11 +129,15 @@ namespace LOKitHelper
oss << "\n";
if (type == LOK_DOCTYPE_PRESENTATION)
{
-oss << loKitDocument->pClass->getPartHash(loKitDocument,
i);
+ptrValue =
loKitDocument->pClass->getPartHash(loKitDocument, i);
+oss << ptrValue;
+std::free(ptrValue);
}
else
{
-oss << loKitDocument->pClass->getPartName(loKitDocument,
i);
+ptrValue =
loKitDocument->pClass->getPartName(loKitDocument, i);
+oss << ptrValue;
+std::free(ptrValue);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/gridctrl.hxx |4 ++--
svx/source/fmcomp/gridctrl.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 634fd0016ef7396a782d28272852302841f37201
Author: Julien Nabet
Date: Sun May 29 13:01:04 2016 +0200
tdf#100115: _nColId is sal_uInt16
like the other methods, so fix it in canCopyCellText + copyCellText
Change-Id: I3395f8823602f0a1791908945e3dec5034d3d612
Reviewed-on: https://gerrit.libreoffice.org/25605
Tested-by: Lionel Elie Mamane
Reviewed-by: Lionel Elie Mamane
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 85c6346..d23b7d0 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -498,9 +498,9 @@ public:
getContext() const { return m_xContext; }
/// returns if the text of the given cell can be copied into the
clipboard
-boolcanCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId);
+boolcanCopyCellText(sal_Int32 _nRow, sal_uInt16 _nColId);
/// copies the text of the given cell into the clipboard
-voidcopyCellText(sal_Int32 _nRow, sal_Int16 _nColId);
+voidcopyCellText(sal_Int32 _nRow, sal_uInt16 _nColId);
// select in listener handling
voidsetGridListener( FmGridListener* _pListener )
{ m_pGridListener = _pListener; }
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 20830d5..8effd55 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2822,7 +2822,7 @@ void DbGridControl::StartDrag( sal_Int8 /*nAction*/,
const Point& rPosPixel )
}
}
-bool DbGridControl::canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId)
+bool DbGridControl::canCopyCellText(sal_Int32 _nRow, sal_uInt16 _nColId)
{
return (_nRow >= 0)
&& (_nRow < GetRowCount())
@@ -2830,7 +2830,7 @@ bool DbGridControl::canCopyCellText(sal_Int32 _nRow,
sal_Int16 _nColId)
&& (_nColId <= ColCount());
}
-void DbGridControl::copyCellText(sal_Int32 _nRow, sal_Int16 _nColId)
+void DbGridControl::copyCellText(sal_Int32 _nRow, sal_uInt16 _nColId)
{
DBG_ASSERT(canCopyCellText(_nRow, _nColId), "DbGridControl::copyCellText:
invalid call!");
DbGridColumn* pColumn = m_aColumns[ GetModelColumnPos(_nColId) ];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c47077f1449abf043237d64f078b7aaf5f634b84 Author: Andras Timar Date: Sun May 29 17:27:33 2016 +0200 Bump version to 5.0-37 Change-Id: I998ddc1759bef24e2fc80b975cc22f832a6b6d49 diff --git a/configure.ac b/configure.ac index e56289a..61c6892 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.0.10.36],[],[],[https://CollaboraOffice.com/]) +AC_INIT([Collabora Office],[5.0.10.37],[],[],[https://CollaboraOffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 7 commits - loleaflet/dist loleaflet/.eslintignore loleaflet/.eslintrc loleaflet/Jakefile.js loleaflet/package.json l
loleaflet/.eslintignore |6
loleaflet/.eslintrc |6
loleaflet/Jakefile.js |2
loleaflet/dist/loleaflet.css|2
loleaflet/dist/toolbar/toolbar.js | 807 ++--
loleaflet/package.json |2
loleaflet/src/admin/AdminSocketAnalytics.js |8
loleaflet/src/admin/AdminSocketSettings.js |2
loleaflet/src/control/Control.Menubar.js|4
loleaflet/src/control/Control.Permission.js |2
loleaflet/src/control/Control.Selection.js |2
loleaflet/src/control/Control.Tabs.js | 18
loleaflet/src/core/Log.js |4
loleaflet/src/dom/DomEvent.DoubleTap.js |2
loleaflet/src/dom/DomEvent.js |6
loleaflet/src/dom/Draggable.js |2
loleaflet/src/geo/LatLng.js |2
loleaflet/src/geo/LatLngBounds.js |4
loleaflet/src/layer/GeoJSON.js |2
loleaflet/src/layer/Layer.Popup.js |6
loleaflet/src/layer/Layer.js|4
loleaflet/src/layer/marker/Cursor.js|2
loleaflet/src/layer/marker/Marker.js|6
loleaflet/src/layer/tile/GridLayer.js | 32 -
loleaflet/src/layer/tile/TileLayer.js |6
loleaflet/src/layer/vector/Polyline.js |4
loleaflet/src/layer/vector/SVG.js |4
loleaflet/src/map/Map.js| 12
loleaflet/src/map/anim/Map.ZoomAnimation.js |4
loleaflet/src/map/ext/Map.Geolocation.js|2
loleaflet/src/map/handler/Map.Keyboard.js | 108 +--
loleaflet/src/map/handler/Map.Scroll.js |4
32 files changed, 539 insertions(+), 538 deletions(-)
New commits:
commit 761b69e00b4fdbd319471b81b3a74c7aa1909941
Author: Pranav Kant
Date: Sun May 29 15:16:12 2016 +0530
bccu#1841 - Remove selection uno commands from impress menubar
... temporarily, till we have them.
Change-Id: I5f35e54a33a7a1c96359de59e326a286af655ddf
(cherry picked from commit 3516f31031d7b18d8bc408f5983bd4ba442aca0e)
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 3b3efd9..d6c63ea 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -80,10 +80,6 @@ L.Control.Menubar = L.Control.extend({
{name: _('Delete'), type: 'menu', menu: [{name: _('Rows'),
type: 'unocommand', uno: '.uno:DeleteRows'},
{name: _('Columns'), type: 'unocommand', uno:
'.uno:DeleteColumns'},
{name: _('Table'), type: 'unocommand', uno:
'.uno:DeleteTable'}]},
-
{name: _('Select'), type: 'menu', menu: [{name: _('Table'),
type: 'unocommand', uno: '.uno:SelectTable'},
-
{name: _('Row'), type: 'unocommand', uno: '.uno:EntireRow'},
-
{name: _('Column'), type: 'unocommand', uno:
'.uno:EntireColumn'},
-
{name: _('Cell'), type: 'unocommand', uno: '.uno:EntireCell'}]},
{name: _('Merge cells'), type: 'unocommand', uno:
'.uno:MergeCells'}]
},
{name: _('Slide'), type: 'menu', menu: [{name: _('New
slide'), id: 'insertpage', type: 'action'},
commit 430f6f4c8cce7f70d3c1c287a15badf447a20eff
Author: Pranav Kant
Date: Sun May 29 15:14:01 2016 +0530
bccu#1850 - Help shadows all but menu bar
Change-Id: I156fde8e70421292e0bd134340eb01e1950853b7
(cherry picked from commit 6831385c05399d3e8983f79a3a905af06f82fa1f)
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 473cf0c..c82f194 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -24,7 +24,7 @@
right: 0;
left: 0;
padding-left: 125px;
-z-index: 1030;
+z-index: 1000;
}
body {
commit a8bfc23e0b349d26
Re: Crash reporting for TDF builds
Hello Markus, Il 29/05/2016 13:11, Markus Mohrhard ha scritto: ** Server (code at https://github.com/mmohrhard/crash ) automated a few workflows (currently the processing is async and needs to be done manually) Do you have more details for this item? -- Riccardo Magliocchetti @rmistaken http://menodizero.it ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDContentCollector.cpp | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 10f1e175b2dc83cc486614ac5a7a3b286eea7c0a
Author: Julien Nabet
Date: Sun May 29 15:52:38 2016 +0200
cppcheck: Prefer prefix ++/-- operators for non-primitive types
Change-Id: Ib375053b5830f8120dccdfa4278c4138b02deba8
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index fb216b0..3178937 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -760,11 +760,11 @@ void libvisio::VSDContentCollector::_flushText()
* last one. */
if (!paraNumRemaining)
{
- paraIt++;
+ ++paraIt;
if (paraIt != m_paraFormats.end())
paraNumRemaining = paraIt->charCount;
else
-paraIt--;
+--paraIt;
}
/* Decrease the count of remaining characters in the same span,
@@ -777,7 +777,7 @@ void libvisio::VSDContentCollector::_flushText()
* the last one. */
if (!charNumRemaining)
{
- charIt++;
+ ++charIt;
if (charIt != m_charFormats.end())
{
charNumRemaining = charIt->charCount;
@@ -791,7 +791,7 @@ void libvisio::VSDContentCollector::_flushText()
}
}
else
-charIt--;
+--charIt;
}
/* Decrease the count of remaining characters using the same
@@ -802,7 +802,7 @@ void libvisio::VSDContentCollector::_flushText()
* last one. */
if (!tabNumRemaining)
{
- tabIt++;
+ ++tabIt;
if (tabIt != m_tabSets.end())
tabNumRemaining = tabIt->m_numChars;
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' -
0 files changed New commits: commit 29911d499a6ed7ffc02d67cd27b68d8324a03348 Author: László Németh Date: Sun May 29 14:46:40 2016 +0200 empty commit (first proc. idle in start) Change-Id: I5e5d7572aff6a3ce26775fe0cd691bf440fd35e4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: /usr/lib/libnss3.so: version `NSS_3.19.1' not found
On 29/05/16 09:21, YuGiOhJCJ Mailing-List wrote: > On Sun, 29 May 2016 01:35:47 +0100 > Wols Lists wrote: > >> On 24/05/16 11:26, Eike Rathke wrote: >>> Hi YuGiOhJCJ, >>> >>> On Thursday, 2016-05-19 17:26:21 +0200, YuGiOhJCJ Mailing-List wrote: >>> > Dumb question: how much system memory is available? I have 4GB of memory: >>> >>> That certainly is not enough and it will either grind your machine to >>> heavily swap, or break the build / abort things if no swap is available. >>> $ free -m total used free sharedbuffers cached Mem: 3995559 3436 0 53330 -/+ buffers/cache:175 3819 Swap: 956 0956 >>> >>> >>> > And why are you building under /tmp/ and how much free disk space is > there? Well, I could do it in /home but as it is a NFS share, it is slower than in /tmp >>> >>> Ok, but as Linoel already said, using /var/tmp/ might be a better >>> choice. Also, if disk space is limited under /tmp/ then building there >>> may conflict with temporary files the compiler and linker create, which >>> can become quite large. >> >> Bear in mind, the LFS says that /tmp and /var/tmp behave differently. On >> a "correctly" configured system, the contents of /tmp are NOT guaranteed >> to survive a system crash. Which is why /tmp is often configured as a >> tmpfs. On the other hand, the contents of /var/tmp ARE guaranteed to >> survive, which is why vi and emacs and that sort of program all store >> their replay logs there ... >> >> and which is why the OP's choice of /tmp was probably correct :-) >> although most distros don't seem to make the /tmp directory overly >> large. (They also seem not to allocate much swap space.) >>> Do you think I don't have enough memory? Is there a way to require less memory while building libreoffice or should I buy more memory? >>> >>> Buy memory ;-) at least 8GB are needed, but when building with debug >>> and symbols even that might result in swapping if you forgot to quit >>> a previous gdb session before linking Calc for example.. 12GB or having >>> a larger swap than just 1GB is recommended. >>> >> My rule of thumb is simple. Disk space is cheap, I allocate twice >> maximum ram per disk. In other words, my desktop is maxed out at 16Gb so >> the two disks each have a 32Gb swap partition. My laptop maxes out at >> 8Gb so there should be a 16Gb swap partition on the drive (actually it's >> 32Gb :-) >> >> The reason for that is - in the old days everybody said "swap should be >> twice memory" which was thought to be an old wives' tale. Then kernel >> 2.4 came out, and it turned out (1) that this requirement was actually >> part of the swap algorithm, and (2) the optimisations and hacks and >> whatever that enabled smaller swaps were a heap of old crufty rubbish. >> Linus ripped out all the hacks and vanilla 2.4 kernels started crashing >> everywhere they had a swapspace of less than twice ram. >> >> Obviously, new optimisations have gone in, presumably much better than >> before, but nowhere have I found any reference to whether the >> fundamental algorithm has been replaced. So I'm assuming it hasn't, and >> allocate at least twice ram to ensure I get top performance. >> >> Which means my fstab contains the following line >> >> tmp /tmptmpfs size=10G,mode=0777 0 0 >> >> and you'll notice the size=10G parameter, giving me a 10Gb /tmp directory. >> >> (I run gentoo, so /var/tmp/portage is also a tmpfs, and that's declared >> at 30Gb!) >> >> Cheers, >> Wol > > In my /etc/fstab file I got this line on Slackware 14.1: > $ grep "tmp" /etc/fstab > tmpfs/dev/shm tmpfs defaults 0 0 > It is a bit different than your line in /etc/fstab but I don't know if that > matters. > > OK, so I see three things I can do in this order: > 1) Try to build libre office in an other directory than /tmp (because it is a > tmpfs) and /home (because it is an NFS share) With no size option, /tmp will default to half of ram. I would just add the "size" option, so change the fourth parameter to "size=10G,defaults", and you'll have a 10gig /tmp. MAKE SURE that ram+swap is bigger, or a "/tmp is full" will crash your machine! > 2) Try to increase the size of my swap partition (as I have 4GB of RAM, I > need a swap space of 8GB instead of 1GB) If you've not got any free space on your local disk, you could always add a swap file instead of a partition, but if you follow my suggestion of a 10Gb /tmp, you need to add at least four more gig of ram or swap. > 3) Try to buy more RAM in order to get 8GB instead of 4GB > YES. I don't know what ram your machine takes, but DDR3 is about GBP15 for a 4Gb stick at the moment. If your machine will take more, go for it... Oh - and as with most things linux, it'll only use the huge /tmp space if it needs it, so you can "set and forget"
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/days360.fods | 1279 1 file changed, 1279 insertions(+) New commits: commit 1c5e150ec81fca20af80c4372bbc96413a481340 Author: ZdenÄk Crhonek Date: Sat May 28 15:31:44 2016 +0200 add DAYS360 test case Change-Id: If670fcbf870d96e2328c02bc0f42beb5cd8e60ff Reviewed-on: https://gerrit.libreoffice.org/25583 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/days360.fods b/sc/qa/unit/data/functions/fods/days360.fods new file mode 100644 index 000..f9261d6 --- /dev/null +++ b/sc/qa/unit/data/functions/fods/days360.fods @@ -0,0 +1,1279 @@ + + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:form x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> + 2016-05-28T12:04:51.801913159P0D1LibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64 LibreOffice_project/fa9416906e615f5f19ad8524176d2ed693662769 + + + 0 + 0 + 27975 + 8468 + + + view1 + + + 2 + 7 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + 10 + 3 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + Sheet1 + 1241 + 0 + 100 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + cs + CZ + + + + + + en + US + + + + + + true + true + 3 + 1 + true + 1 + true + qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY= + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + + + + + ( + + ) + + + + + + + + ( + + ) + + + + £ + + + + + - + £ + + + + + + £ + + + +
Crash reporting for TDF builds
Hey, so I managed to land the crash reporting that I presented during my FOSDEM talk finally in time for the 5.2 release. The code is already integrated and available for 5.2.0.0.beta1. Below are some information for all developers on how to make use of the crash reporting in the code and how to use the reported crashes. Please note that you should not upload crashes from your own builds as there are no corresponding debug symbols on the server. Please only use it for official TDF builds. * How does it work? We use the breakpad library which registers signal handlers for a few signal that signal crashes and related problems (on Windows SEH exceptions). During the start of Libreoffice we generate a file in the user profile called dump.ini with key value pairs of information (the URL of the server, the version, the product name). During the runtime of LibreOffice we may collect additional key value pairs, e.g. currently the used OpenGL device and driver if we use OpenGL. These information are all added to the dump.ini. If we now hit a crash the crash handler will write a minidump of the current stack (a windows debug format) and add the path to the minidump file to the dump.ini. Nothing more is done from the crash reporting code in the crashing process (well you should not do more than really necessary in a process that might be corrupted). During the next start-up we check if a dump.ini exists and if it contains a path to a minidump (if there is no such path we just ignore it), and if it exists ask the user if he wants to upload it. Currently there is no feedback for the user with the ID or an URL for the uploaded crash. The processing of the crash to a human readable stack trace happens completely on the server with the symbols generated during the build. To generate the symbols we have now two additional make targets (make symbols and make upload-symbols). Note that you can not use them to upload your own symbols as that is restricted to registered users. * How can a developer make use of the crash reporting to provide more information? I mentioned already that we already upload additional information with the crash report like the used OpenGL device and driver if we use them. This is done through the CrashReporter::AddKeyValue method from include/desktop/crashreport.hxx The idea is that you can add important information as key value pairs and they will be available together with the crash report on the server. Some information that area already part of the minidump are the OS, the CPU, the loaded modules. Keep in mind that you should only collect the information that are really necessary. Some information that we might want to select in the future: OpenCL info if OpenCL is use did we crash inside of our OpenGL code loaded extensions The plan is to improve the dialog asking the user to upload the crash with the information that we will include. * How can a developer use the uploaded crashes to fix bugs? The server side of our crash reporting is at http://crashreport.libreoffice.org/stats/ (yes the main page is nearly unusable right now and incredibly ugly). But more importantly are pages like: http://crashreport.libreoffice.org/stats/version/5.2.0.0 http://crashreport.libreoffice.org/stats/signature/sclo.dll+0x64396a http://crashreport.libreoffice.org/stats/crash_details/4a266638-29a6-41a9-bcec-cfccaffb1a6c Taking the last one as an example we have on the top all the meta information that are part of the minidump, below that the stacktrace of the crashing thread (the symbols for sclo.dll are missing because I rebuilt the library after generating the symbol information) and at the bottom a link to open the stack traces for all the other threads. On the top you have 4 tabs for different information: the main details page, the metadata (which contains all the key-value pairs (empty in that case), the loaded modules and finally the raw export of the minidump. Hopefully that provides enough information for you to understand the crash. In the future I also want to add a way to link crashes to bugzilla. * Open Items As can be seen we have a basic working concept but this is for now just a little bit more than a working prototype. We still need to make several big changes on client and server side. The following come to my mind: ** Client better feedback for the user collect all relevant and important information clean-up my code integrate it into the OSX build ** Server (code at https://github.com/mmohrhard/crash ) more beautiful and somewhat useable pages and UX automated a few workflows (currently the processing is async and needs to be done manually) provide connection to bugzilla (see issue#9) integrate windows library symbols (see issue#14) many more smaller tasks, see for example other issues and TODO comments in the code If you want to help out please talk to me. I'm especially looking for people with experience in web development around javascript, css and django. Regards, Mar
Re: /usr/lib/libnss3.so: version `NSS_3.19.1' not found
On Sun, 29 May 2016 01:35:47 +0100 Wols Lists wrote: > On 24/05/16 11:26, Eike Rathke wrote: > > Hi YuGiOhJCJ, > > > > On Thursday, 2016-05-19 17:26:21 +0200, YuGiOhJCJ Mailing-List wrote: > > > >>> Dumb question: how much system memory is available? > >> I have 4GB of memory: > > > > That certainly is not enough and it will either grind your machine to > > heavily swap, or break the build / abort things if no swap is available. > > > >> $ free -m > >> total used free sharedbuffers cached > >> Mem: 3995559 3436 0 53330 > >> -/+ buffers/cache:175 3819 > >> Swap: 956 0956 > > > > > > > >>> And why are you building under /tmp/ and how much free disk space is > >>> there? > >> > >> Well, I could do it in /home but as it is a NFS share, it is slower than > >> in /tmp > > > > Ok, but as Linoel already said, using /var/tmp/ might be a better > > choice. Also, if disk space is limited under /tmp/ then building there > > may conflict with temporary files the compiler and linker create, which > > can become quite large. > > Bear in mind, the LFS says that /tmp and /var/tmp behave differently. On > a "correctly" configured system, the contents of /tmp are NOT guaranteed > to survive a system crash. Which is why /tmp is often configured as a > tmpfs. On the other hand, the contents of /var/tmp ARE guaranteed to > survive, which is why vi and emacs and that sort of program all store > their replay logs there ... > > and which is why the OP's choice of /tmp was probably correct :-) > although most distros don't seem to make the /tmp directory overly > large. (They also seem not to allocate much swap space.) > > > >> Do you think I don't have enough memory? > >> Is there a way to require less memory while building libreoffice or should > >> I buy more memory? > > > > Buy memory ;-) at least 8GB are needed, but when building with debug > > and symbols even that might result in swapping if you forgot to quit > > a previous gdb session before linking Calc for example.. 12GB or having > > a larger swap than just 1GB is recommended. > > > My rule of thumb is simple. Disk space is cheap, I allocate twice > maximum ram per disk. In other words, my desktop is maxed out at 16Gb so > the two disks each have a 32Gb swap partition. My laptop maxes out at > 8Gb so there should be a 16Gb swap partition on the drive (actually it's > 32Gb :-) > > The reason for that is - in the old days everybody said "swap should be > twice memory" which was thought to be an old wives' tale. Then kernel > 2.4 came out, and it turned out (1) that this requirement was actually > part of the swap algorithm, and (2) the optimisations and hacks and > whatever that enabled smaller swaps were a heap of old crufty rubbish. > Linus ripped out all the hacks and vanilla 2.4 kernels started crashing > everywhere they had a swapspace of less than twice ram. > > Obviously, new optimisations have gone in, presumably much better than > before, but nowhere have I found any reference to whether the > fundamental algorithm has been replaced. So I'm assuming it hasn't, and > allocate at least twice ram to ensure I get top performance. > > Which means my fstab contains the following line > > tmp /tmptmpfs size=10G,mode=0777 0 0 > > and you'll notice the size=10G parameter, giving me a 10Gb /tmp directory. > > (I run gentoo, so /var/tmp/portage is also a tmpfs, and that's declared > at 30Gb!) > > Cheers, > Wol In my /etc/fstab file I got this line on Slackware 14.1: $ grep "tmp" /etc/fstab tmpfs/dev/shm tmpfs defaults 0 0 It is a bit different than your line in /etc/fstab but I don't know if that matters. OK, so I see three things I can do in this order: 1) Try to build libre office in an other directory than /tmp (because it is a tmpfs) and /home (because it is an NFS share) 2) Try to increase the size of my swap partition (as I have 4GB of RAM, I need a swap space of 8GB instead of 1GB) 3) Try to buy more RAM in order to get 8GB instead of 4GB ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |4
1 file changed, 4 deletions(-)
New commits:
commit 3516f31031d7b18d8bc408f5983bd4ba442aca0e
Author: Pranav Kant
Date: Sun May 29 15:16:12 2016 +0530
bccu#1841 - Remove selection uno commands from impress menubar
... temporarily, till we have them.
Change-Id: I5f35e54a33a7a1c96359de59e326a286af655ddf
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 3b3efd9..d6c63ea 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -80,10 +80,6 @@ L.Control.Menubar = L.Control.extend({
{name: _('Delete'), type: 'menu', menu: [{name: _('Rows'),
type: 'unocommand', uno: '.uno:DeleteRows'},
{name: _('Columns'), type: 'unocommand', uno:
'.uno:DeleteColumns'},
{name: _('Table'), type: 'unocommand', uno:
'.uno:DeleteTable'}]},
-
{name: _('Select'), type: 'menu', menu: [{name: _('Table'),
type: 'unocommand', uno: '.uno:SelectTable'},
-
{name: _('Row'), type: 'unocommand', uno: '.uno:EntireRow'},
-
{name: _('Column'), type: 'unocommand', uno:
'.uno:EntireColumn'},
-
{name: _('Cell'), type: 'unocommand', uno: '.uno:EntireCell'}]},
{name: _('Merge cells'), type: 'unocommand', uno:
'.uno:MergeCells'}]
},
{name: _('Slide'), type: 'menu', menu: [{name: _('New
slide'), id: 'insertpage', type: 'action'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/loleaflet.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6831385c05399d3e8983f79a3a905af06f82fa1f
Author: Pranav Kant
Date: Sun May 29 15:14:01 2016 +0530
bccu#1850 - Help shadows all but menu bar
Change-Id: I156fde8e70421292e0bd134340eb01e1950853b7
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 473cf0c..c82f194 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -24,7 +24,7 @@
right: 0;
left: 0;
padding-left: 125px;
-z-index: 1030;
+z-index: 1000;
}
body {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 5 commits - loleaflet/dist loleaflet/.eslintignore loleaflet/.eslintrc loleaflet/Jakefile.js loleaflet/package.json loleaflet/src
loleaflet/.eslintignore |6
loleaflet/.eslintrc |6
loleaflet/Jakefile.js |2
loleaflet/dist/toolbar/toolbar.js | 807 ++--
loleaflet/package.json |2
loleaflet/src/admin/AdminSocketAnalytics.js |8
loleaflet/src/admin/AdminSocketSettings.js |2
loleaflet/src/control/Control.Permission.js |2
loleaflet/src/control/Control.Selection.js |2
loleaflet/src/control/Control.Tabs.js | 18
loleaflet/src/core/Log.js |4
loleaflet/src/dom/DomEvent.DoubleTap.js |2
loleaflet/src/dom/DomEvent.js |6
loleaflet/src/dom/Draggable.js |2
loleaflet/src/geo/LatLng.js |2
loleaflet/src/geo/LatLngBounds.js |4
loleaflet/src/layer/GeoJSON.js |2
loleaflet/src/layer/Layer.Popup.js |6
loleaflet/src/layer/Layer.js|4
loleaflet/src/layer/marker/Cursor.js|2
loleaflet/src/layer/marker/Marker.js|6
loleaflet/src/layer/tile/GridLayer.js | 32 -
loleaflet/src/layer/tile/TileLayer.js |6
loleaflet/src/layer/vector/Polyline.js |4
loleaflet/src/layer/vector/SVG.js |4
loleaflet/src/map/Map.js| 12
loleaflet/src/map/anim/Map.ZoomAnimation.js |4
loleaflet/src/map/ext/Map.Geolocation.js|2
loleaflet/src/map/handler/Map.Keyboard.js | 108 +--
loleaflet/src/map/handler/Map.Scroll.js |4
30 files changed, 538 insertions(+), 533 deletions(-)
New commits:
commit eaf34618733aec2f46c6744ed21e6329a7e08022
Author: Pranav Kant
Date: Fri May 27 22:22:35 2016 +0530
loleaflet: fix indent errors reported by bumped eslint
Change-Id: I49e274e1d4869d9d0a39342d9c3b64747a1fc870
diff --git a/loleaflet/src/admin/AdminSocketAnalytics.js
b/loleaflet/src/admin/AdminSocketAnalytics.js
index 4f93626..c8815b7 100644
--- a/loleaflet/src/admin/AdminSocketAnalytics.js
+++ b/loleaflet/src/admin/AdminSocketAnalytics.js
@@ -66,10 +66,10 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
_setUpAxis: function() {
this._xScale =
d3.scale.linear().range([this._graphMargins.left, this._graphWidth -
this._graphMargins.right]).domain([d3.min(this._memStatsData, function(d) {
- return d.time;
- }), d3.max(this._memStatsData, function(d) {
- return d.time;
- })]);
+ return d.time;
+ }), d3.max(this._memStatsData, function(d) {
+ return d.time;
+ })]);
this._yScale = d3.scale.linear().range([this._graphHeight -
this._graphMargins.bottom,
this._graphMargins.top]).domain([d3.min(this._memStatsData, function(d) {
diff --git a/loleaflet/src/admin/AdminSocketSettings.js
b/loleaflet/src/admin/AdminSocketSettings.js
index 241150f..094cfeb 100644
--- a/loleaflet/src/admin/AdminSocketSettings.js
+++ b/loleaflet/src/admin/AdminSocketSettings.js
@@ -33,7 +33,7 @@ var AdminSocketSettings = AdminSocketBase.extend({
this.socket.send('settings');
},
-onSocketMessage: function(e) {
+ onSocketMessage: function(e) {
var textMsg;
if (typeof e.data === 'string') {
textMsg = e.data;
diff --git a/loleaflet/src/control/Control.Permission.js
b/loleaflet/src/control/Control.Permission.js
index 2f67eec..1178580 100644
--- a/loleaflet/src/control/Control.Permission.js
+++ b/loleaflet/src/control/Control.Permission.js
@@ -9,7 +9,7 @@ L.Control.PermissionSwitch = L.Control.extend({
onAdd: function (map) {
var partName = 'leaflet-control-editviewswitch',
- container = L.DomUtil.create('label', partName + '
leaflet-bar');
+ container = L.DomUtil.create('label', partName + '
leaflet-bar');
this._checkBox = L.DomUtil.create('input', 'editview-cb',
container);
this._checkBox.type = 'checkbox';
diff --git a/loleaflet/src/control/Control.Selection.js
b/loleaflet/src/control/Control.Selection.js
index 524b187..af0ed0e 100644
--- a/loleaflet/src/control/Control.Selection.js
+++ b/loleaflet/src/control/Control.Selection.js
@@ -9,7 +9,7 @@ L.Control.Selection = L.Control.extend({
onAdd: function (map) {
var partName = 'leaflet-control-editviewswitch',
- container = L.DomUtil.create('label', partName + '
leaflet-bar');
+ container = L.DomUtil.create('label', partName + '
leaflet-bar');
this._checkBox = L.DomUtil.create('input', 'editview-cb',
container);
this._checkBox.type = 'checkbox';
diff --git a/loleaflet/src/control/Control.Tabs.js
getting close to the 30000 RESOLVED bugs milestone
take a look here: http://tinyurl.com/ze4qyhj the count is now 29970 I know we already passed the 30K FIXED milestone if we count the CLOSED and VERIFIED bugs as well... anyway it's getting time to celebrate this new achievement soon... cheers, Tommy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Changes to 'private/pranavk/linting'
New branch 'private/pranavk/linting' available with the following commits: commit 36d692f00483f980271277ee677462bfbf3fbd30 Author: Pranav Kant Date: Fri May 27 22:22:35 2016 +0530 loleaflet: fix indent errors reported by bumped eslint Change-Id: I49e274e1d4869d9d0a39342d9c3b64747a1fc870 commit 0550f3746a359ea68f3331fdea79cfcc5bb5fc01 Author: Pranav Kant Date: Fri May 27 22:08:44 2016 +0530 loleaflet: Bump eslint version to 2.8.0 Adjust config file, .eslintrc, accordingly; remove deprecated options Change-Id: I113606c5d1fdc4c46216b1fa340c957fd0e69308 commit 94c8baf9c204b1b224b6edf5b7fbdcfcc4a4ac07 Author: Pranav Kant Date: Fri May 27 20:46:30 2016 +0530 loleaflet: linting: fix errors in toolbar.js Change-Id: Ieb8e5054a9c8113ec211973e086111d91759f80b commit a7d3a8e9c36e58457ee82427921cc3306995e1ee Author: Pranav Kant Date: Fri May 27 20:08:03 2016 +0530 loleaflet: Enable toolbar linting Till now we have only been linting our src/ directory. toolbar.js is the only file we edit directly in dist/. Lets keep a check on it too. Change-Id: I3e8a6e675a1d0c508339db1363600b5fe8f9c2cd commit 7460884df47a82d066edcfc64e97ad100d67f5db Author: Pranav Kant Date: Fri May 27 20:04:58 2016 +0530 loleaflet: Remove superfluous entries All files in dist/ are ignored already by our linting tool. There's no point in list them here. Change-Id: I0a3a67796d85506196eb13be347b1ff59bcae02f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
