[Libreoffice-commits] core.git: solenv/clang-format sw/inc sw/source

[Miklos Vajna]

 solenv/clang-format/blacklist|2 
 sw/inc/textboxhelper.hxx |   21 +
 sw/source/core/doc/textboxhelper.cxx |  420 ++-
 3 files changed, 239 insertions(+), 204 deletions(-)

New commits:
commit 4d35ac2f063f09efa0503303ef7c99b2e829ed14
Author: Miklos Vajna 
Date:   Wed Feb 21 17:31:56 2018 +0100

sw: clang-format textboxhelper

This was more or less consistent before, but the recent automatic
rewrites broke consistency, just give up on manual formatting here.

Change-Id: Ieb387e3d7230d227e33ba0b420cfa572309c5330
Reviewed-on: https://gerrit.libreoffice.org/50119
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 198294203d73..654166228374 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -15126,7 +15126,6 @@ sw/inc/tabcol.hxx
 sw/inc/tblafmt.hxx
 sw/inc/tblenum.hxx
 sw/inc/tblsel.hxx
-sw/inc/textboxhelper.hxx
 sw/inc/tgrditem.hxx
 sw/inc/tox.hxx
 sw/inc/toxe.hxx
@@ -15375,7 +15374,6 @@ sw/source/core/doc/swstylemanager.hxx
 sw/source/core/doc/tblafmt.cxx
 sw/source/core/doc/tblcpy.cxx
 sw/source/core/doc/tblrwcl.cxx
-sw/source/core/doc/textboxhelper.cxx
 sw/source/core/doc/visiturl.cxx
 sw/source/core/docnode/cancellablejob.cxx
 sw/source/core/docnode/cancellablejob.hxx
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 29e8ea6fd6a5..4e94e9b94e39 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -55,11 +55,14 @@ public:
 static css::uno::Any queryInterface(SwFrameFormat* pShape, const 
css::uno::Type& rType);
 
 /// Sync property of TextBox with the one of the shape.
-static void syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 
nMemberID, const css::uno::Any& rValue);
+static void syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 
nMemberID,
+ const css::uno::Any& rValue);
 /// Does the same, but works on properties which lack an sw-specific WID / 
MemberID.
-static void syncProperty(SwFrameFormat* pShape, const OUString& 
rPropertyName, const css::uno::Any& rValue);
+static void syncProperty(SwFrameFormat* pShape, const OUString& 
rPropertyName,
+ const css::uno::Any& rValue);
 /// Get a property of the underlying TextFrame.
-static void getProperty(SwFrameFormat const* pShape, sal_uInt16 nWID, 
sal_uInt8 nMemberID, css::uno::Any& rValue);
+static void getProperty(SwFrameFormat const* pShape, sal_uInt16 nWID, 
sal_uInt8 nMemberID,
+css::uno::Any& rValue);
 
 /// Similar to syncProperty(), but used by the internal API (e.g. for UI 
purposes).
 static void syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const& 
rSet);
@@ -74,7 +77,8 @@ public:
  */
 static SwFrameFormat* getOtherTextBoxFormat(const SwFrameFormat* pFormat, 
sal_uInt16 nType);
 /// If we have an associated TextFrame, then return that.
-static SwFrameFormat* 
getOtherTextBoxFormat(css::uno::Reference const& xShape);
+static SwFrameFormat*
+getOtherTextBoxFormat(css::uno::Reference const& 
xShape);
 /// Return the textbox rectangle of a draw shape (in twips).
 static tools::Rectangle getTextRectangle(SwFrameFormat* pShape, bool 
bAbsolute = true);
 
@@ -103,11 +107,14 @@ public:
 static void getShapeWrapThrough(const SwFrameFormat* pTextBox, bool& 
rWrapThrough);
 
 /// Saves the current shape -> textbox links in a map, so they can be 
restored later.
-static void saveLinks(const SwFrameFormats& rFormats, std::map& rLinks);
+static void saveLinks(const SwFrameFormats& rFormats,
+  std::map& rLinks);
 /// Reset the shape -> textbox link on the shape, and save it to the map, 
so it can be restored later.
-static void resetLink(SwFrameFormat* pShape, std::map& rOldContent);
+static void resetLink(SwFrameFormat* pShape,
+  std::map& 
rOldContent);
 /// Undo the effect of saveLinks() + individual resetLink() calls.
-static void restoreLinks(std::set& rOld, 
std::vector& rNew, SavedLink& rSavedLinks, SavedContent& 
rResetContent);
+static void restoreLinks(std::set& rOld, 
std::vector& rNew,
+ SavedLink& rSavedLinks, SavedContent& 
rResetContent);
 };
 
 #endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index ccfb7b4d5f53..3377220d98fd 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -52,9 +52,13 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape)
 return;
 
 // Create the associated TextFrame and insert it into the document.
-uno::Reference 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

 vcl/source/gdi/pdfwriter_impl2.cxx |   27 +--
 1 file changed, 21 insertions(+), 6 deletions(-)

New commits:
commit ffdb0cfe9015609653d5add1220edb111de37317
Author: Caolán McNamara 
Date:   Tue Feb 20 21:18:04 2018 +

forcepoint #4

Thanks to Antti Levomäki and Christian Jalio from Forcepoint.

Change-Id: I569ca80267ad9b5a21da0029ba903d2a4c45a035
Reviewed-on: https://gerrit.libreoffice.org/50085
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx 
b/vcl/source/gdi/pdfwriter_impl2.cxx
index 18ff07afc556..9bc58989a46c 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1604,11 +1604,8 @@ inline bool isSet( const Scanline i_pLine, long i_nIndex 
)
 return (i_pLine[ i_nIndex/8 ] & (0x80 >> (i_nIndex&7))) != 0;
 }
 
-long findBitRun( const Scanline i_pLine, long i_nStartIndex, long i_nW, bool 
i_bSet )
+long findBitRunImpl( const Scanline i_pLine, long i_nStartIndex, long i_nW, 
bool i_bSet )
 {
-if( i_nStartIndex < 0 )
-return i_nW;
-
 long nIndex = i_nStartIndex;
 if( nIndex < i_nW )
 {
@@ -1670,6 +1667,24 @@ long findBitRun( const Scanline i_pLine, long 
i_nStartIndex, long i_nW, bool i_b
 return nIndex < i_nW ? nIndex : i_nW;
 }
 
+long findBitRun(const Scanline i_pLine, long i_nStartIndex, long i_nW, bool 
i_bSet)
+{
+if (i_nStartIndex < 0)
+return i_nW;
+
+return findBitRunImpl(i_pLine, i_nStartIndex, i_nW, i_bSet);
+}
+
+long findBitRun(const Scanline i_pLine, long i_nStartIndex, long i_nW)
+{
+if (i_nStartIndex < 0)
+return i_nW;
+
+const bool bSet = i_nStartIndex < i_nW && isSet(i_pLine, i_nStartIndex);
+
+return findBitRunImpl(i_pLine, i_nStartIndex, i_nW, bSet);
+}
+
 struct BitStreamState
 {
 sal_uInt8   mnBuffer;
@@ -1973,7 +1988,7 @@ void PDFWriterImpl::writeG4Stream( BitmapReadAccess const 
* i_pBitmap )
 long nRefIndex1 = bRefSet ? 0 : findBitRun( pRefLine, 0, nW, bRefSet );
 for( ; nLineIndex < nW; )
 {
-long nRefIndex2 = findBitRun( pRefLine, nRefIndex1, nW, isSet( 
pRefLine, nRefIndex1 ) );
+long nRefIndex2 = findBitRun( pRefLine, nRefIndex1, nW );
 if( nRefIndex2 >= nRunIndex1 )
 {
 long nDiff = nRefIndex1 - nRunIndex1;
@@ -2003,7 +2018,7 @@ void PDFWriterImpl::writeG4Stream( BitmapReadAccess const 
* i_pBitmap )
 {   // difference too large, horizontal coding
 // emit horz code 001
 putG4Bits( 3, 0x1, aBitState );
-long nRunIndex2 = findBitRun( pCurLine, nRunIndex1, nW, 
isSet( pCurLine, nRunIndex1 ) );
+long nRunIndex2 = findBitRun( pCurLine, nRunIndex1, nW );
 bool bWhiteFirst = ( nLineIndex + nRunIndex1 == 0 || ! 
isSet( pCurLine, nLineIndex ) );
 putG4Span( nRunIndex1 - nLineIndex, bWhiteFirst, aBitState 
);
 putG4Span( nRunIndex2 - nRunIndex1, ! bWhiteFirst, 
aBitState );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang include/vcl svtools/source

[Caolán McNamara]

 compilerplugins/clang/unusedenumconstants.writeonly.results |4 
 include/vcl/errinf.hxx  |2 --
 svtools/source/misc/ehdl.cxx|4 
 3 files changed, 10 deletions(-)

New commits:
commit 5e85f475eea463e6d5572d24d61e85d24084bd4e
Author: Caolán McNamara 
Date:   Wed Feb 21 21:29:07 2018 +

drop unused button mask enum

Change-Id: Id94c6ecdfc642888eea8c13e55d38326b2d7ad12
Reviewed-on: https://gerrit.libreoffice.org/50145
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results 
b/compilerplugins/clang/unusedenumconstants.writeonly.results
index 5658a30b5efa..d817a7801fef 100644
--- a/compilerplugins/clang/unusedenumconstants.writeonly.results
+++ b/compilerplugins/clang/unusedenumconstants.writeonly.results
@@ -3302,12 +3302,8 @@ include/tools/datetime.hxx:34
 enum DateTime::DateTimeInitSystem SYSTEM
 include/tools/datetime.hxx:39
 enum DateTime::DateTimeInitEmpty EMPTY
-include/tools/errinf.hxx:44
-enum ErrorHandlerFlags ButtonsOkCancel
 include/tools/errinf.hxx:47
 enum ErrorHandlerFlags ButtonsYesNo
-include/tools/errinf.hxx:48
-enum ErrorHandlerFlags ButtonsYesNoCancel
 include/tools/inetmsg.hxx:66
 enum InetMessageMime VERSION
 include/tools/inetmsg.hxx:67
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index bc8c01a13e05..f4edc53d46fd 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -78,11 +78,9 @@ enum class DialogMask
 ButtonsOk   = 0x0001,
 ButtonsCancel   = 0x0002,
 ButtonsRetry= 0x0004,
-ButtonsOkCancel = 0x0003,
 ButtonsNo   = 0x0008,
 ButtonsYes  = 0x0010,
 ButtonsYesNo= 0x0018,
-ButtonsYesNoCancel  = 0x001a,
 
 ButtonDefaultsOk= 0x0100,
 ButtonDefaultsCancel= 0x0200,
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 6c2406f57ae8..dfd28ac168d6 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -55,12 +55,8 @@ static DialogMask aWndFunc(
 MessBoxStyle eBits = MessBoxStyle::NONE;
 if ( (nFlags & (DialogMask::ButtonsCancel | DialogMask::ButtonsRetry)) == 
(DialogMask::ButtonsCancel | DialogMask::ButtonsRetry))
 eBits = MessBoxStyle::RetryCancel;
-else if ( (nFlags & DialogMask::ButtonsOkCancel) == 
DialogMask::ButtonsOkCancel )
-eBits = MessBoxStyle::OkCancel;
 else if ( (nFlags & DialogMask::ButtonsOk) == DialogMask::ButtonsOk )
 eBits = MessBoxStyle::Ok;
-else if ( (nFlags & DialogMask::ButtonsYesNoCancel) == 
DialogMask::ButtonsYesNoCancel )
-eBits = MessBoxStyle::YesNoCancel;
 else if ( (nFlags & DialogMask::ButtonsYesNo) == DialogMask::ButtonsYesNo )
 eBits = MessBoxStyle::YesNo;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: new version libreoffice viewer or android viewer

[Miklos Vajna]

Hi,

On Wed, Feb 21, 2018 at 11:23:37AM +0530, krishna  wrote:
> if it was released for trial basis or limited to few persons, please excuse 
> for my mail.

Quoting the latest ESC minutes:

>   + Android
> + beta → production for 5% of the users (as a start)

So that seems to be the case.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - svx/source

[Caolán McNamara]

 svx/source/dialog/srchdlg.cxx |   42 +-
 1 file changed, 17 insertions(+), 25 deletions(-)

New commits:
commit fc956febae30ed0604477c49a78247bc81cde66e
Author: Caolán McNamara 
Date:   Tue Feb 20 13:59:08 2018 +

Resolves: rhbz#1546997 'search not found' at 0,0 when window too narrow

if the statusbar hadn't got space for the initial label, then it doesn't 
get set a position,
so when later forced visible it draws at 0,0

call Resize on the toolbox to get it to relayout, and while we're at it
set the required size of the label so we might have space for it if that
text is shorter than the original len allocation

Change-Id: I37d20125d8195b2c75e83e9673c82c2011ceda8e
Reviewed-on: https://gerrit.libreoffice.org/50042
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 504c52f2de4e..2ee79ba6b44d 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2363,11 +2363,11 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
 }
 
 
-static vcl::Window* lcl_GetSearchLabelWindow()
+static void lcl_SetSearchLabelWindow(const OUString& rStr)
 {
 SfxViewFrame* pViewFrame = SfxViewFrame::Current();
 if (!pViewFrame)
-return nullptr;
+return;
 
 css::uno::Reference< css::beans::XPropertySet > xPropSet(
 pViewFrame->GetFrame().GetFrameInterface(), 
css::uno::UNO_QUERY_THROW);
@@ -2376,7 +2376,7 @@ static vcl::Window* lcl_GetSearchLabelWindow()
 css::uno::Reference< css::ui::XUIElement > xUIElement =
 xLayoutManager->getElement("private:resource/toolbar/findbar");
 if (!xUIElement.is())
-return nullptr;
+return;
 css::uno::Reference< css::awt::XWindow > xWindow(
 xUIElement->getRealInterface(), css::uno::UNO_QUERY_THROW);
 VclPtr< ToolBox > pToolBox = static_cast( 
VCLUnoHelper::GetWindow(xWindow).get() );
@@ -2384,9 +2384,19 @@ static vcl::Window* lcl_GetSearchLabelWindow()
 {
 sal_uInt16 id = pToolBox->GetItemId(i);
 if (pToolBox->GetItemCommand(id) == ".uno:SearchLabel")
-return pToolBox->GetItemWindow(id);
+{
+vcl::Window* pSearchLabel = pToolBox->GetItemWindow(id);
+assert(pSearchLabel);
+pSearchLabel->Hide();
+pSearchLabel->SetText(rStr);
+if (!rStr.isEmpty())
+{
+pSearchLabel->SetSizePixel(pSearchLabel->get_preferred_size());
+pSearchLabel->Show();
+}
+}
 }
-return nullptr;
+pToolBox->Resize();
 }
 
 void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL)
@@ -2401,16 +2411,7 @@ void SvxSearchDialogWrapper::SetSearchLabel(const 
SearchLabel& rSL)
 else if (rSL == SearchLabel::NotFound)
 sStr = SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND);
 
-if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow())
-{
-if (sStr.isEmpty())
-pSearchLabel->Hide();
-else
-{
-pSearchLabel->SetText(sStr);
-pSearchLabel->Show();
-}
-}
+lcl_SetSearchLabelWindow(sStr);
 if (SvxSearchDialogWrapper *pWrp = static_cast( 
SfxViewFrame::Current()->
 GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
 pWrp->getDialog()->SetSearchLabel(sStr);
@@ -2419,16 +2420,7 @@ void SvxSearchDialogWrapper::SetSearchLabel(const 
SearchLabel& rSL)
 void SvxSearchDialogWrapper::SetSearchLabel(const OUString& sStr)
 {
 
-if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow())
-{
-if (sStr.isEmpty())
-pSearchLabel->Hide();
-else
-{
-pSearchLabel->SetText(sStr);
-pSearchLabel->Show();
-}
-}
+lcl_SetSearchLabelWindow(sStr);
 if (SvxSearchDialogWrapper *pWrp = static_cast( 
SfxViewFrame::Current()->
 GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
 pWrp->getDialog()->SetSearchLabel(sStr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - hwpfilter/source

[Caolán McNamara]

 hwpfilter/source/hcode.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8381d6b95caf5dabf671861e1cafa24596584dfa
Author: Caolán McNamara 
Date:   Tue Feb 20 16:33:38 2018 +

forcepoint #2

Thanks to Antti Levomäki and Christian Jalio from Forcepoint.

Change-Id: Ie2b644a3c4c1c165334768eea73d451f07f97def
Reviewed-on: https://gerrit.libreoffice.org/50081
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index 1e0170401dca..31423c0a3db2 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -1217,6 +1217,8 @@ hchar_string hstr2ucsstr(hchar const* hstr)
 hchar_string kstr2hstr(unsigned char const* src)
 {
 hchar_string ret;
+if (!src)
+return ret;
 for (unsigned int i = 0; src[i] != '\0' ; i++)
 {
 if ( src[i] < 127 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - sal/osl

[Samuel Mehrbrodt]

 sal/osl/w32/file_dirvol.cxx |   28 
 1 file changed, 12 insertions(+), 16 deletions(-)

New commits:
commit 85c640f19f6a5b0ea34236141db37f2967b986ea
Author: Samuel Mehrbrodt 
Date:   Thu Feb 22 09:03:08 2018 +0100

Use long path prefix in osl_getFileStatus

Follow-up fixes after 51afd886e59e519be0546c980dcc724d771fd245

Change-Id: I29ce4af850978322cab60743119a02d47305e739

diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index ed6adb974365..bf9e88abf84c 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -43,8 +43,6 @@ static const wchar_t UNC_PREFIX[] = L"";
 static const wchar_t BACKSLASH = '\\';
 static const wchar_t SLASH = '/';
 
-#define STR_LONG_PATH_PREFIX "?\\"
-
 extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME 
*pFTime)
 {
 SYSTEMTIME  BaseSysTime;
@@ -1587,14 +1585,6 @@ oslFileError SAL_CALL osl_getFileStatus(
 if ( !pItemImpl )
 return osl_File_E_INVAL;
 
-// Provide a long path version of the file name, because when
-// the path is longer than 255 chars, windows api calls expect this prefix.
-rtl_uString* sPrefix = nullptr;
-rtl_uString* sLongPath = nullptr;
-rtl_uString_newFromAscii( , STR_LONG_PATH_PREFIX );
-rtl_uString_newConcat( , sPrefix, pItemImpl->m_pFullPath );
-rtl_uString_release( sPrefix );
-
 switch ( pItemImpl->uType  )
 {
 case DIRECTORYITEM_DRIVE:
@@ -1605,9 +1595,16 @@ oslFileError SAL_CALL osl_getFileStatus(
 break;
 }
 
+// Provide a long path version of the file name, because when
+// the path is longer than 255 chars, windows api calls expect this prefix.
+OUString sFullPath(pItemImpl->m_pFullPath);
+
+if (sFullPath.getLength() >= MAX_PATH && isalpha(sFullPath[0]) && 
sFullPath[1] == ':')
+sFullPath = "?\\" + sFullPath;
+
 if ( uFieldMask & osl_FileStatus_Mask_Validate )
 {
-HANDLE  hFind = FindFirstFile( rtl_uString_getStr( sLongPath ), 
>FindData );
+HANDLE  hFind = FindFirstFile( sFullPath.getStr(), 
>FindData );
 
 if ( hFind != INVALID_HANDLE_VALUE )
 FindClose( hFind );
@@ -1667,7 +1664,7 @@ oslFileError SAL_CALL osl_getFileStatus(
 
 if ( uFieldMask & osl_FileStatus_Mask_LinkTargetURL )
 {
-oslFileError error = osl_getFileURLFromSystemPath( 
pItemImpl->m_pFullPath, >ustrLinkTargetURL );
+oslFileError error = osl_getFileURLFromSystemPath( sFullPath.pData, 
>ustrLinkTargetURL );
 if (error != osl_File_E_None)
 return error;
 
@@ -1679,7 +1676,7 @@ oslFileError SAL_CALL osl_getFileStatus(
 if ( !pItemImpl->bFullPathNormalized )
 {
 ::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH );
-sal_uInt32 nNewLen = GetCaseCorrectPathName( rtl_uString_getStr( 
sLongPath ),
+sal_uInt32 nNewLen = GetCaseCorrectPathName( sFullPath.getStr(),
   
::osl::mingw_reinterpret_cast( aBuffer ),
   
aBuffer.getBufSizeInSymbols(),
   sal_True );
@@ -1687,18 +1684,17 @@ oslFileError SAL_CALL osl_getFileStatus(
 if ( nNewLen )
 {
 rtl_uString_newFromStr( >m_pFullPath, aBuffer );
+sFullPath = OUString( pItemImpl->m_pFullPath );
 pItemImpl->bFullPathNormalized = TRUE;
 }
 }
 
-oslFileError error = osl_getFileURLFromSystemPath( sLongPath, 
>ustrFileURL );
+oslFileError error = osl_getFileURLFromSystemPath( sFullPath.pData, 
>ustrFileURL );
 if (error != osl_File_E_None)
 return error;
 pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
 }
 
-rtl_uString_release( sLongPath );
-
 return osl_File_E_None;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gla11y

[Stephan Bergmann]

 bin/gla11y |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 870c7a16259923668156a49d70e32d4d461adcb0
Author: Stephan Bergmann 
Date:   Thu Feb 22 10:11:59 2018 +0100

The vim mode line supposedly needs to go at the end of the file

Change-Id: I413b01e93000f9f81ba6190811cea51c04f1d58b

diff --git a/bin/gla11y b/bin/gla11y
index fc06fac7da01..a0c3468bb895 100755
--- a/bin/gla11y
+++ b/bin/gla11y
@@ -23,8 +23,6 @@
 #   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 #   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 #   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
 
 # Take LibreOffice (glade) .ui files and check for non accessible widgets
 
@@ -211,3 +209,5 @@ if __name__ == "__main__":
 main()
 except KeyboardInterrupt:
 pass
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/qa sd/source

[Miklos Vajna]

 sd/qa/unit/tiledrendering/data/tdf115873.fodp |   29 +++
 sd/qa/unit/tiledrendering/tiledrendering.cxx  |   38 ++
 sd/source/ui/dlg/navigatr.cxx |   27 ++
 sd/source/ui/dlg/sdtreelb.cxx |   18 +++-
 sd/source/ui/inc/navigatr.hxx |3 +-
 sd/source/ui/inc/sdtreelb.hxx |   12 
 6 files changed, 125 insertions(+), 2 deletions(-)

New commits:
commit f3c68cdf8f6a0273c62b493552f78af0138a44e8
Author: Miklos Vajna 
Date:   Wed Feb 21 17:27:53 2018 +0100

tdf#115873 sd navigator: allow selecting but not focusing on objects

There were also two cases here:

- changing the selection with the keyboard or single-click only updated
  the selection in the navigator
- pressing enter or double-click also selected the shape in the main
  window and gave the focus away

Introduce a 3rd case for single-click: update the shape selection but
doesn't give the focus away. This way double-click is not needed to sync
navigator -> main doc selection but keyboard navigation should still
work.

An additional trick is to make sure that the current shell is the draw
shell (and not the slide sorter) after navigation, so follow-up
operations work with the selected object and not with the whole slide.

Finally, a third related problem was that the selection jumped back to
the item of the slide after clicking on a shape in the navigator. The
reason for this was the navigator list was constantly cleared and
re-filled in SdNavigatorWin::InitTreeLB(), as
SdPageObjsTLB::IsEqualToDoc() returned false (even if the list was up to
date) in case of shapes which had children but no name. Fix this by
using the same SdrIterMode::Flat iteration mode that
SdPageObjsTLB::AddShapeList() does, so the fill and the equality check
of the navigator iterates the same way.

Change-Id: I0bfc3e8b49f7ef01d5797a68284616dcd2a81c5d
Reviewed-on: https://gerrit.libreoffice.org/50118
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sd/qa/unit/tiledrendering/data/tdf115873.fodp 
b/sd/qa/unit/tiledrendering/data/tdf115873.fodp
new file mode 100644
index ..1633a0471440
--- /dev/null
+++ b/sd/qa/unit/tiledrendering/data/tdf115873.fodp
@@ -0,0 +1,29 @@
+
+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:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
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:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xml
 ns: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:formx="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.presentation">
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index b938800a12c3..ab3dd0de15b0 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 

[Libreoffice-commits] core.git: include/editeng include/svx sd/qa svx/source sw/inc sw/source xmloff/source

[Tomaž Vajngerl]

 include/editeng/unoprnms.hxx|2 +-
 include/svx/unoshprp.hxx|4 ++--
 sd/qa/unit/export-tests.cxx |6 +++---
 svx/source/unodraw/unoshap2.cxx |8 +++-
 sw/inc/unoprnms.hxx |1 +
 sw/source/core/unocore/unoframe.cxx |   21 +
 sw/source/core/unocore/unomap1.cxx  |1 +
 xmloff/source/draw/shapeexport.cxx  |   27 +--
 xmloff/source/text/txtparae.cxx |   23 +++
 9 files changed, 56 insertions(+), 37 deletions(-)

New commits:
commit 1cf55d6397418dd3cd86eae59c2f75085dbb0d51
Author: Tomaž Vajngerl 
Date:   Mon Feb 19 21:52:33 2018 +0900

Replace "ReplacementGraphicURL" with "ReplacementGraphic" property

To transport the replacement graphic we use "ReplacementGraphicURL"
property, but as it uses an GraphicObject URL it needs to be
replaced. The new "ReplacementGraphic" does this with an XGraphic
object as instead of the String URL.

Change-Id: Iddf01c9aecb2a31a467e7b9d399495e0428d1859
Reviewed-on: https://gerrit.libreoffice.org/49993
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 44b4ce8843c9..6c98921dddaf 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -162,7 +162,7 @@
 
 #define UNO_NAME_GRAPHOBJ_FILLBITMAP"GraphicObjectFillBitmap"
 #define UNO_NAME_GRAPHOBJ_GRAFURL   "GraphicURL"
-#define UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL"ReplacementGraphicURL"
+#define UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC   "ReplacementGraphic"
 #define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL"
 #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
 #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX  "vnd.sun.star.Package:"
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index b68e473e339e..9fea5f41ab73 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -115,7 +115,7 @@
 #define OWN_ATTR_BASE_GEOMETRY  (OWN_ATTR_VALUE_START+47)
 
 /// reuse attr slots for GraphicObject which will never be used together with 
graphic object
-#define OWN_ATTR_REPLACEMENTGRAFURL (OWN_ATTR_VALUE_START+14)
+#define OWN_ATTR_REPLACEMENT_GRAPHIC(OWN_ATTR_VALUE_START+14)
 
 #define OWN_ATTR_APPLET_DOCBASE (OWN_ATTR_VALUE_START+48)
 #define OWN_ATTR_APPLET_CODEBASE(OWN_ATTR_VALUE_START+49)
@@ -428,7 +428,7 @@
 SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \
 { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP),   SDRATTR_GRAFCROP   
 , ::cppu::UnoType::get(),0,  0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_GRAFURL),  OWN_ATTR_GRAFURL   
 , ::cppu::UnoType::get(), 0, 0 }, \
-{ OUString(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL),   
OWN_ATTR_REPLACEMENTGRAFURL , ::cppu::UnoType::get(), 0, 0 }, \
+{ OUString(UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC),  
OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType::get()  ,   
0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL),OWN_ATTR_GRAFSTREAMURL 
 , ::cppu::UnoType::get(), 
css::beans::PropertyAttribute::MAYBEVOID, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP),   
OWN_ATTR_VALUE_FILLBITMAP   , cppu::UnoType::get()  ,0,  
   0},\
 { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC),  OWN_ATTR_VALUE_GRAPHIC 
 , cppu::UnoType::get()  ,   0, 0}, \
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 8994f0d8883c..e0c31b2b0da3 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -736,9 +736,9 @@ void SdExportTest::testEmbeddedPdf()
 xShell = saveAndReload( xShell.get(), ODP );
 uno::Reference xPage = getPage(0, xShell);
 uno::Reference xShape(xPage->getByIndex(0), 
uno::UNO_QUERY);
-OUString aReplacementGraphicURL;
-xShape->getPropertyValue("ReplacementGraphicURL") >>= 
aReplacementGraphicURL;
-CPPUNIT_ASSERT(!aReplacementGraphicURL.isEmpty());
+uno::Reference xGraphic;
+xShape->getPropertyValue("ReplacementGraphic") >>= xGraphic;
+CPPUNIT_ASSERT(xGraphic.is());
 xShell->DoClose();
 #endif
 }
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index b8500ac7643b..79e7c24296b6 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1579,15 +1579,13 @@ bool SvxGraphicObject::getPropertyValueImpl( const 
OUString& rName, const SfxIte
 break;
 }
 
-case OWN_ATTR_REPLACEMENTGRAFURL:
+case OWN_ATTR_REPLACEMENT_GRAPHIC:
 {
 const GraphicObject* pGrafObj = static_cast< SdrGrafObj* 
>(mpObj.get())->GetReplacementGraphicObject();
 
-if(pGrafObj)
+if (pGrafObj)
 {
-OUString aURL(UNO_NAME_GRAPHOBJ_URLPREFIX);
- 

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

[Samuel Thibault]

 configure.ac  |2 +-
 solenv/gbuild/UIConfig.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a9f851e54f416820c61baf8caa79e4d91c8c61f
Author: Samuel Thibault 
Date:   Wed Feb 21 10:45:02 2018 +0100

gla11y: Use python interpreter decided by configure

configure uses $PYTHON to determine lxml availability, so the make rule
should use the same instead of letting gla11y find a python interpreter
through "env", in case e.g. $PYTHON is python3, and lxml is available in
python3 but not in python (actually python2).

Along the way, rather use PYTHON_FOR_BUILD for coherency.

Change-Id: Ied4c05aca462cc16685c61f36b56bb9e8612d90e
Reviewed-on: https://gerrit.libreoffice.org/50087
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 58451b4912c7..8b624c3ded46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8154,7 +8154,7 @@ system)
 SYSTEM_PYTHON=TRUE
 
 AC_MSG_CHECKING([for python lxml])
-if $PYTHON -c "import lxml.etree as ET" ; then
+if $PYTHON_FOR_BUILD -c "import lxml.etree as ET" ; then
 PYTHON_LXML=TRUE
 AC_MSG_RESULT([yes])
 else
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index fb8762e8a09c..9665dcaf9d18 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -94,7 +94,7 @@ endef
 # * UIConfig/ containing all nontranslatable files
 
 gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg
-gb_UIConfig_a11yerrors_COMMAND = $(SRCDIR)/bin/gla11y
+gb_UIConfig_a11yerrors_COMMAND = $(PYTHON_FOR_BUILD) $(SRCDIR)/bin/gla11y
 
 $(dir $(call gb_UIConfig_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: bin/gla11y config_host.mk.in configure.ac solenv/gbuild

[Miklos Vajna]

Hi Samuel,

On Wed, Feb 21, 2018 at 10:11:18AM +0100, Samuel Thibault  
wrote:
> For the "error" cases (-W none), it makes sense: 
> 
> « Add to the build process error checking (only the hard errors such as
> bogus target names). »
> 
> That's really the kind of issues one should get as soon as compilation
> time.
> 
> Later on I'll add a call in "make check" time for the warnings.

For source code we have warnings for these linter type problems and then
--enable-werror (Jenkins uses it) turns those warnings into errors.

Probably the best would be if the .ui checker would follow the same
pattern, instead of running it twice during 'make check' (which is a
superset of 'make').

Thanks,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - hwpfilter/source

[Caolán McNamara]

 hwpfilter/source/hwpfile.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a82a0c0e688e029b76598445bcce14e6468cac3b
Author: Caolán McNamara 
Date:   Tue Feb 20 16:26:21 2018 +

forcepoint #1

Thanks to Antti Levomäki and Christian Jalio from Forcepoint.

Change-Id: Ic5e9a9d0f8f8d35cb6b39e68338ba029948a4ce0
Reviewed-on: https://gerrit.libreoffice.org/50083
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index 470fa2bdfd41..b205e986963a 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -230,7 +230,7 @@ class DLLEXPORT HWPFile
 HWPInfo& GetHWPInfo(void) { return _hwpInfo; }
 HWPFont& GetHWPFont(void) { return _hwpFont; }
 HWPStyle& GetHWPStyle(void) { return _hwpStyle; }
-HWPPara *GetFirstPara(void) { return plist.front().get(); }
+HWPPara *GetFirstPara(void) { return !plist.empty() ? 
plist.front().get() : nullptr; }
 
 EmPicture *GetEmPicture(Picture *pic);
 EmPicture *GetEmPictureByName(char * name);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Noel Grandin]

 sc/source/core/tool/detfunc.cxx|   10 +-
 sc/source/filter/excel/xestyle.cxx |2 +-
 sc/source/ui/app/inputhdl.cxx  |3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 795e8de6485eb6c1c2c9a43fc37d57c0563a
Author: Noel Grandin 
Date:   Thu Feb 22 10:10:03 2018 +0200

loplugin:redundantcast

Change-Id: I358e9673edcba81336b3895479e787d981fad7a5

diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 4ddf9c623622..0022dea97add 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -142,7 +142,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
 {
 nMaxLevel = 0;
 
-aBoxSet.Put( XLineColorItem( EMPTY_OUSTRING, Color( 
ScDetectiveFunc::GetArrowColor() ) ) );
+aBoxSet.Put( XLineColorItem( EMPTY_OUSTRING, 
ScDetectiveFunc::GetArrowColor() ) );
 aBoxSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 
 //  create default line endings (like XLineEndList::Create)
@@ -187,7 +187,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
 aFromTabSet.Put( XLineEndWidthItem( 200 ) );
 aFromTabSet.Put( XLineEndCenterItem( false ) );
 
-aCircleSet.Put( XLineColorItem( OUString(), Color( 
ScDetectiveFunc::GetErrorColor() ) ) );
+aCircleSet.Put( XLineColorItem( OUString(), 
ScDetectiveFunc::GetErrorColor() ) );
 aCircleSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 aCircleSet.Put( XLineWidthItem( 55 ) ); // 54 = 1 Pixel
 }
@@ -489,7 +489,7 @@ bool ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
 rAttrSet.Put( XLineWidthItem( 0 ) );// single reference
 
 Color nColor = ( bRed ? GetErrorColor() : GetArrowColor() );
-rAttrSet.Put( XLineColorItem( OUString(), Color( nColor ) ) );
+rAttrSet.Put( XLineColorItem( OUString(), nColor ) );
 
 basegfx::B2DPolygon aTempPoly;
 aTempPoly.append(basegfx::B2DPoint(aStartPos.X(), aStartPos.Y()));
@@ -554,7 +554,7 @@ bool ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, 
SCROW nStartRow,
 rAttrSet.Put( XLineWidthItem( 0 ) );// single reference
 
 Color nColor = ( bRed ? GetErrorColor() : GetArrowColor() );
-rAttrSet.Put( XLineColorItem( OUString(), Color( nColor ) ) );
+rAttrSet.Put( XLineColorItem( OUString(), nColor ) );
 
 basegfx::B2DPolygon aTempPoly;
 aTempPoly.append(basegfx::B2DPoint(aStartPos.X(), aStartPos.Y()));
@@ -1499,7 +1499,7 @@ void ScDetectiveFunc::UpdateAllArrowColors()
 if ( bArrow || bError )
 {
 Color nColor = ( bError ? GetErrorColor() : 
GetArrowColor() );
-pObject->SetMergedItem( XLineColorItem( OUString(), 
Color( nColor ) ) );
+pObject->SetMergedItem( XLineColorItem( OUString(), 
nColor ) );
 
 // repaint only
 pObject->ActionChanged();
diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index 3a95c4b23a40..466ad9a395bd 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -798,7 +798,7 @@ void XclExpPalette::GetMixedColors(
 
 Color XclExpPalette::GetColor( sal_uInt16 nXclIndex ) const
 {
-return Color(mxImpl->GetColor( nXclIndex ));
+return mxImpl->GetColor( nXclIndex );
 }
 
 void XclExpPalette::Save( XclExpStream& rStrm )
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d25fde7b8bd3..dcbfba02d73b 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -381,8 +381,7 @@ handle_r1c1:
 
 ESelection aSel( 0, nStart, 0, nPos );
 SfxItemSet aSet( mpEditEngine->GetEmptyItemSet() );
-aSet.Put( SvxColorItem( Color( nColor ),
-EE_CHAR_COLOR ) );
+aSet.Put( SvxColorItem( nColor, EE_CHAR_COLOR ) );
 mpEditEngine->QuickSetAttribs( aSet, aSel );
 ++nCount;
 }
___
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.3' - desktop/qa desktop/source include/LibreOfficeKit include/vcl sc/inc sc/source

[Marco Cecchetti]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |3 ++-
 desktop/source/lib/init.cxx |   22 ++
 include/LibreOfficeKit/LibreOfficeKit.h |3 +++
 include/vcl/ITiledRenderable.hxx|9 +
 sc/inc/docuno.hxx   |3 +++
 sc/source/ui/unoobj/docuno.cxx  |   12 
 6 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 0a25b404359ff28ef21603c47a8e0acdb9d8b3fb
Author: Marco Cecchetti 
Date:   Thu Feb 1 12:17:45 2018 +0100

lok - calc: add support for show/hide tabs in online

Change-Id: Ibd061414a0c3a5fad83d03f7047831cef62076d2
Reviewed-on: https://gerrit.libreoffice.org/49978
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 7524c34637d5..145bf0928067 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2212,10 +2212,11 @@ void DesktopLOKTest::testABI()
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(38), offsetof(struct 
_LibreOfficeKitDocumentClass, postWindowMouseEvent));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(39), offsetof(struct 
_LibreOfficeKitDocumentClass, setViewLanguage));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(40), offsetof(struct 
_LibreOfficeKitDocumentClass, postExtTextInputEvent));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(41), offsetof(struct 
_LibreOfficeKitDocumentClass, getPartInfo));
 
 // Extending is fine, update this, and add new assert for the offsetof the
 // new method
-CPPUNIT_ASSERT_EQUAL(documentClassOffset(41), sizeof(struct 
_LibreOfficeKitDocumentClass));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(42), sizeof(struct 
_LibreOfficeKitDocumentClass));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6309802f6971..1bf6d00674a8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -640,6 +640,8 @@ static void doc_paintWindow(LibreOfficeKitDocument* pThis, 
unsigned nLOKWindowId
 
 static void doc_postWindow(LibreOfficeKitDocument* pThis, unsigned 
nLOKWindowId, int nAction);
 
+static char* doc_getPartInfo(LibreOfficeKitDocument* pThis, int nPart);
+
 LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
 )
 : mxComponent(xComponent)
 {
@@ -695,6 +697,8 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
setViewLanguage = doc_setViewLanguage;
 
+m_pDocumentClass->getPartInfo = doc_getPartInfo;
+
 gDocumentClass = m_pDocumentClass;
 }
 pClass = m_pDocumentClass.get();
@@ -1903,6 +1907,24 @@ static void doc_setPart(LibreOfficeKitDocument* pThis, 
int nPart)
 pDoc->setPart( nPart );
 }
 
+static char* doc_getPartInfo(LibreOfficeKitDocument* pThis, int nPart)
+{
+SolarMutexGuard aGuard;
+ITiledRenderable* pDoc = getTiledRenderable(pThis);
+if (!pDoc)
+{
+gImpl->maLastExceptionMsg = "Document doesn't support tiled rendering";
+return nullptr;
+}
+
+OUString aPartInfo = pDoc->getPartInfo( nPart );
+OString aString = OUStringToOString(aPartInfo, RTL_TEXTENCODING_UTF8);
+
+char* pMemory = static_cast(malloc(aString.getLength() + 1));
+strcpy(pMemory, aString.getStr());
+return pMemory;
+}
+
 static char* doc_getPartPageRectangles(LibreOfficeKitDocument* pThis)
 {
 SolarMutexGuard aGuard;
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 2af965e4a45d..e58e690242c7 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -295,6 +295,9 @@ struct _LibreOfficeKitDocumentClass
int nType,
const char* pText);
 
+/// @see lok::Document::getPartInfo().
+char* (*getPartInfo) (LibreOfficeKitDocument* pThis, int nPart);
+
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index b91a67fdc0a3..f6da97484bdc 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -259,6 +259,15 @@ public:
 {
 return OUString();
 }
+
+/*
+ * Used for sheets in spreadsheet documents.
+ */
+virtual OUString getPartInfo(int /*nPart*/)
+{
+return OUString();
+}
+
 };
 } // namespace vcl
 
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 0b91ec3ddcfc..1d2ab0e1d966 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -373,6 +373,9 @@ public:
 /// @see vcl::ITiledRenderable::getParts().
 virtual int getParts() override;
 
+/// @see vcl::ITiledRenderable::getPartInfo().
+virtual OUString getPartInfo( int 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - hwpfilter/source

[Caolán McNamara]

 hwpfilter/source/hcode.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fb953ed10ca5a9f574d6ebf0598fb438bd3f4509
Author: Caolán McNamara 
Date:   Tue Feb 20 16:33:38 2018 +

forcepoint #2

Thanks to Antti Levomäki and Christian Jalio from Forcepoint.

Change-Id: Ie2b644a3c4c1c165334768eea73d451f07f97def
Reviewed-on: https://gerrit.libreoffice.org/50082
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index 41fb6d34cb81..d2eaf57bd28f 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -1217,6 +1217,8 @@ hchar_string hstr2ucsstr(hchar const* hstr)
 hchar_string kstr2hstr(unsigned char const* src)
 {
 hchar_string ret;
+if (!src)
+return ret;
 for (unsigned int i = 0; src[i] != '\0' ; i++)
 {
 if ( src[i] < 127 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - hwpfilter/source

[Caolán McNamara]

 hwpfilter/source/hwpfile.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae9a3581d1d1be4bc4f4da4c57d7449458f256a1
Author: Caolán McNamara 
Date:   Tue Feb 20 16:26:21 2018 +

forcepoint #1

Thanks to Antti Levomäki and Christian Jalio from Forcepoint.

Change-Id: Ic5e9a9d0f8f8d35cb6b39e68338ba029948a4ce0
Reviewed-on: https://gerrit.libreoffice.org/50084
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index d58faa569a7b..3fab3a5b3dd4 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -227,7 +227,7 @@ class DLLEXPORT HWPFile
 HWPInfo& GetHWPInfo(void) { return _hwpInfo; }
 HWPFont& GetHWPFont(void) { return _hwpFont; }
 HWPStyle& GetHWPStyle(void) { return _hwpStyle; }
-HWPPara *GetFirstPara(void) { return plist.front(); }
+HWPPara *GetFirstPara(void) { return !plist.empty() ? plist.front() : 
nullptr; }
 
 EmPicture *GetEmPicture(Picture *pic);
 EmPicture *GetEmPictureByName(char * name);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svx/source

[Caolán McNamara]

 svx/source/dialog/srchdlg.cxx |   42 +-
 1 file changed, 17 insertions(+), 25 deletions(-)

New commits:
commit 9a28fdb9f508204b886ddbc57d6a5aaa53ffc929
Author: Caolán McNamara 
Date:   Tue Feb 20 13:59:08 2018 +

Resolves: rhbz#1546997 'search not found' at 0,0 when window too narrow

if the statusbar hadn't got space for the initial label, then it doesn't 
get set a position,
so when later forced visible it draws at 0,0

call Resize on the toolbox to get it to relayout, and while we're at it
set the required size of the label so we might have space for it if that
text is shorter than the original len allocation

Change-Id: I37d20125d8195b2c75e83e9673c82c2011ceda8e
Reviewed-on: https://gerrit.libreoffice.org/50043
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 2fbeeaf30088..e94f1da3b81c 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2369,11 +2369,11 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
 }
 
 
-static vcl::Window* lcl_GetSearchLabelWindow()
+static void lcl_SetSearchLabelWindow(const OUString& rStr)
 {
 SfxViewFrame* pViewFrame = SfxViewFrame::Current();
 if (!pViewFrame)
-return nullptr;
+return;
 
 css::uno::Reference< css::beans::XPropertySet > xPropSet(
 pViewFrame->GetFrame().GetFrameInterface(), 
css::uno::UNO_QUERY_THROW);
@@ -2382,7 +2382,7 @@ static vcl::Window* lcl_GetSearchLabelWindow()
 css::uno::Reference< css::ui::XUIElement > xUIElement =
 xLayoutManager->getElement("private:resource/toolbar/findbar");
 if (!xUIElement.is())
-return nullptr;
+return;
 css::uno::Reference< css::awt::XWindow > xWindow(
 xUIElement->getRealInterface(), css::uno::UNO_QUERY_THROW);
 VclPtr< ToolBox > pToolBox = static_cast( 
VCLUnoHelper::GetWindow(xWindow).get() );
@@ -2390,9 +2390,19 @@ static vcl::Window* lcl_GetSearchLabelWindow()
 {
 sal_uInt16 id = pToolBox->GetItemId(i);
 if (pToolBox->GetItemCommand(id) == ".uno:SearchLabel")
-return pToolBox->GetItemWindow(id);
+{
+vcl::Window* pSearchLabel = pToolBox->GetItemWindow(id);
+assert(pSearchLabel);
+pSearchLabel->Hide();
+pSearchLabel->SetText(rStr);
+if (!rStr.isEmpty())
+{
+pSearchLabel->SetSizePixel(pSearchLabel->get_preferred_size());
+pSearchLabel->Show();
+}
+}
 }
-return nullptr;
+pToolBox->Resize();
 }
 
 void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL)
@@ -2407,16 +2417,7 @@ void SvxSearchDialogWrapper::SetSearchLabel(const 
SearchLabel& rSL)
 else if (rSL == SearchLabel::NotFound)
 sStr = SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND);
 
-if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow())
-{
-if (sStr.isEmpty())
-pSearchLabel->Hide();
-else
-{
-pSearchLabel->SetText(sStr);
-pSearchLabel->Show();
-}
-}
+lcl_SetSearchLabelWindow(sStr);
 if (SvxSearchDialogWrapper *pWrp = static_cast( 
SfxViewFrame::Current()->
 GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
 pWrp->getDialog()->SetSearchLabel(sStr);
@@ -2425,16 +2426,7 @@ void SvxSearchDialogWrapper::SetSearchLabel(const 
SearchLabel& rSL)
 void SvxSearchDialogWrapper::SetSearchLabel(const OUString& sStr)
 {
 
-if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow())
-{
-if (sStr.isEmpty())
-pSearchLabel->Hide();
-else
-{
-pSearchLabel->SetText(sStr);
-pSearchLabel->Show();
-}
-}
+lcl_SetSearchLabelWindow(sStr);
 if (SvxSearchDialogWrapper *pWrp = static_cast( 
SfxViewFrame::Current()->
 GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
 pWrp->getDialog()->SetSearchLabel(sStr);
___
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-3-1' - wsd/ClientSession.cpp

[Ashod Nakashian]

 wsd/ClientSession.cpp |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 43c709166ef5aa6d6c595d8a6bbe7c1f177da3d8
Author: Ashod Nakashian 
Date:   Wed Feb 21 20:41:47 2018 -0500

wsd: always avoid saving readonly files

Otherwise saving is bound to fail, causing other
errors, which is nonsensical since there is nothing
to save to begin with.

Change-Id: Icb65a4a3b277b3175aadbe5107b294b24a399e7b
Reviewed-on: https://gerrit.libreoffice.org/50153
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 94f9f44e..b307e2e6 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -237,11 +237,12 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 else if (tokens[0] == "save")
 {
 int dontTerminateEdit = 1;
-int dontSaveIfUnmodified = 1;
 if (tokens.size() > 1)
 getTokenInteger(tokens[1], "dontTerminateEdit", dontTerminateEdit);
 
-if (tokens.size() > 2)
+// Don't save unmodified docs by default, or when read-only.
+int dontSaveIfUnmodified = 1;
+if (!isReadOnly() && tokens.size() > 2)
 getTokenInteger(tokens[2], "dontSaveIfUnmodified", 
dontSaveIfUnmodified);
 
 docBroker->sendUnoSave(getId(), dontTerminateEdit != 0, 
dontSaveIfUnmodified != 0);
___
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 wsd/LOOLWSD.cpp wsd/UserMessages.hpp

[Samuel Mehrbrodt]

 loleaflet/dist/errormessages.js |2 +-
 loleaflet/src/core/Socket.js|   40 ++--
 wsd/LOOLWSD.cpp |   33 ++---
 wsd/UserMessages.hpp|3 ++-
 4 files changed, 55 insertions(+), 23 deletions(-)

New commits:
commit 96292dc873ea2b021b22c755f02293184d818714
Author: Samuel Mehrbrodt 
Date:   Tue Feb 13 16:36:38 2018 +0100

Only apply hard limit when configured with support key

In other case, show the warning to all users (instead of just the last one)
and link to our get professional help page.

Change-Id: Id443ba6427acd4c05f7e0e2ce86025acfb553265
Reviewed-on: https://gerrit.libreoffice.org/49673
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index fa6a9997..edda0764 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -1,6 +1,6 @@
 exports.diskfull = _('No disk space left on server, please contact the server 
administrator to continue.');
 exports.emptyhosturl = _('The host URL is empty. The loolwsd server is 
probably misconfigured, please contact the administrator.');
-exports.limitreached = _('This development build is limited to %0 documents, 
and %1 connections - to avoid the impression that it is suitable for deployment 
in large enterprises. To find out more about deploying and scaling %2 check 
out: %3.');
+exports.limitreached = _('This is an unsupported version of {productname}. To 
avoid the impression that it is suitable for deployment in enterprises, this 
version is limited to {docs} documents, and {connections} 
connections.{a}More information and support{/a}');
 exports.limitreachedprod = _('This service is limited to %0 documents, and %1 
connections total by the admin. This limit has been reached. Please try again 
later.');
 exports.serviceunavailable = _('Service is unavailable. Please try again later 
and report to your administrator if the issue persists.');
 exports.unauthorized = _('Unauthorized WOPI host. Please try again later and 
report to your administrator if the issue persists.');
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 9cb99c23..3e33a88d 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -7,6 +7,7 @@
 L.Socket = L.Class.extend({
ProtocolVersionNumber: '0.1',
ReconnectCount: 0,
+   WasShownLimitDialog: false,
 
getParameterValue: function (s) {
var i = s.indexOf('=');
@@ -550,31 +551,34 @@ L.Socket = L.Class.extend({
}
else if (textMsg.startsWith('error:') && !this._map._docLayer) {
textMsg = textMsg.substring(6);
-   if (command.errorKind === 'limitreached') {
-   this._map._fatal = true;
-   this._map._active = false; // Practically 
disconnected.
+   if (command.errorKind === 'hardlimitreached') {
 
-   // Servers configured for 50 documents are not 
demo/development.
-   if (parseInt(command.params[0]) >= 50) {
-   textMsg = 
errorMessages.limitreachedprod;
-   textMsg = textMsg.replace(/%0/g, 
command.params[0]);
-   textMsg = textMsg.replace(/%1/g, 
command.params[1]);
-   }
-   else {
-   textMsg = errorMessages.limitreached;
-   textMsg = textMsg.replace(/%0/g, 
command.params[0]);
-   textMsg = textMsg.replace(/%1/g, 
command.params[1]);
-   textMsg = textMsg.replace(/%2/g, 
(typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice 
Online'));
-   textMsg = textMsg.replace(/%3/g, 
(typeof brandProductFAQURL !== 'undefined' ? brandProductFAQURL : 
'https://wiki.documentfoundation.org/Development/LibreOffice_Online'));
-   }
+   textMsg = errorMessages.limitreachedprod;
+   textMsg = textMsg.replace(/%0/g, 
command.params[0]);
+   textMsg = textMsg.replace(/%1/g, 
command.params[1]);
}
else if (command.errorKind === 'serviceunavailable') {
-   this._map._fatal = true;
-   this._map._active = false; // Practically 
disconnected.
textMsg = errorMessages.serviceunavailable;
}
+   

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/oox oox/source writerfilter/source

[Ashod Nakashian]

 include/oox/core/xmlfilterbase.hxx  |2 +
 oox/source/core/xmlfilterbase.cxx   |   30 +++
 writerfilter/source/filter/WriterFilter.cxx |   36 +---
 3 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit f2ca825e4f76ae728d2ea9d8c2b7897174305667
Author: Ashod Nakashian 
Date:   Tue Feb 6 17:46:28 2018 -0500

oox: move putPropertiesToDocumentGrabBag to XmlFilterBase

Reviewed-on: https://gerrit.libreoffice.org/49235
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 
(cherry picked from commit e26a95360e60e0c17e70e72f36fb988bb664ddb5)

Change-Id: Ic3cbabc420c7856682b889528043563622997c14
Reviewed-on: https://gerrit.libreoffice.org/50150
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/oox/core/xmlfilterbase.hxx 
b/include/oox/core/xmlfilterbase.hxx
index 83d8ff1585e4..b351b614cde4 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -228,6 +228,8 @@ public:
 void exportDocumentProperties( const css::uno::Reference< 
css::document::XDocumentProperties >& xProperties );
 
 void importDocumentProperties();
+static void putPropertiesToDocumentGrabBag(const 
css::uno::Reference& xDstDoc,
+   const 
comphelper::SequenceAsHashMap& rProperties);
 
 FastParser* createParser() const;
 
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index c5eb5d3d7c7f..093bfae42ff6 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -244,6 +244,36 @@ void XmlFilterBase::checkDocumentProperties(const 
Reference
 mbMSO2007 = true;
 }
 
+void XmlFilterBase::putPropertiesToDocumentGrabBag(const 
css::uno::Reference& xDstDoc,
+   const 
comphelper::SequenceAsHashMap& rProperties)
+{
+try
+{
+uno::Reference xDocProps(xDstDoc, uno::UNO_QUERY);
+if (xDocProps.is())
+{
+uno::Reference xPropsInfo = 
xDocProps->getPropertySetInfo();
+
+static const OUString aGrabBagPropName = "InteropGrabBag";
+if (xPropsInfo.is() && 
xPropsInfo->hasPropertyByName(aGrabBagPropName))
+{
+// get existing grab bag
+comphelper::SequenceAsHashMap 
aGrabBag(xDocProps->getPropertyValue(aGrabBagPropName));
+
+// put the new items
+aGrabBag.update(rProperties);
+
+// put it back to the document
+xDocProps->setPropertyValue(aGrabBagPropName, 
uno::Any(aGrabBag.getAsConstPropertyValueList()));
+}
+}
+}
+catch (const uno::Exception&)
+{
+SAL_WARN("oox","Failed to save documents grab bag");
+}
+}
+
 void XmlFilterBase::importDocumentProperties()
 {
 Reference< XMultiServiceFactory > xFactory( 
getComponentContext()->getServiceManager(), UNO_QUERY );
diff --git a/writerfilter/source/filter/WriterFilter.cxx 
b/writerfilter/source/filter/WriterFilter.cxx
index 206640bda607..9fad4ef79fbb 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -117,10 +118,6 @@ public:
 OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, 
std::exception) override;
 sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw 
(uno::RuntimeException, std::exception) override;
 uno::Sequence SAL_CALL getSupportedServiceNames() throw 
(uno::RuntimeException, std::exception) override;
-
-private:
-void putPropertiesToDocumentGrabBag(const comphelper::SequenceAsHashMap& 
rProperties);
-
 };
 
 sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& 
aDescriptor) throw (uno::RuntimeException, std::exception)
@@ -232,7 +229,7 @@ sal_Bool WriterFilter::filter(const uno::Sequence< 
beans::PropertyValue >& aDesc
 // Adding the saved embedding document to document's grab bag
 aGrabBagProperties["OOXEmbeddings"] = 
uno::makeAny(pDocument->getEmbeddingsList());
 
-putPropertiesToDocumentGrabBag(aGrabBagProperties);
+oox::core::XmlFilterBase::putPropertiesToDocumentGrabBag(m_xDstDoc, 
aGrabBagProperties);
 
 writerfilter::ooxml::OOXMLStream::Pointer_t  
pVBAProjectStream(writerfilter::ooxml::OOXMLDocumentFactory::createStream(pDocStream,
 writerfilter::ooxml::OOXMLStream::VBAPROJECT));
 oox::StorageRef xVbaPrjStrg(new ::oox::ole::OleStorage(m_xContext, 
pVBAProjectStream->getDocumentStream(), false));
@@ -338,35 +335,6 @@ uno::Sequence 
WriterFilter::getSupportedServiceNames() throw (uno::Run
 return aRet;
 }
 
-void 

[Libreoffice-commits] core.git: solenv/gbuild

[Rico Tzschichholz]

 solenv/gbuild/extensions/post_PackageInfo.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0d739026d21077e51bfc82ee63d04f6b4b69828
Author: Rico Tzschichholz 
Date:   Fri Feb 9 23:48:32 2018 +0100

solenv: Fix gb_MoTarget_get_install_target argument

This fixes l10n-*.files generation of packageinfo and makes
"install-packages-l10n-*" targets work again.

Change-Id: Ib4d726f1079360cade8d5f398b1f5144d6693152
Reviewed-on: https://gerrit.libreoffice.org/49528
Tested-by: Jenkins 
Reviewed-by: Rico Tzschichholz 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index d0e0f15df133..1abd6e241d9f 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -55,7 +55,7 @@ define gb_PackageInfo_emit_l10n_for_one_alllangpackage
 endef
 
 define gb_PackageInfo_emit_l10n_for_one_mo
-@echo "$(patsubst $(INSTDIR)/%,%,$(call 
gb_MoTarget_get_install_target,$(1)$(2)))" >> 
$(gb_PackageInfo_get_target)/l10n-$(2).files
+@echo "$(patsubst $(INSTDIR)/%,%,$(call gb_MoTarget_get_install_target,$(shell 
$(SRCDIR)/solenv/bin/localestr $(2))/LC_MESSAGES/$(1)))" >> 
$(gb_PackageInfo_get_target)/l10n-$(2).files
 
 endef
 
___
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.3' - include/vcl sc/source vcl/source

[Jan Holesovsky]

 include/vcl/dialog.hxx|4 +++-
 sc/source/ui/app/inputhdl.cxx |8 ++--
 vcl/source/window/msgbox.cxx  |1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 274c86af3ce7e665aee232e4e9fee76fe22af0bd
Author: Jan Holesovsky 
Date:   Wed Feb 21 19:58:11 2018 +0100

sc lok: Make the Validation "Invalid value." message box working.

Change-Id: Ic0131fa6fc397ae440efed834266b8396aa9e619
Reviewed-on: https://gerrit.libreoffice.org/50122
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index b1bdfcfb1cea..980fcadff31c 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -54,7 +54,6 @@ private:
 SAL_DLLPRIVATE voidRemoveFromDlgList();
 SAL_DLLPRIVATE voidImplInitDialogData();
 SAL_DLLPRIVATE voidImplInitSettings();
-SAL_DLLPRIVATE inline  void ImplLOKNotifier(vcl::Window* pParent);
 
 virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
 
@@ -67,6 +66,9 @@ protected:
 using Window::ImplInit;
 SAL_DLLPRIVATE voidImplInit( vcl::Window* pParent, WinBits nStyle, 
InitFlag eFlag = InitFlag::Default );
 
+/// Find and set the LOK notifier according to the pParent.
+void ImplLOKNotifier(vcl::Window* pParent);
+
 public:
 SAL_DLLPRIVATE boolIsInClose() const { return mbInClose; }
 virtualvoiddoDeferredInit(WinBits nBits) override;
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 48d7fd0eb58d..0a84c9d60584 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2656,8 +2656,12 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode )
 if ( pActiveViewSh )// If it came from 
MouseButtonDown
 pActiveViewSh->StopMarking();   // (the InfoBox consumes 
the MouseButtonUp)
 
-//FIXME: We still run into problems if the input is triggered 
by activating another View
-vcl::Window* pParent = Application::GetDefDialogParent();
+vcl::Window* pParent = nullptr;
+if (pActiveViewSh)
+pParent = >GetViewFrame()->GetWindow();
+else
+pParent = Application::GetDefDialogParent();
+
 if ( pData->DoError( pParent, aString, aCursorPos ) )
 bForget = true; // Do not take over input
 }
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index ad1031d7ae60..8248e546457f 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -135,6 +135,7 @@ MessBox::MessBox( vcl::Window* pParent, WinBits nStyle,
 mbCheck( false ),
 maMessText( rMessage )
 {
+ImplLOKNotifier(pParent);
 ImplInit( pParent, nStyle | WB_MOVEABLE | WB_HORZ | WB_CENTER );
 ImplInitButtons();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/dist

[Samuel Mehrbrodt]

 loleaflet/dist/loleaflet.html |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 542c87451c6c4527f74a5c73a2c57d5ce75c51c5
Author: Samuel Mehrbrodt 
Date:   Thu Feb 15 17:37:09 2018 +0100

Improve about dialog

Don't wrap other block elements in , some cleanups

Change-Id: I42fcff615cb5e67d413b065aa72cce5d42aa19c9
Reviewed-on: https://gerrit.libreoffice.org/50161
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 621cbbcb..42505b50 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -80,15 +80,11 @@
 
   LibreOffice Online
   
-  
-  
-LOOLWSD
-
-  
-  
-LOKit
-
-  
+  
+  LOOLWSD
+  
+  LOKit
+  
 
 
 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - external/liborcus

[Kohei Yoshida]

 
external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 |   30 ++
 external/liborcus/UnpackedTarball_liborcus.mk  
   |1 
 2 files changed, 31 insertions(+)

New commits:
commit 10d6381de641ce5f82b22795496800cfbc1ed45d
Author: Kohei Yoshida 
Date:   Wed Feb 21 20:08:23 2018 -0500

Patch liborcus to avoid incorrect parsing of XML.

Found by Antti Levomäki and Christian Jalio from Forcepoint.

This one is not a backport from the master branch.  On the master
branch the same fix will come from updating liborcus from 0.13.3
to 0.13.4.

(cherry picked from commit 160350de5f07024b22fb5a9b596918ccc7f22c75)

 Conflicts:
external/liborcus/UnpackedTarball_liborcus.mk

Change-Id: I701c5a65ff67d77767913f8d056682b9db549f84

diff --git 
a/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 
b/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
new file mode 100644
index ..990665f9c383
--- /dev/null
+++ 
b/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
@@ -0,0 +1,30 @@
+From 12e5d89cbd7101c61fbdf063322203a1590a0ef5 Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard 
+Date: Wed, 21 Feb 2018 00:29:03 +0100
+Subject: [PATCH] protect the self-closing xml element code against
+ self-closing root elements
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Found by Antti Levomäki and Christian Jalio from Forcepoint.
+---
+ include/orcus/sax_parser.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/orcus/sax_parser.hpp b/include/orcus/sax_parser.hpp
+index ba5ebcd..67d5943 100644
+--- a/include/orcus/sax_parser.hpp
 b/include/orcus/sax_parser.hpp
+@@ -171,6 +171,8 @@ void 
sax_parser<_Handler,_Config>::element_open(std::ptrdiff_t begin_pos)
+ m_handler.start_element(elem);
+ reset_buffer_pos();
+ m_handler.end_element(elem);
++if (!m_nest_level)
++m_root_elem_open = false;
+ #if ORCUS_DEBUG_SAX_PARSER
+ cout << "element_open: ns='" << elem.ns << "', name='" << 
elem.name << "' (self-closing)" << endl;
+ #endif
+-- 
+2.7.4
+
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 93b988553116..791436e66016 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/visibility.patch.0 \
external/liborcus/nullptr-in-ostringstream.patch.1 \
+   
external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Intro

[Sourabh Pruthi]

Hello everyone myself Sourabh a student of pre-final year looking to apply
for gsoc 2018 . I am really interested in contributing to LibreOffice.
Actually I know only C++ and Java. Can I still able to proceed further
because I don't know Android ? Another small query can I contribute to
documentation as well?

Thanks
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Status of LO embedding inside other processes windows?

[Michael Stahl]

On 21.02.2018 16:55, Robert Marcano wrote:
> Greetings. I have been playing with the developers guide example [1] for 
> embedding LO inside a Java window (Swing toolkit). The example works on 
> a Windows host, but on Linux I found the following problems (in the 
> order I found)
> 
> 1- When the host Java application is running on a Wayland session (Java 
> Swing is still an X11 program), there is a crash. IIRC LO still is a X11 
> based application (or at least the Fedora compiled version is using the 
> X11 GTK back-end)
> 
> 2- Switched to an X11 desktop session, there was no crash this time, but 
> the document was not shown embedded on the Java window, it was a 
> floating window with no window controls, unresponsive to the user.
> 
> 3- Run the same application with the environment variable 
> SAL_USE_VCLPLUGIN=gtk in order to force the LO GTK2 back-end. The 
> document is embedded on the Java window as expected, but keyboard input 
> is not possible on the document or the controls, mouse actions works, 
> for example, I can change fonts using the mouse, but can't write 
> anything on the font combobox nor the document. New LO dialogs opened 
> from that document, keyboard input works.
> 
> 4- Trying with SAL_USE_VCLPLUGIN=gen and keyboard input now works, but 
> with the outdated look of that LO VCL backend :(
> 
> So now the possible reasons that came to my head for each case:
> 
> 1- Some confusion between Java being X11 and LO trying to do some 
> Wayland thing?

by default the "gtk3" vclplug will use Wayland if available.  probably
this won't work if the Java connects to X11 instead.  there is some
environment var GDK_BACKEND=x11 that can be used to force it.

> 2- Java has a GTK Look and Feel/theme that loads GTK2 (the example 
> application does not load that theme) , I am under the impression that 
> if LO is loading GTK3, they are on different processes, so should not be 
> any conflict here.

AFAIK GTK 2 and GTK 3 cannot coexist in the same process, due to some
naming conflict of GObjects or so...

> 3- Now both processes should be using GTK2, but the problems with 
> keyboard input is a blocker

that sounds like a bug somewhere.  (unlikely to get fixed any time soon
given this is quite an esoteric use-case.)

> 4- Everything running without conflicting libraries/protocols (Wayland 
> vs X11 or GTK3 vs GTK2) and work, but the look and feel!!
> 
> Now, when running the example with a no inline option, everything works 
> fine, even when GTK2 and GTK3 are mixed. Wish to have an option to 
> create the new document top level window as a child of the Java window, 
> it is a pain for user that the document can go to the back of the 
> "caller" window. Any hints if this is possible between two processes 
> like Java and LO?

so does that option run LO as a separate process? yes, that would avoid
some of these issues, but as you found you get different issues instead :-/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/source

[Caolán McNamara]

 vcl/source/gdi/pdfwriter_impl2.cxx |   27 +--
 1 file changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 887c267aa87b187af93d5d1bd8007a6c1643d025
Author: Caolán McNamara 
Date:   Tue Feb 20 21:18:04 2018 +

forcepoint #4

Thanks to Antti Levomäki and Christian Jalio from Forcepoint.

Change-Id: I569ca80267ad9b5a21da0029ba903d2a4c45a035
Reviewed-on: https://gerrit.libreoffice.org/50086
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx 
b/vcl/source/gdi/pdfwriter_impl2.cxx
index bf039f142d58..351026f5a012 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1605,11 +1605,8 @@ inline bool isSet( const Scanline i_pLine, long i_nIndex 
)
 return (i_pLine[ i_nIndex/8 ] & (0x80 >> (i_nIndex&7))) != 0;
 }
 
-long findBitRun( const Scanline i_pLine, long i_nStartIndex, long i_nW, bool 
i_bSet )
+long findBitRunImpl( const Scanline i_pLine, long i_nStartIndex, long i_nW, 
bool i_bSet )
 {
-if( i_nStartIndex < 0 )
-return i_nW;
-
 long nIndex = i_nStartIndex;
 if( nIndex < i_nW )
 {
@@ -1671,6 +1668,24 @@ long findBitRun( const Scanline i_pLine, long 
i_nStartIndex, long i_nW, bool i_b
 return nIndex < i_nW ? nIndex : i_nW;
 }
 
+long findBitRun(const Scanline i_pLine, long i_nStartIndex, long i_nW, bool 
i_bSet)
+{
+if (i_nStartIndex < 0)
+return i_nW;
+
+return findBitRunImpl(i_pLine, i_nStartIndex, i_nW, i_bSet);
+}
+
+long findBitRun(const Scanline i_pLine, long i_nStartIndex, long i_nW)
+{
+if (i_nStartIndex < 0)
+return i_nW;
+
+const bool bSet = i_nStartIndex < i_nW && isSet(i_pLine, i_nStartIndex);
+
+return findBitRunImpl(i_pLine, i_nStartIndex, i_nW, bSet);
+}
+
 struct BitStreamState
 {
 sal_uInt8   mnBuffer;
@@ -1974,7 +1989,7 @@ void PDFWriterImpl::writeG4Stream( BitmapReadAccess* 
i_pBitmap )
 long nRefIndex1 = bRefSet ? 0 : findBitRun( pRefLine, 0, nW, bRefSet );
 for( ; nLineIndex < nW; )
 {
-long nRefIndex2 = findBitRun( pRefLine, nRefIndex1, nW, isSet( 
pRefLine, nRefIndex1 ) );
+long nRefIndex2 = findBitRun( pRefLine, nRefIndex1, nW );
 if( nRefIndex2 >= nRunIndex1 )
 {
 long nDiff = nRefIndex1 - nRunIndex1;
@@ -2004,7 +2019,7 @@ void PDFWriterImpl::writeG4Stream( BitmapReadAccess* 
i_pBitmap )
 {   // difference too large, horizontal coding
 // emit horz code 001
 putG4Bits( 3, 0x1, aBitState );
-long nRunIndex2 = findBitRun( pCurLine, nRunIndex1, nW, 
isSet( pCurLine, nRunIndex1 ) );
+long nRunIndex2 = findBitRun( pCurLine, nRunIndex1, nW );
 bool bWhiteFirst = ( nLineIndex + nRunIndex1 == 0 || ! 
isSet( pCurLine, nLineIndex ) );
 putG4Span( nRunIndex1 - nLineIndex, bWhiteFirst, aBitState 
);
 putG4Span( nRunIndex2 - nRunIndex1, ! bWhiteFirst, 
aBitState );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/OperationSmiley'

[Armin Le Grand]

New branch 'feature/OperationSmiley' available with the following commits:
commit a12344fbc6c2a12b1e086d30195e8ff3b115049b
Author: Armin Le Grand 
Date:   Thu Feb 22 11:14:31 2018 +0100

OperationSmiley: Remove brightness from SdrPathObj

There was a member at SdrPathObj called mdBrightness only for
holding a blend value during creation of SdrPathObjs for
CustomShape visualization. This has nothing to do on the
model data, move it to where it belongs

Change-Id: Iee101f90a1275ce1ed97e8e8d0ccf7084c83d4f6

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Non-portable configure.ac

[Eike Rathke]

Hi Sander,

On Wednesday, 2018-02-21 14:03:49 +0100, Sander Maijers wrote:

> I have set dash as /bin/sh.

"Funny", because Debian has dash there as well and no problem.

Anyway.. this

> ./configure fails due a syntax error, since `${PRODUCTNAME// /}` not a
> portable syntax.

has been changed to
PRODUCTNAME_WITHOUT_SPACES=$(printf %s "$PRODUCTNAME" | sed 's/ //g')

on master.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Rostislav Kondratenko license statement

[rostik]

   All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/quartz

[Noel Grandin]

 vcl/quartz/salbmp.cxx |   67 +-
 1 file changed, 29 insertions(+), 38 deletions(-)

New commits:
commit 60a95595d0e85dd64aab685e8c0500e0af85f3ed
Author: Noel Grandin 
Date:   Wed Feb 21 21:19:14 2018 +0200

ColorData->Color in vcl quartz

Change-Id: Ie0de7f989ab4aefa900da6b9b75fcfe98584c8f3
Reviewed-on: https://gerrit.libreoffice.org/50124
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 28365159afa7..e7a614dbe50f 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -364,8 +364,8 @@ public:
 
 virtual void StartLine( sal_uInt8* pLine ) = 0;
 virtual void SkipPixel( sal_uInt32 nPixel ) = 0;
-virtual ColorData ReadPixel() = 0;
-virtual void WritePixel( ColorData nColor ) = 0;
+virtual Color ReadPixel() = 0;
+virtual void WritePixel( Color nColor ) = 0;
 virtual ~ImplPixelFormat() { }
 };
 
@@ -379,18 +379,18 @@ public:
 {
 pData += nPixel << 2;
 }
-virtual ColorData ReadPixel() override
+virtual Color ReadPixel() override
 {
-const ColorData c = RGB_COLORDATA( pData[1], pData[2], pData[3] );
+const Color c = RGB_COLORDATA( pData[1], pData[2], pData[3] );
 pData += 4;
 return c;
 }
-virtual void WritePixel( ColorData nColor ) override
+virtual void WritePixel( Color nColor ) override
 {
 *pData++ = 0;
-*pData++ = COLORDATA_RED( nColor );
-*pData++ = COLORDATA_GREEN( nColor );
-*pData++ = COLORDATA_BLUE( nColor );
+*pData++ = nColor.GetRed();
+*pData++ = nColor.GetGreen();
+*pData++ = nColor.GetBlue();
 }
 };
 
@@ -404,17 +404,17 @@ public:
 {
 pData += (nPixel << 1) + nPixel;
 }
-virtual ColorData ReadPixel() override
+virtual Color ReadPixel() override
 {
-const ColorData c = RGB_COLORDATA( pData[2], pData[1], pData[0] );
+const Color c = RGB_COLORDATA( pData[2], pData[1], pData[0] );
 pData += 3;
 return c;
 }
-virtual void WritePixel( ColorData nColor ) override
+virtual void WritePixel( Color nColor ) override
 {
-*pData++ = COLORDATA_BLUE( nColor );
-*pData++ = COLORDATA_GREEN( nColor );
-*pData++ = COLORDATA_RED( nColor );
+*pData++ = nColor.GetBlue();
+*pData++ = nColor.GetGreen();
+*pData++ = nColor.GetRed();
 }
 };
 
@@ -432,17 +432,17 @@ public:
 {
 pData += nPixel;
 }
-virtual ColorData ReadPixel() override
+virtual Color ReadPixel() override
 {
-const ColorData c = RGB_COLORDATA( (*pData & 0xf800) >> 8, (*pData & 
0x07e0) >> 3 , (*pData & 0x001f) << 3 );
+const Color c = RGB_COLORDATA( (*pData & 0xf800) >> 8, (*pData & 
0x07e0) >> 3 , (*pData & 0x001f) << 3 );
 pData++;
 return c;
 }
-virtual void WritePixel( ColorData nColor ) override
+virtual void WritePixel( Color nColor ) override
 {
-*pData++ =  ((COLORDATA_RED( nColor ) & 0xf8 ) << 8 ) |
-((COLORDATA_GREEN( nColor ) & 0xfc ) << 3 ) |
-((COLORDATA_BLUE( nColor ) & 0xf8 ) >> 3 );
+*pData++ =  (( nColor.GetRed() & 0xf8 ) << 8 ) |
+(( nColor.GetGreen() & 0xfc ) << 3 ) |
+(( nColor.GetBlue() & 0xf8 ) >> 3 );
 }
 };
 
@@ -463,16 +463,13 @@ public:
 {
 pData += nPixel;
 }
-virtual ColorData ReadPixel() override
+virtual Color ReadPixel() override
 {
 return mrPalette[ *pData++ ].GetColor().GetColor();
 }
-virtual void WritePixel( ColorData nColor ) override
+virtual void WritePixel( Color nColor ) override
 {
-const BitmapColor aColor( COLORDATA_RED( nColor ),
-  COLORDATA_GREEN( nColor ),
-  COLORDATA_BLUE( nColor ) );
-*pData++ = static_cast< sal_uInt8 >( mrPalette.GetBestIndex( 
aColor ) );
+*pData++ = static_cast< sal_uInt8 >( mrPalette.GetBestIndex( 
nColor ) );
 }
 };
 
@@ -506,20 +503,17 @@ public:
 mnX = 0;
 mnShift = 4;
 }
-virtual ColorData ReadPixel() override
+virtual Color ReadPixel() override
 {
 const BitmapColor& rColor = mrPalette[( pData[mnX >> 1] >> 
mnShift) & 0x0f];
 mnX++;
 mnShift ^= 4;
 return rColor.GetColor().GetColor();
 }
-virtual void WritePixel( ColorData nColor ) override
+virtual void WritePixel( Color nColor ) override
 {
-const BitmapColor aColor( COLORDATA_RED( nColor ),
-  COLORDATA_GREEN( nColor ),
-  COLORDATA_BLUE( nColor ) );
  

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/oox oox/source

[Ashod Nakashian]

 include/oox/core/xmlfilterbase.hxx |3 
 oox/source/core/xmlfilterbase.cxx  |  174 -
 2 files changed, 176 insertions(+), 1 deletion(-)

New commits:
commit 90440d7b06c48ea76c72f5fd7fdd8ba17d13891b
Author: Ashod Nakashian 
Date:   Tue Feb 6 17:49:23 2018 -0500

oox: preserve custom oox fragments and packages

Reviewed-on: https://gerrit.libreoffice.org/49236
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 
(cherry picked from commit 335a2b80fa900848a8b60d8fd5db6656bc30a95a)

Change-Id: Ic4c75d136601a9b7d772aab577c9fbebc7391eaf
Reviewed-on: https://gerrit.libreoffice.org/50151
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/oox/core/xmlfilterbase.hxx 
b/include/oox/core/xmlfilterbase.hxx
index b351b614cde4..53c80057ba60 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -257,6 +257,9 @@ private:
 virtual StorageRef  implCreateStorage(
 const css::uno::Reference< css::io::XStream >& 
rxOutStream ) const override;
 
+void importCustomFragments(css::uno::Reference& 
xDocumentStorage);
+void exportCustomFragments();
+
 private:
 ::std::unique_ptr< XmlFilterBaseImpl > mxImpl;
 sal_Int32 mnRelId;
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 093bfae42ff6..c858bd707e16 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -29,6 +29,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -48,7 +51,8 @@
 #include "oox/helper/zipstorage.hxx"
 #include 
 #include 
-#include "oox/token/properties.hxx"
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -57,12 +61,14 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 using ::com::sun::star::xml::dom::DocumentBuilder;
 using ::com::sun::star::xml::dom::XDocument;
@@ -293,6 +299,8 @@ void XmlFilterBase::importDocumentProperties()
 Reference< XDocumentProperties > xDocProps = 
xPropSupplier->getDocumentProperties();
 xImporter->importProperties( xDocumentStorage, xDocProps );
 checkDocumentProperties(xDocProps);
+
+importCustomFragments(xDocumentStorage);
 }
 
 FastParser* XmlFilterBase::createParser() const
@@ -845,6 +853,8 @@ void XmlFilterBase::exportDocumentProperties( const 
Reference< XDocumentProperti
 writeAppProperties( *this, xProperties );
 writeCustomProperties( *this, xProperties );
 }
+
+exportCustomFragments();
 }
 
 // protected --
@@ -946,6 +956,168 @@ void XmlFilterBase::setMissingExtDrawing()
 mbMissingExtDrawing = true;
 }
 
+void 
XmlFilterBase::importCustomFragments(css::uno::Reference& 
xDocumentStorage)
+{
+Reference xRelations(xDocumentStorage, UNO_QUERY);
+if (xRelations.is())
+{
+// These are all the custom types we recognize and can preserve.
+static const std::set sCustomTypes = {
+
"http://schemas.dell.com/ddp/2016/relationships/xenFile;,
+
"http://schemas.dell.com/ddp/2016/relationships/hmacFile;,
+
"http://schemas.dell.com/ddp/2016/relationships/metadataFile;
+};
+
+uno::Sequence aSeqs = 
xRelations->getAllRelationships();
+
+std::vector aCustomFragments;
+std::vector aCustomFragmentTypes;
+std::vector aCustomFragmentTargets;
+for (sal_Int32 j = 0; j < aSeqs.getLength(); j++)
+{
+OUString sType;
+OUString sTarget;
+const uno::Sequence& aSeq = aSeqs[j];
+for (sal_Int32 i = 0; i < aSeq.getLength(); i++)
+{
+const beans::StringPair& aPair = aSeq[i];
+if (aPair.First == "Target")
+sTarget = aPair.Second;
+else if (aPair.First == "Type")
+sType = aPair.Second;
+}
+
+if (sCustomTypes.find(sType) != sCustomTypes.end())
+{
+StreamDataSequence aDataSeq;
+if (importBinaryData(aDataSeq, sTarget))
+{
+aCustomFragments.emplace_back(aDataSeq);
+aCustomFragmentTypes.emplace_back(sType);
+aCustomFragmentTargets.emplace_back(sTarget);
+}
+}
+}
+
+// Adding the saved custom xml DOM
+comphelper::SequenceAsHashMap aGrabBagProperties;
+aGrabBagProperties["OOXCustomFragments"] <<= 
comphelper::containerToSequence(aCustomFragments);
+aGrabBagProperties["OOXCustomFragmentTypes"] <<= 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - external/liborcus

[Kohei Yoshida]

 
external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 |   30 ++
 external/liborcus/UnpackedTarball_liborcus.mk  
   |1 
 2 files changed, 31 insertions(+)

New commits:
commit 50bdaa1b6fa815a61fce2963d70445ac6d75a9e6
Author: Kohei Yoshida 
Date:   Wed Feb 21 20:08:23 2018 -0500

Patch liborcus to avoid incorrect parsing of XML.

Found by Antti Levomäki and Christian Jalio from Forcepoint.

This one is not a backport from the master branch.  On the master
branch the same fix will come from updating liborcus from 0.13.3
to 0.13.4.

(cherry picked from commit 160350de5f07024b22fb5a9b596918ccc7f22c75)

 Conflicts:
external/liborcus/UnpackedTarball_liborcus.mk

Change-Id: I701c5a65ff67d77767913f8d056682b9db549f84
Reviewed-on: https://gerrit.libreoffice.org/50162
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git 
a/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 
b/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
new file mode 100644
index ..990665f9c383
--- /dev/null
+++ 
b/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
@@ -0,0 +1,30 @@
+From 12e5d89cbd7101c61fbdf063322203a1590a0ef5 Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard 
+Date: Wed, 21 Feb 2018 00:29:03 +0100
+Subject: [PATCH] protect the self-closing xml element code against
+ self-closing root elements
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Found by Antti Levomäki and Christian Jalio from Forcepoint.
+---
+ include/orcus/sax_parser.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/orcus/sax_parser.hpp b/include/orcus/sax_parser.hpp
+index ba5ebcd..67d5943 100644
+--- a/include/orcus/sax_parser.hpp
 b/include/orcus/sax_parser.hpp
+@@ -171,6 +171,8 @@ void 
sax_parser<_Handler,_Config>::element_open(std::ptrdiff_t begin_pos)
+ m_handler.start_element(elem);
+ reset_buffer_pos();
+ m_handler.end_element(elem);
++if (!m_nest_level)
++m_root_elem_open = false;
+ #if ORCUS_DEBUG_SAX_PARSER
+ cout << "element_open: ns='" << elem.ns << "', name='" << 
elem.name << "' (self-closing)" << endl;
+ #endif
+-- 
+2.7.4
+
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 93b988553116..791436e66016 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/visibility.patch.0 \
external/liborcus/nullptr-in-ostringstream.patch.1 \
+   
external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSOC introduction

[Kommuru jai shankar reddy]

Hello,
  I am Jaya Shankar studying in NIT Andhra Pradesh, CSE Dept. I would
like to apply to your organization through GSOC.
  I have subscribed to the mailing list with the link given in GSOC
page and tried building the source code in Ubuntu 16.04, but getting errors
during make command. Also, It would be better if I am provided with a
suggestion on an Easy Hack.


-- 
Thanks in advance for the help

K.jaishankar reddy
B.Tech
NIT Andhra Pradesh
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4220 +++-
 1 file changed, 2292 insertions(+), 1928 deletions(-)

New commits:
commit 49bab70c93a400b997a16af77d6d8952c33e7395
Author: Christian Lohmaier 
Date:   Thu Feb 22 13:53:46 2018 +0100

update credits

Change-Id: I189e30718e5818d183dc308ecbb96f4943b4e20a
(cherry picked from commit 8faa6b8bbaf89f95d7c319d70af855331cc99b7d)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e8ec085487aa..73999319624f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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: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:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is: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:officeooo="http://openoffice.org/2009/office; 
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:formx="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.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.1.1$Linux_X86_64
 
LibreOffice_project/60bfb1526849283ce2491346ed2aa51c465abfe62012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   563
+   690
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 563
+ 690
  42464
- 21888
+ 22015
  0
  0
  false
@@ -39,6 +39,7 @@

false
false
+   true
false
false
false
@@ -71,7 +72,7 @@
false
false
true
-   7433446
+   7512211
false
false
false
@@ -317,26 +318,23 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -398,24 +396,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -748,21 +746,21 @@

   
   
-   
+   
 



   
   
-   
+   
 



   
   
-   
+   
 


@@ -1047,7 +1045,7 @@

   
  Credits
-1309 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-01-23 23:15:28.
+1318 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-02-21 21:22:32.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1074,10 +1072,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23451Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23643Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15697Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15825Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1085,30 +1083,30 @@
  
  
   
-   *Noel GrandinCommits: 
8646Joined: 2011-12-12
+   *Noel GrandinCommits: 
8847Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 

[Libreoffice-commits] online.git: loleaflet/build loleaflet/debug loleaflet/dist loleaflet/main.css loleaflet/main.js loleaflet/README loleaflet/src

[Samuel Mehrbrodt]

 loleaflet/README |8 +
 loleaflet/build/deps.js  |5 ++-
 loleaflet/debug/document/loleaflet.html  |1 
 loleaflet/dist/errormessages.js  |3 +-
 loleaflet/dist/loleaflet.css |9 ++
 loleaflet/main.css   |1 
 loleaflet/main.js|1 
 loleaflet/src/control/Control.Infobar.js |   42 +++
 loleaflet/src/core/Socket.js |9 --
 9 files changed, 73 insertions(+), 6 deletions(-)

New commits:
commit 4c9872188f3ae5f876fb5652273c6bdb10065d14
Author: Samuel Mehrbrodt 
Date:   Thu Feb 22 14:19:03 2018 +0100

Add non-obtrusive notification method (infobar-alike)

This reuses the vex dialogs and pushes notifications to the bottom right 
area.
Converted the limit reached notification to this new type.

Change-Id: I20f0c1202eecde028e70156f02ba31497ef2f9b9

diff --git a/loleaflet/README b/loleaflet/README
index acc790da..4694417a 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -300,6 +300,14 @@ Error:
 + [e.cmd] = the command that caused the error
 + [e.kind] = the kind of error
 
+Infobars:
+- events
+map.on('infobar', function (e) {}) where
++ [e.msg] = a message
++ [e.actionlabel] = Label for the action button
++ [e.action] = A link (starting with http).
+   Please extend to allow other actions when needed.
+
 CommandValues:
 - api:
 map.getToolbarCommandValues(command)
diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index 9c905d76..59f4cde3 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -343,8 +343,9 @@ var deps = {
 
ControlDialog: {
src: ['control/Control.js',
- 'control/Control.LokDialog.js',
- 'control/Control.AlertDialog.js'],
+   'control/Control.LokDialog.js',
+   'control/Control.AlertDialog.js',
+   'control/Control.Infobar.js'],
heading: 'Controls',
desc: 'Handles vex dialogs for displaying alerts'
},
diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 49c0dfce..2d7a6a75 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -20,6 +20,7 @@
 
 
 
+
 
 
 
diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index edda0764..36937c06 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -1,6 +1,7 @@
 exports.diskfull = _('No disk space left on server, please contact the server 
administrator to continue.');
 exports.emptyhosturl = _('The host URL is empty. The loolwsd server is 
probably misconfigured, please contact the administrator.');
-exports.limitreached = _('This is an unsupported version of {productname}. To 
avoid the impression that it is suitable for deployment in enterprises, this 
version is limited to {docs} documents, and {connections} 
connections.{a}More information and support{/a}');
+exports.limitreached = _('This is an unsupported version of {productname}. To 
avoid the impression that it is suitable for deployment in enterprises, this 
version is limited to {docs} documents, and {connections} connections.');
+exports.infoandsupport = _('More information and support');
 exports.limitreachedprod = _('This service is limited to %0 documents, and %1 
connections total by the admin. This limit has been reached. Please try again 
later.');
 exports.serviceunavailable = _('Service is unavailable. Please try again later 
and report to your administrator if the issue persists.');
 exports.unauthorized = _('Unauthorized WOPI host. Please try again later and 
report to your administrator if the issue persists.');
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index f458c371..6315efbf 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -362,3 +362,12 @@ body {
 -webkit-user-select: none;
 -o-user-select: none;
 }
+
+/* Infobar */
+.vex-theme-bottom-right-corner .vex-dialog-message {
+   font-size: 1em;
+}
+/* Place above statusbar */
+.vex.vex-theme-bottom-right-corner .vex-content {
+   bottom: 40px !important;
+}
\ No newline at end of file
diff --git a/loleaflet/main.css b/loleaflet/main.css
index 729b21b3..de61241f 100644
--- a/loleaflet/main.css
+++ b/loleaflet/main.css
@@ -14,6 +14,7 @@
 @import url('node_modules/jquery-contextmenu/dist/jquery.contextMenu.css');
 @import url('node_modules/vex-js/css/vex.css');
 @import url('node_modules/vex-js/css/vex-theme-plain.css');
+@import url('node_modules/vex-js/css/vex-theme-bottom-right-corner.css');
 @import url('node_modules/w2ui/w2ui.css');
 @import 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/inc

[Eike Rathke]

 sc/inc/table.hxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2110c7260ef8f536e2d8517145b91a62b6c52b68
Author: Eike Rathke 
Date:   Wed Feb 21 15:13:11 2018 +0100

Pass ScColumnsRange::Iterator as const& and use pre-increment/decrement

 This is a combination of 2 commits.

Pass ScColumnsRange::Iterator as const&

Specifically for each operator==() call two temporaries were
copied, for operator!=() even twice as much.. in
for(...:GetColumnsRange())

(cherry picked from commit 581b845509d20fa864b00088ed649f30fe4e1109)

 Conflicts:
 sc/inc/table.hxx

Use iterator pre-increment/decrement

(cherry picked from commit f599ff99ecb405e2934c8d4d472e54fd4064a26a)

079850116648dc69b8c92fa23b30233f63d9b6e7

Change-Id: I4b426ae855454544e50efca35aa73303138f7ba7
Reviewed-on: https://gerrit.libreoffice.org/50113
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 2ec2cd87e892..d6af98d394f0 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -130,17 +130,17 @@ class ScColumnsRange final
 {
 std::vector::const_iterator maColIter;
 public:
-explicit Iterator(std::vector::const_iterator colIter) : 
maColIter(colIter) {}
+explicit Iterator(const std::vector::const_iterator& 
colIter) : maColIter(colIter) {}
 
-Iterator& operator++() { maColIter++; return *this;}
-Iterator& operator--() { maColIter--; return *this;}
+Iterator& operator++() { ++maColIter; return *this;}
+Iterator& operator--() { --maColIter; return *this;}
 
-bool operator==(Iterator other) const {return maColIter == 
other.maColIter;}
-bool operator!=(Iterator other) const {return !(*this == other);}
+bool operator==(const Iterator & rOther) const {return maColIter == 
rOther.maColIter;}
+bool operator!=(const Iterator & rOther) const {return !(*this == 
rOther);}
 reference operator*() const {return (*maColIter)->GetCol();}
 };
 
-ScColumnsRange(Iterator nBegin, Iterator nEnd) : maBegin(nBegin), 
maEnd(nEnd) {}
+ScColumnsRange(const Iterator & rBegin, const Iterator & rEnd) : 
maBegin(rBegin), maEnd(rEnd) {}
 const Iterator & begin() { return maBegin; }
 const Iterator & end() { return maEnd; }
 std::reverse_iterator rbegin() { return 
std::reverse_iterator(maEnd); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4220 +++-
 1 file changed, 2292 insertions(+), 1928 deletions(-)

New commits:
commit 8faa6b8bbaf89f95d7c319d70af855331cc99b7d
Author: Christian Lohmaier 
Date:   Thu Feb 22 13:53:46 2018 +0100

update credits

Change-Id: I189e30718e5818d183dc308ecbb96f4943b4e20a

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e8ec085487aa..73999319624f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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: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:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is: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:officeooo="http://openoffice.org/2009/office; 
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:formx="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.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.1.1$Linux_X86_64
 
LibreOffice_project/60bfb1526849283ce2491346ed2aa51c465abfe62012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   563
+   690
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 563
+ 690
  42464
- 21888
+ 22015
  0
  0
  false
@@ -39,6 +39,7 @@

false
false
+   true
false
false
false
@@ -71,7 +72,7 @@
false
false
true
-   7433446
+   7512211
false
false
false
@@ -317,26 +318,23 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -398,24 +396,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -748,21 +746,21 @@

   
   
-   
+   
 



   
   
-   
+   
 



   
   
-   
+   
 


@@ -1047,7 +1045,7 @@

   
  Credits
-1309 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-01-23 23:15:28.
+1318 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-02-21 21:22:32.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1074,10 +1072,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23451Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23643Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15697Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15825Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1085,30 +1083,30 @@
  
  
   
-   *Noel GrandinCommits: 
8646Joined: 2011-12-12
+   *Noel GrandinCommits: 
8847Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8091Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8116Joined: 
2010-03-23
 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4220 +++-
 1 file changed, 2292 insertions(+), 1928 deletions(-)

New commits:
commit 9187fec31abaae8890b06d36b5887c1012c1384a
Author: Christian Lohmaier 
Date:   Thu Feb 22 13:53:46 2018 +0100

update credits

Change-Id: I189e30718e5818d183dc308ecbb96f4943b4e20a
(cherry picked from commit 8faa6b8bbaf89f95d7c319d70af855331cc99b7d)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e8ec085487aa..73999319624f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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: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:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is: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:officeooo="http://openoffice.org/2009/office; 
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:formx="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.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.1.1$Linux_X86_64
 
LibreOffice_project/60bfb1526849283ce2491346ed2aa51c465abfe62012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   563
+   690
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 563
+ 690
  42464
- 21888
+ 22015
  0
  0
  false
@@ -39,6 +39,7 @@

false
false
+   true
false
false
false
@@ -71,7 +72,7 @@
false
false
true
-   7433446
+   7512211
false
false
false
@@ -317,26 +318,23 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -398,24 +396,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -748,21 +746,21 @@

   
   
-   
+   
 



   
   
-   
+   
 



   
   
-   
+   
 


@@ -1047,7 +1045,7 @@

   
  Credits
-1309 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-01-23 23:15:28.
+1318 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-02-21 21:22:32.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1074,10 +1072,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23451Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23643Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15697Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15825Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1085,30 +1083,30 @@
  
  
   
-   *Noel GrandinCommits: 
8646Joined: 2011-12-12
+   *Noel GrandinCommits: 
8847Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 

[Libreoffice-commits] core.git: basctl/source sw/source

[Shubham Verma]

 basctl/source/basicide/basicbox.cxx|3 +--
 sw/source/ui/config/mailconfigpage.cxx |6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 0c371a6b5e6c6251d782c7a8ecbe0ab32c7812ac
Author: Shubham Verma 
Date:   Sat Feb 17 16:52:15 2018 +0530

tdf#112689 : Replace chained O(U)StringBuffer::append() with operator+

Change-Id: I119d33b171da7024daab5c4ca4488ceb495eab2f
Reviewed-on: https://gerrit.libreoffice.org/49898
Tested-by: Jenkins 
Reviewed-by: Muhammet Kara 

diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index 3efa5d01a8b6..01238926670f 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -408,8 +408,7 @@ void LanguageBox::FillBox()
 OUString sLanguage = SvtLanguageTable::GetLanguageString( 
eLangType );
 if ( bIsDefault )
 {
-sLanguage += " ";
-sLanguage += m_sDefaultLanguageStr;
+sLanguage += " " + m_sDefaultLanguageStr;
 }
 sal_Int32 nPos = InsertEntry( sLanguage );
 SetEntryData( nPos, new LanguageEntry( pLocale[i], bIsDefault ) );
diff --git a/sw/source/ui/config/mailconfigpage.cxx 
b/sw/source/ui/config/mailconfigpage.cxx
index 3e5b043812a4..c7509d5f9d71 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -383,10 +383,10 @@ void SwTestAccountSettingsDialog::Test()
 
 if (!bIsServer || !bIsLoggedIn)
 {
-OUStringBuffer aErrorMessage(m_sErrorServer);
+OUString aErrorMessage(m_sErrorServer);
 if (!sException.isEmpty())
-aErrorMessage.append("\n--\n").append(sException);
-m_pErrorsED->SetText(aErrorMessage.makeStringAndClear());
+aErrorMessage += "\n--\n" + sException;
+m_pErrorsED->SetText(aErrorMessage);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ScFiltersTest::testOrcusODSStyleInterface fails with liborcus 0.13.3

[Olivier Tilloy]

Hello,

I initially filed
https://bugs.documentfoundation.org/show_bug.cgi?id=115931 but it was
suggested to me to raise the issue on the mailing list instead.

So here it goes: when building libreoffice 6.0 with an external
liborcus (version 0.13.3), unit tests fail:

subsequent_filters-test.cxx:2398:Assertion
Test name: ScFiltersTest::testOrcusODSStyleInterface
equality assertion failed
- Expected: Color: R:254 G:255 B: 204
- Actual : Color: R:255 G:255 B: 255

This is most likely caused by that upstream change:
https://gitlab.com/orcus/orcus/commit/f821995022df8dd1e580dd22cf131584b2b1ac4f

I'm not familiar with that code, but I came up with a tentative patch
(which I will actually put to the test soon):

--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -839,7 +839,7 @@ void ScOrcusStyles::fill::applyToItemSet
 return;
 }

-rSet.Put(SvxBrushItem(maBgColor, ATTR_BACKGROUND));
+rSet.Put(SvxBrushItem(maFgColor, ATTR_BACKGROUND));
 }

Thoughts and feedback welcome!

Regards,

 Olivier
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Status of LO embedding inside other processes windows?

[Robert Marcano]

Thanks for replying.

On 02/22/2018 07:10 AM, Michael Stahl wrote:

On 21.02.2018 16:55, Robert Marcano wrote:

Greetings. I have been playing with the developers guide example [1] for
embedding LO inside a Java window (Swing toolkit). The example works on
a Windows host, but on Linux I found the following problems (in the
order I found)

1- When the host Java application is running on a Wayland session (Java
Swing is still an X11 program), there is a crash. IIRC LO still is a X11
based application (or at least the Fedora compiled version is using the
X11 GTK back-end)

2- Switched to an X11 desktop session, there was no crash this time, but
the document was not shown embedded on the Java window, it was a
floating window with no window controls, unresponsive to the user.

3- Run the same application with the environment variable
SAL_USE_VCLPLUGIN=gtk in order to force the LO GTK2 back-end. The
document is embedded on the Java window as expected, but keyboard input
is not possible on the document or the controls, mouse actions works,
for example, I can change fonts using the mouse, but can't write
anything on the font combobox nor the document. New LO dialogs opened
from that document, keyboard input works.

4- Trying with SAL_USE_VCLPLUGIN=gen and keyboard input now works, but
with the outdated look of that LO VCL backend :(

So now the possible reasons that came to my head for each case:

1- Some confusion between Java being X11 and LO trying to do some
Wayland thing?


by default the "gtk3" vclplug will use Wayland if available.  probably
this won't work if the Java connects to X11 instead.  there is some
environment var GDK_BACKEND=x11 that can be used to force it.


GDK_BACKEND=x11 helps with not crashing on the Wayland session.




2- Java has a GTK Look and Feel/theme that loads GTK2 (the example
application does not load that theme) , I am under the impression that
if LO is loading GTK3, they are on different processes, so should not be
any conflict here.


AFAIK GTK 2 and GTK 3 cannot coexist in the same process, due to some
naming conflict of GObjects or so...


What I find weird is that there is no GTK libraries loaded on the 
process space of the Java example (verified checking /proc//maps), 
even when running the example in-place (not on an independent top level 
window)





3- Now both processes should be using GTK2, but the problems with
keyboard input is a blocker


that sounds like a bug somewhere.  (unlikely to get fixed any time soon
given this is quite an esoteric use-case.)


LibreOffice online and if IIRC the Android viewer are more invested on 
using LibreOfficeKit, I think I should investigate that. My knowledge of 
what can be done with LibreOfficeKit tell me I can have an headless 
process rendering to a shared buffer and use that to draw on my Java 
process.


Is this a better long term strategy?




4- Everything running without conflicting libraries/protocols (Wayland
vs X11 or GTK3 vs GTK2) and work, but the look and feel!!

Now, when running the example with a no inline option, everything works
fine, even when GTK2 and GTK3 are mixed. Wish to have an option to
create the new document top level window as a child of the Java window,
it is a pain for user that the document can go to the back of the
"caller" window. Any hints if this is possible between two processes
like Java and LO?


so does that option run LO as a separate process? yes, that would avoid
some of these issues, but as you found you get different issues instead :-/



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: ScFiltersTest::testOrcusODSStyleInterface fails with liborcus 0.13.3

[Kohei Yoshida]

Hi there,

> On February 22, 2018 at 8:01 AM Olivier Tilloy  
> wrote:
> 
> 
> Hello,
> 
> I initially filed
> https://bugs.documentfoundation.org/show_bug.cgi?id=115931 but it was
> suggested to me to raise the issue on the mailing list instead.
> 
> So here it goes: when building libreoffice 6.0 with an external
> liborcus (version 0.13.3), unit tests fail:
> 
> subsequent_filters-test.cxx:2398:Assertion
> Test name: ScFiltersTest::testOrcusODSStyleInterface
> equality assertion failed
> - Expected: Color: R:254 G:255 B: 204
> - Actual : Color: R:255 G:255 B: 255
> 
> This is most likely caused by that upstream change:
> https://gitlab.com/orcus/orcus/commit/f821995022df8dd1e580dd22cf131584b2b1ac4f
> 
> I'm not familiar with that code, but I came up with a tentative patch
> (which I will actually put to the test soon):
> 
> --- a/sc/source/filter/orcus/interface.cxx
> +++ b/sc/source/filter/orcus/interface.cxx
> @@ -839,7 +839,7 @@ void ScOrcusStyles::fill::applyToItemSet
>  return;
>  }
> 
> -rSet.Put(SvxBrushItem(maBgColor, ATTR_BACKGROUND));
> +rSet.Put(SvxBrushItem(maFgColor, ATTR_BACKGROUND));
>  }
> 
> Thoughts and feedback welcome!

Yes, so, you have raised this in a timely fashion.  While I was backporting a 
patch against orcus for the 6-0 branch last night, I did notice the possibility 
of this very issue, and was thinking of how to address it for that branch.  
Since you've already discovered this and emailed it to the list, let me provide 
my thoughts on this.

First of all, your patch should work fine.  However, with this change, we need 
to ensure that liborcus version 0.13.3 or later be used.  If you used an 
earlier version this change does break things.

What I was thinking of proposing is backporting the following commits:

20945a9a4de6684010fd5b3603595e6da543807d
a1c36eff089c3cd695bd78090575ca1c7677121e

raise the orcus baseline to 0.13.3, and commit all of these as a single 
backport commit to ensure that these all happen atomically.  This way if 
someone wants to build from the 6-0 branch using the system liborcus then the 
configure script should be able to catch it and fail.

How does this sound?

Kohei
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - svx/source

[Julien Nabet]

 svx/source/form/formcontroller.cxx |   34 ++
 1 file changed, 34 insertions(+)

New commits:
commit 074cda388a8c378f3ab433c1f4a5f086b4dcd67e
Author: Julien Nabet 
Date:   Thu Jan 25 14:52:43 2018 +0100

tdf#107134: add comparator in form filter

Change-Id: I86d3b5c4ebd231bdad70dc9f5a364658cfca6df4
Reviewed-on: https://gerrit.libreoffice.org/48609
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
(cherry picked from commit 819ba42b3409bd2f66593f619f1934ea7f461364)
Reviewed-on: https://gerrit.libreoffice.org/49681
Reviewed-by: Eike Rathke 

diff --git a/svx/source/form/formcontroller.cxx 
b/svx/source/form/formcontroller.cxx
index 15be71774403..f7d53f99128a 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3170,6 +3171,39 @@ void 
FormController::setFilter(::std::vector& rFieldInfos)
 if ( pParseNode != nullptr )
 {
 OUString sCriteria;
+switch (pRefValues[j].Handle)
+{
+case css::sdb::SQLFilterOperator::EQUAL:
+sCriteria += "=";
+break;
+case 
css::sdb::SQLFilterOperator::NOT_EQUAL:
+sCriteria += "!=";
+break;
+case css::sdb::SQLFilterOperator::LESS:
+sCriteria += "<";
+break;
+case css::sdb::SQLFilterOperator::GREATER:
+sCriteria += ">";
+break;
+case 
css::sdb::SQLFilterOperator::LESS_EQUAL:
+sCriteria += "<=";
+break;
+case 
css::sdb::SQLFilterOperator::GREATER_EQUAL:
+sCriteria += ">=";
+break;
+case css::sdb::SQLFilterOperator::LIKE:
+sCriteria += "LIKE ";
+break;
+case css::sdb::SQLFilterOperator::NOT_LIKE:
+sCriteria += "NOT LIKE ";
+break;
+case css::sdb::SQLFilterOperator::SQLNULL:
+sCriteria += "IS NULL";
+break;
+case 
css::sdb::SQLFilterOperator::NOT_SQLNULL:
+sCriteria += "IS NOT NULL";
+break;
+}
 pParseNode->parseNodeToPredicateStr( sCriteria
 
,xConnection
 ,xFormatter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Intro

[Muhammet Kara]

Hello Sourabh,

Welcome!

You don't have to know Android if you are not going to work on the 
Android viewer part. Just C++ would be enough to work on core.


And you are also free to contribute to LibreOffice documentation, but 
non-coding tasks/projects might not be acceptable for GSoC.


Cheers,
Muhammet

On 02/22/2018 03:22 AM, Sourabh Pruthi wrote:
Hello everyone myself Sourabh a student of pre-final year looking to 
apply for gsoc 2018 . I am really interested in contributing to 
LibreOffice. Actually I know only C++ and Java. Can I still able to 
proceed further because I don't know Android ? Another small query can 
I contribute to documentation as well?


Thanks


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: ScFiltersTest::testOrcusODSStyleInterface fails with liborcus 0.13.3

[Olivier Tilloy]

On Thu, Feb 22, 2018 at 2:21 PM, Kohei Yoshida  wrote:
> Hi there,
>
>> On February 22, 2018 at 8:01 AM Olivier Tilloy 
>>  wrote:
>>
>>
>> Hello,
>>
>> I initially filed
>> https://bugs.documentfoundation.org/show_bug.cgi?id=115931 but it was
>> suggested to me to raise the issue on the mailing list instead.
>>
>> So here it goes: when building libreoffice 6.0 with an external
>> liborcus (version 0.13.3), unit tests fail:
>>
>> subsequent_filters-test.cxx:2398:Assertion
>> Test name: ScFiltersTest::testOrcusODSStyleInterface
>> equality assertion failed
>> - Expected: Color: R:254 G:255 B: 204
>> - Actual : Color: R:255 G:255 B: 255
>>
>> This is most likely caused by that upstream change:
>> https://gitlab.com/orcus/orcus/commit/f821995022df8dd1e580dd22cf131584b2b1ac4f
>>
>> I'm not familiar with that code, but I came up with a tentative patch
>> (which I will actually put to the test soon):
>>
>> --- a/sc/source/filter/orcus/interface.cxx
>> +++ b/sc/source/filter/orcus/interface.cxx
>> @@ -839,7 +839,7 @@ void ScOrcusStyles::fill::applyToItemSet
>>  return;
>>  }
>>
>> -rSet.Put(SvxBrushItem(maBgColor, ATTR_BACKGROUND));
>> +rSet.Put(SvxBrushItem(maFgColor, ATTR_BACKGROUND));
>>  }
>>
>> Thoughts and feedback welcome!
>
> Yes, so, you have raised this in a timely fashion.  While I was backporting a 
> patch against orcus for the 6-0 branch last night, I did notice the 
> possibility of this very issue, and was thinking of how to address it for 
> that branch.  Since you've already discovered this and emailed it to the 
> list, let me provide my thoughts on this.
>
> First of all, your patch should work fine.  However, with this change, we 
> need to ensure that liborcus version 0.13.3 or later be used.  If you used an 
> earlier version this change does break things.
>
> What I was thinking of proposing is backporting the following commits:
>
> 20945a9a4de6684010fd5b3603595e6da543807d
> a1c36eff089c3cd695bd78090575ca1c7677121e
>
> raise the orcus baseline to 0.13.3, and commit all of these as a single 
> backport commit to ensure that these all happen atomically.  This way if 
> someone wants to build from the 6-0 branch using the system liborcus then the 
> configure script should be able to catch it and fail.
>
> How does this sound?

That sounds correct to me.

I'm building packages for ubuntu 18.04 where liborcus is at version
0.13.3 in the archive already, which is why I've started hitting the
issue. I'll test the change I suggested earlier as a distro-patch, and
it can be dropped later when your changes are merged and released.

Regards,

 Olivier
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - include/osl

[Aron Budea]

 include/osl/file.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c8bb752d21e25a1ba9b61e1197002e6d8c1746a5
Author: Aron Budea 
Date:   Wed Feb 21 14:49:11 2018 +0100

tdf#115383: revert mixup of E_ROFS and E_SPIPE in file.hxx

Regression from a9739f2dec197793fa9400dd95be49494dc85264

Change-Id: I1b55b0201888a63bd2439be8c0421f450d609018
Reviewed-on: https://gerrit.libreoffice.org/50105
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
Reviewed-on: https://gerrit.libreoffice.org/50171
Reviewed-by: Noel Grandin 
Tested-by: Michael Stahl 

diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index b005a31b5e76..96c155a18e1e 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -80,8 +80,8 @@ public:
 E_NOTTY= osl_File_E_NOTTY,  //< inappropriate I/O 
control operation
 E_FBIG = osl_File_E_FBIG,   //< file too large
 E_NOSPC= osl_File_E_NOSPC,  //< no space left on 
device, write failed
-E_SPIPE= osl_File_E_ROFS,   //< invalid seek operation 
(such as on pipe)
-E_ROFS = osl_File_E_SPIPE,  //< illegal modification 
to read-only filesystem
+E_SPIPE= osl_File_E_SPIPE,  //< invalid seek operation 
(such as on pipe)
+E_ROFS = osl_File_E_ROFS,   //< illegal modification 
to read-only filesystem
 E_MLINK= osl_File_E_MLINK,  //< too many links to file
 E_PIPE = osl_File_E_PIPE,   //< broken pipe; no 
process reading from other end of pipe
 E_DOM  = osl_File_E_DOM,//< domain error 
(mathematical error)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/UIConfig.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7752298d4a23c5adecb14a704dfb93f888b47b6
Author: Stephan Bergmann 
Date:   Wed Feb 21 17:12:28 2018 +0100

Process all added uifiles

Change-Id: I9efb05973e7d8468afb82bd9875d527412a4fd1c
Reviewed-on: https://gerrit.libreoffice.org/50116
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 9665dcaf9d18..640ead85d658 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -121,7 +121,7 @@ $(call gb_UIConfig_get_clean_target,%) :
 define gb_UIConfig_a11yerrors__command
 $(call gb_Output_announce,$(2),$(true),UIA,1)
 $(call gb_Helper_abbreviate_dirs,\
-   $(gb_UIConfig_a11yerrors_COMMAND) -W none $(UIFILE) > $@
+   $(gb_UIConfig_a11yerrors_COMMAND) -W none $(UIFILES) > $@
 )
 endef
 
@@ -189,7 +189,7 @@ $(call gb_UIConfig_get_imagelist_target,$(1)) : 
UI_IMAGELISTS += $(call gb_UIIma
 $(call gb_UIConfig_get_imagelist_target,$(1)) : $(call 
gb_UIImageListTarget_get_target,$(2))
 $(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_UIImageListTarget_get_clean_target,$(2))
 
-$(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILE := $(SRCDIR)/$(2).ui
+$(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILES += $(SRCDIR)/$(2).ui
 $(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_UIA11YErrorsTarget_get_clean_target,$(2))
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format

[Noel Grandin]

 solenv/clang-format/blacklist |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a6fd7fcdc9f8b1e29e7cc9c321e3b4c6ad667f94
Author: Noel Grandin 
Date:   Thu Feb 22 13:31:04 2018 +0200

update clang-format blacklist

after I accidentally formatted it in
commit 50d0ec571f302fe54ac7ddac827b571c94554bec
rename redundantcopy loplugin to redundantfcast

Change-Id: I8e006fa9a90af3d70ef7e6a9fdef2d6f294e0fba

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 654166228374..9fdf7746c1f7 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -1764,7 +1764,6 @@ compilerplugins/clang/privatebase.cxx
 compilerplugins/clang/ptrvector.cxx
 compilerplugins/clang/rangedforcopy.cxx
 compilerplugins/clang/redundantcast.cxx
-compilerplugins/clang/redundantcopy.cxx
 compilerplugins/clang/redundantinline.cxx
 compilerplugins/clang/redundantpointerops.cxx
 compilerplugins/clang/refcounting.cxx
@@ -1855,7 +1854,6 @@ compilerplugins/clang/test/passparamsbyref.cxx
 compilerplugins/clang/test/passstuffbyref.cxx
 compilerplugins/clang/test/redundantcast.cxx
 compilerplugins/clang/test/redundantcast.hxx
-compilerplugins/clang/test/redundantcopy.cxx
 compilerplugins/clang/test/redundantinline.cxx
 compilerplugins/clang/test/redundantinline.hxx
 compilerplugins/clang/test/redundantpointerops.cxx
___
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-3-1' - bundled/include kit/KitHelper.hpp loleaflet/src loleaflet/unocommands.js

[Marco Cecchetti]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h |3 +
 kit/KitHelper.hpp   |   32 +-
 loleaflet/src/control/Control.Menubar.js|1 
 loleaflet/src/control/Control.Tabs.js   |   16 -
 loleaflet/src/control/Parts.js  |   42 
 loleaflet/src/core/Socket.js|7 
 loleaflet/src/layer/tile/CalcTileLayer.js   |   25 --
 loleaflet/unocommands.js|3 +
 8 files changed, 124 insertions(+), 5 deletions(-)

New commits:
commit 264c79d16cf6418c3b1359c02c8be813082eae1c
Author: Marco Cecchetti 
Date:   Thu Feb 1 16:36:24 2018 +0100

calc: added support for hidden sheets and validation of cell content

Change-Id: I5db971b8826de7d5be2f88354925cd107082da77
Reviewed-on: https://gerrit.libreoffice.org/50007
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 2af965e4..e58e6902 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -295,6 +295,9 @@ struct _LibreOfficeKitDocumentClass
int nType,
const char* pText);
 
+/// @see lok::Document::getPartInfo().
+char* (*getPartInfo) (LibreOfficeKitDocument* pThis, int nPart);
+
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
diff --git a/kit/KitHelper.hpp b/kit/KitHelper.hpp
index f3523a9f..1cc6b7fb 100644
--- a/kit/KitHelper.hpp
+++ b/kit/KitHelper.hpp
@@ -13,6 +13,8 @@
 #include 
 #include 
 
+#include 
+
 #define LOK_USE_UNSTABLE_API
 #include 
 
@@ -140,7 +142,35 @@ namespace LOKitHelper
 
 if (type == LOK_DOCTYPE_SPREADSHEET || type == 
LOK_DOCTYPE_PRESENTATION)
 {
-for (auto i = 0; i < parts; ++i)
+if (type == LOK_DOCTYPE_SPREADSHEET)
+{
+std::ostringstream hposs;
+for (int i = 0; i < parts; ++i)
+{
+
+ptrValue = 
loKitDocument->pClass->getPartInfo(loKitDocument, i);
+std::string partinfo(ptrValue);
+std::free(ptrValue);
+const auto aPartInfo = Util::JsonToMap(partinfo);
+for (const auto prop: aPartInfo)
+{
+const std::string& name = prop.first;
+if (name == "visible")
+{
+if (prop.second == "0")
+hposs << i << ",";
+}
+}
+}
+std::string hiddenparts = hposs.str();
+if (!hiddenparts.empty())
+{
+hiddenparts.pop_back();
+oss << " hiddenparts=" << hiddenparts;
+}
+}
+
+for (int i = 0; i < parts; ++i)
 {
 oss << "\n";
 ptrValue = loKitDocument->pClass->getPartName(loKitDocument, 
i);
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8b6a2e99..81dd25fc 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -353,6 +353,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:DataSort'},
{uno: '.uno:SortAscending'},
{uno: '.uno:SortDescending'},
+   {uno: '.uno:Validation'},
{type: 'separator'},
{uno: '.uno:DataFilterAutoFilter'},
{name: _UNO('.uno:FilterMenu', 'spreadsheet'), 
type: 'menu', menu: [
diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index a2095457..8295f2fd 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -68,7 +68,19 @@ L.Control.Tabs = L.Control.extend({

map.renamePage(data.sheetname, nPos);
}
});
-   }}
+   }},
+   'showsheets': {
+   name: _UNO('.uno:Show', 'spreadsheet', 
true),
+   callback: function() {
+   map.showPage();
+   }
+ 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - external/liborcus

[Kohei Yoshida]

 
external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 |   30 ++
 external/liborcus/UnpackedTarball_liborcus.mk  
   |1 
 2 files changed, 31 insertions(+)

New commits:
commit f25bc1254782589af5d24471599260b65558154a
Author: Kohei Yoshida 
Date:   Wed Feb 21 20:08:23 2018 -0500

Patch liborcus to avoid incorrect parsing of XML.

Found by Antti Levomäki and Christian Jalio from Forcepoint.

This one is not a backport from the master branch.  On the master
branch the same fix will come from updating liborcus from 0.13.3
to 0.13.4.

(cherry picked from commit 160350de5f07024b22fb5a9b596918ccc7f22c75)

 Conflicts:
external/liborcus/UnpackedTarball_liborcus.mk

Change-Id: I701c5a65ff67d77767913f8d056682b9db549f84
Reviewed-on: https://gerrit.libreoffice.org/50147
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git 
a/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 
b/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
new file mode 100644
index ..990665f9c383
--- /dev/null
+++ 
b/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
@@ -0,0 +1,30 @@
+From 12e5d89cbd7101c61fbdf063322203a1590a0ef5 Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard 
+Date: Wed, 21 Feb 2018 00:29:03 +0100
+Subject: [PATCH] protect the self-closing xml element code against
+ self-closing root elements
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Found by Antti Levomäki and Christian Jalio from Forcepoint.
+---
+ include/orcus/sax_parser.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/orcus/sax_parser.hpp b/include/orcus/sax_parser.hpp
+index ba5ebcd..67d5943 100644
+--- a/include/orcus/sax_parser.hpp
 b/include/orcus/sax_parser.hpp
+@@ -171,6 +171,8 @@ void 
sax_parser<_Handler,_Config>::element_open(std::ptrdiff_t begin_pos)
+ m_handler.start_element(elem);
+ reset_buffer_pos();
+ m_handler.end_element(elem);
++if (!m_nest_level)
++m_root_elem_open = false;
+ #if ORCUS_DEBUG_SAX_PARSER
+ cout << "element_open: ns='" << elem.ns << "', name='" << 
elem.name << "' (self-closing)" << endl;
+ #endif
+-- 
+2.7.4
+
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 93b988553116..791436e66016 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/visibility.patch.0 \
external/liborcus/nullptr-in-ostringstream.patch.1 \
+   
external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/liborcus

[Kohei Yoshida]

 
external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 |   30 ++
 external/liborcus/UnpackedTarball_liborcus.mk  
   |1 
 2 files changed, 31 insertions(+)

New commits:
commit 76bb102d90ecc04de0dd016019c31ba1abcb9b26
Author: Kohei Yoshida 
Date:   Wed Feb 21 20:08:23 2018 -0500

Patch liborcus to avoid incorrect parsing of XML.

Found by Antti Levomäki and Christian Jalio from Forcepoint.

This one is not a backport from the master branch.  On the master
branch the same fix will come from updating liborcus from 0.13.3
to 0.13.4.

Change-Id: I701c5a65ff67d77767913f8d056682b9db549f84
Reviewed-on: https://gerrit.libreoffice.org/50146
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git 
a/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 
b/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
new file mode 100644
index ..990665f9c383
--- /dev/null
+++ 
b/external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
@@ -0,0 +1,30 @@
+From 12e5d89cbd7101c61fbdf063322203a1590a0ef5 Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard 
+Date: Wed, 21 Feb 2018 00:29:03 +0100
+Subject: [PATCH] protect the self-closing xml element code against
+ self-closing root elements
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Found by Antti Levomäki and Christian Jalio from Forcepoint.
+---
+ include/orcus/sax_parser.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/orcus/sax_parser.hpp b/include/orcus/sax_parser.hpp
+index ba5ebcd..67d5943 100644
+--- a/include/orcus/sax_parser.hpp
 b/include/orcus/sax_parser.hpp
+@@ -171,6 +171,8 @@ void 
sax_parser<_Handler,_Config>::element_open(std::ptrdiff_t begin_pos)
+ m_handler.start_element(elem);
+ reset_buffer_pos();
+ m_handler.end_element(elem);
++if (!m_nest_level)
++m_root_elem_open = false;
+ #if ORCUS_DEBUG_SAX_PARSER
+ cout << "element_open: ns='" << elem.ns << "', name='" << 
elem.name << "' (self-closing)" << endl;
+ #endif
+-- 
+2.7.4
+
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index e9270c24a5cb..7fadaa46b1c9 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
external/liborcus/silence-assert.patch \
+   
external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch
 \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: bin/gla11y config_host.mk.in configure.ac solenv/gbuild

[Samuel Thibault]

Hello,

Miklos Vajna, on jeu. 22 févr. 2018 09:53:43 +0100, wrote:
> On Wed, Feb 21, 2018 at 10:11:18AM +0100, Samuel Thibault 
>  wrote:
> > Rene Engelhard, on mer. 21 févr. 2018 10:02:08 +0100, wrote:
> > > OK, thanks - and then I wonder why this is ran in "normal" UIConfig 
> > > targets and
> > > not only in make check...
> > For the "error" cases (-W none), it makes sense: 
> > 
> > « Add to the build process error checking (only the hard errors such as
> > bogus target names). »
> > 
> > That's really the kind of issues one should get as soon as compilation
> > time.
> > 
> > Later on I'll add a call in "make check" time for the warnings.
> 
> For source code we have warnings for these linter type problems

Err, these are not just "linter type problems". They are undefined
references, just like undefined C references. So the failure belongs to
compilation time. If somebody modifies a .ui file in a way that gets
such undefined reference, compilation itself should really fail, just
like it does when a variable defintion is missing.

The "make check" warnings I mentioned above are *other* kinds of issues,
which would indeed only be tested within make check, made warnings by
default, and turned into errors by Jenkins.

Samuel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/osl

[Aron Budea]

 include/osl/file.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2219f0f6f85316d05231130c89613b98e7fd2cf5
Author: Aron Budea 
Date:   Wed Feb 21 14:49:11 2018 +0100

tdf#115383: revert mixup of E_ROFS and E_SPIPE in file.hxx

Regression from a9739f2dec197793fa9400dd95be49494dc85264

Change-Id: I1b55b0201888a63bd2439be8c0421f450d609018
Reviewed-on: https://gerrit.libreoffice.org/50103
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-by: Michael Stahl 

diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index f6764f14ed27..76b2a1bb110f 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -80,8 +80,8 @@ public:
 E_NOTTY= osl_File_E_NOTTY,  ///< inappropriate I/O 
control operation
 E_FBIG = osl_File_E_FBIG,   ///< file too large
 E_NOSPC= osl_File_E_NOSPC,  ///< no space left on 
device, write failed
-E_SPIPE= osl_File_E_ROFS,   ///< invalid seek 
operation (such as on pipe)
-E_ROFS = osl_File_E_SPIPE,  ///< illegal modification 
to read-only filesystem
+E_SPIPE= osl_File_E_SPIPE,  ///< invalid seek 
operation (such as on pipe)
+E_ROFS = osl_File_E_ROFS,   ///< illegal modification 
to read-only filesystem
 E_MLINK= osl_File_E_MLINK,  ///< too many links to file
 E_PIPE = osl_File_E_PIPE,   ///< broken pipe; no 
process reading from other end of pipe
 E_DOM  = osl_File_E_DOM,///< domain error 
(mathematical error)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/osl

[Aron Budea]

 include/osl/file.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aafbeb29074c9e520a755f5582a774f9c812049b
Author: Aron Budea 
Date:   Wed Feb 21 14:49:11 2018 +0100

tdf#115383: revert mixup of E_ROFS and E_SPIPE in file.hxx

Regression from a9739f2dec197793fa9400dd95be49494dc85264

Change-Id: I1b55b0201888a63bd2439be8c0421f450d609018
Reviewed-on: https://gerrit.libreoffice.org/50105
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 3c2848eaa590..a888f0329df0 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -80,8 +80,8 @@ public:
 E_NOTTY= osl_File_E_NOTTY,  ///< inappropriate I/O 
control operation
 E_FBIG = osl_File_E_FBIG,   ///< file too large
 E_NOSPC= osl_File_E_NOSPC,  ///< no space left on 
device, write failed
-E_SPIPE= osl_File_E_ROFS,   ///< invalid seek 
operation (such as on pipe)
-E_ROFS = osl_File_E_SPIPE,  ///< illegal modification 
to read-only filesystem
+E_SPIPE= osl_File_E_SPIPE,  ///< invalid seek 
operation (such as on pipe)
+E_ROFS = osl_File_E_ROFS,   ///< illegal modification 
to read-only filesystem
 E_MLINK= osl_File_E_MLINK,  ///< too many links to file
 E_PIPE = osl_File_E_PIPE,   ///< broken pipe; no 
process reading from other end of pipe
 E_DOM  = osl_File_E_DOM,///< domain error 
(mathematical error)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5ca7b7d6871be7a4f4de6f2e152cc98762e096a
Author: Christian Lohmaier 
Date:   Thu Feb 22 12:41:14 2018 +0100

Updated core
Project: translations  db79c9d122d554eb563cb501b8eafb289b38

update translations for 6.0.2 rc1

and force-fix errors using pocheck

Change-Id: I760bd52e6a79b34ebf7f59f7d7c11ce7605b4a79

diff --git a/translations b/translations
index 4092195506ca..db79c9d1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4092195506ca82679ed8ed0feb596777a39aaa20
+Subproject commit db79c9d122d554eb563cb501b8eafb289b38
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - translations

[Christian Lohmaier]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18350415ae85823d66fe9d063fd4eb75a6b77034
Author: Christian Lohmaier 
Date:   Thu Feb 22 12:41:14 2018 +0100

Updated core
Project: translations  a67ce9f4daaddb3b7a1a17ab5d4cb2216eec3961

update translations for 6.0.2 rc1

and force-fix errors using pocheck

Change-Id: I760bd52e6a79b34ebf7f59f7d7c11ce7605b4a79
(cherry picked from commit db79c9d122d554eb563cb501b8eafb289b38)

diff --git a/translations b/translations
index 27745d017226..a67ce9f4daad 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 27745d0172265edac7ea74fefc12de23d1037f4d
+Subproject commit a67ce9f4daaddb3b7a1a17ab5d4cb2216eec3961
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa

[Zdeněk Crhonek]

 sw/qa/uitest/writer_tests/watermark.py |   67 +
 1 file changed, 67 insertions(+)

New commits:
commit e313f0f959dfe0977366a8342ba43dbea6703adb
Author: Zdeněk Crhonek 
Date:   Wed Feb 21 21:22:32 2018 +0100

uitest - writer Watermark dialog

Change-Id: If701a563ce2ff0e811dfcaae6852ada05c925ce3
Reviewed-on: https://gerrit.libreoffice.org/50126
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests/watermark.py 
b/sw/qa/uitest/writer_tests/watermark.py
new file mode 100644
index ..d42f37bb2aff
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/watermark.py
@@ -0,0 +1,67 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
+import time
+from uitest.debug import sleep
+from uitest.uihelper.common import select_pos
+
+
+class watermark(UITestCase):
+
+   def test_insert_watermark(self):
+self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+self.ui_test.execute_dialog_through_command(".uno:Watermark")
+xDialog = self.xUITest.getTopFocusWindow()
+xTextInput = xDialog.getChild("TextInput")
+xAngle = xDialog.getChild("Angle")
+xTransparency = xDialog.getChild("Transparency")
+
+xTextInput.executeAction("TYPE", 
mkPropertyValues({"TEXT":"Watermark"}))
+xAngle.executeAction("UP", tuple())
+xTransparency.executeAction("UP", tuple())
+
+xOkBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+self.ui_test.execute_dialog_through_command(".uno:Watermark")
+xDialog = self.xUITest.getTopFocusWindow()
+xTextInput = xDialog.getChild("TextInput")
+xAngle = xDialog.getChild("Angle")
+xTransparency = xDialog.getChild("Transparency")
+
+self.assertEqual(get_state_as_dict(xTextInput)["Text"], "Watermark")
+self.assertEqual(get_state_as_dict(xAngle)["Text"], "46")
+self.assertEqual(get_state_as_dict(xTransparency)["Text"], "51")
+
+xCancBtn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancBtn)
+
+self.ui_test.execute_dialog_through_command(".uno:Watermark")
+xDialog = self.xUITest.getTopFocusWindow()
+xTextInput = xDialog.getChild("TextInput")
+xTextInput.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+xTextInput.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+xOkBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+self.ui_test.execute_dialog_through_command(".uno:Watermark")
+xDialog = self.xUITest.getTopFocusWindow()
+xTextInput = xDialog.getChild("TextInput")
+
+self.assertEqual(get_state_as_dict(xTextInput)["Text"], "")
+
+xCancBtn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancBtn)
+
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
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.3' - sc/source sd/source sw/source

[Pranav Kant]

 sc/source/ui/unoobj/docuno.cxx|4 ++--
 sd/source/ui/unoidl/unomodel.cxx  |5 +++--
 sw/source/uibase/uno/unotxdoc.cxx |4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit d5f0b3d725f678c1a7eb4b8b4ab3a2279742260c
Author: Pranav Kant 
Date:   Thu Feb 22 17:40:35 2018 +0530

Revert posting key events on the main thread

This partially reverts commit f2d3192e8a4ae743fcaab27ab6d829d57ae8fb60.

Change-Id: Ic273e3f742d48dbfb73060a6ecb4feb80afdcfaa
Reviewed-on: https://gerrit.libreoffice.org/50174
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index f415a7b5cd4c..b6cbc5e46fac 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -623,10 +623,10 @@ void ScModelObj::postKeyEvent(int nType, int nCharCode, 
int nKeyCode)
 switch (nType)
 {
 case LOK_KEYEVENT_KEYINPUT:
-Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT, pWindow, );
+pWindow->KeyInput(aEvent);
 break;
 case LOK_KEYEVENT_KEYUP:
-Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP, pWindow, );
+pWindow->KeyUp(aEvent);
 break;
 default:
 assert(false);
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 30971a584e49..d9ea81e4982e 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2507,13 +2507,14 @@ void SdXImpressDocument::postKeyEvent(int nType, int 
nCharCode, int nKeyCode)
 return;
 
 KeyEvent aEvent(nCharCode, nKeyCode, 0);
+
 switch (nType)
 {
 case LOK_KEYEVENT_KEYINPUT:
-Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT, pWindow, );
+pWindow->KeyInput(aEvent);
 break;
 case LOK_KEYEVENT_KEYUP:
-Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP, pWindow, );
+pWindow->KeyUp(aEvent);
 break;
 default:
 assert(false);
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 103ae13f9111..0244b3db6a2b 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3499,10 +3499,10 @@ void SwXTextDocument::postKeyEvent(int nType, int 
nCharCode, int nKeyCode)
 switch (nType)
 {
 case LOK_KEYEVENT_KEYINPUT:
-Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT, pWindow, );
+pWindow->KeyInput(aEvent);
 break;
 case LOK_KEYEVENT_KEYUP:
-Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP, pWindow, );
+pWindow->KeyUp(aEvent);
 break;
 default:
 assert(false);
___
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.3' - oox/source

[Jan Holesovsky]

 oox/source/core/xmlfilterbase.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8dde1396f7c9aed30590bc7c55d3ac0e2252381f
Author: Jan Holesovsky 
Date:   Thu Feb 22 13:01:55 2018 +0100

Fix build.

Change-Id: I1048970fdfa431d20ff4f7861b7f1788aadedf4e
Reviewed-on: https://gerrit.libreoffice.org/50173
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index c858bd707e16..00d23a377564 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -51,7 +51,6 @@
 #include "oox/helper/zipstorage.hxx"
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -69,6 +68,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using ::com::sun::star::xml::dom::DocumentBuilder;
 using ::com::sun::star::xml::dom::XDocument;
@@ -1013,7 +1013,7 @@ void 
XmlFilterBase::importCustomFragments(css::uno::Reference xCustDoc = importFragment("customXml/item" + 
OUString::number(i) + ".xml");
 Reference xCustDocProps = 
importFragment("customXml/itemProps" + OUString::number(i) + ".xml");
-if (xCustDoc && xCustDocProps)
+if (xCustDoc.is() && xCustDocProps.is())
 {
 aCustomXmlDomList.emplace_back(xCustDoc);
 aCustomXmlDomPropsList.emplace_back(xCustDocProps);
@@ -1082,7 +1082,7 @@ void XmlFilterBase::exportCustomFragments()
 const OUString fragmentPath = "customXml/item" + 
OUString::number((j+1)) + ".xml";
 if (customXmlDom.is())
 {
-addRelation(oox::getRelationship(Relationship::CUSTOMXML), "../" + 
fragmentPath);
+
addRelation("http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml;,
 "../" + fragmentPath);
 
 uno::Reference 
serializer(customXmlDom, uno::UNO_QUERY);
 uno::Reference writer = 
xml::sax::Writer::create(comphelper::getProcessComponentContext());
@@ -1102,7 +1102,7 @@ void XmlFilterBase::exportCustomFragments()
 
 // Adding itemprops's relationship entry to item.xml.rels file
 addRelation(openFragmentStream(fragmentPath, "application/xml"),
-oox::getRelationship(Relationship::CUSTOMXMLPROPS),
+
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps;,
 "itemProps"+OUString::number((j+1))+".xml");
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/UIConfig.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9de93343afd95b991264ee3254bccbefc14761bc
Author: Stephan Bergmann 
Date:   Thu Feb 22 10:06:29 2018 +0100

gb_UIConfig_get_imagelist_target missing from clean target

Change-Id: I541bd57815bd66978326486b29165d0480d8a7b6
Reviewed-on: https://gerrit.libreoffice.org/50157
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 640ead85d658..458d426ce413 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -115,7 +115,7 @@ $(call gb_UIConfig_get_imagelist_target,%) :
 $(call gb_UIConfig_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),UIC,2)
$(call gb_Helper_abbreviate_dirs,\
-   rm -f $(call gb_UIConfig_get_target,$*) \
+   rm -f $(call gb_UIConfig_get_target,$*) $(call 
gb_UIConfig_get_imagelist_target,$*) \
)
 
 define gb_UIConfig_a11yerrors__command
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad1a885e3b34714980121f7ef273cf59f3f76e12
Author: Olivier Hallot 
Date:   Thu Feb 22 13:13:31 2018 -0300

Updated core
Project: help  235783d1ed47620748fe297f5ff5133121fbe75e

tdf#114995 CSV Link external data help page

Change-Id: I932bb17e0c599ea79dba950733e354e86f6efce4
Reviewed-on: https://gerrit.libreoffice.org/50193
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 75cf318614f7..235783d1ed47 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 75cf318614f73c93a51538a9508ccca2b47f82b1
+Subproject commit 235783d1ed47620748fe297f5ff5133121fbe75e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing accessibility non-regression check tool

[Samuel Thibault]

Stephan Bergmann, on jeu. 22 févr. 2018 16:36:44 +0100, wrote:
>  I have e.g. no idea whether/how
> it's possible to tell that lxml setup.py which libxml2/libxslt to use.

That was indeed a missing part in my patch, it's a mere setup.py option
which does work fine.

> (And whether e.g. the external/{libxml2,libxslt} case will require
> some extra scaffolding at the calling site of gla11y in UIConfig.mk.)

This is already handled with LD_LIBRARY_PATH on programs/

> Just be warned. ;)

Sure, I'm not saying that the plumbing is completely trivial :)

Samuel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/source

[Tor Lillqvist]

 vcl/inc/salinst.hxx   |4 
 vcl/osx/salinst.cxx   |3 +++
 vcl/source/app/svmain.cxx |4 
 3 files changed, 11 insertions(+)

New commits:
commit 8bd289c43c34ab9258f4b08a0f3f6143dc710e4e
Author: Tor Lillqvist 
Date:   Thu Feb 22 12:40:26 2018 +0200

tdf#103690: Set up notifications only after VCL has been initialised

On some Macs, it seems that LibreOffice (or any app?) gets an
NSApplicationDidChangeScreenParametersNotification as soon as it has
started and asked for such a notification. Our handler for that
notification assumes that VCL is initialised. Thus we should not ask
for such notifications before VCL has been initialised.

I could not reproduce the reported crash with an unmodified
LibreOffice, only after inserting a sleep after the notifications had
been set up. But I am fairly sure this change fixes the problem.

Change-Id: I18d342eb7dc0c77cb7fc8623756bead65a1bd329
Reviewed-on: https://gerrit.libreoffice.org/50164
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 1eadc7ac382f..600f8ddfb8b3 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -205,6 +205,10 @@ void DeInitSalData();   // called from 
Application-Dtor
 
 void InitSalMain();
 
+#ifdef MACOSX
+void postInitVCLinitNSApp();
+#endif
+
 #endif // INCLUDED_VCL_INC_SALINST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 48eafa5eac1a..e008357b3641 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -157,7 +157,10 @@ static void initNSApp()
 
 // activate our delegate methods
 [NSApp setDelegate: NSApp];
+}
 
+void postInitVCLinitNSApp()
+{
 [[NSNotificationCenter defaultCenter] addObserver: NSApp
   selector: 
@selector(systemColorsChanged:)
   name: 
NSSystemColorsDidChangeNotification
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 500eb3060c19..f44fd566aabc 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -187,6 +187,10 @@ int ImplSVMain()
 
 bool bInit = isInitVCL() || InitVCL();
 
+#ifdef MACOSX
+postInitVCLinitNSApp();
+#endif
+
 if( bInit )
 {
 // call application main
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01d64f4bee56f3db2348f29a24c9cd7325bb4ce2
Author: tagezi 
Date:   Sat Feb 17 17:47:10 2018 +0300

Updated core
Project: help  75cf318614f73c93a51538a9508ccca2b47f82b1

Deletion [Runtime] from names functions

[Runtime] was deleted
[Runtime - VBA] was replaced to [VBA]
Combination of words "runtime functions" and "runtime categiries"
was replaced to "functions" and "categiries" respectively

Change-Id: I1f03a5f2ef1697e216e144ecccbfb8942b315718
Reviewed-on: https://gerrit.libreoffice.org/49914
Tested-by: Olivier Hallot 
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 5339d3c91fb8..75cf318614f7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5339d3c91fb81ea593a96c5602b767d68aba623f
+Subproject commit 75cf318614f73c93a51538a9508ccca2b47f82b1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Open Source Dockerfiles for LibreOffice development

[Stefan Weiberg]

Hello *,

I started developing/configuring some Docker Images for LibreOffice
development. They are licensed with EUPLv1.2 (GPLv3 compatible):

https://gitea.hibiki.eu/suntorytimed/dockerimage-libreoffice-base
https://gitea.hibiki.eu/suntorytimed/dockerimage-libreoffice-user
https://gitea.hibiki.eu/suntorytimed/dockerimage-libreoffice-jenkins

Feel free to mirror/fork.

Cheers,
Stefan (suntorytimed)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Implementing accessibility non-regression check tool

[Michael Stahl]

On 22.02.2018 16:36, Stephan Bergmann wrote:
> I was more hoping that there might be an established plain Python option 
> for XML processing?

FWIW, there is at least xml.etree.ElementTree and xml.dom.minidom in the
CPython bundled libs.

https://docs.python.org/3/library/xml.etree.elementtree.html
https://docs.python.org/3/library/xml.dom.minidom.html

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: source/text

[Olivier Hallot]

 source/text/scalc/guide/rename_table.xhp |  144 +++
 1 file changed, 72 insertions(+), 72 deletions(-)

New commits:
commit 5339d3c91fb81ea593a96c5602b767d68aba623f
Author: Olivier Hallot 
Date:   Thu Feb 22 12:51:22 2018 -0300

tdf#115831 Review of rename sheet help page

Change-Id: Ibe2db947cd6a1ef52231013a6ecdb9efbf2e99a2
Reviewed-on: https://gerrit.libreoffice.org/50192
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/source/text/scalc/guide/rename_table.xhp 
b/source/text/scalc/guide/rename_table.xhp
index c750ca40a..0cebc5bcf 100644
--- a/source/text/scalc/guide/rename_table.xhp
+++ b/source/text/scalc/guide/rename_table.xhp
@@ -1,5 +1,6 @@
 
 
+
 
-
-
-  
-Renaming Sheets
-/text/scalc/guide/rename_table.xhp
-  
-
-
-
-
-
-  renaming;sheets
-  sheet tabs;renaming
-  tables;renaming
-  names; sheets
-
-mw made "renaming sheets" a two level entry.
+ -->
 
-Renaming 
Sheets 
 
-
-  
-Click the 
name of the sheet that you want to change.
-  
-  
-Open the 
context menu and choose the Rename Sheet command. A dialog box 
appears where you can enter a new name.
-  
-  
-Enter a new 
name for the sheet and click OK.
-  
-  
-Alternatively, hold down the Option key 
+
+  
+ Renaming Sheets
+ /text/scalc/guide/rename_table.xhp
+  
+   
+   
+renaming;sheets
+  sheet tabs;renaming
+  tables;renaming
+  names; sheets
+mw made "renaming sheets" a two level entry.
+Renaming 
Sheets
+
+Setting sheet names is an important feature to produce 
readable and understandable spreadsheets documents. To rename a sheet in your 
document:
+  
+ 
+Click on the sheet tab to select it.
+ 
+ 
+Open the context menu of the sheet tab and choose the 
Rename Sheet command. A dialog box appears where you can enter a 
new name.
+ 
+ 
+Enter a new name for the sheet and click 
OK.
+ 
+ 
+Alternatively, hold down the Option key
 Alt key and click 
on any sheet name and enter the new name directly.
-
-  
-
-Sheet 
names can contain almost any character. Some naming restrictions apply, the 
following characters are not allowed in sheet names:
-
-
-  
-colon :
-  
-  
-back slash \
-  
-  
-forward slash /
-  
-  
-question mark ?
-  
-  
-asterisk *
-  
-  
-left square bracket [
-  
-  
-right square bracket ]
-  
-  
-single quote ' as the first or last character of the 
name
-  
-In 
cell references, a sheet name has to be enclosed in single quotes ' if the name 
contains other characters than alphanumeric or underscore. A single quote 
contained within a name has to be escaped by doubling it (two single quotes). 
For example, you want to reference the cell A1 on a sheet with the following 
name:
-This 
year's sheet
-The 
reference must be enclosed in single quotes, and the one single quote inside 
the name must be doubled:
-'This 
year''s sheet'.A1
-The name of a 
sheet is independent of the name of the spreadsheet. You enter the spreadsheet 
name when you save it for the first time as a file. The document can contain up 
to 10,000 individual sheets, which can have different names.
-
-
-
-
-
-
+
+ 
+  
+  Sheet names can contain almost any character. Some naming 
restrictions apply, the following characters are not allowed in sheet 
names:
+  
+ 
+colon :
+ 
+ 
+back slash \
+ 
+ 
+forward slash /
+ 
+ 
+question mark ?
+ 
+ 
+asterisk *
+ 
+ 
+left square bracket [
+ 
+ 
+right square bracket ]
+ 
+ 
+single quote ' as the first or last character of the 
name
+ 
+  
+  In 
cell references, a sheet name must be enclosed in single quotes ' when the name 
contains other characters than alphanumeric or underscore. A single quote 
contained within a name has to be escaped by doubling it (two single 
quotes).
+  For example, you want to reference the cell A1 on a sheet with 
the following name:
+  This 
year's sheet
+  The reference must be enclosed in single quotes, and the one 
single quote inside the name must be doubled:
+  'This year''s sheet'.A1
+  The name of a 
sheet is independent of the name of the spreadsheet. You enter the spreadsheet 
name when you save it for the first time as a file.
+  The 
document can contain up to 10,000 individual sheets, which must have different 
names.
+  You can set a prefix for the names of new sheets you create. 
See this 
page of Calc options.
+  
+  New sheet names prefixing.
+ 
+  
+   
 

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc646858a208e42cae39fb2c16c8c04eca91ee97
Author: Olivier Hallot 
Date:   Thu Feb 22 12:51:22 2018 -0300

Updated core
Project: help  5339d3c91fb81ea593a96c5602b767d68aba623f

tdf#115831 Review of rename sheet help page

Change-Id: Ibe2db947cd6a1ef52231013a6ecdb9efbf2e99a2
Reviewed-on: https://gerrit.libreoffice.org/50192
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 90671d8531b2..5339d3c91fb8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 90671d8531b28cebf6129402932320a437cf4544
+Subproject commit 5339d3c91fb81ea593a96c5602b767d68aba623f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/TargetLocations.mk |1 -
 solenv/gbuild/UIConfig.mk|8 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit b7e8ae27f85aea1e924a28c7facfd82289b9e6a9
Author: Stephan Bergmann 
Date:   Thu Feb 22 09:46:07 2018 +0100

Fix clean-up of gb_UIConfig_get_a11yerrors_target

The old code tried to remove non-exisiting *.a11yerrors files corresponding 
to a
UIConfig's individual *.ui files, not the one single *.a11yerrors file
corresponding to the UIConfig itself.

Also, there's no need to have a UIA11YErrorsTarget merely for clean-up.  
Just
do that clean-up as part of gb_UIConfig_get_clean_target.

Change-Id: I6676f08496254398801bb75172c1326d1c843071
Reviewed-on: https://gerrit.libreoffice.org/50156
Reviewed-by: Samuel Thibault 
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 06ec8bea0f43..4911b1b8c137 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -281,7 +281,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
CppunitTestFakeExecutable \
CustomTarget \
ExternalProject \
-   UIA11YErrorsTarget \
UIConfig \
UIImageListTarget \
UIMenubarTarget \
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 458d426ce413..e7de81a25839 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -117,6 +117,8 @@ $(call gb_UIConfig_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UIConfig_get_target,$*) $(call 
gb_UIConfig_get_imagelist_target,$*) \
)
+   $(call gb_Output_announce,$*,$(false),UIA,2)
+   rm -f $(call gb_UIConfig_get_a11yerrors_target,$*)
 
 define gb_UIConfig_a11yerrors__command
 $(call gb_Output_announce,$(2),$(true),UIA,1)
@@ -132,11 +134,6 @@ else
touch $@
 endif
 
-.PHONY : $(call gb_UIA11YErrorsTarget_get_clean_target,%)
-$(call gb_UIA11YErrorsTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(false),UIA,2)
-   rm -f $(call gb_UIConfig_get_a11yerrors_target,$*)
-
 gb_UIConfig_get_packagename = UIConfig/$(1)
 gb_UIConfig_get_packagesetname = UIConfig/$(1)
 
@@ -190,7 +187,6 @@ $(call gb_UIConfig_get_imagelist_target,$(1)) : $(call 
gb_UIImageListTarget_get_
 $(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_UIImageListTarget_get_clean_target,$(2))
 
 $(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILES += $(SRCDIR)/$(2).ui
-$(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_UIA11YErrorsTarget_get_clean_target,$(2))
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing accessibility non-regression check tool

[Stephan Bergmann]

On 22.02.2018 16:13, Samuel Thibault wrote:

Stephan Bergmann, on jeu. 22 févr. 2018 15:49:40 +0100, wrote:

That's four different ways how to build external/lxml, and slightly more
different ways (using the system lxml versus external/lxml) how to run the
gla11y tool in solenv/gbuild/UIConfig.mk.  And getting all those ways to
work, on the different platforms, will be hell.

[...]

(and the current building issue reported in gerrit 50115 is merely that
the current LO python3 module doesn't install any header file or such)


...and that's only the start, I guess. :)  I have e.g. no idea 
whether/how it's possible to tell that lxml setup.py which 
libxml2/libxslt to use.  (And whether e.g. the 
external/{libxml2,libxslt} case will require some extra scaffolding at 
the calling site of gla11y in UIConfig.mk.)


Just be warned. ;)


Isn't there another option to make that gla11y tool process XML data, one
that better matches LO's needs?


Well, we can reimplement the world for sure.

More seriously, we can of course at least depend only on libxml2. Not
depending on a higher-level library, however, means to have to
reimplement all the tree browsing functions needed to reach the pieces
of .ui files.  And avoiding python means, writing all of this in C?
That's neither fun nor easy to extend for further .ui checking.  The
eventual script we plan to integrate is only about 300 lines of python.
I'm scared by the maintenance of the equivalent without using python and
lxml more than maintenance of building lxml.


I was more hoping that there might be an established plain Python option 
for XML processing?


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Stephan, Heiko, Michael M, Christian, Olivier, Miklos, Caolan
  Eike, Kendy, David, Kendy, Michael S, Jmux, Xisco, Thorsten

* Completed Action Items:

* Pending Action Items:
+ come up with a list of retiring committers to mail (Norbert)
+ go over the past budget ideas & cleanup as a base (Thorsten)

* Release Engineering update (Christian)
+ 6.0.2 - RC1 – tag Feb 2 0
+ will be done by Xisco later today
+ a 1 RC only release.
+ move back to normal branching further down the release.
+ problems with crash-reporter (Michael)
AI:  + do a branch on the tag (Christian)
+ 6.0 kill ? (Heiko)
+ on our download page – have access to 6.0
+ not sure it is a problem – hard to find (Cloph, Michael)
 + will disappear when builds go from the mirror directory.
+ 5.4.6 - RC1 tag Feb 27 next Tues. 
+ regular 2x RC schedule.
+ Android
+ roll out covers all users
+ crash reports looking much better
+ Online
+ should do a 6.0.2 RC1/final next week.

* Documentation (Olivier)
+ Catching up the help pages gap x features updates (ohallot, LaurentBP)
+ Published 3/8 Macro BASIC ref. cards (JF Nifenecker, ohallot)
   + written in French; now translated to English.
+ Resuming book review for Getting Started 6 (D. Barton, Jrodriguez, 
ohallot)
+ Please advise on https://gerrit.libreoffice.org/#/c/49914/
   + massive change, terminology: removing the word Runtime
   + is there a reason for that ? (Eike)
   + bothers the authors (Olivier)
   + “Runtime” doesn’t seem to be needed in text.
   + can we do this with a sed script across the translations ? 
(Michael)
   + yes, if only a script – but did translators translate it ? 
(Cloph)
   + if not – mostly tricky.
   + is “catagiries” in commit Categories in change? (Michael)
   + yes (Olivier)
AI:   + ask Sophie (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
250(250) (topicUI) bugs open, 322(322) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month3 months   12 months  
 added  6(-2)15(-6) 33(-4) 107(-9) 
 commented 49(8)196(-37)   474(-28)   2016(-48)
   removed  0(0)  0(0)   2(0)   14(-1) 
  resolved  3(1) 12(1)  44(-2) 192(-23)
+ top 10 contributors:
  Tietze, Heiko made 94 changes in 1 month, and 887 changes in 1 year
  Philips, Yousuf made 28 changes in 1 month, and 782 changes in 1 year
  Buovjaga made 22 changes in 1 month, and 220 changes in 1 year
  Xisco Faulí made 19 changes in 1 month, and 286 changes in 1 year
  Foote, V Stuart made 19 changes in 1 month, and 296 changes in 1 year
  Budea, Áron made 19 changes in 1 month, and 58 changes in 1 year
  Thomas Lendo made 19 changes in 1 month, and 433 changes in 1 year
  Thomas Linard made 18 changes in 1 month, and 65 changes in 1 year
  Dieter Praas made 15 changes in 1 month, and 89 changes in 1 year
  Telesto made 15 changes in 1 month, and 85 changes in 1 year

  + Easyhacking: How to set up your environment

https://design.blog.documentfoundation.org/2018/02/22/easyhacking-set-environment/
   + collection of links to the wiki: so people can install code and hack 
on it
   + first of a series Heiko plans on this
   + since some GSOC students don’t know how to do it.

  + Improvements to Font Listing
https://design.blog.documentfoundation.org/2018/02/18/improvements-font-listing/
   + outcome of design session last week
   + how to filter out un-interesting fonts in the font-name drop-down.
   + 3 options; poll in the blog – give your feedback to inform the devs
 ultimate decisions as they implement.

  + New backgrounds gallery theme in 6.1
   + Extensions for legacy bitmaps available
   + now can install the old background images via extensions.

* Crash Hunting (Caolan)
+ 0 (-1) import failure, 0(+0) export failures
+ good news.
+ 4(+0) coverity
+ ?? 45 fuzzers * 3 sanitizers+engine combos (asan+libfuzzer,
ubsan+libfuzzer, asan+afl), font parser last added
+ something wrong up-stream; not producing results.
+ unclear what changed; exception suggests no config files.
+ forcepoint – have been finding things in master
+ also in DLP libraries
+ finding some bits in filter-detection
+ lots of overlap between fuzzing & crash-testing & coverity
+ finding the same things.
+ added a fuzzer for PDF importing and finding bits in PDF export.

* Crash Reporter (Xisco)
+ http://crashreport.libreoffice.org/stats/version/5.3.7.2
+ 1004 (last 7 days) (down)
+ 

[Libreoffice-commits] core.git: helpcontent2

[Laurent BP]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 136dfa3fe0bc66c2e1708e3b420e5836b02af11f
Author: Laurent BP 
Date:   Sun Feb 18 21:51:33 2018 +0100

Updated core
Project: help  90671d8531b28cebf6129402932320a437cf4544

tdf#115831 Renaming of sheet

Renaming of sheets have the same constraints whatever
the file format used.

Max number of sheets is 10,000. See tdf#3

File modified with HelpAuthoring

Change-Id: Iff4ecdea6cdfede9844475eaac31c27c9d903a3d
Reviewed-on: https://gerrit.libreoffice.org/49949
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index e256ca7d98c9..90671d8531b2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e256ca7d98c9e4da4e14bd405e648edf394a56c4
+Subproject commit 90671d8531b28cebf6129402932320a437cf4544
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Laurent BP]

 source/text/scalc/guide/rename_table.xhp |  142 +++
 1 file changed, 73 insertions(+), 69 deletions(-)

New commits:
commit 90671d8531b28cebf6129402932320a437cf4544
Author: Laurent BP 
Date:   Sun Feb 18 21:51:33 2018 +0100

tdf#115831 Renaming of sheet

Renaming of sheets have the same constraints whatever
the file format used.

Max number of sheets is 10,000. See tdf#3

File modified with HelpAuthoring

Change-Id: Iff4ecdea6cdfede9844475eaac31c27c9d903a3d
Reviewed-on: https://gerrit.libreoffice.org/49949
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/source/text/scalc/guide/rename_table.xhp 
b/source/text/scalc/guide/rename_table.xhp
index 8a18900cf..c750ca40a 100644
--- a/source/text/scalc/guide/rename_table.xhp
+++ b/source/text/scalc/guide/rename_table.xhp
@@ -1,6 +1,5 @@
 
 
-   
 
- 
-   
+-->
+
 
-  
- Renaming Sheets
- /text/scalc/guide/rename_table.xhp
-  
-   
-   
-renaming;sheets
-  sheet tabs;renaming
-  tables;renaming
-  names; sheets
-mw made "renaming sheets" a two level entry.
-Renaming 
Sheets
-
-  
- 
-Click the name of the sheet that you want to change.
- 
- 
-Open the context menu and choose the Rename Sheet 
command. A dialog box appears where you can enter a new name.
- 
- 
-Enter a new name for the sheet and click 
OK.
- 
- 
-Alternatively, hold down the Option key
+  
+Renaming Sheets
+/text/scalc/guide/rename_table.xhp
+  
+
+
+
+
+
+  renaming;sheets
+  sheet tabs;renaming
+  tables;renaming
+  names; sheets
+
+mw made "renaming sheets" a two level entry.
+
+Renaming 
Sheets 
+
+
+  
+Click the 
name of the sheet that you want to change.
+  
+  
+Open the 
context menu and choose the Rename Sheet command. A dialog box 
appears where you can enter a new name.
+  
+  
+Enter a new 
name for the sheet and click OK.
+  
+  
+Alternatively, hold down the Option key 
 Alt key and click 
on any sheet name and enter the new name directly.
-
- 
-  
-  Sheet names can contain almost any character. Some naming 
restrictions apply when you want to save the spreadsheet to Microsoft Excel 
format.
-  When saving to Microsoft Excel format, the following 
characters are not allowed in sheet names:
-  
- 
-colon :
- 
- 
-back slash \
- 
- 
-forward slash /
- 
- 
-question mark ?
- 
- 
-asterisk *
- 
- 
-left square bracket [
- 
- 
-right square bracket ]
- 
- 
-single quote ' as the first or last character of the 
name
- 
-  
-  In cell references, a sheet name has to be enclosed in single 
quotes ' if the name contains other characters than alphanumeric or underscore. 
A single quote contained within a name has to be escaped by doubling it (two 
single quotes). For example, you want to reference the cell A1 on a sheet with 
the following name:
-  This year's sheet
-  The reference must be enclosed in single quotes, and the one 
single quote inside the name must be doubled:
-  'This year''s sheet'.A1
-  The name 
of a sheet is independent of the name of the spreadsheet. You enter the 
spreadsheet name when you save it for the first time as a file. The document 
can contain up to 256 individual sheets, which can have different 
names.
-  
- 
-  
-   
+
+  
+
+Sheet 
names can contain almost any character. Some naming restrictions apply, the 
following characters are not allowed in sheet names:
+
+
+  
+colon :
+  
+  
+back slash \
+  
+  
+forward slash /
+  
+  
+question mark ?
+  
+  
+asterisk *
+  
+  
+left square bracket [
+  
+  
+right square bracket ]
+  
+  
+single quote ' as the first or last character of the 
name
+  
+In 
cell references, a sheet name has to be enclosed in single quotes ' if the name 
contains other characters than alphanumeric or underscore. A single quote 
contained within a name has to be escaped by doubling it (two single quotes). 
For example, you want to reference the cell A1 on a sheet with the following 
name:
+This 
year's sheet
+The 
reference must be enclosed in single quotes, and the one single quote inside 
the name must be doubled:
+'This 
year''s sheet'.A1
+The name of a 
sheet is independent of the name of the spreadsheet. You enter the spreadsheet 
name when you save it for the first time as a file. The document can contain up 
to 10,000 individual sheets, which can have different names.
+
+
+
+
+
+
 

[Libreoffice-commits] core.git: Changes to 'libreoffice-6-0-1'

[Christian Lohmaier]

New branch 'libreoffice-6-0-1' available with the following commits:
commit 8b911f0db1b245295711b5201c8aaea42fad4db1
Author: Christian Lohmaier 
Date:   Thu Feb 22 16:41:53 2018 +0100

Branch libreoffice-6-0-1

This is 'libreoffice-6-0-1' - the stable branch for the 6.0.1 release.

Change-Id: I73c6ff992a9cf02f62f7ab68d6d0b23fb1f5b45d

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Invoking gla11y [was: core.git: bin/gla11y config_host.mk.in configure.ac solenv/gbuild]

[Samuel Thibault]

Stephan Bergmann, on jeu. 22 févr. 2018 18:03:28 +0100, wrote:
> Does that make sense?

Yes, thanks for making these clear :)

Samuel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - configure.ac

[Xisco Fauli]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0de921a90343a7b35612fdf85ae69657f1eefe82
Author: Xisco Fauli 
Date:   Thu Feb 22 18:34:23 2018 +0100

bump product version to 6.0.3.0.0+

Change-Id: Ia3299fda6e1639e21b21030b2f4b1cf6506956ae

diff --git a/configure.ac b/configure.ac
index dcba0de5d5b1..289cf2911c93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.3.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-6-0-2'

[Xisco Fauli]

New branch 'libreoffice-6-0-2' available with the following commits:
commit 38bcd7a89c6ae0e9f64fa25cf6620bbb140ca88a
Author: Xisco Fauli 
Date:   Thu Feb 22 18:28:26 2018 +0100

Branch libreoffice-6-0-2

This is 'libreoffice-6-0-2' - the stable branch for the 6.0.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.0.x release,
please use the 'libreoffice-6-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I5af299610d96df788695c84809a7e25c64b4ffb9

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-2' - configure.ac

[Xisco Fauli]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7707c5f842de27c9f33f65b6641d88a3abdb7e2b
Author: Xisco Fauli 
Date:   Thu Feb 22 18:45:41 2018 +0100

bump product version to 6.0.2.1.0+

Change-Id: I497c530fff78ffaf2b545a1acf7eae30134f3b04

diff --git a/configure.ac b/configure.ac
index dcba0de5d5b1..bb8c7ca3ded3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.2.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.0.2.1'

[Xisco Fauli]

Tag 'libreoffice-6.0.2.1' created by Xisco Fauli  
at 2018-02-22 17:43 +

Tag libreoffice-6.0.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJajwE8AAoJEPQ0oe+v7q6j2jIP/0avKkp6grmGm8451DN5Ojuw
SBDxl4JVeFl57dlLjYR2v5487jl8332ezdmont5eShBwR8az6Px+oa5PcR9xv1Qk
it7wLO5epnnVYiBihSqUwWBbgN5Nk3nncLoPRaIr3hea4tTU1gu8VIU84sAZVqSI
sTQgC6TomLLsaO2y0LAbyFdq+mmFj6VJ+G4OR+xY2H2IpmqzWPj5Q71dx/zpGJqu
O+2rHoVf5GAUDyvxXpGwkNVpWQmhTXd+/mft7fpFWtYNNuWwDd1Vfs0NrWEheAIX
0oAh1iuXoXOZnRSeee1wdIAIlGgT4D+GWVwsu5rS5xEUfydooh5zBNDbd08rvGPa
0mELYSkv4If/mMsiQNT6YlA8DL4BdPo/gD8IoanCALAonvz2entXK+jLYjfW8wQ9
QXuMY9Vj73KcEk0XXj6kWxbPSfh7LmINO39VZEQV+WMFi801N211i4NcY+fiWnrQ
1LobKjSTmtIFp9kKXoywbvFhHRUcj4Hrkq1Oo33QNYQv7riYwyBK1A6o1YD10B5s
6vKkZvUm+Qhw+jCXzZ6agkTv85JzoROd1zyg5SGd9kFxXDcWB/83wCy+DeK+8g7b
CFaJ0hxmSx34/ZyubAVkzyC0nG+vhu3xQeD8d/4l8tO063ThjH1db3Ugrrw+yUND
Dcws3NEQEyWSi/lE6yBs
=Uw/b
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-21:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.0.2.1'

[Xisco Fauli]

Tag 'libreoffice-6.0.2.1' created by Xisco Fauli  
at 2018-02-22 17:43 +

Tag libreoffice-6.0.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJajwE8AAoJEPQ0oe+v7q6jSl8P/25hLKYHc3TuH2a7ndWUx/TP
ZWrgziaLtb/d82+rffYZBLY+WRlg/gStr/pCZX7lYvmMEdGHmWnu+2/ECAwEOPNI
+m8A8/FmKBjQOJRp/FERvn/ylLXDzLSrlpNLT9jBUGYg/cHN2OFSAvBVIQhude1k
2qhiKOwhUmhSZrUxr4jV7d2hlmSFOczaQF5zU3EdvshTUwhSetv9I/ky3Sij+zsp
/wSYdAsniusCXQD275upsUlNn0tulzGmS0W7y6XhTvDFtWfLvKRwIUZ/ci3xYDJo
tIE8KpZbf+ML03hTwIpStw1lm+GDu70gs9CByN99yHr5C6x8xlTd4/kSrdJ+p/+0
jc9r5Ts8o2DjiuYSrfBsADcVEv1CwPEuArGqeJq5pmB7h+e1u1fX5xDFP00DKiBX
oQDPqpp7RZt3YRvCELJXTqMFn+tGucOofaVYYjQc2B7qgyqxNPXcunczuAGpVUVO
7EwfbiWsQ2ojLevXWW3GQn9exonya5bmNSGzIUW/++NNz71BBLc2uCNGO6hjznYS
hcmZJKdNtQlIiTgB0EObMs87r/DJEddak7lQNcTiS4rr5PDWnVtVxIyjngJEdAlI
UP2s7mo6U7SsUDy6eNf/9l+ldCDFjgSDr6uGnlNW44fLBtftrSE11QUao6amqUvn
GcNhekZJTv2UKYFTd+vg
=2f7L
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-652:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.0.2.1'

[Xisco Fauli]

Tag 'libreoffice-6.0.2.1' created by Xisco Fauli  
at 2018-02-22 17:43 +

Tag libreoffice-6.0.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJajwE4AAoJEPQ0oe+v7q6jOkQQAJCJqdMuIgnuk0PDZIplUS3q
jgbHBgdWf79vdRo24z7SMoR0PhFYmdVawZp84+UyOqF/qcXGOU8BKoogffuwnp/2
BSnOZyp5gcxQiyQYfTdKYPx90ARhQso+jKEiAGqWEtJ+Osf0LJi0GThzSNwVTsH/
ZwRUf33ry5jznc0ZPIZDX42jacdN4Lg5SCGcsrExy7K4EglsnjMU59+ZtHZ3P8U/
LxcQekF+DdvoT9wzvdAOqhREpothXexGNe1JzRo+DxZsnLJN1R0dnhQq0aiszsCZ
L95M3zkYP4zJhuJXyw3/gftgxiWcc6gYdNZCi7Ia79T2KjPgsIAh4PLlkoz5e5cR
amopq0czbz7C4lx/AxQPvcsdq0T13DzhRZ7PTyJYGZPVaFByz+NwpZ1wZKkRN8EL
8SVozEPTTa2c19/2Lyuw1xw6g8wmZZF+Z+ceQt0zlfbMTp0fcFMHKcRKrN3f3RPx
zDfvHSsrVHLRJZP7/zXEgHpaJoPWFM5YThWG5bObvGgDrJi53wlUnZ2i7XQmvilX
OQfzMhu4xaSIJnHWqN6G6L5c/73mqfY6D1LPJEQY9irE82bx46T1xsUewo+r1GQm
Hz4PJSWL+RPYQZx02awc36YEZ2uCdZblf4/DrWbKKhXheARt4cQiVI1ENWWmWx7H
3dTk6Q+Bco5fI/B+BO+G
=An+3
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.0.2.1'

[Xisco Fauli]

Tag 'libreoffice-6.0.2.1' created by Xisco Fauli  
at 2018-02-22 17:43 +

Tag libreoffice-6.0.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJajwE8AAoJEPQ0oe+v7q6jiS8P/3UDiBiwdLthO8JcxqopfEiP
wSpy30bb9MX229r7RX/2XLMvp34GeiRHQi6nCNEjPpPPjBIB5U0nA5wR5HA8ka2F
2MGOp8b4uunYQ/5UFtdTnScpfiLgPabexBT7GJCtqZXkB6tQ/XUCwx6NbZMTY8MA
6KGX56TY6xs7ExnfXgOFziTTLRkzuS0rA8N1XzyZyJ90kKSEGjLn5tnSso53L989
MoDYsWXU6Ewtck6/gJKgaSyzAViLE+PPfMji8Igu4bymZSWmH1M3wsamR3XfrWNA
4kyYXwfRcrDxbtgC1FoWFfeFMSs/6EkIcGJ8vnNIy1Dki6qs+6BHLsQuRfbixWFv
j63qVAKCoA38FX6VQpSuaRHF+Wzd9mDeYvOwCpHjE0vzRylndp0WN6yUC3OeR6hI
E1Ad0ngw0ba1Frc/U3t81eJ/AkwdRLP3x5x5i6IUohsjG0c18++Hnh7eI7lk1qHN
dOaUxcCCbq9p2tN7DRe7hPmcjthVFXbbrfa0T+10bmvgAsRUJoj0JCOluM/ErUKw
0+6wPkMa9oH+GGFR/c35Es6ZYcH3rvJVTKEMGSShHfDsAWKnGXGU3xwTICibnwbu
dRGZpdAzj3eePmrUBFZar1pb7B9osFOlVWOqHdecorgDntX435BxAh54amSwjSgE
ueNGTVjFcW5jq92lpxnR
=2rK0
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-41:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/npm-shrinkwrap.json loleaflet/package.json

[Samuel Mehrbrodt]

 loleaflet/npm-shrinkwrap.json | 3293 --
 loleaflet/package.json|   11 
 2 files changed, 1914 insertions(+), 1390 deletions(-)

New commits:
commit 37e7e953043e8aecf7941a54d530d319dbefc119
Author: Samuel Mehrbrodt 
Date:   Thu Feb 22 16:23:55 2018 +0100

NPM Shrinkwrap: Upgrade to new format (v5)

Should be backwards compatible with npm 2,3 and 4

Change-Id: Ie40f39af4b6fb618916df33d9cdd2fc62e4bc592
Reviewed-on: https://gerrit.libreoffice.org/50191
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/npm-shrinkwrap.json b/loleaflet/npm-shrinkwrap.json
index 8c8d46ae..ffeb9e14 100644
--- a/loleaflet/npm-shrinkwrap.json
+++ b/loleaflet/npm-shrinkwrap.json
@@ -1,243 +1,363 @@
 {
   "name": "loleaflet",
   "version": "0.8.0-dev",
+  "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
 "autolinker": {
   "version": "1.4.3",
-  "from": "autolinker@latest",
-  "resolved": "./node_shrinkwrap/autolinker-1.4.3.tgz",
+  "resolved": 
"https://registry.npmjs.org/autolinker/-/autolinker-1.4.3.tgz;,
+  "integrity": "sha1-LmFQV8jjcTmabXeUmppq8k/kbfw=",
   "dev": true
 },
 "bootstrap": {
-  "version": "3.3.6",
-  "from": "node_shrinkwrap/bootstrap-3.3.6.tgz",
-  "resolved": "./node_shrinkwrap/bootstrap-3.3.6.tgz",
+  "version": "file:node_shrinkwrap/bootstrap-3.3.6.tgz",
+  "integrity": 
"sha512-XC+LTYJoVYHIalmjNcznwlZHY+YLhMJ9NPs8M2aEweugK7wMrto3h79POn7O5Vj/woDU/tjzmjyUbAd1HzSXIw==",
   "dev": true
 },
 "browserify": {
-  "version": "13.1.0",
-  "from": "node_shrinkwrap/browserify-13.1.0.tgz",
-  "resolved": "./node_shrinkwrap/browserify-13.1.0.tgz",
+  "version": "file:node_shrinkwrap/browserify-13.1.0.tgz",
+  "integrity": 
"sha512-i5iASp425UxqX6nhOfsxJVLmm+GKvPcapI8RsPixFSNQQbSbrZsYYLzPK1amobpeOuDF7nJDq/upZYkmw/C59w==",
   "dev": true,
+  "requires": {
+"JSONStream": "file:node_shrinkwrap/JSONStream-1.1.4.tgz",
+"assert": "file:node_shrinkwrap/assert-1.3.0.tgz",
+"browser-pack": "file:node_shrinkwrap/browser-pack-6.0.1.tgz",
+"browser-resolve": "file:node_shrinkwrap/browser-resolve-1.11.2.tgz",
+"browserify-zlib": "file:node_shrinkwrap/browserify-zlib-0.1.4.tgz",
+"buffer": "file:node_shrinkwrap/buffer-4.7.1.tgz",
+"concat-stream": "file:node_shrinkwrap/concat-stream-1.5.1.tgz",
+"console-browserify": 
"file:node_shrinkwrap/console-browserify-1.1.0.tgz",
+"constants-browserify": 
"file:node_shrinkwrap/constants-browserify-1.0.0.tgz",
+"crypto-browserify": 
"file:node_shrinkwrap/crypto-browserify-3.11.0.tgz",
+"defined": "file:node_shrinkwrap/defined-1.0.0.tgz",
+"deps-sort": "file:node_shrinkwrap/deps-sort-2.0.0.tgz",
+"domain-browser": "file:node_shrinkwrap/domain-browser-1.1.7.tgz",
+"duplexer2": "file:node_shrinkwrap/duplexer2-0.1.4.tgz",
+"events": "file:node_shrinkwrap/events-1.1.1.tgz",
+"glob": "file:node_shrinkwrap/glob-5.0.15.tgz",
+"has": "file:node_shrinkwrap/has-1.0.1.tgz",
+"htmlescape": "file:node_shrinkwrap/htmlescape-1.1.1.tgz",
+"https-browserify": "file:node_shrinkwrap/https-browserify-0.0.1.tgz",
+"inherits": "file:node_shrinkwrap/inherits-2.0.1.tgz",
+"insert-module-globals": 
"file:node_shrinkwrap/insert-module-globals-7.0.1.tgz",
+"labeled-stream-splicer": 
"file:node_shrinkwrap/labeled-stream-splicer-2.0.0.tgz",
+"module-deps": "file:node_shrinkwrap/module-deps-4.0.7.tgz",
+"os-browserify": "file:node_shrinkwrap/os-browserify-0.1.2.tgz",
+"parents": "file:node_shrinkwrap/parents-1.0.1.tgz",
+"path-browserify": "file:node_shrinkwrap/path-browserify-0.0.0.tgz",
+"process": "file:node_shrinkwrap/process-0.11.7.tgz",
+"punycode": "file:node_shrinkwrap/punycode-1.4.1.tgz",
+"querystring-es3": "file:node_shrinkwrap/querystring-es3-0.2.1.tgz",
+"read-only-stream": "file:node_shrinkwrap/read-only-stream-2.0.0.tgz",
+"readable-stream": "file:node_shrinkwrap/readable-stream-2.1.4.tgz",
+"resolve": "file:node_shrinkwrap/resolve-1.1.7.tgz",
+"shasum": "file:node_shrinkwrap/shasum-1.0.2.tgz",
+"shell-quote": "file:node_shrinkwrap/shell-quote-1.6.1.tgz",
+"stream-browserify": 
"file:node_shrinkwrap/stream-browserify-2.0.1.tgz",
+"stream-http": "file:node_shrinkwrap/stream-http-2.3.1.tgz",
+"string_decoder": "file:node_shrinkwrap/string_decoder-0.10.31.tgz",
+"subarg": "file:node_shrinkwrap/subarg-1.0.0.tgz",
+"syntax-error": "file:node_shrinkwrap/syntax-error-1.1.6.tgz",
+"through2": "file:node_shrinkwrap/through2-2.0.1.tgz",
+"timers-browserify": 
"file:node_shrinkwrap/timers-browserify-1.4.2.tgz",
+

[Libreoffice-commits] core.git: include/svx include/vcl sc/source sw/source

[Stephan Bergmann]

 include/svx/sidebar/AreaTransparencyGradientPopup.hxx |1 +
 include/vcl/syswin.hxx|2 --
 sc/source/ui/inc/navipi.hxx   |1 +
 sw/source/uibase/inc/convert.hxx  |1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1888a602001c74b7da7e9c99cb78c9246714d8be
Author: Stephan Bergmann 
Date:   Thu Feb 22 09:13:25 2018 +0100

Remove unused forward declarations from vcl/syswin.hxx

Change-Id: Ide4990afa32ba4cc7851d0e7d3d8d1247eb27b3b
Reviewed-on: https://gerrit.libreoffice.org/50155
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx 
b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
index 5f23aa4b06ed..4004a0041267 100644
--- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
+++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 
+class VclContainer;
 class XFillFloatTransparenceItem;
 
 namespace svx { namespace sidebar {
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 625143ebec6b..4a2088114fc6 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -28,11 +28,9 @@
 #include 
 #include 
 
-class ModalDialog;
 class MenuBar;
 class NotebookBar;
 class TaskPaneList;
-class VclContainer;
 
 #define ICON_LO_DEFAULT 1
 #define ICON_TEXT_DOCUMENT  2
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index dc62b5080d9f..1ee61b41a355 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -40,6 +40,7 @@ class ScNavigatorControllerItem;
 class ScNavigatorDialogWrapper;
 class ScNavigatorDlg;
 class ScNavigatorSettings;
+class VclContainer;
 
 #define SC_DROPMODE_URL 0
 #define SC_DROPMODE_LINK1
diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx
index bb4177b976ce..faf7521a68d4 100644
--- a/sw/source/uibase/inc/convert.hxx
+++ b/sw/source/uibase/inc/convert.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 
+class VclContainer;
 class SwTableAutoFormat;
 class SwView;
 class SwWrtShell;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-6-0-2'

[Xisco Fauli]

New branch 'libreoffice-6-0-2' available with the following commits:
commit 56a4ef0f210c057a3b011d248429e7ec8728d609
Author: Xisco Fauli 
Date:   Thu Feb 22 18:27:31 2018 +0100

Branch libreoffice-6-0-2

This is 'libreoffice-6-0-2' - the stable branch for the 6.0.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.0.x release,
please use the 'libreoffice-6-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I6c8ef3414b28a0b41a35f984fbc207bdf1c8a932

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: bin/gla11y config_host.mk.in configure.ac solenv/gbuild

[Stephan Bergmann]

On 22.02.2018 13:54, Samuel Thibault wrote:

Miklos Vajna, on jeu. 22 févr. 2018 09:53:43 +0100, wrote:

On Wed, Feb 21, 2018 at 10:11:18AM +0100, Samuel Thibault  
wrote:

Rene Engelhard, on mer. 21 févr. 2018 10:02:08 +0100, wrote:

OK, thanks - and then I wonder why this is ran in "normal" UIConfig targets and
not only in make check...

For the "error" cases (-W none), it makes sense:

« Add to the build process error checking (only the hard errors such as
bogus target names). »

That's really the kind of issues one should get as soon as compilation
time.

Later on I'll add a call in "make check" time for the warnings.


For source code we have warnings for these linter type problems


Err, these are not just "linter type problems". They are undefined
references, just like undefined C references. So the failure belongs to
compilation time. If somebody modifies a .ui file in a way that gets
such undefined reference, compilation itself should really fail, just
like it does when a variable defintion is missing.

The "make check" warnings I mentioned above are *other* kinds of issues,
which would indeed only be tested within make check, made warnings by
default, and turned into errors by Jenkins.


I don't understand the "turned into errors by Jenkins" part.  How would 
that be done?


(And `make check` should ideally be "silent".  We do not want it to 
produce any non-fatal warnings.)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] translations.git: Changes to 'libreoffice-6-0-1'

[Christian Lohmaier]

New branch 'libreoffice-6-0-1' available with the following commits:
commit ad5f6de64bdf8a336d353457d92e72d86be703df
Author: Christian Lohmaier 
Date:   Thu Feb 22 16:41:29 2018 +0100

Branch libreoffice-6-0-1

This is 'libreoffice-6-0-1' - the stable branch for the 6.0.1 release.

Change-Id: Id4e01b957f00409dd6908c4666f2f1870d1a373c

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-6-0-1'

[Christian Lohmaier]

New branch 'libreoffice-6-0-1' available with the following commits:
commit 27780c9241d13cdb17b39bb73634629085022cc0
Author: Christian Lohmaier 
Date:   Thu Feb 22 16:41:29 2018 +0100

Branch libreoffice-6-0-1

This is 'libreoffice-6-0-1' - the stable branch for the 6.0.1 release.

Change-Id: Ib7b425b34fc931d1f6925994fa63bfafeb687bbf

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-6-0-1'

[Christian Lohmaier]

New branch 'libreoffice-6-0-1' available with the following commits:
commit b13dd7e58817c6bce2f1c28abf212ee813ed9d67
Author: Christian Lohmaier 
Date:   Thu Feb 22 16:41:29 2018 +0100

Branch libreoffice-6-0-1

This is 'libreoffice-6-0-1' - the stable branch for the 6.0.1 release.

Change-Id: I982873cd5f22f8aa69b230ab90643426af97

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Invoking gla11y [was: core.git: bin/gla11y config_host.mk.in configure.ac solenv/gbuild]

[Samuel Thibault]

Stephan Bergmann, on jeu. 22 févr. 2018 16:43:37 +0100, wrote:
> On 22.02.2018 13:54, Samuel Thibault wrote:
> > Miklos Vajna, on jeu. 22 févr. 2018 09:53:43 +0100, wrote:
> > > On Wed, Feb 21, 2018 at 10:11:18AM +0100, Samuel Thibault 
> > >  wrote:
> > > > Rene Engelhard, on mer. 21 févr. 2018 10:02:08 +0100, wrote:
> > > > > OK, thanks - and then I wonder why this is ran in "normal" UIConfig 
> > > > > targets and
> > > > > not only in make check...
> > > > For the "error" cases (-W none), it makes sense:
> > > > 
> > > > « Add to the build process error checking (only the hard errors such as
> > > > bogus target names). »
> > > > 
> > > > That's really the kind of issues one should get as soon as compilation
> > > > time.
> > > > 
> > > > Later on I'll add a call in "make check" time for the warnings.
> > > 
> > > For source code we have warnings for these linter type problems
> > 
> > Err, these are not just "linter type problems". They are undefined
> > references, just like undefined C references. So the failure belongs to
> > compilation time. If somebody modifies a .ui file in a way that gets
> > such undefined reference, compilation itself should really fail, just
> > like it does when a variable defintion is missing.
> > 
> > The "make check" warnings I mentioned above are *other* kinds of issues,
> > which would indeed only be tested within make check, made warnings by
> > default, and turned into errors by Jenkins.
> 
> I don't understand the "turned into errors by Jenkins" part.  How would that
> be done?
> 
> (And `make check` should ideally be "silent".  We do not want it to produce
> any non-fatal warnings.)

Well, perhaps I didn't understand what Miklos meant, then.

Miklos Vajna, on jeu. 22 févr. 2018 09:53:43 +0100, wrote:
> For source code we have warnings for these linter type problems and then
> --enable-werror (Jenkins uses it) turns those warnings into errors.
> 
> Probably the best would be if the .ui checker would follow the same
> pattern, instead of running it twice during 'make check' (which is a
> superset of 'make').

What I had understood from that was that at "make" time there are only
compiler errors, and at "make check" time there are linter warnings, and
in Jenkins, --enable-werror is used to turn these warnings into errors.

Now that I re-read it with what you said, I understand that

- at "make" time there are some compiler warnings which are turned into
errors in Jenkins with --enable-werror
- Miklos suggested that we only call gla11y at "make" time, and not a
second time at "make check" time.

I'm fine with emitting accessibility warnings at "make" time and let
Jenkins turning them into errors, I just thought from the discussions at
FOSDEM that they should be done at "make check" time.

Samuel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[Thorsten Behrens]

Michael Meeks wrote:
> + go over the past budget ideas & cleanup as a base (Thorsten)
> 
First round done - see:

> * Budgeting (Thorsten)
> + collecting other wish-lists – cross-check with GSoC ideas
> + current ideas 
> list:https://wiki.documentfoundation.org/Development/Budget2018
> 
If people could please double-check that list & remove things that are
done or obsolete - and then we probably want to clone useful ideas to
the gsoc page (and vice versa).

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Non-portable configure.ac

[Jan-Marek Glogowski]

Am 22.02.2018 um 18:36 schrieb Sander Maijers:
> Note that checkbashisms 2.17.12-1 failed to catch this when I debugged
> this issue.
> 
> https://www.archlinux.org/packages/community/any/checkbashisms/
> 
> Also note that on Arch Linux, I used dash 0.5.9.1-1, whereas Debian only
> has various older versions
> 
> https://packages.debian.org/search?keywords=dash
> 
> Running shellcheck and checkbashisms regularly is advisable even for
> autoconf generated scripts.

On my Ubuntu I also have sh -> dash. But I guess, like most people, I
use autogen.sh to run configure with flags from autogen.input.

And autogen.sh is really a Perl script, and Perls system call runs
configure by calling "bash ./configure …". That's probably why nobody
caught this yet. Now I have no idea why Perls system function uses bash
as shell…

Jan-Marek
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loleaflet/dist

[Samuel Mehrbrodt]

 loleaflet/dist/errormessages.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 08ee839562c4f2e62570c9cecdbc0a6d3ce99b2f
Author: Samuel Mehrbrodt 
Date:   Thu Feb 22 14:50:26 2018 +0100

Improve message displayed when limit reached

Change-Id: I659d3e5156bc4ae8e6b30a7fd9f9957dd1a868ec
Reviewed-on: https://gerrit.libreoffice.org/50179
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index 36937c06..bdad9bb9 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -1,6 +1,6 @@
 exports.diskfull = _('No disk space left on server, please contact the server 
administrator to continue.');
 exports.emptyhosturl = _('The host URL is empty. The loolwsd server is 
probably misconfigured, please contact the administrator.');
-exports.limitreached = _('This is an unsupported version of {productname}. To 
avoid the impression that it is suitable for deployment in enterprises, this 
version is limited to {docs} documents, and {connections} connections.');
+exports.limitreached = _('This is an unsupported version of {productname}. To 
avoid the impression that it is suitable for deployment in enterprises, this 
message appears when more than {docs} documents or {connections} connections 
are in use concurrently');
 exports.infoandsupport = _('More information and support');
 exports.limitreachedprod = _('This service is limited to %0 documents, and %1 
connections total by the admin. This limit has been reached. Please try again 
later.');
 exports.serviceunavailable = _('Service is unavailable. Please try again later 
and report to your administrator if the issue persists.');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Mike Kaganski]

 sfx2/source/dialog/tabdlg.cxx |   43 +-
 1 file changed, 14 insertions(+), 29 deletions(-)

New commits:
commit d4b4f5f1f4e452cb9f4a0e202b57c0a8610c1cad
Author: Mike Kaganski 
Date:   Thu Feb 22 11:45:24 2018 +0100

Remove useless special handling of single-value ranges

... as they are treated by generic code just fine.
A check added to guard against overflow (0x + 1 -> 0).

Change-Id: Ibef85191eab82002981e12f83f313f3d122da74c
Reviewed-on: https://gerrit.libreoffice.org/50163
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 22d03b7073af..f6fd5f90299f 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -994,41 +994,26 @@ IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl, Button*, void)
 {
 const sal_uInt16* pU = pTmpRanges + 1;
 
-if ( *pTmpRanges == *pU )
+// Correct Range with multiple values
+sal_uInt16 nTmp = *pTmpRanges, nTmpEnd = *pU;
+DBG_ASSERT( nTmp <= nTmpEnd, "Range is sorted the wrong way" );
+
+if ( nTmp > nTmpEnd )
+{
+// If really sorted wrongly, then set new
+std::swap(nTmp, nTmpEnd);
+}
+
+while ( nTmp && nTmp <= nTmpEnd ) // guard against overflow
 {
-// Range which two identical values -> only set one Item
-sal_uInt16 nWh = pPool->GetWhich( *pTmpRanges );
+// Iterate over the Range and set the Items
+sal_uInt16 nWh = pPool->GetWhich( nTmp );
 m_pExampleSet->ClearItem( nWh );
 aTmpSet.ClearItem( nWh );
 // At the Outset of InvalidateItem,
 // so that the change takes effect
 m_pOutSet->InvalidateItem( nWh );
-}
-else
-{
-// Correct Range with multiple values
-sal_uInt16 nTmp = *pTmpRanges, nTmpEnd = *pU;
-DBG_ASSERT( nTmp <= nTmpEnd, "Range is sorted the wrong way" );
-
-if ( nTmp > nTmpEnd )
-{
-// If really sorted wrongly, then set new
-sal_uInt16 nTmp1 = nTmp;
-nTmp = nTmpEnd;
-nTmpEnd = nTmp1;
-}
-
-while ( nTmp <= nTmpEnd )
-{
-// Iterate over the Range and set the Items
-sal_uInt16 nWh = pPool->GetWhich( nTmp );
-m_pExampleSet->ClearItem( nWh );
-aTmpSet.ClearItem( nWh );
-// At the Outset of InvalidateItem,
-// so that the change takes effect
-m_pOutSet->InvalidateItem( nWh );
-nTmp++;
-}
+nTmp++;
 }
 // Go to the next pair
 pTmpRanges += 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-6-0-2'

[Xisco Fauli]

New branch 'libreoffice-6-0-2' available with the following commits:
commit bbd8b54e3c79f8ac17248ee5d633d7199d720b8f
Author: Xisco Fauli 
Date:   Thu Feb 22 18:27:32 2018 +0100

Branch libreoffice-6-0-2

This is 'libreoffice-6-0-2' - the stable branch for the 6.0.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.0.x release,
please use the 'libreoffice-6-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I4341e528dcaf846a38378f35fe979496a466d8e9

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-6-0-2'

[Xisco Fauli]

New branch 'libreoffice-6-0-2' available with the following commits:
commit 00d890565744475637cd3f40f44fe01c199c2616
Author: Xisco Fauli 
Date:   Thu Feb 22 18:27:31 2018 +0100

Branch libreoffice-6-0-2

This is 'libreoffice-6-0-2' - the stable branch for the 6.0.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.0.x release,
please use the 'libreoffice-6-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Idb586ec6b186507ec2ef1edf0c68667d5d114241

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing accessibility non-regression check tool

[Samuel Thibault]

Michael Stahl, on jeu. 22 févr. 2018 16:59:21 +0100, wrote:
> On 22.02.2018 16:36, Stephan Bergmann wrote:
> > I was more hoping that there might be an established plain Python option 
> > for XML processing?
> 
> FWIW, there is at least xml.etree.ElementTree and xml.dom.minidom in the
> CPython bundled libs.
> 
> https://docs.python.org/3/library/xml.etree.elementtree.html
> https://docs.python.org/3/library/xml.dom.minidom.html

An issue with these is that they do not keep source line numbers of the
nodes.  That's really concerning for providing useful information to
the programmer.  We will be bothering them with new warnings that they
will have to learn about ; if we don't provide with line numbers, they
will get rightfully angry :) We could fallback to only providing the
class and id of the suspected widget. In some cases we have seen no id
defined, and thus no pointer to give to the programmer.

Samuel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

[Rico Tzschichholz]

 solenv/gbuild/extensions/post_PackageInfo.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e27c67107d128d1421e2c09d81c99f43ad0d45a4
Author: Rico Tzschichholz 
Date:   Thu Feb 22 14:21:50 2018 +0100

solenv: Update gb_PackageInfo_emit_l10n_for_one_lang

Add cjk_*, ctl_* and ctlseqcheck_$LANG.xcd files to install list

Change-Id: I2c56cf2af3cc444cb7075740a981b6954950e5f5
Reviewed-on: https://gerrit.libreoffice.org/50181
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index 1abd6e241d9f..331eeb89e194 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -69,6 +69,9 @@ define gb_PackageInfo_emit_l10n_for_one_lang
 $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst 
%/,%,$(gb_AllLangPackage_ALLDIRS)),$(call 
gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1
 $(if $(filter $(gb_AllLangMoTarget_LANGS),$(1)),$(foreach 
target,$(gb_AllLangMoTarget_REGISTERED),$(call 
gb_PackageInfo_emit_l10n_for_one_mo,$(target),$(1
 $(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- 
res/fcfg_langpack_ res/registry_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CJK_LANGS),$(1)),$(foreach configfile,cjk_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CTL_LANGS),$(1)),$(foreach configfile,ctl_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CTLSEQCHECK_LANGS),$(1)),$(foreach 
configfile,ctlseqcheck_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
 @echo "$(foreach suf,executables libraries 
files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf)) \\" >> 
$(WORKDIR)/Dep/packageinfo.d
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits