date:20171213

 solenv/clang-format/blacklist |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f988c1b36454445a503f6d2c1d8dd52f902fcf0e
Author: Stephan Bergmann 
Date:   Thu Dec 14 07:57:23 2017 +0100

Add wrongly formatted new file to blacklist

Change-Id: I56963d2eb273fdb0db375af54186e8a3b01b06a1

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 202f3ecfde84..78474fa8e961 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7820,6 +7820,7 @@ include/tools/resary.hxx
 include/tools/solar.h
 include/tools/stream.hxx
 include/tools/svborder.hxx
+include/tools/svlibrary.h
 include/tools/tenccvt.hxx
 include/tools/time.hxx
 include/tools/toolsdllapi.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/source/app/svmain.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 099877b179c50a9b5f9f8be114886166944c7ff3
Author: Stephan Bergmann 
Date:   Wed Dec 13 17:54:13 2017 +0100

Move call to Scheduler::ImplDeInitScheduler in DeInitVCL back to orig. place

Dec 13 16:18:27  jmux, any reason
 fd0fff67798fea87217e65bb1561aa0d0e741c51 moved the call to
 Scheduler::ImplDeInitScheduler() in DeInitVCL (vcl/source/app/svmain.cxx) 
past
 the call to the pSVData->maDeInitHook?
Dec 13 16:18:30  core - Assert active Tasks on scheduler de-init -
 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=fd0fff67798fea87217e65bb1561aa0d0e741c51
Dec 13 16:20:06  jmux, observing a crash in
 CppunitTest_dbaccess_firebird_test here when
 comphelper::geProcessServiceFactory wants to be used after it has been 
cleared,
 
Dec 13 16:22:41  sberg: no. That was still during the analysis with 
all
 those static tasks and cleanup problems.
Dec 13 16:23:17  jmux, I'll see what breaks if I move the call back 
to
 its original place, then

The relevant backtraces from
:

> #0  0x7fffee08c160 in 
comphelper::setProcessServiceFactory(com::sun::star::uno::Reference
 const&) (xSMgr=...) at comphelper/source/processfactory/processfactory.cxx:55
> #1  0x7fffe8b120eb in (anonymous 
namespace)::Hook::deinitHook((anonymous namespace)::Hook*, LinkParamNone*) () 
at test/source/setupvcl.cxx:54
> #2  0x7fffe8b11f8d in (anonymous 
namespace)::Hook::LinkStubdeinitHook(void*, LinkParamNone*) (instance=0x0, 
data=0x0) at test/source/setupvcl.cxx:37
> #3  0x7fffe76a9cb1 in Link::Call(LinkParamNone*) const (this=0x7fffe8374418 ::get()::instance+984>, data=0x0) at 
include/tools/link.hxx:84
> #4  0x7fffe79c5baf in DeInitVCL() () at vcl/source/app/svmain.cxx:517
> #5  0x7fffe8d1cc0a in (anonymous namespace)::Protector::~Protector() 
(this=0x6f6b50, __in_chrg=) at 
test/source/vclbootstrapprotector.cxx:34
> #6  0x7fffe8d1cc5e in (anonymous namespace)::Protector::~Protector() 
(this=0x6f6b50, __in_chrg=) at 
test/source/vclbootstrapprotector.cxx:43
> #7  0x77b962f3 in CppUnit::ProtectorChain::pop() (this=0x630e00) 
at ProtectorChain.cpp:56
> #8  0x77ba65d4 in CppUnit::TestResult::popProtector() 
(this=0x7fff2870) at TestResult.cpp:196
> #9  0x00408998 in (anonymous 
namespace)::ProtectedFixtureFunctor::run() const (this=0x7fff2840) at 
sal/cppunittester/cppunittester.cxx:328
> #10 0x00409484 in sal_main() () at 
sal/cppunittester/cppunittester.cxx:469
> #11 0x0040900b in main(int, char**) (argc=23, 
argv=0x7fff2be8) at sal/cppunittester/cppunittester.cxx:376

and

> #0  0x7fffee08c213 in comphelper::getProcessServiceFactory() () at 
comphelper/source/processfactory/processfactory.cxx:64
> #1  0x7fffee08c651 in comphelper::getProcessComponentContext() () at 
comphelper/source/processfactory/processfactory.cxx:96
> #2  0x7fffe79a7281 in setupPersonaHeaderFooter(WhichPersona, 
rtl::OUString&, BitmapEx&, boost::optional&) (eWhich=PERSONA_HEADER, 
rHeaderFooter=..., rHeaderFooterBitmap=..., rMenuBarTextColor=...) at 
vcl/source/app/settings.cxx:2135
> #3  0x7fffe79a7c96 in StyleSettings::GetPersonaHeader() const 
(this=0x15d7130) at vcl/source/app/settings.cxx:2214
> #4  0x7fffe757285f in MenuBarWindow::ApplySettings(OutputDevice&) 
(this=0x1644ee0, rRenderContext=...) at vcl/source/window/menubarwindow.cxx:1022
> #5  0x7fffe7488fdb in PaintHelper::DoPaint(vcl::Region const*) 
(this=0x7fff1720, pRegion=0x0) at vcl/source/window/paint.cxx:298
> #6  0x7fffe748a74e in vcl::Window::ImplCallPaint(vcl::Region const*, 
ImplPaintFlags) (this=0x1644ee0, pRegion=0x0, 
nPaintFlags=(ImplPaintFlags::PaintAll | ImplPaintFlags::PaintAllChildren | 
ImplPaintFlags::PaintChildren | ImplPaintFlags::Erase)) at 
vcl/source/window/paint.cxx:606
> #7  0x7fffe748a0e5 in PaintHelper::~PaintHelper() 
(this=0x7fff1890, __in_chrg=) at 
vcl/source/window/paint.cxx:540
> #8  0x7fffe748a7a7 in vcl::Window::ImplCallPaint(vcl::Region const*, 
ImplPaintFlags) (this=0x1510d40, pRegion=0x0, 
nPaintFlags=ImplPaintFlags::PaintChildren) at vcl/source/window/paint.cxx:603
> #9  0x7fffe748a8ea in vcl::Window::ImplCallOverlapPaint() 
(this=0x1510d40) at vcl/source/window/paint.cxx:630
> #10 0x7fffe748aa34 in vcl::Window::ImplHandlePaintHdl(Timer*) 
(this=0x1510d40) at vcl/source/window/paint.cxx:651
> #11 0x7fffe748a929 in vcl::Window::LinkStubImplHandlePaintHdl(void*, 
Timer*) (instance=0x1510d40, data=0x1511940) at vcl/source/window/paint.cxx:634
> #12 0x7fffe79c7f33 in Link::Call(Timer*) const 
(this=0x1511960, data=

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

 include/svx/galtheme.hxx   |4 ++--
 include/svx/svdundo.hxx|4 ++--
 include/vcl/sysdata.hxx|2 +-
 svx/source/svdraw/svdundo.cxx  |6 +++---
 vcl/source/window/syschild.cxx |2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c0f1d211eff5f89f5c9298743f6e7d91d187b799
Author: Noel Grandin 
Date:   Wed Dec 13 12:18:43 2017 +0200

sal_uIntPtr->unsigned long in SystemEnvData

to match the type used by X11

Change-Id: I5fe043e33602be21c84b81780c89df751c3bc96c
Reviewed-on: https://gerrit.libreoffice.org/46393
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index e427e3a1b435..794f424b4448 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -64,7 +64,7 @@ struct SystemEnvData
 // Nothing
 #elif defined( UNX )
 void*   pDisplay;   // the relevant display connection
-sal_uIntPtr aWindow;// the window of the object
+unsigned long   aWindow;// the window of the object
 void*   pSalFrame;  // contains a salframe, if object has 
one
 void*   pWidget;// the corresponding widget
 void*   pVisual;// the visual in use
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 8424f82937d6..3be9ffe7ca6b 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -184,7 +184,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle()
 #elif defined IOS
 // Nothing
 #elif defined UNX
-nRet = (sal_IntPtr) GetSystemData()->aWindow;
+nRet = GetSystemData()->aWindow;
 #endif
 
 return nRet;
commit b4940db58257de07797abaf51d087ae040b9c9ef
Author: Noel Grandin 
Date:   Wed Dec 13 12:21:28 2017 +0200

sal_uIntPtr->sal_uInt32 in GalleryTheme

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

diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index cf021b7758fe..5b258c305c22 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -83,8 +83,8 @@ private:
 tools::SvRefaSvDrawStorageRef;
 Gallery*pParent;
 GalleryThemeEntry*  pThm;
-sal_uIntPtr mnThemeLockCount;
-sal_uIntPtr mnBroadcasterLockCount;
+sal_uInt32  mnThemeLockCount;
+sal_uInt32  mnBroadcasterLockCount;
 sal_uIntPtr nDragPos;
 boolbDragging;
 boolbAbortActualize;
commit e9cef371fe73d3b6b08a2c3cc19fdac1863d02fa
Author: Noel Grandin 
Date:   Wed Dec 13 12:10:13 2017 +0200

sal_uIntPtr->sal_Int32 in SdrUndoGroup

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

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index d14eb77d9e36..5fd24db225d5 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -98,8 +98,8 @@ public:
 virtual ~SdrUndoGroup() override;
 
 void Clear();
-sal_uIntPtr GetActionCount() const { return aBuf.size(); }
-SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return aBuf[nNum]; }
+sal_Int32 GetActionCount() const { return aBuf.size(); }
+SdrUndoAction* GetAction(sal_Int32 nNum) const { return aBuf[nNum]; }
 void AddAction(SdrUndoAction* pAct);
 
 void SetComment(const OUString& rStr) { aComment=rStr; }
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index ba26e624d777..1fd2aca90d1d 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -120,7 +120,7 @@ SdrUndoGroup::~SdrUndoGroup()
 
 void SdrUndoGroup::Clear()
 {
-for (sal_uIntPtr nu=0; nu0;) {
+for (sal_Int32 nu=GetActionCount(); nu>0;) {
 nu--;
 SdrUndoAction* pAct=GetAction(nu);
 pAct->Undo();
@@ -143,7 +143,7 @@ void SdrUndoGroup::Undo()
 
 void SdrUndoGroup::Redo()
 {
-for (sal_uIntPtr nu=0; nuRedo();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/uibase/utlui/initui.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 817a5da6bc6d7db92423933d09c696f7eb9633d9
Author: Noel Grandin 
Date:   Wed Dec 13 15:51:25 2017 +0200

DELETEZ->std::unique_ptr in FinitUI

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

diff --git a/sw/source/uibase/utlui/initui.cxx 
b/sw/source/uibase/utlui/initui.cxx
index 0c3cf1cfafca..bd5a30fb1a52 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -38,7 +38,7 @@
 
 // Global Pointer
 
-static SwGlossaries* pGlossaries = nullptr;
+static std::unique_ptr pGlossaries;
 
 // Provides all needed paths. Is initialized by UI.
 static SwGlossaryList* pGlossaryList = nullptr;
@@ -152,7 +152,7 @@ void FinitUI()
 
 SwEditWin::FinitStaticData();
 
-DELETEZ(pGlossaries);
+pGlossaries.reset();
 
 delete SwFieldType::s_pFieldNames;
 
@@ -253,8 +253,8 @@ OUString ShellResource::GetPageDescName(sal_uInt16 nNo, 
PageNameMode eMode)
 SwGlossaries* GetGlossaries()
 {
 if (!pGlossaries)
-pGlossaries = new SwGlossaries;
-return pGlossaries;
+pGlossaries.reset( new SwGlossaries );
+return pGlossaries.get();
 }
 
 bool HasGlossaryList()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/svx/gallery1.hxx |2 +-
 svx/source/gallery2/gallery1.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e54cae8b40602b958db760489bf9fe048bb1aa93
Author: Noel Grandin 
Date:   Wed Dec 13 09:54:21 2017 +0200

sal_uIntPtr->sal_uInt32 in Gallery

to match GetId() on class GalleryThemeEntry

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

diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index ada646b08a02..932e7c4dc8d5 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -122,7 +122,7 @@ public:
 SAL_DLLPRIVATE const GalleryThemeEntry* GetThemeInfo( const OUString& 
rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
 
 boolHasTheme( const OUString& rThemeName );
-SAL_DLLPRIVATE OUString GetThemeName( sal_uIntPtr nThemeId ) const;
+SAL_DLLPRIVATE OUString GetThemeName( sal_uInt32 nThemeId ) const;
 
 boolCreateTheme( const OUString& rThemeName );
 SAL_DLLPRIVATE void RenameTheme( const OUString& rOldName, const 
OUString& rNewName );
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index c3d32d6f1971..a4b65b5297aa 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -520,7 +520,7 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const 
OUString& rThemeName )
 return pFound;
 }
 
-OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
+OUString Gallery::GetThemeName( sal_uInt32 nThemeId ) const
 {
 GalleryThemeEntry* pFound = nullptr;
 
___
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' - sfx2/source shell/Library_syssh.mk shell/source

2017-12-13 Thread Michael Meeks

 sfx2/source/appl/openuriexternally.cxx |   16 
 sfx2/source/appl/sfxhelp.cxx   |   26 ++
 shell/Library_syssh.mk |1 +
 shell/source/unix/exec/shellexec.cxx   |7 +++
 4 files changed, 50 insertions(+)

New commits:
commit 689176e9424e617a64edd5e233b750b2269a7275
Author: Michael Meeks 
Date:   Wed Dec 13 15:09:36 2017 +

LOK: fix URL launching, so that Help buttons work.

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

diff --git a/sfx2/source/appl/openuriexternally.cxx 
b/sfx2/source/appl/openuriexternally.cxx
index ed702340fb11..5e597cc4cc2f 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -24,6 +24,11 @@
 #include 
 #include 
 
+#include 
+#include 
+
+#include 
+
 #include "openuriexternally.hxx"
 
 #include "app.hrc"
@@ -31,6 +36,17 @@
 bool sfx2::openUriExternally(
 OUString const & uri, bool handleSystemShellExecuteException)
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+if(SfxViewShell* pViewShell = SfxViewShell::Current())
+{
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
+   uri.toUtf8().getStr());
+return true;
+}
+return false;
+}
+
 css::uno::Reference< css::system::XSystemShellExecute > exec(
 
css::system::SystemShellExecute::create(comphelper::getProcessComponentContext()));
 try {
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 2a4c32566c98..7e98a7984ed2 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -58,6 +58,10 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+
 #include "newhelp.hxx"
 #include 
 #include 
@@ -490,6 +494,9 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, 
const vcl::Window* p
 /// Check for built-in help
 static bool impl_hasHelpInstalled( const OUString &rLang = OUString() )
 {
+if (comphelper::LibreOfficeKit::isActive())
+return false;
+
 OUStringBuffer aHelpRootURL("vnd.sun.star.help://");
 AppendConfigToken(aHelpRootURL, true, rLang);
 std::vector< OUString > aFactories = 
SfxContentHelper::GetResultSet(aHelpRootURL.makeStringAndClear());
@@ -517,6 +524,19 @@ static bool impl_showOnlineHelp( const OUString& rURL )
 OUString aHelpLink( "http://help.libreoffice.org/";  );
 aHelpLink += rURL.copy( aInternal.getLength() );
 aHelpLink = aHelpLink.replaceAll("%2F","/");
+
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+if(SfxViewShell* pViewShell = SfxViewShell::Current())
+{
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
+   
aHelpLink.toUtf8().getStr());
+return true;
+}
+return false;
+}
+
 try
 {
 Reference< XSystemShellExecute > xSystemShell(
@@ -611,6 +631,12 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 }
 }
 
+if ( comphelper::LibreOfficeKit::isActive() )
+{
+impl_showOnlineHelp( aHelpURL );
+return true;
+}
+
 if ( !impl_hasHelpInstalled() )
 {
 if ( impl_showOnlineHelp( aHelpURL ) )
diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk
index 17ee516c5b77..192c16442f57 100644
--- a/shell/Library_syssh.mk
+++ b/shell/Library_syssh.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Library_use_sdk_api,syssh))
 $(eval $(call gb_Library_use_libraries,syssh,\
cppu \
cppuhelper \
+   comphelper \
sal \
$(gb_UWINAPI) \
 ))
diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index 71f01e764a56..5447b19e1057 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "uno/current_context.hxx"
 
@@ -99,6 +100,12 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, 
const OUString& aPar
 {
 OStringBuffer aBuffer, aLaunchBuffer;
 
+if (comphelper::LibreOfficeKit::isActive())
+{
+SAL_WARN("shell", "Unusual - shell attemp to launch " << aCommand << " 
with params " << aParameter << " under lok");
+return;
+}
+
 // DESKTOP_LAUNCH, see 
http://freedesktop.org/pipermail/xdg/2004-August/004489.html
 static const char *pDesktopLaunch = getenv( "DESKTOP_LAUNCH" );
 
___
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' - helpcontent2

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

New commits:
commit ad858ef01d113aee32e5a31642254f5421fd399a
Author: Adolfo Jayme Barrientos 
Date:   Wed Dec 13 19:36:31 2017 -0600

Updated core
Project: help  61013cad831b369176fa51337e107e7017456f6f

We donât support âearlier visions [sic] of Windowsâ anymore

Change-Id: I5292b60fff0f1be7f89ce8572f0798f89fc5bdeb
(cherry picked from commit 8238444c3413205b898cbb914d2a55022256dfb5)
Reviewed-on: https://gerrit.libreoffice.org/46432
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 9e5c859354d9..61013cad831b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9e5c859354d94c236d4528e83b88f733aa2241bc
+Subproject commit 61013cad831b369176fa51337e107e7017456f6f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text

 source/text/shared/explorer/database/dabawiz02ado.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61013cad831b369176fa51337e107e7017456f6f
Author: Adolfo Jayme Barrientos 
Date:   Wed Dec 13 19:36:31 2017 -0600

We donât support âearlier visions [sic] of Windowsâ anymore

Change-Id: I5292b60fff0f1be7f89ce8572f0798f89fc5bdeb
(cherry picked from commit 8238444c3413205b898cbb914d2a55022256dfb5)
Reviewed-on: https://gerrit.libreoffice.org/46432
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/explorer/database/dabawiz02ado.xhp 
b/source/text/shared/explorer/database/dabawiz02ado.xhp
index 2f50b0a29..d6a449982 100644
--- a/source/text/shared/explorer/database/dabawiz02ado.xhp
+++ b/source/text/shared/explorer/database/dabawiz02ado.xhp
@@ -39,7 +39,7 @@
 
 Specifies the options for adding an ADO (Microsoft ActiveX Data 
Objects) database.UFI: copied text from 
shared\explorer\database\1116
 The ADO interface is 
a Microsoft Windows proprietary container for connecting to 
databases.
-$[officename] 
requires the Microsoft Data Access Components (MDAC) to use the ADO interface. 
Microsoft Windows 2000 and XP include these components by default. For earlier 
visions of Windows, you need to install MDAC separately. You can download MDAC 
from the Microsoft web site.
+$[officename] 
requires the Microsoft Data Access Components (MDAC) to use the ADO interface. 
Microsoft Windows 2000 and XP include these components by default.
 
 Data 
source URL
 Enter the data source URL.UFI: removed three lines in 
hcshared01 #58442
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/explorer/database/dabawiz02ado.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8238444c3413205b898cbb914d2a55022256dfb5
Author: Adolfo Jayme Barrientos 
Date:   Wed Dec 13 19:36:31 2017 -0600

We donât support âearlier visions [sic] of Windowsâ anymore

Change-Id: I5292b60fff0f1be7f89ce8572f0798f89fc5bdeb

diff --git a/source/text/shared/explorer/database/dabawiz02ado.xhp 
b/source/text/shared/explorer/database/dabawiz02ado.xhp
index 2f50b0a29..d6a449982 100644
--- a/source/text/shared/explorer/database/dabawiz02ado.xhp
+++ b/source/text/shared/explorer/database/dabawiz02ado.xhp
@@ -39,7 +39,7 @@
 
 Specifies the options for adding an ADO (Microsoft ActiveX Data 
Objects) database.UFI: copied text from 
shared\explorer\database\1116
 The ADO interface is 
a Microsoft Windows proprietary container for connecting to 
databases.
-$[officename] 
requires the Microsoft Data Access Components (MDAC) to use the ADO interface. 
Microsoft Windows 2000 and XP include these components by default. For earlier 
visions of Windows, you need to install MDAC separately. You can download MDAC 
from the Microsoft web site.
+$[officename] 
requires the Microsoft Data Access Components (MDAC) to use the ADO interface. 
Microsoft Windows 2000 and XP include these components by default.
 
 Data 
source URL
 Enter the data source URL.UFI: removed three lines in 
hcshared01 #58442
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 83fb512af2d8b62d99137eb9fe6a86ab72f12ad8
Author: Adolfo Jayme Barrientos 
Date:   Wed Dec 13 19:36:31 2017 -0600

Updated core
Project: help  8238444c3413205b898cbb914d2a55022256dfb5

We donât support âearlier visions [sic] of Windowsâ anymore

Change-Id: I5292b60fff0f1be7f89ce8572f0798f89fc5bdeb

diff --git a/helpcontent2 b/helpcontent2
index 21b8db8ae2fa..8238444c3413 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 21b8db8ae2fad1bcb23270ab3d2613c1aad8b114
+Subproject commit 8238444c3413205b898cbb914d2a55022256dfb5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-13 Thread Andrea Gelmini

 framework/qa/complex/dispatches/checkdispatchapi.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 26d2b9d616e08c481d463c0696eca7a3bab54c98
Author: Andrea Gelmini 
Date:   Fri Dec 1 22:21:45 2017 +0100

Fix typo

Change-Id: I34d41941ef0ba20bca604b7caed80a2d0b6ac129
Reviewed-on: https://gerrit.libreoffice.org/45706
Tested-by: Jenkins 
Reviewed-by: TamÃ¡s Zolnai 

diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java 
b/framework/qa/complex/dispatches/checkdispatchapi.java
index 74ee152c9be8..32786e858364 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -345,7 +345,7 @@ public class checkdispatchapi
 {
 // Error
 fail("At least one DispatchInformation item does not match 
the requested group.\n\trequested group=[" + nGroup
-+ "] returned groupd=[" + aInfo.GroupId + "] 
command=\"" + aInfo.Command + "\""); // true => don't break this test
++ "] returned group=[" + aInfo.GroupId + "] 
command=\"" + aInfo.Command + "\""); // true => don't break this test
 continue;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: m4/libgcrypt.m4 reportbuilder/README scp2/source

2017-12-13 Thread Andrea Gelmini

 m4/libgcrypt.m4  |2 +-
 reportbuilder/README |2 +-
 scp2/source/ooo/module_pdfimport.scp |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fa6ea25708aa0441fa04c3fca012080f234c6a31
Author: Andrea Gelmini 
Date:   Wed Dec 13 09:58:45 2017 +0100

Fix typos

Change-Id: I09e511f35d32b25683811f3a39c833779f3b61fe
Reviewed-on: https://gerrit.libreoffice.org/46370
Tested-by: Jenkins 
Reviewed-by: TamÃ¡s Zolnai 

diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 2c79027c7894..1be2fe61fed7 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -13,7 +13,7 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A 
PARTICULAR PURPOSE.
 dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
 dnl   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionally prefixed
 dnl with the API version to also check the API compatibility. Example:
 dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
 dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
diff --git a/reportbuilder/README b/reportbuilder/README
index 25f8e85710ef..696cc4b4830a 100644
--- a/reportbuilder/README
+++ b/reportbuilder/README
@@ -1,7 +1,7 @@
 Report Builder, or "new style reports", replacing legacy reports (in 
reportdesign).
 Started as an extension called "Sun Report Builder" then "Oracle Report 
Builder"
 [http://extensions.services.openoffice.org/project/reportdesign],
-which got bundled with LibreOffice, then converted to an optionallly 
installable
+which got bundled with LibreOffice, then converted to an optionally installable
 (but installed by default) part of LibreOffice proper.
 
 Uses the Pentaho Reporting Flow Engine of Pentaho BI [http://www.pentaho.com/].
diff --git a/scp2/source/ooo/module_pdfimport.scp 
b/scp2/source/ooo/module_pdfimport.scp
index 548ea587a70c..25e0a92d4fcb 100644
--- a/scp2/source/ooo/module_pdfimport.scp
+++ b/scp2/source/ooo/module_pdfimport.scp
@@ -19,7 +19,7 @@
 // which is duplicated across calc, draw, impress, math, writer .xcd
 // files.  For this to work, there is a hack in
 // postprocess/packregistry/makefile.mk to make pdfimport.xcd depend
-// on all those other .xcd files (optinally, as not all of the other
+// on all those other .xcd files (optionally, as not all of the other
 // .xcd files need to be present in a given installation).
 
 #include "macros.inc"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-13 Thread Gergely Tarsoly

 cui/source/tabpages/tphatch.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6df6c576cae880a1645f6a0514a1e10e99cac2f7
Author: Gergely Tarsoly 
Date:   Wed Dec 13 18:57:19 2017 +0100

Minor fix: unused local variable

Change-Id: I42db2c6fd90686641cd6c2f7f45d960977557ab4
Reviewed-on: https://gerrit.libreoffice.org/46416
Reviewed-by: TamÃ¡s Zolnai 
Tested-by: TamÃ¡s Zolnai 

diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 922418d8c358..c3e5097fc916 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -336,7 +336,7 @@ IMPL_LINK_NOARG( SvxHatchTabPage, 
ModifiedBackgroundHdl_Impl, SvxColorListBox&,
 m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
 m_pCtlPreview->Invalidate();
 }
-m_rXFSet.Put(XFillColorItem( OUString(), 
m_pLbBackgroundColor->GetSelectEntryColor() ));
+m_rXFSet.Put(XFillColorItem( OUString(), aColor ));
 
 m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
 m_pCtlPreview->Invalidate();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Unit test for text rotation inside textbox

2017-12-13 Thread serdar tunc

Hello

I am working on bug tdf#104290
https://bugs.documentfoundation.org/show_bug.cgi?id=104290
I've sended a patch for fix and i need to send unit test. I've couldnt
found unit test for text rotation inside textbox. I've just found one
property named "TextRotation" and i've tried it but i get error called
UnknownPropertyException. I did search opengrok but i couldnt found
anything else.

This is my unit test:

void ScFiltersTest::testTdf104290XLSX()
{
ScDocShellRef xDocSh = loadDoc("tdf104290.", FORMAT_XLSX);
CPPUNIT_ASSERT_MESSAGE("Failed to load tdf104290 .xlsx", xDocSh.is());
uno::Reference< drawing::XDrawPagesSupplier > xDoc(
xDocSh->GetModel(), uno::UNO_QUERY_THROW );
uno::Reference< drawing::XDrawPage > xPage(
xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
uno::Reference< drawing::XShape > xShape(
xPage->getByIndex(0), uno::UNO_QUERY_THROW );
CPPUNIT_ASSERT_MESSAGE( "failed to load shape", xShape.is() );
uno::Reference< beans::XPropertySet > xShapeProperties(
xShape, uno::UNO_QUERY );
sal_Int32 nTextRotate = 0;
xShapeProperties->getPropertyValue("TextRotation") >>= nTextRotate;
CPPUNIT_ASSERT(nTextRotate == 0);
xDocSh->DoClose();
}

Is there any example unit test for text rotation inside textbox or
somebody knows property name of text rotation inside textbox? Thank
you very much
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/breeze icon-themes/sifr

2017-12-13 Thread Yousuf Philips

 icon-themes/breeze/links.txt |4 ++--
 icon-themes/sifr/links.txt   |2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 270b32755d5f524d9a7b5625ab4bf09bb0f835e8
Author: Yousuf Philips 
Date:   Mon Dec 11 18:04:37 2017 +0400

tdf#114265 Use close icon in find in print preview

Change-Id: I23d0fb9973d0ae8d0ed35e7dbace65a1ef298141
Reviewed-on: https://gerrit.libreoffice.org/46232
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit 62b08a7c7d1cb77906c8eab2218cba257e5be385)
Reviewed-on: https://gerrit.libreoffice.org/46340
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index fce62a1b8a59..314c6f4fd05b 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -432,16 +432,16 @@ cmd/sc_dsbeditdoc.png cmd/sc_editdoc.png
 # Quit
 cmd/lc_closemasterview.png cmd/lc_quit.png
 cmd/lc_closewin.png cmd/lc_quit.png
-cmd/lc_closepreview.png cmd/lc_quit.png
 cmd/sc_closemasterview.png cmd/sc_quit.png
 cmd/sc_closewin.png cmd/sc_quit.png
-cmd/sc_closepreview.png cmd/sc_quit.png
 
 # Close
 cmd/lc_closedocs.png cmd/lc_closedoc.png
 cmd/lc_exitsearch.png cmd/lc_closedoc.png
+cmd/lc_closepreview.png cmd/lc_closedoc.png
 cmd/sc_closedocs.png cmd/sc_closedoc.png
 cmd/sc_exitsearch.png cmd/sc_closedoc.png
+cmd/sc_closepreview.png cmd/sc_closedoc.png
 
 # arc
 cmd/lc_basicshapes.block-arc.png cmd/lc_arc.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 58d9a65f5852..08af510ca16f 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -64,6 +64,8 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png
 # Print Preview Toolbar
 cmd/lc_showsinglepage.png cmd/lc_adddirect.png
 cmd/sc_showsinglepage.png cmd/sc_adddirect.png
+cmd/lc_closepreview.png cmd/lc_exitsearch.png
+cmd/sc_closepreview.png cmd/sc_exitsearch.png
 
 # Horizontal Text Alignment (align* is in calc and *para is used in writer)
 #cmd/lc_alignleft.png cmd/lc_leftpara.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 xmloff/source/text/XMLIndexTemplateContext.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8d0e6ad024f3154115bc39f9db4cec3a6afc59c4
Author: Michael Stahl 
Date:   Wed Dec 13 22:43:14 2017 +0100

Related: tdf#71737 xmloff: import of user-defined hyperlink was missing

... from commit 6ca6d6ac912588a8f62d7e6b668ebec333752ebc.

Change-Id: I7f604df3ae83fcc11d148e64c5fc6f7bc229d873

diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx 
b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 17d718fc6cdf..7d26498110d6 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -336,8 +336,8 @@ const bool aAllowedTokenTypesUser[] =
 true,   // XML_TOK_INDEX_TYPE_TEXT,
 true,   // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
 true,   // XML_TOK_INDEX_TYPE_CHAPTER,
-false,  // XML_TOK_INDEX_TYPE_LINK_START,
-false,  // XML_TOK_INDEX_TYPE_LINK_END,
+true,   // XML_TOK_INDEX_TYPE_LINK_START,
+true,   // XML_TOK_INDEX_TYPE_LINK_END,
 false   // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
 };
 
___
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-0' - loleaflet/src

 loleaflet/src/control/Control.ColumnHeader.js |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ad712291d938d9439ee1c239db7ca71064fa74a2
Author: Jan Holesovsky 
Date:   Wed Dec 13 21:33:05 2017 +0100

Adjust the vertical centering of the column headers slightly.

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

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index 7b0a25ab..6b0ae0d7 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -245,7 +245,11 @@ L.Control.ColumnHeader = L.Control.Header.extend({
ctx.font = this._font;
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
-   ctx.fillText(content, endPar - (width / 2), startOrt + (height 
/ 2));
+   // The '+ 1' below is a hack - it's currently not possible to 
measure
+   // the exact bounding box in html5's canvas, and the 
textBaseline
+   // 'middle' measures everything including the descent etc.
+   // '+ 1' looks visually fine, and seems safe enough
+   ctx.fillText(content, endPar - (width / 2), startOrt + (height 
/ 2) + 1);
// draw row separator
ctx.fillStyle = this._borderColor;
ctx.fillRect(endPar -1, startOrt, this._borderWidth, height);
___
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-0' - loleaflet/src

 loleaflet/src/control/Control.Menubar.js |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ba61ec9da2c073d2d728c5bb8df8912f5117fd5e
Author: Jan Holesovsky 
Date:   Wed Dec 13 19:49:11 2017 +0100

l10n: Calc and Impress should use _UNO('.uno:LanguageMenu') too.

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

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 52474f5e..c15a286c 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -189,7 +189,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ToolsMenu', 'text'), id: 'tools', 
type: 'menu', menu: [
{uno: '.uno:SpellingAndGrammarDialog'},
{uno: '.uno:SpellOnline'},
-   {name: _UNO('.uno:LanguageMenu', 'text'), type: 
'menu', menu: [
+   {name: _UNO('.uno:LanguageMenu'), type: 'menu', 
menu: [
{name: 
_UNO('.uno:SetLanguageSelectionMenu', 'text'), type: 'menu', menu: [
{name: _('None (Do not check 
spelling)'), id: 'noneselection', uno: 
'.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
{name: 
_UNO('.uno:SetLanguageParagraphMenu', 'text'), type: 'menu', menu: [
@@ -267,7 +267,7 @@ L.Control.Menubar = L.Control.extend({
},
{name: _UNO('.uno:ToolsMenu', 'presentation'), id: 
'tools', type: 'menu', menu: [
{uno: '.uno:SpellOnline'},
-   {name: _('Language'), type: 'menu', menu: [
+   {name: _UNO('.uno:LanguageMenu'), type: 'menu', 
menu: [
{name: _('None (Do not check 
spelling)'), id: 'nonelanguage', uno: 
'.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
]},
{name: _UNO('.uno:HelpMenu', 'presentation'), id: 
'help', type: 'menu', menu: [
@@ -348,7 +348,7 @@ L.Control.Menubar = L.Control.extend({
]},
{name: _UNO('.uno:ToolsMenu', 'spreadsheet'), id: 
'tools', type: 'menu', menu: [
{uno: '.uno:SpellOnline'},
-   {name: _('Language'), type: 'menu', menu: [
+   {name: _UNO('.uno:LanguageMenu'), type: 'menu', 
menu: [
{name: _('None (Do not check 
spelling)'), id: 'nonelanguage', uno: 
'.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
]},
{name: _UNO('.uno:HelpMenu', 'spreadsheet'), id: 
'help', type: 'menu', menu: [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - basic/source chart2/source editeng/source filter/source include/tools sc/qa sc/source sd/inc sd/qa sd/source sfx2/source slideshow/source sot/source starmat

 basic/source/uno/dlgcont.cxx |1 +
 chart2/source/view/main/AbstractShapeFactory.cxx |1 +
 chart2/source/view/main/ChartView.cxx|1 +
 editeng/source/items/frmitems.cxx|1 +
 editeng/source/items/numitem.cxx |1 +
 editeng/source/items/paraitem.cxx|1 +
 editeng/source/items/textitem.cxx|1 +
 filter/source/msfilter/msoleexp.cxx  |1 +
 include/tools/solar.h|   11 ---
 include/tools/svlibrary.h|   15 +++
 sc/qa/unit/helper/qahelper.hxx   |1 +
 sc/source/core/data/documen8.cxx |1 +
 sc/source/core/tool/autoform.cxx |1 +
 sc/source/core/tool/ddelink.cxx  |1 +
 sc/source/filter/xml/xmlwrap.cxx |1 +
 sc/source/ui/app/drwtrans.cxx|1 +
 sc/source/ui/app/transobj.cxx|1 +
 sc/source/ui/attrdlg/scabstdlg.cxx   |1 +
 sc/source/ui/docshell/docsh.cxx  |1 +
 sc/source/ui/docshell/impex.cxx  |1 +
 sd/inc/sdxmlwrp.hxx  |1 +
 sd/qa/unit/sdmodeltestbase.hxx   |1 +
 sd/source/filter/sdfilter.cxx|1 +
 sd/source/ui/app/sdxfer.cxx  |1 +
 sfx2/source/appl/app.cxx |1 +
 sfx2/source/appl/appinit.cxx |1 +
 sfx2/source/appl/appserv.cxx |1 +
 sfx2/source/appl/fileobj.cxx |1 +
 sfx2/source/doc/SfxDocumentMetaData.cxx  |1 +
 sfx2/source/doc/docfilt.cxx  |1 +
 sfx2/source/doc/objembed.cxx |1 +
 sfx2/source/doc/objserv.cxx  |1 +
 sfx2/source/doc/objstor.cxx  |1 +
 sfx2/source/doc/sfxbasemodel.cxx |1 +
 slideshow/source/engine/shapes/gdimtftools.cxx   |1 +
 sot/source/base/formats.cxx  |1 +
 sot/source/sdstor/storage.cxx|1 +
 starmath/qa/extras/mmlimport-test.cxx|2 ++
 starmath/source/document.cxx |1 +
 starmath/source/mathmlexport.cxx |1 +
 starmath/source/mathmlimport.cxx |1 +
 svl/source/items/macitem.cxx |1 +
 svtools/source/graphic/provider.cxx  |1 +
 svtools/source/misc/embedhlp.cxx |1 +
 svtools/source/misc/embedtransfer.cxx|1 +
 svtools/source/misc/svtaccessiblefactory.cxx |2 ++
 svtools/source/misc/transfer.cxx |1 +
 svtools/source/misc/transfer2.cxx|1 +
 svx/source/dialog/compressgraphicdialog.cxx  |1 +
 svx/source/gallery2/galobj.cxx   |1 +
 svx/source/gallery2/galtheme.cxx |1 +
 svx/source/items/chrtitem.cxx|1 +
 svx/source/items/e3ditem.cxx |1 +
 svx/source/xml/xmleohlp.cxx  |1 +
 svx/source/xml/xmlgrhlp.cxx  |1 +
 sw/qa/core/filters-test.cxx  |1 +
 sw/qa/unit/sw-dialogs-test.cxx   |1 +
 sw/qa/unit/sw-dialogs-test_2.cxx |1 +
 sw/source/core/doc/tblafmt.cxx   |1 +
 sw/source/core/swg/SwXMLTextBlocks1.cxx  |1 +
 sw/source/filter/basflt/fltini.cxx   |1 +
 sw/source/filter/xml/swxml.cxx   |1 +
 sw/source/filter/xml/wrtxml.cxx  |2 ++
 sw/source/uibase/app/docsh2.cxx  |1 +
 sw/source/uibase/dochdl/swdtflvr.cxx |1 +
 sw/source/uibase/globdoc/globdoc.cxx |1 +
 sw/source/uibase/web/wdocsh.cxx  |1 +
 toolkit/source/helper/accessibilityclient.cxx|2 +-
 tools/source/stream/stream.cxx   |1 +
 vcl/qa/cppunit/graphicfilter/filters-test.cxx|2 ++
 vcl/source/filter/FilterConfigCache.cxx  |1 +
 vcl/source/gdi/dibtools.cxx  |1 +
 vcl/source/gdi/gdimtf.cxx|1 +
 vcl/source/gdi/impgraph.cxx  |1 +
 vcl/source/gdi/pdfwriter_impl2.cxx   |1 +
 xmloff/source/core/xmlimp.cxx|1 +
 xmloff/source/text/XMLSectionExport.cxx  |5 -
 77 files changed, 97 insertions(+), 13 deletions(-)

New commits:
commit 68eb27e3bd5d536e7b00b7dc145ae4943b95bec9
Author: Michael Stahl 
Date:   Wed Dec 13 21:50:15 2017 +0100

tools: reimplement SVLIBRARY macro & remove it from solar.h

Change-Id: I03f8f5fd656d62410821f2f2851f1c584c97d1f4

diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx 
b/chart2/source/view/main/AbstractShapeFactory.cxx
inde

Re: Agenda for the design/UX meeting 2017-Dec-13

2017-12-13 Thread Heiko Tietze

Present: (Csongor), Jay, Thomas, Heiko

 * Show the Preview in dialogs left or right of the content
   + https://bugs.documentfoundation.org/show_bug.cgi?id=89605
   + +1 for the request as we started this at other dialogs (Heiko)
   + shrink from left instead of right (Csongor)
   => full agreement to move the preview to the right as on most other dialogs

 * Removal of x to close the sidebar deck
   + https://bugs.documentfoundation.org/show_bug.cgi?id=91508
   + requires to change the HIG 
https://wiki.documentfoundation.org/Design/SideBar
   => full agreement to keep the current state because of consistency, it's 
  described in the HIG, and there is no alternative function to keep the 
  tabbar open

 * Hard English string & UI freezeWeek 51 , Dec 18, 2017 - Dec 24, 2017
   + bullet list style names => AI Jay
 https://bugs.documentfoundation.org/show_bug.cgi?id=106988
   + Input from Stuart & Adolfo needed on 
https://bugs.documentfoundation.org/show_bug.cgi?id=114013
   + Customization 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=113590
 => will handle it (Jay)

 + New gradients
   + https://bugs.documentfoundation.org/show_bug.cgi?id=114006
   + proposals attached to the ticket
   + would be nice to have more input from community and do the full cleanup 
during 6.1 cycle (Jay)
   => no objection to go ahead

 * Ultra-contextual toolbar
   + https://bugs.documentfoundation.org/show_bug.cgi?id=114318
   + introduce as a new toolbar variant, or notebookbar, or extension
   + would hate it (Csongor)
   + do not include as classic toolbar neither as notebookbar
   => extension? sounds good

 * Improve internal file picker or just accept this as a workaround
   + Improvement idea: https://bugs.documentfoundation.org/show_bug.cgi?id=88180
   + Meta ticket: https://bugs.documentfoundation.org/show_bug.cgi?id=87860
 + 20 issues and requests
   + flag as obsolete with 6.0 and remove with 6.2 when Qt5 is done (Heiko)
   + some webprotocols are not-that-well-supported in native dialogs (cloph)
   + adds consistency over OS'es (Thomas)
   + Maxim's comment on the dialog - 
https://bugs.documentfoundation.org/show_bug.cgi?id=79803#c21
 (kde4 and VCL gen)
   + if functionality can be replaced we should do that
   => to the ESC with the proposal





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

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

2017-12-13 Thread Michael Meeks

 desktop/source/lib/init.cxx  |   17 
++
 framework/source/accelerators/globalacceleratorconfiguration.cxx |3 +
 2 files changed, 20 insertions(+)

New commits:
commit d83b5a462412acbad86ecb31685159015374ffbb
Author: Michael Meeks 
Date:   Fri Dec 1 21:56:55 2017 +

Initialize more for sharing during pre-init.

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e169c768e430..3cd8e1220753 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -54,6 +54,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -83,6 +84,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -94,6 +96,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -3546,6 +3549,20 @@ static void preloadData()
 xSpellChecker->isValid("forcefed", it, aNone);
 }
 std::cerr << "\n";
+
+css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg;
+xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create(
+comphelper::getProcessComponentContext());
+xGlobalCfg->getAllKeyEvents();
+
+std::cerr << "Preload icons\n";
+ImageTree &images = ImageTree::get();
+images.getImageUrl("forcefed.png", "style", "FO_oo");
+
+std::cerr << "Preload languages\n";
+// force load language singleton
+SvtLanguageTable::HasLanguageType(LANGUAGE_SYSTEM);
+LanguageTag::isValidBcp47("foo");
 }
 
 static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const 
char* pUserProfileUrl)
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx 
b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 5104c242c791..6db06f656edf 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -90,6 +91,8 @@ private:
 GlobalAcceleratorConfiguration::GlobalAcceleratorConfiguration(const 
css::uno::Reference< css::uno::XComponentContext >& xContext)
 : GlobalAcceleratorConfiguration_BASE(xContext)
 {
+// force keyboard string registration.
+KeyMapping::get();
 }
 
 void GlobalAcceleratorConfiguration::fillCache()
___
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' - vcl/source

2017-12-13 Thread Pranav Kant

 vcl/source/window/window.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 976f65f94d1e8d4114fc3afe26844f412a3eb6f8
Author: Pranav Kant 
Date:   Fri Dec 8 18:06:36 2017 +0530

Use ImplIsFloatingWindow instead of dynamic_cast

Change-Id: I09f351ae5d8d1b5c1a405d7aa8082be6014268b3
(cherry picked from commit 0898ced81a3129b4c36c08e0222f96c513f0fd77)
Reviewed-on: https://gerrit.libreoffice.org/46114
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 7eaa26482630..95157d665b1f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3255,7 +3255,7 @@ void Window::LogicMouseButtonDown(const MouseEvent& 
rMouseEvent)
 // When we're not doing tiled rendering, then positions must be passed as 
pixels.
 assert(comphelper::LibreOfficeKit::isActive());
 
-if (dynamic_cast(this) != nullptr)
+if (ImplIsFloatingWindow())
 ImplWindowFrameProc(ImplGetBorderWindow(), 
SalEvent::ExternalMouseButtonDown, &rMouseEvent);
 else
 ImplWindowFrameProc(this, SalEvent::ExternalMouseButtonDown, 
&rMouseEvent);
@@ -3266,7 +3266,7 @@ void Window::LogicMouseButtonUp(const MouseEvent& 
rMouseEvent)
 // When we're not doing tiled rendering, then positions must be passed as 
pixels.
 assert(comphelper::LibreOfficeKit::isActive());
 
-if (dynamic_cast(this) != nullptr)
+if (ImplIsFloatingWindow())
 ImplWindowFrameProc(ImplGetBorderWindow(), 
SalEvent::ExternalMouseButtonUp, &rMouseEvent);
 else
 ImplWindowFrameProc(this, SalEvent::ExternalMouseButtonUp, 
&rMouseEvent);
@@ -3277,7 +3277,7 @@ void Window::LogicMouseMove(const MouseEvent& rMouseEvent)
 // When we're not doing tiled rendering, then positions must be passed as 
pixels.
 assert(comphelper::LibreOfficeKit::isActive());
 
-if (dynamic_cast(this) != nullptr)
+if (ImplIsFloatingWindow())
 ImplWindowFrameProc(ImplGetBorderWindow(), 
SalEvent::ExternalMouseMove, &rMouseEvent);
 else
 ImplWindowFrameProc(this, SalEvent::ExternalMouseMove, &rMouseEvent);
___
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/source

2017-12-13 Thread Henry Castro

 desktop/source/lib/init.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit e8400fb18cfc3f8f09ee1e13b4a6fd1eec11d9ba
Author: Henry Castro 
Date:   Thu Dec 7 08:49:12 2017 -0400

lok: discard name languages not registered

there is a STR_ARR_SVT_LANGUAGE_TABLE table that all language names are 
registered

But not all, like locale "es"

{ LANGUAGE_SPANISH_LATIN_AMERICA,   "es", ""  , k0 }

Avoid that names until get registered appropriately

Change-Id: I148f2c30f72c82c978f5e9a1e977bf4b5e923a9c
Reviewed-on: https://gerrit.libreoffice.org/46027
Tested-by: Jenkins 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/46064
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d6f8d8646f8f..e169c768e430 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2612,10 +2612,15 @@ static char* getLanguages(const char* pCommand)
 boost::property_tree::ptree aTree;
 aTree.put("commandName", pCommand);
 boost::property_tree::ptree aValues;
+boost::property_tree::ptree aChild;
+OUString sLanguage;
 for ( sal_Int32 itLocale = 0; itLocale < aLocales.getLength(); itLocale++ )
 {
-boost::property_tree::ptree aChild;
-aChild.put("", 
SvtLanguageTable::GetLanguageString(LanguageTag::convertToLanguageType(aLocales[itLocale])).toUtf8());
+sLanguage = 
SvtLanguageTable::GetLanguageString(LanguageTag::convertToLanguageType(aLocales[itLocale]));
+if (sLanguage.startsWith("{") && sLanguage.endsWith("}"))
+continue;
+
+aChild.put("", sLanguage.toUtf8());
 aValues.push_back(std::make_pair("", aChild));
 }
 aTree.add_child("commandValues", aValues);
___
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/source sfx2/source

2017-12-13 Thread Pranav Kant

 desktop/source/lib/init.cxx  |8 +++-
 sfx2/source/control/unoctitm.cxx |8 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit d895dc24654b6dd356dbdf16c8b3e3bd4878e33d
Author: Pranav Kant 
Date:   Wed Dec 6 17:32:53 2017 +0530

lokdialog: State change events for dialogs uno commands

Change-Id: I92f60e717cd2a0695c8b86b103076d26c0c22cef
(cherry picked from commit 98da350c7c9bcb96937f1397a34c2c68ede44011)
Reviewed-on: https://gerrit.libreoffice.org/45941
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 17a731837656..d6f8d8646f8f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1760,7 +1760,13 @@ static void doc_iniUnoCommands ()
 OUString(".uno:NextTrackedChange"),
 OUString(".uno:PreviousTrackedChange"),
 OUString(".uno:AcceptAllTrackedChanges"),
-OUString(".uno:RejectAllTrackedChanges")
+OUString(".uno:RejectAllTrackedChanges"),
+OUString(".uno:TableDialog"),
+OUString(".uno:FormatCellDialog"),
+OUString(".uno:FontDialog"),
+OUString(".uno:ParagraphDialog"),
+OUString(".uno:OutlineBullet"),
+OUString(".uno:InsertIndexesEntry")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c55005d8433d..25bdbbf8788d 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1072,7 +1072,13 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "SortAscending" ||
  aEvent.FeatureURL.Path == "SortDescending" ||
  aEvent.FeatureURL.Path == "AcceptAllTrackedChanges" ||
- aEvent.FeatureURL.Path == "RejectAllTrackedChanges")
+ aEvent.FeatureURL.Path == "RejectAllTrackedChanges" ||
+ aEvent.FeatureURL.Path == "TableDialog" ||
+ aEvent.FeatureURL.Path == "FormatCellDialog" ||
+ aEvent.FeatureURL.Path == "FontDialog" ||
+ aEvent.FeatureURL.Path == "ParagraphDialog" ||
+ aEvent.FeatureURL.Path == "OutlineBullet" ||
+ aEvent.FeatureURL.Path == "InsertIndexesEntry")
 
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source unotools/source

 include/toolkit/controls/unocontrol.hxx  |3 ++-
 include/toolkit/controls/unocontrolcontainer.hxx |3 ++-
 toolkit/source/controls/unocontrol.cxx   |1 -
 toolkit/source/controls/unocontrolcontainer.cxx  |8 +++-
 unotools/source/config/saveopt.cxx   |   18 --
 5 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit 78a6ce17f06fbe13b806fd563e85a4fe60d3bcfc
Author: Noel Grandin 
Date:   Wed Dec 13 15:47:02 2017 +0200

DELETEZ->std::unique_ptr in toolkit,unotools

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

diff --git a/include/toolkit/controls/unocontrol.hxx 
b/include/toolkit/controls/unocontrol.hxx
index 9080d918304e..29dd824f88bc 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 struct UnoControlComponentInfos
@@ -108,7 +109,7 @@ protected:
 boolmbDesignMode;
 
 UnoControlComponentInfosmaComponentInfos;
-UnoControl_Data*mpData;
+std::unique_ptrmpData;
 
 ::osl::Mutex&  
 GetMutex() { return maMutex; }
 
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx 
b/include/toolkit/controls/unocontrolcontainer.hxx
index ca2a5a54555b..816632d418db 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -32,6 +32,7 @@
 #include 
 
 #include 
+#include 
 
 class UnoControlHolderList;
 
@@ -48,7 +49,7 @@ typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
 class UnoControlContainer : public UnoControlContainer_Base
 {
 private:
-UnoControlHolderList*   mpControls;
+std::unique_ptr   mpControls;
 css::uno::Sequence< css::uno::Reference< css::awt::XTabController > >
maTabControllers;
 ContainerListenerMultiplexermaCListeners;
 
diff --git a/toolkit/source/controls/unocontrol.cxx 
b/toolkit/source/controls/unocontrol.cxx
index f07ff4d64251..6c8435791883 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -150,7 +150,6 @@ UnoControl::UnoControl() :
 
 UnoControl::~UnoControl()
 {
-DELETEZ( mpData );
 }
 
 OUString UnoControl::GetComponentServiceName()
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx 
b/toolkit/source/controls/unocontrolcontainer.cxx
index 0a992812f7d8..5b533dddb22a 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -381,7 +381,7 @@ UnoControlContainer::UnoControlContainer()
 :UnoControlContainer_Base()
 ,maCListeners( *this )
 {
-mpControls = new UnoControlHolderList;
+mpControls.reset(new UnoControlHolderList);
 }
 
 UnoControlContainer::UnoControlContainer(const uno::Reference< 
awt::XWindowPeer >& xP )
@@ -390,12 +390,11 @@ UnoControlContainer::UnoControlContainer(const 
uno::Reference< awt::XWindowPeer
 {
 setPeer( xP );
 mbDisposePeer = false;
-mpControls = new UnoControlHolderList;
+mpControls.reset(new UnoControlHolderList);
 }
 
 UnoControlContainer::~UnoControlContainer()
 {
-DELETEZ( mpControls );
 }
 
 void UnoControlContainer::ImplActivateTabControllers()
@@ -433,8 +432,7 @@ void UnoControlContainer::dispose(  )
 
 
 // Delete all structures
-DELETEZ( mpControls );
-mpControls = new UnoControlHolderList;
+mpControls.reset(new UnoControlHolderList);
 
 UnoControlBase::dispose();
 }
diff --git a/unotools/source/config/saveopt.cxx 
b/unotools/source/config/saveopt.cxx
index cdb66c6fabe4..35b721702f21 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -45,11 +45,11 @@ class SvtLoadOptions_Impl;
 
 struct SvtLoadSaveOptions_Impl
 {
-SvtSaveOptions_Impl* pSaveOpt;
-SvtLoadOptions_Impl* pLoadOpt;
+std::unique_ptr pSaveOpt;
+std::unique_ptr pLoadOpt;
 };
 
-static SvtLoadSaveOptions_Impl* pOptions = nullptr;
+static std::unique_ptr pOptions;
 static sal_Int32   nRefCount = 0;
 
 class SvtSaveOptions_Impl : public utl::ConfigItem
@@ -802,14 +802,14 @@ SvtSaveOptions::SvtSaveOptions()
 ::osl::MutexGuard aGuard( LocalSingleton::get() );
 if ( !pOptions )
 {
-pOptions = new SvtLoadSaveOptions_Impl;
-pOptions->pSaveOpt = new SvtSaveOptions_Impl;
-pOptions->pLoadOpt = new SvtLoadOptions_Impl;
+pOptions.reset(new SvtLoadSaveOptions_Impl);
+pOptions->pSaveOpt.reset(new SvtSaveOptions_Impl);
+pOptions->pLoadOpt.reset( new SvtLoadOptions_Impl);
 
 ItemHolder1::holdConfigItem(EItem::SaveOptions);
}
++nRefCount;
-pImp = pOptions;
+pImp = pOptions.get();
 }
 
 SvtSaveOptions::~SvtSaveOptions()

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

 include/svx/galmisc.hxx   |8 
 svx/source/gallery2/galbrws2.cxx  |2 +-
 svx/source/gallery2/galtheme.cxx  |   18 +-
 svx/source/unogallery/unogaltheme.cxx |2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 3f7fbae1bc38d528080552a715af187285f47028
Author: Noel Grandin 
Date:   Wed Dec 13 09:49:31 2017 +0200

sal_uIntPtr->void* in GalleryHint

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

diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 602c8283550f..f0823ae6553a 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -180,20 +180,20 @@ private:
 GalleryHintType mnType;
 OUStringmaThemeName;
 OUStringmaStringData;
-sal_uIntPtr mnData1;
+void*   mnData1;
 
 public:
 
- GalleryHint( GalleryHintType nType, const OUString& 
rThemeName, sal_uIntPtr nData1 = 0 ) :
+ GalleryHint( GalleryHintType nType, const OUString& 
rThemeName, void* nData1 = nullptr ) :
 mnType( nType ), maThemeName( rThemeName ), mnData1( 
nData1 ) {}
 
- GalleryHint( GalleryHintType nType, const OUString& 
rThemeName, const OUString& rStringData, sal_uIntPtr nData1 = 0 ) :
+ GalleryHint( GalleryHintType nType, const OUString& 
rThemeName, const OUString& rStringData, void* nData1 = nullptr ) :
 mnType( nType ), maThemeName( rThemeName ), 
maStringData( rStringData ), mnData1( nData1 ) {}
 
 GalleryHintType  GetType() const { return mnType; }
 const OUString&  GetThemeName() const { return maThemeName; }
 const OUString&  GetStringData() const { return maStringData; }
-sal_uIntPtr  GetData1() const { return mnData1; }
+void*GetData1() const { return mnData1; }
 };
 
 #endif
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 0a77441323f4..b6feefd016ad 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -518,7 +518,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const 
SfxHint& rHint )
 if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
 SetMode( meLastMode );
 
-ImplUpdateViews( (sal_uInt16) rGalleryHint.GetData1() + 1 );
+ImplUpdateViews( reinterpret_cast(rGalleryHint.GetData1()) 
+ 1 );
 }
 break;
 
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 84b693fc6851..3c0800493f79 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -80,8 +80,8 @@ GalleryTheme::~GalleryTheme()
 
 for (GalleryObject* pEntry : aObjectList)
 {
-Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(), 
reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
-Broadcast( GalleryHint( GalleryHintType::OBJECT_REMOVED, GetName(), 
reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
+Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(), 
pEntry ) );
+Broadcast( GalleryHint( GalleryHintType::OBJECT_REMOVED, GetName(), 
pEntry ) );
 delete pEntry;
 }
 aObjectList.clear();
@@ -336,7 +336,7 @@ void GalleryTheme::ImplBroadcast( sal_uIntPtr nUpdatePos )
 if( GetObjectCount() && ( nUpdatePos >= GetObjectCount() ) )
 nUpdatePos = GetObjectCount() - 1;
 
-Broadcast( GalleryHint( GalleryHintType::THEME_UPDATEVIEW, GetName(), 
nUpdatePos ) );
+Broadcast( GalleryHint( GalleryHintType::THEME_UPDATEVIEW, GetName(), 
reinterpret_cast(nUpdatePos) ) );
 }
 }
 
@@ -471,8 +471,8 @@ bool GalleryTheme::RemoveObject( size_t nPos )
 if( SgaObjKind::SvDraw == pEntry->eObjKind )
 aSvDrawStorageRef->Remove( pEntry->aURL.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ) );
 
-Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(), 
reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
-Broadcast( GalleryHint( GalleryHintType::OBJECT_REMOVED, GetName(), 
reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
+Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(), 
pEntry ) );
+Broadcast( GalleryHint( GalleryHintType::OBJECT_REMOVED, GetName(), 
pEntry ) );
 delete pEntry;
 pEntry = nullptr;
 
@@ -596,8 +596,8 @@ void GalleryTheme::Actualize( const Link& rActualize
 {
 if( (*it)->mbDelete )
 {
-Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(), 
reinterpret_cast< sal_uIntPtr >( *it ) ) );
-Broadcast( GalleryHint( GalleryHintType::OBJECT_REMOVED, 
GetName(), reinterpret_cast< sal_uLong >( *it ) ) );
+Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(), 
*it ) );
+

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

 svl/qa/unit/svl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac863696a697b8007a7ee525127fb571d84d1b88
Author: Stephan Bergmann 
Date:   Wed Dec 13 18:35:20 2017 +0100

Blind fix for ambiguous CPPUNIT_ASSERT_EQUAL

Change-Id: Ia0730cfd2293c374ec8b8f4aa69fef5d319642e4

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 7ff1d23dcca8..defc53df056d 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1506,7 +1506,7 @@ void Test::testColorNamesConversion()
 {
 aFormatCode = "[" + aGermanKeywords[i] + "]0";
 aFormatter.PutandConvertEntry( aFormatCode, nCheckPos, nType, nKey, 
LANGUAGE_GERMAN, LANGUAGE_ENGLISH_US);
-CPPUNIT_ASSERT_EQUAL_MESSAGE("CheckPos should be 0.", 0, nCheckPos);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("CheckPos should be 0.", sal_Int32(0), 
nCheckPos);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Type should be NUMBER.", 
css::util::NumberFormat::NUMBER, nType);
 CPPUNIT_ASSERT_EQUAL( OUString("[" + rEnglishKeywords[i] + "]0"), 
aFormatCode);
 }
___
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' - svl/source

 svl/source/numbers/zforscan.cxx |  131 +---
 1 file changed, 69 insertions(+), 62 deletions(-)

New commits:
commit 8c806348c326bf0084f7bca7e5eaf4cadeac7030
Author: Eike Rathke 
Date:   Tue Dec 12 22:54:19 2017 +0100

Determine possibly localized keywords early and once

.. instead of in every GetKeyWord() call, and force to EnglishOnly
if there aren't.

Change-Id: I56941298c0e02d041b80cdb5805905e24116405e
(cherry picked from commit 38a3886fc1464e635985f9ec82b48e0a69f6e536)
Reviewed-on: https://gerrit.libreoffice.org/46384
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ed3edf731096..d29ecddb1d16 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -301,7 +301,60 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 sKeyword[NF_KEY_THAI_T] = sEnglishKeyword[NF_KEY_THAI_T];
 }
 
-const bool bL10n = (meKeywordLocalization != 
KeywordLocalization::EnglishOnly);
+bool bL10n = (meKeywordLocalization != KeywordLocalization::EnglishOnly);
+if (bL10n)
+{
+// Check if this actually is a locale that uses any localized keywords,
+// if not then disable localized keywords completely.
+if ( !eLang.anyOf( LANGUAGE_GERMAN,
+LANGUAGE_GERMAN_SWISS,
+LANGUAGE_GERMAN_AUSTRIAN,
+LANGUAGE_GERMAN_LUXEMBOURG,
+LANGUAGE_GERMAN_LIECHTENSTEIN,
+LANGUAGE_DUTCH,
+LANGUAGE_DUTCH_BELGIAN,
+LANGUAGE_FRENCH,
+LANGUAGE_FRENCH_BELGIAN,
+LANGUAGE_FRENCH_CANADIAN,
+LANGUAGE_FRENCH_SWISS,
+LANGUAGE_FRENCH_LUXEMBOURG,
+LANGUAGE_FRENCH_MONACO,
+LANGUAGE_FINNISH,
+LANGUAGE_ITALIAN,
+LANGUAGE_ITALIAN_SWISS,
+LANGUAGE_DANISH,
+LANGUAGE_NORWEGIAN,
+LANGUAGE_NORWEGIAN_BOKMAL,
+LANGUAGE_NORWEGIAN_NYNORSK,
+LANGUAGE_SWEDISH,
+LANGUAGE_SWEDISH_FINLAND,
+LANGUAGE_PORTUGUESE,
+LANGUAGE_PORTUGUESE_BRAZILIAN,
+LANGUAGE_SPANISH_MODERN,
+LANGUAGE_SPANISH_DATED,
+LANGUAGE_SPANISH_MEXICAN,
+LANGUAGE_SPANISH_GUATEMALA,
+LANGUAGE_SPANISH_COSTARICA,
+LANGUAGE_SPANISH_PANAMA,
+LANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
+LANGUAGE_SPANISH_VENEZUELA,
+LANGUAGE_SPANISH_COLOMBIA,
+LANGUAGE_SPANISH_PERU,
+LANGUAGE_SPANISH_ARGENTINA,
+LANGUAGE_SPANISH_ECUADOR,
+LANGUAGE_SPANISH_CHILE,
+LANGUAGE_SPANISH_URUGUAY,
+LANGUAGE_SPANISH_PARAGUAY,
+LANGUAGE_SPANISH_BOLIVIA,
+LANGUAGE_SPANISH_EL_SALVADOR,
+LANGUAGE_SPANISH_HONDURAS,
+LANGUAGE_SPANISH_NICARAGUA,
+LANGUAGE_SPANISH_PUERTO_RICO ))
+{
+bL10n = false;
+meKeywordLocalization = KeywordLocalization::EnglishOnly;
+}
+}
 
 if ( bL10n && eLang.anyOf(
 LANGUAGE_GERMAN,
@@ -663,71 +716,25 @@ short ImpSvNumberformatScan::GetKeyWord( const OUString& 
sSymbol, sal_Int32 nPos
 if (i == 0 && meKeywordLocalization == 
KeywordLocalization::AllowEnglish)
 {
 // No localized (if so) keyword, try English keywords if keywords
-// are localized.
-LanguageType eLang = 
pFormatter->GetLocaleData()->getLoadedLanguageTag().getLanguageType( false);
-if ( eLang.anyOf( LANGUAGE_GERMAN,
-LANGUAGE_GERMAN_SWISS,
-LANGUAGE_GERMAN_AUSTRIAN,
-LANGUAGE_GERMAN_LUXEMBOURG,
-LANGUAGE_GERMAN_LIECHTENSTEIN,
-LANGUAGE_DUTCH,
-LANGUAGE_DUTCH_BELGIAN,
-LANGUAGE_FRENCH,
-LANGUAGE_FRENCH_BELGIAN,
-LANGUAGE_FRENCH_CANADIAN,
-LANGUAGE_FRENCH_SWISS,
-LANGUAGE_FRENCH_LUXEMBOURG,
-LANGUAGE_FRENCH_MONACO,
-LANGUAGE_FINNISH,
-LANGUAGE_ITALIAN,
-LANGUAGE_ITALIAN_SWISS,
-LANGUAGE_DANISH,
-LANGUAGE_NORWEGIAN,
-LANGUAGE_NORWEGIAN_BOKMAL,
-LANGUAGE_NORWEGIAN_NYNORSK,
-LANGUAGE_SWEDISH,
-

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

 svl/qa/unit/svl.cxx |   37 +
 1 file changed, 37 insertions(+)

New commits:
commit e3cc0ebafa40d1aa55f3603cb89fa9c6c67a855b
Author: Eike Rathke 
Date:   Wed Dec 13 17:57:47 2017 +0100

Unit test testUserDefinedNumberFormats()

Change-Id: Ic908af0bf5cbd83fab7bbf2d2f37a1b51bc5e32a

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 558047bec5a2..7ff1d23dcca8 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -67,6 +67,7 @@ public:
 void testUserDefinedNumberFormats();
 void testNfEnglishKeywordsIntegrity();
 void testStandardColorIntegrity();
+void testColorNamesConversion();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testNumberFormat);
@@ -81,6 +82,7 @@ public:
 CPPUNIT_TEST(testUserDefinedNumberFormats);
 CPPUNIT_TEST(testNfEnglishKeywordsIntegrity);
 CPPUNIT_TEST(testStandardColorIntegrity);
+CPPUNIT_TEST(testColorNamesConversion);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1475,6 +1477,41 @@ void Test::testStandardColorIntegrity()
 CPPUNIT_ASSERT_EQUAL( aStandardColors[9].GetColor(), COL_WHITE );
 }
 
+void Test::testColorNamesConversion()
+{
+SvNumberFormatter aFormatter(m_xContext, LANGUAGE_GERMAN);
+const SvNumberformat* pNumberFormat = aFormatter.GetEntry(0);
+const ::std::vector & rEnglishKeywords = 
pNumberFormat->GetEnglishKeywords();
+const NfKeywordTable& rKeywords = pNumberFormat->GetKeywords();
+
+// Holding a reference to the NfKeywordTable doesn't help if we switch
+// locales internally, so copy the relevant parts in advance.
+std::vector aGermanKeywords(NF_KEYWORD_ENTRIES_COUNT);
+for (size_t i = NF_KEY_COLOR; i <= NF_KEY_WHITE; ++i)
+aGermanKeywords[i] = rKeywords[i];
+
+// Check that we actually have German and English keywords.
+CPPUNIT_ASSERT_EQUAL( OUString("FARBE"), aGermanKeywords[NF_KEY_COLOR]);
+CPPUNIT_ASSERT_EQUAL( OUString("COLOR"), rEnglishKeywords[NF_KEY_COLOR]);
+
+// Test each color conversion.
+// [FARBE1] -> [COLOR1] can't be tested because we have no color table link
+// set, so the scanner returns nCheckPos error.
+sal_Int32 nCheckPos;
+short nType;
+sal_uInt32 nKey;
+OUString aFormatCode;
+
+for (size_t i = NF_KEY_BLACK; i <= NF_KEY_WHITE; ++i)
+{
+aFormatCode = "[" + aGermanKeywords[i] + "]0";
+aFormatter.PutandConvertEntry( aFormatCode, nCheckPos, nType, nKey, 
LANGUAGE_GERMAN, LANGUAGE_ENGLISH_US);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("CheckPos should be 0.", 0, nCheckPos);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Type should be NUMBER.", 
css::util::NumberFormat::NUMBER, nType);
+CPPUNIT_ASSERT_EQUAL( OUString("[" + rEnglishKeywords[i] + "]0"), 
aFormatCode);
+}
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
___
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' - helpcontent2

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

New commits:
commit 81bed85ef3bfc16252f847945fa760ca59fea8e3
Author: Olivier Hallot 
Date:   Wed Dec 13 12:39:20 2017 -0200

Updated core
Project: help  9e5c859354d94c236d4528e83b88f733aa2241bc

Fix even more typos in help pages

Change-Id: Idbcae07c0807df54db3ba93ed66a9f881c5fa2e4
Reviewed-on: https://gerrit.libreoffice.org/46406
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 21b8db8ae2fad1bcb23270ab3d2613c1aad8b114)
Reviewed-on: https://gerrit.libreoffice.org/46414

diff --git a/helpcontent2 b/helpcontent2
index de8e57dbe34c..9e5c859354d9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit de8e57dbe34c7042701b810efc5aa111fee1a3de
+Subproject commit 9e5c859354d94c236d4528e83b88f733aa2241bc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 99cc3e51c693a79f3ee84720ae8133510efa5934
Author: Olivier Hallot 
Date:   Wed Dec 13 12:39:20 2017 -0200

Updated core
Project: help  21b8db8ae2fad1bcb23270ab3d2613c1aad8b114

Fix even more typos in help pages

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

diff --git a/helpcontent2 b/helpcontent2
index 5bf98f3fd366..21b8db8ae2fa 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5bf98f3fd366b056c0a56bcc54e106673b0d5cd5
+Subproject commit 21b8db8ae2fad1bcb23270ab3d2613c1aad8b114
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text

 source/text/sbasic/shared/03132200.xhp |2 +-
 source/text/scalc/01/12040201.xhp  |8 
 source/text/shared/01/01010203.xhp |8 
 source/text/shared/02/12090100.xhp |8 
 source/text/shared/05/0001.xhp |2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 9e5c859354d94c236d4528e83b88f733aa2241bc
Author: Olivier Hallot 
Date:   Wed Dec 13 12:39:20 2017 -0200

Fix even more typos in help pages

Change-Id: Idbcae07c0807df54db3ba93ed66a9f881c5fa2e4
Reviewed-on: https://gerrit.libreoffice.org/46406
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 21b8db8ae2fad1bcb23270ab3d2613c1aad8b114)
Reviewed-on: https://gerrit.libreoffice.org/46414

diff --git a/source/text/sbasic/shared/03132200.xhp 
b/source/text/sbasic/shared/03132200.xhp
index 4aad91c47..4d3f2e45a 100644
--- a/source/text/sbasic/shared/03132200.xhp
+++ b/source/text/sbasic/shared/03132200.xhp
@@ -33,7 +33,7 @@
   components;addressing
 
 
-ThisComponent [Runtime]
+ThisComponent Statement [Runtime]
 Addresses the 
active component so that its properties can be read and set. ThisComponent is 
used from document Basic, where it represents the document the Basic belongs 
to. The type of object accessed by ThisComponent depends on the document 
type.see i60932
 
 
diff --git a/source/text/scalc/01/12040201.xhp 
b/source/text/scalc/01/12040201.xhp
index 91a4ae2bf..2fbae172f 100644
--- a/source/text/scalc/01/12040201.xhp
+++ b/source/text/scalc/01/12040201.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Options
@@ -27,7 +27,7 @@
 
 
 
-More
+Options
 
 
 Shows 
additional filter options.
diff --git a/source/text/shared/01/01010203.xhp 
b/source/text/shared/01/01010203.xhp
index 94a09a682..6179a1893 100644
--- a/source/text/shared/01/01010203.xhp
+++ b/source/text/shared/01/01010203.xhp
@@ -30,8 +30,8 @@
 
 
 
-  
-  
+
+
   
   Options
   Sets additional options for your labels or business cards, 
including text synchronization and printer settings.
@@ -40,9 +40,9 @@
   
 
   Entire Page
-  Creates a full page of  labels or business 
cards.
+  Creates a full page of labels or business 
cards.
   Single Label
-  Prints a single label or  business card on a 
page.
+  Prints a single label or business card on a 
page.
   Column
   Enter the 
number of labels or business cards that you want to have in a row on your 
page.
   Row
diff --git a/source/text/shared/02/12090100.xhp 
b/source/text/shared/02/12090100.xhp
index dc2982c6b..38ad010f3 100644
--- a/source/text/shared/02/12090100.xhp
+++ b/source/text/shared/02/12090100.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
   
  Standard Filter
@@ -78,7 +78,7 @@
   If you 
use the filter function in database tables or forms, then type the value in the 
Value text box to be used for filtering.
 
 
-More 
Options
+Options
   
 
 
diff --git a/source/text/shared/05/0001.xhp 
b/source/text/shared/05/0001.xhp
index 9bc303862..84e2d1a41 100644
--- a/source/text/shared/05/0001.xhp
+++ b/source/text/shared/05/0001.xhp
@@ -57,7 +57,7 @@
 You can 
download the latest version of %PRODUCTNAME at http://www.libreoffice.org/download/";>www.libreoffice.org/download/.
 
 
 Documentation
-You can 
download documentation as PDF files, how-tos, and guides from the %PRODUCTNAME 
documentation website at http://documentation.libreoffice.org";>documentation.libreoffice.org.
 You can also access the documentation website choosing the menu Help â User Guidesâ¦ .
+You can 
download documentation as PDF files, how-tos, and guides from the %PRODUCTNAME 
documentation website at http://documentation.libreoffice.org";>documentation.libreoffice.org.
 You can also access the documentation website choosing the menu Help â User Guidesâ¦
 
 Participate and give back
 If 
you want to take an active role in the worldwide %PRODUCTNAME community, you 
are very welcome to give feedback, discuss features, propose enhancements, 
write your own article in an FAQ, how-to, manual, create a video tutorial, 
etc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/sbasic/shared/03132200.xhp |2 +-
 source/text/scalc/01/12040201.xhp  |8 
 source/text/shared/01/01010203.xhp |8 
 source/text/shared/02/12090100.xhp |8 
 source/text/shared/05/0001.xhp |2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 21b8db8ae2fad1bcb23270ab3d2613c1aad8b114
Author: Olivier Hallot 
Date:   Wed Dec 13 12:39:20 2017 -0200

Fix even more typos in help pages

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

diff --git a/source/text/sbasic/shared/03132200.xhp 
b/source/text/sbasic/shared/03132200.xhp
index 4aad91c47..4d3f2e45a 100644
--- a/source/text/sbasic/shared/03132200.xhp
+++ b/source/text/sbasic/shared/03132200.xhp
@@ -33,7 +33,7 @@
   components;addressing
 
 
-ThisComponent [Runtime]
+ThisComponent Statement [Runtime]
 Addresses the 
active component so that its properties can be read and set. ThisComponent is 
used from document Basic, where it represents the document the Basic belongs 
to. The type of object accessed by ThisComponent depends on the document 
type.see i60932
 
 
diff --git a/source/text/scalc/01/12040201.xhp 
b/source/text/scalc/01/12040201.xhp
index 91a4ae2bf..2fbae172f 100644
--- a/source/text/scalc/01/12040201.xhp
+++ b/source/text/scalc/01/12040201.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Options
@@ -27,7 +27,7 @@
 
 
 
-More
+Options
 
 
 Shows 
additional filter options.
diff --git a/source/text/shared/01/01010203.xhp 
b/source/text/shared/01/01010203.xhp
index 94a09a682..6179a1893 100644
--- a/source/text/shared/01/01010203.xhp
+++ b/source/text/shared/01/01010203.xhp
@@ -30,8 +30,8 @@
 
 
 
-  
-  
+
+
   
   Options
   Sets additional options for your labels or business cards, 
including text synchronization and printer settings.
@@ -40,9 +40,9 @@
   
 
   Entire Page
-  Creates a full page of  labels or business 
cards.
+  Creates a full page of labels or business 
cards.
   Single Label
-  Prints a single label or  business card on a 
page.
+  Prints a single label or business card on a 
page.
   Column
   Enter the 
number of labels or business cards that you want to have in a row on your 
page.
   Row
diff --git a/source/text/shared/02/12090100.xhp 
b/source/text/shared/02/12090100.xhp
index dc2982c6b..38ad010f3 100644
--- a/source/text/shared/02/12090100.xhp
+++ b/source/text/shared/02/12090100.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
   
  Standard Filter
@@ -78,7 +78,7 @@
   If you 
use the filter function in database tables or forms, then type the value in the 
Value text box to be used for filtering.
 
 
-More 
Options
+Options
   
 
 
diff --git a/source/text/shared/05/0001.xhp 
b/source/text/shared/05/0001.xhp
index 9bc303862..84e2d1a41 100644
--- a/source/text/shared/05/0001.xhp
+++ b/source/text/shared/05/0001.xhp
@@ -57,7 +57,7 @@
 You can 
download the latest version of %PRODUCTNAME at http://www.libreoffice.org/download/";>www.libreoffice.org/download/.
 
 
 Documentation
-You can 
download documentation as PDF files, how-tos, and guides from the %PRODUCTNAME 
documentation website at http://documentation.libreoffice.org";>documentation.libreoffice.org.
 You can also access the documentation website choosing the menu Help â User Guidesâ¦ .
+You can 
download documentation as PDF files, how-tos, and guides from the %PRODUCTNAME 
documentation website at http://documentation.libreoffice.org";>documentation.libreoffice.org.
 You can also access the documentation website choosing the menu Help â User Guidesâ¦
 
 Participate and give back
 If 
you want to take an active role in the worldwide %PRODUCTNAME community, you 
are very welcome to give feedback, discuss features, propose enhancements, 
write your own article in an FAQ, how-to, manual, create a video tutorial, 
etc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/doc/DocumentRedlineManager.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 0999ac11796d2f2c7439df8c5f65d73119716a7d
Author: Michael Stahl 
Date:   Wed Dec 6 22:28:05 2017 +0100

ofz#4518 sw: why do we need to set IgnoreDeleteRedlines

This mysterious IgnoreDeleteRedlines flag was set in this particular
case of a new DELETE redline inside or equal to an existing INSERT
redline since initial import.

Why it's needed is documented nowhere.

If it is needed, then i'm assuming it's only needed to prevent
deleting redlines that are actually in the pNewRedl range;
it makes no sense to prevent deletion of redlines inside a footnote
when that footnote is deleted, because there is no valid
position left for such redlines.

The problem here is that in the range that is deleted there is a
footnote and there is another redline inside the footnote text
and that has its positions corrected rather ridiculously by
DelBookmarks() because DeleteRedline() ignored it due to the flag.

Remove the call to MaybeNotifyRedlineModification(), to fix a
SwTiledRenderingTest::testRedlineUpdateCallback failure,
assuming that it is only called to compensate for the flag
being set, seeing as this is the only such call in AppendRedline.

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

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 5fc5ada08205..6aad179ab11e 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1224,8 +1224,6 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 case SwComparePosition::Inside:
 if( bCallDelete )
 {
-meRedlineFlags |= 
RedlineFlags::IgnoreDeleteRedlines;
-
 // DeleteAndJoin does not yield the
 // desired result if there is no paragraph to
 // join with, i.e. at the end of the document.
@@ -1247,8 +1245,6 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 }
 delete pNewRedl;
 pNewRedl = nullptr;
-if (eCmpPos == SwComparePosition::Inside)
-MaybeNotifyRedlineModification(pRedl, &m_rDoc);
 break;
 
 case SwComparePosition::Outside:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-13 Thread Samuel Mehrbrodt

 sw/uiconfig/swriter/ui/signatureline.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 45bbb07680b3d81aaf66ef2d11c95d4c48ab23de
Author: Samuel Mehrbrodt 
Date:   Tue Dec 12 14:56:26 2017 +0100

Signature line dialog: Set mnemonic widget where it is not set automatically

Change-Id: I2f1f24ae6af045eea119bca77d0beba0303bb884
Reviewed-on: https://gerrit.libreoffice.org/46308
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sw/uiconfig/swriter/ui/signatureline.ui 
b/sw/uiconfig/swriter/ui/signatureline.ui
index 77e84449e0f6..bc6b4d26d36a 100644
--- a/sw/uiconfig/swriter/ui/signatureline.ui
+++ b/sw/uiconfig/swriter/ui/signatureline.ui
@@ -174,6 +174,8 @@
 False
 start
 Instructions to the 
signer:
+True
+edit_instructions
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-13 Thread Samuel Mehrbrodt

 sw/uiconfig/swriter/ui/signatureline.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2b63477620633cf1098a5b3330f8d5f6897b2f98
Author: Samuel Mehrbrodt 
Date:   Tue Dec 12 14:30:53 2017 +0100

Set default action for signature line dialog

Change-Id: I61782526312015173c97d469381f1494b2dcdbf2
Reviewed-on: https://gerrit.libreoffice.org/46307
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sw/uiconfig/swriter/ui/signatureline.ui 
b/sw/uiconfig/swriter/ui/signatureline.ui
index 6a7e0bc9c483..77e84449e0f6 100644
--- a/sw/uiconfig/swriter/ui/signatureline.ui
+++ b/sw/uiconfig/swriter/ui/signatureline.ui
@@ -34,6 +34,7 @@
 gtk-ok
 True
 True
+True
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svl/source/numbers/zforscan.cxx |  118 ++--
 svl/source/numbers/zforscan.hxx |1 
 2 files changed, 80 insertions(+), 39 deletions(-)

New commits:
commit 53137888731d520b1f51f8764bf59827987cc3a3
Author: Eike Rathke 
Date:   Wed Dec 13 15:54:16 2017 +0100

German super cow colors, conversion doesn't need a locale switch

Change-Id: I86a8bb7d345e707ad45693e997aa18bac7ce8825

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index d29ecddb1d16..8e3bfd308042 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -104,6 +104,9 @@ const ::std::vector 
ImpSvNumberformatScan::sEnglishKeyword =
 ::std::vector ImpSvNumberformatScan::StandardColor;
 bool ImpSvNumberformatScan::bStandardColorNeedInitialization = true;
 
+// This vector will hold *only* the color names in German language.
+::std::vector ImpSvNumberformatScan::sGermanColorNames;
+
 const OUString ImpSvNumberformatScan::sErrStr =  "###";
 
 ImpSvNumberformatScan::ImpSvNumberformatScan( SvNumberFormatter* pFormatterP )
@@ -149,6 +152,24 @@ ImpSvNumberformatScan::ImpSvNumberformatScan( 
SvNumberFormatter* pFormatterP )
 StandardColor.push_back( Color(COL_GRAY) );
 StandardColor.push_back( Color(COL_YELLOW) );
 StandardColor.push_back( Color(COL_WHITE) );
+
+static_assert( NF_KEY_BLACK - NF_KEY_COLOR == 1,"bad 
FARBE(COLOR), SCHWARZ(BLACK) sequence");
+static_assert( NF_KEY_FIRSTCOLOR - NF_KEY_COLOR == 1,   "bad color 
sequence");
+static_assert( NF_MAX_DEFAULT_COLORS + 1 == 11, "bad color 
count");
+static_assert( NF_KEY_WHITE - NF_KEY_COLOR + 1 == 11,   "bad color 
sequence count");
+
+sGermanColorNames.resize( NF_KEY_WHITE - NF_KEY_COLOR + 1 );
+sGermanColorNames[NF_KEY_COLOR - NF_KEY_COLOR]   = "FARBE";
+sGermanColorNames[NF_KEY_BLACK - NF_KEY_COLOR]   = "SCHWARZ";
+sGermanColorNames[NF_KEY_BLUE - NF_KEY_COLOR]= "BLAU";
+sGermanColorNames[NF_KEY_GREEN - NF_KEY_COLOR]   = OUString( "GR" 
"\xDC" "N", 4, RTL_TEXTENCODING_ISO_8859_1 );
+sGermanColorNames[NF_KEY_CYAN - NF_KEY_COLOR]= "CYAN";
+sGermanColorNames[NF_KEY_RED - NF_KEY_COLOR] = "ROT";
+sGermanColorNames[NF_KEY_MAGENTA - NF_KEY_COLOR] = "MAGENTA";
+sGermanColorNames[NF_KEY_BROWN - NF_KEY_COLOR]   = "BRAUN";
+sGermanColorNames[NF_KEY_GREY - NF_KEY_COLOR]= "GRAU";
+sGermanColorNames[NF_KEY_YELLOW - NF_KEY_COLOR]  = "GELB";
+sGermanColorNames[NF_KEY_WHITE - NF_KEY_COLOR]   = "WEISS";
 }
 
 nStandardPrec = 2;
@@ -378,17 +399,17 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 sKeyword[NF_KEY_YY] ="JJ";
 sKeyword[NF_KEY_] =  "";
 sKeyword[NF_KEY_BOOLEAN] =   "LOGISCH";
-sKeyword[NF_KEY_COLOR] = "FARBE";
-sKeyword[NF_KEY_BLACK] = "SCHWARZ";
-sKeyword[NF_KEY_BLUE] =  "BLAU";
-sKeyword[NF_KEY_GREEN] = OUString( "GR" "\xDC" "N", 4, 
RTL_TEXTENCODING_ISO_8859_1 );
-sKeyword[NF_KEY_CYAN] =  "CYAN";
-sKeyword[NF_KEY_RED] =   "ROT";
-sKeyword[NF_KEY_MAGENTA] =   "MAGENTA";
-sKeyword[NF_KEY_BROWN] = "BRAUN";
-sKeyword[NF_KEY_GREY] =  "GRAU";
-sKeyword[NF_KEY_YELLOW] ="GELB";
-sKeyword[NF_KEY_WHITE] = "WEISS";
+sKeyword[NF_KEY_COLOR] = sGermanColorNames[NF_KEY_COLOR - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_BLACK] = sGermanColorNames[NF_KEY_BLACK - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_BLUE] =  sGermanColorNames[NF_KEY_BLUE - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_GREEN] = sGermanColorNames[NF_KEY_GREEN - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_CYAN] =  sGermanColorNames[NF_KEY_CYAN - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_RED] =   sGermanColorNames[NF_KEY_RED - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_MAGENTA] =   sGermanColorNames[NF_KEY_MAGENTA - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_BROWN] = sGermanColorNames[NF_KEY_BROWN - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_GREY] =  sGermanColorNames[NF_KEY_GREY - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_YELLOW] =sGermanColorNames[NF_KEY_YELLOW - 
NF_KEY_COLOR];
+sKeyword[NF_KEY_WHITE] = sGermanColorNames[NF_KEY_WHITE - 
NF_KEY_COLOR];
 }
 else
 {
@@ -603,6 +624,33 @@ Color* ImpSvNumberformatScan::GetColor(OUString& sStr)
 }
 }
 
+enum ColorKeywordConversion
+{
+None,
+GermanToEnglish,
+EnglishToGerman
+} eColorKeywordConversion(None);
+
+if (bConvertMode)
+{
+const bool bFromGerman = eTmpLnge.anyOf(
+LANGUAGE_GERMAN,
+LANGUAGE_GERMAN_SWISS,
+LANGUAGE_GERMAN_AUSTRIAN,
+LANGUAGE_GERMAN_LUXEMBOURG,
+LANGUAGE_GERMAN_LIECHTENSTEIN);
+const bool bToGerman = eNewLnge.anyOf(
+

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

 sw/source/filter/html/swhtml.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 79a13ea778265a9af9ebe2ce867063eece3f5f9d
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 13 08:46:26 2017 +

ofz: Null-deref

Change-Id: I5fefd9ba125c3769cdcb8a97f1a00a2aad5b21f4
Reviewed-on: https://gerrit.libreoffice.org/46369
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index a5dfee53c528..ef5b157fbe9c 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -414,6 +414,8 @@ SwHTMLParser::~SwHTMLParser()
 #endif
 
 OSL_ENSURE(m_aContexts.empty(), "There are still contexts on the stack");
+OSL_ENSURE(!m_nContextStMin, "There are protected contexts");
+m_nContextStMin = 0;
 while (!m_aContexts.empty())
 {
 std::unique_ptr xCntxt(PopContext());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/filter/ww8/wrtw8nds.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 255376bae1a1459ec975b49c3295abe3b9b719c6
Author: Michael Stahl 
Date:   Wed Dec 13 15:36:14 2017 +0100

sw: fix crash exporting ooo72077-2.odt to DOCX

There is an assertion about empty lastOpenCell vector in
DocxAttributeOutput::SyncNodelessCells(); since i don't know
if this splitting should be done at all for paragraphs in a table,
let's disable it for now.

(regression from c1d58c46eec5081576979f584151c7e9a4f67fe0)

Change-Id: Ied67b6047b48689cba3c41b9d0f68b7c2a257ba0

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 54466b48f5d0..a9cf06d2974a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2274,7 +2274,8 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
 
 SwSoftPageBreakList softBreakList;
 // Let's decide if we need to split the paragraph because of a section 
break
-bool bNeedParaSplit = NeedTextNodeSplit( rNode, softBreakList );
+bool bNeedParaSplit = NeedTextNodeSplit( rNode, softBreakList )
+&& !IsInTable();
 
 auto aBreakIt = softBreakList.begin();
 // iterate through portions on different pages
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sw/inc sw/Library_sw.mk sw/sdi sw/source sw/uiconfig sw/UIConfig_swriter.mk

2017-12-13 Thread Samuel Mehrbrodt

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 
 sw/Library_sw.mk|1 
 sw/UIConfig_swriter.mk  |1 
 sw/inc/cmdid.h  |1 
 sw/inc/swabstdlg.hxx|1 
 sw/sdi/swriter.sdi  |   17 
 sw/sdi/viewsh.sdi   |6 
 sw/source/ui/dialog/swdlgfact.cxx   |7 
 sw/source/ui/dialog/swdlgfact.hxx   |2 
 sw/source/uibase/dialog/SignatureLineDialog.cxx |  313 
++
 sw/source/uibase/inc/SignatureLineDialog.hxx|   43 +
 sw/source/uibase/uiview/viewdlg2.cxx|   11 
 sw/source/uibase/uiview/viewstat.cxx|1 
 sw/uiconfig/swriter/menubar/menubar.xml |1 
 sw/uiconfig/swriter/ui/signatureline.ui |  237 
+++
 15 files changed, 650 insertions(+)

New commits:
commit 03db771e92160e95b0af8710f88b0c43591e8f3e
Author: Samuel Mehrbrodt 
Date:   Mon Dec 4 16:37:14 2017 +0100

tdf#83877 Add dialog to generate signature line

Change-Id: Iacc929edf1469c7e37707f8d9518cd07642bb9dd
Reviewed-on: https://gerrit.libreoffice.org/45810
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 2c3c827be9c4..8efa138bb380 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -845,6 +845,14 @@
   1
 
   
+  
+
+  Signature ~Line
+
+
+  1
+
+  
   
 
   Appl~y
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 7ca75085cc74..4056c57deb27 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -588,6 +588,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 sw/source/uibase/config/uinums \
 sw/source/uibase/config/usrpref \
 sw/source/uibase/config/viewopt \
+sw/source/uibase/dialog/SignatureLineDialog \
 sw/source/uibase/dialog/SwSpellDialogChildWindow \
 sw/source/uibase/dialog/regionsw \
 sw/source/uibase/dialog/swabstdlg \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index caa24da40f0c..9d5a8a811ad9 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -245,6 +245,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/selectindexdialog \
sw/uiconfig/swriter/ui/selecttabledialog \
sw/uiconfig/swriter/ui/sidebarpage \
+   sw/uiconfig/swriter/ui/signatureline \
sw/uiconfig/swriter/ui/pageformatpanel \
sw/uiconfig/swriter/ui/pagestylespanel \
sw/uiconfig/swriter/ui/pageheaderpanel \
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 651c72082eff..c0ae37149ba0 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -209,6 +209,7 @@
 
 #define FN_INSERT_IDX_ENTRY_DLG (FN_INSERT + 35)/* insert index entry */
 #define FN_INSERT_FRAME_INTERACT_NOCOL (FN_INSERT + 36) /*insert interactive 
non column frame*/
+#define FN_INSERT_SIGNATURELINE (FN_INSERT + 37)/*insert signature line*/
 
 #define FN_TOOL_ANCHOR  (FN_INSERT + 49)/* Draw Anchor for object 
*/
 #define FN_TOOL_ANCHOR_PAGE (FN_INSERT + 50)/* anchor Draw object to 
page */
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index f28a86a5fac5..61e64265dfe3 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -400,6 +400,7 @@ public:
 SwCharDlgMode nDialogMode, const OUString* pFormatStr = nullptr) = 0;
 virtual VclPtr CreateSwConvertTableDlg(SwView& 
rView, bool bToTable) = 0;
 virtual VclPtr CreateSwCaptionDialog ( vcl::Window 
*pParent, SwView &rV) = 0;
+virtual VclPtr CreateSignatureLineDialog(vcl::Window* 
pParent, SwView& rView) = 0;
 
 virtual VclPtr 
CreateSwInsertDBColAutoPilot(SwView& rView,
 css::uno::Reference< css::sdbc::XDataSource> rxSource,
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 2f0d5d9ec45a..75e75897bf41 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3314,6 +3314,23 @@ SfxVoidItem InsertTopicField FN_INSERT_FLD_TOPIC
 GroupId = SfxGroupId::Insert;
 ]
 
+SfxVoidItem SignatureLineDialog FN_INSERT_SIGNATURELINE
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::In

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - sc/source

2017-12-13 Thread Tomaž Vajngerl

 sc/source/ui/inc/printfun.hxx  |   35 ---
 sc/source/ui/unoobj/docuno.cxx |4 +-
 sc/source/ui/view/printfun.cxx |   61 +
 3 files changed, 77 insertions(+), 23 deletions(-)

New commits:
commit c542db6e3b2d7b881b52565cdcb6fdf9d849
Author: TomaÅ¾ Vajngerl 
Date:   Tue Dec 12 22:24:45 2017 +0900

tdf#114384 reset the print state if the sheet changes

Reviewed-on: https://gerrit.libreoffice.org/46301
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 
(cherry picked from commit c7a2538129f16ef1253ae974737d5c9676aaf883)

Change-Id: Ia90a2bae0dab3d82cae1204a9205f386f71e5c49
Reviewed-on: https://gerrit.libreoffice.org/46375
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 286f9a407b54..8776c6490e49 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1561,7 +1561,7 @@ uno::Sequence SAL_CALL 
ScModelObj::getRenderer( sal_Int32
 }
 
 std::unique_ptr pPrintFunc;
-if (m_pPrintState)
+if (m_pPrintState && m_pPrintState->nPrintTab == nTab)
 pPrintFunc.reset(new ScPrintFunc(pDocShell, pDocShell->GetPrinter(), 
*m_pPrintState, &aStatus.GetOptions()));
 else
 pPrintFunc.reset(new ScPrintFunc(pDocShell, pDocShell->GetPrinter(), 
nTab,
@@ -1673,7 +1673,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, 
const uno::Any& aSelec
 //  pages of the same sheet
 
 std::unique_ptr pPrintFunc;
-if (m_pPrintState)
+if (m_pPrintState && m_pPrintState->nPrintTab == nTab)
 pPrintFunc.reset(new ScPrintFunc(pDev, pDocShell, *m_pPrintState, 
&aStatus.GetOptions()));
 else
 pPrintFunc.reset(new ScPrintFunc(pDev, pDocShell, nTab, 
pPrintFuncCache->GetFirstAttr(nTab), nTotalPages, pSelRange, 
&aStatus.GetOptions()));
commit dab029a384474c613709c86fa1bab133d6a900dd
Author: TomaÅ¾ Vajngerl 
Date:   Tue Dec 12 22:22:32 2017 +0900

tdf#114256 add cache criterium when to recalculate page range size

Page range size can only be valid for the input parameters, which
includes the document size, which was not taken into account at all
before. Now we look at all this parameters to decide if we need to
recalculate or not.

Change-Id: Ic52ad7516189b395c66f59aabc374c3da85f6a89
Reviewed-on: https://gerrit.libreoffice.org/46300
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 
(cherry picked from commit 5217a2a0bf27e496cc429ee45dff7c239b466ae6)
Reviewed-on: https://gerrit.libreoffice.org/46374
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index ef8b370adae7..958ab4f28352 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -96,6 +96,28 @@ public:
 namespace sc
 {
 
+struct PrintPageRangesInput
+{
+bool m_bSkipEmpty;
+bool m_bPrintArea;
+SCROW m_nStartRow;
+SCROW m_nEndRow;
+SCCOL m_nStartCol;
+SCCOL m_nEndCol;
+SCTAB m_nPrintTab;
+Size  m_aDocSize;
+
+PrintPageRangesInput()
+: m_bSkipEmpty(false)
+, m_bPrintArea(false)
+, m_nStartRow(0)
+, m_nEndRow(0)
+, m_nStartCol(0)
+, m_nEndCol(0)
+, m_nPrintTab(0)
+{}
+};
+
 class PrintPageRanges
 {
 public:
@@ -109,12 +131,16 @@ public:
 size_t m_nPagesY;
 size_t m_nTotalY;
 
-bool m_bCalculated;
+PrintPageRangesInput m_aInput;
+
+bool checkIfAlreadyCalculatedAndSet(bool bSkipEmpty, bool bPrintArea,
+SCROW nStartRow, SCROW nEndRow,
+SCCOL nStartCol, SCCOL nEndCol,
+SCTAB nPrintTab, Size const & 
aDocSize);
 
-void calculate(ScDocument* pDoc, ScPageTableParam const & rTableParam,
-   ScPageAreaParam const & rAreaParam,
+void calculate(ScDocument* pDoc, bool bSkipEmpty, bool bPrintArea,
SCROW nStartRow, SCROW nEndRow, SCCOL nStartCol, SCCOL 
nEndCol,
-   SCTAB nPrintTab);
+   SCTAB nPrintTab, Size const & aDocSize);
 };
 
 }
@@ -136,6 +162,7 @@ struct ScPrintState //  Save 
Variables from ScPrintFunc
 
 // Additional state of page ranges
 bool bSavedStateRanges;
+sc::PrintPageRangesInput aPrintPageRangesInput;
 size_t nTotalY;
 std::vector aPageEndX;
 std::vector aPageEndY;
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 2398f41ee45a..b15b0dd7ec2e 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -262,7 +262,7 @@ ScPrintFunc::ScPrintFunc(ScDocShell* pShell, SfxPrinter* 
pNewPrinter,
 m_aRanges.m_aPageEndX = rState.aPageEndX;
 m_aRanges.m_aPageEndY = rState.aPageEndY;
 m_aRanges.m_aP

[Libreoffice-commits] online.git: Changes to 'refs/tags/3.0-rc1'

2017-12-13 Thread Andras Timar

Tag '3.0-rc1' created by Andras Timar  at 
2017-12-13 13:57 +

3.0-rc1

Changes since 3.0-beta2-10:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - sc/source

2017-12-13 Thread Tomaž Vajngerl

 sc/source/ui/inc/printfun.hxx  |  106 +--
 sc/source/ui/unoobj/docuno.cxx |   28 +++-
 sc/source/ui/view/printfun.cxx |  285 +
 3 files changed, 239 insertions(+), 180 deletions(-)

New commits:
commit 0321fdb0f73dcf41c502878131e9c580bdd9c6de
Author: TomaÅ¾ Vajngerl 
Date:   Sat Dec 2 01:17:15 2017 +0900

Calculate print page ranges only when needed, cache in print state

When printing or exporting PDF, we need to calculate the page
print (cell) ranges for the current zoom level (document size).
This is quite a expensive thing to do as you need to inspect
the properties of individual cells.
The calculation ideally needs to be done only once per printing
request, but because of the rendering UNO API, this was done
everytime ScPrintFunc was instantiated, which is for every page
twice (once getRenderer is called and then when render is called).
To fix this performance issue, the print page ranges need to be
carried from one call to ScPrintFunc to the other. There already
is a print state (ScPrintState) which is used for exactly that,
but it didn't do this for print page ranges.
With this, PDF export time in a test case decreased from 17 sec to
around 3 sec.

Reviewed-on: https://gerrit.libreoffice.org/45689
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 
(cherry picked from commit 5684e53b931eaaac658bc3246ae1c3249e252fdb)

Change-Id: I97ade0e397960c5c98379e4bb28e57c5411ff757
Reviewed-on: https://gerrit.libreoffice.org/46373
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index 9a9f7ef44743..ef8b370adae7 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -65,6 +65,60 @@ struct ScPrintHFParam
 const SvxShadowItem* pShadow;
 };
 
+class ScPageRowEntry
+{
+private:
+SCROWnStartRow;
+SCROWnEndRow;
+size_t   nPagesX;
+std::vectoraHidden;
+//! Cache Number of really visible?
+
+public:
+ScPageRowEntry(){ nStartRow = nEndRow = 0; nPagesX = 0; }
+
+ScPageRowEntry(const ScPageRowEntry& r);
+ScPageRowEntry& operator=(const ScPageRowEntry& r);
+
+SCROW   GetStartRow() const { return nStartRow; }
+SCROW   GetEndRow() const   { return nEndRow; }
+size_t  GetPagesX() const   { return nPagesX; }
+voidSetStartRow(SCROW n){ nStartRow = n; }
+voidSetEndRow(SCROW n)  { nEndRow = n; }
+
+voidSetPagesX(size_t nNew);
+voidSetHidden(size_t nX);
+boolIsHidden(size_t nX) const;
+
+size_t  CountVisible() const;
+};
+
+namespace sc
+{
+
+class PrintPageRanges
+{
+public:
+PrintPageRanges();
+
+std::vector m_aPageEndX;
+std::vector m_aPageEndY;
+std::vector m_aPageRows;
+
+size_t m_nPagesX;
+size_t m_nPagesY;
+size_t m_nTotalY;
+
+bool m_bCalculated;
+
+void calculate(ScDocument* pDoc, ScPageTableParam const & rTableParam,
+   ScPageAreaParam const & rAreaParam,
+   SCROW nStartRow, SCROW nEndRow, SCCOL nStartCol, SCCOL 
nEndCol,
+   SCTAB nPrintTab);
+};
+
+}
+
 struct ScPrintState //  Save Variables from ScPrintFunc
 {
 SCTAB   nPrintTab;
@@ -79,6 +133,14 @@ struct ScPrintState //  Save 
Variables from ScPrintFunc
 longnTotalPages;
 longnPageStart;
 longnDocPages;
+
+// Additional state of page ranges
+bool bSavedStateRanges;
+size_t nTotalY;
+std::vector aPageEndX;
+std::vector aPageEndY;
+std::vector aPageRows;
+
 ScPrintState()
 : nPrintTab(0)
 , nStartCol(0)
@@ -92,37 +154,9 @@ struct ScPrintState //  Save 
Variables from ScPrintFunc
 , nTotalPages(0)
 , nPageStart(0)
 , nDocPages(0)
-{
-}
-};
-
-class ScPageRowEntry
-{
-private:
-SCROW   nStartRow;
-SCROW   nEndRow;
-size_t  nPagesX;
-std::vector aHidden;
-//! Cache Number of really visible?
-
-public:
-ScPageRowEntry(){ nStartRow = nEndRow = 0; nPagesX = 0; }
-~ScPageRowEntry()   { }
-
-ScPageRowEntry(const ScPageRowEntry& r);
-ScPageRowEntry& operator=(const ScPageRowEntry& r);
-
-SCROW   GetStartRow() const { return nStartRow; }
-SCROW   GetEndRow() const   { return nEndRow; }
-size_t  GetPagesX() const   { return nPagesX; }
-voidSetStartRow(SCROW n){ nStartRow = n; }
-voidSetEndRow(SCROW n)  { nEndRow = n; }
-
-voidSetPagesX(size_t nNew);
-voidSetHidden(size_t nX);
-boolIsHidden(size_t nX) const;
-
-size_t  CountVisible() const;
+, bSavedStateRanges(false)
+, nTotalY(0)
+{}
 };
 
 class ScPri

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sc/inc sc/source

2017-12-13 Thread Tomaž Vajngerl

 sc/inc/docuno.hxx  |2 ++
 sc/source/ui/inc/printfun.hxx  |3 +++
 sc/source/ui/unoobj/docuno.cxx |   24 ++--
 sc/source/ui/view/printfun.cxx |   35 +++
 4 files changed, 58 insertions(+), 6 deletions(-)

New commits:
commit e9b6eecdb962a346ef65284b35b76259091746ad
Author: TomaÅ¾ Vajngerl 
Date:   Fri Dec 1 22:28:48 2017 +0900

Use print state when rendering a Calc document

When rendering a Calc document with UNO rendering API for printing,
PDF export, some data (like print X, Y sizes) can be passed from one
ScPrintFunc call to the other to save us from some unnecessay
recalculation and increase performance. This was used previously for
preview, but not when rendering.
This implements some missing functions in ScPrintFunc and implements
the use of print state when rendering with UNO rendering API.

Reviewed-on: https://gerrit.libreoffice.org/45687
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 
(cherry picked from commit f1f1dd3885cdbf00032a362275f36e408ef5ac9f)

Change-Id: Ic69dee99223961befb9b5dddf8ec5c268630bf79
Reviewed-on: https://gerrit.libreoffice.org/46371
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 80ab14d95950..b041c0e79487 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -59,6 +59,7 @@ class ScDocShell;
 class ScAnnotationObj;
 class ScMarkData;
 class ScPrintFuncCache;
+struct ScPrintState;
 class ScPrintSelectionStatus;
 class ScTableColumnObj;
 class ScTableRowObj;
@@ -91,6 +92,7 @@ private:
 ScDocShell* pDocShell;
 ScPrintFuncCache*   pPrintFuncCache;
 ScPrintUIOptions*   pPrinterOptions;
+std::unique_ptr m_pPrintState;
 css::uno::Reference xNumberAgg;
 css::uno::Reference xDrawGradTab;
 css::uno::Reference xDrawHatchTab;
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index 000d58917ee9..38e697c44b45 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -224,6 +224,9 @@ public:
  const ScPrintOptions* pOptions = nullptr,
  ScPageBreakData* pData = nullptr );
 
+ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter,
+const ScPrintState& rState, const 
ScPrintOptions* pOptions );
+
 // ctors for device other than printer - for preview and 
pdf:
 
 ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, 
SCTAB nTab,
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 064c8b699533..c4c28780d9ae 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -22,6 +22,7 @@
 #include "scitems.hxx"
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1555,9 +1556,14 @@ uno::Sequence SAL_CALL 
ScModelObj::getRenderer( sal_Int32
 aMark.GetMarkArea( aRange );
 pSelRange = &aRange;
 }
-ScPrintFunc aFunc( pDocShell, pDocShell->GetPrinter(), nTab,
-pPrintFuncCache->GetFirstAttr(nTab), nTotalPages, 
pSelRange, &aStatus.GetOptions() );
-aFunc.SetRenderFlag( true );
+
+std::unique_ptr pPrintFunc;
+if (m_pPrintState)
+pPrintFunc.reset(new ScPrintFunc(pDocShell, pDocShell->GetPrinter(), 
*m_pPrintState, &aStatus.GetOptions()));
+else
+pPrintFunc.reset(new ScPrintFunc(pDocShell, pDocShell->GetPrinter(), 
nTab,
+ 
pPrintFuncCache->GetFirstAttr(nTab), nTotalPages, pSelRange, 
&aStatus.GetOptions()));
+pPrintFunc->SetRenderFlag( true );
 
 Range aPageRange( nRenderer+1, nRenderer+1 );
 MultiSelection aPage( aPageRange );
@@ -1567,13 +1573,19 @@ uno::Sequence SAL_CALL 
ScModelObj::getRenderer( sal_Int32
 long nDisplayStart = pPrintFuncCache->GetDisplayStart( nTab );
 long nTabStart = pPrintFuncCache->GetTabStart( nTab );
 
-(void)aFunc.DoPrint( aPage, nTabStart, nDisplayStart, false, nullptr );
+(void)pPrintFunc->DoPrint( aPage, nTabStart, nDisplayStart, false, nullptr 
);
 
 ScRange aCellRange;
-bool bWasCellRange = aFunc.GetLastSourceRange( aCellRange );
-Size aTwips = aFunc.GetPageSize();
+bool bWasCellRange = pPrintFunc->GetLastSourceRange( aCellRange );
+Size aTwips = pPrintFunc->GetPageSize();
 awt::Size aPageSize( TwipsToHMM( aTwips.Width() ), TwipsToHMM( 
aTwips.Height() ) );
 
+if (!m_pPrintState)
+{
+m_pPrintState.reset(new ScPrintState());
+pPrintFunc->GetPrintState(*m_pPrintState);
+}
+
 long nPropCount = bWasCellRange ? 3 : 2;
 uno::Sequence aSequence(nPropCount);
 beans::PropertyValue* pArray = aSequence.getArray();
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 292b9d1de392..6a1dd38be3ca 100644
---

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 9 commits - filter/source include/svx sfx2/inc sfx2/source svx/source sw/inc sw/qa sw/source

2017-12-13 Thread Juergen Funk

Rebased ref, commits from common ancestor:
commit a89aefc93fa25001a99f1cec3d5d25bab16e60b6
Author: Juergen Funk 
Date:   Wed Dec 13 12:00:22 2017 +

fix build: incompatible exception specs

For gcc 4x and 5.2, we need to have matching, or more narrow, exception
specs for overridden virtual methods.

Change-Id: I2f2da8b8a9ac5639a3d885cd6851e1d0125651b1

diff --git a/filter/source/config/cache/typedetection.hxx 
b/filter/source/config/cache/typedetection.hxx
index f948e6522697..ae75131a0fa6 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -383,17 +383,17 @@ private:
 public:
 
 using cppu::WeakComponentImplHelperBase::disposing;
-virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+virtual void SAL_CALL disposing(const css::lang::EventObject&) throw ()  
override
 {
 }
 
 // XTerminateListener
-virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
throw () override
 {
 m_pTypeDetection->cancel();
 }
 
-virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
throw () override
 {
 }
 
diff --git a/sfx2/inc/preventduplicateinteraction.hxx 
b/sfx2/inc/preventduplicateinteraction.hxx
index f9097576e480..0f89169b6087 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -81,19 +81,19 @@ private:
 public:
 
 using cppu::WeakComponentImplHelperBase::disposing;
-virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+virtual void SAL_CALL disposing(const css::lang::EventObject&) throw () 
override
 {
 }
 
 // XTerminateListener
-virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
throw () override
 {
 closewarningdialogs();
 Application::PostUserEvent(LINK(this, WarningDialogsParent, 
TerminateDesktop));
 throw css::frame::TerminationVetoException();
 }
 
-virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
throw () override
 {
 }
 
@@ -221,7 +221,8 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
 // uno interface
 public:
 
-virtual void SAL_CALL initialize(const 
css::uno::Sequence& rArguments) override;
+virtual void SAL_CALL initialize(const 
css::uno::Sequence& rArguments)
+throw(css::uno::RuntimeException, std::exception) override;
 
 /**
 @interface  XInteractionHandler
diff --git a/sfx2/source/appl/preventduplicateinteraction.cxx 
b/sfx2/source/appl/preventduplicateinteraction.cxx
index 7ef25e70e82d..dd7263d51c6d 100644
--- a/sfx2/source/appl/preventduplicateinteraction.cxx
+++ b/sfx2/source/appl/preventduplicateinteraction.cxx
@@ -243,6 +243,7 @@ bool PreventDuplicateInteraction::getInteractionInfo(const 
css::uno::Type&
 }
 
 void SAL_CALL PreventDuplicateInteraction::initialize(const 
css::uno::Sequence& rArguments)
+  throw (css::uno::RuntimeException, std::exception)
 {
 // If we're re-initialized to set a specific new window as a parent then 
drop our temporary
 // dialog parent
commit 5722c826a0eecc52892df4e839aa78f0861be80f
Author: Jan-Marek Glogowski 
Date:   Fri Jul 22 18:00:59 2016 +0200

Remove now unused SwTextBoxHelper functions

(Manually cherry picked from commit 
f7f5d27066b696ac4e33246d3794bde8058e8622)

Change-Id: I39500424c79040b1887ea74081fdf0ea0bc5f009
Reviewed-on: https://gerrit.libreoffice.org/46331
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 98983bad9f42..32fc2167c72a 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -73,8 +73,6 @@ 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 xShape);
-static SwFrameFormat* findTextBox(const SwFrameFormat* pShape);
-static SwFrameFormat* findTextBox(const 
css::uno::Reference& xShape);
 /// Return the textbox rectangle of a draw shape (in twips).
 static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = 
true);
 
@@ -91,17 +89,6 @@ public:
 /// Is pObject a textbox of a drawinglayer shape?
 static bool isTextBox(const SdrObject* pObject);
 
-/// Look up TextFrames in a document, which are in fact TextBoxes.
-static std::set findTextBoxes(const SwDoc* pDoc);
-/**
- * Look up

[Libreoffice-commits] core.git: filter/CppunitTest_filter_textfilterdetect.mk filter/Module_filter.mk filter/qa filter/source

2017-12-13 Thread Miklos Vajna

 filter/CppunitTest_filter_textfilterdetect.mk   |   46 +
 filter/Module_filter.mk |1 
 filter/qa/unit/data/tdf114428.xhtml |9 +++
 filter/qa/unit/textfilterdetect.cxx |   63 
 filter/source/textfilterdetect/filterdetect.cxx |   24 -
 5 files changed, 140 insertions(+), 3 deletions(-)

New commits:
commit 4af729f31c64c09c76ea8bcfa5067092571b92de
Author: Miklos Vajna 
Date:   Wed Dec 13 09:49:41 2017 +0100

tdf#114428 filter: recognize XHTML with XML declaration as HTML

The problem was the additional



XML declaration before the usual

https://gerrit.libreoffice.org/46324
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/filter/CppunitTest_filter_textfilterdetect.mk 
b/filter/CppunitTest_filter_textfilterdetect.mk
new file mode 100644
index ..dfcaee9ce16a
--- /dev/null
+++ b/filter/CppunitTest_filter_textfilterdetect.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_textfilterdetect))
+
+$(eval $(call gb_CppunitTest_use_api,filter_textfilterdetect,\
+   offapi \
+   udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_textfilterdetect, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+   test \
+   textfd \
+   tl \
+   unotest \
+   utl \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_textfilterdetect, \
+   filter/qa/unit/textfilterdetect \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_textfilterdetect))
+
+$(eval $(call gb_CppunitTest_use_vcl,filter_textfilterdetect))
+
+$(eval $(call gb_CppunitTest_use_components,filter_textfilterdetect,\
+configmgr/source/configmgr \
+filter/source/textfilterdetect/textfd \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_textfilterdetect))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index a7834b6dc631..08aa0f2d395b 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Module_add_check_targets,filter,\
 CppunitTest_filter_xslt \
 CppunitTest_filter_priority \
 CppunitTest_filter_msfilter \
+CppunitTest_filter_textfilterdetect \
 ))
 
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
diff --git a/filter/qa/unit/data/tdf114428.xhtml 
b/filter/qa/unit/data/tdf114428.xhtml
new file mode 100644
index ..f08f0fa4a028
--- /dev/null
+++ b/filter/qa/unit/data/tdf114428.xhtml
@@ -0,0 +1,9 @@
+
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/1999/xhtml";>
+  
+Title of document
+  
+  hello world
+
diff --git a/filter/qa/unit/textfilterdetect.cxx 
b/filter/qa/unit/textfilterdetect.cxx
new file mode 100644
index ..272ba85b330b
--- /dev/null
+++ b/filter/qa/unit/textfilterdetect.cxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * 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/.
+ */
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace com::sun::star;
+
+namespace
+{
+/// Test class for PlainTextFilterDetect.
+class TextFilterDetectTest : public test::BootstrapFixture
+{
+public:
+void testTdf114428();
+
+CPPUNIT_TEST_SUITE(TextFilterDetectTest);
+CPPUNIT_TEST(testTdf114428);
+CPPUNIT_TEST_SUITE_END();
+};
+
+char const DATA_DIRECTORY[] = "/filter/qa/unit/data/";
+
+void TextFilterDetectTest::testTdf114428()
+{
+uno::Reference xComponentContext
+= comphelper::getComponentContext(getMultiServiceFactory());
+uno::Reference xDetect(
+
getMultiServiceFactory()->createInstance("com.sun.star.comp.filters.PlainTextFilterDetect"),
+uno::UNO_QUERY);
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"tdf114428.xhtml";
+SvFileStream aStream(aURL, StreamMode::READ);
+uno::Reference xStream(new utl::OStreamWrapper(aStream));
+uno::Sequence aDescriptor
+= { comphelper::makePropertyValue("DocumentService",
+  
OUString("com.sun.star.text.TextDocument")),
+comphelper::makePropertyValue("InputStream", xStream),
+comphelper::makePropertyValue("TypeName", 
OUString("generic_HTML")) };
+xDetect

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - kit/Kit.cpp

 kit/Kit.cpp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f6447576773e10b554530b10e11d342cb43ff32d
Author: Jan Holesovsky 
Date:   Wed Dec 13 14:28:57 2017 +0100

lokdialog: Set the language of the given view.

Change-Id: I54d542ff736b37c9b08c3e73f65d3fc27d095acc
Reviewed-on: https://gerrit.libreoffice.org/46385
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 61f5f4c8..5c6eb920 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1500,9 +1500,12 @@ private:
 
 const int viewId = _loKitDocument->getView();
 session->setViewId(viewId);
+
 _sessionUserInfo[viewId] = UserInfo(session->getViewUserId(), 
session->getViewUserName(),
 session->getViewUserExtraInfo(), 
session->isReadOnly());
 
+_loKitDocument->setViewLanguage(viewId, lang.c_str());
+
 _viewIdToCallbackDescr.emplace(viewId,
std::unique_ptr(new 
CallbackDescriptor({ this, viewId })));
 _loKitDocument->registerCallback(ViewCallback, 
_viewIdToCallbackDescr[viewId].get());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tdf#108580: integrate vc_redist.exe into Windows installer

2017-12-13 Thread Jan-Marek Glogowski

Hi Mike,

Am 13.12.2017 um 14:02 schrieb Mike Kaganski:

[snip] how to integrate vc_redist into LO MSI

> This has its drawback: if one wants to use unattended installation
> (without UI; one example is deployment using ActiveDirectory GPO), then
> InstallUISequence is not run, and so VCRedist isn't installed. In this
> case, one should install VCRedist separately. Supposedly this should not
> be huge problem, because this is the case for many existing applications
> that need separate VCRedist deployment in these scenarios.
> 
> Please share your opinions. Is this change viable?

I would prefer security updates and some unattended install hassle,
which is already well known from other applications.

Mentioning this "unattended install" problem in the release notes should
be enough to give an admin an idea how to fix the problem.

ATB

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

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

 vcl/qt5/Qt5Bitmap.cxx |2 +-
 vcl/qt5/Qt5Bitmap.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1d6b85f85925c3b4d2d2bb8eaf237b10bb8f7d60
Author: Stephan Bergmann 
Date:   Wed Dec 13 14:30:30 2017 +0100

Fix --enable-qt5

...after e75abe6e0a4ea250366bb29c0ece697e9b1b80a1 "convert tolerance params 
to
sal_uInt8"

Change-Id: I6677fa21d4786ebadcded53e1542514465d5d0a2

diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index 0f312e0057e2..49b7a22e6fb2 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -239,7 +239,7 @@ bool Qt5Bitmap::Scale(const double& rScaleX, const double& 
rScaleY, BmpScaleFlag
 return false;
 }
 
-bool Qt5Bitmap::Replace(const Color& rSearchColor, const Color& rReplaceColor, 
sal_uLong nTol)
+bool Qt5Bitmap::Replace(const Color& rSearchColor, const Color& rReplaceColor, 
sal_uInt8 nTol)
 {
 return false;
 }
diff --git a/vcl/qt5/Qt5Bitmap.hxx b/vcl/qt5/Qt5Bitmap.hxx
index c8d35e2050cc..6ecdebed5ca1 100644
--- a/vcl/qt5/Qt5Bitmap.hxx
+++ b/vcl/qt5/Qt5Bitmap.hxx
@@ -61,7 +61,7 @@ public:
 virtual bool Scale(const double& rScaleX, const double& rScaleY,
BmpScaleFlag nScaleFlag) override;
 virtual bool Replace(const Color& rSearchColor, const Color& rReplaceColor,
- sal_uLong nTol) override;
+ sal_uInt8 nTol) override;
 };
 
 /* 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 'private/swe/libreoffice-5-2+backports' - filter/source sfx2/inc sfx2/source

2017-12-13 Thread Juergen Funk

 filter/source/config/cache/typedetection.hxx |6 +++---
 sfx2/inc/preventduplicateinteraction.hxx |9 +
 sfx2/source/appl/preventduplicateinteraction.cxx |1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 6ce5c193a1ea787453e69f38e3aaebd67aec0031
Author: Juergen Funk 
Date:   Wed Dec 13 12:00:22 2017 +

fix build: incompatible exception specs

For gcc 4x and 5.2, we need to have matching, or more narrow, exception
specs for overridden virtual methods.

Change-Id: I2f2da8b8a9ac5639a3d885cd6851e1d0125651b1

diff --git a/filter/source/config/cache/typedetection.hxx 
b/filter/source/config/cache/typedetection.hxx
index f948e6522697..ae75131a0fa6 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -383,17 +383,17 @@ private:
 public:
 
 using cppu::WeakComponentImplHelperBase::disposing;
-virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+virtual void SAL_CALL disposing(const css::lang::EventObject&) throw ()  
override
 {
 }
 
 // XTerminateListener
-virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
throw () override
 {
 m_pTypeDetection->cancel();
 }
 
-virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
throw () override
 {
 }
 
diff --git a/sfx2/inc/preventduplicateinteraction.hxx 
b/sfx2/inc/preventduplicateinteraction.hxx
index f9097576e480..0f89169b6087 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -81,19 +81,19 @@ private:
 public:
 
 using cppu::WeakComponentImplHelperBase::disposing;
-virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+virtual void SAL_CALL disposing(const css::lang::EventObject&) throw () 
override
 {
 }
 
 // XTerminateListener
-virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
throw () override
 {
 closewarningdialogs();
 Application::PostUserEvent(LINK(this, WarningDialogsParent, 
TerminateDesktop));
 throw css::frame::TerminationVetoException();
 }
 
-virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
throw () override
 {
 }
 
@@ -221,7 +221,8 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
 // uno interface
 public:
 
-virtual void SAL_CALL initialize(const 
css::uno::Sequence& rArguments) override;
+virtual void SAL_CALL initialize(const 
css::uno::Sequence& rArguments)
+throw(css::uno::RuntimeException, std::exception) override;
 
 /**
 @interface  XInteractionHandler
diff --git a/sfx2/source/appl/preventduplicateinteraction.cxx 
b/sfx2/source/appl/preventduplicateinteraction.cxx
index 7ef25e70e82d..dd7263d51c6d 100644
--- a/sfx2/source/appl/preventduplicateinteraction.cxx
+++ b/sfx2/source/appl/preventduplicateinteraction.cxx
@@ -243,6 +243,7 @@ bool PreventDuplicateInteraction::getInteractionInfo(const 
css::uno::Type&
 }
 
 void SAL_CALL PreventDuplicateInteraction::initialize(const 
css::uno::Sequence& rArguments)
+  throw (css::uno::RuntimeException, std::exception)
 {
 // If we're re-initialized to set a specific new window as a parent then 
drop our temporary
 // dialog parent
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

tdf#108580: integrate vc_redist.exe into Windows installer

2017-12-13 Thread Mike Kaganski

Hi!

Some time ago, we had a ESC decision [1] to use a workaround for bug
108580 [2] about problem with VCRedist, which stopped to install
essential part of libraries on Windows Vista and above (currently
affected are Win7, Win8, and Win8.1), which was done in
71d9a61302e65fe091cf70c13fa72b3df09b7e3a [3], and "for 6.0 do something
clever".

Here is the proposal [4] that pretends to be clever :)
The following is essentially a copy-paste from the patch commit message:

Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a
workaround described at [5] as "App-local deployment of the Universal
CRT". We just copy all UCRT DLLs to LibreOffice/program. This has a
drawback though, that our UCRT is not updated by Windows Update, so
users would rely on LibreOffice updates in case of some vulnerabilities
in UCRT (and they could even not realize they have that problem).

MS recommends to install UCRT using EXEs they provide from their site.
The EXEs install both VCRuntimes and UCRTs, along with required patches,
for all Windows versions (Windows XP through Windows 10, where they only
install VCRuntimes); the installed libraries are managed by system's
update mechanism. But those EXEs cannot be used in MSI custom actions
inside InstallExecuteSequence, because they use MSI themselves.

So this patch integrates the vc_redist.xXX.exe into MSI binary table,
and uses custom action to run the EXE after ExecuteAction in
InstallUISequence. This will show the user a VCRedist install window
after the main LibreOffice installation finishes; no user interaction is
required (except one more UAC request), and errors are ignored.

Since this installation takes care of both VCRuntime and UCRT, we can
ultimately drop both the app-local workaround, and vcredist merge module
(so VCRuntime would also be updated by system).

This has its drawback: if one wants to use unattended installation
(without UI; one example is deployment using ActiveDirectory GPO), then
InstallUISequence is not run, and so VCRedist isn't installed. In this
case, one should install VCRedist separately. Supposedly this should not
be huge problem, because this is the case for many existing applications
that need separate VCRedist deployment in these scenarios.

Please share your opinions. Is this change viable?

The patch itself IMO needs some polish: I suppose that we should remove
redundant workaround (and possibly even merge module bits) if we accept
it. But it is in working state, so testing is possible.

[1]
https://lists.freedesktop.org/archives/libreoffice-qa/2017-November/010300.html

[2] https://bugs.documentfoundation.org/show_bug.cgi?id=108580
[3]
https://cgit.freedesktop.org/libreoffice/core/commit/?id=71d9a61302e65fe091cf70c13fa72b3df09b7e3a

[4] https://gerrit.libreoffice.org/46356
[5]
https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/

--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sw/source/filter/ww8/wrtw8nds.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 07138b4f5cd5dc2585b9f63f68f3e2badd34d3c7
Author: Michael Stahl 
Date:   Wed Dec 13 13:06:49 2017 +0100

sw: fix crash exporting tdf93816-2.odt to WW8

The problem is that nLen = *aBreakIt - nAktPos - ofs; results in -12.

It doesn't make sense to me that nEnd should still be the end of the
paragraph in this case.

Change-Id: I0c9df6a938035b3bc2c8857ef09206d8967c20f4

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 76120b876fa4..54466b48f5d0 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2318,7 +2318,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
 
 const OUString& aStr( rNode.GetText() );
 
-sal_Int32 const nEnd = aStr.getLength();
+sal_Int32 const nEnd = bNeedParaSplit ? *aBreakIt : aStr.getLength();
 bool bIncludeEndOfParaCRInRedlineProperties = false;
 sal_Int32 nOpenAttrWithRange = 0;
 
@@ -2496,8 +2496,10 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode 
)
 nLen -= ofs;
 
 // if paragraph needs to be split, write only until split 
position
+assert(!bNeedParaSplit || nAktPos <= *aBreakIt);
 if( bNeedParaSplit && nAktPos + ofs + nLen > *aBreakIt)
 nLen = *aBreakIt - nAktPos - ofs;
+assert(0 <= nLen);
 
 OUString aSnippet( aAttrIter.GetSnippet( aStr, nAktPos + ofs, 
nLen ) );
 if ( ( m_nTextTyp == TXT_EDN || m_nTextTyp == TXT_FTN ) && 
nAktPos == 0 && nLen > 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .git-hooks/pre-commit solenv/clang-format writerfilter/source

2017-12-13 Thread Miklos Vajna

 .git-hooks/pre-commit  |3 +--
 solenv/clang-format/ClangFormat.pm |   12 ++--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 2e4ecd03d63268eec0f4045b126aa8cfdb75dee7
Author: Miklos Vajna 
Date:   Wed Dec 13 09:36:51 2017 +0100

clang-format: ignore not staged hunks

09:28 <@sberg> vmiklos, I think I ran into a scenario last night where I had
both `git add`-ed and non-added changes in a non-blacklisted file, and the
non-added changes violated clang-format (and the added ones did not), and 
the
commit hook complained

So make sure we validate the index version, not the filesystem one.

(And modify a formatted file to trigger CI validation of the hook change
itself.)

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

diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
index c0464e1c0778..e25532bb0662 100755
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@@ -161,8 +161,7 @@ sub check_style($)
 print("cp clang-format-$version-$platform clang-format\n");
 print("chmod +x clang-format\n\n");
 
-print("(Or read the instructions how to build it yourself 
at\n");
-
print(").\n\n");
+print("(Or read solenv/clang-format/README on how to build it 
yourself.\n");
 return;
 }
 if (!ClangFormat::check_style($clang_format, $filename))
diff --git a/solenv/clang-format/ClangFormat.pm 
b/solenv/clang-format/ClangFormat.pm
index 1ec19ada2466..024fe7c1f87f 100644
--- a/solenv/clang-format/ClangFormat.pm
+++ b/solenv/clang-format/ClangFormat.pm
@@ -91,11 +91,19 @@ sub find()
 return $clang_format;
 }
 
-# Diffs the original and the formatted version of a single file.
+# Diffs the original and the formatted version of a single file from the index.
 sub check_style($$)
 {
+# Make sure that not staged changes are not considered when diffing.
 my ($clang_format, $filename) = @_;
-return system("'$clang_format' $filename | git --no-pager diff --no-index 
--exit-code $filename -") == 0;
+my $index = $filename . ".index";
+system("git show :$filename > $index");
+my $format = $index . ".format";
+system("'$clang_format' -assume-filename=$filename $index > $format");
+my $ret = system("git --no-pager diff --no-index --exit-code $index 
$format") == 0;
+unlink($index);
+unlink($format);
+return $ret;
 }
 
 # Private functions.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3cd40f81d9c6..081efdca95cc 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3140,7 +3140,7 @@ RTFError RTFDocumentImpl::popState()
 {
 if (m_aStates.top().eDestination == 
Destination::LISTOVERRIDEENTRY)
 {
-// copy properties upwards so upper popState inserts it
+// copy properties upwards so upper popState() inserts it
 m_aStates.top().aTableAttributes = aState.aTableAttributes;
 m_aStates.top().aTableSprms = aState.aTableSprms;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update, calc threading

On Wed, 2017-12-13 at 08:48 +, Crashtest VM wrote:
> New crashtest update available at http://dev-builds.libreoffice.org/c
> rashtest/b5bab910a7d1dcdcc4c10343cc74f2731560b68f/

Still got a lot of calc threading crashes and failures, e.g tdf95460-
1.odt crashes (https://gerrit.libreoffice.org/#/c/46380/ gets us past
that, though unsure if that really makes sense) and then goes on to
assert in ScDocument::GetFormatTable anyway, so something more needed
there
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: 2 commits - esc-reporting/qa-tools.py

2017-12-13 Thread Xisco Fauli

 esc-reporting/qa-tools.py |   30 ++
 1 file changed, 22 insertions(+), 8 deletions(-)

New commits:
commit ded52a2bc89a33dca60898934746f874d12de616
Author: Xisco Fauli 
Date:   Wed Dec 13 13:16:55 2017 +0100

QA tools: Avoid pop when the list is empty

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index 7ea511a..b8eafb9 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -395,6 +395,7 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 isReopened = False
 closeDate = None
 reopenerEmail = ""
+isConfirmed = False
 
 for action in row['history']:
 actionMail = action['who']
@@ -435,10 +436,12 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 
statList['bugs']['confirmed']['id'].append(rowId)
 
statList['bugs']['confirmed']['author'].append(actionMail)
 
statList['bugs']['confirmed']['status'][rowStatus] += 1
-else:
+isConfirmed = True
+elif isConfirmed:
 statList['bugs']['confirmed']['id'].pop()
 statList['bugs']['confirmed']['author'].pop()
 
statList['bugs']['confirmed']['status'][rowStatus] -= 1
+isConfirmed = False
 
 if change['field_name'] == 'version':
 if actionDate >= cfg['reportPeriod'] and 
(isOpen(rowStatus) or rowStatus == 'UNCONFIRMED'):
commit b711a5ebd3b0defa084cfe74be24a4ddfbdd3f53
Author: Xisco Fauli 
Date:   Wed Dec 13 12:59:03 2017 +0100

QA tools: Warn about these conditions:

- Unconfirmed bugs untouched for more than 2 months which last commenter is 
not
the reporter
- Needinfo bugs untouced for more than 2 months which last commenter is
the reporter
- Unconfirmed bugs untouced for more than 2 months with only 1 comment

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index 01e0068..7ea511a 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -24,13 +24,13 @@ newUserPeriodDays = 30
 
 fixBugPingPeriodDays = 30
 
-untouchedUnconfirmedPeriodDays = 30
+retestPeriodDays = 60
 
 untouchedPeriodDays = 365
 
 inactiveAssignedPeriodDays = 90
 
-targets_list = ['5.3.6', '5.4.1']
+targets_list = ['5.3.7', '5.4.3', '6.0.0']
 
 periods_list = [30, 60, 90, 180]
 
@@ -714,13 +714,25 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 row['product'] == 'Impress Remote') and 
row['severity'] != 'enhancement':
 statList['massping']['untouched'].append(rowId)
 
-if len(comments) and rowStatus == 'UNCONFIRMED' and 
comments[-1]['creator'] != creatorMail and \
-
datetime.datetime.strptime(row['last_change_time'], "%Y-%m-%dT%H:%M:%SZ") < 
cfg['untouchedUnconfirmedPeriod'] and \
-
datetime.datetime.strptime(row['last_change_time'], "%Y-%m-%dT%H:%M:%SZ") >= 
cfg['untouchedUnconfirmedDiff']:
+if rowStatus == 'UNCONFIRMED' and comments[-1]['creator'] != 
creatorMail and \
+datetime.datetime.strptime(row['last_change_time'], 
"%Y-%m-%dT%H:%M:%SZ") < cfg['retestPeriod']:
 if 'untouchedUnconfirmed' not in lResults:
 lResults['untouchedUnconfirmed'] = [[],[]]
 lResults['untouchedUnconfirmed'][0].append(rowId)
 
lResults['untouchedUnconfirmed'][1].append(comments[-1]['creator'])
+elif rowStatus == 'NEEDINFO' and comments[-1]['creator'] == 
creatorMail and \
+datetime.datetime.strptime(row['last_change_time'], 
"%Y-%m-%dT%H:%M:%SZ") < cfg['retestPeriod']:
+if 'NeedInfoProvided' not in lResults:
+lResults['NeedInfoProvided'] = [[],[]]
+lResults['NeedInfoProvided'][0].append(rowId)
+
lResults['NeedInfoProvided'][1].append(comments[-1]['creator'])
+else:
+if rowStatus == 'UNCONFIRMED' and \
+datetime.datetime.strptime(row['last_change_time'], 
"%Y-%m-%dT%H:%M:%SZ") < cfg['retestPeriod']:
+if 'Unconfirmed1Comment' not in lResults:
+lResults['Unconfirmed1Comment'] = [[],[]]
+lResults['Unconfirmed1Comment'][0].append(rowId)
+lResults['Unconfirmed1Comment'][1].append(creatorMail)
 
 for person in row['cc_detail']:
 email = person['email']
@@ -1370,8 +1382,7 @@ def runCfg(homeDir):
 cfg['fixBugPingPeriod'] = util_convert_days_to_datetime(cfg, 
fixBugPingPeriodDays)
 c

[Libreoffice-commits] core.git: compilerplugins/clang

 compilerplugins/clang/salcall.cxx |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 2f28d2b4fa92be7dca47ea48c1a68db7b2060608
Author: Stephan Bergmann 
Date:   Wed Dec 13 08:42:34 2017 +0100

Improve loplugin:salcall error reporting

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

diff --git a/compilerplugins/clang/salcall.cxx 
b/compilerplugins/clang/salcall.cxx
index 61fb4e1a5f0b..f60eecf40e80 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -301,11 +301,23 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
 if (bOK)
 return true;
 
-report(DiagnosticsEngine::Warning, "SAL_CALL unnecessary here", rewriteLoc)
-<< decl->getSourceRange();
+if (bDeclIsSalCall)
+{
+report(DiagnosticsEngine::Warning, "SAL_CALL unnecessary here",
+   rewriteLoc.isValid() ? rewriteLoc : decl->getLocation())
+<< decl->getSourceRange();
+}
 if (canonicalDecl != decl)
+{
 report(DiagnosticsEngine::Warning, "SAL_CALL unnecessary here", 
rewriteCanonicalLoc)
 << canonicalDecl->getSourceRange();
+if (!bDeclIsSalCall)
+{
+report(DiagnosticsEngine::Note, "defined here (without SAL_CALL 
decoration)",
+   decl->getLocation())
+<< decl->getSourceRange();
+}
+}
 
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Some points on clang-format usage


On 11/17/2017 10:03 AM, Stephan Bergmann wrote:

* clang-format cannot automatically reformat code

Most comments in the code are written by humans, for humans.  They are 
often placed in a way that makes it technically unclear what code they 
pertain to, relying on humans to nevertheless easily discern that.  For 
example, in


void f(int x) { g(x + 1); } // long comment explaining how g 
internally subtracts one


the comment clearly pertains to the call to g.  Yet, clang-format will 
reformat this to something like



void f(int x)
{
    g(x + 1);
} // long comment explaining how g internally subtracts one


instead of


void f(int x)
{
    g(x + 1); // long comment explaining how g internally subtracts one
}


thereby obscuring things.  Always review automatically reformatted code 
for glitches like this.



Another gotcha to watch out for related to comments is how


void decl1(); // lengthy comment comment comment comment comment comment 
comment comment comment
  // comment comment comment comment comment comment comment 
comment pertaining to decl1
void decl2();
// lengthy comment comment comment comment comment comment comment comment 
pertaining to decl2
void decl3();

void f() {
statement1(); // lengthy comment comment comment comment comment comment 
comment comment comment
  // comment comment comment comment comment comment pertaining 
to statement1
statement2();
// lengthy comment comment comment comment comment comment comment 
pertaining to statement2
statement3();
}


is reformatted to


void decl1(); // lengthy comment comment comment comment comment comment 
comment comment comment
// comment comment comment comment comment comment comment comment 
pertaining to decl1
void decl2();
// lengthy comment comment comment comment comment comment comment comment 
pertaining to decl2
void decl3();

void f()
{
statement1(); // lengthy comment comment comment comment comment comment 
comment comment comment
// comment comment comment comment comment comment pertaining to 
statement1
statement2();
// lengthy comment comment comment comment comment comment comment 
pertaining to statement2
statement3();
}

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

Re: tdf#114185: [Calc number format] Acceptance of English number format

Hi,

For the records..

On Wednesday, 2017-12-06 18:20:38 +0100, Eike Rathke wrote:

> Maybe we have to treat the TEXT() case different, which uses
> SvNumberFormatter::GetPreviewStringGuess() that may convert format codes
> or not. Probably logic from down there could be enhanced to ignore
> misplaced keywords in certain context

Done with
https://cgit.freedesktop.org/libreoffice/core/commit/?id=482182fd0331a0be371f8f58dc74aa05a68f0a1d
https://cgit.freedesktop.org/libreoffice/core/commit/?id=b2cd9dd31183c45942c2f522104654ff1f8e6889

and some clean-up in
https://cgit.freedesktop.org/libreoffice/core/commit/?id=38a3886fc1464e635985f9ec82b48e0a69f6e536

  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

[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source framework/inc framework/source i18npool/source i18nutil/source include/framework include/i18nutil xmloff/source

 compilerplugins/clang/salcall.cxx   |  160 +++
 compilerplugins/clang/test/salcall.cxx  |   11 -
 dbaccess/source/ui/inc/sbamultiplex.hxx |4 
 framework/inc/dispatch/mailtodispatcher.hxx |2 
 framework/inc/dispatch/oxt_handler.hxx  |2 
 framework/inc/dispatch/servicehandler.hxx   |2 
 framework/inc/dispatch/systemexec.hxx   |2 
 framework/inc/jobs/helponstartup.hxx|2 
 framework/inc/jobs/shelljob.hxx |2 
 framework/inc/macros/registration.hxx   |2 
 framework/inc/macros/xserviceinfo.hxx   |4 
 framework/inc/recording/dispatchrecorder.hxx|2 
 framework/inc/recording/dispatchrecordersupplier.hxx|2 
 framework/inc/services/mediatypedetectionhelper.hxx |2 
 framework/inc/services/uriabbreviation.hxx  |2 
 framework/inc/tabwin/tabwinfactory.hxx  |2 
 framework/inc/uielement/fontmenucontroller.hxx  |2 
 framework/inc/uielement/fontsizemenucontroller.hxx  |2 
 framework/inc/uielement/footermenucontroller.hxx|2 
 framework/inc/uielement/headermenucontroller.hxx|2 
 framework/inc/uielement/langselectionmenucontroller.hxx |2 
 framework/inc/uielement/macrosmenucontroller.hxx|2 
 framework/inc/uielement/newmenucontroller.hxx   |2 
 framework/inc/uielement/notebookbarmenucontroller.hxx   |2 
 framework/inc/uielement/toolbarmodemenucontroller.hxx   |2 
 framework/inc/uielement/toolbarsmenucontroller.hxx  |2 
 framework/source/inc/dispatch/dispatchdisabler.hxx  |2 
 i18npool/source/registerservices/registerservices.cxx   |4 
 i18nutil/source/utility/unicode.cxx |2 
 include/framework/dispatchhelper.hxx|4 
 include/i18nutil/unicode.hxx|6 
 xmloff/source/draw/sdxmlexp.cxx |6 
 xmloff/source/draw/sdxmlimp.cxx |6 
 xmloff/source/transform/OOo2Oasis.cxx   |6 
 xmloff/source/transform/XMLFilterRegistration.hxx   |  162 
 35 files changed, 250 insertions(+), 171 deletions(-)

New commits:
commit a987aa3be73ec29917567d16886c017ac9a0a3d8
Author: Stephan Bergmann 
Date:   Wed Dec 13 08:46:01 2017 +0100

Make loplugin:salcall look into macros too

"Indirect" calls to isSallCallFunction (for canonic and overridden
FunctionDecls) already needed to handle many cases of FunctionDecls spanning
macros, so it isn't that much more work to make that also work for cases 
called
directly from VisitFunctionDecl.

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

diff --git a/compilerplugins/clang/salcall.cxx 
b/compilerplugins/clang/salcall.cxx
index 16657e848d5a..61fb4e1a5f0b 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -173,11 +173,6 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
 
compiler.getSourceManager().getSpellingLoc(canonicalDecl->getLocation(
 return true;
 
-// macros make getCharacterData() extremely unreliable
-if (compiler.getSourceManager().isMacroArgExpansion(decl->getLocation())
-|| 
compiler.getSourceManager().isMacroBodyExpansion(decl->getLocation()))
-return true;
-
 SourceLocation rewriteLoc;
 SourceLocation rewriteCanonicalLoc;
 bool bDeclIsSalCall = isSalCallFunction(decl, &rewriteLoc);
@@ -398,9 +393,8 @@ bool SalCall::isSalCallFunction(FunctionDecl const* 
functionDecl, SourceLocation
 while (SM.isMacroArgExpansion(endLoc, &endLoc))
 {
 }
-while (endLoc.isMacroID() && 
SM.isAtStartOfImmediateMacroExpansion(endLoc))
+while (endLoc.isMacroID() && 
SM.isAtStartOfImmediateMacroExpansion(endLoc, &endLoc))
 {
-endLoc = SM.getImmediateMacroCallerLoc(endLoc);
 }
 endLoc = SM.getSpellingLoc(endLoc);
 
@@ -442,13 +436,21 @@ bool SalCall::isSalCallFunction(FunctionDecl const* 
functionDecl, SourceLocation
 // that parameter in the remainder of the replacement text will be 
false positives.
 assert(SM.isMacroBodyExpansion(startLoc));
 auto const startLoc2 = 
SM.getImmediateExpansionRange(startLoc).second;
-auto const MI
-= compiler.getPreprocessor()
-  .getMacroDefinitionAtLoc(
-  &compiler.getASTContext().Idents.get(
-  Lexer::getImmediateMacroName(startLoc, SM, 
compiler.getLangOpts())),
-  SM.getSpellingLoc(startLoc))
-  .getMacroInfo();
+

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

 svl/source/numbers/zforlist.cxx |4 
 svl/source/numbers/zforscan.cxx |  211 ++--
 svl/source/numbers/zforscan.hxx |   12 ++
 3 files changed, 134 insertions(+), 93 deletions(-)

New commits:
commit c1293b4fa344096b4de6b8648a0409ca5811eccc
Author: Eike Rathke 
Date:   Tue Dec 12 21:13:18 2017 +0100

Resolves: tdf#114185 force KeywordLocalization::LocaleLegacy

... in GetPreviewStringGuess() that is used in Calc TEXT()
spreadsheet function, if the format code didn't resolve as English
or the format code needs to be (re)parsed otherwise as locale
dependent.

Also SvNumberFormatterServiceObj::convertNumberToPreviewString()
(XNumberFormatPreviewer::convertNumberToPreviewString()) if
bAllowEnglish==true.

Change-Id: I7c4b1a610d2bcb20fe0f0ae06efc81f998cae048
(cherry picked from commit b2cd9dd31183c45942c2f522104654ff1f8e6889)
Reviewed-on: https://gerrit.libreoffice.org/46352
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index a6e7af89562f..f20c83f57c90 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1730,6 +1730,8 @@ bool SvNumberFormatter::GetPreviewStringGuess( const 
OUString& sFormatString,
   
pEntry->GetFormatstring() ) )
 {
 // other Format
+// Force locale's keywords.
+pFormatScanner->ChangeIntl( 
ImpSvNumberformatScan::KeywordLocalization::LocaleLegacy );
 sTmpString = sFormatString;
 pEntry.reset(new SvNumberformat( sTmpString, pFormatScanner,
  pStringScanner, nCheckPos, eLnge 
));
@@ -1750,6 +1752,8 @@ bool SvNumberFormatter::GetPreviewStringGuess( const 
OUString& sFormatString,
 
pEntry2->GetFormatstring() ) )
 {
 // other Format
+// Force locale's keywords.
+pFormatScanner->ChangeIntl( 
ImpSvNumberformatScan::KeywordLocalization::LocaleLegacy );
 sTmpString = sFormatString;
 pEntry.reset(new SvNumberformat( sTmpString, 
pFormatScanner,
  pStringScanner, nCheckPos, 
eLnge ));
commit 4e34b003bc8908e0f9f78e8ed5e84e7a5e42a6ca
Author: Eike Rathke 
Date:   Tue Dec 12 20:43:18 2017 +0100

Prepare ImpSvNumberformatScan with KeywordLocalization context, tdf#114185

Change-Id: I3942a7de52bcedf491da83407791fcd0080aaf4d
(cherry picked from commit 482182fd0331a0be371f8f58dc74aa05a68f0a1d)
Reviewed-on: https://gerrit.libreoffice.org/46351
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index a48063f7df24..ed3edf731096 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -111,6 +111,7 @@ ImpSvNumberformatScan::ImpSvNumberformatScan( 
SvNumberFormatter* pFormatterP )
 , eNewLnge(LANGUAGE_DONTKNOW)
 , eTmpLnge(LANGUAGE_DONTKNOW)
 , nCurrPos(-1)
+, meKeywordLocalization(KeywordLocalization::AllowEnglish)
 {
 pFormatter = pFormatterP;
 xNFC = css::i18n::NumberFormatMapper::create( 
pFormatter->GetComponentContext() );
@@ -160,8 +161,9 @@ ImpSvNumberformatScan::~ImpSvNumberformatScan()
 Reset();
 }
 
-void ImpSvNumberformatScan::ChangeIntl()
+void ImpSvNumberformatScan::ChangeIntl( KeywordLocalization 
eKeywordLocalization )
 {
+meKeywordLocalization = eKeywordLocalization;
 bKeywordsNeedInit = true;
 bCompatCurNeedInit = true;
 // may be initialized by InitSpecialKeyword()
@@ -298,7 +300,10 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 {
 sKeyword[NF_KEY_THAI_T] = sEnglishKeyword[NF_KEY_THAI_T];
 }
-if ( eLang.anyOf(
+
+const bool bL10n = (meKeywordLocalization != 
KeywordLocalization::EnglishOnly);
+
+if ( bL10n && eLang.anyOf(
 LANGUAGE_GERMAN,
 LANGUAGE_GERMAN_SWISS,
 LANGUAGE_GERMAN_AUSTRIAN,
@@ -335,7 +340,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 else
 {
 // day
-if ( eLang.anyOf(
+if ( bL10n && eLang.anyOf(
 LANGUAGE_ITALIAN,
 LANGUAGE_ITALIAN_SWISS))
 {
@@ -348,7 +353,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 sKeyword[NF_KEY_GG] = "XX";
 sKeyword[NF_KEY_GGG] = "XXX";
 }
-else if ( eLang.anyOf(
+else if ( bL10n && eLang.anyOf(
  LANGUAGE_FRENCH,
  LANGUAGE_FRENCH_BELGIAN,
  LANGUAGE_FRENCH_CANADIAN,
@@ -361,7 +366,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 sKeyword[NF_KEY_DDD] = "JJJ";

[Libreoffice-commits] core.git: framework/source include/framework include/vcl vcl/source

 framework/source/fwe/classes/addonmenu.cxx|2 +-
 framework/source/fwe/xml/menuconfiguration.cxx|   12 ++--
 framework/source/uielement/menubarmanager.cxx |8 
 framework/source/uielement/newmenucontroller.cxx  |   10 +-
 framework/source/uielement/popuptoolbarcontroller.cxx |2 +-
 framework/source/uielement/toolbarsmenucontroller.cxx |2 +-
 include/framework/menuconfiguration.hxx   |6 +++---
 include/vcl/menu.hxx  |6 +++---
 vcl/source/window/menu.cxx|8 
 vcl/source/window/menuitemlist.cxx|4 ++--
 vcl/source/window/menuitemlist.hxx|6 +++---
 11 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 6847deb1f7c68cf0402ccbc61c42ca5d285d3a61
Author: Noel Grandin 
Date:   Tue Dec 12 15:33:40 2017 +0200

sal_uLong->void* for userdata in Menu

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

diff --git a/framework/source/fwe/classes/addonmenu.cxx 
b/framework/source/fwe/classes/addonmenu.cxx
index a044870378a8..2fddbebe1aee 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -255,7 +255,7 @@ void AddonMenuManager::BuildMenu( PopupMenu*
pCurrent
 
 // Store values from configuration to the New and Wizard menu 
entries to enable
 // sfx2 based code to support high contrast mode correctly!
-sal_uIntPtr nAttributePtr = 
MenuAttributes::CreateAttribute(aTarget, aImageId);
+void* nAttributePtr = MenuAttributes::CreateAttribute(aTarget, 
aImageId);
 pCurrentMenu->SetUserValue(nId, nAttributePtr, 
MenuAttributes::ReleaseAttribute);
 pCurrentMenu->SetItemCommand( nId, aURL );
 
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx 
b/framework/source/fwe/xml/menuconfiguration.cxx
index d64a9793663d..dead1239926f 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -124,25 +124,25 @@ void MenuConfiguration::StoreMenuBarConfigurationToXML(
 }
 }
 
-sal_uIntPtr MenuAttributes::CreateAttribute(const OUString& rFrame, const 
OUString& rImageIdStr)
+void* MenuAttributes::CreateAttribute(const OUString& rFrame, const OUString& 
rImageIdStr)
 {
 MenuAttributes* pAttributes = new MenuAttributes(rFrame, rImageIdStr);
 pAttributes->acquire();
-return reinterpret_cast(pAttributes);
+return pAttributes;
 }
 
-sal_uIntPtr MenuAttributes::CreateAttribute(const 
css::uno::WeakReference& rDispatchProvider)
+void* MenuAttributes::CreateAttribute(const 
css::uno::WeakReference& rDispatchProvider)
 {
 MenuAttributes* pAttributes = new MenuAttributes(rDispatchProvider);
 pAttributes->acquire();
-return reinterpret_cast(pAttributes);
+return pAttributes;
 }
 
-void MenuAttributes::ReleaseAttribute(sal_uIntPtr nAttributePtr)
+void MenuAttributes::ReleaseAttribute(void* nAttributePtr)
 {
 if (!nAttributePtr)
 return;
-MenuAttributes* pAttributes = 
reinterpret_cast(nAttributePtr);
+MenuAttributes* pAttributes = static_cast(nAttributePtr);
 pAttributes->release();
 }
 
diff --git a/framework/source/uielement/menubarmanager.cxx 
b/framework/source/uielement/menubarmanager.cxx
index 3d336f00bf53..fa5215f80213 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1125,7 +1125,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const 
Reference< XFrame >& rF
 Reference< XDispatchProvider > xPopupMenuDispatchProvider( 
rDispatchProvider );
 
 // Retrieve possible attributes struct
-MenuAttributes* pAttributes = reinterpret_cast(pMenu->GetUserValue( nItemId ));
+MenuAttributes* pAttributes = static_cast(pMenu->GetUserValue( nItemId ));
 if ( pAttributes )
 xPopupMenuDispatchProvider = 
pAttributes->xDispatchProvider;
 
@@ -1513,7 +1513,7 @@ void MenuBarManager::FillMenu(
 if ( xDispatchProvider.is() )
 {
 // Use attributes struct to transport special 
dispatch provider
-sal_uIntPtr nAttributePtr = 
MenuAttributes::CreateAttribute(xDispatchProvider);
+void* nAttributePtr = 
MenuAttributes::CreateAttribute(xDispatchProvider);
 pMenu->SetUserValue(nId, nAttributePtr, 
MenuAttributes::ReleaseAttribute);
 }
 
@@ -1766,7 +1766,7 @@ void MenuBarManager::Init(const Reference< XFrame >& 
rFrame, Menu* pAddonMenu, b
 {
 if ( pAddonMenu->GetItemType( i ) != MenuItemType::SEP

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - bundled/include

 bundled/include/LibreOfficeKit/LibreOfficeKit.h   |9 ++---
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx |   11 +++
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 081401991e12817bdcc2aba6fcd8b029f3b7d53f
Author: Jan Holesovsky 
Date:   Wed Dec 13 12:13:20 2017 +0100

Update the bundled headers.

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

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 69b20106..8ac97371 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -217,9 +217,6 @@ struct _LibreOfficeKitDocumentClass
 /// @see lok::Document::setVisibleArea).
 void (*setClientVisibleArea) (LibreOfficeKitDocument* pThis, int nX, int 
nY, int nWidth, int nHeight);
 
-/// @see lok::Document::setOutlineState).
-void (*setOutlineState) (LibreOfficeKitDocument* pThis, bool bColumn, int 
nLevel, int nIndex, bool bHidden);
-
 /// @see lok::Document::createView().
 int (*createView) (LibreOfficeKitDocument* pThis);
 /// @see lok::Document::destroyView().
@@ -259,6 +256,9 @@ struct _LibreOfficeKitDocumentClass
int* pArray,
size_t nSize);
 
+/// @see lok::Document::setOutlineState).
+void (*setOutlineState) (LibreOfficeKitDocument* pThis, bool bColumn, int 
nLevel, int nIndex, bool bHidden);
+
 /// Paints window with given id to the buffer
 /// @see lok::Document::paintWindow().
 void (*paintWindow) (LibreOfficeKitDocument* pThis, unsigned nWindowId,
@@ -286,6 +286,9 @@ struct _LibreOfficeKitDocumentClass
   int nButtons,
   int nModifier);
 
+/// @see lok::Document::setViewLanguage().
+void (*setViewLanguage) (LibreOfficeKitDocument* pThis, int nId, const 
char* language);
+
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 7bdd2c47..d7fa22b7 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -525,6 +525,17 @@ public:
 return mpDoc->pClass->getViewIds(mpDoc, pArray, nSize);
 }
 
+/**
+ * Set the language tag of the window with the specified nId.
+ *
+ * @param nId a view ID, returned by createView().
+ * @param language Bcp47 languageTag, like en-US or so.
+ */
+void setViewLanguage(int nId, const char* language)
+{
+mpDoc->pClass->setViewLanguage(mpDoc, nId, language);
+}
+
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
___
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-0' - 2 commits - bundled/include kit/Kit.cpp loleaflet/dist loleaflet/src loleaflet/unocommands.js

2017-12-13 Thread Marco Cecchetti

 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |7 ++-
 kit/Kit.cpp  |6 --
 loleaflet/dist/l10n/uno/af.json  |5 +
 loleaflet/dist/l10n/uno/am.json  |8 ++--
 loleaflet/dist/l10n/uno/ar.json  |8 ++--
 loleaflet/dist/l10n/uno/as.json  |6 ++
 loleaflet/dist/l10n/uno/ast.json |6 ++
 loleaflet/dist/l10n/uno/be.json  |4 
 loleaflet/dist/l10n/uno/bg.json  |8 ++--
 loleaflet/dist/l10n/uno/bn-IN.json   |6 ++
 loleaflet/dist/l10n/uno/bn.json  |6 ++
 loleaflet/dist/l10n/uno/bo.json  |5 +
 loleaflet/dist/l10n/uno/br.json  |8 ++--
 loleaflet/dist/l10n/uno/brx.json |2 ++
 loleaflet/dist/l10n/uno/bs.json  |6 ++
 loleaflet/dist/l10n/uno/ca-valencia.json |7 ++-
 loleaflet/dist/l10n/uno/ca.json  |8 ++--
 loleaflet/dist/l10n/uno/cs.json  |8 ++--
 loleaflet/dist/l10n/uno/cy.json  |8 ++--
 loleaflet/dist/l10n/uno/da.json  |8 ++--
 loleaflet/dist/l10n/uno/de.json  |8 ++--
 loleaflet/dist/l10n/uno/dgo.json |3 +++
 loleaflet/dist/l10n/uno/dz.json  |5 +
 loleaflet/dist/l10n/uno/el.json  |8 ++--
 loleaflet/dist/l10n/uno/en-GB.json   |8 ++--
 loleaflet/dist/l10n/uno/en-ZA.json   |5 +
 loleaflet/dist/l10n/uno/eo.json  |8 ++--
 loleaflet/dist/l10n/uno/es.json  |8 ++--
 loleaflet/dist/l10n/uno/et.json  |8 ++--
 loleaflet/dist/l10n/uno/eu.json  |8 ++--
 loleaflet/dist/l10n/uno/fa.json  |2 ++
 loleaflet/dist/l10n/uno/fi.json  |8 ++--
 loleaflet/dist/l10n/uno/fr.json  |8 ++--
 loleaflet/dist/l10n/uno/ga.json  |6 ++
 loleaflet/dist/l10n/uno/gd.json  |8 ++--
 loleaflet/dist/l10n/uno/gl.json  |8 ++--
 loleaflet/dist/l10n/uno/gu.json  |6 ++
 loleaflet/dist/l10n/uno/gug.json |8 ++--
 loleaflet/dist/l10n/uno/he.json  |7 ++-
 loleaflet/dist/l10n/uno/hi.json  |6 ++
 loleaflet/dist/l10n/uno/hr.json  |8 ++--
 loleaflet/dist/l10n/uno/hu.json  |8 ++--
 loleaflet/dist/l10n/uno/id.json  |8 ++--
 loleaflet/dist/l10n/uno/is.json  |8 ++--
 loleaflet/dist/l10n/uno/it.json  |8 ++--
 loleaflet/dist/l10n/uno/ja.json  |8 ++--
 loleaflet/dist/l10n/uno/ka.json  |5 +
 loleaflet/dist/l10n/uno/kk.json  |8 ++--
 loleaflet/dist/l10n/uno/km.json  |6 ++
 loleaflet/dist/l10n/uno/kmr-Latn.json|5 +
 loleaflet/dist/l10n/uno/kn.json  |6 ++
 loleaflet/dist/l10n/uno/ko.json  |6 ++
 loleaflet/dist/l10n/uno/kok.json |2 ++
 loleaflet/dist/l10n/uno/ks.json  |2 ++
 loleaflet/dist/l10n/uno/lo.json  |2 ++
 loleaflet/dist/l10n/uno/lt.json  |8 ++--
 loleaflet/dist/l10n/uno/lv.json  |8 ++--
 loleaflet/dist/l10n/uno/mai.json |2 ++
 loleaflet/dist/l10n/uno/mk.json  |5 +
 loleaflet/dist/l10n/uno/ml.json  |6 ++
 loleaflet/dist/l10n/uno/mn.json  |5 +
 loleaflet/dist/l10n/uno/mni.json |2 ++
 loleaflet/dist/l10n/uno/mr.json  |6 ++
 loleaflet/dist/l10n/uno/my.json  |6 ++
 loleaflet/dist/l10n/uno/nb.json  |8 ++--
 loleaflet/dist/l10n/uno/ne.json  |6 ++
 loleaflet/dist/l10n/uno/nl.json  |8 ++--
 loleaflet/dist/l10n/uno/nn.json  |8 ++--
 loleaflet/dist/l10n/uno/nso.json |5 +
 loleaflet/dist/l10n/uno/oc.json  |8 ++--
 loleaflet/dist/l10n/uno/om.json  |5 +
 loleaflet/dist/l10n/uno/or.json  |6 ++
 loleaflet/dist/l10n/uno/pa-IN.json   |6 ++
 loleafle

Unit test PythonTest_solenv_python failing on Linux on est_gbuildtojson

2017-12-13 Thread Luke Benes

Can anyone run the subsequent tests successfully or do any tinderboxes run a 
make check? Recently, the test_gbuildtojson test started failing. It looks like 
it is related to xmlsecurity/qa/unit/signing/data/S.gpg-agent' being 
prematurely removed or never created. 

I could reproduce this on both Arch Linux and Ubuntu 17.10. 

-Luke


mkdir -p /tmp/gbuildjsd3l63b/LinkTarget/Library/
LD_LIBRARY_PATH=/core/instdir/program:/core/instdir/program:/core/workdir/UnpackedTarball/cppunit/src/cppunit/.libs
 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/core/instdir/program:/core/instdir/program"
   /tmp/gbuildjsd3l63b/LinkTarget/Executable/gbuildtojson 
--makefile=/tmp/gbuild.5p5Rcq --linktarget=/tmp/gbuild.xNoSJJ 
--ilibtarget=/tmp/gbuild.bDHJyo --cxxobjects=/tmp/gbuild.Q3s4UK 
--yaccobjects=/tmp/gbuild.91p7jm --objcobjects=/tmp/gbuild.8ZDptA 
--objcxxobjects=/tmp/gbuild.ccElEo --cxxclrobjects=/tmp/gbuild.f0GWsq 
--asmobjects=/tmp/gbuild.KtPIxc --lexobjects=/tmp/gbuild.wBGLK1 
--gencobjects=/tmp/gbuild.Pe8qnm --gencxxobjects=/tmp/gbuild.8OlNN4 
--gencxxclrobjects=/tmp/gbuild.CIsZx4 --cobjects=/tmp/gbuild.YQzJUx 
--javaobjects=/tmp/gbuild.GXDPjE --pythonobjects=/tmp/gbuild.VRoMPV 
--cflags=/tmp/gbuild.03xla9 --cflagsappend=/tmp/gbuild.vSATGa 
--cxxflags=/tmp/gbuild.AGLyMq --cxxflagsappend=/tmp/gbuild.zUdwXa 
--objcflags=/tmp/gbuild.8dBWHe --objcflagsappend=/tmp/gbuild.QaEADe 
--objcxxflags=/tmp/gbuild.Q3YE4h --objcxxflagsappend=/tmp/gbuild.aAMno0 
--cxxclrflags=/tmp/gbuild.WRxbbS --cxxclrflagsappend=/tmp/gbuild.Cj0Sx2 
--defs=/tmp/gbuild.jvX8aI --include=/tmp/gbuild.hDGcj4 
--linked_libs=/tmp/gbuild.5crr8W --linked_static_libs=/tmp/gbuild.S3zyx3 > 
/tmp/gbuildjsd3l63b/GbuildToJson/Library/libxmlscriptlo.so
E
==
ERROR: test_gbuildtojson (gbuildtojson.CheckGbuildToJsonModules)
--
Traceback (most recent call last):
  File "/core/solenv/qa/python/gbuildtojson.py", line 135, in test_gbuildtojson
    shutil.copytree(os.path.join(os.environ['SRCDIR'], module), 
os.path.join(self.tempsrc, module))
  File "/usr/lib/python3.6/shutil.py", line 359, in copytree
    raise Error(errors)
shutil.Error: [('/core/xmlsecurity/qa/unit/signing/data/S.gpg-agent', 
'/tmp/gbuild0cf_xhb1/xmlsecurity/qa/unit/signing/data/S.gpg-agent', "[Errno 6] 
No such device or address: 
'/core/xmlsecurity/qa/unit/signing/data/S.gpg-agent'")]


--
Ran 2 tests in 122.261s


FAILED (errors=1)


Error: a unit test failed, please do one of:


make PythonTest_solenv_python CPPUNITTRACE="gdb --args"
    # for interactive debugging on Linux
make PythonTest_solenv_python VALGRIND=memcheck
    # for memory checking
make PythonTest_solenv_python DEBUGCPPUNIT=TRUE
    # for exception catching


You can limit the execution to just one particular test by:


make CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params...


make[1]: *** [/core/solenv/gbuild/PythonTest.mk:39: 
/core/workdir/PythonTest/solenv_python/done] Error 1
make: *** [Makefile:276: build] Error 2


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

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

 include/sal/types.h |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 6cbbe3a6c35cde186351315ddb189366bcca1deb
Author: Stephan Bergmann 
Date:   Wed Dec 13 08:22:36 2017 +0100

[API CHANGE] Remove SAL_CALL_ELLIPSE

At least internally it was unused at least ever since
9399c662f36c385b0c705eb34e636a9aec450282 "initial import", it is unlikely 
that
it ever was used for anything useful, and it is highly unlikely that it is 
used
by 3rd-party code.

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

diff --git a/include/sal/types.h b/include/sal/types.h
index d1f5dbeec507..49f7568a1978 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -235,7 +235,6 @@ typedef void *   sal_Handle;
 #   define SAL_DLLPUBLIC_TEMPLATE
 #   define SAL_DLLPUBLIC_RTTI
 #   define SAL_CALL __cdecl
-#   define SAL_CALL_ELLIPSE __cdecl
 #elif defined SAL_UNX
 #   if defined(__GNUC__)
 # if defined(DISABLE_DYNLOADING)
@@ -270,7 +269,6 @@ typedef void *   sal_Handle;
 # define SAL_DLLPUBLIC_RTTI
 #   endif
 #   define SAL_CALL
-#   define SAL_CALL_ELLIPSE
 #else
 #   error("unknown platform")
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/inc/hintids.hxx  |   89 +++-
 sw/inc/ndtxt.hxx|6 +-
 sw/source/core/crsr/crstrvl.cxx |2 
 sw/source/core/doc/doc.cxx  |2 
 sw/source/core/doc/doctxm.cxx   |2 
 sw/source/core/doc/visiturl.cxx |2 
 sw/source/core/txtnode/ndtxt.cxx|   11 ++-
 sw/source/core/undo/rolbck.cxx  |4 -
 sw/source/core/undo/unins.cxx   |2 
 sw/source/core/unocore/unoframe.cxx |1 
 sw/source/core/unocore/unomap.cxx   |1 
 sw/source/core/unocore/unomap1.cxx  |4 +
 sw/source/core/unocore/unosrch.cxx  |1 
 sw/source/core/unocore/unostyle.cxx |7 +-
 sw/source/filter/html/htmlflywriter.cxx |3 -
 sw/source/filter/html/htmlgrin.cxx  |1 
 sw/source/filter/ww8/wrtww8.cxx |2 
 sw/source/uibase/uno/unotxdoc.cxx   |1 
 18 files changed, 76 insertions(+), 65 deletions(-)

New commits:
commit 97c80a73a76037057051e54b083193f33ba24a99
Author: Noel Grandin 
Date:   Tue Dec 12 15:36:11 2017 +0200

TypedWhichId in sw (TXTATTR)

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

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index f8bcc291de9a..bb20ee86704d 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -102,9 +102,7 @@
 #define RES_CHRATR_END  (46)
 
 // this Attribute used only in a TextNodes SwpAttr-Array
-enum RES_TXTATR
-{
-RES_TXTATR_BEGIN = RES_CHRATR_END,
+#define RES_TXTATR_BEGIN RES_CHRATR_END
 
 /** text attributes with start and end.
#i105453#:
@@ -122,31 +120,30 @@ RES_TXTATR_BEGIN = RES_CHRATR_END,
- INETFMT should precede CJK_RUBY (for UNO API it does not matter...)
- META and METAFIELD must precede CJK_RUBY and INETFMT
  */
-RES_TXTATR_WITHEND_BEGIN = RES_TXTATR_BEGIN ,
-RES_TXTATR_REFMARK = RES_TXTATR_WITHEND_BEGIN,  // 46
-RES_TXTATR_TOXMARK, // 47
-RES_TXTATR_META,// 48
-RES_TXTATR_METAFIELD,   // 49
-RES_TXTATR_AUTOFMT, // 50
-RES_TXTATR_INETFMT, // 51
-RES_TXTATR_CHARFMT, // 52
-RES_TXTATR_CJK_RUBY,// 53
-RES_TXTATR_UNKNOWN_CONTAINER,   // 54
-RES_TXTATR_INPUTFIELD,  // 55
-RES_TXTATR_WITHEND_END,
+#define RES_TXTATR_WITHEND_BEGIN RES_TXTATR_BEGIN
+#define RES_TXTATR_REFMARK
TypedWhichId(RES_TXTATR_WITHEND_BEGIN) // 46
+#define RES_TXTATR_TOXMARKTypedWhichId(47)
+#define RES_TXTATR_META   TypedWhichId(48)
+#define RES_TXTATR_METAFIELD  TypedWhichId(49)
+#define RES_TXTATR_AUTOFMTTypedWhichId(50)
+#define RES_TXTATR_INETFMTTypedWhichId(51)
+#define RES_TXTATR_CHARFMTTypedWhichId(52)
+#define RES_TXTATR_CJK_RUBY   TypedWhichId(53)
+#define RES_TXTATR_UNKNOWN_CONTAINER  
TypedWhichId(54)
+#define RES_TXTATR_INPUTFIELD TypedWhichId(55)
+#define RES_TXTATR_WITHEND_END 56
 
 // all TextAttributes without an end
-RES_TXTATR_NOEND_BEGIN = RES_TXTATR_WITHEND_END,
-RES_TXTATR_FIELD = RES_TXTATR_NOEND_BEGIN,  // 56
-RES_TXTATR_FLYCNT,  // 57
-RES_TXTATR_FTN, // 58
-RES_TXTATR_ANNOTATION,  // 59
-RES_TXTATR_DUMMY3,  // 60
-RES_TXTATR_DUMMY1,  // 61
-RES_TXTATR_DUMMY2,  // 62
-RES_TXTATR_NOEND_END,
-RES_TXTATR_END = RES_TXTATR_NOEND_END
-};
+#define RES_TXTATR_NOEND_BEGIN RES_TXTATR_WITHEND_END
+#define RES_TXTATR_FIELD  
TypedWhichId(RES_TXTATR_NOEND_BEGIN) // 56
+#define RES_TXTATR_FLYCNT TypedWhichId(57)
+#define RES_TXTATR_FTNTypedWhichId(58)
+#define RES_TXTATR_ANNOTATION TypedWhichId(59)
+#define RES_TXTATR_DUMMY3 TypedWhichId(60)
+#define RES_TXTATR_DUMMY1 TypedWhichId(61)
+#define RES_TXTATR_DUMMY2 TypedWhichId(62)
+#define RES_TXTATR_NOEND_END 63
+#define RES_TXTATR_END RES_TXTATR_NOEND_END
 
 #define RES_PARATR_BEGIN RES_TXTATR_END
 #defineRES_PARATR_LINESPACING  
TypedWhichId(RES_PARATR_BEGIN) // 63
@@ -231,30 +228,30 @@ RES_FRMATR_END
 
 #define RES_GRFATR_BEGIN RES_FRMATR_END
 #define RES_GRFATR_MIRRORGRF
TypedWhichId(RES_GRFATR_BEGIN) // 130
-#define RES_GRFATR_CROPGRF  TypedWhichId(131) // 131
-
-#define RES_GRFATR_ROTATION TypedWhichId(132)  // 132
-#define RES_GRFATR_LUMINANCETypedWhichId(133)  // 133
-#define RES_GRFATR_CONTRAST TypedWhichId(134)  // 134
-#define RES_GRFA

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/uiconfig sw/uiconfig

2017-12-13 Thread Heiko Tietze

 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |2 +-
 sw/uiconfig/swriter/ui/optcompatpage.ui  |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5b51996465c029e55bc328732111fd7c7bedba84
Author: Heiko Tietze 
Date:   Mon Dec 11 15:55:06 2017 +0100

tdf#114310 Removed '(in current document)' from compatibility options

Change-Id: Ie91ca2c9aac9b3ab7ca103bf2e6b55d453255d77
Reviewed-on: https://gerrit.libreoffice.org/46242
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
(cherry picked from commit 5f9812e65e6c3c147c8143a046f934be4433fca6)
Reviewed-on: https://gerrit.libreoffice.org/46365

diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui 
b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 057f9877a511..fbee20afb08d 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -619,7 +619,7 @@
 
 
   
-Add _spacing between paragraphs 
and tables (in current document)
+Add _spacing between paragraphs 
and tables
 True
 True
 False
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui 
b/sw/uiconfig/swriter/ui/optcompatpage.ui
index ed4a0c965a56..f297aeb6bc04 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -54,8 +54,8 @@
 1
 
   Use printer metrics for document 
formatting
-  Add spacing between paragraphs and tables (in 
current document)
-  Add paragraph and table spacing at tops of pages 
(in current document)
+  Add spacing between paragraphs and tables
+  Add paragraph and table spacing at tops of 
pages
   Use OpenOffice.org 1.1 tabstop formatting
   Do not add leading (extra space) between lines 
of text
   Use OpenOffice.org 1.1 line spacing
@@ -66,7 +66,7 @@
   Expand word space on lines with manual line 
breaks in justified paragraphs
   Protect form
   MS Word-compatible trailing blanks
-  Tolerate white lines of PDF page backgrounds for 
compatibility with old documents (in current document)
+  Tolerate white lines of PDF page backgrounds for 
compatibility with old documents
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx include/vcl svtools/source svx/source vcl/headless vcl/inc vcl/opengl vcl/quartz vcl/source vcl/unx vcl/win

 include/svx/bmpmask.hxx|4 -
 include/vcl/bitmap.hxx |8 +--
 include/vcl/bitmapex.hxx   |2 
 svtools/source/graphic/transformer.cxx |2 
 svx/source/dialog/_bmpmask.cxx |   63 +++-
 svx/source/dialog/_contdlg.cxx |2 
 vcl/headless/svpbmp.cxx|2 
 vcl/inc/headless/svpbmp.hxx|2 
 vcl/inc/impbmp.hxx |2 
 vcl/inc/opengl/salbmp.hxx  |2 
 vcl/inc/quartz/salbmp.h|2 
 vcl/inc/salbmp.hxx |3 -
 vcl/inc/unx/salbmp.h   |2 
 vcl/inc/win/salbmp.h   |2 
 vcl/opengl/salbmp.cxx  |2 
 vcl/quartz/salbmp.cxx  |2 
 vcl/source/gdi/bitmap.cxx  |   85 -
 vcl/source/gdi/bitmapex.cxx|4 -
 vcl/source/gdi/gdimtf.cxx  |   46 -
 vcl/source/gdi/impbmp.cxx  |2 
 vcl/unx/generic/gdi/salbmp.cxx |2 
 vcl/win/gdi/salbmp.cxx |2 
 22 files changed, 118 insertions(+), 125 deletions(-)

New commits:
commit e75abe6e0a4ea250366bb29c0ece697e9b1b80a1
Author: Noel Grandin 
Date:   Tue Dec 12 09:33:14 2017 +0200

convert tolerance params to sal_uInt8

since their range is 0-255

Also drop pTols from ImplColReplaceParam, since it is always nullptr.

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

diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 7231742d4753..10d3383367fb 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -131,14 +131,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask : public 
SfxDockingWindow
 virtual boolClose() override;
 
 sal_uInt16  InitColorArrays( Color* pSrcCols, Color* pDstCols,
- sal_uIntPtr* pTols );
+ sal_uInt8* pTols );
 
 Bitmap  ImpMask( const Bitmap& rBitmap );
 GDIMetaFile ImpMask( const GDIMetaFile& rMtf );
 Animation   ImpMask( const Animation& rAnimation );
 BitmapExImpMaskTransparent( const BitmapEx& rBitmapEx,
 const Color& rColor,
-const long nTol );
+sal_uInt8 nTol );
 
 GDIMetaFile GetMetaFile(const Graphic& rGraphic);
 
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index f2cd512b3158..f6600ecdac9a 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -492,11 +492,11 @@ public:
 @param nTol
 Tolerance value. Specifies the maximal difference between
 rTransColor and the individual pixel values, such that the
-corresponding pixel is still regarded transparent.
+corresponding pixel is still regarded as transparent.
 
 @return the resulting bitmask.
  */
-Bitmap  CreateMask( const Color& rTransColor, sal_uLong 
nTol = 0 ) const;
+Bitmap  CreateMask( const Color& rTransColor, sal_uInt8 
nTol = 0 ) const;
 
 /** Create region of similar colors in a given rectangle
 
@@ -550,7 +550,7 @@ public:
 
 @return true, if the operation was completed successfully.
  */
-boolReplace( const Color& rSearchColor, const Color& 
rReplaceColor, sal_uLong nTol = 0 );
+boolReplace( const Color& rSearchColor, const Color& 
rReplaceColor, sal_uInt8 nTol = 0 );
 
 /** Replace all pixel having one the search colors with the corresponding 
replace color
 
@@ -574,7 +574,7 @@ public:
 const Color* pSearchColors,
 const Color* rReplaceColors,
 sal_uLong nColorCount,
-sal_uLong* pTols );
+const sal_uInt8* pTols );
 
 /** Convert the bitmap to a meta file
 
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 705109e2203a..c7a7bc7e2e59 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -293,7 +293,7 @@ public:
 const Color* pSearchColors,
 const Color* pReplaceColors,
 sal_uLong nColorCount,
-const sal_uLong* pTols = nullptr );
+const sal_uInt8* pTols = nullptr );
 
 /** Change various global color characteristics
 
diff --git a/svtools/source/graphic/transformer.cxx 
b/svtools/source/graphic/transformer.cxx
index dbb6bfc0160a..72cc863bee20 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/sour

Crash test update

2017-12-13 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/b5bab910a7d1dcdcc4c10343cc74f2731560b68f/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-12-13 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/tdf113183.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |   10 ++
 writerfilter/source/dmapper/GraphicHelpers.cxx |4 
 3 files changed, 14 insertions(+)

New commits:
commit 134898e42ac6c455d5df0c2de3842d1bd7309f5f
Author: Miklos Vajna 
Date:   Tue Dec 12 09:18:39 2017 +0100

tdf#113183 DOCX import: fix not independent text box alignments

The alternative would be to clear them in
writerfilter::dmapper::DomainMapper::getPositionOffset(), but that runs
before writerfilter::dmapper::PositionHandler::lcl_sprm(), so it would
be too early.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx

(cherry picked from commit 312cecf11c1ab8acef6ce08ccb90d5322836b08f)

Change-Id: I287b9a4025c4b1844ae467c48815b5d7ffe3f98e
Reviewed-on: https://gerrit.libreoffice.org/46322
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf113183.docx 
b/sw/qa/extras/ooxmlexport/data/tdf113183.docx
new file mode 100644
index ..197f483ba011
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf113183.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 116b3f05bb2b..6aca7e81b2cd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -99,6 +99,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf67207_MERGEFIELD, 
"mailmerge.docx")
 
CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.text.fieldmaster.DataBase.Name"), 
sValue);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf113183, "tdf113183.docx")
+{
+// This was 2096, the horizontal positioning of the star shape affected the
+// positioning of the triangle one, so the triangle was outside the page
+// frame.
+CPPUNIT_ASSERT_EQUAL(static_cast(0),
+ getProperty(getShapeByName("triangle"),
+"HoriOrientPosition"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx 
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 62579dbaa864..8108445d24fb 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -133,9 +133,11 @@ void PositionHandler::lcl_sprm(Sprm& rSprm)
 {
 case NS_ooxml::LN_CT_PosH_posOffset:
 m_nPosition = 
oox::drawingml::convertEmuToHmm(m_rPositionOffsets.first.toInt32());
+m_rPositionOffsets.first.clear();
 break;
 case NS_ooxml::LN_CT_PosV_posOffset:
 m_nPosition = 
oox::drawingml::convertEmuToHmm(m_rPositionOffsets.second.toInt32());
+m_rPositionOffsets.second.clear();
 break;
 case NS_ooxml::LN_CT_PosH_align:
 {
@@ -150,6 +152,7 @@ void PositionHandler::lcl_sprm(Sprm& rSprm)
 m_nOrient = text::HoriOrientation::INSIDE;
 else if (rAlign == "outside")
 m_nOrient = text::HoriOrientation::OUTSIDE;
+rAlign.clear();
 break;
 }
 case NS_ooxml::LN_CT_PosV_align:
@@ -165,6 +168,7 @@ void PositionHandler::lcl_sprm(Sprm& rSprm)
 m_nOrient = text::VertOrientation::NONE;
 else if (rAlign == "outside")
 m_nOrient = text::VertOrientation::NONE;
+rAlign.clear();
 break;
 }
 }
___
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' - xmloff/source

 xmloff/source/text/XMLIndexTemplateContext.cxx |2 +-
 xmloff/source/text/XMLSectionExport.cxx|   24 +++-
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 934ae5cd6fc2c676429c14834b929707fec9faa1
Author: Michael Stahl 
Date:   Fri Dec 8 13:47:11 2017 +0100

tdf#71737 xmloff: ODF 1.2 doesn't allow hyperlinks in ...

... text:illustration-index-entry-template, so store these elements
only in ODF 1.2 extended, and in loext namespace.

Change-Id: Icf919e91114f5c9aed2adc3f5359b9df61eb3433
Reviewed-on: https://gerrit.libreoffice.org/46088
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit a26c4448e6e5ffcd285cc691bfc4eb6c7edf76bc)
Reviewed-on: https://gerrit.libreoffice.org/46109
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit c5b7e99758553d8d4f1a149bcc3d0b2d5835d312)
Reviewed-on: https://gerrit.libreoffice.org/46219

diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx 
b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 9487cd539571..e6f01fbc8b45 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -217,7 +217,7 @@ SvXMLImportContext 
*XMLIndexTemplateContext::CreateChildContext(
 {
 SvXMLImportContext* pContext = nullptr;
 
-if (XML_NAMESPACE_TEXT == nPrefix)
+if (XML_NAMESPACE_TEXT == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix)
 {
 TemplateTokenType nToken;
 if (SvXMLUnitConverter::convertEnum(nToken, rLocalName,
diff --git a/xmloff/source/text/XMLSectionExport.cxx 
b/xmloff/source/text/XMLSectionExport.cxx
index f276db392811..b42dd7562ef1 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -1256,6 +1256,7 @@ void XMLSectionExport::ExportIndexTemplateElement(
 
 // convert type to token (and check validity) ...
 XMLTokenEnum eElement(XML_TOKEN_INVALID);
+sal_uInt16 nNamespace(XML_NAMESPACE_TEXT);
 switch(nTokenType)
 {
 case TOK_TTYPE_ENTRY_TEXT:
@@ -1301,6 +1302,27 @@ void XMLSectionExport::ExportIndexTemplateElement(
 break;
 }
 
+if (eType != TEXT_SECTION_TYPE_TOC)
+{
+switch (nTokenType)
+{
+case TOK_TTYPE_HYPERLINK_START:
+case TOK_TTYPE_HYPERLINK_END:
+if (SvtSaveOptions::ODFVER_012 < aODFVersion)
+{
+assert(eType == TEXT_SECTION_TYPE_ILLUSTRATION);
+nNamespace = XML_NAMESPACE_LO_EXT;
+}
+else
+{
+eElement = XML_TOKEN_INVALID; // not allowed in ODF <= 1.2
+}
+break;
+default:
+break;
+}
+}
+
 //--->i90246
 //check the ODF version being exported
 if( aODFVersion == SvtSaveOptions::ODFVER_011
@@ -1455,7 +1477,7 @@ void XMLSectionExport::ExportIndexTemplateElement(
  OUString::number(nLevel));
 }
 // export template
-SvXMLElementExport aTemplateElement(GetExport(), XML_NAMESPACE_TEXT,
+SvXMLElementExport aTemplateElement(GetExport(), nNamespace,
 GetXMLToken(eElement),
 true, false)
 ;
___
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' - sw/source

 sw/source/core/layout/atrfrm.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0c8a30ba47c6ed64c45063a060356e61e82a789f
Author: Michael Stahl 
Date:   Tue Dec 12 22:47:15 2017 +0100

tdf#114396 sw: overly strict assertions in SwFrameFormat::Modify()

It's only a problem if the style contains an anchor position;
the anchor type by itself is fine, and the wrong assertion is
particularly stupid considering that
DocumentStylePoolManager::GetFormatFromPool() inits various
built-in styles with anchor types.

(regression from eed046433a847d3005e52c38963fb883322a39e6)

Change-Id: If8ac000b7f888686725d6bf0ef8e5fb38198c889
(cherry picked from commit 1e70464c380ecc0756ea29098632c503a60aec71)
Reviewed-on: https://gerrit.libreoffice.org/46358
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 37a3b2bd44ae..118f551cbf4c 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2623,8 +2623,9 @@ void SwFrameFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew )
 static_cast< const SwAttrSetChg* >(pNew)->GetChgSet()->GetItemState( 
RES_ANCHOR, false, &tmp );
 if( tmp )
 {
-assert(static_cast(pNew)->GetTheChgdSet() == 
&m_aSet); // must not be style's set!
 newAnchorPosition = static_cast< const SwFormatAnchor* >( tmp 
)->GetContentAnchor();
+assert(newAnchorPosition == nullptr || // style's set must not 
contain position!
+static_cast(pNew)->GetTheChgdSet() == 
&m_aSet);
 }
 }
 if( pNew && pNew->Which() == RES_ANCHOR )
@@ -2635,8 +2636,9 @@ void SwFrameFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew )
 static_cast< const SwAttrSetChg* >(pOld)->GetChgSet()->GetItemState( 
RES_ANCHOR, false, &tmp );
 if( tmp )
 {
-assert(static_cast(pOld)->GetTheChgdSet() == 
&m_aSet); // must not be style's set!
 oldAnchorPosition = static_cast< const SwFormatAnchor* >( tmp 
)->GetContentAnchor();
+assert(oldAnchorPosition == nullptr || // style's set must not 
contain position!
+static_cast(pOld)->GetTheChgdSet() == 
&m_aSet);
 }
 }
 if( pOld && pOld->Which() == RES_ANCHOR )
___
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' - sysui/desktop

2017-12-13 Thread Rene Engelhard

 sysui/desktop/apparmor/program.xpdfimport |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 6709fa41ca0ccb4b4c7712038d58ebd2f8b90589
Author: Rene Engelhard 
Date:   Mon Dec 11 20:03:45 2017 +0100

apparmor: copy xpdfimport definition into xpdfimport and allow "m"

Dec 11 18:46:11 sid kernel: [  176.085106] audit: type=1400 
audit(1513014371.237:22): apparmor="DENIED" operation="file_mmap" 
profile="libreoffice-xpdfimport" name="/usr/lib/libreoffice/program/xpdfimport" 
pid=1511 comm="xpdfimport" requested_mask="m" denied_mask="m" fsuid=1000 ouid=0

Change-Id: I31ddb412d1dd95506a00d22739a33d2e6770ba23
Reviewed-on: https://gerrit.libreoffice.org/46258
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
Reviewed-on: https://gerrit.libreoffice.org/46333

diff --git a/sysui/desktop/apparmor/program.xpdfimport 
b/sysui/desktop/apparmor/program.xpdfimport
index 3934c0a04006..efe10dce020d 100644
--- a/sysui/desktop/apparmor/program.xpdfimport
+++ b/sysui/desktop/apparmor/program.xpdfimport
@@ -1,12 +1,14 @@
 # --
 #
 #Copyright (C) 2016 Canonical Ltd.
+#Copyright (C) 2017 Software in the Public Interest, Inc.
 #
 #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/.
 #
-#Author: Bryan Quigley 
+#Authors: Bryan Quigley 
+# Rene Engelhard 
 #
 # --
 
@@ -22,6 +24,8 @@ profile libreoffice-xpdfimport INSTDIR-program/xpdfimport {
   /usr/share/libreoffice/share/config/* r,
   owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw,
 
+  INSTDIR-program/xpdfimportpxm,
+
   #Uncomment for build testing (should be one directory <- of instdir)
   #/mnt/store/git/libo/**r,
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: pre-init / strings ...


On 12/11/2017 11:06 PM, Michael Meeks wrote:

On 08/12/17 16:20, Stephan Bergmann wrote:

So, it would be interesting to know whether the issue indeed is mostly
with such rtl_uString instances, so that the mechanism I outlined above
would be going to sufficiently solve your issue.

[...]

Some clearly come from the code - but a lot look like they come from
the services.rdb and filter configuration, and a rather large number of
them look like they are from the officecfg.


Sounds reasonable.  I'd suggest you put a patch on Gerrit, where it is 
easier to discuss the details.

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

[Libreoffice-commits] core.git: 4 commits - starmath/source sw/source xmloff/source

 starmath/source/parse.cxx|  103 ---
 sw/source/filter/html/htmlgrin.cxx   |6 
 sw/source/filter/html/htmltab.cxx|  103 ++-
 sw/source/ui/index/cnttab.cxx|8 -
 xmloff/source/text/XMLIndexIllustrationSourceContext.cxx |2 
 xmloff/source/text/XMLIndexTemplateContext.cxx   |   14 --
 xmloff/source/text/XMLIndexTemplateContext.hxx   |1 
 7 files changed, 120 insertions(+), 117 deletions(-)

New commits:
commit 6ca6d6ac912588a8f62d7e6b668ebec333752ebc
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 7 09:35:08 2017 +

Related: tdf#71737: allows links in more indexes

tables, objects and user-defined

Change-Id: I081446832ee86453227f4838552c88fd9e5cf75f
Reviewed-on: https://gerrit.libreoffice.org/46326
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index ac3b7fc411d0..0fbc5b42f22d 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2103,7 +2103,11 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& 
/*rSet*/)
 bool bToxIsAuthorities = TOX_AUTHORITIES == aCurType.eType;
 bool bToxIsIndex =   TOX_INDEX == aCurType.eType;
 bool bToxIsContent = TOX_CONTENT == aCurType.eType;
-bool bToxIsSequence =TOX_ILLUSTRATIONS == aCurType.eType;
+bool bToxSupportsLinks = TOX_CONTENT == aCurType.eType ||
+ TOX_ILLUSTRATIONS == aCurType.eType ||
+ TOX_TABLES == aCurType.eType ||
+ TOX_OBJECTS == aCurType.eType ||
+ TOX_USER == aCurType.eType;
 
 m_pLevelLB->Clear();
 for(sal_uInt16 i = 1; i < m_pCurrentForm->GetFormMax(); i++)
@@ -2173,7 +2177,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& 
/*rSet*/)
 
 //show or hide controls
 m_pEntryNoPB->Show(bToxIsContent);
-m_pHyperLinkPB->Show(bToxIsContent || bToxIsSequence);
+m_pHyperLinkPB->Show(bToxSupportsLinks);
 m_pRelToStyleCB->Show(!bToxIsAuthorities);
 m_pChapterInfoPB->Show(!bToxIsContent && !bToxIsAuthorities);
 m_pEntryPB->Show(!bToxIsAuthorities);
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx 
b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index 4e79914d4856..87fa6219b570 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
@@ -63,7 +63,7 @@ SvXMLImportContextRef 
XMLIndexIllustrationSourceContext::CreateChildContext(
aLevelNameTableMap,
XML_TOKEN_INVALID, // no 
outline-level attr
aLevelStylePropNameTableMap,
-   
aIllustrationAllowedTokenTypesTable);
+   aAllowedTokenTypesTable);
 }
 else
 {
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx 
b/xmloff/source/text/XMLIndexTemplateContext.cxx
index b538860afeeb..17d718fc6cdf 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -432,7 +432,7 @@ const SvXMLEnumMapEntry* aLevelNameTableMap = 
nullptr;
 const sal_Char* aLevelStylePropNameTableMap[] =
 { nullptr, "ParaStyleLevel1", nullptr };
 
-const bool aIllustrationAllowedTokenTypesTable[] =
+const bool aAllowedTokenTypesTable[] =
 {
 true,   // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
 true,   // XML_TOK_INDEX_TYPE_TAB_STOP,
@@ -444,16 +444,4 @@ const bool aIllustrationAllowedTokenTypesTable[] =
 false   // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
 };
 
-const bool aAllowedTokenTypesTable[] =
-{
-true,   // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
-true,   // XML_TOK_INDEX_TYPE_TAB_STOP,
-true,   // XML_TOK_INDEX_TYPE_TEXT,
-true,   // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
-true,   // XML_TOK_INDEX_TYPE_CHAPTER,
-false,  // XML_TOK_INDEX_TYPE_LINK_START,
-false,  // XML_TOK_INDEX_TYPE_LINK_END,
-false   // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx 
b/xmloff/source/text/XMLIndexTemplateContext.hxx
index b2907ef1efb3..03562ee91541 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -56,7 +56,6 @@ extern const bool aAllowedTokenTypesBibliography[];
 // table, illustration and object tables:
 extern const SvXMLEnumMapEntry* aLevelNameTableMap; // NULL: no 
outline-level
 extern const sal_Char* aLevelStylePropNameTableMap[];
-extern const bool aIllustratio

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