Re: Autocorrect pt_PT - 2016-01-29

[Marco A.G.Pinto]

A Masters in Information Warfare/Competitive Intelligence is  a military 
course to apply the military concepts to enterprise management and such.


I was the first civilian to finish it in Portugal.

Kind regards,
 >Marco A.G.Pinto
   ---


On 02/02/2016 07:32, Chris Sherlock wrote:

OK, I gotta ask - what on earth is a Masters in Information Warfare, and what 
do you actually do with that?

:-)

Chris


On 2 Feb 2016, at 9:09 AM, Marco A.G.Pinto  wrote:

All of my past & future contributions to LibreOffice may be licensed under the 
MPLv2/LGPLv3+ dual license.

Kind regards,
   >Marco A.G.Pinto
 


--





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

[Bug 91054] cleanup weirdo function prototypes ...

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=91054

--- Comment #6 from iremsendur  ---
I sent following patch for this bug :

https://gerrit.libreoffice.org/#/c/21990/

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Autocorrect pt_PT - 2016-01-29

[Chris Sherlock]

OK, I gotta ask - what on earth is a Masters in Information Warfare, and what 
do you actually do with that?

:-)

Chris

> On 2 Feb 2016, at 9:09 AM, Marco A.G.Pinto  
> wrote:
> 
> All of my past & future contributions to LibreOffice may be licensed under 
> the MPLv2/LGPLv3+ dual license.
> 
> Kind regards,
>   >Marco A.G.Pinto
> 
> 
> 
> -- 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

Autocorrect pt_PT - 2016-01-29

[Marco A.G.Pinto]

All of my past & future contributions to LibreOffice may be licensed under the 
MPLv2/LGPLv3+ dual license.


Kind regards,
  >Marco A.G.Pinto



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

[Bug 96971] SetXORMode - remove un-needed parameter ...

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96971

--- Comment #6 from kerem  ---
I sent following for this patch;

https://gerrit.libreoffice.org/#/c/22003/

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Bug 66754 - Need help on where to test this

[Andras Timar]

On Tue, Feb 2, 2016 at 4:22 AM, Kohei Yoshida  wrote:

> Hi Josh,
>
> On Sat, 2016-01-30 at 07:21 -0500, joshbaldwin42 . wrote:
>
> > I am working on
> > https://bugs.documentfoundation.org/show_bug.cgi?id=66754 .  This
> > required a change to /setup_native/scripts/admin.pl.  I did
> >
> > egrep -ir "admin.pl" .
>
> BTW, when grepping through git-managed files, it's normally a lot faster
> to run 'git grep' than the normal grep command (in case you were not
> aware of it).
> >
> > to see where in libreoffice admin.pl used.  However, it does not
> > appear to be called anywhere.
>
> Yup, it looks that way.  Running git log -S'admin.pl' reveals that this
> commit
>
>
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=bdd97ec6ee5ad96fd2452ce99b3ebd28e540629a
>
> removed the last use of this script.  I'm not an expert on the packaging
> part of the build system, but I'm pretty certain that this script is
> unused for real.
>
> But just in case it is still used externally, let me CC Andras who is
> more familiar with this part of the code.
>
> > I wanted to know so I can properly test the code before submitting.
>
> I think you've done your due diligence to make sure the script is now
> unused.  Unless someone else screams and tells you "Please don't remove
> it!", I would just remove that file in your gerrit patch, to at least
> have Jenkins tell us if it still is buildable on all major platforms.
>
>
I've never used admin.pl. I think its functionality is 100% covered by
'msiexec -a' command, so we don't need it.

Best regards,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 canvas/source/vcl/spritecanvashelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37b465b3ee57d888dffbf1faca5978a3b4ff3075
Author: Tor Lillqvist 
Date:   Tue Feb 2 08:42:25 2016 +0200

Remove leftover printf-style %f

But seriously, who builds with OSL_DEBUG_LEVEL > 2?

Either debugging printouts inside such ifdefs are completely pointless
and should be removed, or then the information might actually be
useful, and the ifdefs should be removed, so that the information can
be selected to be printed using the normal SAL_LOG environment
variable mechanism (in a build where SAL_INFO is functional).

Change-Id: Ia5d2c7c7b525ed133fe3f077a005f583b8a856e7

diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index 22637d8..c7aee1f 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -294,7 +294,7 @@ namespace vclcanvas
 static ::canvas::tools::ElapsedTime aElapsedTime;
 
 // log time immediately after surface flip
-SAL_INFO("canvas.vcl", "SpriteCanvasHelper::updateScreen(): flip done 
at %f"<<
+SAL_INFO("canvas.vcl", "SpriteCanvasHelper::updateScreen(): flip done 
at " <<
aElapsedTime.getElapsedTime() );
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=43157

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|target:4.1.0 target:4.2.0   |target:4.1.0 target:4.2.0
   |target:4.3.0 target:4.4.0   |target:4.3.0 target:4.4.0
   |target:4.5.0 target:5.0.0   |target:4.5.0 target:5.0.0
   ||target:5.2.0

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=43157

--- Comment #41 from Commit Notification 
 ---
aybuke committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=91c072b473beadda01a38dbc26086207c7b4d145

tdf#43157: Fix format string violations in OSL_TRACE etc.

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[aybuke]

 canvas/source/vcl/spritecanvas.cxx   |4 ++--
 canvas/source/vcl/spritecanvashelper.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 91c072b473beadda01a38dbc26086207c7b4d145
Author: aybuke 
Date:   Mon Feb 1 15:00:26 2016 +0200

tdf#43157: Fix format string violations in OSL_TRACE etc.

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

diff --git a/canvas/source/vcl/spritecanvas.cxx 
b/canvas/source/vcl/spritecanvas.cxx
index 39e3ad7..268ff37 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -56,7 +56,7 @@ namespace vclcanvas
 if( maArguments.getLength() == 0 )
 return;
 
-OSL_TRACE( "SpriteCanvas created" );
+SAL_INFO("canvas.vcl", "SpriteCanvas created" );
 
 // add our own property to GraphicDevice
 maPropHelper.addProperties(
@@ -105,7 +105,7 @@ namespace vclcanvas
 
 SpriteCanvas::~SpriteCanvas()
 {
-OSL_TRACE( "SpriteCanvas destroyed" );
+SAL_INFO("canvas.vcl", "SpriteCanvas destroyed" );
 }
 
 
diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index 892b241..22637d8 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -294,7 +294,7 @@ namespace vclcanvas
 static ::canvas::tools::ElapsedTime aElapsedTime;
 
 // log time immediately after surface flip
-OSL_TRACE( "SpriteCanvasHelper::updateScreen(): flip done at %f",
+SAL_INFO("canvas.vcl", "SpriteCanvasHelper::updateScreen(): flip done 
at %f"<<
aElapsedTime.getElapsedTime() );
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bug 66754 - Need help on where to test this

[Kohei Yoshida]

Hi Josh,

On Sat, 2016-01-30 at 07:21 -0500, joshbaldwin42 . wrote:

> I am working on
> https://bugs.documentfoundation.org/show_bug.cgi?id=66754 .  This
> required a change to /setup_native/scripts/admin.pl.  I did 
> 
> egrep -ir "admin.pl" .

BTW, when grepping through git-managed files, it's normally a lot faster
to run 'git grep' than the normal grep command (in case you were not
aware of it).
> 
> to see where in libreoffice admin.pl used.  However, it does not
> appear to be called anywhere.

Yup, it looks that way.  Running git log -S'admin.pl' reveals that this
commit

http://cgit.freedesktop.org/libreoffice/core/commit/?id=bdd97ec6ee5ad96fd2452ce99b3ebd28e540629a

removed the last use of this script.  I'm not an expert on the packaging
part of the build system, but I'm pretty certain that this script is
unused for real.

But just in case it is still used externally, let me CC Andras who is
more familiar with this part of the code.

> I wanted to know so I can properly test the code before submitting. 

I think you've done your due diligence to make sure the script is now
unused.  Unless someone else screams and tells you "Please don't remove
it!", I would just remove that file in your gerrit patch, to at least
have Jenkins tell us if it still is buildable on all major platforms.

Kohei


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

[Libreoffice-commits] online.git: loolwsd/Util.cpp loolwsd/Util.hpp

[Henry Castro]

 loolwsd/Util.cpp |   52 
 loolwsd/Util.hpp |   19 +++
 2 files changed, 71 insertions(+)

New commits:
commit 1b6425913d475a2b15866876fe50a9e58a0ea2ce
Author: Henry Castro 
Date:   Mon Feb 1 22:23:58 2016 -0400

loolwsd: add LO core exit codes

diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 088620c..a764ff4 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -491,6 +491,58 @@ namespace Util
 sigaction(SIGFPE, &aSigAction, NULL);
 #endif
 }
+
+int getChildStatus(const int nCode)
+{
+int nRetVal;
+
+switch (static_cast(nCode))
+{
+case LOOLExitCode::LOOL_SECOND_OFFICE:
+case LOOLExitCode::LOOL_FATAL_ERROR:
+case LOOLExitCode::LOOL_CRASH_WITH_RESTART:
+case LOOLExitCode::LOOL_NORMAL_RESTART:
+case LOOLExitCode::LOOL_EXIT_SOFTWARE:
+nRetVal = EXIT_FAILURE;
+break;
+
+case LOOLExitCode::LOOL_NO_ERROR:
+nRetVal = EXIT_SUCCESS;
+break;
+
+default:
+nRetVal = EXIT_SUCCESS;
+break;
+}
+
+return nRetVal;
+}
+
+int getSignalStatus(const int nCode)
+{
+int nRetVal;
+
+switch (nCode)
+{
+case SIGSEGV:
+case SIGBUS:
+case SIGABRT:
+case SIGILL:
+case SIGFPE:
+case SIGTERM:
+case SIGINT:
+case SIGQUIT:
+case SIGHUP:
+nRetVal = EXIT_FAILURE;
+break;
+
+default:
+nRetVal = EXIT_SUCCESS;
+break;
+}
+
+return nRetVal;
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index b599508..b6f6f08 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -25,6 +25,22 @@
 
 // Possible states of LOOL processes.
 enum class LOOLState { LOOL_RUNNING, LOOL_STOPPING, LOOL_ABNORMAL };
+
+enum class LOOLExitCode
+{
+LOOL_NO_ERROR = 0,
+/* pipe was detected - second office must terminate itself */
+LOOL_SECOND_OFFICE = 1,
+/* an uno exception was catched during startup */
+LOOL_FATAL_ERROR = 77, /* Only the low 8 bits are significant 333 % 256 = 
77 */
+/* user force automatic restart after crash */
+LOOL_CRASH_WITH_RESTART = 79,
+/* the office restarts itself */
+LOOL_NORMAL_RESTART = 81,
+/* internal software error */
+LOOL_EXIT_SOFTWARE = 70
+};
+
 extern volatile LOOLState TerminationState;
 
 /// Flag to stop pump loops.
@@ -100,6 +116,9 @@ namespace Util
 /// Trap signals to cleanup and exit the process gracefully.
 void setTerminationSignals();
 void setFatalSignals();
+
+int getChildStatus(const int nCode);
+int getSignalStatus(const int nCode);
 };
 
 //TODO: Move to own file.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Bug 38808] Removal of ATL dependency on Windows

[Chris Sherlock]

This is interesting... 

Do we still want to use ATL?

Chris

> On 27 Jan 2016, at 2:32 AM, bugzilla-dae...@bugs.documentfoundation.org wrote:
> 
> Michael Stahl changed bug 38808 
> What  Removed Added
> StatusNEW RESOLVED
> Resolution--- WONTFIX
> You are receiving this mail because:
> You are on the CC list for the bug.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp loolwsd/LOOLKit.cpp loolwsd/LOOLWSD.cpp

[Henry Castro]

 loolwsd/LOOLBroker.cpp |   30 +++---
 loolwsd/LOOLKit.cpp|   16 +---
 loolwsd/LOOLWSD.cpp|8 
 3 files changed, 28 insertions(+), 26 deletions(-)

New commits:
commit 5fd2be332a6f1b7ae90ecdf8b4b2605768a9c730
Author: Henry Castro 
Date:   Mon Feb 1 21:51:42 2016 -0400

loolwsd: use EXIT_SOFTWARE to indicate internal error

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 24e8d94..aa9d07a 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -229,7 +229,7 @@ namespace
 {
 Log::error("Error: link(\"" + std::string(fpath) + "\",\"" + 
newPath.toString() +
"\") failed. Exiting.");
-exit(1);
+exit(Application::EXIT_SOFTWARE);
 }
 break;
 case FTW_DP:
@@ -592,7 +592,7 @@ static int createLibreOfficeKit(const bool sharePages,
 {
 // child
 lokit_main(loSubPath, jailId, pipe);
-_exit(0);
+_exit(Application::EXIT_OK);
 }
 else
 {
@@ -730,37 +730,37 @@ int main(int argc, char** argv)
 if (loSubPath.empty())
 {
 Log::error("Error: --losubpath is empty");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if (sysTemplate.empty())
 {
 Log::error("Error: --losubpath is empty");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if (loTemplate.empty())
 {
 Log::error("Error: --lotemplate is empty");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if (childRoot.empty())
 {
 Log::error("Error: --childroot is empty");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if (numPreSpawnedChildren < 1)
 {
 Log::error("Error: --numprespawns is 0");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if ( (readerBroker = open(FIFO_FILE.c_str(), O_RDONLY) ) < 0 )
 {
 Log::error("Error: failed to open pipe [" + FIFO_FILE + "] read only. 
Exiting.");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 try
@@ -786,7 +786,7 @@ int main(int argc, char** argv)
 if (!File(loolkitPath).exists())
 {
 Log::error("Error: loolkit does not exists at [" + loolkitPath + "].");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 const Path jailPath = Path::forDirectory(childRoot + Path::separator() + 
jailId);
@@ -838,13 +838,13 @@ int main(int argc, char** argv)
 if (chroot(jailPath.toString().c_str()) == -1)
 {
 Log::error("Error: chroot(\"" + jailPath.toString() + "\") failed.");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if (chdir("/") == -1)
 {
 Log::error("Error: chdir(\"/\") in jail failed.");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 #ifdef __linux
@@ -858,7 +858,7 @@ int main(int argc, char** argv)
 if (mkfifo(FIFO_BROKER.c_str(), 0666) == -1)
 {
 Log::error("Error: Failed to create pipe FIFO [" + FIFO_BROKER + "].");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 // Initialize LoKit and hope we can fork and save memory by sharing pages.
@@ -868,7 +868,7 @@ int main(int argc, char** argv)
 if (createLibreOfficeKit(sharePages, loSubPath, jailId) < 0)
 {
 Log::error("Error: failed to create children.");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if (numPreSpawnedChildren > 1)
@@ -877,7 +877,7 @@ int main(int argc, char** argv)
 if ( (readerChild = open(FIFO_BROKER.c_str(), O_RDONLY) ) < 0 )
 {
 Log::error("Error: pipe opened for reading.");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 PipeRunnable pipeHandler;
@@ -991,7 +991,7 @@ int main(int argc, char** argv)
 close(readerBroker);
 
 Log::info("Process [loolbroker] finished.");
-return 0;
+return Application::EXIT_OK;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index ec3e7b3..f57c7ad 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define LOK_USE_UNSTABLE_API
 #include 
@@ -57,6 +58,7 @@ using Poco::Process;
 using Poco::Notification;
 using Poco::NotificationQueue;
 using Poco::FastMutex;
+using Poco::Util::Application;
 
 const std::string CHILD_URI = "/loolws/child/";
 const std::string LOKIT_BROKER = "/tmp/loolbroker.fifo";
@@ -533,7 +535,7 @@ void lokit_main(const std::string &loSubPath, const 
std::string& jailId, const s
 if (loKit == nullptr)
 {
 Log::error("Error: LibreOfficeKit initialization failed. Exiting.");
-exit(-1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 try
@@ -544,13 +546,13 @@ void lokit_main(c

[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp loolwsd/LOOLWSD.cpp

[Ashod Nakashian]

 loolwsd/LOOLBroker.cpp |1 +
 loolwsd/LOOLWSD.cpp|   10 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit f3b319ee7f847d21472e6914b189ed8d509efd81
Author: Ashod Nakashian 
Date:   Mon Feb 1 20:47:40 2016 -0500

loolwsd: each HTTPServer has its params and skip failed child query

Change-Id: I41c730a935fd0d2e1e3181cced529d414c3aebb0
Reviewed-on: https://gerrit.libreoffice.org/22014
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index cb93536..24e8d94 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -379,6 +379,7 @@ public:
 }
 
 log << Log::end;
+++it;
 continue;
 }
 
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 2e59e0e..e13438e 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -963,20 +963,22 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 // We must have sufficient available threads
 // in the default ThreadPool to dispatch
 // connections, otherwise we will deadlock.
-auto params = new HTTPServerParams();
-params->setMaxThreads(MAX_SESSIONS);
+auto params1 = new HTTPServerParams();
+params1->setMaxThreads(MAX_SESSIONS);
+auto params2 = new HTTPServerParams();
+params2->setMaxThreads(MAX_SESSIONS);
 
 // Start a server listening on the port for clients
 ServerSocket svs(ClientPortNumber);
 ThreadPool threadPool(NumPreSpawnedChildren*6, MAX_SESSIONS * 2);
-HTTPServer srv(new RequestHandlerFactory(), 
threadPool, svs, params);
+HTTPServer srv(new RequestHandlerFactory(), 
threadPool, svs, params1);
 
 srv.start();
 
 // And one on the port for child processes
 SocketAddress addr2("127.0.0.1", MASTER_PORT_NUMBER);
 ServerSocket svs2(addr2);
-HTTPServer srv2(new RequestHandlerFactory(), 
threadPool, svs2, params);
+HTTPServer srv2(new RequestHandlerFactory(), 
threadPool, svs2, params2);
 
 srv2.start();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp loolwsd/LOOLKit.cpp loolwsd/LOOLWSD.cpp loolwsd/Util.cpp loolwsd/Util.hpp

[Henry Castro]

 loolwsd/LOOLBroker.cpp |3 +-
 loolwsd/LOOLKit.cpp|3 +-
 loolwsd/LOOLWSD.cpp|3 +-
 loolwsd/Util.cpp   |   60 +
 loolwsd/Util.hpp   |3 +-
 5 files changed, 54 insertions(+), 18 deletions(-)

New commits:
commit b477f4163619e52e3a46e681612c0afbf28a2acf
Author: Henry Castro 
Date:   Mon Feb 1 21:26:19 2016 -0400

loolwsd: add fatal signals handler

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index f58a4f3..cb93536 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -669,7 +669,8 @@ int main(int argc, char** argv)
 // Initialization
 Log::initialize("brk");
 
-Util::setSignals(false);
+Util::setTerminationSignals();
+Util::setFatalSignals();
 
 std::string childRoot;
 std::string jailId;
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 04e5d82..ec3e7b3 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -517,7 +517,8 @@ void lokit_main(const std::string &loSubPath, const 
std::string& jailId, const s
 #ifdef __linux
 if (prctl(PR_SET_NAME, reinterpret_cast(process_name.c_str()), 0, 0, 0) != 0)
 Log::error("Cannot set process name to " + process_name + ".");
-Util::setSignals(false);
+Util::setTerminationSignals();
+Util::setFatalSignals();
 #endif
 Log::debug("Process [" + process_name + "] started.");
 
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index b5ef7e0..2e59e0e 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -896,7 +896,8 @@ int LOOLWSD::main(const std::vector& /*args*/)
 setlocale(LC_ALL, "en_US.utf8");
 #endif
 
-Util::setSignals(false);
+Util::setTerminationSignals();
+Util::setFatalSignals();
 
 if (access(Cache.c_str(), R_OK | W_OK | X_OK) != 0)
 {
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index ee2b5d1..088620c 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -416,7 +416,7 @@ namespace Util
 }
 
 static
-void handleSignal(int aSignal)
+void handleTerminationSignal(const int aSignal)
 {
 if (!TerminationFlag)
 {
@@ -426,37 +426,69 @@ namespace Util
 TerminationFlag = true;
 TerminationState = ( aSignal == SIGTERM ? LOOLState::LOOL_ABNORMAL 
: LOOLState::LOOL_STOPPING );
 
-Log::info() << "Signal received: " << strsignal(aSignal) << 
Log::end;
-if (aSignal == SIGSEGV || aSignal == SIGBUS)
-{
-Log::error() << "\nSegfault! Attach debugger with:\n"
- << "sudo gdb --pid=" << Poco::Process::id() << 
"\n or \n"
- << "sudo gdb --q --n --ex 'thread apply all 
backtrace full' --batch --pid="
- << Poco::Process::id() << "\n" << Log::end;
-sleep(10);
-}
+Log::info() << "Termination signal received: "
+<< strsignal(aSignal) << Log::end;
 }
 }
 
-void setSignals(bool isIgnored)
+void setTerminationSignals()
 {
 #ifdef __linux
 struct sigaction aSigAction;
 
 sigemptyset(&aSigAction.sa_mask);
 aSigAction.sa_flags = 0;
-aSigAction.sa_handler = (isIgnored ? SIG_IGN : handleSignal);
+aSigAction.sa_handler = handleTerminationSignal;
 
 sigaction(SIGTERM, &aSigAction, nullptr);
 sigaction(SIGINT, &aSigAction, nullptr);
 sigaction(SIGQUIT, &aSigAction, nullptr);
 sigaction(SIGHUP, &aSigAction, nullptr);
+#endif
+}
+
+static
+void handleFatalSignal(const int aSignal)
+{
+Log::error() << "Fatal signal received: "
+ << strsignal(aSignal) << Log::end;
 
 if (getenv("LOOL_DEBUG"))
 {
-sigaction(SIGBUS, &aSigAction, nullptr);
-sigaction(SIGSEGV, &aSigAction, nullptr);
+Log::error() << "\nSegfault! Attach debugger with:\n"
+ << "sudo gdb --pid=" << Poco::Process::id() << "\n or 
\n"
+ << "sudo gdb --q --n --ex 'thread apply all backtrace 
full' --batch --pid="
+ << Poco::Process::id() << "\n" << Log::end;
+sleep(10);
 }
+
+#ifdef __linux
+struct sigaction aSigAction;
+
+sigemptyset(&aSigAction.sa_mask);
+aSigAction.sa_flags = 0;
+aSigAction.sa_handler = SIG_DFL;
+
+sigaction(aSignal, &aSigAction, NULL);
+// let default handler process the signal
+kill(Poco::Process::id(), aSignal);
+#endif
+}
+
+void setFatalSignals()
+{
+#ifdef __linux
+struct sigaction aSigAction;
+
+sigemptyset(&aSigAction.sa_mask);
+aSigAction.sa_flags = 0;
+aSigAction.sa_handler = handleFatalSignal;
+
+sigaction(SIGSEGV, &aSigAction, NULL);
+sigaction(SIGBUS, &aSigAction, NULL);
+sigaction(SIGABRT, &aSigAction, NULL);
+sigaction(SIG

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loolwsd/LOOLWSD.cpp loolwsd/Util.cpp loolwsd/Util.hpp

[Henry Castro]

 loolwsd/LOOLWSD.cpp |   21 ++--
 loolwsd/Util.cpp|   54 +++-
 loolwsd/Util.hpp|   17 
 3 files changed, 89 insertions(+), 3 deletions(-)

New commits:
commit 78e19dbedc4f2257bdad63608a8f70e65b486e04
Author: Henry Castro 
Date:   Mon Feb 1 20:14:26 2016 -0400

loolwsd: avoid fork a new child when its exit code is not success

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ca909aa..d8070e0 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1227,6 +1227,8 @@ bool LOOLWSD::startupComponent(int nComponents)
 
 void LOOLWSD::desktopMain()
 {
+int nChildExitCode = Application::EXIT_OK;
+
 #ifdef __linux
 if (prctl(PR_SET_NAME, reinterpret_cast("loolbroker"), 0, 
0, 0) != 0)
 std::cout << Util::logPrefix() << "Cannot set thread name :" << 
strerror(errno) << std::endl;
@@ -1248,7 +1250,20 @@ void LOOLWSD::desktopMain()
 {
 if ((WIFEXITED(status) || WIFSIGNALED(status)))
 {
-std::cout << Util::logPrefix() << "One of our known child 
processes died :" << std::to_string(pid)  << std::endl;
+if (WIFEXITED(status))
+{
+nChildExitCode = 
Util::getChildStatus(WEXITSTATUS(status));
+std::cout << Util::logPrefix() << "One of our known 
child processes died :" << std::to_string(pid)
+  << " exit code " << 
std::to_string(WEXITSTATUS(status)) << std::endl;
+}
+else
+if (WIFSIGNALED(status))
+{
+nChildExitCode = 
Util::getSignalStatus(WTERMSIG(status));
+std::cout << Util::logPrefix() << "One of our known 
child processes died :" << std::to_string(pid)
+  << " signal code " << 
strsignal(WTERMSIG(status)) << std::endl;
+}
+
 // remove chroot child
 File aWorkSpace(LOOLWSD::childRoot + Path::separator() +
 
std::to_string(MasterProcessSession::_childProcesses[pid]));
@@ -1256,6 +1271,7 @@ void LOOLWSD::desktopMain()
 aWorkSpace.remove(true);
 
 MasterProcessSession::_childProcesses.erase(pid);
+timeoutCounter = -1;
 }
 
 if ( WCOREDUMP(status) )
@@ -1289,7 +1305,7 @@ void LOOLWSD::desktopMain()
 if (MasterProcessSession::_childProcesses.size() + toSpawn < 
_numPreSpawnedChildren)
 toSpawn = _numPreSpawnedChildren - 
MasterProcessSession::_childProcesses.size();
 
-if (toSpawn > 0)
+if (toSpawn > 0 && nChildExitCode == Application::EXIT_OK)
 {
 std::cout << Util::logPrefix() << "Create child session, fork 
new ones: " << toSpawn << std::endl;
 if (!startupComponent(toSpawn))
@@ -1302,6 +1318,7 @@ void LOOLWSD::desktopMain()
 {
 timeoutCounter = 0;
 sleep(MAINTENANCE_INTERVAL);
+nChildExitCode = Application::EXIT_OK;
 }
 }
 
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index faf7518..7980fbd 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -84,7 +84,7 @@ namespace Util
 
 bool encodeBufferToPNG(unsigned char *pixmap, int width, int height, 
std::vector& output, LibreOfficeKitTileMode mode)
 {
-   
+
 return encodeSubBufferToPNG(pixmap, 0, 0, width, height, width, 
height, output, mode);
 }
 
@@ -200,6 +200,58 @@ namespace Util
 return std::to_string(signo);
 }
 }
+
+int getChildStatus(const int nCode)
+{
+int nRetVal;
+
+switch (static_cast(nCode))
+{
+case LOOLExitCode::LOOL_SECOND_OFFICE:
+case LOOLExitCode::LOOL_FATAL_ERROR:
+case LOOLExitCode::LOOL_CRASH_WITH_RESTART:
+case LOOLExitCode::LOOL_NORMAL_RESTART:
+case LOOLExitCode::LOOL_EXIT_SOFTWARE:
+nRetVal = EXIT_FAILURE;
+break;
+
+case LOOLExitCode::LOOL_NO_ERROR:
+nRetVal = EXIT_SUCCESS;
+break;
+
+default:
+nRetVal = EXIT_SUCCESS;
+break;
+}
+
+return nRetVal;
+}
+
+int getSignalStatus(const int nCode)
+{
+int nRetVal;
+
+switch (nCode)
+{
+case SIGSEGV:
+case SIGBUS:
+case SIGABRT:
+case SIGILL:
+case SIGFPE:
+case SIGTERM:
+case SIGINT:
+case SIGQUIT:
+case SIGHUP:
+nRetVal = EXIT_FAILURE;
+break;
+
+default:
+nRetVal = EXIT_SUCCESS;
+break;
+}
+
+return nRetVal;
+

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loolwsd/LOOLWSD.cpp

[Henry Castro]

 loolwsd/LOOLWSD.cpp |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5aec6bfcf7ebe2d0104bbd67c8cce7f7f5e366e4
Author: Henry Castro 
Date:   Mon Feb 1 18:01:48 2016 -0400

loolwsd: use EXIT_SOFTWARE to indicate internal error

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8948da0..ca909aa 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -866,7 +866,7 @@ namespace
 Application::instance().logger().error(Util::logPrefix() +
"link(\"" + fpath + 
"\",\"" + newPath.toString() + "\") failed: " +
strerror(errno));
-exit(1);
+exit(Application::EXIT_SOFTWARE);
 }
 break;
 case FTW_DP:
@@ -935,20 +935,20 @@ namespace
 if (caps == NULL)
 {
 Application::instance().logger().error(Util::logPrefix() + 
"cap_get_proc() failed: " + strerror(errno));
-exit(1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if (cap_set_flag(caps, CAP_EFFECTIVE, 
sizeof(cap_list)/sizeof(cap_list[0]), cap_list, CAP_CLEAR) == -1 ||
 cap_set_flag(caps, CAP_PERMITTED, 
sizeof(cap_list)/sizeof(cap_list[0]), cap_list, CAP_CLEAR) == -1)
 {
 Application::instance().logger().error(Util::logPrefix() +  
"cap_set_flag() failed: " + strerror(errno));
-exit(1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if (cap_set_proc(caps) == -1)
 {
 Application::instance().logger().error(std::string("cap_set_proc() 
failed: ") + strerror(errno));
-exit(1);
+exit(Application::EXIT_SOFTWARE);
 }
 
 char *capText = cap_to_text(caps, NULL);
@@ -1073,13 +1073,13 @@ void LOOLWSD::componentMain()
 if (chroot(jailPath.toString().c_str()) == -1)
 {
 logger().error("chroot(\"" + jailPath.toString() + "\") failed: " 
+ strerror(errno));
-exit(Application::EXIT_UNAVAILABLE);
+exit(Application::EXIT_SOFTWARE);
 }
 
 if (chdir("/") == -1)
 {
 logger().error(std::string("chdir(\"/\") in jail failed: ") + 
strerror(errno));
-exit(Application::EXIT_UNAVAILABLE);
+exit(Application::EXIT_SOFTWARE);
 }
 
 #ifdef __linux
@@ -1106,7 +1106,7 @@ void LOOLWSD::componentMain()
 if (!loKit)
 {
 logger().fatal(Util::logPrefix() + "LibreOfficeKit initialisation 
failed");
-exit(Application::EXIT_UNAVAILABLE);
+exit(Application::EXIT_SOFTWARE);
 }
 
 _namedMutexLOOL.unlock();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hpp

[Henry Castro]

 loolwsd/LOOLWSD.cpp |   52 +---
 loolwsd/LOOLWSD.hpp |6 --
 2 files changed, 49 insertions(+), 9 deletions(-)

New commits:
commit dbf816b9392db136f3a74c785a7704c3d5d42a05
Author: Henry Castro 
Date:   Mon Feb 1 17:46:56 2016 -0400

loolwsd: add fatal signals handler

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index db2ccac..8948da0 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -657,20 +657,38 @@ LOOLWSD::~LOOLWSD()
 {
 }
 
-void LOOLWSD::handleSignal(int aSignal)
+void LOOLWSD::handleTerminationSignal(const int aSignal)
 {
-std::cout << Util::logPrefix() << "Signal received: " << 
strsignal(aSignal) << std::endl;
+std::cout << Util::logPrefix() << "Signal received: "
+  << strsignal(aSignal) << std::endl;
 LOOLWSD::isShutDown = true;
 }
 
-void LOOLWSD::setSignals(bool isIgnored)
+void LOOLWSD::handleFatalSignal(const int aSignal)
+{
+std::cout << Util::logPrefix() << "Fatal signal received: "
+  << strsignal(aSignal) << std::endl;
+ #ifdef __linux
+struct sigaction aSigAction;
+
+sigemptyset(&aSigAction.sa_mask);
+aSigAction.sa_flags = 0;
+aSigAction.sa_handler = SIG_DFL;
+
+sigaction(aSignal, &aSigAction, NULL);
+// let default handler process the signal
+kill(Process::id(), aSignal);
+#endif
+}
+
+void LOOLWSD::setTerminationSignals()
 {
 #ifdef __linux
 struct sigaction aSigAction;
 
 sigemptyset(&aSigAction.sa_mask);
 aSigAction.sa_flags = 0;
-aSigAction.sa_handler = (isIgnored ? SIG_IGN : handleSignal);
+aSigAction.sa_handler = handleTerminationSignal;
 
 sigaction(SIGTERM, &aSigAction, NULL);
 sigaction(SIGINT, &aSigAction, NULL);
@@ -679,6 +697,23 @@ void LOOLWSD::setSignals(bool isIgnored)
 #endif
 }
 
+void LOOLWSD::setFatalSignals()
+{
+#ifdef __linux
+struct sigaction aSigAction;
+
+sigemptyset(&aSigAction.sa_mask);
+aSigAction.sa_flags = 0;
+aSigAction.sa_handler = handleFatalSignal;
+
+sigaction(SIGSEGV, &aSigAction, NULL);
+sigaction(SIGBUS, &aSigAction, NULL);
+sigaction(SIGABRT, &aSigAction, NULL);
+sigaction(SIGILL, &aSigAction, NULL);
+sigaction(SIGFPE, &aSigAction, NULL);
+#endif
+}
+
 void LOOLWSD::initialize(Application& self)
 {
 ServerApplication::initialize(self);
@@ -982,7 +1017,8 @@ void LOOLWSD::componentMain()
 if (prctl(PR_SET_NAME, reinterpret_cast("libreofficekit"), 
0, 0, 0) != 0)
 std::cout << Util::logPrefix() << "Cannot set thread name :" << 
strerror(errno) << std::endl;
 
-setSignals(false);
+setTerminationSignals();
+setFatalSignals();
 #endif
 
 try
@@ -1195,7 +1231,8 @@ void LOOLWSD::desktopMain()
 if (prctl(PR_SET_NAME, reinterpret_cast("loolbroker"), 0, 
0, 0) != 0)
 std::cout << Util::logPrefix() << "Cannot set thread name :" << 
strerror(errno) << std::endl;
 
-setSignals(false);
+setTerminationSignals();
+setFatalSignals();
 #endif
 
 _rng.seed(Process::id());
@@ -1309,7 +1346,8 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 if (locale == NULL || std::strcmp(locale, "C") == 0)
 setlocale(LC_ALL, "en_US.utf8");
 
-setSignals(false);
+setTerminationSignals();
+setFatalSignals();
 #endif
 
 if (access(cache.c_str(), R_OK | W_OK | X_OK) != 0)
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index f58917a..8d87cb0 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -56,8 +56,10 @@ public:
 static const std::string LOKIT_PIDLOG;
 
 protected:
-static void setSignals(bool bIgnore);
-static void handleSignal(int nSignal);
+static void setTerminationSignals();
+static void setFatalSignals();
+static void handleTerminationSignal(const int nSignal);
+static void handleFatalSignal(const int nSignal);
 
 void initialize(Poco::Util::Application& self) override;
 void uninitialize() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti]

 loleaflet/src/layer/marker/Cursor.js  |   32 ++--
 loleaflet/src/layer/tile/TileLayer.js |2 +-
 loleaflet/src/map/Map.js  |8 
 3 files changed, 27 insertions(+), 15 deletions(-)

New commits:
commit e88d2f5ae78661ed8d6cbecbbc24bf726aadf942
Author: Marco Cecchetti 
Date:   Mon Feb 1 22:18:13 2016 +0100

loleaflet: custom cursor properties can be passed as map options

Change-Id: I0213278becc63bbd66e202c870cb55268c1bcd2b

diff --git a/loleaflet/src/layer/marker/Cursor.js 
b/loleaflet/src/layer/marker/Cursor.js
index f98e323..6d9a47a 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -107,22 +107,26 @@ L.Cursor.imagePath = (function () {
}
 }());
 
-L.Cursor.getCustomCursor = function( cursorName ) {
-   var customCursor,
-   isCustomCursor = true,
-   top = 0,
-   left = 0;
-
-   if ( cursorName === 'fill' ) {
-   top = 16; left = 7;
-   } else {
-   isCustomCursor = false;
-   }
+L.Cursor.hotSpot = {
+   fill: {x: 7, y: 16}
+};
+
+L.Cursor.customCursors = [
+   'fill'
+];
+
+L.Cursor.isCustomCursor = function (cursorName) {
+   return (L.Cursor.customCursors.indexOf(cursorName) !== -1);
+};
+
+L.Cursor.getCustomCursor = function (cursorName) {
+   var customCursor;
 
-   if (isCustomCursor) {
+   if (L.Cursor.isCustomCursor(cursorName)) {
+   var cursorHotSpot = L.Cursor.hotSpot[cursorName] || {x: 0, y: 
0};
customCursor = L.Browser.ie ? // IE10 does not like item with 
left/top position in the url list
'url(' + L.Cursor.imagePath + '/' + cursorName + 
'.cur), default' :
-   'url(' + L.Cursor.imagePath + '/' + cursorName + '.png) 
' + left + ' ' + top + ', default';
+   'url(' + L.Cursor.imagePath + '/' + cursorName + '.png) 
' + cursorHotSpot.x + ' ' + cursorHotSpot.y + ', default';
}
-   return customCursor
+   return customCursor;
 };
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index fc46e6e..832f531 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -441,7 +441,7 @@ L.TileLayer = L.GridLayer.extend({
_onMousePointerMsg: function (textMsg) {
textMsg = textMsg.substring(14); // "mousepointer: "
textMsg = L.Cursor.getCustomCursor(textMsg) || textMsg;
-   if (this._map._container.style.cursor != textMsg) {
+   if (this._map._container.style.cursor !== textMsg) {
this._map._container.style.cursor = textMsg;
}
},
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index eb430a9..daec441 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -46,6 +46,14 @@ L.Map = L.Evented.extend({
this.setView(L.latLng(options.center), options.zoom, 
{reset: true});
}
 
+   if (options.cursorURL !== undefined) {
+   L.Cursor.imagePath = options.cursorURL;
+   }
+
+   if (options.cursorHotSpot !== undefined) {
+   L.Cursor.hotSpot = options.cursorHotSpot;
+   }
+
if (options.webserver === undefined) {
var protocol = window.location.protocol === 'file:' ? 
'http:' : window.location.protocol;
options.webserver = options.server.replace(/^ws:/i, 
protocol);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loleaflet/src

[Marco Cecchetti]

 loleaflet/src/layer/marker/Cursor.js  |   32 ++--
 loleaflet/src/layer/tile/TileLayer.js |2 +-
 loleaflet/src/map/Map.js  |8 
 3 files changed, 27 insertions(+), 15 deletions(-)

New commits:
commit 1a5e9b19e14c8e085b2b9e2a47d47eb203e889ee
Author: Marco Cecchetti 
Date:   Mon Feb 1 22:18:13 2016 +0100

loleaflet: custom cursor properties can be passed as map options

Change-Id: I0213278becc63bbd66e202c870cb55268c1bcd2b

diff --git a/loleaflet/src/layer/marker/Cursor.js 
b/loleaflet/src/layer/marker/Cursor.js
index f98e323..6d9a47a 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -107,22 +107,26 @@ L.Cursor.imagePath = (function () {
}
 }());
 
-L.Cursor.getCustomCursor = function( cursorName ) {
-   var customCursor,
-   isCustomCursor = true,
-   top = 0,
-   left = 0;
-
-   if ( cursorName === 'fill' ) {
-   top = 16; left = 7;
-   } else {
-   isCustomCursor = false;
-   }
+L.Cursor.hotSpot = {
+   fill: {x: 7, y: 16}
+};
+
+L.Cursor.customCursors = [
+   'fill'
+];
+
+L.Cursor.isCustomCursor = function (cursorName) {
+   return (L.Cursor.customCursors.indexOf(cursorName) !== -1);
+};
+
+L.Cursor.getCustomCursor = function (cursorName) {
+   var customCursor;
 
-   if (isCustomCursor) {
+   if (L.Cursor.isCustomCursor(cursorName)) {
+   var cursorHotSpot = L.Cursor.hotSpot[cursorName] || {x: 0, y: 
0};
customCursor = L.Browser.ie ? // IE10 does not like item with 
left/top position in the url list
'url(' + L.Cursor.imagePath + '/' + cursorName + 
'.cur), default' :
-   'url(' + L.Cursor.imagePath + '/' + cursorName + '.png) 
' + left + ' ' + top + ', default';
+   'url(' + L.Cursor.imagePath + '/' + cursorName + '.png) 
' + cursorHotSpot.x + ' ' + cursorHotSpot.y + ', default';
}
-   return customCursor
+   return customCursor;
 };
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index fc46e6e..832f531 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -441,7 +441,7 @@ L.TileLayer = L.GridLayer.extend({
_onMousePointerMsg: function (textMsg) {
textMsg = textMsg.substring(14); // "mousepointer: "
textMsg = L.Cursor.getCustomCursor(textMsg) || textMsg;
-   if (this._map._container.style.cursor != textMsg) {
+   if (this._map._container.style.cursor !== textMsg) {
this._map._container.style.cursor = textMsg;
}
},
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index eb430a9..daec441 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -46,6 +46,14 @@ L.Map = L.Evented.extend({
this.setView(L.latLng(options.center), options.zoom, 
{reset: true});
}
 
+   if (options.cursorURL !== undefined) {
+   L.Cursor.imagePath = options.cursorURL;
+   }
+
+   if (options.cursorHotSpot !== undefined) {
+   L.Cursor.hotSpot = options.cursorHotSpot;
+   }
+
if (options.webserver === undefined) {
var protocol = window.location.protocol === 'file:' ? 
'http:' : window.location.protocol;
options.webserver = options.server.replace(/^ws:/i, 
protocol);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Bug 32364] Add a "filter" to Insert > Field > Other > Cross reference tab

[Chris Sherlock]

Hi all, 

Quick ping to the mailing list - if anyone here has expertise around this area, 
it would be great for the submitter to get some feedback :-)

Chris

> On 2 Feb 2016, at 7:52 AM, bugzilla-dae...@bugs.documentfoundation.org wrote:
> 
> 
> Comment # 9  on 
> bug 32364  from 
> Chris Sherlock 
> Hi all, a decent stab at resolving this has been made in gerrit, I don't know
> the codebase well enough to confirm the enhancement though. If someone more
> knowledgeable than myself could review this, it would be greatly appreciated
> :-)
> 
> https://gerrit.libreoffice.org/#/c/21856/ 
> 
> 
> You are receiving this mail because:
> You are on the CC list for the bug.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

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

[Chris Sherlock]

 vcl/inc/impfont.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8e43d1c5d16c5aca294b58c4688e2acd1eda93ba
Author: Chris Sherlock 
Date:   Mon Feb 1 15:41:46 2016 +1100

vcl: minor formatting

Change-Id: I7cc82556d0c1fe874bf112052300217a0162c5bb

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index bc6b4c8..e30bfe4 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -116,8 +116,8 @@ private:
 FontWidth   meWidthType;
 FontItalic  meItalic;
 TextAlign   meAlign;
-FontLineStylemeUnderline;
-FontLineStylemeOverline;
+FontLineStyle   meUnderline;
+FontLineStyle   meOverline;
 FontStrikeout   meStrikeout;
 FontRelief  meRelief;
 FontEmphasisMarkmeEmphasisMark;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 32364] Add a "filter" to Insert > Field > Other > Cross reference tab

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=32364

--- Comment #9 from Chris Sherlock  ---
Hi all, a decent stab at resolving this has been made in gerrit, I don't know
the codebase well enough to confirm the enhancement though. If someone more
knowledgeable than myself could review this, it would be greatly appreciated
:-)

https://gerrit.libreoffice.org/#/c/21856/

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LO exit codes?

[Henry Castro]

>> What is EXIT_NOPERM?

common code "sysexits.h"

#define EX_NOPERM   77  /* permission denied */

I will clean up.  Thanks



2016-02-01 4:27 GMT-04:00 Stephan Bergmann :

> On 01/29/2016 07:17 PM, Henry Castro wrote:
>
>> I was tracing LO exit codes about corrupted installation. I found
>> desktop/source/inc/exithelper.h
>>
>> EXITHELPER_FATAL_ERROR = 333,/* Only the low 8 bits are significant
>> 333 % 256 = 77 */
>>
>> it is confused with standard code
>>
>> EXIT_NOPERM  = 77, /// permission denied
>>
>> I am not sure for Mac and Windows, but is there any reason why 333
>> code?.  any objections if I change to non-standard code?
>>
>
> What is EXIT_NOPERM?
>
> But anyway, yeah, that 333 is silly, given exit(3) et al only use the
> lower eight bits of that argument.  Please clean that up.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Questions about the font shaping tender

[Chris Sherlock]

This does seem a bit odd… unless we want to make AFM parsing cross-platform?

The only thing that I’m aware implements AFM parsing is PrintFontManager, which 
is only used by Unix-based platforms. 

Could we get some clarification around this?

Oh, and also - Khaled, once this is clarified why don’t you go for the tender? 
I can’t think of anyone I’d more highly recommend than yourself, and I’m 
reasonably certain you have some good ideas around how to fix the SalLayout 
mess... certainly you have the technical expertise and experience to tackle 
this. 

Just a suggestion :-)

Chris

> On 1 Feb 2016, at 9:35 PM, Khaled Hosny  wrote:
> 
> I just came across this tender [1] and it is not quite clear to me what
> is it about. Am I right in thinking this is about having a shared
> cross-platform implementation of VCL text layout API (the dreaded
> SalLayout et all)? If so I don’t understand what AFM stuff is doing here
> since we don’t use any of this AFM stuff during text layout as far as I
> can know and I don’t see how it can even be reused for such a task.
> 
> 1. 
> https://blog.documentfoundation.org/blog/2015/12/16/tender-for-cross-platform-fontshaping-stubs-for-layout-tests-201512-05/
> 
> Regards,
> Khaled
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

Marc Bessières license statement

[Marc Bessières]

   All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.

PS: I got the introduction explanation at FOSDEM hackaton by Jan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: German translation request again

[Chris Sherlock]

Thank you Stephan :-) 

Chris 

> On 27 Jan 2016, at 7:17 PM, Stephan Bergmann  wrote:
> 
> On 01/27/2016 08:38 AM, Chris Sherlock wrote:
>> Could someone please translate the following German comments for me?
>> 
>> // Achtung: Diese Id's muessen min. 10 Werte auseinanderliegen, da
>> // je nach Style noch ein Offset aufgerechnet wird
> 
> 
>  "Translate German comment"
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

Re: ucp WebDAV provider returns Content-Type header value, but...

[Chris Sherlock]

I can’t answer this question, but I can publicly thank you for the fix - it’s 
resolved a nasty issue with importing external data from a website!

Great work :-) Thanks so much for diagnosing and committing a fix Giuseppe. 

Chris

On 1 Feb 2016, at 9:31 PM, Giuseppe Castagno  
wrote:
> 
> Hi all,
> 
> These commits:
> 
> 
> 
> 
> fixed a problem preventing MediaType from getting the value of Content-Type 
> header form a Web resource.
> 
> Following two Gerrit patch set propose the same for 5.1 branch.
> 
> 
> 
> 
> I'd like to preserve the sequence so I cherry-picked (-x) them externally, 
> not sure I did the right thing.
> 
> Checked them, fix tdf#95217 in 5.1 as well.
> 
> With both patch applied the value contained in MediaType prop is now not 
> empty, but being a value under a web server control, it may not be right.
> 
> This excerpt from  tells 
> you that:
> "
> ...
> In practice, resource owners do not always properly configure their
> origin server to provide the correct Content-Type for a given
> representation,
> "
> 
> Furthermore, in some WebDAV read/only server, I found that 'Content-type' 
> header and 'DAV:getcontenttype' values are different, instead of being the 
> same as stated in section 15.5 of RFC4918
> 
> 
> As an example accessing the hybrid web site resource:
> 
> 
> LO gets, using GET:
> 
> Content-Type: text/plain
> 
> while PROFIND:
> 
> DAV:getcontenttype:text/xml; charset="utf-8"
> 
> In this case (a WebDAV site) MediaType prop returns DAV:getcontenttype value.
> 
> -- 
> Kind Regards,
> Giuseppe Castagno aka beppec56
> Acca Esse http://www.acca-esse.eu
> giuseppe.castagno at acca-esse.eu
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

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

[Miklos Vajna]

 vcl/android/androidinst.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit c1411517afeb128c9f96dc8ee331516f15cdf5d9
Author: Miklos Vajna 
Date:   Mon Feb 1 20:28:29 2016 +0100

vcl: -Werror=unused-variable

Change-Id: I544d42994bd46171d5d507af450cd1ca5f9c912a

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 99f4c50..349877c 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -24,8 +24,6 @@
 #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOGTAG, 
__VA_ARGS__))
 #define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOGTAG, 
__VA_ARGS__))
 
-static jclass appClass = 0;
-
 // Horrible hack
 static int viewWidth = 1, viewHeight = 1;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loolwsd/bundled loolwsd/LOKitClient.cpp

[Miklos Vajna]

 loolwsd/LOKitClient.cpp  |4 
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h  |   20 +++-
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |   49 ++-
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h  |   31 --
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h |4 
 5 files changed, 86 insertions(+), 22 deletions(-)

New commits:
commit a45c895605f58c2478835d5affaa7fc0ed3c4595
Author: Miklos Vajna 
Date:   Fri Jan 29 14:36:14 2016 +0100

loolwsd: update bundled headers

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index a78c0aa..ee9ac1a 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -12,9 +12,10 @@
 
 #include 
 
-#ifdef LOK_USE_UNSTABLE_API
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 // the unstable API needs C99's bool
 #include 
+#include 
 #endif
 
 #include 
@@ -55,14 +56,25 @@ struct _LibreOfficeKitClass
 LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis,
 const char* pURL,
 const char* pOptions);
-#ifdef LOK_USE_UNSTABLE_API
+void (*freeError) (char* pFree);
+
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 void (*registerCallback) (LibreOfficeKit* pThis,
   LibreOfficeKitCallback pCallback,
   void* pData);
 
 /// @see lok::Office::getFilterTypes().
 char* (*getFilterTypes) (LibreOfficeKit* pThis);
+
+/// @see lok::Office::setOptionalFeatures().
+void (*setOptionalFeatures)(LibreOfficeKit* pThis, uint64_t features);
+
+/// @see lok::Office::setDocumentPassword().
+void (*setDocumentPassword) (LibreOfficeKit* pThis,
+char const* pURL,
+char const* pPassword);
 #endif
+
 };
 
 #define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) 
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize)
@@ -83,7 +95,7 @@ struct _LibreOfficeKitDocumentClass
const char* pFormat,
const char* pFilterOptions);
 
-#ifdef LOK_USE_UNSTABLE_API
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 /// @see lok::Document::getDocumentType().
 int (*getDocumentType) (LibreOfficeKitDocument* pThis);
 
@@ -208,7 +220,7 @@ struct _LibreOfficeKitDocumentClass
const char* pFontName,
int* pFontWidth,
int* pFontHeight);
-#endif // LOK_USE_UNSTABLE_API
+#endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
 #ifdef __cplusplus
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index a0f5e88..b615bd9 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -15,7 +15,7 @@ extern "C"
 {
 #endif
 
-#ifdef LOK_USE_UNSTABLE_API
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 typedef enum
 {
   LOK_DOCTYPE_TEXT,
@@ -40,6 +40,32 @@ typedef enum
 }
 LibreOfficeKitTileMode;
 
+/** Optional features of LibreOfficeKit, in particular callbacks that block
+ *  LibreOfficeKit until the corresponding reply is received, which would
+ *  deadlock if the client does not support the feature.
+ *
+ *  @see lok::Office::setOptionalFeatures().
+ */
+typedef enum
+{
+/**
+ * Handle LOK_CALLBACK_DOCUMENT_PASSWORD by prompting the user
+ * for a password.
+ *
+ * @see lok::Office::setDocumentPassword().
+ */
+LOK_FEATURE_DOCUMENT_PASSWORD = (1ULL << 0),
+
+/**
+ * Handle LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY by prompting the user
+ * for a password.
+ *
+ * @see lok::Office::setDocumentPassword().
+ */
+LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY = (1ULL << 1),
+}
+LibreOfficeKitOptionalFeatures;
+
 typedef enum
 {
 /**
@@ -221,7 +247,24 @@ typedef enum
 /**
  * The text content of the formula bar in Calc.
  */
-LOK_CALLBACK_CELL_FORMULA
+LOK_CALLBACK_CELL_FORMULA,
+
+/**
+ * Loading a document requires a password.
+ *
+ * Loading the document is blocked until the password is provided via
+ * lok::Office::setDocumentPassword().  The document cannot be loaded
+ * without the password.
+ */
+LOK_CALLBACK_DOCUMENT_PASSWORD,
+
+/**
+ * Editing a document requires a password.
+ *
+ * Loading the document is blocked until the password is provided via
+ * lok::Office::setDocumentPassword().
+ */
+LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY,
 }
 LibreOfficeKitCallbackType;
 
@@ -281,7 +324,7 @@ typedef enum
 }
 LibreOffic

[Bug 95405] Kill focus-stealing search and replace dialog and make functionality available in a sidebar deck

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=95405

Akshay Deep  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |akshaydeepi...@gmail.com
   |desktop.org |
 QA Contact|akshaydeepi...@gmail.com|

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 95405] Kill focus-stealing search and replace dialog and make functionality available in a sidebar deck

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=95405

Akshay Deep  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Marco Cecchetti]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d104ed1a643806edcb188073d7c83bc2927fce57
Author: Marco Cecchetti 
Date:   Mon Feb 1 18:50:02 2016 +0100

lool - now the fill cursor type is mapped correctly

Change-Id: I6d89df49b9f740b7f8139493861f25a50dba

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 13e0f6c..aaf52f1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -183,6 +183,7 @@ static const std::map  aPointerMap {
 { PointerStyle::Text, "text" },
 { PointerStyle::Help, "help" },
 { PointerStyle::Cross, "crosshair" },
+{ PointerStyle::Fill, "fill" },
 { PointerStyle::Move, "move" },
 { PointerStyle::NSize, "n-resize" },
 { PointerStyle::SSize, "s-resize" },
@@ -1107,7 +1108,6 @@ static void doc_postMouseEvent(LibreOfficeKitDocument* 
pThis, int nType, int nX,
 pDoc->postMouseEvent(nType, nX, nY, nCount, nButtons, nModifier);
 
 Pointer aPointer = pDoc->getPointer();
-
 // We don't map all possible pointers hence we need a default
 OString aPointerString = "default";
 auto aIt = aPointerMap.find(aPointer.GetStyle());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - libreofficekit/source

[Miklos Vajna]

 libreofficekit/source/gtk/lokdocview.cxx |   28 +++-
 1 file changed, 27 insertions(+), 1 deletion(-)

New commits:
commit c84e1e2521fe0794c3bc84a2238df59a8dba93f4
Author: Miklos Vajna 
Date:   Mon Feb 1 15:04:08 2016 +0100

lokdocview: call lok::Document::setClientZoom() after zoom change

This is similar to what is implemented in online.git's leaflet. If the
zoom factor changes, then inform LOK about it on the first keyboard hit.

Change-Id: I2db4ffed3897db5c852f4b8aea8f4e2d3500a25a

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index afb347f..e6da630 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -123,6 +123,12 @@ struct LOKDocViewPrivateImpl
 /// View ID, returned by createView() or 0 by default.
 int m_nViewId;
 
+/**
+ * Contains a freshly set zoom level: logic size of a tile.
+ * It gets reset back to 0 when LOK was informed about this zoom change.
+*/
+int m_nTileSizeTwips;
+
 LOKDocViewPrivateImpl()
 : m_aLOPath(nullptr),
 m_aDocPath(nullptr),
@@ -159,7 +165,8 @@ struct LOKDocViewPrivateImpl
 m_aHandleEndRect({0, 0, 0, 0}),
 m_bInDragEndHandle(false),
 m_pGraphicHandle(nullptr),
-m_nViewId(0)
+m_nViewId(0),
+m_nTileSizeTwips(0)
 {
 memset(&m_aGraphicHandleRects, 0, sizeof(m_aGraphicHandleRects));
 memset(&m_bInDragGraphicHandles, 0, sizeof(m_bInDragGraphicHandles));
@@ -541,6 +548,20 @@ postKeyEventInThread(gpointer data)
 LOEvent* pLOEvent = static_cast(g_task_get_task_data(task));
 
 priv->m_pDocument->pClass->setView(priv->m_pDocument, priv->m_nViewId);
+
+if (priv->m_nTileSizeTwips)
+{
+std::stringstream ss;
+ss << "lok::Document::setClientZoom(" << nTileSizePixels << ", " << 
nTileSizePixels << ", " << priv->m_nTileSizeTwips << ", " << 
priv->m_nTileSizeTwips << ")";
+g_info("%s", ss.str().c_str());
+priv->m_pDocument->pClass->setClientZoom(priv->m_pDocument,
+ nTileSizePixels,
+ nTileSizePixels,
+ priv->m_nTileSizeTwips,
+ priv->m_nTileSizeTwips);
+priv->m_nTileSizeTwips = 0;
+}
+
 std::stringstream ss;
 ss << "lok::Document::postKeyEvent(" << pLOEvent->m_nKeyEvent << ", " << 
pLOEvent->m_nCharCode << ", " << pLOEvent->m_nKeyCode << ")";
 g_info("%s", ss.str().c_str());
@@ -2556,6 +2577,8 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
 g_clear_error(&error);
 }
 g_object_unref(task);
+
+priv->m_nTileSizeTwips = pixelToTwip(nTileSizePixels, priv->m_fZoom);
 }
 
 SAL_DLLPUBLIC_EXPORT gfloat
commit dfe5531ec8eaf9665248eb332f33ddfecd04d588
Author: Miklos Vajna 
Date:   Mon Feb 1 14:49:52 2016 +0100

lokdocview: log lok::Document::postKeyEvent() arguments

Change-Id: I16e7c0fee34077d5bbb493d9d9502ff82355c2c6

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index bf35646..afb347f 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -541,6 +541,9 @@ postKeyEventInThread(gpointer data)
 LOEvent* pLOEvent = static_cast(g_task_get_task_data(task));
 
 priv->m_pDocument->pClass->setView(priv->m_pDocument, priv->m_nViewId);
+std::stringstream ss;
+ss << "lok::Document::postKeyEvent(" << pLOEvent->m_nKeyEvent << ", " << 
pLOEvent->m_nCharCode << ", " << pLOEvent->m_nKeyCode << ")";
+g_info("%s", ss.str().c_str());
 priv->m_pDocument->pClass->postKeyEvent(priv->m_pDocument,
 pLOEvent->m_nKeyEvent,
 pLOEvent->m_nCharCode,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabriele Ponzo]

 sfx2/uiconfig/ui/startcenter.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 43adbc8489cd724545a6cde72a8720a76ac554f0
Author: Gabriele Ponzo 
Date:   Fri Jan 29 12:53:45 2016 +0100

tdf#96327: Fix accelerator for remote files

Change the accelerator from F to S, because it was conflicting with
file menu.

Change-Id: I1f3959ae12b09fb5d48a7379693c6afc1bafa906
Reviewed-on: https://gerrit.libreoffice.org/21898
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 410e2aa..5b78deb 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -142,7 +142,7 @@
 
 
   
-Remote 
_Files
+Remote 
File_s
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4dae4ed81b82ea3f5ae5f1097e5c75c3b1f0644e
Author: Marco Cecchetti 
Date:   Mon Feb 1 18:50:02 2016 +0100

lool - now the fill cursor type is mapped correctly

Change-Id: I6d89df49b9f740b7f8139493861f25a50dba

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ccb2e40..5360309 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -202,6 +202,7 @@ static const std::map  aPointerMap {
 { PointerStyle::Text, "text" },
 { PointerStyle::Help, "help" },
 { PointerStyle::Cross, "crosshair" },
+{ PointerStyle::Fill, "fill" },
 { PointerStyle::Move, "move" },
 { PointerStyle::NSize, "n-resize" },
 { PointerStyle::SSize, "s-resize" },
@@ -1156,7 +1157,6 @@ static void doc_postMouseEvent(LibreOfficeKitDocument* 
pThis, int nType, int nX,
 pDoc->postMouseEvent(nType, nX, nY, nCount, nButtons, nModifier);
 
 Pointer aPointer = pDoc->getPointer();
-
 // We don't map all possible pointers hence we need a default
 OString aPointerString = "default";
 auto aIt = aPointerMap.find(aPointer.GetStyle());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/android vcl/headless vcl/inc

[Caolán McNamara]

 vcl/android/androidinst.cxx |   30 --
 vcl/headless/svpgdi.cxx |  119 
 vcl/inc/android/androidinst.hxx |2 
 vcl/inc/headless/svpgdi.hxx |3 -
 4 files changed, 51 insertions(+), 103 deletions(-)

New commits:
commit 74ac2c25a71d820ce187282be6d66f4b66da5b18
Author: Caolán McNamara 
Date:   Sun Jan 31 22:25:07 2016 +

work around lack of cairo_rectangle_int_t with basegfx

ditch the CAIRO_VERSION_ENCODE(1, 10, 0) + sub optional
damage rect and just use our always-available basegfx
foo here.

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

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index b39face..99f4c50 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -37,26 +37,6 @@ public:
 virtual bool ErrorTrapPop( bool ) { return false; }
 };
 
-void AndroidSalInstance::damaged(AndroidSalFrame* /* frame */)
-{
-static bool beenHere = false;
-static jmethodID nCallbackDamaged = 0;
-
-// Check if we are running in an app that has registered for damage 
callbacks
-// static public void callbackDamaged();
-// Call the Java layer to post an invalidate if necessary
-
-if (appClass != 0 && !beenHere) {
-nCallbackDamaged = m_pJNIEnv->GetStaticMethodID(appClass, 
"callbackDamaged", "()V");
-if (nCallbackDamaged == 0)
-LOGE("Could not find the callbackDamaged method");
-beenHere = true;
-}
-
-if (appClass != 0 && nCallbackDamaged != 0)
-m_pJNIEnv->CallStaticVoidMethod(appClass, nCallbackDamaged);
-}
-
 void AndroidSalInstance::GetWorkArea( Rectangle& rRect )
 {
 rRect = Rectangle( Point( 0, 0 ),
@@ -131,16 +111,6 @@ public:
 AndroidSalInstance::getInstance()->GetWorkArea( rRect );
 }
 
-virtual void damaged( const basegfx::B2IBox& rDamageRect)
-{
-if (rDamageRect.getWidth() <= 0 ||
-rDamageRect.getHeight() <= 0)
-{
-return;
-}
-AndroidSalInstance::getInstance()->damaged( this );
-}
-
 virtual void UpdateSettings( AllSettings &rSettings )
 {
 // Clobber the UI fonts
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 74fd4d8..24220b7 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -37,63 +37,51 @@
 #include 
 
 #if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
-
 #   define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
-
-struct _cairo_rectangle_int
-{
-int x, y;
-int width, height;
-};
-
 #endif
 
 namespace
 {
-cairo_rectangle_int_t getFillDamage(cairo_t* cr)
+basegfx::B2DRange getClipBox(cairo_t* cr)
 {
-cairo_rectangle_int_t extents;
 double x1, y1, x2, y2;
 
 cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height 
= y2-y1;
 
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
-cairo_region_t *region = cairo_region_create_rectangle(&extents);
+return basegfx::B2DRange(x1, y1, x2, y2);
+}
+
+basegfx::B2DRange getFillDamage(cairo_t* cr)
+{
+double x1, y1, x2, y2;
 
 cairo_fill_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height 
= y2-y1;
-cairo_region_intersect_rectangle(region, &extents);
 
-cairo_region_get_extents(region, &extents);
-cairo_region_destroy(region);
-#endif
+return basegfx::B2DRange(x1, y1, x2, y2);
+}
 
-return extents;
+basegfx::B2DRange getClippedFillDamage(cairo_t* cr)
+{
+basegfx::B2DRange aDamageRect(getFillDamage(cr));
+aDamageRect.intersect(getClipBox(cr));
+return aDamageRect;
 }
 
-cairo_rectangle_int_t getStrokeDamage(cairo_t* cr)
+basegfx::B2DRange getStrokeDamage(cairo_t* cr)
 {
-cairo_rectangle_int_t extents;
 double x1, y1, x2, y2;
 
-cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height 
= y2-y1;
-
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
-cairo_region_t *region = cairo_region_create_rectangle(&extents);
-
 cairo_stroke_extents(cr, &x1, &y1, &x2, &y2);
-extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height 
= y2-y1;
-cairo_region_intersect_rectangle(region, &extents);
 
-cairo_region_get_extents(region, &extents);
-cairo_region_destroy(region);
-#endif
-
-return extents;
+return basegfx::B2DRange(x1, y1, x2, y2);
 }
 
+basegfx::B2DRange getClippedStrokeDamage(cairo_t* cr)
+{
+basegfx::B2DRange aDamageRect(getStrokeDamage(cr));
+aDamageRect.in

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

[Marco Cecchetti]

 loleaflet/dist/cursors/fill.cur   |binary
 loleaflet/dist/cursors/fill.png   |binary
 loleaflet/src/layer/marker/Cursor.js  |   36 ++
 loleaflet/src/layer/tile/TileLayer.js |5 +++-
 4 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit e6d10469eead57765edf63796ceb46a97bc3c932
Author: Marco Cecchetti 
Date:   Mon Feb 1 18:39:07 2016 +0100

loleaflet - in highlighting mode a custom cursor is used

When the user clicks on the background text color control while
editing a text document, loleaflet enter in highlighting mode (exactly
as Wrieter does).
In order to notify that loleaflet has switched to highlighting mode
the cursor changes is shape to a small bottle in the act of dropping
ink.

Change-Id: Ic9a5a636df9fd6071e38edc7e0fc2e11e037a517

diff --git a/loleaflet/dist/cursors/fill.cur b/loleaflet/dist/cursors/fill.cur
new file mode 100644
index 000..78f5fad
Binary files /dev/null and b/loleaflet/dist/cursors/fill.cur differ
diff --git a/loleaflet/dist/cursors/fill.png b/loleaflet/dist/cursors/fill.png
new file mode 100644
index 000..220641b
Binary files /dev/null and b/loleaflet/dist/cursors/fill.png differ
diff --git a/loleaflet/src/layer/marker/Cursor.js 
b/loleaflet/src/layer/marker/Cursor.js
index b4cd5f1..f98e323 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -90,3 +90,39 @@ L.Cursor = L.Layer.extend({
 L.cursor = function (latlng, options) {
return new L.Cursor(latlng, options);
 };
+
+L.Cursor.imagePath = (function () {
+   var scripts = document.getElementsByTagName('script'),
+   leafletRe = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;
+
+   var i, len, src, path;
+
+   for (i = 0, len = scripts.length; i < len; i++) {
+   src = scripts[i].src;
+
+   if (src.match(leafletRe)) {
+   path = src.split(leafletRe)[0];
+   return (path ? path + '/' : '') + 'cursors';
+   }
+   }
+}());
+
+L.Cursor.getCustomCursor = function( cursorName ) {
+   var customCursor,
+   isCustomCursor = true,
+   top = 0,
+   left = 0;
+
+   if ( cursorName === 'fill' ) {
+   top = 16; left = 7;
+   } else {
+   isCustomCursor = false;
+   }
+
+   if (isCustomCursor) {
+   customCursor = L.Browser.ie ? // IE10 does not like item with 
left/top position in the url list
+   'url(' + L.Cursor.imagePath + '/' + cursorName + 
'.cur), default' :
+   'url(' + L.Cursor.imagePath + '/' + cursorName + '.png) 
' + left + ' ' + top + ', default';
+   }
+   return customCursor
+};
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 71855f5..fc46e6e 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -440,7 +440,10 @@ L.TileLayer = L.GridLayer.extend({
 
_onMousePointerMsg: function (textMsg) {
textMsg = textMsg.substring(14); // "mousepointer: "
-   this._map._container.style.cursor = textMsg;
+   textMsg = L.Cursor.getCustomCursor(textMsg) || textMsg;
+   if (this._map._container.style.cursor != textMsg) {
+   this._map._container.style.cursor = textMsg;
+   }
},
 
_onHyperlinkClickedMsg: function (textMsg) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loleaflet/dist loleaflet/src

[Marco Cecchetti]

 loleaflet/dist/cursors/fill.cur   |binary
 loleaflet/dist/cursors/fill.png   |binary
 loleaflet/src/layer/marker/Cursor.js  |   36 ++
 loleaflet/src/layer/tile/TileLayer.js |5 +++-
 4 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit 17e9dfcf8a02ddbd7ab00b8f4e4678eec1a867c5
Author: Marco Cecchetti 
Date:   Mon Feb 1 18:39:07 2016 +0100

loleaflet - in highlighting mode a custom cursor is used

When the user clicks on the background text color control while
editing a text document, loleaflet enter in highlighting mode (exactly
as Wrieter does).
In order to notify that loleaflet has switched to highlighting mode
the cursor changes is shape to a small bottle in the act of dropping
ink.

Change-Id: Ic9a5a636df9fd6071e38edc7e0fc2e11e037a517

diff --git a/loleaflet/dist/cursors/fill.cur b/loleaflet/dist/cursors/fill.cur
new file mode 100644
index 000..78f5fad
Binary files /dev/null and b/loleaflet/dist/cursors/fill.cur differ
diff --git a/loleaflet/dist/cursors/fill.png b/loleaflet/dist/cursors/fill.png
new file mode 100644
index 000..220641b
Binary files /dev/null and b/loleaflet/dist/cursors/fill.png differ
diff --git a/loleaflet/src/layer/marker/Cursor.js 
b/loleaflet/src/layer/marker/Cursor.js
index b4cd5f1..f98e323 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -90,3 +90,39 @@ L.Cursor = L.Layer.extend({
 L.cursor = function (latlng, options) {
return new L.Cursor(latlng, options);
 };
+
+L.Cursor.imagePath = (function () {
+   var scripts = document.getElementsByTagName('script'),
+   leafletRe = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;
+
+   var i, len, src, path;
+
+   for (i = 0, len = scripts.length; i < len; i++) {
+   src = scripts[i].src;
+
+   if (src.match(leafletRe)) {
+   path = src.split(leafletRe)[0];
+   return (path ? path + '/' : '') + 'cursors';
+   }
+   }
+}());
+
+L.Cursor.getCustomCursor = function( cursorName ) {
+   var customCursor,
+   isCustomCursor = true,
+   top = 0,
+   left = 0;
+
+   if ( cursorName === 'fill' ) {
+   top = 16; left = 7;
+   } else {
+   isCustomCursor = false;
+   }
+
+   if (isCustomCursor) {
+   customCursor = L.Browser.ie ? // IE10 does not like item with 
left/top position in the url list
+   'url(' + L.Cursor.imagePath + '/' + cursorName + 
'.cur), default' :
+   'url(' + L.Cursor.imagePath + '/' + cursorName + '.png) 
' + left + ' ' + top + ', default';
+   }
+   return customCursor
+};
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 71855f5..fc46e6e 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -440,7 +440,10 @@ L.TileLayer = L.GridLayer.extend({
 
_onMousePointerMsg: function (textMsg) {
textMsg = textMsg.substring(14); // "mousepointer: "
-   this._map._container.style.cursor = textMsg;
+   textMsg = L.Cursor.getCustomCursor(textMsg) || textMsg;
+   if (this._map._container.style.cursor != textMsg) {
+   this._map._container.style.cursor = textMsg;
+   }
},
 
_onHyperlinkClickedMsg: function (textMsg) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 89756] change from postfix operator++/-- to prefix operator++/--

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=89756

jan iversen  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #21 from jan iversen  ---
following suggestion from Tor followed by direct discussions.

I will cleanup the gerrit patches (which are faulty)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/sifr

[Laurent Balland-Poirier]

 icon-themes/sifr/cmd/lc_saveasremote.png |binary
 icon-themes/sifr/cmd/sc_saveasremote.png |binary
 2 files changed

New commits:
commit 2387d277f7c717f9f4035235f71f15f5ccdc9751
Author: Laurent Balland-Poirier 
Date:   Sun Jan 31 23:01:59 2016 +0100

Add icons for 'Save to Remote Server' (tdf#93038)

Sifr icon theme

Change-Id: Ic8cf19195ce48a4825e94ae31aee83be1e0e
Reviewed-on: https://gerrit.libreoffice.org/21970
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/icon-themes/sifr/cmd/lc_saveasremote.png 
b/icon-themes/sifr/cmd/lc_saveasremote.png
new file mode 100644
index 000..92ca0e4
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_saveasremote.png differ
diff --git a/icon-themes/sifr/cmd/sc_saveasremote.png 
b/icon-themes/sifr/cmd/sc_saveasremote.png
new file mode 100644
index 000..b6b538f
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_saveasremote.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-con

[Michael Stahl]

 RepositoryExternal.mk |   12 --
 config_host.mk.in |1 
 configure.ac  |   37 ++
 distro-configs/LibreOfficeAndroid.conf|1 
 distro-configs/LibreOfficeAndroidAarch64.conf |1 
 distro-configs/LibreOfficeAndroidX86.conf |1 
 distro-configs/LibreOfficeEmscripten.conf |1 
 distro-configs/LibreOfficeLinux.conf  |1 
 distro-configs/LibreOfficeOpenBSD.conf|1 
 vcl/unx/generic/app/randrwrapper.cxx  |  145 --
 10 files changed, 12 insertions(+), 189 deletions(-)

New commits:
commit 8d0b06a69ec0cabbab634241d0e0def323b8250e
Author: Michael Stahl 
Date:   Mon Feb 1 17:25:20 2016 +0100

configure: remove ---disable-randr-link

This looks obsolete, it was used in LibreOfficeLinux.conf since the
beginning but in fact since LO 3.5 it was broken and the vclplug_gen
was not actully dlopen()ing Xrandr.so but somehow magically "found"
the symbols anyway.

Change-Id: I81251a8fef0abac63183b0ff3533bb2331ca6f5a

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 929bdcc..31847d3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3230,8 +3230,6 @@ endif # ENABLE_EOT
 
 ifeq ($(USING_X11), TRUE)
 
-ifeq ($(XRANDR_DLOPEN),FALSE)
-
 define gb_LinkTarget__use_Xrandr
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
@@ -3243,16 +3241,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
 )
 endef
 
-else # XRANDR_DLOPEN
-
-define gb_LinkTarget__use_Xrandr
-$(call gb_LinkTarget_add_defs,$(1),\
-   -DXRANDR_DLOPEN \
-)
-endef
-
-endif # XRANDR_DLOPEN
-
 define gb_LinkTarget__use_Xrender
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
diff --git a/config_host.mk.in b/config_host.mk.in
index c9c7324..2721820 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -643,7 +643,6 @@ export XCODEBUILD_SDK=@XCODEBUILD_SDK@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
 export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@
-export XRANDR_DLOPEN=@XRANDR_DLOPEN@
 export XRANDR_LIBS=$(gb_SPACE)@XRANDR_LIBS@
 export XRENDER_CFLAGS=$(gb_SPACE)@XRENDER_CFLAGS@
 export XRENDER_LIBS=$(gb_SPACE)@XRENDER_LIBS@
diff --git a/configure.ac b/configure.ac
index c90b56a..29ef7e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1261,11 +1261,6 @@ AC_ARG_ENABLE(randr,
 [Disable RandR support in the vcl project.]),
 ,enable_randr=yes)
 
-AC_ARG_ENABLE(randr-link,
-AS_HELP_STRING([--disable-randr-link],
-[Disable linking with libXrandr, instead dynamically open it at 
runtime.]),
-,enable_randr_link=yes)
-
 AC_ARG_ENABLE(gstreamer-1-0,
 AS_HELP_STRING([--disable-gstreamer-1-0],
 [Disable building with the new gstreamer 1.0 avmedia backend.]),
@@ -9224,32 +9219,24 @@ dnl Check for XRandr
 dnl ===
 AC_MSG_CHECKING([whether to enable RandR support])
 if test "$USING_X11" = TRUE -a "$test_randr" = "yes" -a \( "$enable_randr" = 
"yes" -o "$enable_randr" = "TRUE" \); then
-if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
-XRANDR_DLOPEN="TRUE"
+AC_MSG_RESULT([yes])
+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2, ENABLE_RANDR="TRUE", 
ENABLE_RANDR="")
+if test "$ENABLE_RANDR" != "TRUE"; then
+AC_CHECK_HEADER(X11/extensions/Xrandr.h, [],
+[AC_MSG_ERROR([X11/extensions/Xrandr.h could not be found. 
X11 dev missing?])], [])
+XRANDR_CFLAGS=" "
+AC_CHECK_LIB([Xrandr], [XRRQueryExtension], [:],
+  [ AC_MSG_ERROR(libXrandr not found or functional) ], [])
+XRANDR_LIBS="-lXrandr "
 ENABLE_RANDR="TRUE"
-AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
-else
-AC_MSG_RESULT([yes])
-XRANDR_DLOPEN="FALSE"
-PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2, ENABLE_RANDR="TRUE", 
ENABLE_RANDR="")
-if test "$ENABLE_RANDR" != "TRUE"; then
-AC_CHECK_HEADER(X11/extensions/Xrandr.h, [],
-[AC_MSG_ERROR([X11/extensions/Xrandr.h could not be 
found. X11 dev missing?])], [])
-XRANDR_CFLAGS=" "
-AC_CHECK_LIB([Xrandr], [XRRQueryExtension], [:],
-  [ AC_MSG_ERROR(libXrandr not found or functional) ], [])
-XRANDR_LIBS="-lXrandr "
-ENABLE_RANDR="TRUE"
-fi
-XRANDR_CFLAGS=$(printf '%s' "$XRANDR_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
-FilterLibs "${XRANDR_LIBS}"
-XRANDR_LIBS="${filteredlibs}"
 fi
+XRANDR_CFLAGS=$(printf '%s' "$XRANDR_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+FilterLibs "${XRANDR_LIBS}"
+XRANDR_LIBS="${filteredlibs}"
 else
 ENABLE_RANDR=""
 AC_MSG_RESULT([no])
 fi
-AC_SUBST(XRANDR_DLOPEN)
 AC_SUBST(XRANDR_CFLAGS)
 AC_SUBST(XRANDR_LIBS)
 AC_SUBST(ENABLE_RANDR)
diff --git a/distro-configs/LibreOfficeAndroid.conf 
b/distro-configs/

[Bug 82335] Register LibreOffice for Kingsoft Office file types

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=82335

--- Comment #28 from jan iversen  ---
(In reply to Tor Lillqvist from comment #27)
> This is actually not that easy for an easy hack, at least for Linux-based
> newbies, as building a LibreOffice that would include desktop integration
> with file type registration is clearly harder for a newbie than doing a
> normal developer-only build without any packages. As has been demonstrated
> plainly the recent weeks.
> 
> Add to that then that the vast majority of our users are on Windows, and it
> is for Windows that it presumably would be of greater usefulness to
> associate with KingSoft types. Or am I mistaken?

You are not mistaken, we need the registration for windows. I am however
confused we already register file types so it seems to be adding the extra file
types, what did I miss?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Mike Kaganski]

 sdext/source/pdfimport/tree/drawtreevisiting.cxx |   13 +++--
 sdext/source/pdfimport/tree/pdfiprocessor.cxx|2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit f8058b556d7ef23098bf6265f41e3f01f0529879
Author: Mike Kaganski 
Date:   Thu Jan 28 18:33:11 2016 +1000

tdf#96993: remove obsolete vertical mirror hack from PDF import

Since commit ae0e830f9ace78b889713e7e74ce46f88fa21470, mirroring
is handled correctly in LO, so no need to handle it specially in
PDF import code. This obsolete handling causes double-mirroring.

Change-Id: Ia873f0426e444cafd80b24b7d209e90eb481d8f4
Reviewed-on: https://gerrit.libreoffice.org/21870
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx 
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 568b25c..a38050a 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -215,9 +215,9 @@ void DrawXmlEmitter::fillFrameProps( DrawElement&   
rElem,
 if (rElem.MirrorVertical)
 {
 basegfx::B2DHomMatrix mat2;
-mat2.translate(-0.5, -0.5);
-mat2.scale(-1, -1);
-mat2.translate(0.5, 0.5);
+mat2.translate(0, -0.5);
+mat2.scale(1, -1);
+mat2.translate(0, 0.5);
 mat = mat * mat2;
 }
 
@@ -949,13 +949,6 @@ void DrawXmlFinalizer::visit( FrameElement& elem, const 
std::list< Element* >::c
 aGCProps[ "fo:padding-right" ]   = "0cm";
 aGCProps[ "fo:padding-bottom" ]  = "0cm";
 
-// remark: vertical mirroring is done in current OOO by
-// mirroring horzontally and rotating 180 degrees
-// this is quaint, but unfortunately it seems
-// mirror=vertical is defined but not implemented in current code
-if( elem.MirrorVertical )
-aGCProps[ "style:mirror" ] = "horizontal";
-
 StyleContainer::Style style1( "style:style", props1 );
 StyleContainer::Style subStyle1( "style:graphic-properties", aGCProps );
 style1.SubStyles.push_back(&subStyle1);
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 567f256..c91bef3 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -350,7 +350,7 @@ void PDFIProcessor::setupImage(ImageId nImage)
 pFrame->h = pImageElement->h = aScale.getY();
 pFrame->ZOrder = m_nNextZOrder++;
 
-if (aScale.getY() > 0)
+if (aScale.getY() < 0)
 pFrame->MirrorVertical = pImageElement->MirrorVertical = true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac vcl/unx

[Michael Stahl]

 configure.ac |1 +
 vcl/unx/generic/app/randrwrapper.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0e5a0cd29c2b98b8e8262a0727795dd8b5b22649
Author: Michael Stahl 
Date:   Mon Feb 1 17:05:03 2016 +0100

fix the --disable-randr-link build

This was borked since gbuildification of vcl in 2011 and the dlopen
code didn't even compile since commit
b5f1139427b40ca727a03e2e41aa5625cfb08bb8

Change-Id: Ieff22ed144d9d89e53dd956ce0dfea5e4d07ea13

diff --git a/configure.ac b/configure.ac
index fed2b42..c90b56a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9226,6 +9226,7 @@ AC_MSG_CHECKING([whether to enable RandR support])
 if test "$USING_X11" = TRUE -a "$test_randr" = "yes" -a \( "$enable_randr" = 
"yes" -o "$enable_randr" = "TRUE" \); then
 if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
 XRANDR_DLOPEN="TRUE"
+ENABLE_RANDR="TRUE"
 AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
 else
 AC_MSG_RESULT([yes])
diff --git a/vcl/unx/generic/app/randrwrapper.cxx 
b/vcl/unx/generic/app/randrwrapper.cxx
index 570cfcc..d97f86f 100644
--- a/vcl/unx/generic/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -138,7 +138,7 @@ RandRWrapper::RandRWrapper( Display* pDisplay ) :
 // obviously they expected libXext to be linked in global symbolspace 
(that is
 // linked by the application), which is not the case with us (because 
we want
 // to be able to run in headless mode even without an installed X11 
library)
-m_pRandRLib = osl_loadModule( "libXrandr.so.2", SAL_LOADMODULE_DEFAULT 
| SAL_LOADMODULE_NOW );
+m_pRandRLib = osl_loadModuleAscii("libXrandr.so.2", 
SAL_LOADMODULE_DEFAULT | SAL_LOADMODULE_NOW);
 initFromModule();
 }
 if( m_bValid )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 82335] Register LibreOffice for Kingsoft Office file types

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=82335

--- Comment #27 from Tor Lillqvist  ---
This is actually not that easy for an easy hack, at least for Linux-based
newbies, as building a LibreOffice that would include desktop integration with
file type registration is clearly harder for a newbie than doing a normal
developer-only build without any packages. As has been demonstrated plainly the
recent weeks.

Add to that then that the vast majority of our users are on Windows, and it is
for Windows that it presumably would be of greater usefulness to associate with
KingSoft types. Or am I mistaken?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Xisco Fauli]

 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |2 -
 svgio/source/svgreader/svgstyleattributes.cxx|   28 ---
 2 files changed, 26 insertions(+), 4 deletions(-)

New commits:
commit 359f43f8e76c3bd85c3daf35b5a6d925a4c8c64f
Author: Xisco Fauli 
Date:   Sat Jan 30 01:50:07 2016 +0100

tdf#79163: SVGIO: Fix problem with opacity attribute

Opacity attribute didn't work because it was always set to 1.0

Change-Id: I3a2029ef23acf9d8c0f346e04341db33c6802b8e
Reviewed-on: https://gerrit.libreoffice.org/21911
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx 
b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 02cf55d..9d589d1 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -425,7 +425,7 @@ namespace svgio
 const basegfx::BColor* getCurrentColor() const;
 
 /// Opacity content
-SvgNumber getOpacity() const { return maOpacity; }
+SvgNumber getOpacity() const;
 void setOpacity(const SvgNumber& rOpacity = SvgNumber()) { 
maOpacity = rOpacity; }
 
 /// Visibility
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 3e3fa00..e733396 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1056,7 +1056,7 @@ namespace svgio
 return;
 }
 
-const double fOpacity(getOpacity().getNumber());
+const double fOpacity(getOpacity().solve(mrOwner));
 
 if(basegfx::fTools::equalZero(fOpacity))
 {
@@ -1113,7 +1113,7 @@ namespace svgio
 {
 if(!rSource.empty())
 {
-const double fOpacity(getOpacity().getNumber());
+const double fOpacity(getOpacity().solve(mrOwner));
 
 if(basegfx::fTools::equalZero(fOpacity))
 {
@@ -1210,7 +1210,7 @@ namespace svgio
 maTextDecoration(TextDecoration_notset),
 maTextAnchor(TextAnchor_notset),
 maColor(),
-maOpacity(1.0),
+maOpacity(),
 maVisibility(Visibility_visible),
 maTitle(),
 maDesc(),
@@ -2163,6 +2163,28 @@ namespace svgio
 return SvgNumber(1.0);
 }
 
+SvgNumber SvgStyleAttributes::getOpacity() const
+{
+if(mbIsClipPathContent)
+{
+return SvgNumber(1.0);
+}
+else if(maOpacity.isSet())
+{
+return maOpacity;
+}
+
+const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
+
+if(pSvgStyleAttributes)
+{
+return pSvgStyleAttributes->getOpacity();
+}
+
+// default is 1
+return SvgNumber(1.0);
+}
+
 FillRule SvgStyleAttributes::getFillRule() const
 {
 if(FillRule_notset != maFillRule)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: C++ Macro example: DocumentLoader

[aitor_czr]

Hi Stephan,

On 02/01/2016 09:39 AM, Stephan Bergmann wrote:

On 01/30/2016 01:42 PM, aitor_czr wrote:

# make DocumentLoader.run
cd /usr/lib/libreoffice/sdk/LINUXexample.out/bin && DocumentLoader
-env:URE_MORE_TYPES=file://"/types/offapi.rdb"
"/usr/lib/libreoffice/sdk/test.odt"
/bin/sh: 1: DocumentLoader: not found
Makefile:101: recipe for target 'DocumentLoader.run' failed
make: *** [DocumentLoader.run] Error 127


You probably did not (re-)run the setsdkenv_unix script 
()? It drops you into a 
sub-shell where "." is on PATH.


I built the DocumentLoader example succesfully, but running it this is 
what i get:


$ make DocumentLoader.run
cd /usr/lib/libreoffice/sdk/LINUXexample.out/bin && DocumentLoader 
-env:URE_MORE_TYPES=file://"/types/offapi.rdb" 
"/usr/lib/libreoffice/sdk/test.odt"
Error: cannot establish a connection using 
'uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager':

   Connector : couldn't connect to socket (Success)
Makefile:101: recipe for target 'DocumentLoader.run' failed
make: *** [DocumentLoader.run] Error 1

I tried doing:

$/usr/lib/libreoffice/program/soffice 
"--accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" &


before running the application, but it doesn't work.

Cheers,

   Aitor.

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

Re: C++ Macro example: DocumentLoader

[aitor_czr]

Hi Stephan,

On 02/01/2016 09:39 AM, Stephan Bergmann wrote:

On 01/30/2016 01:42 PM, aitor_czr wrote:

# make DocumentLoader.run
cd /usr/lib/libreoffice/sdk/LINUXexample.out/bin && DocumentLoader
-env:URE_MORE_TYPES=file://"/types/offapi.rdb"
"/usr/lib/libreoffice/sdk/test.odt"
/bin/sh: 1: DocumentLoader: not found
Makefile:101: recipe for target 'DocumentLoader.run' failed
make: *** [DocumentLoader.run] Error 127


You probably did not (re-)run the setsdkenv_unix script 
()? It drops you into a 
sub-shell where "." is on PATH. 


Thanks a lot, i will try :)

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

[Bug 93821] not storing & restoring window contents under menus ...

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=93821

--- Comment #4 from Michael Meeks  ---
Argh ! =) be strong, I managed to resist it ;-) Your penance - should you chose
to accept it is to file another easy hack ! =) and also great to see you in
Brussels ... of course.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 74608] Constructor functions for UNO component implementations

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=74608

--- Comment #26 from Commit Notification 
 ---
kripton committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=a395a1137d2e9430dfd5fd20e81c9413f06a554d

tdf#74608 comphelper: Constructor feature for AnyCompareFactory

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: comphelper/source comphelper/util

[kripton]

 comphelper/source/compare/AnyCompareFactory.cxx |   32 
 comphelper/source/inc/comphelper_services.hxx   |1 
 comphelper/source/misc/comphelper_services.cxx  |1 
 comphelper/util/comphelp.component  |3 +-
 4 files changed, 8 insertions(+), 29 deletions(-)

New commits:
commit a395a1137d2e9430dfd5fd20e81c9413f06a554d
Author: kripton 
Date:   Sat Jan 30 17:52:26 2016 +0200

tdf#74608 comphelper: Constructor feature for AnyCompareFactory

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

diff --git a/comphelper/source/compare/AnyCompareFactory.cxx 
b/comphelper/source/compare/AnyCompareFactory.cxx
index 21fa21d..9eacb4f 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -17,13 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "comphelper_module.hxx"
-#include "comphelper_services.hxx"
-
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -74,11 +72,6 @@ public:
 virtual OUString SAL_CALL getImplementationName(  ) 
throw(RuntimeException, std::exception) override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
throw(RuntimeException, std::exception) override;
 virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) 
throw(RuntimeException, std::exception) override;
-
-// XServiceInfo - static versions (used for component registration)
-static OUString SAL_CALL getImplementationName_static();
-static Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
-static Reference< XInterface > SAL_CALL Create( const Reference< 
XComponentContext >& );
 };
 
 sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) 
throw(css::uno::RuntimeException, std::exception)
@@ -121,11 +114,6 @@ void SAL_CALL AnyCompareFactory::initialize( const 
Sequence< Any >& aArguments )
 
 OUString SAL_CALL AnyCompareFactory::getImplementationName(  ) throw( 
RuntimeException, std::exception )
 {
-return getImplementationName_static();
-}
-
-OUString SAL_CALL AnyCompareFactory::getImplementationName_static(  )
-{
 return OUString( "AnyCompareFactory" );
 }
 
@@ -136,25 +124,17 @@ sal_Bool SAL_CALL AnyCompareFactory::supportsService( 
const OUString& ServiceNam
 
 Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames(  ) 
throw(RuntimeException, std::exception)
 {
-return getSupportedServiceNames_static();
-}
-
-Sequence< OUString > SAL_CALL 
AnyCompareFactory::getSupportedServiceNames_static(  )
-{
 const OUString aServiceName( "com.sun.star.ucb.AnyCompareFactory" );
 const Sequence< OUString > aSeq( &aServiceName, 1 );
 return aSeq;
 }
 
-Reference< XInterface > SAL_CALL AnyCompareFactory::Create(
-const Reference< XComponentContext >& rxContext )
-{
-return static_cast(new AnyCompareFactory( rxContext ));
-}
-
-void createRegistryInfo_AnyCompareFactory()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+AnyCompareFactory_get_implementation(
+css::uno::XComponentContext *context,
+css::uno::Sequence const &)
 {
-static ::comphelper::module::OAutoRegistration< AnyCompareFactory > 
aAutoRegistration;
+return cppu::acquire(new AnyCompareFactory(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/inc/comphelper_services.hxx 
b/comphelper/source/inc/comphelper_services.hxx
index 04cbcb3..0f499f3 100644
--- a/comphelper/source/inc/comphelper_services.hxx
+++ b/comphelper/source/inc/comphelper_services.hxx
@@ -22,7 +22,6 @@
 
 #include 
 
-void createRegistryInfo_AnyCompareFactory();
 void createRegistryInfo_Map();
 void createRegistryInfo_OInstanceLocker();
 void createRegistryInfo_OPropertyBag();
diff --git a/comphelper/source/misc/comphelper_services.cxx 
b/comphelper/source/misc/comphelper_services.cxx
index da76ced..47fdf20 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -38,7 +38,6 @@ namespace comphelper { namespace module
 createRegistryInfo_SequenceOutputStream();
 createRegistryInfo_SequenceInputStream();
 createRegistryInfo_UNOMemoryStream();
-createRegistryInfo_AnyCompareFactory();
 createRegistryInfo_OInstanceLocker();
 createRegistryInfo_Map();
 createRegistryInfo_OSimpleLogRing();
diff --git a/comphelper/util/comphelp.component 
b/comphelper/util/comphelp.component
index a948150..4de65e1 100644
--- a/comphelper/util/comphelp.component
+++ b/comphelper/util/comphelp.component
@@ -19,7 +19,8 @@
 
 http://openoffice.org/2010/uno-components";>
-  
+  
 
   
   http://lists.freedesktop.org/mailman/lis

[Libreoffice-commits] core.git: external/boost

[Michael Stahl]

 external/boost/UnpackedTarball_boost.mk   |1 
 external/boost/boost.wdeprecated-auto_ptr.patch.0 |   46 ++
 2 files changed, 47 insertions(+)

New commits:
commit ee5b0e6c9772c905061bf599491ff3d79f62d5ac
Author: Michael Stahl 
Date:   Mon Feb 1 15:30:32 2016 +0100

boost: restore auto_ptr patch for boost::spirit

Change-Id: If70658c568e746ab8923f8e6a5ad3407bd5e94a0

diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index 8e4f580..10ea672 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -82,6 +82,7 @@ boost_patches += gcc6-warnings.patch.0
 # 
https://github.com/boostorg/math/commit/74ff2db959c5fa75bec770c41ed2951a740fe936
 boost_patches += boost_1_60_0.quadmath.patch
 boost_patches += boost_1_60_0.undef.warning.patch
+boost_patches += boost.wdeprecated-auto_ptr.patch.0
 boost_patches += boost_1_60_0.android.undef.warning.patch
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 
b/external/boost/boost.wdeprecated-auto_ptr.patch.0
new file mode 100644
index 000..cf58429
--- /dev/null
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -0,0 +1,46 @@
+--- boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp.orig2 
2015-12-15 18:24:31.318854561 +0100
 boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp   
2015-12-15 18:26:19.804853629 +0100
+@@ -11,6 +11,11 @@
+ #if !defined BOOST_SPIRIT_GRAMMAR_IPP
+ #define BOOST_SPIRIT_GRAMMAR_IPP
+ 
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || 
defined(__clang__)
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++#endif
++
+ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
+ #include 
+ #include 
+@@ -368,4 +373,8 @@
+ 
+ }} // namespace boost::spirit
+ 
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || 
defined(__clang__)
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
+--- boost/spirit/home/classic/symbols/impl/tst.ipp.orig2015-12-15 
19:08:48.978831726 +0100
 boost/spirit/home/classic/symbols/impl/tst.ipp 2015-12-15 
19:09:35.064831330 +0100
+@@ -9,6 +9,11 @@
+ #ifndef BOOST_SPIRIT_TST_IPP
+ #define BOOST_SPIRIT_TST_IPP
+ 
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || 
defined(__clang__)
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++#endif
++
+ 
///
+ #include  // for std::auto_ptr
+ #include 
+@@ -278,4 +283,8 @@
+ 
+ }} // namespace boost::spirit
+ 
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || 
defined(__clang__)
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 74608] Constructor functions for UNO component implementations

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=74608

--- Comment #25 from yeliz  ---
Hi, I sent following patch for this bug:
https://gerrit.libreoffice.org/#/c/21936/

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: C++ Macro example: DocumentLoader

[Stephan Bergmann]

On 02/01/2016 12:24 PM, aitor_czr wrote:

$ make DocumentLoader.run
cd /usr/lib/libreoffice/sdk/LINUXexample.out/bin && DocumentLoader
-env:URE_MORE_TYPES=file://"/types/offapi.rdb"
"/usr/lib/libreoffice/sdk/test.odt"
Error: cannot establish a connection using
'uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager':
Connector : couldn't connect to socket (Success)
Makefile:101: recipe for target 'DocumentLoader.run' failed
make: *** [DocumentLoader.run] Error 1

I tried doing:

$/usr/lib/libreoffice/program/soffice
"--accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" &

before running the application, but it doesn't work.


I cannot reproduce that problem; works fine here. You can use something like

  netstat -an | grep 2083

to check that nothing is listening on port 2083 before you start 
soffice, and then again check that soffice started to listen on that 
port after starting soffice.

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

[Libreoffice-commits] voting.git: 3 commits - vote/2013-board vote/2014-mc vote/2015-board

[Thorsten Behrens]

 vote/2013-board/votes.blt |  131 
 vote/2014-mc/votes.blt|  163 ++
 vote/2015-board/votes.blt |  144 
 3 files changed, 438 insertions(+)

New commits:
commit 5bdb390f7536147b07c39aee55ebebe63808b4f1
Author: Thorsten Behrens 
Date:   Mon Feb 1 10:20:22 2016 +0100

Sticking ballot files to git for archival

diff --git a/vote/2015-board/votes.blt b/vote/2015-board/votes.blt
new file mode 100644
index 000..3ebdd5b
--- /dev/null
+++ b/vote/2015-board/votes.blt
@@ -0,0 +1,144 @@
+11 10
+1 2 7 9 3 6 11 4 10 5 1 0
+1 7 4 1 6 9 0
+1 10 4 5 9 0
+1 1 8 11 3 6 9 10 4 0
+1 3 11 6 10 4 9 5 0
+1 3 5 6 4 11 9 7 0
+1 9 10 5 1 3 4 2 11 6 7 0
+1 1 8 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 11 5 4 6 0
+1 4 10 6 11 1 3 5 8 7 9 0
+1 10 6 3 4 9 7 0
+1 4 9 6 3 5 8 7 2 11 1 0
+1 11 1 9 8 10 4 0
+1 3 9 5 6 0
+1 4 10 3 6 2 5 7 8 1 11 0
+1 5 3 9 4 1 6 11 7 10 0
+1 4 3 5 6 2 1 11 10 9 7 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 4 9 3 5 6 10 2 11 1 7 0
+1 1 4 11 3 7 6 9 8 10 2 0
+1 5 3 7 6 2 9 11 10 4 0
+1 9 4 6 7 3 10 1 5 2 11 0
+1 7 1 3 9 5 8 11 2 6 4 0
+1 10 1 3 6 4 2 5 9 8 7 0
+1 11 3 4 5 9 7 10 6 1 2 0
+1 4 3 9 5 6 1 8 11 7 10 0
+1 3 6 2 5 1 7 9 8 4 0
+1 3 6 9 5 1 2 11 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 10 3 6 7 1 0
+1 4 10 3 1 6 2 7 9 8 5 0
+1 5 3 2 1 4 6 9 11 10 7 0
+1 5 2 10 9 4 3 6 11 1 7 0
+1 4 10 5 3 11 6 9 2 1 8 0
+1 1 11 2 4 3 8 10 9 7 5 0
+1 6 3 7 9 1 8 5 2 11 4 0
+1 4 10 5 9 11 0
+1 3 6 5 7 9 2 4 1 11 8 0
+1 4 10 9 3 5 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 11 4 3 9 5 6 1 2 10 7 0
+1 4 9 6 3 2 1 5 11 10 8 0
+1 8 1 3 11 4 6 7 5 2 9 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 7 1 8 2 5 4 3 10 11 9 0
+1 1 0
+1 7 10 3 8 9 6 5 4 0
+1 3 4 5 9 6 10 2 11 1 8 0
+1 1 0
+1 1 8 11 6 4 10 9 2 3 5 0
+1 11 1 8 6 4 9 3 10 2 5 0
+1 4 10 3 9 5 2 1 0
+1 3 10 5 4 9 2 6 7 11 1 0
+1 4 5 9 11 2 10 6 3 7 1 0
+1 3 6 7 11 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 5 4 2 3 0
+1 9 5 2 3 4 11 6 0
+1 4 9 3 11 7 5 10 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 11 7 3 10 9 4 6 0
+1 4 11 6 1 8 2 9 3 0
+1 4 10 5 2 9 11 1 0
+1 3 11 9 4 10 5 6 2 0
+1 5 4 1 2 9 10 11 8 7 3 0
+1 4 10 5 11 2 0
+1 1 3 11 2 4 8 10 5 6 7 0
+1 3 9 2 0
+1 3 6 7 2 9 1 5 4 8 0
+1 7 9 0
+1 3 8 11 5 6 4 9 2 10 7 0
+1 4 10 0
+1 4 10 3 7 6 1 5 11 2 8 0
+1 10 8 2 1 11 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 9 4 11 2 1 5 6 3 10 8 0
+1 7 3 6 4 2 10 0
+1 4 2 9 6 0
+1 1 8 11 3 6 4 0
+1 5 9 10 3 6 7 0
+1 3 9 5 0
+1 9 3 5 6 2 4 11 1 0
+1 1 8 11 3 9 5 6 4 10 2 0
+1 8 1 7 6 9 4 2 3 11 10 0
+1 6 3 4 9 0
+1 1 8 3 11 5 0
+1 3 4 2 10 6 9 1 11 0
+1 1 8 11 3 4 10 6 9 5 0
+1 7 3 6 4 0
+1 4 10 2 5 11 9 0
+1 3 4 6 5 9 10 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 4 5 1 3 8 11 0
+1 10 1 6 11 0
+1 9 6 5 3 1 2 8 10 4 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 11 3 4 10 6 9 1 0
+1 10 4 11 1 0
+1 3 6 11 8 1 4 7 10 9 5 0
+1 4 3 6 10 1 0
+1 4 2 10 3 11 6 0
+1 1 4 9 10 8 11 0
+1 9 6 5 8 4 10 11 3 0
+1 3 11 2 6 7 5 9 10 4 0
+1 9 8 7 0
+1 5 4 10 2 3 6 9 11 0
+1 11 3 6 1 10 8 5 2 9 7 0
+1 5 3 9 6 7 0
+1 7 9 6 3 0
+1 1 3 4 11 5 2 6 9 10 7 0
+1 3 9 6 7 5 2 10 4 0
+1 1 8 11 6 3 4 10 9 5 0
+1 3 4 10 1 7 6 0
+1 1 8 11 6 3 4 10 9 5 2 0
+1 9 3 5 2 6 10 11 4 0
+1 4 10 5 9 2 1 11 0
+1 4 11 2 1 10 5 6 3 7 9 0
+1 6 1 2 11 0
+1 5 10 11 3 0
+1 3 6 10 5 11 9 2 4 1 0
+1 4 0
+1 3 4 7 6 10 5 2 9 1 11 0
+1 11 1 4 3 9 6 10 5 8 0
+1 1 11 4 2 8 0
+1 4 11 1 6 8 10 3 5 9 7 0
+1 1 3 10 0
+1 10 3 4 5 6 7 11 9 2 1 0
+1 2 3 1 8 6 10 4 11 0
+0
+"Marina Latini"
+"Joel Madero"
+"Thorsten Behrens"
+"Michael Meeks"
+"Norbert Thiebaud"
+"Björn Michaelsen"
+"Andreas Mantke"
+"Osvaldo Gervasi"
+"Eike Rathke"
+"Jan Holešovský"
+"Simon Phipps"
+"2015 Board of Directors election"
commit 03a41b0d6770c5b9e00bc13b7fb0867f6c5a5af9
Author: Thorsten Behrens 
Date:   Mon Feb 1 10:19:59 2016 +0100

Sticking ballot files to git for archival

diff --git a/vote/2014-mc/votes.blt b/vote/2014-mc/votes.blt
new file mode 100644
index 000..2414e70
--- /dev/null
+++ b/vote/2014-mc/votes.blt
@@ -0,0 +1,163 @@
+15 7
+1 1 4 15 13 2 7 12 0
+1 2 4 6 12 1 9 0
+1 7 4 2 12 11 9 10 0
+1 4 12 5 9 10 7 8 0
+1 2 13 12 9 0
+1 10 1 9 4 0
+1 9 4 8 1 0
+1 1 13 8 3 9 4 5 0
+1 15 9 7 8 13 10 4 0
+1 13 8 14 7 10 0
+1 10 1 13 6 8 12 4 0
+1 12 5 1 0
+1 3 9 13 4 15 8 14 0
+1 15 9 7 10 8 5 13 0
+1 15 9 7 10 8 5 13 0
+1 1 10 7 14 4 8 13 0
+1 2 8 10 7 3 1 0
+1 15 9 7 3 4 0
+1 8 13 10 5 4 1 7 0
+1 9 1 10 3 5 0
+1 12 6 4 11 7 1 3 0
+1 7 11 0
+1 1 4 15 13 9 7 12 0
+1 2 6 12 1 5 4 9 0
+1 13 8 14 4 7 0
+1 7 9 11 8 14 4 2 0
+1 13 7 9 8 5 3 10 0
+1 9 4 5 10 8 7 3 0
+1 1 9 14 4 6 11 3 0
+1 14 9 13 0
+1 1 4 9 10 5 7 8 0
+1 15 9 13 7 10 5 8 0
+1 10 1 4 9 13 2 8 0
+1 1 6 15 3 7 8 4 0
+1 1 10 7 13 4 11 15 0
+1 4 9 10 13 8 7 5 0
+1 8 13 4 7 14 0
+1 5 4 2 15 10 3 11 0
+1 11 8 4 13 12 14 5 0
+1 1 14 13 8 0
+1 10 1 2 4 8 3 9 0
+1 13 7 8 4 3 11 12 0
+1 14 15 7 11 13 8 10 0
+1 7 8 13 9 0
+1 13 8 14 7 0
+1 7 4 13 10 1 11 8 0
+1 4 13 8 11 2 14 6 0
+1 12 4 3 7 1 2 10 0
+1 15 9 10 8 13 7 5 0
+1 8 0
+1 4 8 9 7 11 10 13 0
+1 4 3 7 11 9 10 8

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

[David Tardon]

 vcl/source/gdi/dibtools.cxx |   72 ++--
 1 file changed, 36 insertions(+), 36 deletions(-)

New commits:
commit b9d4e76f27b66037c2e2ac4c3738b975e9e773aa
Author: David Tardon 
Date:   Fri Jan 22 19:18:47 2016 +0100

limit variable scope

Change-Id: I961d1378f81b511be3173c61206b53983841abbe
(cherry picked from commit eae3881b92ece4ce7ad93dd836e396b0ad44d16b)
Reviewed-on: https://gerrit.libreoffice.org/21789
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 10c70e9..3c1bc0d 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -761,42 +761,6 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, 
Bitmap* pBmpAlpha, sal_uLon
 }
 
 const sal_uInt16 nBitCount(discretizeBitcount(aHeader.nBitCount));
-const Size aSizePixel(aHeader.nWidth, aHeader.nHeight);
-BitmapPalette aDummyPal;
-Bitmap aNewBmp(aSizePixel, nBitCount, &aDummyPal);
-BitmapWriteAccess* pAcc = aNewBmp.AcquireWriteAccess();
-if (!pAcc)
-return false;
-if (pAcc->Width() != aHeader.nWidth || pAcc->Height() != 
aHeader.nHeight)
-{
-Bitmap::ReleaseAccess(pAcc);
-return false;
-}
-Bitmap aNewBmpAlpha;
-BitmapWriteAccess* pAccAlpha = nullptr;
-bool bAlphaPossible(pBmpAlpha && aHeader.nBitCount == 32);
-
-if (bAlphaPossible)
-{
-const bool bRedSet(0 != aHeader.nV5RedMask);
-const bool bGreenSet(0 != aHeader.nV5GreenMask);
-const bool bBlueSet(0 != aHeader.nV5BlueMask);
-
-// some clipboard entries have alpha mask on zero to say that 
there is
-// no alpha; do only use this when the other masks are set. The MS 
docu
-// says that masks are only to be set when bV5Compression is set to
-// BI_BITFIELDS, but there seem to exist a wild variety of 
usages...
-if((bRedSet || bGreenSet || bBlueSet) && (0 == 
aHeader.nV5AlphaMask))
-{
-bAlphaPossible = false;
-}
-}
-
-if (bAlphaPossible)
-{
-aNewBmpAlpha = Bitmap(aSizePixel, 8);
-pAccAlpha = aNewBmpAlpha.AcquireWriteAccess();
-}
 
 sal_uInt16 nColors(0);
 SvStream* pIStm;
@@ -885,6 +849,42 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, 
Bitmap* pBmpAlpha, sal_uLon
 pIStm = &rIStm;
 }
 
+const Size aSizePixel(aHeader.nWidth, aHeader.nHeight);
+BitmapPalette aDummyPal;
+Bitmap aNewBmp(aSizePixel, nBitCount, &aDummyPal);
+BitmapWriteAccess* pAcc = aNewBmp.AcquireWriteAccess();
+if (!pAcc)
+return false;
+if (pAcc->Width() != aHeader.nWidth || pAcc->Height() != 
aHeader.nHeight)
+{
+Bitmap::ReleaseAccess(pAcc);
+return false;
+}
+Bitmap aNewBmpAlpha;
+BitmapWriteAccess* pAccAlpha = nullptr;
+bool bAlphaPossible(pBmpAlpha && aHeader.nBitCount == 32);
+
+if (bAlphaPossible)
+{
+const bool bRedSet(0 != aHeader.nV5RedMask);
+const bool bGreenSet(0 != aHeader.nV5GreenMask);
+const bool bBlueSet(0 != aHeader.nV5BlueMask);
+
+// some clipboard entries have alpha mask on zero to say that 
there is
+// no alpha; do only use this when the other masks are set. The MS 
docu
+// says that masks are only to be set when bV5Compression is set to
+// BI_BITFIELDS, but there seem to exist a wild variety of 
usages...
+if((bRedSet || bGreenSet || bBlueSet) && (0 == 
aHeader.nV5AlphaMask))
+{
+bAlphaPossible = false;
+}
+}
+
+if (bAlphaPossible)
+{
+aNewBmpAlpha = Bitmap(aSizePixel, 8);
+pAccAlpha = aNewBmpAlpha.AcquireWriteAccess();
+}
 // read palette
 if(nColors)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 compilerplugins/clang/unusedmethods.cxx |   94 ++--
 compilerplugins/clang/unusedmethods.py  |   65 ++
 2 files changed, 131 insertions(+), 28 deletions(-)

New commits:
commit d34d792230251f8d27008522c4e63fb61db32773
Author: Noel Grandin 
Date:   Mon Feb 1 14:52:38 2016 +0200

new loplugin to find public methods that can be private

based on the unusedmethods plugin, which I should probably rename at
some point

Change-Id: If197423c59d4350ea1fdc69e99d24b631d9751b9

diff --git a/compilerplugins/clang/unusedmethods.cxx 
b/compilerplugins/clang/unusedmethods.cxx
index 6f724f8..b05ffe3 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -16,8 +16,14 @@
 #include "compat.hxx"
 
 /**
-Dump a list of calls to methods, and a list of method definitions.
-Then we will post-process the 2 lists and find the set of unused methods.
+This plugin performs 3 different analyses:
+
+(1) Find unused methods
+(2) Find methods whose return types are never evaluated
+(3) Find methods which are public, but are never called from outside the class 
i.e. they can be private
+
+It does so, by dumping various call/definition/use info to a log file.
+Then we will post-process the various lists and find the set of unused methods.
 
 Be warned that it produces around 5G of log file.
 
@@ -41,6 +47,7 @@ namespace {
 
 struct MyFuncInfo
 {
+std::string access;
 std::string returnType;
 std::string nameAndParams;
 std::string sourceLocation;
@@ -58,16 +65,17 @@ struct MyFuncInfo
 
 
 // try to limit the voluminous output a little
+
+// for the "unused method" analysis
 static std::set callSet;
-static std::set usedReturnSet;
 static std::set definitionSet;
+// for the "unused return type" analysis
+static std::set usedReturnSet;
+// for the "unnecessary public" analysis
+static std::set publicDefinitionSet;
+static std::set calledFromOutsideSet;
 
 
-static bool startswith(const std::string& s, const std::string& prefix)
-{
-return s.rfind(prefix,0) == 0;
-}
-
 class UnusedMethods:
 public RecursiveASTVisitor, public loplugin::Plugin
 {
@@ -80,17 +88,19 @@ public:
 
 // dump all our output in one write call - this is to try and limit IO 
"crosstalk" between multiple processes
 // writing to the same logfile
+
 std::string output;
+for (const MyFuncInfo & s : definitionSet)
+output += "definition:\t" + s.access + "\t" + s.returnType + "\t" 
+ s.nameAndParams + "\t" + s.sourceLocation + "\n";
+// for the "unused method" analysis
 for (const MyFuncInfo & s : callSet)
 output += "call:\t" + s.returnType + "\t" + s.nameAndParams + "\n";
+// for the "unused return type" analysis
 for (const MyFuncInfo & s : usedReturnSet)
 output += "usedReturn:\t" + s.returnType + "\t" + s.nameAndParams 
+ "\n";
-for (const MyFuncInfo & s : definitionSet)
-{
-//treat all UNO interfaces as having been called, since they are 
part of our external ABI
-if (!startswith(s.nameAndParams, "com::sun::star::"))
-output += "definition:\t" + s.returnType + "\t" + 
s.nameAndParams + "\t" + s.sourceLocation + "\n";
-}
+// for the "unnecessary public" analysis
+for (const MyFuncInfo & s : calledFromOutsideSet)
+output += "outside:\t" + s.returnType + "\t" + s.nameAndParams + 
"\n";
 ofstream myfile;
 myfile.open( SRCDIR "/unusedmethods.log", ios::app | ios::out);
 myfile << output;
@@ -121,6 +131,13 @@ MyFuncInfo UnusedMethods::niceName(const FunctionDecl* 
functionDecl)
 #endif
 
 MyFuncInfo aInfo;
+switch (functionDecl->getAccess())
+{
+case AS_public: aInfo.access = "public"; break;
+case AS_private: aInfo.access = "private"; break;
+case AS_protected: aInfo.access = "protected"; break;
+default: aInfo.access = "unknown"; break;
+}
 aInfo.returnType = 
compat::getReturnType(*functionDecl).getCanonicalType().getAsString();
 
 if (isa(functionDecl)) {
@@ -201,6 +218,33 @@ void UnusedMethods::logCallToRootMethods(const 
FunctionDecl* functionDecl, std::
 // prevent recursive templates from blowing up the stack
 static std::set traversedFunctionSet;
 
+const Decl* get_DeclContext_from_Stmt(ASTContext& context, const Stmt& stmt)
+{
+  auto it = context.getParents(stmt).begin();
+
+  if (it == context.getParents(stmt).end())
+  return nullptr;
+
+  const Decl *aDecl = it->get();
+  if (aDecl)
+  return aDecl;
+
+  const Stmt *aStmt = it->get();
+  if (aStmt)
+  return get_DeclContext_from_Stmt(context, *aStmt);
+
+  return nullptr;
+}
+
+static const FunctionDecl* get_top_FunctionDecl_from_Stmt(ASTContext& context, 
const Stmt& stmt)
+{
+  const Decl *decl = get_DeclContext_from_Stmt(context, stmt);
+  if (decl)
+  return static_cast(decl->getNonClosureContext());
+

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/inc sw/source

[Samuel Mehrbrodt]

 sw/inc/globals.hrc|6 ++
 sw/source/ui/frmdlg/frmui.src |   19 ---
 sw/source/uibase/shells/frmsh.cxx |   26 +-
 3 files changed, 19 insertions(+), 32 deletions(-)

New commits:
commit acfc9935a41d45619d09d05abe6d933c3cd9fcc7
Author: Samuel Mehrbrodt 
Date:   Fri Dec 11 09:23:09 2015 +0100

tdf#96075 Frame alignment buttons not using correct tooltips

Tooltips change on state change, and they were taken from another source.
Unify this to reuse the existing strings from the uno command.

Change-Id: I8ff6fc43bc0469f15c9e930695d950f6d664bfdf
Reviewed-on: https://gerrit.libreoffice.org/20629
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
Reviewed-on: https://gerrit.libreoffice.org/20633
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index ca0a2ef..96bc1c5 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -59,10 +59,8 @@
 #define STR_TOP_BASE(RC_GLOBALS_BEGIN + 31)
 #define STR_BOTTOM_BASE (RC_GLOBALS_BEGIN + 32)
 #define STR_CENTER_BASE (RC_GLOBALS_BEGIN + 33)
-#define STR_TOP (RC_GLOBALS_BEGIN + 34)
-#define STR_BOTTOM  (RC_GLOBALS_BEGIN + 35)
-#define STR_CENTER_HORI (RC_GLOBALS_BEGIN + 36)
-#define STR_CENTER_VERT (RC_GLOBALS_BEGIN + 37)
+
+// free
 
 #define STR_LOAD_HTML_DOC   (RC_GLOBALS_BEGIN + 38)
 
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index c6d436a..ecbcc4e 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -19,25 +19,6 @@
 #include "frmui.hrc"
 
 /*---
-Description: V-Align
- ---*/
-String STR_TOP
-{
-Text [ en-US ] = "~Top" ;
-};
-String STR_BOTTOM
-{
-Text [ en-US ] = "~Bottom" ;
-};
-String STR_CENTER_VERT
-{
-Text [ en-US ] = "C~enter" ;
-};
-String STR_CENTER_HORI
-{
-Text [ en-US ] = "~Center" ;
-};
-/*---
 Description: V-Rel
  ---*/
 String STR_TOPPRT
diff --git a/sw/source/uibase/shells/frmsh.cxx 
b/sw/source/uibase/shells/frmsh.cxx
index 4868fdf..87fdc66 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -739,21 +740,25 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
 rSet.DisableItem( nWhich );
 else
 {
-sal_uInt16 nId = 0;
+// These slots need different labels depending on 
whether they are anchored in a character
+// or on a paragraph/page etc.
+OUString sNewLabel;
 if (eFrmType & FrmTypeFlags::FLY_INCNT)
 {
 switch (nWhich)
 {
 case SID_OBJECT_ALIGN_UP :
 case FN_FRAME_ALIGN_VERT_TOP:
-nId = STR_TOP_BASE; break;
+sNewLabel = SW_RES(STR_TOP_BASE);
+break;
 case SID_OBJECT_ALIGN_MIDDLE :
 case FN_FRAME_ALIGN_VERT_CENTER:
-nId = STR_CENTER_BASE;  break;
+sNewLabel = SW_RES(STR_CENTER_BASE);
+break;
 case SID_OBJECT_ALIGN_DOWN :
 case FN_FRAME_ALIGN_VERT_BOTTOM:
 if(!bHtmlMode)
-nId = STR_BOTTOM_BASE;
+sNewLabel = SW_RES(STR_BOTTOM_BASE);
 else
 rSet.DisableItem( nWhich );
 break;
@@ -782,17 +787,20 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
 {
 case SID_OBJECT_ALIGN_UP :
 case FN_FRAME_ALIGN_VERT_TOP:
-nId = STR_TOP; break;
+sNewLabel = 
sfx2::sidebar::CommandInfoProvider::Instance().GetLabelForCommand(".uno:AlignTop",
 GetFrame()->GetFrame().GetFrameInterface());
+break;
 case SID_OBJECT_ALIGN_MIDDLE:
 case FN_FRAME_ALIGN_VERT_CENTER:
- 

[Libreoffice-commits] core.git: 3 commits - desktop/source sw/qa writerfilter/source

[Michael Stahl]

 desktop/source/lib/init.cxx|   11 --
 sw/qa/extras/htmlimport/htmlimport.cxx |2 -
 sw/qa/extras/inc/swmodeltestbase.hxx   |1 
 sw/qa/extras/odfexport/odfexport.cxx   |2 -
 sw/qa/extras/odfimport/odfimport.cxx   |4 +-
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx  |4 +-
 sw/qa/extras/ooxmlimport/data/section_break_numbering.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   22 ++---
 sw/qa/extras/rtfexport/rtfexport.cxx   |4 +-
 writerfilter/source/dmapper/DomainMapper.cxx   |   13 ++-
 10 files changed, 44 insertions(+), 19 deletions(-)

New commits:
commit 27b623d9743667d123532f0e5aac6f6f14fbc0a2
Author: Michael Stahl 
Date:   Mon Feb 1 12:58:44 2016 +0100

sw: for better or worse getParagraph() is 1-based

Change-Id: I2bc99b4cbb86a368b6218b3c1a7dfc693858d1c9

diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index afd62ed..e6d9c92 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -116,7 +116,7 @@ DECLARE_HTMLIMPORT_TEST(testInlinedImagesPageAndParagraph, 
"PageAndParagraphFill
 if(nParagraphs)
 {
 // get the paragraph
-uno::Reference< text::XTextRange > xPara = getParagraph( 0 );
+uno::Reference xPara = getParagraph(1);
 uno::Reference< beans::XPropertySet > xParagraphProperties( xPara, 
uno::UNO_QUERY);
 
 // check for Bitmap FillStyle, name empty, repeat
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index e9f974a..b154efe 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -464,6 +464,7 @@ protected:
 
 uno::Reference getParagraphOrTable(int number, 
uno::Reference xText = uno::Reference()) const
 {
+assert(number != 0); // this thing is 1-based
 uno::Reference paraEnumAccess;
 if (xText.is())
 paraEnumAccess.set(xText, uno::UNO_QUERY);
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 6333b921..a5b1847 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -770,7 +770,7 @@ DECLARE_ODFEXPORT_TEST(testOdtBorderTypes, 
"border_types.odt")
 
 DECLARE_ODFEXPORT_TEST(testCellUserDefineAttr, "userdefattr-tablecell.odt")
 {
-uno::Reference xTable(getParagraphOrTable(0), 
uno::UNO_QUERY);
+uno::Reference xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
 uno::Reference const xCellA1(xTable->getCellByName("A1"), 
uno::UNO_SET_THROW);
 uno::Reference const xCellB1(xTable->getCellByName("B1"), 
uno::UNO_SET_THROW);
 uno::Reference const xCellC1(xTable->getCellByName("C1"), 
uno::UNO_SET_THROW);
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index c944d44..c26a45d 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -282,7 +282,7 @@ DECLARE_ODFIMPORT_TEST(testPageStyleLayoutRight, 
"hello.odt")
 
 DECLARE_ODFIMPORT_TEST(testFdo61952, "hello.odt")
 {
-uno::Reference xPara(getParagraph(0), uno::UNO_QUERY);
+uno::Reference xPara(getParagraph(1), uno::UNO_QUERY);
 xPara->setPropertyValue("PageDescName", uno::makeAny(OUString("Left 
Page")));
 xPara->setPropertyValue("PageDescName", uno::makeAny(OUString("Right 
Page")));
 xPara->setPropertyValue("PageDescName", uno::makeAny(OUString("Left 
Page")));
@@ -291,7 +291,7 @@ DECLARE_ODFIMPORT_TEST(testFdo61952, "hello.odt")
 
 DECLARE_ODFIMPORT_TEST(testFdo60842, "fdo60842.odt")
 {
-uno::Reference const xTable(getParagraphOrTable(0));
+uno::Reference const xTable(getParagraphOrTable(1));
 getCell(xTable, "A1", "");
 getCell(xTable, "B1", "18/02/2012");
 getCell(xTable, "C1", "USD"); // this is the cell with office:string-value
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index a850c81..f3cb5bc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -1091,14 +1091,14 @@ DECLARE_OOXMLEXPORT_TEST(testTableFloating, 
"table-floating.docx")
 DECLARE_OOXMLEXPORT_TEST(testFdo44689_start_page_0, 
"fdo44689_start_page_0.docx")
 {
 // The problem was that the import & export process did not analyze the 
'start from page' attribute of a section
-uno::Reference xPara(getParagraph(0), uno::UNO_QUERY);
+uno::Reference xPara(getParagraph(1), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sal_Int16(0), getProperty(xPara, 
"PageNumberOffset"));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFdo44689_start_page_7, 
"fdo44689_start_page_7.docx")
 {
 // The problem was that the import & export process did not analyze the 
'start from page' attribute of a section

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

[Noel Grandin]

 chart2/inc/pch/precompiled_chartcontroller.hxx|1 -
 chart2/source/controller/main/DrawCommandDispatch.cxx |4 ++--
 editeng/inc/pch/precompiled_editeng.hxx   |1 -
 editeng/source/accessibility/AccessibleStaticTextBase.cxx |6 +++---
 4 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 35f4c0d24208385a3fc26c63dd2202e1211844b4
Author: Noel Grandin 
Date:   Mon Feb 1 10:38:59 2016 +0200

boost::cref->std::cref

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

diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx 
b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 0da4c04..8206c33 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -58,7 +58,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx 
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 5c72097..4ae7d1b 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -43,7 +43,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::frame;
@@ -379,7 +379,7 @@ void DrawCommandDispatch::execute( const OUString& 
rCommand, const Sequence< bea
 const beans::PropertyValue* pIter = rArgs.getConstArray();
 const beans::PropertyValue* pEnd  = pIter + rArgs.getLength();
 const beans::PropertyValue* pKeyModifier = ::std::find_if(
-pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), 
boost::cref( sKeyModifier ) ) );
+pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), 
std::cref( sKeyModifier ) ) );
 sal_Int16 nKeyModifier = 0;
 if ( pKeyModifier != pEnd && pKeyModifier && ( 
pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 )
 {
diff --git a/editeng/inc/pch/precompiled_editeng.hxx 
b/editeng/inc/pch/precompiled_editeng.hxx
index f9498b1..7945aba 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -51,7 +51,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx 
b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 08da4ee..f21f63a 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -28,7 +28,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -943,7 +943,7 @@ namespace accessibility
 {
 const beans::PropertyValue* pItr = aSeq.getConstArray();
 const beans::PropertyValue* pEnd  = pItr + aSeq.getLength();
-const beans::PropertyValue* pFind = ::std::find_if( pItr, 
pEnd, ::std::bind2nd( PropertyValueEqualFunctor(), boost::cref( *aItr ) ) );
+const beans::PropertyValue* pFind = ::std::find_if( pItr, 
pEnd, ::std::bind2nd( PropertyValueEqualFunctor(), std::cref( *aItr ) ) );
 if ( pFind != pEnd )
 {
 aIntersectionVec.push_back( *pFind );
@@ -981,7 +981,7 @@ namespace accessibility
 {
 const beans::PropertyValue* pItr = 
aIntersectionSeq.getConstArray();
 const beans::PropertyValue* pEnd  = pItr + 
aIntersectionSeq.getLength();
-bool bNone = ::std::none_of( pItr, pEnd, ::std::bind2nd( 
PropertyValueEqualFunctor(), boost::cref( pDefAttr[i] ) ) );
+bool bNone = ::std::none_of( pItr, pEnd, ::std::bind2nd( 
PropertyValueEqualFunctor(), std::cref( pDefAttr[i] ) ) );
 if ( bNone && pDefAttr[i].Handle != 0)
 {
 aDiffVec.push_back( pDefAttr[i] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 bridges/source/jni_uno/jni_info.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit fdfcb1c8de221476c1b855362af7c0236c393c0f
Author: Stephan Bergmann 
Date:   Mon Feb 1 11:42:13 2016 +0100

Fix loop to actually get executed

Change-Id: I736868fbaa0783a2ed8be04c99f440f1cb964048

diff --git a/bridges/source/jni_uno/jni_info.cxx 
b/bridges/source/jni_uno/jni_info.cxx
index 89e4b0b..a2e2367 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -877,11 +877,9 @@ JNI_info::JNI_info(
 
 void JNI_info::destruct( JNIEnv * jni_env )
 {
-t_str2type::const_iterator iPos( m_type_map.begin() );
-t_str2type::const_iterator const iEnd( m_type_map.begin() );
-for ( ; iPos != iEnd; ++iPos )
+for (auto & i: m_type_map)
 {
-iPos->second.m_info->destroy( jni_env );
+i.second.m_info->destroy( jni_env );
 }
 if (nullptr != m_XInterface_type_info)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit e6aaf64cfc378d0daa0709c40c85ee1e9c0fd151
Author: Miklos Vajna 
Date:   Mon Feb 1 11:16:15 2016 +0100

xmlsecurity: validate OOXML  references

ODF uses no  references, so this doesn't change anything for
ODF.

Previously we only validated the hash of a  element, but not
reference hashes inside the  element. This means now we can
detect not only changes to the signature metadata (signing data, signing
comment), but also changes in other streams, i.e. everything else.

libxmlsec already validated the manifest references hashes, the only
missing piece was that it's up to the client if it wants to validate
them, so libxmlsec doesn't do so by default -> our code has to.

This commit only affects the nss backend, still need to adapt the
mscrypto backend later presumably.

Change-Id: I0b11519d3eb003783048a00c4cada74762c6462f

diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 4093f1c..1a42704 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -244,9 +244,21 @@ SAL_CALL XMLSignature_NssImpl::validate(
 //Verify signature
 int rs = xmlSecDSigCtxVerify( pDsigCtx , pNode );
 
+// Also verify manifest: this is empty for ODF, but contains 
everything (except signature metadata) for OOXML.
+xmlSecSize nReferenceCount = 
xmlSecPtrListGetSize(&pDsigCtx->manifestReferences);
+// Require that all manifest references are also good.
+xmlSecSize nReferenceGood = 0;
+for (xmlSecSize nReference = 0; nReference < nReferenceCount; 
++nReference)
+{
+xmlSecDSigReferenceCtxPtr pReference = 
static_cast(xmlSecPtrListGetItem(&pDsigCtx->manifestReferences,
 nReference));
+if (pReference)
+{
+if (pReference->status == xmlSecDSigStatusSucceeded)
+++nReferenceGood;
+}
+}
 
-if (rs == 0 &&
-pDsigCtx->status == xmlSecDSigStatusSucceeded)
+if (rs == 0 && pDsigCtx->status == xmlSecDSigStatusSucceeded && 
nReferenceCount == nReferenceGood)
 {
 
aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
 xmlSecDSigCtxDestroy( pDsigCtx ) ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Questions about the font shaping tender

[Khaled Hosny]

I just came across this tender [1] and it is not quite clear to me what
is it about. Am I right in thinking this is about having a shared
cross-platform implementation of VCL text layout API (the dreaded
SalLayout et all)? If so I don’t understand what AFM stuff is doing here
since we don’t use any of this AFM stuff during text layout as far as I
can know and I don’t see how it can even be reused for such a task.

1. 
https://blog.documentfoundation.org/blog/2015/12/16/tender-for-cross-platform-fontshaping-stubs-for-layout-tests-201512-05/

Regards,
Khaled
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

ucp WebDAV provider returns Content-Type header value, but...

[Giuseppe Castagno]

Hi all,

These commits:




fixed a problem preventing MediaType from getting the value of 
Content-Type header form a Web resource.


Following two Gerrit patch set propose the same for 5.1 branch.




I'd like to preserve the sequence so I cherry-picked (-x) them 
externally, not sure I did the right thing.


Checked them, fix tdf#95217 in 5.1 as well.

With both patch applied the value contained in MediaType prop is now not 
empty, but being a value under a web server control, it may not be right.


This excerpt from  
tells you that:

"
...
In practice, resource owners do not always properly configure their
origin server to provide the correct Content-Type for a given
representation,
"

Furthermore, in some WebDAV read/only server, I found that 
'Content-type' header and 'DAV:getcontenttype' values are different, 
instead of being the same as stated in section 15.5 of RFC4918



As an example accessing the hybrid web site resource:


LO gets, using GET:

Content-Type: text/plain

while PROFIND:

DAV:getcontenttype:text/xml; charset="utf-8"

In this case (a WebDAV site) MediaType prop returns DAV:getcontenttype 
value.


--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: qadevOOo/tests

[Stephan Bergmann]

 qadevOOo/tests/java/ifc/i18n/_XCalendar.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 513d5c5781ec14f8512432f31290a3d54c8d57df
Author: Stephan Bergmann 
Date:   Mon Feb 1 11:20:38 2016 +0100

Don't silently suppress calling loadDefaultCalendar

Change-Id: I0335f42ca5bc3110a819fb2aee44f571dcf1d61c

diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java 
b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
index 129339b..2aaeb92 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
@@ -80,11 +80,11 @@ public class _XCalendar extends MultiMethodTest {
 installed_locales = locData.getAllInstalledLocaleNames();
 calendars = new String[installed_locales.length][];
 count = new int[installed_locales.length];
-oObj.loadDefaultCalendar(installed_locales[0]);
 } catch (com.sun.star.uno.Exception e) {
 
 }
 
+oObj.loadDefaultCalendar(installed_locales[0]);
 aOriginalDTime = oObj.getDateTime();
 debug = tParam.getBool("DebugIsActive");
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 66754] Remove own implementations of various Perl functions in installer

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=66754

--- Comment #10 from Christian Lohmaier  ---
just read the file and you'll see that's it can be used to do a special kind of
installation using the created msi installer packages. It is not used during
building of LO.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Setting data in Writer chart from Basic

[sos]

Did you tran


Sent from my Samsung Galaxy smartphone.Did you translate the solution into 
basic code?
Hi Fernand,

thanks for the ideas. Sadly nothing you or anybody else posted helped.
Finally I found this hack (here xChart has type Reference< XTextContent
> xChart):

  Reference < XEmbeddedObjectSupplier2 >xEOS2(xChart, UNO_QUERY_THROW);
  Reference < XEmbeddedObject >
xEmbObj(xEOS2->getExtendedControlOverEmbeddedObject());

  if (xEmbObj->getCurrentState() ==
com::sun::star::embed::EmbedStates::LOADED)
  xEmbObj->changeState( com::sun::star::embed::EmbedStates::RUNNING);
  if (xEmbObj->getCurrentState() ==
com::sun::star::embed::EmbedStates::RUNNING)
  xEmbObj->changeState(
com::sun::star::embed::EmbedStates::INPLACE_ACTIVE);
  if (xEmbObj->getCurrentState() ==
com::sun::star::embed::EmbedStates::INPLACE_ACTIVE)
  xEmbObj->changeState( com::sun::star::embed::EmbedStates::RUNNING);

which works on Windows. On Linux this works better:

  Reference < XEmbeddedObjectSupplier > xEOS(xChart, UNO_QUERY_THROW);
  Reference < ::com::sun::star::chart::XChartDocument >
cDoc(xEOS->getEmbeddedObject(), UNO_QUERY_THROW);

  Reference< XPropertySet > dProperties(cDoc->getDiagram(),
UNO_QUERY_THROW);
  Any type = dProperties->getPropertyValue(OU("SplineType"));
  dProperties->setPropertyValue(OU("SplineType"), makeAny(sal_uInt32(0)));
  dProperties->setPropertyValue(OU("SplineType"), makeAny(sal_uInt32(1)));
  dProperties->setPropertyValue(OU("SplineType"), type);

Regards,
    Jan

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

Re: building firebird fails without parallelism

[Stephan Bergmann]

On 01/30/2016 12:16 PM, Lionel Elie Mamane wrote:

On Sat, Jan 30, 2016 at 08:42:54AM +0100, Jean-Baptiste Faure wrote:


It seems that the makefile generated to build Firebird in the master
does not like the --without-parallelism option of the autogen.sh.


Fixed. Sorry for the regression.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=1e38737b72ab3c3b550675ece22130c07b14577a


I'm not aware of any other external modules where we explicitly pass 
down the parallelism setting.  If we did, running a top-level make could 
become problematic for some, when the requested parallelism of N happens 
to result in an effective parallelism of N^2.  Just saying.

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

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

[Tor Lillqvist]

 sc/README |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 77a4d7fdd7468334e74d675959a05a15ac362aee
Author: Tor Lillqvist 
Date:   Mon Feb 1 10:50:48 2016 +0200

Avoid vague and misleading terminology

Sorry, could not resist.

"debug mode" can mean a lot. We say here that we mean dbgutil, so use
just that term then. And it is no special "mode", it is a dbgutil
build, as we already said.

Change-Id: I62f1b580298db8a479ff0852834aa7115297e838

diff --git a/sc/README b/sc/README
index e4e46e3..ad14ece 100644
--- a/sc/README
+++ b/sc/README
@@ -1,11 +1,6 @@
 Spreadsheet application code.
 
-
-Debug mode:
-
-There is a mode to dump some information in a dbgutil build.
-
-== Graphical information ==
+You can dump some information in a dbgutil build:
 
 === CTRL+SHIFT+F12 ===
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: C++ Macro example: DocumentLoader

[Stephan Bergmann]

On 01/30/2016 01:42 PM, aitor_czr wrote:

# make DocumentLoader.run
cd /usr/lib/libreoffice/sdk/LINUXexample.out/bin && DocumentLoader
-env:URE_MORE_TYPES=file://"/types/offapi.rdb"
"/usr/lib/libreoffice/sdk/test.odt"
/bin/sh: 1: DocumentLoader: not found
Makefile:101: recipe for target 'DocumentLoader.run' failed
make: *** [DocumentLoader.run] Error 127


You probably did not (re-)run the setsdkenv_unix script 
()?  It drops you into a 
sub-shell where "." is on PATH.

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

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

[Miklos Vajna]

 svx/source/svdraw/svdedtv2.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 48b74575bafc980959affd08254c2c22ea968690
Author: Miklos Vajna 
Date:   Mon Feb 1 09:34:14 2016 +0100

svx: nAnz -> nObjCount

Change-Id: I5d7f50d52aac9b1333828db1571163d7d5a624c4

diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 2868408..fcee2e4 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1859,18 +1859,18 @@ void SdrEditView::UnGroupMarked()
 // FIRST move contained objects to parent of group, so that
 // the contained objects are NOT migrated to the UNDO-ItemPool
 // when AddUndo(new SdrUndoDelObj(*pGrp)) is called.
-const size_t nAnz=pSrcLst->GetObjCount();
+const size_t nObjCount=pSrcLst->GetObjCount();
 
 if( bUndo )
 {
-for (size_t no=nAnz; no>0;)
+for (size_t no=nObjCount; no>0;)
 {
 no--;
 SdrObject* pObj=pSrcLst->GetObj(no);
 
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoRemoveObject(*pObj));
 }
 }
-for (size_t no=0; noRemoveObject(0);
 SdrInsertReason aReason(SDRREASON_VIEWCALL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - bridges/source dbaccess/inc dbaccess/source reportdesign/inc reportdesign/source

[Noel Grandin]

 bridges/source/jni_uno/jni_info.h  |4 ++--
 dbaccess/inc/pch/precompiled_dbu.hxx   |1 -
 dbaccess/source/ui/tabledesign/TableController.cxx |   11 ---
 reportdesign/inc/pch/precompiled_rpt.hxx   |1 -
 reportdesign/inc/pch/precompiled_rptui.hxx |1 -
 reportdesign/source/core/api/Functions.cxx |4 ++--
 reportdesign/source/core/api/Groups.cxx|4 ++--
 reportdesign/source/core/api/ReportDefinition.cxx  |1 -
 reportdesign/source/ui/report/ReportController.cxx |1 -
 9 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit e259c58227a4b8bfe5b2bb0457afcf6907c90800
Author: Noel Grandin 
Date:   Mon Feb 1 09:07:13 2016 +0200

boost::mem_fn->std::mem_fn in reportdesign

Change-Id: I05c8b22ed7af8ea0ac59ac21707025ec7808bf55

diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx 
b/reportdesign/inc/pch/precompiled_rpt.hxx
index 97dbd4d..051c05a 100644
--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.hxx
@@ -56,7 +56,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx 
b/reportdesign/inc/pch/precompiled_rptui.hxx
index dc85cee..e151084 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -59,7 +59,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/reportdesign/source/core/api/Functions.cxx 
b/reportdesign/source/core/api/Functions.cxx
index e20c526..e436e39 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -22,7 +22,6 @@
 #include "core_resource.hxx"
 #include "core_resource.hrc"
 #include 
-#include 
 #include 
 
 namespace reportdesign
@@ -53,7 +52,8 @@ void SAL_CALL OFunctions::dispose() 
throw(uno::RuntimeException, std::exception)
 
 void SAL_CALL OFunctions::disposing()
 {
-
::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&css::report::XFunction::dispose));
+for (auto& rFunction : m_aFunctions)
+rFunction->dispose();
 m_aFunctions.clear();
 lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this 
) );
 m_aContainerListeners.disposeAndClear( aDisposeEvent );
diff --git a/reportdesign/source/core/api/Groups.cxx 
b/reportdesign/source/core/api/Groups.cxx
index 30756c4..65308e5 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -21,7 +21,6 @@
 #include 
 #include "core_resource.hxx"
 #include "core_resource.hrc"
-#include 
 #include 
 
 namespace reportdesign
@@ -52,7 +51,8 @@ void SAL_CALL OGroups::dispose() throw(uno::RuntimeException, 
std::exception)
 
 void SAL_CALL OGroups::disposing()
 {
-
::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&css::report::XGroup::dispose));
+for(auto& rGroup : m_aGroups)
+rGroup->dispose();
 m_aGroups.clear();
 lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this 
) );
 m_aContainerListeners.disposeAndClear( aDisposeEvent );
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index cc825ea..648f163 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -125,7 +125,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 //  page styles
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 3f61c9b..05d22ce 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -140,7 +140,6 @@
 #include "PageNumber.hxx"
 #include "UndoEnv.hxx"
 
-#include 
 #include 
 #include 
 #include 
commit 5805be0b349ebb1be6a3613368bffc63644b1c84
Author: Noel Grandin 
Date:   Mon Feb 1 08:57:13 2016 +0200

boost::mem_fn->std::mem_fn in dbaccess

Change-Id: I9156e106d12b670e94bab899a4f67a35701ae5ac

diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx 
b/dbaccess/inc/pch/precompiled_dbu.hxx
index 7a6f7d3..84bdc63 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx 
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 97fd96e..fbdbe93 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -67,9 +67,6 @@
 #include 
 #include 
 
-#include 
-#include 
-
 #include 
 #include 
 
@@ -193,14 +190,14 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) 
const
 aReturn.bEnabled = true;
 break;
 case ID_BROWSER_SAVEDOC:
-aReturn.bEnabled = 

Re: LO exit codes?

[Stephan Bergmann]

On 01/29/2016 07:17 PM, Henry Castro wrote:

I was tracing LO exit codes about corrupted installation. I found
desktop/source/inc/exithelper.h

EXITHELPER_FATAL_ERROR = 333,/* Only the low 8 bits are significant
333 % 256 = 77 */

it is confused with standard code

EXIT_NOPERM  = 77, /// permission denied

I am not sure for Mac and Windows, but is there any reason why 333
code?.  any objections if I change to non-standard code?


What is EXIT_NOPERM?

But anyway, yeah, that 333 is silly, given exit(3) et al only use the 
lower eight bits of that argument.  Please clean that up.

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

[Bug 93821] not storing & restoring window contents under menus ...

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=93821

Caolán McNamara  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #3 from Caolán McNamara  ---
couldn't resist temptation given the amount of unused code that falls out after
this removal

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 93821] not storing & restoring window contents under menus ...

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=93821

--- Comment #2 from Commit Notification 
 ---
Caolán McNamara committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=01695131f3283d15e8fb803c7a342d0932d0e182

Resolves: tdf#93821 assume mbNoSaveBackground as true everywhere

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 93821] not storing & restoring window contents under menus ...

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=93821

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|| target:5.2.0

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 include/vcl/dialog.hxx   |1 
 include/vcl/floatwin.hxx |1 
 include/vcl/syswin.hxx   |3 
 include/vcl/window.hxx   |8 -
 vcl/inc/svdata.hxx   |1 
 vcl/inc/window.h |   12 -
 vcl/ios/iosinst.cxx  |1 
 vcl/osx/salinst.cxx  |1 
 vcl/source/app/help.cxx  |3 
 vcl/source/control/imp_listbox.cxx   |2 
 vcl/source/opengl/OpenGLHelper.cxx   |1 
 vcl/source/window/clipping.cxx   |  231 ---
 vcl/source/window/dialog.cxx |4 
 vcl/source/window/floatwin.cxx   |5 
 vcl/source/window/menufloatingwindow.cxx |1 
 vcl/source/window/paint.cxx  |   18 --
 vcl/source/window/stacking.cxx   |7 
 vcl/source/window/syswin.cxx |   27 ---
 vcl/source/window/window.cxx |   48 --
 vcl/source/window/winproc.cxx|   12 -
 20 files changed, 3 insertions(+), 384 deletions(-)

New commits:
commit 0ee9022fda949fe672a111e58ae965531da03694
Author: Caolán McNamara 
Date:   Sat Jan 30 19:49:57 2016 +

ImplIsWindowInFront is now unused

Change-Id: I20a7b3acd1af598638282063ad31c0ba91edaf1b

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 52874b7..bc762f4 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -738,8 +738,6 @@ private:
 SAL_DLLPRIVATE long ImplLogicUnitToPixelX( long nX, 
MapUnit eUnit );
 SAL_DLLPRIVATE long ImplLogicUnitToPixelY( long nY, 
MapUnit eUnit );
 
-SAL_DLLPRIVATE bool ImplIsWindowInFront( const 
vcl::Window* pTestWindow ) const;
-
 SAL_DLLPRIVATE static void  ImplNewInputContext();
 
 SAL_DLLPRIVATE void 
ImplCallActivateListeners(vcl::Window*);
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx
index 821db35..fbbc8fc 100644
--- a/vcl/source/window/clipping.cxx
+++ b/vcl/source/window/clipping.cxx
@@ -683,92 +683,6 @@ void Window::ImplCalcOverlapRegion( const Rectangle& 
rSourceRect, vcl::Region& r
 }
 }
 
-bool Window::ImplIsWindowInFront( const vcl::Window* pTestWindow ) const
-{
-// check for overlapping window
-pTestWindow = pTestWindow->ImplGetFirstOverlapWindow();
-const vcl::Window* pTempWindow = pTestWindow;
-const vcl::Window* pThisWindow = ImplGetFirstOverlapWindow();
-if ( pTempWindow == pThisWindow )
-return false;
-do
-{
-if ( pTempWindow == pThisWindow )
-return true;
-if ( pTempWindow->mpWindowImpl->mbFrame )
-break;
-pTempWindow = pTempWindow->mpWindowImpl->mpOverlapWindow;
-}
-while ( pTempWindow );
-pTempWindow = pThisWindow;
-do
-{
-if ( pTempWindow == pTestWindow )
-return false;
-if ( pTempWindow->mpWindowImpl->mbFrame )
-break;
-pTempWindow = pTempWindow->mpWindowImpl->mpOverlapWindow;
-}
-while ( pTempWindow );
-
-// move window to same level
-if ( pThisWindow->mpWindowImpl->mpOverlapWindow != 
pTestWindow->mpWindowImpl->mpOverlapWindow )
-{
-sal_uInt16 nThisLevel = 0;
-sal_uInt16 nTestLevel = 0;
-pTempWindow = pThisWindow;
-do
-{
-nThisLevel++;
-pTempWindow = pTempWindow->mpWindowImpl->mpOverlapWindow;
-}
-while ( !pTempWindow->mpWindowImpl->mbFrame );
-pTempWindow = pTestWindow;
-do
-{
-nTestLevel++;
-pTempWindow = pTempWindow->mpWindowImpl->mpOverlapWindow;
-}
-while ( !pTempWindow->mpWindowImpl->mbFrame );
-
-if ( nThisLevel < nTestLevel )
-{
-do
-{
-if ( pTestWindow->mpWindowImpl->mpOverlapWindow == 
pThisWindow->mpWindowImpl->mpOverlapWindow )
-break;
-if ( pTestWindow->mpWindowImpl->mbFrame )
-break;
-pTestWindow = pTestWindow->mpWindowImpl->mpOverlapWindow;
-}
-while ( pTestWindow );
-}
-else
-{
-do
-{
-if ( pThisWindow->mpWindowImpl->mpOverlapWindow == 
pTempWindow->mpWindowImpl->mpOverlapWindow )
-break;
-if ( pThisWindow->mpWindowImpl->mbFrame )
-break;
-pThisWindow = pThisWindow->mpWindowImpl->mpOverlapWindow;
-}
-while ( pThisWindow );
-}
-}
-
-// if TestWindow is before ThisWindow, it is in front
-pTempWindow = pTestWindow;
-while ( pTempWindow )
-{
-if ( pTempWindow == pThisWindow )
-return true;
-pTempWindow = pTempWindow->mpWindowImpl->mpNext;
-}
-
-return false;
-}
-
 void Window::SaveBackgroun