[Libreoffice-commits] core.git: 8 commits - bin/get-bugzilla-attachments-by-mimetype connectivity/source idl/inc idl/source sc/source solenv/gbuild svl/source vcl/source vcl/win
Michael Stahl
mstahl at redhat.com
Sun Nov 10 00:08:43 CET 2013
bin/get-bugzilla-attachments-by-mimetype | 133 ++++++++++++++-----------
connectivity/source/inc/odbc/OFunctiondefs.hxx | 50 ---------
idl/inc/globals.hxx | 3
idl/source/prj/svidl.cxx | 4
sc/source/ui/docshell/docfunc.cxx | 5
solenv/gbuild/Gallery.mk | 8 +
solenv/gbuild/HelpTarget.mk | 23 ++++
solenv/gbuild/SdiTarget.mk | 5
svl/source/svdde/ddeimp.hxx | 18 ---
svl/source/svdde/ddeinf.cxx | 10 -
svl/source/svdde/ddesvr.cxx | 6 -
vcl/source/filter/jpeg/jpeg.h | 4
vcl/source/window/splitwin.cxx | 2
vcl/win/source/app/salshl.cxx | 8 -
14 files changed, 110 insertions(+), 169 deletions(-)
New commits:
commit 45beff50c9e6c9358080c7a81234c6d98bbd7fac
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Nov 9 23:31:31 2013 +0100
get-bugzilla-attachments-by-mimetype: fix the lanuchpadlib mess
Apparently somebody found it a good idea to remove the getBugTasks()
method. Also the darn thing won't run on Python 3. So apparently it's
mostly unmaintained, except that functions that we need are removed.
For future reference: it can be installed on non-Ubuntu systems by:
pip install -v --user launchpadlib
Change-Id: Ib7b0a46011dffcfe091f5bb73ed19b9dc311046c
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 994e083..e3fb177 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -179,7 +179,7 @@ def get_launchpad_bugs(prefix):
#since searching bugs having attachments with specific mimetypes is not available in launchpad API
#we're iterating over all bugs of the libreoffice source package
libo = ubuntu.getSourcePackage(name="libreoffice")
- libobugs = libo.getBugTasks()
+ libobugs = libo.searchTasks()
for bugtask in libobugs:
bug = bugtask.bug
commit 4855946a5e40747a4ccecf17ba80c8bdbdd8c969
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Nov 9 23:30:55 2013 +0100
get-bugzilla-attachments-by-mimetype: make this run on Python 3
Change-Id: I27cf30c62122ea191c852a1a298a40ef64d35ba9
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 100e78e..994e083 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -18,13 +18,19 @@
#
#where X is the n'th attachment of that type in the bug
-import urllib
import feedparser
import base64
import re
import os, os.path
import sys
-import xmlrpclib
+try:
+ from urllib.request import urlopen
+except:
+ from urllib import urlopen
+try:
+ import xmlrpc.client as xmlrpclib
+except:
+ import xmlrpclib
from xml.dom import minidom
from xml.sax.saxutils import escape
@@ -32,7 +38,7 @@ def urlopen_retry(url):
maxretries = 3
for i in range(maxretries + 1):
try:
- return urllib.urlopen(url)
+ return urlopen(url)
except IOError as e:
print("caught IOError: " + e)
if maxretries == i:
@@ -67,7 +73,7 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
download = suffix + '/' +prefix + id + '-' + str(attachmentid) + '.' + suffix
print('downloading as ' + download)
- f = open(download, 'w')
+ f = open(download, 'wb')
f.write(base64.b64decode(node.firstChild.nodeValue))
f.close()
break
@@ -98,7 +104,11 @@ def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
continue
print(" mimetype is")
- remoteMime = handle.info().gettype()
+ info = handle.info()
+ if info.get_content_type:
+ remoteMime = info.get_content_type()
+ else:
+ remoteMime = info.gettype()
print(remoteMime)
if remoteMime != mimetype:
print("skipping")
@@ -106,12 +116,16 @@ def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
download = suffix + '/' + prefix + id + '-' + str(attachmentid) + '.' + suffix
print('downloading as ' + download)
- f = open(download, 'w')
+ f = open(download, 'wb')
f.write(handle.read())
f.close()
def get_through_rpc_query(rpcurl, showurl, mimetype, prefix, suffix):
try:
+ os.mkdir(suffix)
+ except:
+ pass
+ try:
proxy = xmlrpclib.ServerProxy(rpcurl)
query = dict()
query['column_list']='bug_id'
@@ -144,6 +158,8 @@ def get_through_rss_query_url(url, mimetype, prefix, suffix):
for entry in d['entries']:
try:
get_bug_function(entry['id'], mimetype, prefix, suffix)
+ except KeyboardInterrupt:
+ raise # Ctrl+C should work
except:
print(entry['id'] + " failed: " + sys.exc_info()[0])
pass
commit 1b82dba6f7c11eeb48dae690052ec56ef37f41e4
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Nov 9 22:05:23 2013 +0100
get-bugzilla-attachments-by-mimetype: port to Python 3 syntax
Change-Id: I928eb1baa7390301036585d84895f44eb4c38d20
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 5c3de39..100e78e 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -34,39 +34,39 @@ def urlopen_retry(url):
try:
return urllib.urlopen(url)
except IOError as e:
- print "caught IOError: ", e
+ print("caught IOError: " + e)
if maxretries == i:
raise
- print "retrying..."
+ print("retrying...")
def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
id = url.rsplit('=', 2)[1]
- print "id is", prefix, id, suffix
+ print("id is " + prefix + id + " " + suffix)
if os.path.isfile(suffix + '/' + prefix + id + '-1.' + suffix):
- print "assuming", id, "is up to date"
+ print("assuming " + id + " is up to date")
else:
- print "parsing", id
+ print("parsing", id)
sock = urlopen_retry(url+"&ctype=xml")
dom = minidom.parse(sock)
sock.close()
attachmentid=0
for attachment in dom.getElementsByTagName('attachment'):
attachmentid += 1
- print " mimetype is",
+ print(" mimetype is")
for node in attachment.childNodes:
if node.nodeName == 'type':
- print node.firstChild.nodeValue,
+ print(node.firstChild.nodeValue)
if node.firstChild.nodeValue.lower() != mimetype.lower():
- print 'skipping'
+ print('skipping')
break
elif node.nodeName == 'data':
# check if attachment is deleted (i.e. https://bugs.kde.org/show_bug.cgi?id=53343&ctype=xml)
if not node.firstChild:
- print 'deleted attachment, skipping'
+ print('deleted attachment, skipping')
continue
download = suffix + '/' +prefix + id + '-' + str(attachmentid) + '.' + suffix
- print 'downloading as', download
+ print('downloading as ' + download)
f = open(download, 'w')
f.write(base64.b64decode(node.firstChild.nodeValue))
f.close()
@@ -74,11 +74,11 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
id = url.rsplit('=', 2)[1]
- print "id is", prefix, id, suffix
+ print("id is " + prefix + id + " " + suffix)
if os.path.isfile(suffix + '/' + prefix + id + '-1.' + suffix):
- print "assuming", id, "is up to date"
+ print("assuming " + id + " is up to date")
else:
- print "parsing", id
+ print("parsing " + id)
sock = urlopen_retry(url+"&ctype=xml")
dom = minidom.parse(sock)
sock.close()
@@ -94,18 +94,18 @@ def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
realAttachmentId = match.group(1)
handle = urlopen_retry(novellattach + realAttachmentId)
if not handle:
- print "attachment %s is not accessible", realAttachmentId
- continue
- print " mimetype is",
+ print("attachment %s is not accessible" % realAttachmentId)
+ continue
+ print(" mimetype is")
remoteMime = handle.info().gettype()
- print remoteMime,
+ print(remoteMime)
if remoteMime != mimetype:
- print "skipping"
+ print("skipping")
continue
download = suffix + '/' + prefix + id + '-' + str(attachmentid) + '.' + suffix
- print 'downloading as', download
+ print('downloading as ' + download)
f = open(download, 'w')
f.write(handle.read())
f.close()
@@ -121,14 +121,14 @@ def get_through_rpc_query(rpcurl, showurl, mimetype, prefix, suffix):
query['value0-0-0']=mimetype
result = proxy.Bug.search(query)
bugs = result['bugs']
- print len(bugs), 'bugs to process'
+ print(str(len(bugs)) + ' bugs to process')
for bug in bugs:
url = showurl + str(bug['id'])
get_from_bug_url_via_xml(url, mimetype, prefix, suffix)
- except xmlrpclib.Fault, err:
- print "A fault occurred"
- print "Fault code: %s" % err.faultCode
- print err.faultString
+ except xmlrpclib.Fault as err:
+ print("A fault occurred")
+ print("Fault code: %s" % err.faultCode)
+ print(err.faultString)
def get_through_rss_query_url(url, mimetype, prefix, suffix):
try:
@@ -145,12 +145,12 @@ def get_through_rss_query_url(url, mimetype, prefix, suffix):
try:
get_bug_function(entry['id'], mimetype, prefix, suffix)
except:
- print entry['id'], "failed:", sys.exc_info()[0]
+ print(entry['id'] + " failed: " + sys.exc_info()[0])
pass
def get_through_rss_query(queryurl, mimetype, prefix, suffix):
url = queryurl + '?query_format=advanced&field0-0-0=attachments.mimetype&type0-0-0=equals&value0-0-0=' + escape(mimetype) + '&ctype=rss'
- print 'url is', url
+ print('url is ' + url)
get_through_rss_query_url(url, mimetype, prefix, suffix)
def get_launchpad_bugs(prefix):
@@ -168,7 +168,7 @@ def get_launchpad_bugs(prefix):
for bugtask in libobugs:
bug = bugtask.bug
id = str(bug.id)
- print "parsing ", id, "status:", bugtask.status, "title:", bug.title[:50]
+ print("parsing " + id + " status: " + bugtask.status + " title: " + bug.title[:50])
attachmentid = 0
for attachment in bug.attachments:
attachmentid += 1
@@ -187,10 +187,10 @@ def get_launchpad_bugs(prefix):
download = suffix + '/' + prefix + id + '-' + str(attachmentid) + '.' + suffix
if os.path.isfile(download):
- print "assuming", id, "is up to date"
+ print("assuming " + id + " is up to date")
break
- print 'mimetype is', handle.content_type, 'downloading as', download
+ print('mimetype is ' + handle.content_type + ' downloading as ' + download)
f = open(download, "w")
f.write(handle.read())
@@ -356,6 +356,6 @@ for (mimetype,extension) in mimetypes.items():
try:
get_launchpad_bugs("lp")
except ImportError:
- print "launchpadlib unavailable, skipping Ubuntu tracker"
+ print("launchpadlib unavailable, skipping Ubuntu tracker")
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 5c6e934b839a8b1462ecca4c687e263c85c4224b
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Nov 9 18:46:26 2013 +0100
get-bugzilla-attachments-by-mimetype: IANA has 2 mime-types for WPD
... on https://www.iana.org/assignments/media-types/application
Also fix up the common_noncore_mimetypes while there.
Change-Id: I66eb74b0906a10893a771b7136b5f6ebda938ee6
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 9392884..5c3de39 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -275,6 +275,7 @@ mimetypes = {
'application/vnd.lotus-wordpro': 'lwp',
'application/vnd.lotus-1-2-3': 'wks',
'application/vnd.wordperfect': 'wpd',
+ 'application/wordperfect5.1': 'wpd',
'application/vnd.ms-works': 'wps',
'application/x-hwp': 'hwp',
'application/x-aportisdoc': 'pdb',
@@ -308,28 +309,28 @@ mimetypes = {
}
# disabled for now, this would download gigs of pngs/jpegs...
-common_noncore_mimetypes = [
+common_noncore_mimetypes = {
# graphics
- ('image/svg+xml', 'svg'),
- ('image/x-MS-bmp', 'bmp'),
- ('image/x-wpg', 'wpg'),
- ('image/x-eps', 'eps'),
- ('image/x-met', 'met'),
- ('image/x-portable-bitmap', 'pbm'),
- ('image/x-photo-cd', 'pcd'),
- ('image/x-pcx', 'pcx'),
- ('image/x-portable-graymap', 'pgm'),
- ('image/x-portable-pixmap', 'ppm'),
- ('image/vnd.adobe.photoshop', 'psd'),
- ('image/x-cmu-raster', 'ras'),
- ('image/x-xbitmap', 'xbm'),
- ('image/x-xpixmap', 'xpm'),
- ('image/gif', 'gif'),
- ('image/jpeg', 'jpeg'),
- ('image/png', 'png'),
+ 'image/svg+xml': 'svg',
+ 'image/x-MS-bmp': 'bmp',
+ 'image/x-wpg': 'wpg',
+ 'image/x-eps': 'eps',
+ 'image/x-met': 'met',
+ 'image/x-portable-bitmap': 'pbm',
+ 'image/x-photo-cd': 'pcd',
+ 'image/x-pcx': 'pcx',
+ 'image/x-portable-graymap': 'pgm',
+ 'image/x-portable-pixmap': 'ppm',
+ 'image/vnd.adobe.photoshop': 'psd',
+ 'image/x-cmu-raster': 'ras',
+ 'image/x-xbitmap': 'xbm',
+ 'image/x-xpixmap': 'xpm',
+ 'image/gif': 'gif',
+ 'image/jpeg': 'jpeg',
+ 'image/png': 'png',
# pdf, etc.
- ('application/pdf', 'pdf'),
-]
+ 'application/pdf': 'pdf',
+}
for (mimetype,extension) in mimetypes.items():
get_through_rss_query(freedesktop, mimetype, "fdo", extension)
commit f35b3fea46532ffc54e9026e7a953f64493e7525
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Nov 9 20:16:47 2013 +0100
clean up #ifdef ICC code
According to the dmake documentation, ICC refers to Visual Age C++ for
OS/2, which is not a supported compiler (or platform).
Change-Id: Ic9e23bc7c44de110a3a312bd007beda3b660927d
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 87f4d54..0af1d26 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -52,56 +52,6 @@
//--------------------------------------------------------------------------
-#ifdef OS2__00
-
-#ifdef ODBCIMP
-
-// Stub version: dynamic binding to the DLL at runtime.
-// odbcstub defines the NSQL... methods used in the sources
-// as indirect function calls.
-// odbcimp uses preos2, odbc and postos2 itself.
-// #include "odbc3imp.hxx"
-
-#else
-
-// Currently, we directly use the ODBC DLL from Watcom SQL (via the supplied lib)
-
-#ifndef ODBC_OS2
-#define ODBC_OS2
-#endif
-
-#include <svpm.h>
-#include <odbc.h>
-#define SQL_API __syscall
-#ifndef SQL_MAX_MESSAGE_LENGTH
-#define SQL_MAX_MESSAGE_LENGTH MAX_MESSAGE_LENGTH
-#endif
-#ifndef SQL_MAX_DSN_LENGTH
-#define SQL_MAX_DSN_LENGTH MAX_DSN_LENGTH
-#endif
-#ifndef SQL_AUTOCOMMIT_ON
-#define SQL_AUTOCOMMIT_ON 1UL
-#endif
-#ifndef SQL_AUTOCOMMIT_OFF
-#define SQL_AUTOCOMMIT_OFF 0UL
-#endif
-
-#define SQL_FETCH_PRIOR SQL_FETCH_PREV
-#define SQL_NO_TOTAL (-4)
-
-#endif
-
-// The ODBC.h from Watcom expects char*, not UCHAR* usually used with ODBC
-#if defined( ICC )
-#define SDB_ODBC_CHAR unsigned char
-#else
-#define SDB_ODBC_CHAR char
-#endif
-
-#endif
-
-//--------------------------------------------------------------------------
-
#ifdef UNX
// Currently, we directly use the ODBC shared library from Q+E (via the supplied lib)
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index d743d10..eb1c989 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -22,9 +22,6 @@
#include <hash.hxx>
-#ifdef ICC
-#undef _Export
-#endif
class SvClassManager;
struct SvGlobalHashNames
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 3971415..0d8782b 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -321,10 +321,6 @@ int main ( int argc, char ** argv)
{
if( !aCommand.aTargetFile.isEmpty() )
{
-#ifdef ICC
- DirEntry aT(aCommand.aTargetFile);
- aT.Kill();
-#endif
// stamp file, because idl passed through correctly
SvFileStream aOutStm( aCommand.aTargetFile,
STREAM_READWRITE | STREAM_TRUNC );
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 0c7e82b..b7b7621 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -5115,13 +5115,8 @@ sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi )
if (!r.HasType(RT_DATABASE) && !pLocalList->findByUpperName(itr->first))
ppSortArray[j++] = &r;
}
-#ifndef ICC
qsort( (void*)ppSortArray, nValidCount, sizeof(ScRangeData*),
&ScRangeData_QsortNameCompare );
-#else
- qsort( (void*)ppSortArray, nValidCount, sizeof(ScRangeData*),
- ICCQsortNameCompare );
-#endif
OUString aName;
OUStringBuffer aContent;
OUString aFormula;
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index d39988c..bf31a1e 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -48,30 +48,12 @@ typedef ::std::vector< Conversation* > ConvList;
class DdeInternal
{
public:
-#ifdef WNT
static HDDEDATA CALLBACK CliCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
static HDDEDATA CALLBACK SvrCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
static HDDEDATA CALLBACK InfCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
-#else
-#if defined( ICC )
- static HDDEDATA CALLBACK CliCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
- static HDDEDATA CALLBACK SvrCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
- static HDDEDATA CALLBACK InfCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
-#else
- static HDDEDATA CALLBACK _export CliCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
- static HDDEDATA CALLBACK _export SvrCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
- static HDDEDATA CALLBACK _export InfCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
-#endif
-#endif
static DdeService* FindService( HSZ );
static DdeTopic* FindTopic( DdeService&, HSZ );
static DdeItem* FindItem( DdeTopic&, HSZ );
diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx
index 3e02937..743d0b3 100644
--- a/svl/source/svdde/ddeinf.cxx
+++ b/svl/source/svdde/ddeinf.cxx
@@ -26,18 +26,8 @@
// --- DdeInternal::InfCallback() ----------------------------------
-#ifdef WNT
HDDEDATA CALLBACK DdeInternal::InfCallback(
WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
-#else
-#if defined( ICC )
-HDDEDATA CALLBACK DdeInternal::InfCallback(
- WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
-#else
-HDDEDATA CALLBACK _export DdeInternal::InfCallback(
- WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
-#endif
-#endif
{
return (HDDEDATA)DDE_FNOTPROCESSED;
}
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index beeb3d8..ecce24a 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -46,15 +46,9 @@ class DdeItemImp : public std::vector<DdeItemImpData> {};
// --- DdeInternat::SvrCallback() ----------------------------------
-#if defined( WNT ) || defined( ICC )
HDDEDATA CALLBACK DdeInternal::SvrCallback(
WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
HDDEDATA hData, DWORD, DWORD )
-#else
-HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
- WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
- HDDEDATA hData, DWORD, DWORD )
-#endif
{
DdeServices& rAll = DdeService::GetServices();
DdeService* pService;
diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index bcbe75c..6efa927 100644
--- a/vcl/source/filter/jpeg/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
@@ -20,10 +20,6 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H
#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H
-#if defined( ICC )
-#include <stdio.h>
-#endif
-
#if defined (UNX) || defined(__MINGW32__)
#include <sys/types.h>
#endif
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 2322189..8937527 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -364,7 +364,6 @@ static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, const Point& rPos,
{
if ( pItems[i].mnWidth && pItems[i].mnHeight )
{
- // Wegen ICC auftrennen
Point aPoint( pItems[i].mnLeft, pItems[i].mnTop );
Size aSize( pItems[i].mnWidth, pItems[i].mnHeight );
Rectangle aRect( aPoint, aSize );
@@ -999,7 +998,6 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet )
{
if ( pSet->mpBitmap || pSet->mpWallpaper )
{
- // Wegen ICC auftrennen
Point aPoint( pItems[i].mnLeft, pItems[i].mnTop );
Size aSize( pItems[i].mnWidth, pItems[i].mnHeight );
Rectangle aRect( aPoint, aSize );
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 67feefc..9e6fd34 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -34,11 +34,7 @@ extern "C"
#ifdef __MINGW32__
sal_Bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
#else
-#ifdef ICC
-int _CRT_init(void);
-#else
BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved );
-#endif
BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
#endif
@@ -48,11 +44,7 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
aSalShlData.mhInst = hInst;
#ifndef __MINGW32__
-#ifdef ICC
- if ( _CRT_init() == -1 )
-#else
if ( !_CRT_INIT( hInst, nReason, pReserved ) )
-#endif
return 0;
#else
(void)pReserved;
commit 20193bcc93660a1510a7cd5ab8d0897e55ee7546
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Nov 9 20:28:14 2013 +0100
gbuild: SdiTarget: avoid more spurious rebuilds...
... because the .hxx file only occurs as a target in .d files of
objects, the rule for it will not trigger in a build from scratch and it
will be older than the SdiTarget itself and will be touched on the next
incremental build. Ensure that it's not older than the SdiTarget.
Change-Id: I49504814ff62efb22d1f10b37e3bec2ea841bfc9
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index a877695..d056aa6 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -36,7 +36,10 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS)
-fx$(EXPORTS) \
-fm$@ \
$(if $(gb_FULLDEPS),-fM$(call gb_SdiTarget_get_dep_target,$*)) \
- $<)
+ $< \
+ && touch $@.hxx)
+# touch the hxx file so it's newer than the target - the .hxx only occurs in
+# generated .d files, so it's not a target yet when building from scratch!
# rule necessary to rebuild cxx files that include the header
$(call gb_SdiTarget_get_target,%.hxx) : $(call gb_SdiTarget_get_target,%)
commit 0c29bcec708b4a0c94ea2d52deb4a188f1b32cd5
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Nov 9 00:14:28 2013 +0100
gbuild: HelpTarget: need more recipes...
The files in gb_HelpTarget__get_index_files need to be targets with a
rule since they are delivered via Package. Same for the ".tree" file,
and the HelpJarTarget.
Change-Id: I03167f358aabf297c9f2feacc170ec4e9db437d1
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 748eb88..584c7fa 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -348,6 +348,8 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_WORKDIR := $(4)
$(call gb_HelpLinkTarget_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$(call gb_HelpLinkTarget_get_target,$(1)) :| $(dir $(call gb_HelpLinkTarget_get_target,$(1))).dir
+$(4)/$(2).tree : $(call gb_HelpLinkTarget_get_target,$(1))
+
endef
# gb_HelpLinkTarget_set_configfile target configfile
@@ -373,6 +375,7 @@ endef
# gb_HelpLinkTarget_set_indexed target indexfiles
define gb_HelpLinkTarget_set_indexed
$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := $(2)
+$(addprefix $(call gb_HelpTarget_get_workdir,$(1))/,$(2)) : $(call gb_HelpIndexTarget_get_target,$(1))
endef
@@ -496,6 +499,8 @@ $(call gb_HelpJarTarget_get_target,$(1)) : HELP_WORKDIR := $(3)
$(call gb_HelpJarTarget_get_target,$(1)) :| $(dir $(call gb_HelpJarTarget_get_target,$(1))).dir
+$(3)/$(2).jar : $(call gb_HelpJarTarget_get_target,$(1))
+
endef
# class HelpTarget
@@ -622,6 +627,24 @@ $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpTreeTarget_get_clean
endef
+# need a rule for these because these are targets for the Package
+$(WORKDIR)/HelpTarget/%.tree :
+ touch $@
+$(WORKDIR)/HelpTarget/%.jar :
+ touch $@
+$(WORKDIR)/HelpTarget/%.db :
+ touch $@
+$(WORKDIR)/HelpTarget/%.ht :
+ touch $@
+$(WORKDIR)/HelpTarget/%.key :
+ touch $@
+$(WORKDIR)/HelpTarget/%.idxl/_0.cfs :
+ touch $@
+$(WORKDIR)/HelpTarget/%.idxl/segments_3 :
+ touch $@
+$(WORKDIR)/HelpTarget/%.idxl/segments.gen :
+ touch $@
+
# Get list of the various index files.
#
# gb_HelpTarget__add_index_files target module
commit 6c21f94dffde8649de73ad1acb874fc05b4e16fe
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 8 22:07:13 2013 +0100
gbuild: Gallery: avoid spurious re-delivery
The .sdg/.sdv/.thm files are generated by gengal (i.e. the
Gallery_get_target) but are not targets, which means they will only be
delivered in a second make invocation because make requires running a
command to propagate out-of-date-ness.
Change-Id: Iddb2222151bdbcf93d79bd801fa30ab7d7fbd1d3
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 63090fa..a4319fd 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -82,6 +82,14 @@ $(call gb_Gallery_get_workdir,%).ulf : \
$(call gb_Gallery_get_workdir,%).str : $(gb_Gallery_TRANSLATE)
$(call gb_Gallery__command_str,$@,$*)
+# there must be a rule for these since they are targets due to Package
+$(call gb_Gallery_get_workdir,%).sdg :
+ touch $@
+$(call gb_Gallery_get_workdir,%).sdv :
+ touch $@
+$(call gb_Gallery_get_workdir,%).thm :
+ touch $@
+
.PHONY : $(call gb_Gallery_get_clean_target,%)
$(call gb_Gallery_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),GAL,1)
More information about the Libreoffice-commits
mailing list