[Libreoffice-commits] core.git: configure.ac
configure.ac | 37 +++--
1 file changed, 27 insertions(+), 10 deletions(-)
New commits:
commit 85f75042f6d62bf3da182311c4396392d9730521
Author: Jesús Corrius jcorr...@gmail.com
Date: Wed May 6 13:17:14 2015 +0200
Add very initial support for Visual Studio 2015
The new compiler is not detected automatically yet.
You have to use --with-visual-studio=2015 to enable it.
Change-Id: I0ef8cda7b2d99389b39fd7f8c2e142453ced99ed
Reviewed-on: https://gerrit.libreoffice.org/15644
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Tested-by: David Ostrovsky da...@ostrovsky.org
diff --git a/configure.ac b/configure.ac
index cdef0fe..d214864 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2028,25 +2028,24 @@ AC_ARG_WITH(
[with_doxygen=yes])
AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=2013],
+AS_HELP_STRING([--with-visual-studio=2013/2015],
[Specify which Visual Studio version to use in case several are
- installed. If not specified, the order of preference is 2013
(including
- Express editions). Not very useful at the moment, as currently only
- 2013 is supported, anyway.])
+ installed. If not specified, only 2013 is detected automatically
+ because 2015 support is currently experimental.])
[
- Usage: --with-visual-studio=2013
+ Usage: --with-visual-studio=2013/2015
],
,)
AC_ARG_WITH(windows-sdk,
-AS_HELP_STRING([--with-windows-sdk=7.1(A)/8.0(A)/8.1(A)],
+AS_HELP_STRING([--with-windows-sdk=7.1(A)/8.0(A)/8.1(A)/10],
[Specify which Windows SDK, or Windows Kit, version to use
in case the one that came with the selected Visual Studio
is not what you want for some reason. Note that not all compiler/SDK
combinations are supported. The intent is that this option should not
be needed.])
[
- Usage: --with-windows-sdk=7.1(A)/8.0(A)/8.1(A)
+ Usage:
--with-windows-sdk=7.1(A)/8.0(A)/8.1(A)/10
],
,)
@@ -3392,6 +3391,8 @@ map_vs_year_to_version()
case $1 in
2013)
vsversion=12.0;;
+2015)
+vsversion=14.0;;
*)
AC_MSG_ERROR([Assertion failure - invalid argument $1 to
map_vs_year_to_version()]);;
esac
@@ -3415,7 +3416,7 @@ vs_versions_to_check()
find_msvs()
{
-# Find Visual Studio 2013
+# Find Visual Studio 2013/2015
# Args: $1 (optional) : versions to check, in the order of preference
# Return value: $vstest
@@ -3439,7 +3440,7 @@ find_msvs()
find_msvc()
{
-# Find Visual C++ 2013
+# Find Visual C++ 2013/2015
# Args: $1 (optional) : The VS version year
# Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
@@ -3466,6 +3467,10 @@ find_msvc()
vcyear=2013
vcnum=120
;;
+14.0)
+vcyear=2015
+vcnum=140
+;;
esac
reg_get_value_32
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$vcnumwithdot/Setup/VC/ProductDir
if test -n $regvalue -a $regvalue = $vctest ; then
@@ -3486,7 +3491,7 @@ if test $_os = WINNT; then
if test -n $with_visual_studio; then
AC_MSG_ERROR([No Visual Studio $with_visual_studio
installation found])
else
-AC_MSG_ERROR([No Visual Studio 2013 installation found])
+AC_MSG_ERROR([No Visual Studio 2013/2015 installation found])
fi
fi
@@ -3615,6 +3620,10 @@ if test $_os = WINNT; then
COMEX=15
WINDOWS_SDK_ACCEPTABLE_VERSIONS=8.1A 8.1 8.0 7.1A
;;
+140)
+COMEX=19
+WINDOWS_SDK_ACCEPTABLE_VERSIONS=10.0A 8.1A 8.1 8.0 7.1A
+;;
esac
# The expectation is that --with-windows-sdk should not need to be
used
@@ -5163,6 +5172,14 @@ find_winsdk_version()
return
fi
;;
+10)
+reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows
Kits/Installed Roots/KitsRoot10
+if test -n $regvalue; then
+winsdktest=$regvalue
+winsdklibsubdir=10.0.10056.0
+return
+fi
+;;
esac
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c7b850a934fd3ac68e53fb4affabb32aeae5217e Author: Jesús Corrius jcorr...@gmail.com Date: Tue Apr 7 10:15:33 2015 +0200 Add missing '' Change-Id: I86a01f0a066a915b9f87768fc73d24ab2fcdb4f6 Reviewed-on: https://gerrit.libreoffice.org/15182 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configure.ac b/configure.ac index 4189d51..96031b1 100644 --- a/configure.ac +++ b/configure.ac @@ -2034,7 +2034,7 @@ AC_ARG_WITH(windows-sdk, combinations are supported. The intent is that this option should not be needed.]) [ - Usage: --with-windows-sdk=7.1(A)/8.0(A)/8.1(A) + Usage: --with-windows-sdk=7.1(A)/8.0(A)/8.1(A) ], ,) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/5275/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/5275/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/5367/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/5266/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/5367/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/5423/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/5415/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/5385/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/3623/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/5587/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/5266/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/5275/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/5587/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/3623/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/5423/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/5024/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/63/5163/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/5024/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/01/5401/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/5603/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/5597/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/01/5401/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/95/1695/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/5589/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/5589/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/5603/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/5402/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/5274/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/4997/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/4997/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/5274/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/96/1696/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/95/1695/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/1543/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/1543/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/5274/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/5402/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/96/1696/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/1544/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/1544/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/5529/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/5529/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/5589/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/6132/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/5369/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/3639/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/5369/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/6132/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/3639/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/compat.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 82300f367dda20e3e83477dae9dd37124ac9831b
Author: Jesús Corrius jcorr...@gmail.com
Date: Fri Jan 31 10:31:30 2014 +0100
sbergman's typo
Change-Id: I36dc29659d0d6965c28e5fe0bb03759476de4781
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index d4d92a0..75e46ef 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -16,7 +16,7 @@
#include clang/Basic/DiagnosticIDs.h
#include llvm/ADT/StringRef.h
-// Compatibility wrapper to abstract over (trivial) chanes in the Clang API:
+// Compatibility wrapper to abstract over (trivial) changes in the Clang API:
namespace compat {
inline clang::QualType getReturnType(clang::FunctionDecl const decl) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide | 251 +-
1 file changed, 156 insertions(+), 95 deletions(-)
New commits:
commit 3f8e239f15590cf8b7dccaa57e24d1a7dae7b3da
Author: Jesús Corrius jcorr...@gmail.com
Date: Fri Dec 6 12:20:21 2013 +0100
Source more PEP8 friendly
Change-Id: I033f2a365454c9f98ce2c34f7d1d5ad3c1516202
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 00a22cf..6a7e7f0 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -9,13 +9,13 @@
#
import argparse
-import inspect
import os
import os.path
import shutil
import re
import sys
+
class GbuildParserState:
def __init__(self):
self.include = []
@@ -23,26 +23,36 @@ class GbuildParserState:
self.cxxobjects = []
self.linked_libs = []
+
class GbuildLinkTarget:
def __init__(self, name, location, include, defs, cxxobjects, linked_libs):
-(self.name, self.location, self.include, self.defs, self.cxxobjects,
self.linked_libs) = (name, location, include, defs, cxxobjects, linked_libs)
+(self.name, self.location, self.include, self.defs, self.cxxobjects,
self.linked_libs) = (
+name, location, include, defs, cxxobjects, linked_libs)
+
def short_name(self):
return self.name
+
def __str__(self):
-return '%s at %s with include path: %s, defines %s, objects: %s and
linked libs: %s' % (self.short_name(), self.location, self.include, self.defs,
self.cxxobjects, self.linked_libs)
+return '%s at %s with include path: %s, defines %s, objects: %s and
linked libs: %s' % (
+self.short_name(), self.location, self.include, self.defs,
self.cxxobjects, self.linked_libs)
+
class GbuildLib(GbuildLinkTarget):
def __init__(self, name, location, include, defs, cxxobjects, linked_libs):
GbuildLinkTarget.__init__(self, name, location, include, defs,
cxxobjects, linked_libs)
+
def short_name(self):
return 'Library %s' % self.name
+
class GbuildExe(GbuildLinkTarget):
def __init__(self, name, location, include, defs, cxxobjects, linked_libs):
GbuildLinkTarget.__init__(self, name, location, include, defs,
cxxobjects, linked_libs)
+
def short_name(self):
return 'Executable %s' % self.name
+
class GbuildParser:
makecmdpattern = re.compile('^MAKE_COMMAND := (.*)')
srcdirpattern = re.compile('^SRCDIR = (.*)')
@@ -54,8 +64,10 @@ class GbuildParser:
defspattern = re.compile('# DEFS := (.*)')
cxxpattern = re.compile('# CXXOBJECTS := (.*)')
linkedlibspattern = re.compile('# LINKED_LIBS := (.*)')
+
def __init__(self):
(self.makecmd, self.srcdir, self.builddir, self.instdir, self.libs,
self.exes) = ('', '', '', '', [], [])
+
def parse(self, gbuildstate):
state = GbuildParserState()
for line in gbuildstate:
@@ -83,21 +95,26 @@ class GbuildParser:
continue
libmatch = GbuildParser.libpattern.match(line)
if libmatch:
-self.libs.append(GbuildLib(libmatch.group(2),
libmatch.group(1), state.include, state.defs, state.cxxobjects,
state.linked_libs))
+self.libs.append(
+GbuildLib(libmatch.group(2), libmatch.group(1),
state.include, state.defs, state.cxxobjects,
+ state.linked_libs))
state = GbuildParserState()
continue
exematch = GbuildParser.exepattern.match(line)
if exematch:
-self.exes.append(GbuildExe(exematch.group(2),
exematch.group(1), state.include, state.defs, state.cxxobjects,
state.linked_libs))
+self.exes.append(
+GbuildExe(exematch.group(2), exematch.group(1),
state.include, state.defs, state.cxxobjects,
+ state.linked_libs))
state = GbuildParserState()
continue
includematch = GbuildParser.includepattern.match(line)
if includematch:
-state.include = [includeswitch.strip()[2:] for includeswitch
in includematch.group(1).split(' ') if len(includeswitch) 2]
+state.include = [includeswitch.strip()[2:] for includeswitch
in includematch.group(1).split(' ') if
+ len(includeswitch) 2]
continue
defsmatch = GbuildParser.defspattern.match(line)
if defsmatch:
-alldefs = [defswitch.strip()[2:] for defswitch in
defsmatch.group(1).split(' ') if len(defswitch) 2]
+alldefs = [defswitch.strip()[2:] for defswitch in
defsmatch.group(1).split(' ') if len(defswitch) 2]
for d in alldefs:
defparts = d.split('=')
if len(defparts) == 1:
@@ -115,15 +132,19 @@ class GbuildParser:
#we could match a lot of other stuff here if needed for
integration rpaths etc.
Re: real-time financial data
Hi Daniel, 2013/11/21 Daniel Pocock dan...@pocock.com.au Hi, Is there any extension for receiving a live market data feed (e.g. currency exchange rates, stock prices) in Calc, or is anybody working on such a thing? Short answer: yes, people are working on it. There's been a lot of interest lately, and some very good work too[1], to make Calc a great product for statistics, financial calculations, computational finance, etc.. There's a lot of good work coming in LibreOffice 4.2. Also as a wish for LibreOffice 4.3 I would love to see new core Calc functions like: =GoogleFinance(GOOG) =GoogleFinance(GOOG; volume) =YahooFinance(YHOO; eps) etc. [1] https://bugs.freedesktop.org/show_bug.cgi?id=66477 -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO-4.0.6 with Visual Studio 2012: Windows XP Compatibiliy problem
2013/11/21 Michael Stahl mst...@redhat.com On 21/11/13 12:00, Dali wrote: Hi everyone, I had a successful build of LibreOffice-4.0.6. Here is my conf: - Build Environment: Windows 7 (64 bits) - Microsoft Visual Studio version: 2012 update 4 -Autogen.lastrun: [...] --with-windows-sdk-home=C:\Program Files\Microsoft SDKs\Windows\v7.1 I can install the msi result on Windows 7 and it works fine. I can also install it successfully on *Windows XP* but i have this message when i try to run LibreOffice: -..*soffice.exe is not a valid Win32 program* = It doesn't work I really need and appreciate your help to fix this problem on Windows XP on the libreoffice-4-1 and master branches you can fix this with the configure switch --with-windows-sdk=7.0A ... but that does not work on libreoffice-4-0 branch; there is a --with-windows-sdk-home switch oh you're already using that one. sorry, no idea why that doesn't work - MSVC2012 support was still experimental in those days anyway. As usual, our MSDN friends have all the information you need here: https://blogs.msdn.com/b/vcblog/archive/2012/10/08/10357555.aspx?Redirected=true We don't officially support Windows 2012 for the 4.0 branch, so please don't distribute any 4.0.x release built with this compiler version (as, even if it compiles, other unexpected problems may appear). But feel free to play with it for development purposes. -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
List of new filters for LibreOffice 4.2
Hi guys, Where can I find a list of the new filters (or better: new supported file formats) for LibreOffice 4.2? I would like to add them to the advertised supported file extensions for Windows before we ship 4.2. Cheers, -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
+ turn on mergedlibs LTO for Windows - any objections ? (Michael) AI: + turn on see how it goes for 4.2 (Tor) + Thanks to Jesus for offering to review vs. 2010 Compiled master using Visual Studio 2010 Professional Edition with LTO. Slower compilation but interesting effects on the generated binaries (in some of the smallest ones significant size reduction). Cool stuff. But it's difficult to see any improvements without profiling the application before and after. Pushed into master as it is trivial to disable if there are any regressions (none found by me so far). -- Jesús Corrius je...@softcatala.org ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: minutes of ESC call ...
+ turn on mergedlibs LTO for Windows - any objections ? (Michael) AI: + turn on see how it goes for 4.2 (Tor) + Thanks to Jesus for offering to review vs. 2010 Compiled master using Visual Studio 2010 Professional Edition with LTO. Slower compilation but interesting effects on the generated binaries (in some of the smallest ones significant size reduction). Cool stuff. But it's difficult to see any improvements without profiling the application before and after. Pushed into master as it is trivial to disable if there are any regressions (none found by me so far). -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: soltools/cpp
soltools/cpp/_include.c |2 +- soltools/cpp/_macro.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit d83e581fb5074c575e942115b6930b00a81b21dd Author: Jesús Corrius jcorr...@gmail.com Date: Sat Nov 16 14:53:12 2013 +0100 Fix for VS 2013 compilation I don´t know why it doesn´t work anymore, but the fix is trivial may be related of using the Windows 8.0 SDK. Change-Id: Ia09109b53d4f022a732ea781c98ddd4eb0c721d9 diff --git a/soltools/cpp/_include.c b/soltools/cpp/_include.c index 40ff092..7a9044b 100644 --- a/soltools/cpp/_include.c +++ b/soltools/cpp/_include.c @@ -31,7 +31,7 @@ #include string.h #include fcntl.h -#if defined(__IBMC__) || defined(__EMX__) +#if defined(__IBMC__) || defined(__EMX__) || defined(_MSC_VER) # include fcntl.h # define PATH_MAX _MAX_PATH #endif diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c index 251a1f6..b86af10 100644 --- a/soltools/cpp/_macro.c +++ b/soltools/cpp/_macro.c @@ -23,7 +23,7 @@ #include stdio.h #include stdlib.h #include string.h -#if defined(__IBMC__) || defined(__EMX__) +#if defined(__IBMC__) || defined(__EMX__) || defined(_MSC_VER) # define PATH_MAX _MAX_PATH #endif #include limits.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Problems compiling LO with Visual Studio 2008
Hi Pavel, 2013/11/1 Pavel Laštovička pavel.lastovi...@blue-point.cz Hi Michael, Dne 31.10.2013 22:58, Michael Stahl napsal(a): perhaps you will run into other issues too; since 2008 support was removed completely on master due to the high maintenace effort (uses different project files than newer versions etc.), there is probably little interest in getting the 4-1 branch to build; better to just use a newer MSVC. is it safe to use Express edition of Visual Studio or is Professional edition needed? I recommend you using the Professional Edition if you intend to distribute your build. For development, the Express Edition is fine. Please read carefully the section Getting ATL work with Visual Studio Express here to use ATL in your build: https://wiki.documentfoundation.org/Development/BuildingOnWindows Cheers, -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problems compiling LO with Visual Studio 2008
Hi Thomas, 2013/10/31 Thomas Arnhold thomas-l...@arnhold.org Hi Jesús, ah sorry. I did it with the Windows 7 SDK and _WINNT_VERSION set to Windows XP. The problem is the missing SHARD_APPIDINFO definition. http://msdn.microsoft.com/en-**us/library/windows/desktop/** dd378453(v=vs.85).aspxhttp://msdn.microsoft.com/en-us/library/windows/desktop/dd378453(v=vs.85).aspx Should we just define the hex value of it? Yeah, just define SHARD_APPIDINFO. This should be easy and clean :) We'll have to refactor quite a lot of code when we drop support for Windows XP anyway, and then we can remove all those defines altogether. Unfortunately to get some of the cool stuff in Windows 8 and 8.1 you need to use a higher version. Windows 7 is the minimum you should use when compiling LibreOffice on Windows if you want to distribute your build to other users. We are quite conservative with this requisite but sometimes you just have to do it ;) -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problems compiling LO with Visual Studio 2008
The patch is wrong. The reason why it's wrong is because your generated binary will not work as expected on Windows Vista and higher. The code should compile fine if you use the Windows 7 SDK to compile it. In case I am wrong and it doesn't, the proper way to fix it is to define SHARDAPPIDINFO. 2013/10/31 Thomas Arnhold thomas-l...@arnhold.org Hi Pavel, about the SHARDAPPINFO: I run into this, too. See the attached patch, I'll commit this soon. Thomas On 31.10.2013 19:36, Pavel Laštovička wrote: Hi all, I am trying to compile LO 4.1.3 on my machine with Windows XP and Visual Studio 2008 and I have run into some problems. Is Visual Studio 2008 still supported? Or should I try to get a newer version? First problem was that build did not start at all with error in external/Package_msvc_dlls.mk. I think it was failing on MSVC_DLL_PATH being empty. I tried to set it to a bogus path to make build start. Later I got error about undefined SHARDAPPIDINFO structure. On the net I found MSDN mentioning the structure is available from Windows 7 up. Thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Windows 8.1
Hey guys, Just to let you know that Windows 8.1 was released yesterday to try to compete with Ubuntu 13.10. I made some tests with LibreOffice a couple of months ago with the RTM release and it worked perfectly fine. But if you are asked about it, recommend any Windows 8.1 user to use at least LibreOffice version 4.1.1 or higher. Cheers, -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac | 32 +++-
1 file changed, 23 insertions(+), 9 deletions(-)
New commits:
commit 3164924fac45a377b3620ca68e7658be1359
Author: Jesús Corrius jcorr...@gmail.com
Date: Fri Oct 18 23:27:34 2013 +0200
Initial experimental support for Visual Studio 2013
Change-Id: I4a1ad9da56f39a21d8a392fdb92704cc4311c84c
diff --git a/configure.ac b/configure.ac
index 65013ae..37acab9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1851,12 +1851,12 @@ AC_ARG_WITH(
[with_doxygen=yes])
AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=2012/2010],
+AS_HELP_STRING([--with-visual-studio=2012/2010/2013],
[Specify which Visual Studio version to use in case several are
are installed. If not specified, the order of preference is
- 2012, 2010 (including Express editions).])
+ 2012, 2010, 2013 (including Express editions).])
[
- Usage: --with-visual-studio=2012/2010
+ Usage: --with-visual-studio=2012/2010/2013
],
,)
@@ -3361,6 +3361,8 @@ map_vs_year_to_version()
vsversion=10.0;;
2012)
vsversion=11.0;;
+2013)
+vsversion=12.0;;
*)
AC_MSG_ERROR([Assertion failure - invalid argument $1 to
map_vs_year_to_version()]);;
esac
@@ -3377,14 +3379,14 @@ vs_versions_to_check()
map_vs_year_to_version $1
vsversions=$vsversion
else
-# By default we prefer 2012, then 2010
-vsversions=11.0 10.0
+# By default we prefer 2012, then 2010, then 2013
+vsversions=11.0 10.0 12.0
fi
}
find_msvs()
{
-# Find Visual Studio 2012/2010
+# Find Visual Studio 2012/2010/2013
# Args: $1 (optional) : versions to check, in the order of preference
# Return value: $vstest
@@ -3408,7 +3410,7 @@ find_msvs()
find_msvc()
{
-# Find Visual C++ 2012/2010
+# Find Visual C++ 2012/2010/2013
# Args: $1 (optional) : The VS version year
# Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
@@ -3439,6 +3441,10 @@ find_msvc()
vcyear=2012
vcnum=110
;;
+12.0)
+vcyear=2013
+vcnum=120
+;;
esac
fi
}
@@ -3454,7 +3460,7 @@ if test $_os = WINNT; then
if test -n $with_visual_studio; then
AC_MSG_ERROR([No Visual Studio $with_visual_studio
installation found])
else
-AC_MSG_ERROR([No Visual Studio 2012 or 2010 installation
found])
+AC_MSG_ERROR([No Visual Studio 2012, 2010 or 2013 installation
found])
fi
fi
@@ -3483,7 +3489,11 @@ if test $_os = WINNT; then
MSPDB_PATH=
if test $BITNESS_OVERRIDE = ; then
-MSPDB_PATH=$VC_PRODUCT_DIR/../Common7/IDE
+ if test $vcnum = 120; then
+ MSPDB_PATH=$VC_PRODUCT_DIR/../VC/bin
+ else
+ MSPDB_PATH=$VC_PRODUCT_DIR/../Common7/IDE
+ fi
else
MSPDB_PATH=$VC_PRODUCT_DIR/bin/amd64
fi
@@ -3554,6 +3564,10 @@ if test $_os = WINNT; then
COMEX=14
WINDOWS_SDK_ACCEPTABLE_VERSIONS=8.0 7.1A
;;
+120)
+COMEX=15
+WINDOWS_SDK_ACCEPTABLE_VERSIONS=8.1A 8.1 8.0
+;;
esac
# The expectation is that --with-windows-sdk should not need to be
used
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ATTENTION, creators of mysql-connector-ooo.oxt (--enable-ext-mariadb-connector)
Hi Stephan, After your changes, the new version seems to work flawlessly :) I will update a new version for the MySQL Connector to the templates site for LibO 4.1 after it has been properly tested (beginning of the next week). Additionally if someone wants to help with the test, feel free to message me and I will send you the extensions. Cheers, 2013/10/11 Stephan Bergmann sberg...@redhat.com If you use the LO git repo to build the mysql-connector-ooo.oxt extension (via --enable-ext-mariadb-**connector, formerly --enable-ext-mysql-connector) and then use/distribute that extension as a non-bundled extension (i.e., not unzip it into a LO installation's share/extensions/ directory): Please be aware that doing so off the LO git libreoffice-4-1[-*] and master (towards LO 4.2) branches leads to a broken extension that should not be distributed. What is broken is detailed at http://cgit.freedesktop.org/** libreoffice/core/commit/?id=**3bafe5f5f529f6539363c5a291dd13**ef1e2cbbdehttp://cgit.freedesktop.org/libreoffice/core/commit/?id=3bafe5f5f529f6539363c5a291dd13ef1e2cbbde Extension shared library components must not use the 'prefix' feature, along with a fix of the problem, for which I also requested backports to libreoffice-4-1 (https://gerrit.libreoffice.**org/#/c/6209/https://gerrit.libreoffice.org/#/c/6209/) and libreoffice-4-1-3 (https://gerrit.libreoffice.**org/#/c/6210/https://gerrit.libreoffice.org/#/c/6210/ ). A further reason I'm so panicky about not distributing any broken versions is that there are cooking up changes to the UNO component prefix feature that would make it desirable that no non-bundled extension ever used that prefix feature. In the wild, I find: * http://extensions.**libreoffice.org/extension-** center/mysql-native-connector-**for-libreoffice-4.xhttp://extensions.libreoffice.org/extension-center/mysql-native-connector-for-libreoffice-4.x MySQL Native Connector for LibreOffice 4.x from an UNKNOWN UPLOADER, which only offers http://extensions.**libreoffice.org/extension-** center/mysql-native-connector-**for-libreoffice-4.x/releases/** 1.0/mysql-connector-ooo.oxthttp://extensions.libreoffice.org/extension-center/mysql-native-connector-for-libreoffice-4.x/releases/1.0/mysql-connector-ooo.oxt which is apparently too old to be affected. * http://extensions.**libreoffice.org/extension-** center/mysql-native-connectorhttp://extensions.libreoffice.org/extension-center/mysql-native-connector MySQL Native Connector from an UKNOWN UPLOADER which only offers http://extensions.**libreoffice.org/extension-** center/mysql-native-connector/**releases/1.0/mysql-native-** connector-32-bit/viewhttp://extensions.libreoffice.org/extension-center/mysql-native-connector/releases/1.0/mysql-native-connector-32-bit/view and http://extensions.**libreoffice.org/extension-** center/mysql-native-connector/**releases/1.0/mysql-native-** connector-64-bit/viewhttp://extensions.libreoffice.org/extension-center/mysql-native-connector/releases/1.0/mysql-native-connector-64-bit/view which both are apparently too old to be affected. * http://sourceforge.net/**projects/**lomysqlconnectorextension/http://sourceforge.net/projects/lomysqlconnectorextension/ by Alex Thurgood, which /is/ affected. Alex, can you make available a fixed build there, either off master past http://cgit.freedesktop.org/** libreoffice/core/commit/?id=**3bafe5f5f529f6539363c5a291dd13**ef1e2cbbdehttp://cgit.freedesktop.org/libreoffice/core/commit/?id=3bafe5f5f529f6539363c5a291dd13ef1e2cbbde or off libreoffice-4-1 past pending integration of https://gerrit.libreoffice.**org/#/c/6209/https://gerrit.libreoffice.org/#/c/6209/ ? Andreas, can you contact the uploaders of the two extensions marked UNKNOWN UPLOADER above, to make sure they do not inadvertently upload broken versions? Thanks, Stephan __**_ LibreOffice mailing list LibreOffice@lists.freedesktop.**org LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/**mailman/listinfo/libreofficehttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ATTENTION, creators of mysql-connector-ooo.oxt (--enable-ext-mariadb-connector)
Hi Thomas, 2013/10/12 Thomas Hackert thack...@nexgo.de just out of interest: For which OS/archticture did you build your extension? If you have one for Debian/AMD64, I can help to test it a little bit (but have to add, that I am using MariaDB here, if this does make any difference ... ;) ). I only build it for Windows, so no luck here ;) -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/app/AppController.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 050248fea53adb6a14b649c5f84dd69a8faff997 Author: Jesús Corrius jcorr...@gmail.com Date: Fri Oct 4 10:01:51 2013 +0200 Initial fix for fdo#69915 Change-Id: Id673eb7a55aefb35ff8ab612f926bfd115129ab4 diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index b97a02e..a46169e 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -408,6 +408,12 @@ void SAL_CALL OApplicationController::disposing() aFilter, getStrippedDatabaseName(), OUString() ); + +// add to recent document list +if ( aURL.GetProtocol() == INET_PROT_FILE ) +Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), + (pFilter) ? pFilter-GetMimeType() : OUString(), + (pFilter) ? pFilter-GetServiceName() : OUString() ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dbaccess/source
dbaccess/source/ui/app/AppController.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 5c1e53cb86d4b6bfcb207cb0f43b101d1f109a3b Author: Jesús Corrius jcorr...@gmail.com Date: Fri Oct 4 10:01:51 2013 +0200 Initial fix for fdo#69915 Change-Id: Id673eb7a55aefb35ff8ab612f926bfd115129ab4 Reviewed-on: https://gerrit.libreoffice.org/6132 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index a8d32fa..7655b70 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -420,6 +420,12 @@ void SAL_CALL OApplicationController::disposing() aFilter, getStrippedDatabaseName(), OUString() ); + +// add to recent document list +if ( aURL.GetProtocol() == INET_PROT_FILE ) +Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), + (pFilter) ? pFilter-GetMimeType() : OUString(), + (pFilter) ? pFilter-GetServiceName() : OUString() ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/loadenv/loadenv.cxx | 74 +--
1 file changed, 37 insertions(+), 37 deletions(-)
New commits:
commit a1bc57563f659579e889f279d7f63a9fb487dcb2
Author: Jesús Corrius jcorr...@gmail.com
Date: Thu Sep 26 10:02:26 2013 +0200
Some spellchecker love in the comments
Change-Id: I88dee4ae25ac57a78b72fa020b76e0d9b7709b31
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 1767133..0346412 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -257,7 +257,7 @@ void LoadEnv::initializeLoading(const OUString
// try to find out, if its really a content, which can be loaded or must
be handled
// We use a default value for this in-parameter. Then we have to start a
complex check method
-// internally. But if this check was already done outside it can be
supressed to perform
+// internally. But if this check was already done outside it can be
suppressed to perform
// the load request. We take over the result then!
if (m_eContentType == E_UNSUPPORTED_CONTENT)
{
@@ -286,9 +286,9 @@ void LoadEnv::initializeLoading(const OUString
if (pIt != m_lMediaDescriptor.end())
m_lMediaDescriptor.erase(pIt);
-// patch the MediaDescriptor, so it fullfill the outside requirements
+// patch the MediaDescriptor, so it fulfil the outside requirements
// Means especially items like e.g. UI InteractionHandler, Status
Indicator,
-// MacroExecutionMode etcpp.
+// MacroExecutionMode, etc.
/*TODO progress is bound to a frame ... How can we set it here? */
@@ -376,7 +376,7 @@ void LoadEnv::startLoading()
// - SAFE
aReadLock.unlock();
-// detect its type/filter etcpp.
+// detect its type/filter etc.
// These information will be available by the
// used descriptor member afterwards and is needed
// for all following operations!
@@ -385,8 +385,8 @@ void LoadEnv::startLoading()
impl_detectTypeAndFilter();
// start loading the content ...
-// Attention: Dont check m_eContentType deeper then UNSUPPORTED/SUPPORTED!
-// Because it was made in th easiest way ... may a flat detection was made
only.
+// Attention: Don't check m_eContentType deeper then UNSUPPORTED/SUPPORTED!
+// Because it was made in the easiest way ... may a flat detection was
made only.
// And such simple detection can fail some times .-)
// Use another strategy here. Try it and let it run into the case loading
not possible.
sal_Bool bStarted = sal_False;
@@ -417,7 +417,7 @@ sal_Bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout)
// Because its not a good idea to block the main thread
// (and we can't be sure that we are currently not used inside the
// main thread!), we can't use conditions here really. We must yield
-// in an intellegent manner :-)
+// in an intelligent manner :-)
sal_Int32 nTime = nTimeout;
while(true)
@@ -706,7 +706,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const
OUString
//---
// (TODO) At this point, we have no idea .-)
//But it seems to be better, to break all
-//further requests for this URL. Otherwhise
+//further requests for this URL. Otherwise
//we can run into some trouble.
return E_UNSUPPORTED_CONTENT;
}
@@ -801,7 +801,7 @@ void LoadEnv::impl_detectTypeAndFilter()
ReadGuard aReadLock(m_aLock);
// Attention: Because our stl media descriptor is a copy of an uno sequence
-// we can't use as an in/out parameter here. Copy it before and dont
forget to
+// we can't use as an in/out parameter here. Copy it before and don't
forget to
// update structure afterwards again!
css::uno::Sequence css::beans::PropertyValue lDescriptor =
m_lMediaDescriptor.getAsConstPropertyValueList();
css::uno::Reference css::uno::XComponentContext xContext =
m_xContext;
@@ -845,8 +845,8 @@ void LoadEnv::impl_detectTypeAndFilter()
aWriteLock.unlock();
// - SAFE
-// But the type isnt enough. For loading sometimes we need more
information.
-// E.g. for our _default feature, where we recylce any frame which
contains
+// But the type isn't enough. For loading sometimes we need more
information.
+// E.g. for our _default feature, where we recycle any frame which
contains
// and Untitled document, we must know if the new document is based on a
template!
// But this information is available as a filter property only.
// = We must try(!) to detect the right filter for this load request.
@@ -855,7 +855,7 @@ void LoadEnv::impl_detectTypeAndFilter()
if (sFilter.isEmpty())
{
// no - try to find a preferred filter for the detected type.
-// Dont forget to updatet he media descriptor.
+// Don't forget to
[Libreoffice-commits] core.git: framework/inc framework/source include/salhelper include/svtools
framework/inc/classes/checkediterator.hxx |2 +- framework/inc/classes/filtercachedata.hxx |2 +- framework/inc/classes/framecontainer.hxx |2 +- framework/inc/dispatch/closedispatcher.hxx |4 ++-- framework/inc/helper/propertysetcontainer.hxx |2 +- framework/inc/helper/statusindicatorfactory.hxx|2 +- framework/inc/helper/vclstatusindicator.hxx|2 +- framework/inc/recording/dispatchrecorder.hxx |2 +- framework/inc/services/autorecovery.hxx|2 +- framework/inc/services/desktop.hxx |2 +- framework/inc/services/layoutmanager.hxx |2 +- framework/inc/services/license.hxx |2 +- framework/inc/services/substitutepathvars.hxx |2 +- framework/inc/services/tabwindowservice.hxx|2 +- framework/inc/uiconfiguration/globalsettings.hxx |2 +- framework/inc/uiconfiguration/imagemanager.hxx |2 +- framework/inc/uiconfiguration/moduleimagemanager.hxx |2 +- framework/inc/uiconfiguration/moduleuicfgsupplier.hxx |2 +- framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx |2 +- framework/inc/uiconfiguration/uicategorydescription.hxx|2 +- framework/inc/uiconfiguration/uiconfigurationmanager.hxx |2 +- framework/inc/uiconfiguration/windowstateconfiguration.hxx |2 +- framework/inc/uielement/menubarmanager.hxx |2 +- framework/inc/uielement/uicommanddescription.hxx |2 +- framework/inc/uifactory/uielementfactorymanager.hxx|2 +- framework/inc/uifactory/windowcontentfactorymanager.hxx|2 +- framework/source/inc/loadenv/actionlockguard.hxx |2 +- framework/source/inc/loadenv/loadenv.hxx |6 +++--- framework/source/layoutmanager/toolbarlayoutmanager.hxx|2 +- framework/source/uiconfiguration/imagemanagerimpl.hxx |2 +- include/salhelper/singletonref.hxx |8 include/svtools/acceleratorexecute.hxx |2 +- 32 files changed, 38 insertions(+), 38 deletions(-) New commits: commit 6a3cf741d1d4d9e700c14da6d6ae386d3aa372f8 Author: Jesús Corrius jcorr...@gmail.com Date: Thu Sep 26 10:21:12 2013 +0200 Otherwhise - Otherwise Change-Id: Iaec23e1d240f675a04b52cd251c4cb2a1242bb44 diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index 241e1e7..a7e4745 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -151,7 +151,7 @@ class CheckedIterator /*-//** @short reset this iterator @descr It must be called on an already initialized iterator. -Means the member m_pContainer must be valid. Otherwhise the reaction +Means the member m_pContainer must be valid. Otherwise the reaction isn't defined. @param - diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 809cc00..d585e49 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -20,7 +20,7 @@ #ifndef __FRAMEWORK_CLASSES_FILTERCACHEDATA_HXX_ #define __FRAMEWORK_CLASSES_FILTERCACHEDATA_HXX_ -/** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble +/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble with solaris headers ... */ #include boost/unordered_map.hpp diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index 0fddd0f..f388cfa 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -20,7 +20,7 @@ #ifndef __FRAMEWORK_CLASSES_FRAMECONTAINER_HXX_ #define __FRAMEWORK_CLASSES_FRAMECONTAINER_HXX_ -/** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble +/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble with solaris headers ... */ #include vector diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 7bb3ac4..de51671 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -182,7 +182,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali /** @short a callback for
[Libreoffice-commits] core.git: filter/source framework/inc framework/source include/comphelper include/framework include/salhelper include/ucbhelper include/unotools
filter/source/config/cache/filtercache.hxx |4 ++--
filter/source/config/cache/typedetection.hxx|2 +-
framework/inc/classes/propertysethelper.hxx |2 +-
framework/inc/dispatch/closedispatcher.hxx |2 +-
framework/inc/dispatch/startmoduledispatcher.hxx|2 +-
framework/inc/helper/persistentwindowstate.hxx |4 ++--
framework/inc/services/autorecovery.hxx |4 ++--
framework/inc/services/modulemanager.hxx|2 +-
framework/source/inc/accelerators/presethandler.hxx |2 +-
include/comphelper/configurationhelper.hxx |2 +-
include/framework/framelistanalyzer.hxx |4 ++--
include/salhelper/singletonref.hxx |2 +-
include/ucbhelper/interceptedinteraction.hxx|4 ++--
include/unotools/moduleoptions.hxx |2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 7d491bec4063b447726c49a98be47c80df1d4e24
Author: Jesús Corrius jcorr...@gmail.com
Date: Thu Sep 26 10:33:38 2013 +0200
Everytimes - Every time
Change-Id: Ib84cee7dbb493387760ce68c25ec442bf0a4a121
diff --git a/filter/source/config/cache/filtercache.hxx
b/filter/source/config/cache/filtercache.hxx
index 7305c48..595927e 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -327,7 +327,7 @@ class FilterCache : public BaseLock
Otherwise this method does nothing!
This method must be called from every user of this
cache
-everytimes it need a filled cache. Normaly we load
+every time it need a filled cache. Normaly we load
only standard information into this cache on startup.
After a few seconds we start a special thread, which
may fill this cache completely. But if somehwere
outside
@@ -669,7 +669,7 @@ class FilterCache : public BaseLock
@descr It checks first, if the internal member m_xConfig
already
points to an open update access. If not - it opens a
new one.
-Doing so this method can be called everytimes a
configuration
+Doing so this method can be called every time a
configuration
access is needed.
@param eProvider
diff --git a/filter/source/config/cache/typedetection.hxx
b/filter/source/config/cache/typedetection.hxx
index bb4d45f..3ce6042 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -110,7 +110,7 @@ private:
@param rLastChance
the internal name of a suggested type ... (see before)
-Note: it will be reseted to an empty string everytimes. So
+Note: it will be reseted to an empty string every time. So
a set value of rLastChance can be detected outside very
easy.
@param rUsedDetectors
diff --git a/framework/inc/classes/propertysethelper.hxx
b/framework/inc/classes/propertysethelper.hxx
index 7288356..7ae333e 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -41,7 +41,7 @@ namespace framework{
/** supports the API XPropertySet and XPropertySetInfo.
*
* It must be used as baseclass. The internal list of supported
- * properties can be changed everytimes so dynamic property set's
+ * properties can be changed every time so dynamic property set's
* can be implemented.
*
* Further the derived and this base class share the same lock.
diff --git a/framework/inc/dispatch/closedispatcher.hxx
b/framework/inc/dispatch/closedispatcher.hxx
index de51671..a196cf1 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -257,7 +257,7 @@ class CloseDispatcher : // baseclasses ... order is
necessary for right initiali
/** @short notify a DispatchResultListener.
@descr We check the listener reference before we use it.
-So this method can be called everytimes!
+So this method can be called every time!
@parama xListener
the listener, which should be notified.
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx
b/framework/inc/dispatch/startmoduledispatcher.hxx
index d54887e..d1596c3 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -154,7 +154,7 @@ class StartModuleDispatcher : // baseclasses ... order is
necessary for right in
/** @short notify a DispatchResultListener.
@descr We check the listener reference before we use it.
-So this method can be called
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Common.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa52e16b3fb1b8b051f8f64a52c126ba3cbf4d54 Author: Jesús Corrius jcorr...@gmail.com Date: Wed Sep 25 22:24:38 2013 +0200 don't steal the focus after loading a document to reproduce it, just load a large document and meanwhile change the focus to another window. when the libreoffice document ends loading, the libreoffice window will be bought into foreground and steal the focus Change-Id: Id4b9be67270c17523d9dabf452fa321de660f808 diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index ef0e765..0eb3e64 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -27,7 +27,7 @@ /node node oor:name=NewDocumentHandling prop oor:name=ForceFocusAndToFront -value install:module=wnttrue/value +value install:module=wntfalse/value /prop /node node oor:name=Localisation ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source sal/osl scp2/source
filter/source/graphicfilter/ieps/ieps.cxx |2 +-
sal/osl/w32/nlsupport.c|2 +-
scp2/source/winexplorerext/registryitem_winexplorerext.scp |8
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9de95a52405c948a32895aec1da06c9d33b4eee2
Author: Jesús Corrius jcorr...@gmail.com
Date: Tue Sep 3 21:07:25 2013 +0200
ICE03: WARNING: String overflow (greater than length permitted in column)
Change-Id: I3c918da4c093489db122bc5af7401c7c93c1579e
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index d34223c..a8eda1d 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -128,14 +128,14 @@ End
// Begin registry items for the Column handler
-RegistryItem
gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396
+RegistryItem
gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
Subkey =
Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396};
Value = %PRODUCTNAME Column Handler;
End
-RegistryItem
gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64
+RegistryItem
gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
ComponentCondition = VersionNT64;
@@ -259,14 +259,14 @@ RegistryItem
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_x64
Value = OpenDocument Format Persistent Handler;
End
-RegistryItem
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered
+RegistryItem
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
Subkey =
CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF};
Value = {7BC0E710-5703-45BE-A29D-5D46D8B39262};
End
-RegistryItem
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered_x64
+RegistryItem
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
ComponentCondition = VersionNT64;
commit 6f667f7e5ba1033d4abedf9efca6607b449c2396
Author: Jesús Corrius jcorr...@gmail.com
Date: Tue Sep 3 20:44:16 2013 +0200
dezimal - decimal
Change-Id: I196026cc7f2f885664e9719557f662a32a7187b8
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index de06d5d..311bf8c 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -598,7 +598,7 @@ GraphicImport(SvStream rStream, Graphic rGraphic,
FilterConfigItem*, sal_Boo
{
if ( nByte '9' )
{
-nByte =~0x20;
// case none sensitive for hexadezimal values
+nByte =~0x20;
// case none sensitive for hexadecimal values
nByte -= ( 'A'
- 10 );
if ( nByte
15 )
bIsValid =
sal_False;
diff --git a/sal/osl/w32/nlsupport.c b/sal/osl/w32/nlsupport.c
index 04c63aa..175a8c6 100644
--- a/sal/osl/w32/nlsupport.c
+++ b/sal/osl/w32/nlsupport.c
@@ -147,7 +147,7 @@ rtl_TextEncoding GetTextEncodingFromLCID( LCID localeId )
WCHAR *pwcEnd;
UINT codepage;
-/* values returned from GetLocaleInfo are dezimal based */
+/* values returned from GetLocaleInfo are decimal based */
codepage = wcstol( ansiCP, pwcEnd, 10 );
/* find matching rtl encoding */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: setup_native/source
setup_native/source/win32/customactions/regactivex/regactivex.cxx | 12
--
1 file changed, 12 deletions(-)
New commits:
commit a03b1876c7b334acc26a41b4d8ca6eead07cfa1f
Author: Jesús Corrius jcorr...@gmail.com
Date: Mon Sep 2 16:30:41 2013 +0200
We don't support Win9x anymore, remove legacy code
Change-Id: I12afdc1c25bb09d20fd0698831642b953e08bb63
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index 7be03a2..b25602d 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -71,12 +71,6 @@ char* UnicodeToAnsiString( wchar_t* pUniString )
//--
void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL
InstallForAllUser, BOOL InstallFor64Bit )
{
-// For Win98/WinME the values should be written to the local machine
-OSVERSIONINFO aVerInfo;
-aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
-if ( GetVersionEx( aVerInfo ) aVerInfo.dwPlatformId !=
VER_PLATFORM_WIN32_NT )
-InstallForAllUser = TRUE;
-
HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH );
if( !( hModule = ( HINSTANCE )HINSTANCE_ERROR ) )
{
@@ -104,12 +98,6 @@ void RegisterActiveXNative( const char* pActiveXPath, int
nMode, BOOL InstallFor
//--
void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL
InstallForAllUser, BOOL InstallFor64Bit )
{
-// For Win98/WinME the values should be written to the local machine
-OSVERSIONINFO aVerInfo;
-aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
-if ( GetVersionEx( aVerInfo ) aVerInfo.dwPlatformId !=
VER_PLATFORM_WIN32_NT )
-InstallForAllUser = TRUE;
-
HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH );
if( !( hModule = ( HINSTANCE )HINSTANCE_ERROR ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 24 ++---
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 985ac0b156bdb88afec7091a3b36a2212d39c580
Author: Jesús Corrius jcorr...@gmail.com
Date: Tue Aug 27 19:01:03 2013 +0200
ICE03 WARNING String overflow (greater than length permitted in
column)
Change-Id: I48bade4998c6c5d95e49bdc109d4a5a1ef76bbcb
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index e862409..d34223c 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -36,7 +36,7 @@ RegistryItem
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
End
-RegistryItem
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
+RegistryItem
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
Subkey = CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32;
@@ -44,7 +44,7 @@ RegistryItem
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
Value = Apartment;
End
-RegistryItem
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel_x64
+RegistryItem
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
ComponentCondition = VersionNT64;
@@ -89,7 +89,7 @@ RegistryItem
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
End
-RegistryItem
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
+RegistryItem
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
Subkey = CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32;
@@ -98,7 +98,7 @@ RegistryItem
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
Val64 = Apartment;
End
-RegistryItem
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel_x64
+RegistryItem
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
ComponentCondition = VersionNT64;
@@ -158,7 +158,7 @@ RegistryItem
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
End
-RegistryItem
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
+RegistryItem
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
Subkey = CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32;
@@ -166,7 +166,7 @@ RegistryItem
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
Value = Apartment;
End
-RegistryItem
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel_x64
+RegistryItem
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
ComponentCondition = VersionNT64;
@@ -227,7 +227,7 @@ RegistryItem
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
Value = [INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll;
End
-RegistryItem
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
+RegistryItem
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
Subkey = CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32;
@@ -235,7 +235,7 @@ RegistryItem
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
Value = Apartment;
End
-RegistryItem
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel_x64
+RegistryItem
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
ComponentCondition = VersionNT64;
@@ -293,7 +293,7 @@ RegistryItem
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
End
-RegistryItem
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/inc
scp2/inc/macros.inc |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit c8b6437fb60e0428d615ca5c4b532f79b721785a Author: Jesús Corrius jcorr...@gmail.com Date: Sat Aug 24 13:55:46 2013 +0200 Create the AppUserModelID registry values correctly This commit is a backport from master. The original code is totally broken and creates useless registry values in a wrong place. The corrected patch allows LO to keep track of the MSO file types opened by our application in the shell's recent documents list. Change-Id: I5db0a7f166ef73fe21a5f3fc891f86a91e1914d5 Reviewed-on: https://gerrit.libreoffice.org/5603 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index fa7c350..f0ed12a2 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -236,11 +236,12 @@ End End #define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ -RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ +RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ -ComponentCondition = VersionNT = 600; \ -Subkey = STRING(AppUserModelID); \ +ComponentCondition = STRING(VersionNT = 601); \ +Subkey = STRING(CONCAT2(LibreOffice.,name)); \ +Name = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 1982c3fd674f7a7c4b59e82e565af048c9e7387a Author: Jesús Corrius jcorr...@gmail.com Date: Fri Aug 23 07:49:07 2013 +0200 now really create the key in the right place sigh... Change-Id: I6d55da7b6e7fc1c6a9573aa05f9045388edf3684 Reviewed-on: https://gerrit.libreoffice.org/5589 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index ff01770..cb4924b 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -273,7 +273,8 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ ComponentCondition = STRING(VersionNT = 601); \ -Subkey = STRING(CONCAT3(LibreOffice.,name,\AppUserModelID)); \ +Subkey = STRING(CONCAT2(LibreOffice.,name)); \ +Name = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/windows/component.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0404f37297c4b283972d71c8f53765d9169bdafa
Author: Jesús Corrius jcorr...@gmail.com
Date: Fri Aug 23 19:50:21 2013 +0200
fdo#68194 Font files are left after uninstallation
#i119948# Instruct windows installer to use refcounting on fonts.
Author: Andre Fischer a...@apache.org
Reported by: DaLi Liu
Patch by: qiuhuaidong
Review by: DaLi Liu and Andre Fischer
Change-Id: I45d4eb509d58852dcf446a0af94ac69fb6347d2d
Reviewed-on: https://gerrit.libreoffice.org/5597
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/solenv/bin/modules/installer/windows/component.pm
b/solenv/bin/modules/installer/windows/component.pm
index 82cf8cc..8f48941 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -210,7 +210,7 @@ sub get_file_component_attributes
if ( $localstyles =~ /\bFONT\b/ )
{
-$attributes = 16; # font files will not be deinstalled
+$attributes = 8;# font files will be deinstalled if the ref count
is 0
}
if ( $localstyles =~ /\bASSEMBLY\b/ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cbb3f73adec26896b1e5c371548fa3bd1ae57130 Author: Jesús Corrius jcorr...@gmail.com Date: Thu Aug 22 21:31:05 2013 +0200 I am stupid It's not actually that I am massively stupid, it's just that I've got bad luck when it comes to thinking. This patch makes the installer create the values in the right location. Where now...? you'd better don't ask. /me goes for a brown paper bag. Change-Id: I792ba5e9a78a895d3df7dfc48d1fc7c5303ce28e Reviewed-on: https://gerrit.libreoffice.org/5587 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 75d2778..ff01770 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -273,7 +273,7 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ ComponentCondition = STRING(VersionNT = 601); \ -Subkey = STRING(AppUserModelID); \ +Subkey = STRING(CONCAT3(LibreOffice.,name,\AppUserModelID)); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit c4d5b148340932df9ac0360e6831169e945566fe Author: Jesús Corrius jcorr...@gmail.com Date: Tue Aug 20 11:23:02 2013 +0200 Registy item fix for AppUserModelID and use STRING macro for strings Change-Id: Id6434355aabdde4f39232ab5a839201a85ca4d29 Reviewed-on: https://gerrit.libreoffice.org/5529 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4d588a4..75d2778 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -269,10 +269,10 @@ End End #define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ -RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ +RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ -ComponentCondition = VersionNT = 601; \ +ComponentCondition = STRING(VersionNT = 601); \ Subkey = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End @@ -355,10 +355,10 @@ End RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Explorer_KindMap_,name) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ ModuleID = modid; \ -ComponentCondition = VersionNT = 600; \ +ComponentCondition = STRING(VersionNT = 600); \ Subkey = STRING(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap); \ Name = STRING(CONCAT2(.,key)); \ -Value = document; \ +Value = STRING(document); \ End #define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/inc desktop/source
desktop/inc/app.hxx|1
desktop/source/app/app.cxx | 22 ++
desktop/source/app/officeipcthread.cxx | 50 -
desktop/source/app/officeipcthread.hxx |3 -
4 files changed, 24 insertions(+), 52 deletions(-)
New commits:
commit b0041fd68ae1a9df91f8c3274e0b4003ef914a44
Author: Jesús Corrius jcorr...@gmail.com
Date: Wed Aug 14 16:04:31 2013 +0200
Revert Fixing i#119950 warn about other running terminal sessions
This reverts commit b218cbf59de4d7ae0a6962995fb0f719ed68b5d2.
The original patch just looks for another instance running which
of course can be in the same terminal session. The assumptions
the author makes are wrong.
The bug the patch tries to solve is real and we'll probably
have to solve it in the future, but not this way.
Conflicts:
desktop/source/app/officeipcthread.cxx
Change-Id: I1e645671aa09c6147163820c12d5efb3b3688bd1
Reviewed-on: https://gerrit.libreoffice.org/5415
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 04153ef..d949304 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -64,7 +64,6 @@ class Desktop : public Application
BE_LANGUAGE_MISSING,
BE_USERINSTALL_NOTENOUGHDISKSPACE,
BE_USERINSTALL_NOWRITEACCESS,
-BE_MULTISESSION_NOT_SUPPORTED,
BE_OFFICECONFIG_BROKEN
};
enum BootstrapStatus
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c4e9729..b436ade 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -415,10 +415,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString
const aInternalErrMsg )
// are allowed. Otherwise we will force a crash inside a crash.
// Thats why we have to use a special native message box here which does not
use yield :-)
//=
-
-// #i119950# Add a option that not to display the Fatal Error on dialog title
-void FatalError(const OUString sMessage, const bool isDisplayErrorString =
true);
-void FatalError(const OUString sMessage, const bool isDisplayErrorString)
+void FatalError(const OUString sMessage)
{
OUString sProductKey = ::utl::Bootstrap::getProductKey();
if ( sProductKey.isEmpty())
@@ -432,9 +429,8 @@ void FatalError(const OUString sMessage, const bool
isDisplayErrorString)
OUStringBuffer sTitle (128);
sTitle.append (sProductKey );
-if (isDisplayErrorString) {
-sTitle.appendAscii ( - Fatal Error);
-}
+sTitle.appendAscii ( - Fatal Error);
+
Application::ShowNativeErrorBox (sTitle.makeStringAndClear (), sMessage);
_exit(EXITHELPER_FATAL_ERROR);
}
@@ -626,10 +622,6 @@ void Desktop::Init()
{
SetBootstrapError( BE_PATHINFO_MISSING, OUString() );
}
-else if ( aStatus == OfficeIPCThread::IPC_STATUS_MULTI_TS_ERROR )
-{
-SetBootstrapError( BE_MULTISESSION_NOT_SUPPORTED, OUString() );
-}
else if ( aStatus == OfficeIPCThread::IPC_STATUS_2ND_OFFICE )
{
// 2nd office startup should terminate after sending cmdlineargs
through pipe
@@ -856,13 +848,7 @@ OUStringDesktop::CreateErrorMsgString(
void Desktop::HandleBootstrapErrors(
BootstrapError aBootstrapError, OUString const aErrorMessage )
{
-if ( aBootstrapError == BE_MULTISESSION_NOT_SUPPORTED ) {
-OUStringaMessage;
-aMessage = GetMsgString( STR_BOOTSTRAP_ERR_MULTISESSION,
-OUString( RTL_CONSTASCII_USTRINGPARAM( You have
another instance running in a different terminal session. Close that instance
and then try again. )) );
-FatalError(aMessage,sal_False);
-
-} else if ( aBootstrapError == BE_PATHINFO_MISSING )
+if ( aBootstrapError == BE_PATHINFO_MISSING )
{
OUStringaErrorMsg;
OUStringaBuffer;
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 14000eb..e897ee1 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -522,42 +522,30 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
do
{
osl::Security rSecurity = Security::get();
-// #119950# Try to connect pipe first. If connected, means another
instance already launched.
-if ( pThread-maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN,
rSecurity ))
-{
-// #119950# Test if launched in a new terminal session for same
user. On Windows platform, normally a user is resticted
-// to have only one terminal session. But if mutiple terminal
session for one user is allowed,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/source
scp2/source/extensions/module_extensions.scp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0178c9ec0a2543c3713907f51911a05e31567db1 Author: Jesús Corrius jcorr...@gmail.com Date: Wed Aug 14 09:30:06 2013 +0200 Fix for ICE101 ERROR in generated MSI ICE101 ERROR The feature gm_o_Extensions_Script_Provider_For_Javascript is greater than 38 characters in length. Features are limited to 38 characters and must follow this convention for APIs like MsiEnumFeatures ICE101 ERROR The feature gm_o_Extensions_Script_Provider_For_Beanshell is greater than 38 characters in length. Features are limited to 38 characters and must follow this convention for APIs like MsiEnumFeatures Change-Id: I298a0dafa7babd1af69c7754fe89efcfe5902970 Reviewed-on: https://gerrit.libreoffice.org/5402 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 117b662..edff735 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -257,7 +257,7 @@ End #if defined SOLAR_JAVA !defined WITHOUT_SCRIPTING_BEANSHELL -Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell +Module gid_Module_Optional_Extensions_Script_Provider_For_BS PackageInfo = packinfo_extensions.txt; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL); ParentID = gid_Module_Optional_Extensions; @@ -276,7 +276,7 @@ End #if defined SOLAR_JAVA !defined WITHOUT_SCRIPTING_JAVASCRIPT -Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript +Module gid_Module_Optional_Extensions_Script_Provider_For_JS PackageInfo = packinfo_extensions.txt; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT); ParentID = gid_Module_Optional_Extensions; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/extensions/module_extensions.scp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 535411d1d9e7e0f2cb1b192a1a6220cc5b9b743a Author: Jesús Corrius jcorr...@gmail.com Date: Wed Aug 14 09:30:06 2013 +0200 Fix for ICE101 ERROR in generated MSI ICE101 ERROR The feature gm_o_Extensions_Script_Provider_For_Javascript is greater than 38 characters in length. Features are limited to 38 characters and must follow this convention for APIs like MsiEnumFeatures ICE101 ERROR The feature gm_o_Extensions_Script_Provider_For_Beanshell is greater than 38 characters in length. Features are limited to 38 characters and must follow this convention for APIs like MsiEnumFeatures Change-Id: I298a0dafa7babd1af69c7754fe89efcfe5902970 Reviewed-on: https://gerrit.libreoffice.org/5401 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 117b662..edff735 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -257,7 +257,7 @@ End #if defined SOLAR_JAVA !defined WITHOUT_SCRIPTING_BEANSHELL -Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell +Module gid_Module_Optional_Extensions_Script_Provider_For_BS PackageInfo = packinfo_extensions.txt; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL); ParentID = gid_Module_Optional_Extensions; @@ -276,7 +276,7 @@ End #if defined SOLAR_JAVA !defined WITHOUT_SCRIPTING_JAVASCRIPT -Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript +Module gid_Module_Optional_Extensions_Script_Provider_For_JS PackageInfo = packinfo_extensions.txt; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT); ParentID = gid_Module_Optional_Extensions; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 5cca1c3f9162343fd92ae2344d24a571b07e9e39 Author: Jesús Corrius jcorr...@gmail.com Date: Wed Aug 14 22:18:54 2013 +0200 Fix Windows build for Visual Studio 2012 For more information see: http://msdn.microsoft.com/en-us/library/4hwaceh6(v=vs.110).aspx Also it looks like limits includes math somehow so move the include lower. Change-Id: Ifec3a59370f7ad0e4bdc58c470e4f14f7db33660 Reviewed-on: https://gerrit.libreoffice.org/5423 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index e1ca88f..f5662b0 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -17,8 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include limits +#ifdef WNT +#define _USE_MATH_DEFINES // for M_SQRT2 +#endif + #include cmath +#include limits #include svx/EnhancedCustomShapeGeometry.hxx #include com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9b6e7e72ebd6a9b308fd012b242cd29152407faa Author: Jesús Corrius jcorr...@gmail.com Date: Tue Aug 13 12:47:06 2013 +0200 AppUserModelIDs registry entries are useful only on Windows7+ Change-Id: Ia17608d603434fa244c056bf711ce4951644246e Reviewed-on: https://gerrit.libreoffice.org/5385 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 25e0f41..6a4b19a 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -239,7 +239,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ -ComponentCondition = VersionNT = 600; \ +ComponentCondition = VersionNT = 601; \ Subkey = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/calc/module_calc.scp |9 + scp2/source/draw/module_draw.scp |9 + scp2/source/impress/module_impress.scp |9 + scp2/source/writer/module_writer.scp |8 4 files changed, 35 insertions(+) New commits: commit 45fcdca7b32be49db75bfdcb027e33a04cb04f87 Author: Jesús Corrius jcorr...@gmail.com Date: Mon Aug 12 15:31:22 2013 +0200 Add missing modules to fix the Windows build Related to commit: cd97b11a33db909318572a27a54305cb4757ba0f Change-Id: I899508a648cb111ea3f5aeb1eb5d80fc751951fa Reviewed-on: https://gerrit.libreoffice.org/5369 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index 191577a..020af52 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -83,4 +83,13 @@ Module gid_Module_Prg_Calc_MSO_Reg Default = YES; End +Module gid_Module_Prg_Calc_Other_Reg +ParentID = gid_Module_Prg_Calc; +Name = gid_Module_Prg_Calc_Other_Reg; +Description = gid_Module_Prg_Calc_Other_Reg; +Styles = (HIDDEN_ROOT); +Minimal = YES; +Default = YES; +End + #include alllangmodules_calc.inc diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp index f7d92c1..c0dc581 100644 --- a/scp2/source/draw/module_draw.scp +++ b/scp2/source/draw/module_draw.scp @@ -68,4 +68,13 @@ Module gid_Module_Prg_Draw_MSO_Reg Default = YES; End +Module gid_Module_Prg_Draw_Other_Reg +ParentID = gid_Module_Prg_Draw; +Name = gid_Module_Prg_Draw_Other_Reg; +Description = gid_Module_Prg_Draw_Other_Reg; +Styles = (HIDDEN_ROOT); +Minimal = YES; +Default = YES; +End + #include alllangmodules_draw.inc diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index d4ef187..dd2eeba 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -72,4 +72,13 @@ Module gid_Module_Prg_Impress_MSO_Reg Default = YES; End +Module gid_Module_Prg_Impress_Other_Reg +ParentID = gid_Module_Prg_Impress; +Name = gid_Module_Prg_Impress_Other_Reg; +Description = gid_Module_Prg_Impress_Other_Reg; +Styles = (HIDDEN_ROOT); +Minimal = YES; +Default = YES; +End + #include alllangmodules_impress.inc diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 7fe2210..75b8c04 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -75,6 +75,14 @@ Module gid_Module_Prg_Wrt_MSO_Reg Default = YES; End +Module gid_Module_Prg_Wrt_Other_Reg +ParentID = gid_Module_Prg_Wrt; +Name = gid_Module_Prg_Wrt_Other_Reg; +Description = gid_Module_Prg_Wrt_Other_Reg; +Styles = (HIDDEN_ROOT); +Minimal = YES; +Default = YES; +End #include alllangmodules_writer.inc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/sfxpicklist.cxx | 27 +--
1 file changed, 1 insertion(+), 26 deletions(-)
New commits:
commit f7feb4227d83f4f095597a44826277aaae2bc0df
Author: Jesús Corrius jcorr...@gmail.com
Date: Sat Aug 3 13:44:19 2013 +0200
Call AddDocumentToPickList in SFX_EVENT_OPENDOC
Not only simplifies the code but makes the application more
coherent with other Windows and Linux applications as the
recent documents lists is populated when you open the file.
Also, for Windows 7 and higher, it makes a call to
Application::AddToRecentDocumentList. Tested on Windows
and Linux.
Change-Id: I360acc9723260d5827eb83e3c240ab0673352af6
Reviewed-on: https://gerrit.libreoffice.org/5266
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 32b3ea5..c09f360 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -379,32 +379,7 @@ void SfxPickList::Notify( SfxBroadcaster, const SfxHint
rHint )
case SFX_EVENT_OPENDOC:
{
-SfxMedium *pMed = pDocSh-GetMedium();
-if( !pMed )
-return;
-
-// Unnamed Documents and embedded-Documents not in History
-if ( !pDocSh-HasName() ||
- SFX_CREATE_MODE_STANDARD != pDocSh-GetCreateMode() )
-return;
-
-// Help not in History
-INetURLObject aURL( pDocSh-IsDocShared() ?
pDocSh-GetSharedFileURL() : OUString( pMed-GetOrigURL() ) );
-if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP )
-return;
-
-OUString aTitle = pDocSh-GetTitle(SFX_TITLE_PICKLIST);
-OUString aFilter;
-const SfxFilter* pFilter = pMed-GetOrigFilter();
-if ( pFilter )
-aFilter = pFilter-GetFilterName();
-
-// add to svtool history options
-SvtHistoryOptions().AppendItem( eHISTORY,
-aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
-aFilter,
-aTitle,
-OUString() );
+AddDocumentToPickList(pDocSh);
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 5f23dac65b39750356418d7d8f490a37a944c34c Author: Jesús Corrius jcorr...@gmail.com Date: Sun Aug 4 14:45:59 2013 +0200 Add AppUserModelID for all supported formats Now only the ODF formats have AppUserModelID, but we need AppUserModelID for all supported formats so the Windows 7 recent documents works as expected. This patch only adds a few registry keys during the installation process on Windows. Change-Id: I2d7460c1ed8b4ba77da8bb1c5b0c696c521353c5 Reviewed-on: https://gerrit.libreoffice.org/5274 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 86b4b546..25e0f41 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -235,6 +235,15 @@ End REG_VALUE_LNG(disp_name) \ End +#define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ +RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = modid; \ +ComponentCondition = VersionNT = 600; \ +Subkey = STRING(AppUserModelID); \ +Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ +End + #define REGISTRY_ENTRY_ICON(name,modid,icon_id) \ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ @@ -324,6 +333,7 @@ End REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \ CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \ REGISTRY_ENTRY_DOC(name,modid,disp_name) \ +REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ REGISTRY_ENTRY_ICON(name,modid,icon_id) \ REGISTRY_ENTRY_SHELL(name,default,modid) \ REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ @@ -338,6 +348,7 @@ End REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \ CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \ REGISTRY_ENTRY_DOC(name,modid,disp_name) \ +REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ REGISTRY_ENTRY_ICON(name,modid,icon_id) \ REGISTRY_ENTRY_SHELL(name,default,modid) \ REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/inc
scp2/inc/macros.inc | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 88d95183839b9100cb1dc2f93156f31bf1fd0e31 Author: Jesús Corrius jcorr...@gmail.com Date: Sun Aug 4 14:45:59 2013 +0200 Add AppUserModelID for all supported formats Now only the ODF formats have AppUserModelID, but we need AppUserModelID for all supported formats so the Windows 7 recent documents works as expected. This patch only adds a few registry keys during the installation process on Windows. Change-Id: I2d7460c1ed8b4ba77da8bb1c5b0c696c521353c5 Reviewed-on: https://gerrit.libreoffice.org/5275 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 871ed53..fa7c350 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -235,6 +235,15 @@ End REG_VALUE_LNG(disp_name) \ End +#define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ +RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = modid; \ +ComponentCondition = VersionNT = 600; \ +Subkey = STRING(AppUserModelID); \ +Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ +End + #define REGISTRY_ENTRY_ICON(name,modid,icon_id) \ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ @@ -324,6 +333,7 @@ End REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \ CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \ REGISTRY_ENTRY_DOC(name,modid,disp_name) \ +REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ REGISTRY_ENTRY_ICON(name,modid,icon_id) \ REGISTRY_ENTRY_SHELL(name,default,modid) \ REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ @@ -338,6 +348,7 @@ End REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \ CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \ REGISTRY_ENTRY_DOC(name,modid,disp_name) \ +REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ REGISTRY_ENTRY_ICON(name,modid,icon_id) \ REGISTRY_ENTRY_SHELL(name,default,modid) \ REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Calling AddDocumentToPickList in SFX_EVENT_OPENDOC
Hi guys, Is there any reason why AddDocumentToPickList is not called inside the SFX_EVENT_OPENDOC event in: sfx2/source/appl/sfxpicklist.cxx To be consistent with other Windows applications, I would like to add the document to the recent list of documents when you open it. This would be done automatically just calling AddDocumentToPickList inside the event. I see the event uses SvtHistoryOptions().AppendItem instead. Any comment will be highly appreciated. Thanks. -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/inc vcl/win
vcl/inc/win/saldata.hxx|1
vcl/win/source/app/salinst.cxx | 64 -
vcl/win/source/window/salframe.cxx |3 -
3 files changed, 65 insertions(+), 3 deletions(-)
New commits:
commit d915d7252c1997729892ab5f62680beeefe861aa
Author: Jesús Corrius jcorr...@gmail.com
Date: Mon Jul 29 01:26:24 2013 +0200
Use the Win7 semantics of SHAddToRecentDocs when possible
Change-Id: I7cf0dfaec408800f3c682b3ef56799818b805881
(cherry picked from commit e62fec4075e55fd62a3f0d25b230498e5705dd26)
Reviewed-on: https://gerrit.libreoffice.org/5163
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index fdf2faf..ea60b69 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -136,6 +136,7 @@ struct SalShlData
UINTmnWheelScrollChars; // WheelScrollChars
UINTmnWheelMsgId; // Wheel-Message-Id fuer
W95
BOOLmbWXP; // Windows XP
+BOOLmbW7; // Windows 7
OSVERSIONINFO maVersionInfo;
};
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index f5deb45..99356ba 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -480,6 +480,7 @@ SalInstance* CreateSalInstance()
// determine the windows version
aSalShlData.mbWXP= 0;
+aSalShlData.mbW7 = 0;
memset( aSalShlData.maVersionInfo, 0, sizeof(aSalShlData.maVersionInfo) );
aSalShlData.maVersionInfo.dwOSVersionInfoSize = sizeof(
aSalShlData.maVersionInfo );
if ( GetVersionEx( aSalShlData.maVersionInfo ) )
@@ -488,6 +489,10 @@ SalInstance* CreateSalInstance()
if ( aSalShlData.maVersionInfo.dwMajorVersion 5 ||
( aSalShlData.maVersionInfo.dwMajorVersion == 5
aSalShlData.maVersionInfo.dwMinorVersion = 1 ) )
aSalShlData.mbWXP = 1;
+// Windows 7 ?
+if ( aSalShlData.maVersionInfo.dwMajorVersion 6 ||
+ ( aSalShlData.maVersionInfo.dwMajorVersion == 6
aSalShlData.maVersionInfo.dwMinorVersion = 1 ) )
+aSalShlData.mbW7 = 1;
}
pSalData-mnAppThreadId = GetCurrentThreadId();
@@ -1017,7 +1022,7 @@ void* WinSalInstance::GetConnectionIdentifier(
ConnectionIdentifierType rReturn
@param aFileUrl
The file url of the document.
*/
-void WinSalInstance::AddToRecentDocumentList(const OUString rFileUrl, const
OUString /*rMimeType*/, const OUString /* rDocumentService */)
+void WinSalInstance::AddToRecentDocumentList(const OUString rFileUrl, const
OUString /*rMimeType*/, const OUString rDocumentService)
{
OUString system_path;
osl::FileBase::RC rc = osl::FileBase::getSystemPathFromFileURL(rFileUrl,
system_path);
@@ -1025,7 +1030,64 @@ void WinSalInstance::AddToRecentDocumentList(const
OUString rFileUrl, const OUS
OSL_ENSURE(osl::FileBase::E_None == rc, Invalid file url);
if (osl::FileBase::E_None == rc)
+{
+if ( aSalShlData.mbW7 )
+{
+typedef HRESULT ( WINAPI *SHCREATEITEMFROMPARSINGNAME )( PCWSTR,
IBindCtx*, REFIID, void **ppv );
+SHCREATEITEMFROMPARSINGNAME pSHCreateItemFromParsingName =
+( SHCREATEITEMFROMPARSINGNAME
)GetProcAddress(
+GetModuleHandleW (Lshell32.dll),
SHCreateItemFromParsingName );
+
+if( pSHCreateItemFromParsingName )
+{
+IShellItem* pShellItem = NULL;
+
+HRESULT hr = pSHCreateItemFromParsingName (
system_path.getStr(), NULL, IID_PPV_ARGS(pShellItem) );
+
+if ( SUCCEEDED(hr) pShellItem )
+{
+OUString sApplicationName;
+
+if ( rDocumentService == com.sun.star.text.TextDocument
||
+ rDocumentService ==
com.sun.star.text.GlobalDocument ||
+ rDocumentService == com.sun.star.text.WebDocument ||
+ rDocumentService ==
com.sun.star.xforms.XMLFormDocument )
+sApplicationName = Writer;
+else if ( rDocumentService ==
com.sun.star.sheet.SpreadsheetDocument ||
+ rDocumentService ==
com.sun.star.chart2.ChartDocument )
+sApplicationName = Calc;
+else if ( rDocumentService ==
com.sun.star.presentation.PresentationDocument )
+sApplicationName = Impress;
+else if ( rDocumentService ==
com.sun.star.drawing.DrawingDocument )
+sApplicationName = Draw;
+else if ( rDocumentService ==
com.sun.star.formula.FormulaProperties )
+sApplicationName = Math;
+else if (
Re: Bug 67257 - LibreOfficeCalc inside Windows 8 cant be pinned to the taskbar.
2013/7/24 SSTSylvain s...@videotron.ca Bug 67257 - LibreOfficeCalc inside Windows 8 cant be pinned to the taskbar. Found inside LibreOffice Windows version 4.04 and upper. http://nabble.documentfoundation.org/file/n4067041/LibreOfficeCalcInsideWindows8CantBePinned.jpg You'd be happy to know that we are currently working on this. The target release is 4.1.1. -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/win32 framework/source scp2/source vcl/inc vcl/Library_vcl.mk vcl/win
desktop/win32/source/applauncher/launcher.cxx | 39
framework/source/helper/titlebarupdate.cxx| 32 +++-
scp2/source/base/registryitem_base.scp|2 -
scp2/source/calc/registryitem_calc.scp|8 ++--
scp2/source/draw/registryitem_draw.scp|8 ++--
scp2/source/impress/registryitem_impress.scp |8 ++--
scp2/source/math/registryitem_math.scp|4 +-
scp2/source/writer/registryitem_writer.scp| 14 +++
vcl/Library_vcl.mk|1
vcl/inc/win/salframe.h|7 ++-
vcl/win/source/window/salframe.cxx| 49 +-
11 files changed, 105 insertions(+), 67 deletions(-)
New commits:
commit f7d410edfa0866bd7759b2b977800d5744d8b544
Author: Jesús Corrius jcorr...@gmail.com
Date: Sat Jul 20 17:10:43 2013 +0200
fdo#35785 LibreOffice's support of recent documents in Windows 7 broken
Change-Id: I916ba1335b0a0420f568ab9340632f273e3c9516
Reviewed-on: https://gerrit.libreoffice.org/4997
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 19f3d9310caef84fe2815eb89af448a81937bddd)
Shell32.dll is already loaded
Since the vcllo.dll links already the shell32.dll because of its symbol
SHAddToRecentDocs, no need to increase reference of that library. Just
get the module handle.
Moreover, a mere presence of the symbol SHGetPropertyStoreForWindow in
shell32.dll indicates that we are running at least on Windows 7 or Windows
Server 2008 R2. There is thus no need to check for the library version.
Change-Id: I9ddfb8407fd805faf588779ac5fa8c10a0ae8898
Reviewed-on: https://gerrit.libreoffice.org/5016
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 50d330c3d238b7b6182787959b30a6d665eab078)
Reviewed-on: https://gerrit.libreoffice.org/5024
Reviewed-by: Jesús Corrius jcorr...@gmail.com
Reviewed-by: Tor Lillqvist t...@iki.fi
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/desktop/win32/source/applauncher/launcher.cxx
b/desktop/win32/source/applauncher/launcher.cxx
index c6a40d3..b0f031a 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -34,51 +34,12 @@
#include stdlib.h
#include malloc.h
-#define PACKVERSION(major,minor) MAKELONG(minor,major)
-#define APPUSERMODELID LTheDocumentFoundation.LibreOffice
-
-
#ifdef __MINGW32__
extern C int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
#else
extern C int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
#endif
{
-// Set an explicit Application User Model ID for the process
-
-WCHAR szShell32[MAX_PATH];
-GetSystemDirectoryW(szShell32, MAX_PATH);
-wcscat(szShell32, L\\Shell32.dll);
-
-HINSTANCE hinstDll = LoadLibraryW(szShell32);
-
-if(hinstDll)
-{
-DLLVERSIONINFO dvi;
-ZeroMemory(dvi, sizeof(dvi));
-dvi.cbSize = sizeof(dvi);
-
-DLLGETVERSIONPROC pDllGetVersion;
-pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hinstDll,
DllGetVersion);
-HRESULT hr = (*pDllGetVersion)(dvi);
-
-if(SUCCEEDED(hr))
-{
-DWORD dwVersion = PACKVERSION(dvi.dwMajorVersion,
dvi.dwMinorVersion);
-if(dwVersion = PACKVERSION(6,1)) // Shell32 version in Windows 7
-{
-typedef HRESULT (WINAPI
*SETCURRENTPROCESSEXPLICITAPPUSERMODELID)(PCWSTR);
-SETCURRENTPROCESSEXPLICITAPPUSERMODELID
pSetCurrentProcessExplicitAppUserModelID;
-pSetCurrentProcessExplicitAppUserModelID =
-
(SETCURRENTPROCESSEXPLICITAPPUSERMODELID)GetProcAddress(hinstDll,
SetCurrentProcessExplicitAppUserModelID);
-
-if(pSetCurrentProcessExplicitAppUserModelID)
-(*pSetCurrentProcessExplicitAppUserModelID)
(APPUSERMODELID);
-}
-}
-}
-FreeLibrary(hinstDll);
-
// Retreive startup info
STARTUPINFO aStartupInfo;
diff --git a/framework/source/helper/titlebarupdate.cxx
b/framework/source/helper/titlebarupdate.cxx
index ddf55b7..9b81249 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -172,7 +172,7 @@ void TitleBarUpdate::impl_updateApplicationID(const
css::uno::Reference css::fr
OUString aModuleId = xModuleManager-identify(xFrame);
OUString sDesktopName;
-
+#if defined(UNX) !defined(MACOSX)
if (
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.TextDocument))
||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.GlobalDocument))
||
[Libreoffice-commits] core.git: desktop/win32 framework/source scp2/source vcl/inc vcl/Library_vcl.mk vcl/win
desktop/win32/source/applauncher/launcher.cxx | 39 -
framework/source/helper/titlebarupdate.cxx| 32 ++-
scp2/source/base/registryitem_base.scp|2
scp2/source/calc/registryitem_calc.scp|8 +-
scp2/source/draw/registryitem_draw.scp|8 +-
scp2/source/impress/registryitem_impress.scp |8 +-
scp2/source/math/registryitem_math.scp|4 -
scp2/source/writer/registryitem_writer.scp| 14 ++--
vcl/Library_vcl.mk|1
vcl/inc/win/salframe.h|7 +-
vcl/win/source/window/salframe.cxx| 75 +-
11 files changed, 131 insertions(+), 67 deletions(-)
New commits:
commit 19f3d9310caef84fe2815eb89af448a81937bddd
Author: Jesús Corrius jcorr...@gmail.com
Date: Sat Jul 20 17:10:43 2013 +0200
fdo#35785 LibreOffice's support of recent documents in Windows 7 broken
Change-Id: I916ba1335b0a0420f568ab9340632f273e3c9516
Reviewed-on: https://gerrit.libreoffice.org/4997
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/desktop/win32/source/applauncher/launcher.cxx
b/desktop/win32/source/applauncher/launcher.cxx
index c6a40d3..b0f031a 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -34,51 +34,12 @@
#include stdlib.h
#include malloc.h
-#define PACKVERSION(major,minor) MAKELONG(minor,major)
-#define APPUSERMODELID LTheDocumentFoundation.LibreOffice
-
-
#ifdef __MINGW32__
extern C int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
#else
extern C int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
#endif
{
-// Set an explicit Application User Model ID for the process
-
-WCHAR szShell32[MAX_PATH];
-GetSystemDirectoryW(szShell32, MAX_PATH);
-wcscat(szShell32, L\\Shell32.dll);
-
-HINSTANCE hinstDll = LoadLibraryW(szShell32);
-
-if(hinstDll)
-{
-DLLVERSIONINFO dvi;
-ZeroMemory(dvi, sizeof(dvi));
-dvi.cbSize = sizeof(dvi);
-
-DLLGETVERSIONPROC pDllGetVersion;
-pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hinstDll,
DllGetVersion);
-HRESULT hr = (*pDllGetVersion)(dvi);
-
-if(SUCCEEDED(hr))
-{
-DWORD dwVersion = PACKVERSION(dvi.dwMajorVersion,
dvi.dwMinorVersion);
-if(dwVersion = PACKVERSION(6,1)) // Shell32 version in Windows 7
-{
-typedef HRESULT (WINAPI
*SETCURRENTPROCESSEXPLICITAPPUSERMODELID)(PCWSTR);
-SETCURRENTPROCESSEXPLICITAPPUSERMODELID
pSetCurrentProcessExplicitAppUserModelID;
-pSetCurrentProcessExplicitAppUserModelID =
-
(SETCURRENTPROCESSEXPLICITAPPUSERMODELID)GetProcAddress(hinstDll,
SetCurrentProcessExplicitAppUserModelID);
-
-if(pSetCurrentProcessExplicitAppUserModelID)
-(*pSetCurrentProcessExplicitAppUserModelID)
(APPUSERMODELID);
-}
-}
-}
-FreeLibrary(hinstDll);
-
// Retreive startup info
STARTUPINFO aStartupInfo;
diff --git a/framework/source/helper/titlebarupdate.cxx
b/framework/source/helper/titlebarupdate.cxx
index 6833933..f5506a1 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -172,7 +172,7 @@ void TitleBarUpdate::impl_updateApplicationID(const
css::uno::Reference css::fr
OUString aModuleId = xModuleManager-identify(xFrame);
OUString sDesktopName;
-
+#if defined(UNX) !defined(MACOSX)
if (
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.TextDocument))
||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.GlobalDocument))
||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.WebDocument))
||
@@ -198,6 +198,34 @@ void TitleBarUpdate::impl_updateApplicationID(const
css::uno::Reference css::fr
sApplicationID =
utl::ConfigManager::getProductName().toAsciiLowerCase();
sApplicationID += OUString(sal_Unicode('-'));
sApplicationID += sDesktopName;
+#elif defined(WNT)
+if (
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.TextDocument))
||
+
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.GlobalDocument))
||
+
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.WebDocument))
||
+
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.xforms.XMLFormDocument))
)
+sDesktopName = OUString(Writer);
+else if ( aModuleId == com.sun.star.sheet.SpreadsheetDocument )
+sDesktopName = OUString(Calc);
+else if ( aModuleId ==
com.sun.star.presentation.PresentationDocument )
+sDesktopName = OUString(Impress);
+else
Re: Publishing the MySQL Connector
I downloaded extension with Jesus Corrius url. Download is OK. Installation under Win 7 32bits with LO 4.0 and LO 4.1.0 beta1 is OK. Extension works correctly. I can download the connector from the extensions site without any problem. But there are some people still complaining that downloading it doesn't work. -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/win32
desktop/win32/source/applauncher/launcher.cxx | 40 +-
1 file changed, 39 insertions(+), 1 deletion(-)
New commits:
commit 6c670f63a7859e24bdfa20759bd8b7c3b4a911ef
Author: Jesús Corrius jcorr...@gmail.com
Date: Sat Apr 27 20:11:25 2013 +0200
fdo#35785: don't rely on the old apps fallback mechanism to fix this bug
Change-Id: Id0967358956868538f7563c51f7ed5e106771302
Reviewed-on: https://gerrit.libreoffice.org/3639
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/desktop/win32/source/applauncher/launcher.cxx
b/desktop/win32/source/applauncher/launcher.cxx
index 0edcdbf..c6a40d3 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -34,6 +34,9 @@
#include stdlib.h
#include malloc.h
+#define PACKVERSION(major,minor) MAKELONG(minor,major)
+#define APPUSERMODELID LTheDocumentFoundation.LibreOffice
+
#ifdef __MINGW32__
extern C int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
@@ -41,7 +44,42 @@ extern C int APIENTRY WinMain( HINSTANCE, HINSTANCE,
LPSTR, int )
extern C int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
#endif
{
-// Retrieve startup info
+// Set an explicit Application User Model ID for the process
+
+WCHAR szShell32[MAX_PATH];
+GetSystemDirectoryW(szShell32, MAX_PATH);
+wcscat(szShell32, L\\Shell32.dll);
+
+HINSTANCE hinstDll = LoadLibraryW(szShell32);
+
+if(hinstDll)
+{
+DLLVERSIONINFO dvi;
+ZeroMemory(dvi, sizeof(dvi));
+dvi.cbSize = sizeof(dvi);
+
+DLLGETVERSIONPROC pDllGetVersion;
+pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hinstDll,
DllGetVersion);
+HRESULT hr = (*pDllGetVersion)(dvi);
+
+if(SUCCEEDED(hr))
+{
+DWORD dwVersion = PACKVERSION(dvi.dwMajorVersion,
dvi.dwMinorVersion);
+if(dwVersion = PACKVERSION(6,1)) // Shell32 version in Windows 7
+{
+typedef HRESULT (WINAPI
*SETCURRENTPROCESSEXPLICITAPPUSERMODELID)(PCWSTR);
+SETCURRENTPROCESSEXPLICITAPPUSERMODELID
pSetCurrentProcessExplicitAppUserModelID;
+pSetCurrentProcessExplicitAppUserModelID =
+
(SETCURRENTPROCESSEXPLICITAPPUSERMODELID)GetProcAddress(hinstDll,
SetCurrentProcessExplicitAppUserModelID);
+
+if(pSetCurrentProcessExplicitAppUserModelID)
+(*pSetCurrentProcessExplicitAppUserModelID)
(APPUSERMODELID);
+}
+}
+}
+FreeLibrary(hinstDll);
+
+// Retreive startup info
STARTUPINFO aStartupInfo;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice is one or several applications?
Hi guys, Right now LibreOffice works as a single application on Windows 7 and higher. That means the system doesn't know and/or care if you are creating a spreadsheet or a presentation, you are just running LibreOffice all the time. Identifying the different components of LibreOffice as different applications has its advantages. For example: 1. Now all the LibreOffice windows are grouped together in the Windows task bar. With different applications you could have the windows grouped by component: 3 calc windows, 1 writer window and 2 impress windows. 2. With different applications you could have specific features for each component when they are docked in the taskbar. Right click on Impress icon - Create new presentation. Right click on Calc icon - Create new spreadsheet, etc. 3. With different application you could have recent files per component on the Windows 7 start menu. So for example, under the Writer icon, you'll find only the recent Writer documents. The main advantages of keeping LibreOffice as a single application is that we don't have to do anything (well, except a couple of commits waiting for review on gerrit ;)) which at the time were necessary to make all StarOffice derivatives play nice together on Windows. Many of the bits necessary to make this separation possible are already in the source code, but it's not complete. The main remaining things are: 1. Add extended attributes (KindMap related) to the launcher icons during installation. 2. Change the thread Application User Model ID when launching a new component from inside LibO. 3. Update the taskbar icon when launching a new component from inside LibO. 4. Send the recent saved / opened document to the proper Application User Model ID in the filepicker. In any case, the important question here is: Should LibreOffice remain a single application on Windows or act as different applications?. As you can see, the user experience on Windows can change quite a lot. Thanks for reading. Cheers, -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice is one or several applications?
On Mon, Apr 29, 2013 at 10:55 AM, Tor Lillqvist t...@iki.fi wrote: As long as we have just one soffice.bin process running at a time anyway, I think we should move in the direction of making it clear to the user, too, that LibreOffice is one application and not several. At least on Windows, IMHO, the user experience is better if we pretend that are several applications instead of one. The advantages are the ones mentioned in my previous email. Besides, this is what Microsoft Office does... (not sure if this argument will convince anyone here ;)) -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice is one or several applications?
On Mon, Apr 29, 2013 at 2:10 PM, Stephan Bergmann sberg...@redhat.comwrote: On 04/29/2013 10:31 AM, Jesús Corrius wrote: 2. Change the thread Application User Model ID when launching a new component from inside LibO. Keeping track of per-thread AppUserModelIDs might be tricky (e.g., for remote UNO access), but documentation like http://msdn.microsoft.com/en-* *us/library/windows/desktop/**dd378459%28v=vs.85%29.aspxhttp://msdn.microsoft.com/en-us/library/windows/desktop/dd378459%28v=vs.85%29.aspx Application User Model IDs (AppUserModelIDs) makes it look like any per-process setting is overridden per-window rather than per-thread anyway? I found setting the System.AppUserModel.ID property of the application's shortcut file not necessary provided that the file types are correctly mapped in the registry (we already have so) and the launcher sets the AppUserModelID during startup (I removed the code on Friday but it will be back soon). If we set different IDs per launcher (as it is currently in 4.0.x), everything seems to work perfectly fine if you launch the documents by double clicking in the Windows Explorer icon (you have the recent documents without calling SHAddToRecentDocs and you have a Jump List menu -- I don't like to call it Jump list in the case because it's just the one provided by Windows, that is we don't really provide one, but i may be a little bit picky here). On the other side, if you then open --double click-- a new document (suppose you open a new spreadsheet and you have a write document already open) the window grouping doesn't work, although the AppUserModelID is set correctly by the launcher. Also the icon on the task bar is not the one of a calc document, but just a plain LibreOffice icon. So during application startup (i.e launcher) we call SetCurrentProcessExplicitAppUserModelID(TheDocumentFoundation.LibreOffice) provided that the Shell32.dll version is equal or higher than 6.1. I guess if we wanted to have separate applications we could call SHGetPropertyStoreForWindow for each different app window and set the AppUserModelID, for example, to TheDocumentFoundation.LibreOffice.Writer. This would make setting a different ID in the launchers unnecessary, although we could need them there to personalize the Jump List menu. Also then we should call SHAddToRecentDocs explicitly. But we could do the trick to not prevent the file dialog to call it, in this way all the documents would be added to the TheDocumentFoundation.LibreOffice one and also to the TheDocumentFoundation.LibreOffice.Writer one. In this way, the start center, associated only with the main ID could act as a place to store *all* recent documents, while the writer shortcut could only store the list of recent writer documents. -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/win32
desktop/win32/source/applauncher/launcher.cxx | 37 --
desktop/win32/source/applauncher/launcher.hxx |1
desktop/win32/source/applauncher/sbase.cxx|2 -
desktop/win32/source/applauncher/scalc.cxx|2 -
desktop/win32/source/applauncher/sdraw.cxx|2 -
desktop/win32/source/applauncher/simpress.cxx |2 -
desktop/win32/source/applauncher/smath.cxx|2 -
desktop/win32/source/applauncher/sweb.cxx |2 -
desktop/win32/source/applauncher/swriter.cxx |2 -
9 files changed, 52 deletions(-)
New commits:
commit 64dafbe584fe7644ec29b96b6a9a9588ba4619bd
Author: Jesús Corrius jcorr...@gmail.com
Date: Fri Apr 26 14:17:56 2013 +0200
Fix fdo#35785: recent documents feature of the Windows 7 Start menu broken
Change-Id: I61cffeaf661db7e7b8f642bbbd9457203f75cb9a
Reviewed-on: https://gerrit.libreoffice.org/3623
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/desktop/win32/source/applauncher/launcher.cxx
b/desktop/win32/source/applauncher/launcher.cxx
index d72d7dd..0edcdbf 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -34,8 +34,6 @@
#include stdlib.h
#include malloc.h
-#define PACKVERSION(major,minor) MAKELONG(minor,major)
-
#ifdef __MINGW32__
extern C int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
@@ -43,41 +41,6 @@ extern C int APIENTRY WinMain( HINSTANCE, HINSTANCE,
LPSTR, int )
extern C int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
#endif
{
-// Set an explicit Application User Model ID for the process
-
-WCHAR szShell32[MAX_PATH];
-GetSystemDirectoryW(szShell32, MAX_PATH);
-wcscat(szShell32, L\\Shell32.dll);
-
-HINSTANCE hinstDll = LoadLibraryW(szShell32);
-
-if(hinstDll)
-{
-DLLVERSIONINFO dvi;
-ZeroMemory(dvi, sizeof(dvi));
-dvi.cbSize = sizeof(dvi);
-
-DLLGETVERSIONPROC pDllGetVersion;
-pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hinstDll,
DllGetVersion);
-HRESULT hr = (*pDllGetVersion)(dvi);
-
-if(SUCCEEDED(hr))
-{
-DWORD dwVersion = PACKVERSION(dvi.dwMajorVersion,
dvi.dwMinorVersion);
-if(dwVersion = PACKVERSION(6,1)) // Shell32 version in Windows 7
-{
-typedef HRESULT (WINAPI
*SETCURRENTPROCESSEXPLICITAPPUSERMODELID)(PCWSTR);
-SETCURRENTPROCESSEXPLICITAPPUSERMODELID
pSetCurrentProcessExplicitAppUserModelID;
-pSetCurrentProcessExplicitAppUserModelID =
-
(SETCURRENTPROCESSEXPLICITAPPUSERMODELID)GetProcAddress(hinstDll,
SetCurrentProcessExplicitAppUserModelID);
-
-if(pSetCurrentProcessExplicitAppUserModelID)
-(*pSetCurrentProcessExplicitAppUserModelID)
(APPUSERMODELID);
-}
-}
-}
-FreeLibrary(hinstDll);
-
// Retrieve startup info
STARTUPINFO aStartupInfo;
diff --git a/desktop/win32/source/applauncher/launcher.hxx
b/desktop/win32/source/applauncher/launcher.hxx
index a937c8f..1ea51cf 100644
--- a/desktop/win32/source/applauncher/launcher.hxx
+++ b/desktop/win32/source/applauncher/launcher.hxx
@@ -43,6 +43,5 @@
#define OFFICE_IMAGE_NAME _T(soffice)
extern _TCHAR APPLICATION_SWITCH[];
-extern LPCWSTR APPUSERMODELID;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/sbase.cxx
b/desktop/win32/source/applauncher/sbase.cxx
index 4b51080..e6123a6 100644
--- a/desktop/win32/source/applauncher/sbase.cxx
+++ b/desktop/win32/source/applauncher/sbase.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( --base );
-LPCWSTR APPUSERMODELID = LTheDocumentFoundation.LibreOffice.Base;
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/scalc.cxx
b/desktop/win32/source/applauncher/scalc.cxx
index 356c719..4d11124 100644
--- a/desktop/win32/source/applauncher/scalc.cxx
+++ b/desktop/win32/source/applauncher/scalc.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( --calc );
-LPCWSTR APPUSERMODELID = LTheDocumentFoundation.LibreOffice.Calc;
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/sdraw.cxx
b/desktop/win32/source/applauncher/sdraw.cxx
index 8202f3a..57112523 100644
--- a/desktop/win32/source/applauncher/sdraw.cxx
+++ b/desktop/win32/source/applauncher/sdraw.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( --draw );
-LPCWSTR APPUSERMODELID = LTheDocumentFoundation.LibreOffice.Draw;
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/simpress.cxx
b/desktop/win32/source/applauncher/simpress.cxx
index 35b828f..53a0dcc 100644
--- a/desktop/win32/source/applauncher/simpress.cxx
+++ b/desktop/win32/source/applauncher/simpress.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[]
