From 61c312d271767779e1f580e3123012a864e84942 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 27 Aug 2012 10:21:44 +0200 Subject: typo fix in comment Change-Id: Ief5fe1a58c5f0b09eded67c638eb07a5805e41e2 --- sc/source/ui/vba/vbarange.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 34578e3c6f6f..a300872d5dc9 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -4651,7 +4651,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const if ( bIsValidOpValue ) { // if its a bottom/top Ten(Percent/Value) and there - // is no value specified for critera1 set it to 10 + // is no value specified for criteria1 set it to 10 if ( !bCritHasNumericValue && sCriteria1.isEmpty() && ( nOperator != excel::XlAutoFilterOperator::xlOr ) && ( nOperator != excel::XlAutoFilterOperator::xlAnd ) ) { sTabFilts[0].IsNumeric = sal_True; -- cgit From 42688495edac102b18014a02072ba081870059db Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 27 Aug 2012 11:43:30 +0200 Subject: typo fix in comment Change-Id: Ibdcaacef04b542ff296d13ad0fce7dd27ef36530 Reviewed-on: https://gerrit.libreoffice.org/492 Reviewed-by: Andras Timar Tested-by: Andras Timar --- sw/source/filter/ww8/ww8par.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ee4e34b7a10f..c9eac6c209fc 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3897,7 +3897,7 @@ void wwSectionManager::InsertSegments() bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() && bThisAndPreviousAreCompatible): false; bool bInsertPageDesc = !bInsertSection; - bool bProtected = SectionIsProtected(*aIter); // do we really need this ?? I guess I have a different logic in editshell which disales this... + bool bProtected = SectionIsProtected(*aIter); // do we really need this ?? I guess I have a different logic in editshell which disables this... if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected()) { // here we have the special case that the whole document is protected, with the execption of this section. -- cgit From 437ae002185a81802cb31b00fa777a7b5d8f9847 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 29 Aug 2012 09:47:26 +0200 Subject: Renew localization and kill sdf 1.step Extract strings from source directly to pot files Implement PoHeader and PoEntry classes Renew fomrat of pot/po files Implement conversion from old po to new po Change-Id: I411b6041f7d525e76b189d7f31adc5b9ab60f6d6 Reviewed-on: https://gerrit.libreoffice.org/506 Reviewed-by: Andras Timar Tested-by: Andras Timar --- Repository.mk | 1 + l10ntools/Executable_localize.mk | 9 ++ l10ntools/Executable_renewpo.mk | 36 +++++ l10ntools/Module_l10ntools.mk | 1 + l10ntools/StaticLibrary_transex.mk | 1 + l10ntools/inc/po.hxx | 97 ++++++++++++ l10ntools/source/localize.cxx | 135 +++++++++++----- l10ntools/source/po.cxx | 309 +++++++++++++++++++++++++++++++++++++ l10ntools/source/renewpo.cxx | 168 ++++++++++++++++++++ 9 files changed, 718 insertions(+), 39 deletions(-) create mode 100644 l10ntools/Executable_renewpo.mk create mode 100644 l10ntools/inc/po.hxx create mode 100644 l10ntools/source/po.cxx create mode 100644 l10ntools/source/renewpo.cxx diff --git a/Repository.mk b/Repository.mk index cadf342562d3..8e5847418533 100644 --- a/Repository.mk +++ b/Repository.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ rdbmaker \ regsingleton \ regsvrex \ + renewpo \ rsc \ rscdep \ saxparser \ diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk index 511604ac74d2..6184a8982bd5 100644 --- a/l10ntools/Executable_localize.mk +++ b/l10ntools/Executable_localize.mk @@ -26,10 +26,19 @@ $(eval $(call gb_Executable_Executable,localize)) +$(eval $(call gb_Executable_set_include,localize,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Executable_use_libraries,localize,\ sal \ )) +$(eval $(call gb_Executable_use_static_libraries,localize,\ + transex \ +)) + $(eval $(call gb_Executable_add_exception_objects,localize,\ l10ntools/source/localize \ )) diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk new file mode 100644 index 000000000000..33e38b22751f --- /dev/null +++ b/l10ntools/Executable_renewpo.mk @@ -0,0 +1,36 @@ +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,renewpo)) + +$(eval $(call gb_Executable_set_include,renewpo,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,renewpo,\ + sal \ +)) + +$(eval $(call gb_Executable_use_static_libraries,renewpo,\ + transex \ +)) + +$(eval $(call gb_Executable_add_exception_objects,renewpo,\ + l10ntools/source/renewpo \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index e3c11344a0c9..fb2a3b3289e5 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_targets,l10ntools,\ Executable_transex3 \ Executable_helpindexer \ Executable_helplinker \ + Executable_renewpo \ StaticLibrary_transex \ Library_helplinker \ Package_inc \ diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index e8c84b7d3662..21f50e572ef6 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -37,6 +37,7 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\ l10ntools/source/merge \ l10ntools/source/file \ l10ntools/source/directory \ + l10ntools/source/po \ )) # vim: set noet sw=4 ts=4: diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx new file mode 100644 index 000000000000..de01053ba217 --- /dev/null +++ b/l10ntools/inc/po.hxx @@ -0,0 +1,97 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _PO_INCLUDED +#define _PO_INCLUDED + +#include +#include + +class PoEntry +{ + +private: + + OString m_sWhiteSpace; + OString m_sExtractCom; + OString m_sReference; + OString m_sContext; + OString m_sUnTransStr; + OString m_sTransStr; + + OString m_sKeyId; + +protected: + void setExtractCom(const OString& rExtCom) + { m_sExtractCom = rExtCom; } + +public: + PoEntry(); + PoEntry(const OString& i_rSDFLine, + const sal_uInt16 eType = TEXT); + virtual ~PoEntry(); + + virtual void writeToFile(std::ofstream& io_rOFStream); + + void setTransStr(const OString& rTransStr); + + enum SDFPARTS { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID, + LOCALID, HELPID, PLATFORM, WIDTH, LANGUAGEID, + TEXT, HELPTEXT, QUICKHELPTEXT, TITLE, TIMESTAMP }; +}; + + + + +class PoHeader: public PoEntry +{ + +private: + OString m_sExtractionSource; + OString m_sProjectIdVersion; + OString m_sReportMsgidBugsTo; + OString m_sPotCreationDate; + OString m_sPoRevisionDate; + OString m_sLastTranslator; + OString m_sLanguageTeam; + OString m_sMimeVersion; + OString m_sPluralForms; + OString m_sContentType; + OString m_sCharset; + OString m_sEncoding; + OString m_sXGenerator; + OString m_sXAcceleratorMarker; + +public: + PoHeader( const OString& rExtSrc ); + ~PoHeader(); +}; + +#endif // _PO_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index a54d096503df..c10c3f515c0f 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -50,16 +50,12 @@ #include "sal/main.h" #include "sal/types.h" +#include "po.hxx" + using namespace std; namespace { -namespace global { - -std::ofstream output; - -} - rtl::OUString getEnvironment(rtl::OUString const & variable) { rtl::OUString value; if (osl_getEnvironment(variable.pData, &value.pData) != osl_Process_E_None) @@ -174,7 +170,8 @@ bool passesPositiveList(rtl::OUString const & url) { void handleCommand( rtl::OUString const & project, rtl::OUString const & projectRoot, - rtl::OUString const & url, rtl::OUString const & executable, bool positive) + rtl::OUString const & url, rtl::OUString const & actualDir, + std::ofstream & outPut, rtl::OUString const & executable, bool positive) { if (positive ? passesPositiveList(url) : passesNegativeList(url)) { rtl::OUString inPath; @@ -197,13 +194,13 @@ void handleCommand( throw false; //TODO } rtl::OUStringBuffer buf( - getEnvironment( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOLARVER")))); - buf.append('/'); - buf.append( - getEnvironment( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("INPATH_FOR_BUILD")))); + //getEnvironment( + //rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOLARVER")))); + //buf.append('/'); + //buf.append( + //getEnvironment( + rtl::OUString("/home/zolnai/git/libo/solver/unxlngi6.pro")); + // RTL_CONSTASCII_USTRINGPARAM("INPATH_FOR_BUILD")))); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("/bin/")); buf.append(executable); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" -e -p ")); @@ -239,23 +236,70 @@ void handleCommand( } std::ifstream in(outPath8.getStr()); if (!in.is_open()) { - std::cerr << "Error: Cannot open " << outPath.getStr() << "\n"; + std::cerr << "Error: Cannot open " << outPath8.getStr() << "\n"; throw false; //TODO } + + std::string s; + std::getline(in, s); + if (!in.eof() && !outPut.is_open()) + { + rtl::OUString outDirUrl; + if (osl::FileBase::getFileURLFromSystemPath(actualDir. + copy(0,actualDir.lastIndexOf('/')), outDirUrl) + != osl::FileBase::E_None) + { + std::cerr << "Error: Cannot convert pathname to URL\n"; + throw false; //TODO + } + osl::Directory::createPath(outDirUrl); + + rtl::OString outFilePath; + if (!actualDir.concat(".pot"). + convertToString( + &outFilePath, osl_getThreadTextEncoding(), + (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR + | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) + { + std::cerr << "Error: Cannot convert pathname from UTF-16\n"; + throw false; //TODO + } + outPut.open(outFilePath.getStr(), + std::ios_base::out | std::ios_base::trunc); + rtl::OString relativPath; + if (!inPath.copy(inPath.indexOf(project), + inPath.lastIndexOf('/')-inPath.indexOf(project)). + convertToString(&relativPath, osl_getThreadTextEncoding(), + (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR + | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) + { + std::cerr << "Error: Cannot convert pathname from UTF-16\n"; + throw false; //TODO + } + PoHeader(relativPath).writeToFile(outPut); + } while (!in.eof()) { - std::string s; + OString sLine = OString(s.data(),s.length()); + if (!sLine.isEmpty()) + { + if (!sLine.getToken(PoEntry::TEXT,'\t').isEmpty()) + PoEntry(sLine).writeToFile(outPut); + if (!sLine.getToken(PoEntry::QUICKHELPTEXT,'\t').isEmpty()) + PoEntry(sLine,PoEntry::QUICKHELPTEXT).writeToFile(outPut); + if (!sLine.getToken(PoEntry::TITLE,'\t').isEmpty()) + PoEntry(sLine,PoEntry::TITLE).writeToFile(outPut); + } std::getline(in, s); - if (!s.empty()) - global::output << s << '\n'; - } + }; in.close(); } } void handleFile( rtl::OUString const & project, rtl::OUString const & projectRoot, - rtl::OUString const & url) + rtl::OUString const & url, rtl::OUString const & actualDir, + std::ofstream & outPut) { struct Command { char const * extension; @@ -277,7 +321,7 @@ void handleFile( commands[i].extension, commands[i].extensionLength)) { handleCommand( - project, projectRoot, url, + project, projectRoot, url, actualDir, outPut, rtl::OUString::createFromAscii(commands[i].executable), commands[i].positive); break; @@ -386,8 +430,9 @@ bool excludeDirectory(rtl::OUString const & directory) { /// level <= 0) void handleDirectory( rtl::OUString const & url, int level, rtl::OUString const & project, - rtl::OUString const & projectRoot) + rtl::OUString const & projectRoot, rtl::OUString const & actualDir) { + std::ofstream output; osl::Directory dir(url); if (dir.open() != osl::FileBase::E_None) { std::cerr @@ -417,7 +462,8 @@ void handleDirectory( case -1: // the clone or src directory if (stat.getFileType() == osl::FileStatus::Directory) { handleDirectory( - stat.getFileURL(), 0, rtl::OUString(), rtl::OUString()); + stat.getFileURL(), 0, rtl::OUString(), + rtl::OUString(), actualDir); } break; case 0: // a root directory @@ -425,12 +471,14 @@ void handleDirectory( if (includeProject(stat.getFileName())) { handleDirectory( stat.getFileURL(), 1, stat.getFileName(), - rtl::OUString()); - } else if ( stat.getFileName() == "clone" || stat.getFileName() == "src" ) + rtl::OUString(), actualDir.concat("/"). + concat(stat.getFileName())); + } else if ( stat.getFileName() == "clone" || + stat.getFileName() == "src" ) { handleDirectory( stat.getFileURL(), -1, rtl::OUString(), - rtl::OUString()); + rtl::OUString(), actualDir); } } break; @@ -442,24 +490,29 @@ void handleDirectory( pr += rtl::OUString('/'); } pr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); - handleDirectory(stat.getFileURL(), 2, project, pr); + handleDirectory(stat.getFileURL(), 2, project, pr, + actualDir.concat("/"). + concat(stat.getFileName())); } } else { - handleFile(project, projectRoot, stat.getFileURL()); + handleFile(project, projectRoot, + stat.getFileURL(), actualDir, output); } break; } } + if (output.is_open()) + output.close(); if (dir.close() != osl::FileBase::E_None) { std::cerr << "Error: Cannot close directory\n"; throw false; //TODO } } -void handleProjects(char const * root) { +void handleProjects(char const * sourceRoot, char const * destRoot) { rtl::OUString root16; if (!rtl_convertStringToUString( - &root16.pData, root, rtl_str_getLength(root), + &root16.pData, sourceRoot, rtl_str_getLength(sourceRoot), osl_getThreadTextEncoding(), (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR @@ -475,9 +528,19 @@ void handleProjects(char const * root) { std::cerr << "Error: Cannot convert pathname to URL\n"; throw false; //TODO } - handleDirectory(rootUrl, 0, rtl::OUString(), rtl::OUString()); + rtl::OUString outPutRoot; + if (!rtl_convertStringToUString( + &outPutRoot.pData, destRoot, rtl_str_getLength(destRoot), + osl_getThreadTextEncoding(), + (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR + | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR + | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))) + { + std::cerr << "Error: Cannot convert pathname to UTF-16\n"; + throw false; //TODO + } + handleDirectory(rootUrl, 0, rtl::OUString(), rtl::OUString(), outPutRoot); } - } SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { @@ -490,17 +553,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { "Syntax: localize \n"); std::exit(EXIT_FAILURE); } - global::output.open(argv[2], std::ios_base::out | std::ios_base::trunc); - if (!global::output.is_open()) { - std::cerr << "Error: Cannot append to " << argv[2] << '\n'; - std::exit(EXIT_FAILURE); - } try { - handleProjects(argv[1]); + handleProjects(argv[1],argv[2]); } catch (bool) { //TODO return EXIT_FAILURE; } - global::output.close(); return EXIT_SUCCESS; } diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx new file mode 100644 index 000000000000..ab926792f70d --- /dev/null +++ b/l10ntools/source/po.cxx @@ -0,0 +1,309 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "po.hxx" +#include +#include + +#define ESCAPED OString("\\n\\t\\r\\\\\\\"") +#define UNESCAPED OString("\n\t\r\\\"") + + +//Get actual time in "YEAR-MO-DA HO:MI+ZONE" form +OString ImplGetTime() +{ + time_t aNow(time(NULL)); + struct tm* pNow(localtime(&aNow)); + char pBuff[50]; + strftime( pBuff, sizeof pBuff, "%Y-%m-%d %H:%M%z", pNow ); + return pBuff; +} + +//Split string at the delimiter char +void ImplSplitAt(const OString& rSource, const sal_Int32 nDelimiter, + std::vector& o_vParts) +{ + o_vParts.resize( 0 ); + sal_Int32 nActIndex( 0 ); + sal_Int32 nLastSplit( 0 ); + while( nActIndex < rSource.getLength() ) + { + if ( rSource[nActIndex] == nDelimiter ) + { + o_vParts.push_back(rSource.copy(nLastSplit,nActIndex-nLastSplit)); + nLastSplit = nActIndex+1; + } + ++nActIndex; + } + o_vParts.push_back(rSource.copy(nLastSplit)); +} + +//Escape text +OString ImplEscapeText(const OString& rText, const OString& rUnEscaped, + const OString& rEscaped) +{ + if(rEscaped.getLength()!=2*rUnEscaped.getLength()) throw; + OString sResult = rText; + sal_Int32 nCount = 0; + for(sal_Int32 nIndex=0; nIndex\\\"\\\\","<>\"\\"); +} + +//Unescape extracted text +OString ImplFromSDFText(const OString& rText) +{ + return ImplUnEscapeText(rText,"\\n\\t\\r","\n\t\r"); +} + + +//Generate msgctxt, msgid and msgstr strings +OString ImplGenMsgString(const OString& rSource) +{ + if ( rSource.isEmpty() ) + return "\"\""; + + OString sResult = "\"" + rSource + "\""; + sal_Int32 nIndex = 0; + while((nIndex=sResult.indexOf("\\n",nIndex))!=-1) + { + if( sResult.copy(nIndex-1,3) != "\\\\n" ) + sResult = sResult.replaceAt(nIndex,2,"\\n\"\n\""); + ++nIndex; + } + + if ( sResult.indexOf('\n') != -1 ) + return "\"\"\n" + sResult; + + return sResult; +} + +//Generate crc24 +sal_Int32 ImplGenCRC24(const OString& rKey) +{ + const sal_Int32 CRC24_INIT = 0x00b704ce; + const sal_Int32 CRC24_POLY = 0x00864cfb; + sal_Int32 nCRC = CRC24_INIT; + sal_Int32 nPosition = 0; + + while ( nPosition < rKey.getLength() ) + { + nCRC ^= sal_Int32(rKey[nPosition]) << 16; + for (sal_uInt16 i = 0; i < 8; ++i) + { + nCRC <<= 1; + if (nCRC & 0x01000000) + nCRC ^= CRC24_POLY; + } + ++nPosition; + } + return nCRC & 0x00ffffff; +} + +//Generate KeyId +OString ImplGenKeyId(const OString& rSourcePath, const OString& rContext) +{ + std::vector vPathParts; + ImplSplitAt(rSourcePath,'\\',vPathParts); + if ( vPathParts.size()<3 ) throw; + + sal_Int32 nCRC = ImplGenCRC24( vPathParts[vPathParts.size()-3] + "_" + + vPathParts[vPathParts.size()-2] + "_" + + vPathParts[vPathParts.size()-1] + "_" + + rContext); + const OString sSymbols = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#_"; + OString sKeyId = ""; + while ( sKeyId.getLength() < 4 ) + { + sKeyId += sSymbols.copy(nCRC & 63, 1); + nCRC >>= 6; + } + return sKeyId; +} + +//Default constructor +PoEntry::PoEntry() + : m_sWhiteSpace( OString() ) + , m_sExtractCom( OString() ) + , m_sReference( OString() ) + , m_sContext( OString() ) + , m_sUnTransStr( OString() ) + , m_sTransStr( OString() ) + , m_sKeyId( OString() ) +{ +} + +//Construct PoEntry from sdfline +PoEntry::PoEntry(const OString& rSDFLine, const sal_uInt16 eType) + : m_sWhiteSpace( "\n" ) + , m_sExtractCom( OString() ) + , m_sTransStr( OString() ) + , m_sKeyId( OString() ) +{ + std::vector vParts; + ImplSplitAt(rSDFLine,'\t',vParts); + if(vParts.size()!=15) throw; + + m_sReference = vParts[SOURCEFILE]. + copy(vParts[SOURCEFILE].lastIndexOf("\\")+1); + m_sContext = vParts[GROUPID] + "\\n" + + (vParts[LOCALID].isEmpty()? "" : vParts[LOCALID] + "\\n") + + vParts[RESOURCETYPE]; + + switch(eType){ + case TEXT: + m_sContext += ".text"; break; + case QUICKHELPTEXT: + m_sContext += ".quickhelptext"; break; + case TITLE: + m_sContext += ".title"; break; + default: + throw; break; + } + if (m_sReference.endsWith(".xhp")) + m_sUnTransStr = ImplFromSDFHelpText(vParts[eType]); + else + m_sUnTransStr = ImplFromSDFText(vParts[eType]); + + m_sExtractCom = vParts[HELPTEXT]; + m_sKeyId = ImplGenKeyId(vParts[PROJECT] + + "\\" + vParts[SOURCEFILE],m_sContext); +} + +PoEntry::~PoEntry() +{ +} + +//Write out +void PoEntry::writeToFile(std::ofstream& io_rOFStream) +{ + if ( !m_sWhiteSpace.isEmpty() ) + io_rOFStream << m_sWhiteSpace.getStr(); + if ( !m_sExtractCom.isEmpty() ) + io_rOFStream << "#. " << m_sExtractCom.getStr() << std::endl; + if ( !m_sKeyId.isEmpty() ) + io_rOFStream << "#. " << m_sKeyId.getStr() << std::endl; + if ( !m_sReference.isEmpty() ) + io_rOFStream << "#: " << m_sReference.getStr() << std::endl; + if ( !m_sContext.isEmpty() ) + io_rOFStream << "msgctxt " + << ImplGenMsgString(m_sContext).getStr() << std::endl; + io_rOFStream << "msgid " + << ImplGenMsgString( + ImplEscapeText(m_sUnTransStr)).getStr() + << std::endl; + io_rOFStream << "msgstr " + << ImplGenMsgString( + ImplEscapeText(m_sTransStr)).getStr() + << std::endl; +} + +void PoEntry::setTransStr(const OString& rTransStr) +{ + m_sTransStr = ImplUnEscapeText(rTransStr); +} + +//Constructor +PoHeader::PoHeader( const OString& rExtSrc ) + : m_sExtractionSource( rExtSrc ) + , m_sProjectIdVersion( "PACKAGE VERSION" ) + , m_sReportMsgidBugsTo( OString("https://bugs.freedesktop.org/") + + "enter_bug.cgi?product=LibreOffice&" + + "bug_status=UNCONFIRMED&component=UI" ) + , m_sPotCreationDate( ImplGetTime() ) + , m_sPoRevisionDate( "YEAR-MO-DA HO:MI+ZONE" ) + , m_sLastTranslator( "FULL NAME " ) + , m_sLanguageTeam( "LANGUAGE " ) + , m_sMimeVersion( "1.0" ) + , m_sContentType( "text/plain" ) + , m_sCharset( "UTF-8" ) + , m_sEncoding( "8bit" ) + , m_sXGenerator( "LibreOffice" ) + , m_sXAcceleratorMarker( "~" ) +{ + setExtractCom("extracted from " + rExtSrc); + setTransStr("Project-Id-Version: " + m_sProjectIdVersion + "\n" + + "Report-Msgid-Bugs-To: " + m_sReportMsgidBugsTo + "\n" + + "POT-Creation-Date: " + m_sPotCreationDate + "\n" + + "PO-Revision-Date: " + m_sPoRevisionDate + "\n" + + "Last-Translator: " + m_sLastTranslator + "\n" + + "Language-Team: " + m_sLanguageTeam + "\n" + + "MIME-Version: " + m_sMimeVersion + "\n" + + "Content-Type: " + m_sContentType + "; " + + "charset=" + m_sCharset + "\n" + + "Content-Transfer-Encoding: " + m_sEncoding + "\n" + + "X-Genarator: " + m_sXGenerator + "\n" + + "X-Accelerator_Marker: " + m_sXAcceleratorMarker + "\n"); +} + +PoHeader::~PoHeader() +{ +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx new file mode 100644 index 000000000000..c9fad34a99f3 --- /dev/null +++ b/l10ntools/source/renewpo.cxx @@ -0,0 +1,168 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include +#include +#include +#include +#include +#include "po.hxx" + +using namespace std; + +//Check wheather the two entry are the same but in different languages +bool IsSameEntry(const OString& rFirstEntry,const OString& rSecEntry) +{ + for(int i = PoEntry::PROJECT; i<=PoEntry::LOCALID;++i) + { + if ( rFirstEntry.getToken(i,'\t') != rSecEntry.getToken(i,'\t')) + return false; + } + return true; +} + +//Get path of po file +OString GetPath(const OString& rPath, const OString& rLine) +{ + OString sSourceFile = rLine.getToken(PoEntry::SOURCEFILE,'\t'); + OString sSourcePath = rPath + "/" + + rLine.getToken(PoEntry::PROJECT,'\t') + "/" + + sSourceFile.copy(0,sSourceFile.lastIndexOf("\\")). + replaceAll("\\","/"); + return sSourcePath; +} + +//Renew po files of the actual language +void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, + const OString& rpo2ooPath, const OString& rSDFPath) +{ + const OString LangEntryName = pLangEntry->d_name; + const OString SDFFileName = LangEntryName + ".sdf"; + + //Generate and open sdf + cout << "Start process with language: " << LangEntryName.getStr() << endl; + system( (rpo2ooPath + " -t " + rSDFPath + + " -l " + LangEntryName + " " + + rPath.getStr() + LangEntryName + " " + + SDFFileName).getStr()); + + ofstream aOutPut; + ifstream aSDFInput(SDFFileName.getStr()); + string s; + getline(aSDFInput,s); + OString sLine = OString(s.data(),s.length()); + while(!aSDFInput.eof()) + { + OString sActUnTrans = sLine; + OString sPath = rPath + LangEntryName; + OString sActSourcePath = GetPath(sPath,sActUnTrans); + //Make new po file, copy header with some changes + if (!aOutPut.is_open()) + { + aOutPut.open((sActSourcePath + ".po_tmp").getStr(), + std::ios_base::out | std::ios_base::trunc); + ifstream aPOInput((sActSourcePath + ".po").getStr()); + getline(aPOInput,s); + while(s!="") + { + if (s.find("#. extracted from")!=string::npos) + s = string(s,0,s.length()-3); + if (s.find("Report-Msgid-Bugs-To")!=string::npos) + s = string("\"Report-Msgid-Bugs-To: ") + + "https://bugs.freedesktop.org/enter_bug.cgi?product=" + + "LibreOffice&bug_status=UNCONFIRMED&component=UI\\n\""; + if (s.find("X-Generator")!=string::npos) + s = "\"X-Generator: LibreOffice\\n\""; + aOutPut << s << endl; + getline(aPOInput,s); + }; + aPOInput.close(); + } + + //Set PoEntry and write out + getline(aSDFInput,s); + sLine = OString(s.data(),s.length()); + OString sActTrans; + if (IsSameEntry(sActUnTrans,sLine)) + { + sActTrans = sLine; + getline(aSDFInput,s); + sLine = OString(s.data(),s.length()); + } + else + { + sActTrans =""; + } + PoEntry aPE(sActUnTrans); + aPE.setTransStr(sActTrans.getToken(PoEntry::TEXT,'\t')); + aPE.writeToFile(aOutPut); + + //Check wheather next entry is in the same po file + OString sNextSourcePath = GetPath(sPath,sLine); + if (sNextSourcePath!=sActSourcePath) + { + aOutPut.close(); + system(("rm " + sActSourcePath +".po").getStr()); + system(("mv "+ sActSourcePath +".po_tmp " + + sActSourcePath +".po").getStr()); + } + } + + //Close and remove sdf file + aSDFInput.close(); + system(("rm " + SDFFileName).getStr()); + aOutPut.close(); +} + + +int main(int argc, char* argv[]) +{ + //Usage + if (argc < 4) + { + cout << "Use: renewpot translationsdir po2oo en-us.sdf" << endl; + cout << "translationsdir: in this dir there are language" << endl; + cout << "directories which contain the po files. These" << endl; + cout << "directories have named by the languageid" << endl; + cout << "po2oo: the path withwhich po2oo can be call" << endl; + cout << "en-us.sdf: the path to call po2oo with this sdf" << endl; + return 1; + } + + //Call processing function with all language directories + DIR* pTranslations = opendir(argv[1]); + while ( struct dirent* pActEntry = readdir(pTranslations) ) + { + if ( OString(pActEntry->d_name).indexOf('.')==-1 ) + HandleLanguage(pActEntry,OString(argv[1]), + OString(argv[2]),OString(argv[3])); + } + closedir(pTranslations); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 0319a1c8d1df4a86b847f5d6178966a29e7c24cb Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 29 Aug 2012 09:51:44 +0200 Subject: Some improvement in po classes Raise general po functionalities from PoEntry to the GenPoEntry class. Thus PoEntry contains only the specific things with which LibreOffice localization tool works. Improve escaping text. Change-Id: I98894e7c218d37c226f48b30a1f8b59a5ff1a0bf Reviewed-on: https://gerrit.libreoffice.org/507 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/inc/po.hxx | 58 +++++++--- l10ntools/source/localize.cxx | 4 +- l10ntools/source/po.cxx | 248 ++++++++++++++++++++++-------------------- 3 files changed, 173 insertions(+), 137 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index de01053ba217..ffdb0d2af36c 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -32,7 +32,7 @@ #include #include -class PoEntry +class GenPoEntry { private: @@ -44,31 +44,55 @@ private: OString m_sUnTransStr; OString m_sTransStr; - OString m_sKeyId; - -protected: - void setExtractCom(const OString& rExtCom) - { m_sExtractCom = rExtCom; } - public: - PoEntry(); - PoEntry(const OString& i_rSDFLine, - const sal_uInt16 eType = TEXT); - virtual ~PoEntry(); - - virtual void writeToFile(std::ofstream& io_rOFStream); - - void setTransStr(const OString& rTransStr); + GenPoEntry(); + virtual ~GenPoEntry(); + + virtual void setWhiteSpace(const OString& rWhiteSpace) + { m_sWhiteSpace = rWhiteSpace; } + virtual void setExtractCom(const OString& rExtractCom) + { m_sExtractCom = rExtractCom; } + virtual void setReference(const OString& rReference) + { m_sReference = rReference; } + virtual void setContext(const OString& rContext) + { m_sContext = rContext; } + virtual void setUnTransStr(const OString& rUnTransStr) + { m_sUnTransStr = rUnTransStr; } + virtual void setTransStr(const OString& rTransStr) + { m_sTransStr = rTransStr; } + + virtual void writeToFile(std::ofstream& io_rOFStream); +}; +class PoEntry: public GenPoEntry +{ +public: enum SDFPARTS { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID, LOCALID, HELPID, PLATFORM, WIDTH, LANGUAGEID, TEXT, HELPTEXT, QUICKHELPTEXT, TITLE, TIMESTAMP }; -}; + enum TYPE { TTEXT=TEXT, TQUICKHELPTEXT=QUICKHELPTEXT, TTITLE=TITLE }; +private: + + OString m_sSourceFile; + OString m_sGroupId; + OString m_sLocalId; + OString m_sResourceType; + TYPE m_eType; + OString m_sHelpText; + OString m_sKeyId; +public: + + PoEntry(const OString& i_rSDFLine, + const TYPE eType = TTEXT); + virtual ~PoEntry(); + virtual void setUnTransStr(const OString& rUnTransStr); + virtual void setTransStr(const OString& rTransStr); +}; -class PoHeader: public PoEntry +class PoHeader: public GenPoEntry { private: diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index c10c3f515c0f..ac24ed6733e5 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -286,9 +286,9 @@ void handleCommand( if (!sLine.getToken(PoEntry::TEXT,'\t').isEmpty()) PoEntry(sLine).writeToFile(outPut); if (!sLine.getToken(PoEntry::QUICKHELPTEXT,'\t').isEmpty()) - PoEntry(sLine,PoEntry::QUICKHELPTEXT).writeToFile(outPut); + PoEntry(sLine,PoEntry::TQUICKHELPTEXT).writeToFile(outPut); if (!sLine.getToken(PoEntry::TITLE,'\t').isEmpty()) - PoEntry(sLine,PoEntry::TITLE).writeToFile(outPut); + PoEntry(sLine,PoEntry::TTITLE).writeToFile(outPut); } std::getline(in, s); }; diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index ab926792f70d..98364f3d6036 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -30,42 +30,15 @@ #include #include -#define ESCAPED OString("\\n\\t\\r\\\\\\\"") -#define UNESCAPED OString("\n\t\r\\\"") +#define POESCAPED OString("\\n\\t\\r\\\\\\\"") +#define POUNESCAPED OString("\n\t\r\\\"") - -//Get actual time in "YEAR-MO-DA HO:MI+ZONE" form -OString ImplGetTime() -{ - time_t aNow(time(NULL)); - struct tm* pNow(localtime(&aNow)); - char pBuff[50]; - strftime( pBuff, sizeof pBuff, "%Y-%m-%d %H:%M%z", pNow ); - return pBuff; -} - -//Split string at the delimiter char -void ImplSplitAt(const OString& rSource, const sal_Int32 nDelimiter, - std::vector& o_vParts) -{ - o_vParts.resize( 0 ); - sal_Int32 nActIndex( 0 ); - sal_Int32 nLastSplit( 0 ); - while( nActIndex < rSource.getLength() ) - { - if ( rSource[nActIndex] == nDelimiter ) - { - o_vParts.push_back(rSource.copy(nLastSplit,nActIndex-nLastSplit)); - nLastSplit = nActIndex+1; - } - ++nActIndex; - } - o_vParts.push_back(rSource.copy(nLastSplit)); -} +//Class GenPoEntry //Escape text -OString ImplEscapeText(const OString& rText, const OString& rUnEscaped, - const OString& rEscaped) +OString ImplEscapeText(const OString& rText, + const OString& rUnEscaped= POUNESCAPED, + const OString& rEscaped = POESCAPED) { if(rEscaped.getLength()!=2*rUnEscaped.getLength()) throw; OString sResult = rText; @@ -80,16 +53,10 @@ OString ImplEscapeText(const OString& rText, const OString& rUnEscaped, return sResult; } - -//Escape text to write to po files -OString ImplEscapeText(const OString& rText) -{ - return ImplEscapeText(rText,UNESCAPED,ESCAPED); -} - //Unescape text -OString ImplUnEscapeText(const OString& rText,const OString& rEscaped, - const OString& rUnEscaped) +OString ImplUnEscapeText(const OString& rText, + const OString& rEscaped = POESCAPED, + const OString& rUnEscaped = POUNESCAPED) { if(rEscaped.getLength()!=2*rUnEscaped.getLength()) throw; OString sResult = rText; @@ -104,25 +71,6 @@ OString ImplUnEscapeText(const OString& rText,const OString& rEscaped, return sResult; } -//Unescape text from po files -OString ImplUnEscapeText(const OString& rText) -{ - return ImplUnEscapeText(rText,ESCAPED,UNESCAPED); -} - -//Unescape extracted helptext -OString ImplFromSDFHelpText(const OString& rText) -{ - return ImplUnEscapeText(rText,"\\<\\>\\\"\\\\","<>\"\\"); -} - -//Unescape extracted text -OString ImplFromSDFText(const OString& rText) -{ - return ImplUnEscapeText(rText,"\\n\\t\\r","\n\t\r"); -} - - //Generate msgctxt, msgid and msgstr strings OString ImplGenMsgString(const OString& rSource) { @@ -144,6 +92,67 @@ OString ImplGenMsgString(const OString& rSource) return sResult; } +//Default constructor +GenPoEntry::GenPoEntry() + : m_sWhiteSpace( OString() ) + , m_sExtractCom( OString() ) + , m_sReference( OString() ) + , m_sContext( OString() ) + , m_sUnTransStr( OString() ) + , m_sTransStr( OString() ) +{ +} + +//Destructor +GenPoEntry::~GenPoEntry() +{ +} + +//Write to file +void GenPoEntry::writeToFile(std::ofstream& io_rOFStream) +{ + if ( !m_sWhiteSpace.isEmpty() ) + io_rOFStream << m_sWhiteSpace.getStr(); + if ( !m_sExtractCom.isEmpty() ) + io_rOFStream << "#. " + << m_sExtractCom.replaceAll("\n","\n#. ").getStr() + << std::endl; + if ( !m_sReference.isEmpty() ) + io_rOFStream << "#: " << m_sReference.getStr() << std::endl; + if ( !m_sContext.isEmpty() ) + io_rOFStream << "msgctxt " + << ImplGenMsgString(m_sContext).getStr() << std::endl; + io_rOFStream << "msgid " + << ImplGenMsgString( + ImplEscapeText(m_sUnTransStr)).getStr() + << std::endl; + io_rOFStream << "msgstr " + << ImplGenMsgString( + ImplEscapeText(m_sTransStr)).getStr() + << std::endl; +} + +//Class PoEntry + +//Split string at the delimiter char +void ImplSplitAt(const OString& rSource, const sal_Int32 nDelimiter, + std::vector& o_vParts) +{ + o_vParts.resize( 0 ); + sal_Int32 nActIndex( 0 ); + sal_Int32 nLastSplit( 0 ); + while( nActIndex < rSource.getLength() ) + { + if ( rSource[nActIndex] == nDelimiter ) + { + o_vParts.push_back(rSource.copy(nLastSplit,nActIndex-nLastSplit)); + nLastSplit = nActIndex+1; + } + ++nActIndex; + } + o_vParts.push_back(rSource.copy(nLastSplit)); +} + //Generate crc24 sal_Int32 ImplGenCRC24(const OString& rKey) { @@ -187,86 +196,89 @@ OString ImplGenKeyId(const OString& rSourcePath, const OString& rContext) return sKeyId; } -//Default constructor -PoEntry::PoEntry() - : m_sWhiteSpace( OString() ) - , m_sExtractCom( OString() ) - , m_sReference( OString() ) - , m_sContext( OString() ) - , m_sUnTransStr( OString() ) - , m_sTransStr( OString() ) - , m_sKeyId( OString() ) -{ -} - //Construct PoEntry from sdfline -PoEntry::PoEntry(const OString& rSDFLine, const sal_uInt16 eType) - : m_sWhiteSpace( "\n" ) - , m_sExtractCom( OString() ) - , m_sTransStr( OString() ) +PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) + : m_sSourceFile( OString() ) + , m_sGroupId( OString() ) + , m_sLocalId( OString() ) + , m_sResourceType(OString() ) + , m_eType( TTEXT ) , m_sKeyId( OString() ) { + setWhiteSpace("\n"); std::vector vParts; ImplSplitAt(rSDFLine,'\t',vParts); if(vParts.size()!=15) throw; - m_sReference = vParts[SOURCEFILE]. - copy(vParts[SOURCEFILE].lastIndexOf("\\")+1); - m_sContext = vParts[GROUPID] + "\\n" + - (vParts[LOCALID].isEmpty()? "" : vParts[LOCALID] + "\\n") + - vParts[RESOURCETYPE]; - + m_sSourceFile = vParts[SOURCEFILE]. + copy(vParts[SOURCEFILE].lastIndexOf("\\")+1); + setReference(m_sSourceFile); + m_sGroupId = vParts[GROUPID]; + m_sLocalId = vParts[LOCALID]; + m_sResourceType = vParts[RESOURCETYPE]; + m_eType = eType; + m_sHelpText = vParts[HELPTEXT]; + + OString sContext = m_sGroupId + "\\n" + + (m_sLocalId.isEmpty() ? "" : m_sLocalId + "\\n") + + m_sResourceType; switch(eType){ - case TEXT: - m_sContext += ".text"; break; - case QUICKHELPTEXT: - m_sContext += ".quickhelptext"; break; - case TITLE: - m_sContext += ".title"; break; + case TTEXT: + sContext += ".text"; break; + case TQUICKHELPTEXT: + sContext += ".quickhelptext"; break; + case TTITLE: + sContext += ".title"; break; default: throw; break; } - if (m_sReference.endsWith(".xhp")) - m_sUnTransStr = ImplFromSDFHelpText(vParts[eType]); - else - m_sUnTransStr = ImplFromSDFText(vParts[eType]); + setContext(sContext); + m_sKeyId = ImplGenKeyId(vParts[PROJECT] + "\\" + vParts[SOURCEFILE], + sContext); + setExtractCom((m_sHelpText.isEmpty() ? "" : m_sHelpText + "\n") + m_sKeyId); - m_sExtractCom = vParts[HELPTEXT]; - m_sKeyId = ImplGenKeyId(vParts[PROJECT] + - "\\" + vParts[SOURCEFILE],m_sContext); + setUnTransStr(vParts[eType]); } PoEntry::~PoEntry() { } -//Write out -void PoEntry::writeToFile(std::ofstream& io_rOFStream) +//Unescape sdf text +OString ImplUnEscapeSDFText(const OString& rText,const bool bHelpText = false) { - if ( !m_sWhiteSpace.isEmpty() ) - io_rOFStream << m_sWhiteSpace.getStr(); - if ( !m_sExtractCom.isEmpty() ) - io_rOFStream << "#. " << m_sExtractCom.getStr() << std::endl; - if ( !m_sKeyId.isEmpty() ) - io_rOFStream << "#. " << m_sKeyId.getStr() << std::endl; - if ( !m_sReference.isEmpty() ) - io_rOFStream << "#: " << m_sReference.getStr() << std::endl; - if ( !m_sContext.isEmpty() ) - io_rOFStream << "msgctxt " - << ImplGenMsgString(m_sContext).getStr() << std::endl; - io_rOFStream << "msgid " - << ImplGenMsgString( - ImplEscapeText(m_sUnTransStr)).getStr() - << std::endl; - io_rOFStream << "msgstr " - << ImplGenMsgString( - ImplEscapeText(m_sTransStr)).getStr() - << std::endl; + if ( bHelpText ) + return ImplUnEscapeText(rText,"\\<\\>\\\"\\\\","<>\"\\"); + else + return ImplUnEscapeText(rText,"\\n\\t\\r","\n\t\r"); } +//Set translation text when input is in sdf format +void PoEntry::setUnTransStr(const OString& rUnTransStr) +{ + GenPoEntry::setUnTransStr( + ImplUnEscapeSDFText( + rUnTransStr,m_sSourceFile.endsWith(".xhp"))); +} + +//Set translated text when input is in sdf format void PoEntry::setTransStr(const OString& rTransStr) { - m_sTransStr = ImplUnEscapeText(rTransStr); + GenPoEntry::setTransStr( + ImplUnEscapeSDFText( + rTransStr,m_sSourceFile.endsWith(".xhp"))); +} + +//Class PoHeader + +//Get actual time in "YEAR-MO-DA HO:MI+ZONE" form +OString ImplGetTime() +{ + time_t aNow(time(NULL)); + struct tm* pNow(localtime(&aNow)); + char pBuff[50]; + strftime( pBuff, sizeof pBuff, "%Y-%m-%d %H:%M%z", pNow ); + return pBuff; } //Constructor -- cgit From 305ecb308a9b6f54263fd526cfdda9167fcaab56 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 29 Aug 2012 09:54:30 +0200 Subject: Make renew working well Change po2lo output: write out the untranslated sdf line too, write out translated sdf line only if there is translation to the komponent, write out fuzzy entries and indicate which entries are fuzzy. Change GenPoEntry to write out fuzzy flag Change renewpo to write out all type of entries not just text and to remove id duplicates which are made by xrmex Change-Id: Idc9b6062638d1d5fcbbae75e0396996b63e9a7a0 Reviewed-on: https://gerrit.libreoffice.org/508 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/inc/po.hxx | 3 ++ l10ntools/scripts/po2lo | 29 +++++++++++------- l10ntools/source/localize.cxx | 16 +++++----- l10ntools/source/po.cxx | 3 ++ l10ntools/source/renewpo.cxx | 69 +++++++++++++++++++++++++++++++++---------- 5 files changed, 85 insertions(+), 35 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index ffdb0d2af36c..fddd9074cf9d 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -43,6 +43,7 @@ private: OString m_sContext; OString m_sUnTransStr; OString m_sTransStr; + bool m_bFuzzy; public: GenPoEntry(); @@ -60,6 +61,8 @@ public: { m_sUnTransStr = rUnTransStr; } virtual void setTransStr(const OString& rTransStr) { m_sTransStr = rTransStr; } + virtual void setFuzzy(bool bFuzzy) + { m_bFuzzy = bFuzzy; } virtual void writeToFile(std::ofstream& io_rOFStream); }; diff --git a/l10ntools/scripts/po2lo b/l10ntools/scripts/po2lo index cdf8892fc950..579699102710 100755 --- a/l10ntools/scripts/po2lo +++ b/l10ntools/scripts/po2lo @@ -41,6 +41,7 @@ class Entry: """Represents a single line in an SDF file.""" def __init__(self, items): + self.has_translation = None; self.items = items # list of 15 fields path = self.items[1].split('\\') self.po = "%s/%s/%s.po" % (options.input.replace('\\', '/'), self.items[0], "/".join(path[:-1])) @@ -65,13 +66,20 @@ class Entry: """Translates text in the entry based on translations.""" self.items[9] = options.language + self.items[2] = "" + self.has_translation = False for idx, key in self.keys: try: - self.items[idx] = translations.data[(self.po, key)] + if translations.data[(self.po, key)][1]: + self.items[2] += "1" + else: + self.items[2] += "0" + self.items[idx] = translations.data[(self.po, key)][0] + self.has_translation = True self.items[14] = "2002-02-02 02:02:02" except KeyError: - pass + self.items[idx]="" self.items[14] = self.items[14].strip() def sdf2po(self, s): @@ -95,8 +103,10 @@ class Template: sock = xopen(options.output, "w", encoding='utf-8') for line in self.lines: + sock.write("\t".join(line.items)) line.translate(translations) - sock.write("\t".join(line.items)+"\r\n") + if line.has_translation: + sock.write("\t".join(line.items)+"\r\n") sock.close() class Translations: @@ -120,10 +130,10 @@ class Translations: elif line.startswith("msgstr "): trans = line.strip()[8:-1] if len(trans): + self.setdata(path, key, trans, fuzzy) if fuzzy: fuzzy = False else: - self.setdata(path, key, trans) multiline = False else: buf = [] @@ -132,16 +142,15 @@ class Translations: elif multiline and line.startswith('"'): buf.append(line.strip()[1:-1]) elif multiline and not len(line.strip()) and len("".join(buf)): + self.setdata(path, key, "".join(buf),fuzzy) if fuzzy: fuzzy = False - else: - self.setdata(path, key, "".join(buf)) buf = [] multiline = False - if multiline and len("".join(buf)) and not fuzzy: - self.setdata(path, key, "".join(buf)) + if multiline and len("".join(buf)): + self.setdata(path, key, "".join(buf),fuzzy) - def setdata(self, path, key, s): + def setdata(self, path, key, s, fuzzy = False): """Sets the translation for a given path and key, handling (un)escaping as well.""" if key: @@ -151,7 +160,7 @@ class Translations: s = self.escape_help_text(s) else: s = s.replace('\\\\', '\\') - self.data[(path.replace('\\', '/'), key)] = s + self.data[(path.replace('\\', '/'), key)] = ( s , fuzzy ) def escape_help_text(self, text): """Escapes the help text as it would be in an SDF file.""" diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index ac24ed6733e5..bef2444ae6a8 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -281,15 +281,13 @@ void handleCommand( while (!in.eof()) { OString sLine = OString(s.data(),s.length()); - if (!sLine.isEmpty()) - { - if (!sLine.getToken(PoEntry::TEXT,'\t').isEmpty()) - PoEntry(sLine).writeToFile(outPut); - if (!sLine.getToken(PoEntry::QUICKHELPTEXT,'\t').isEmpty()) - PoEntry(sLine,PoEntry::TQUICKHELPTEXT).writeToFile(outPut); - if (!sLine.getToken(PoEntry::TITLE,'\t').isEmpty()) - PoEntry(sLine,PoEntry::TTITLE).writeToFile(outPut); - } + + if (!sLine.getToken(PoEntry::TEXT,'\t').isEmpty()) + PoEntry(sLine).writeToFile(outPut); + if (!sLine.getToken(PoEntry::QUICKHELPTEXT,'\t').isEmpty()) + PoEntry(sLine,PoEntry::TQUICKHELPTEXT).writeToFile(outPut); + if (!sLine.getToken(PoEntry::TITLE,'\t').isEmpty()) + PoEntry(sLine,PoEntry::TTITLE).writeToFile(outPut); std::getline(in, s); }; in.close(); diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 98364f3d6036..9bedf4d2d409 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -100,6 +100,7 @@ GenPoEntry::GenPoEntry() , m_sContext( OString() ) , m_sUnTransStr( OString() ) , m_sTransStr( OString() ) + , m_bFuzzy( false ) { } @@ -119,6 +120,8 @@ void GenPoEntry::writeToFile(std::ofstream& io_rOFStream) << std::endl; if ( !m_sReference.isEmpty() ) io_rOFStream << "#: " << m_sReference.getStr() << std::endl; + if ( m_bFuzzy ) + io_rOFStream << "#, fuzzy" << std::endl; if ( !m_sContext.isEmpty() ) io_rOFStream << "msgctxt " << ImplGenMsgString(m_sContext).getStr() << std::endl; diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index c9fad34a99f3..f68250ee37c0 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include #include "po.hxx" @@ -40,7 +41,8 @@ bool IsSameEntry(const OString& rFirstEntry,const OString& rSecEntry) { for(int i = PoEntry::PROJECT; i<=PoEntry::LOCALID;++i) { - if ( rFirstEntry.getToken(i,'\t') != rSecEntry.getToken(i,'\t')) + if ( rFirstEntry.getToken(i,'\t') != rSecEntry.getToken(i,'\t') && + i != PoEntry::DUMMY) return false; } return true; @@ -57,19 +59,34 @@ OString GetPath(const OString& rPath, const OString& rLine) return sSourcePath; } +OString DelLocalId(const OString& rLine) +{ + sal_uInt16 nTabIndex = 0; + for(sal_uInt16 nComponent=0; nComponentd_name; const OString SDFFileName = LangEntryName + ".sdf"; //Generate and open sdf - cout << "Start process with language: " << LangEntryName.getStr() << endl; - system( (rpo2ooPath + " -t " + rSDFPath + - " -l " + LangEntryName + " " + - rPath.getStr() + LangEntryName + " " + - SDFFileName).getStr()); + cout << "Process start with language: " << LangEntryName.getStr() << endl; + system( (rpo2loPath + + " -i " + rPath.getStr() + LangEntryName + + " -o " + SDFFileName + + " -l " + LangEntryName + + " -t " + rSDFPath).getStr()); + cout << "Language sdf is ready!" << endl; ofstream aOutPut; ifstream aSDFInput(SDFFileName.getStr()); @@ -118,9 +135,31 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, { sActTrans =""; } - PoEntry aPE(sActUnTrans); - aPE.setTransStr(sActTrans.getToken(PoEntry::TEXT,'\t')); - aPE.writeToFile(aOutPut); + const vector vTypes = { PoEntry::TTEXT, + PoEntry::TQUICKHELPTEXT, + PoEntry::TTITLE }; + sal_uInt16 nDummyBit = 0; + for( sal_uInt16 nIndex=0; nIndex Date: Wed, 29 Aug 2012 12:42:11 +0200 Subject: Improve KeyId generation Move KeyId from PoEntry to GenPoEntry to make these classes more separated. Replace crc24 with crc32 (boost/crc). Extend KeyId's charset to [33,126] intervallum of ASCII Change-Id: If761a572e2a2651af3eab253a1582569ea68e440 Reviewed-on: https://gerrit.libreoffice.org/509 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/inc/po.hxx | 4 +-- l10ntools/source/po.cxx | 92 +++++++++++++++++++------------------------------ 2 files changed, 38 insertions(+), 58 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index fddd9074cf9d..3330afb0e880 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -44,6 +44,7 @@ private: OString m_sUnTransStr; OString m_sTransStr; bool m_bFuzzy; + OString m_sKeyId; public: GenPoEntry(); @@ -63,7 +64,7 @@ public: { m_sTransStr = rTransStr; } virtual void setFuzzy(bool bFuzzy) { m_bFuzzy = bFuzzy; } - + virtual void genKeyId(); virtual void writeToFile(std::ofstream& io_rOFStream); }; @@ -82,7 +83,6 @@ private: OString m_sResourceType; TYPE m_eType; OString m_sHelpText; - OString m_sKeyId; public: diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 9bedf4d2d409..c488c8798d0e 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -29,12 +29,29 @@ #include "po.hxx" #include #include +#include #define POESCAPED OString("\\n\\t\\r\\\\\\\"") #define POUNESCAPED OString("\n\t\r\\\"") //Class GenPoEntry +//Generate KeyId +OString ImplGenKeyId(const OString& rGenerator) +{ + boost::crc_32_type aCRC32; + aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength()); + sal_uInt32 nCRC = aCRC32.checksum(); + OString sKeyId = ""; + while ( sKeyId.getLength() < 4 ) + { + //Concat a char from the [33,126] intervallum of ASCII + sKeyId += OString(char(int(double(nCRC & 255)/255*93)+33)); + nCRC >>= 8; + } + return sKeyId; +} + //Escape text OString ImplEscapeText(const OString& rText, const OString& rUnEscaped= POUNESCAPED, @@ -101,6 +118,7 @@ GenPoEntry::GenPoEntry() , m_sUnTransStr( OString() ) , m_sTransStr( OString() ) , m_bFuzzy( false ) + , m_sKeyId( OString() ) { } @@ -109,15 +127,21 @@ GenPoEntry::~GenPoEntry() { } +//Set keyid +void GenPoEntry::genKeyId() +{ + m_sKeyId = ImplGenKeyId(m_sReference + m_sContext + m_sUnTransStr); +} + //Write to file void GenPoEntry::writeToFile(std::ofstream& io_rOFStream) { if ( !m_sWhiteSpace.isEmpty() ) io_rOFStream << m_sWhiteSpace.getStr(); if ( !m_sExtractCom.isEmpty() ) - io_rOFStream << "#. " - << m_sExtractCom.replaceAll("\n","\n#. ").getStr() - << std::endl; + io_rOFStream << "#. " << m_sExtractCom.getStr() << std::endl; + if ( !m_sKeyId.isEmpty() ) + io_rOFStream << "#. " << m_sKeyId.getStr() << std::endl; if ( !m_sReference.isEmpty() ) io_rOFStream << "#: " << m_sReference.getStr() << std::endl; if ( m_bFuzzy ) @@ -125,14 +149,12 @@ void GenPoEntry::writeToFile(std::ofstream& io_rOFStream) if ( !m_sContext.isEmpty() ) io_rOFStream << "msgctxt " << ImplGenMsgString(m_sContext).getStr() << std::endl; - io_rOFStream << "msgid " - << ImplGenMsgString( - ImplEscapeText(m_sUnTransStr)).getStr() - << std::endl; - io_rOFStream << "msgstr " - << ImplGenMsgString( - ImplEscapeText(m_sTransStr)).getStr() - << std::endl; + io_rOFStream << "msgid " + << ImplGenMsgString(ImplEscapeText(m_sUnTransStr)).getStr() + << std::endl; + io_rOFStream << "msgstr " + << ImplGenMsgString(ImplEscapeText(m_sTransStr)).getStr() + << std::endl; } //Class PoEntry @@ -156,48 +178,7 @@ void ImplSplitAt(const OString& rSource, const sal_Int32 nDelimiter, o_vParts.push_back(rSource.copy(nLastSplit)); } -//Generate crc24 -sal_Int32 ImplGenCRC24(const OString& rKey) -{ - const sal_Int32 CRC24_INIT = 0x00b704ce; - const sal_Int32 CRC24_POLY = 0x00864cfb; - sal_Int32 nCRC = CRC24_INIT; - sal_Int32 nPosition = 0; - while ( nPosition < rKey.getLength() ) - { - nCRC ^= sal_Int32(rKey[nPosition]) << 16; - for (sal_uInt16 i = 0; i < 8; ++i) - { - nCRC <<= 1; - if (nCRC & 0x01000000) - nCRC ^= CRC24_POLY; - } - ++nPosition; - } - return nCRC & 0x00ffffff; -} - -//Generate KeyId -OString ImplGenKeyId(const OString& rSourcePath, const OString& rContext) -{ - std::vector vPathParts; - ImplSplitAt(rSourcePath,'\\',vPathParts); - if ( vPathParts.size()<3 ) throw; - - sal_Int32 nCRC = ImplGenCRC24( vPathParts[vPathParts.size()-3] + "_" + - vPathParts[vPathParts.size()-2] + "_" + - vPathParts[vPathParts.size()-1] + "_" + - rContext); - const OString sSymbols = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#_"; - OString sKeyId = ""; - while ( sKeyId.getLength() < 4 ) - { - sKeyId += sSymbols.copy(nCRC & 63, 1); - nCRC >>= 6; - } - return sKeyId; -} //Construct PoEntry from sdfline PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) @@ -206,7 +187,6 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) , m_sLocalId( OString() ) , m_sResourceType(OString() ) , m_eType( TTEXT ) - , m_sKeyId( OString() ) { setWhiteSpace("\n"); std::vector vParts; @@ -236,13 +216,13 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) throw; break; } setContext(sContext); - m_sKeyId = ImplGenKeyId(vParts[PROJECT] + "\\" + vParts[SOURCEFILE], - sContext); - setExtractCom((m_sHelpText.isEmpty() ? "" : m_sHelpText + "\n") + m_sKeyId); + setExtractCom(m_sHelpText); setUnTransStr(vParts[eType]); + genKeyId(); } +//Destructor PoEntry::~PoEntry() { } -- cgit From ecfa813595cb577781668219d9e17a0494f92bea Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 29 Aug 2012 12:58:29 +0200 Subject: Some cleanup Use normal integer types when it's unecessary to use sal_int types. Delete some hack from code. Change-Id: I93f0b1f260578d3aa9609b7e9d8a79053693971b Reviewed-on: https://gerrit.libreoffice.org/510 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/source/localize.cxx | 14 +++++++------- l10ntools/source/po.cxx | 22 +++++++++++----------- l10ntools/source/renewpo.cxx | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index bef2444ae6a8..598eccf60601 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -194,13 +194,13 @@ void handleCommand( throw false; //TODO } rtl::OUStringBuffer buf( - //getEnvironment( - //rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOLARVER")))); - //buf.append('/'); - //buf.append( - //getEnvironment( - rtl::OUString("/home/zolnai/git/libo/solver/unxlngi6.pro")); - // RTL_CONSTASCII_USTRINGPARAM("INPATH_FOR_BUILD")))); + getEnvironment( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOLARVER")))); + buf.append('/'); + buf.append( + getEnvironment( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("INPATH_FOR_BUILD")))); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("/bin/")); buf.append(executable); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" -e -p ")); diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index c488c8798d0e..472e8766a86e 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -45,7 +45,7 @@ OString ImplGenKeyId(const OString& rGenerator) OString sKeyId = ""; while ( sKeyId.getLength() < 4 ) { - //Concat a char from the [33,126] intervallum of ASCII + //Concat a char from the [33,126] interval of ASCII sKeyId += OString(char(int(double(nCRC & 255)/255*93)+33)); nCRC >>= 8; } @@ -59,10 +59,10 @@ OString ImplEscapeText(const OString& rText, { if(rEscaped.getLength()!=2*rUnEscaped.getLength()) throw; OString sResult = rText; - sal_Int32 nCount = 0; - for(sal_Int32 nIndex=0; nIndex& o_vParts) { o_vParts.resize( 0 ); - sal_Int32 nActIndex( 0 ); - sal_Int32 nLastSplit( 0 ); + int nActIndex( 0 ); + int nLastSplit( 0 ); while( nActIndex < rSource.getLength() ) { if ( rSource[nActIndex] == nDelimiter ) diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index f68250ee37c0..20738b1ca03c 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -61,8 +61,8 @@ OString GetPath(const OString& rPath, const OString& rLine) OString DelLocalId(const OString& rLine) { - sal_uInt16 nTabIndex = 0; - for(sal_uInt16 nComponent=0; nComponent vTypes = { PoEntry::TTEXT, PoEntry::TQUICKHELPTEXT, PoEntry::TTITLE }; - sal_uInt16 nDummyBit = 0; - for( sal_uInt16 nIndex=0; nIndex Date: Thu, 30 Aug 2012 12:41:18 +0200 Subject: More cleanup aka clean up cleanup Use integers consistently Change headers Make variable initialization uniform Change-Id: I91937704a80c0d5997ad81591ce79076794a4e32 Reviewed-on: https://gerrit.libreoffice.org/517 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/Executable_renewpo.mk | 19 ++++++--------- l10ntools/inc/po.hxx | 31 +++++-------------------- l10ntools/source/po.cxx | 51 +++++++++++++---------------------------- l10ntools/source/renewpo.cxx | 31 +++++-------------------- 4 files changed, 35 insertions(+), 97 deletions(-) diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk index 33e38b22751f..4872e8a2bb77 100644 --- a/l10ntools/Executable_renewpo.mk +++ b/l10ntools/Executable_renewpo.mk @@ -1,18 +1,13 @@ -# for the specific language governing rights and limitations under the -# License. +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -# Major Contributor(s): -# Copyright (C) 2012 David Ostrovsky (initial developer) +# This file is part of the LibreOffice project. # -# All Rights Reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# For minor contributions see the git repository. +# convert old po to new po # -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. $(eval $(call gb_Executable_Executable,renewpo)) @@ -33,4 +28,4 @@ $(eval $(call gb_Executable_add_exception_objects,renewpo,\ l10ntools/source/renewpo \ )) -# vim:set shiftwidth=4 softtabstop=4 expandtab: +# vim: set noet sw=4 ts=4: diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index 3330afb0e880..c03baf8dc829 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -1,30 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #ifndef _PO_INCLUDED #define _PO_INCLUDED diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 472e8766a86e..6848d7e3680f 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -1,30 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #include "po.hxx" #include @@ -60,9 +41,9 @@ OString ImplEscapeText(const OString& rText, if(rEscaped.getLength()!=2*rUnEscaped.getLength()) throw; OString sResult = rText; int nCount = 0; - for(int nIndex=0; nIndex& o_vParts) { o_vParts.resize( 0 ); - int nActIndex( 0 ); - int nLastSplit( 0 ); + sal_Int32 nActIndex = 0; + sal_Int32 nLastSplit = 0; while( nActIndex < rSource.getLength() ) { if ( rSource[nActIndex] == nDelimiter ) @@ -257,8 +238,8 @@ void PoEntry::setTransStr(const OString& rTransStr) //Get actual time in "YEAR-MO-DA HO:MI+ZONE" form OString ImplGetTime() { - time_t aNow(time(NULL)); - struct tm* pNow(localtime(&aNow)); + time_t aNow = time(NULL); + struct tm* pNow = localtime(&aNow); char pBuff[50]; strftime( pBuff, sizeof pBuff, "%Y-%m-%d %H:%M%z", pNow ); return pBuff; diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index 20738b1ca03c..a6e127356118 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -1,30 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #include #include -- cgit From 574ddaba5315816a5629550a0a12f9c694b79370 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Fri, 31 Aug 2012 14:40:14 +0200 Subject: Make Regexpr class safer Make copy constructor and copy operator private Change-Id: Ifdaff6d74bebb0406432d470c84d221f2c06ba94 Reviewed-on: https://gerrit.libreoffice.org/519 Reviewed-by: Andras Timar Tested-by: Andras Timar --- regexp/inc/regexp/reclass.hxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/regexp/inc/regexp/reclass.hxx b/regexp/inc/regexp/reclass.hxx index f61112dbe58b..4be52bbe6503 100644 --- a/regexp/inc/regexp/reclass.hxx +++ b/regexp/inc/regexp/reclass.hxx @@ -357,6 +357,9 @@ class REGEXP_DLLPUBLIC Regexpr sal_Bool iswordend(const sal_Unicode *d, sal_Unicode *string, sal_Int32 ssize); void set_list_bit(sal_Unicode c, sal_Unicode *b); + Regexpr(const Regexpr&); + Regexpr& operator=(const Regexpr&); + public: // constructors Regexpr( const ::com::sun::star::util::SearchOptions & rOptions, -- cgit From 8a8a39c4c129daa3547dce5f0caf20429997e919 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Fri, 31 Aug 2012 15:09:06 +0200 Subject: Implement more Po method for merge Implement file oprerations(entire reading and rest part of writing) Convert text to merge/sdf form Plus cleanup Change-Id: I6bab9bb202fcdc6d0f2a13f6c44d28e22c688e1e Reviewed-on: https://gerrit.libreoffice.org/520 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/Executable_localize.mk | 1 + l10ntools/Executable_renewpo.mk | 1 + l10ntools/StaticLibrary_transex.mk | 2 + l10ntools/inc/po.hxx | 20 ++- l10ntools/source/po.cxx | 324 +++++++++++++++++++++++++++++++------ l10ntools/source/renewpo.cxx | 4 +- 6 files changed, 299 insertions(+), 53 deletions(-) diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk index 6184a8982bd5..e6e7f1fc2c6e 100644 --- a/l10ntools/Executable_localize.mk +++ b/l10ntools/Executable_localize.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,localize,\ $(eval $(call gb_Executable_use_libraries,localize,\ sal \ + i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,localize,\ diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk index 4872e8a2bb77..5aa036a40100 100644 --- a/l10ntools/Executable_renewpo.mk +++ b/l10ntools/Executable_renewpo.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Executable_set_include,renewpo,\ $(eval $(call gb_Executable_use_libraries,renewpo,\ sal \ + i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,renewpo,\ diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index 21f50e572ef6..82e20a012c5f 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -32,6 +32,8 @@ $(eval $(call gb_StaticLibrary_set_include,transex,\ $$(INCLUDE) \ )) +$(eval $(call gb_StaticLibrary_use_sdk_api,transex)) + $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\ l10ntools/source/export2 \ l10ntools/source/merge \ diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index c03baf8dc829..df3004c1fe5e 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -31,6 +31,14 @@ public: GenPoEntry(); virtual ~GenPoEntry(); + virtual OString getWhiteSpace() const { return m_sWhiteSpace; } + virtual OString getExtractCom() const { return m_sExtractCom; } + virtual OString getReference() const { return m_sReference; } + virtual OString getContext() const { return m_sContext; } + virtual OString getUnTransStr() const { return m_sUnTransStr; } + virtual OString getTransStr() const { return m_sTransStr; } + virtual bool getFuzzy() const { return m_bFuzzy; } + virtual void setWhiteSpace(const OString& rWhiteSpace) { m_sWhiteSpace = rWhiteSpace; } virtual void setExtractCom(const OString& rExtractCom) @@ -46,7 +54,9 @@ public: virtual void setFuzzy(bool bFuzzy) { m_bFuzzy = bFuzzy; } virtual void genKeyId(); - virtual void writeToFile(std::ofstream& io_rOFStream); + + virtual void writeToFile(std::ofstream& rOFStream); + virtual void readFromFile(std::ifstream& rIFStream); }; class PoEntry: public GenPoEntry @@ -67,13 +77,19 @@ private: public: + PoEntry(); PoEntry(const OString& i_rSDFLine, - const TYPE eType = TTEXT); + const TYPE eType = TTEXT); virtual ~PoEntry(); + virtual OString getUnTransStr() const; + virtual OString getTransStr() const; virtual void setUnTransStr(const OString& rUnTransStr); virtual void setTransStr(const OString& rTransStr); + virtual void writeToFile(std::ofstream& rOFStream); + virtual void readFromFile(std::ifstream& rIFStream); + }; class PoHeader: public GenPoEntry diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 6848d7e3680f..a82a88b186f4 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -7,11 +7,20 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "po.hxx" +#include +#include +#include +#include +#include + +#include +#include #include #include #include +#include "po.hxx" + #define POESCAPED OString("\\n\\t\\r\\\\\\\"") #define POUNESCAPED OString("\n\t\r\\\"") @@ -69,17 +78,17 @@ OString ImplUnEscapeText(const OString& rText, return sResult; } -//Generate msgctxt, msgid and msgstr strings -OString ImplGenMsgString(const OString& rSource) +//Convert a normal string to msg/po output string +OString ImplGenMsgString(const OString& rString) { - if ( rSource.isEmpty() ) + if ( rString.isEmpty() ) return "\"\""; - OString sResult = "\"" + rSource + "\""; + OString sResult = "\"" + ImplEscapeText(rString) + "\""; sal_Int32 nIndex = 0; while((nIndex=sResult.indexOf("\\n",nIndex))!=-1) { - if( sResult.copy(nIndex-1,3) != "\\\\n" ) + if(sResult.copy(nIndex-1,3)!="\\\\n" && nIndex!=sResult.getLength()-3) sResult = sResult.replaceAt(nIndex,2,"\\n\"\n\""); ++nIndex; } @@ -90,6 +99,18 @@ OString ImplGenMsgString(const OString& rSource) return sResult; } +//Convert msg string to normal form +OString ImplGenNormString(const OString& rString) +{ + return ImplUnEscapeText(rString.copy(1,rString.getLength()-2)); +} + +//Decide whether a string starts with an other string +bool ImplStartsWith(const OString& rString,const OString& rStart) +{ + return rString.copy(0,rStart.getLength())==rStart; +} + //Default constructor GenPoEntry::GenPoEntry() : m_sWhiteSpace( OString() ) @@ -115,29 +136,79 @@ void GenPoEntry::genKeyId() } //Write to file -void GenPoEntry::writeToFile(std::ofstream& io_rOFStream) +void GenPoEntry::writeToFile(std::ofstream& rOFStream) { if ( !m_sWhiteSpace.isEmpty() ) - io_rOFStream << m_sWhiteSpace.getStr(); + rOFStream << m_sWhiteSpace.getStr(); if ( !m_sExtractCom.isEmpty() ) - io_rOFStream << "#. " << m_sExtractCom.getStr() << std::endl; + rOFStream << "#. " << m_sExtractCom.getStr() << std::endl; if ( !m_sKeyId.isEmpty() ) - io_rOFStream << "#. " << m_sKeyId.getStr() << std::endl; + rOFStream << "#. " << m_sKeyId.getStr() << std::endl; if ( !m_sReference.isEmpty() ) - io_rOFStream << "#: " << m_sReference.getStr() << std::endl; + rOFStream << "#: " << m_sReference.getStr() << std::endl; if ( m_bFuzzy ) - io_rOFStream << "#, fuzzy" << std::endl; + rOFStream << "#, fuzzy" << std::endl; if ( !m_sContext.isEmpty() ) - io_rOFStream << "msgctxt " - << ImplGenMsgString(m_sContext).getStr() << std::endl; - io_rOFStream << "msgid " - << ImplGenMsgString(ImplEscapeText(m_sUnTransStr)).getStr() - << std::endl; - io_rOFStream << "msgstr " - << ImplGenMsgString(ImplEscapeText(m_sTransStr)).getStr() - << std::endl; + rOFStream << "msgctxt " + << ImplGenMsgString(m_sContext).getStr() << std::endl; + rOFStream << "msgid " + << ImplGenMsgString(m_sUnTransStr).getStr() << std::endl; + rOFStream << "msgstr " + << ImplGenMsgString(m_sTransStr).getStr() << std::endl; } +//Read from file +void GenPoEntry::readFromFile(std::ifstream& rIFStream) +{ + m_sWhiteSpace = "\n"; + OString* pLastMsg = 0; + std::string sTemp; + getline(rIFStream,sTemp); + while(!rIFStream.eof()) + { + OString sLine = OString(sTemp.data(),sTemp.length()); + if (ImplStartsWith(sLine,"#. ")) + { + if (sLine.getLength()==7) + m_sKeyId = sLine.copy(3); + else + m_sExtractCom = sLine.copy(3); + } + else if (ImplStartsWith(sLine,"#: ")) + { + m_sReference = sLine.copy(3); + } + else if (ImplStartsWith(sLine,"#, fuzzy")) + { + m_bFuzzy = true; + } + else if (ImplStartsWith(sLine,"msgctxt ")) + { + m_sContext = ImplGenNormString(sLine.copy(8)); + pLastMsg = &m_sContext; + } + else if (ImplStartsWith(sLine,"msgid ")) + { + m_sUnTransStr = ImplGenNormString(sLine.copy(6)); + pLastMsg = &m_sUnTransStr; + } + else if (ImplStartsWith(sLine,"msgstr ")) + { + m_sTransStr = ImplGenNormString(sLine.copy(7)); + pLastMsg = &m_sTransStr; + } + else if (ImplStartsWith(sLine,"\"") && pLastMsg) + { + *pLastMsg += ImplGenNormString(sLine); + } + else + break; + getline(rIFStream,sTemp); + } + if (m_sKeyId.isEmpty()) + genKeyId(); + } + //Class PoEntry //Split string at the delimiter char @@ -159,8 +230,122 @@ void ImplSplitAt(const OString& rSource, const sal_Char nDelimiter, o_vParts.push_back(rSource.copy(nLastSplit)); } +//Unescape sdf string +OString ImplUnEscapeSDFText(const OString& rText,const bool bHelpText = false) +{ + if ( bHelpText ) + return ImplUnEscapeText(rText,"\\<\\>\\\"\\\\","<>\"\\"); + else + return ImplUnEscapeText(rText,"\\n\\t\\r","\n\t\r"); +} + +//Miminize the length of the regular expression result +void ImplMinimize(const OUString& rText, Regexpr& io_rRegExp, re_registers& io_rRegs) +{ + re_registers aPrevRegs; + const sal_Int32 nStart = io_rRegs.start[0]; + do + { + const OUString sTemp = rText.copy(0,io_rRegs.end[0]-1); + memcpy(static_cast(&aPrevRegs), static_cast(&io_rRegs), + sizeof(re_registers)); + memset(static_cast(&io_rRegs), 0, sizeof(re_registers)); + io_rRegExp.set_line(sTemp.getStr(),sTemp.getLength()); + io_rRegExp.re_search(&io_rRegs,nStart); + } while(io_rRegs.num_of_match); + + memcpy(static_cast(&io_rRegs),static_cast(&aPrevRegs), + sizeof(re_registers)); + io_rRegExp.set_line(rText.getStr(),rText.getLength()); +} + +//Find all special tag in a string using a regular expression +void ImplFindAllTag(const OString& rText,std::vector& o_vFoundTags) +{ + ::com::sun::star::util::SearchOptions aOptions; + aOptions.algorithmType = ::com::sun::star::util::SearchAlgorithms_REGEXP; + aOptions.searchFlag = ::com::sun::star::util::SearchFlags::NORM_WORD_ONLY; + aOptions.searchString = "<[/]?[a-z_\\-]+(| +[a-z]+=\".*\") *[/]?>"; + ::com::sun::star::uno::Reference< + ::com::sun::star::i18n::XExtendedTransliteration > xTrans; + + Regexpr aRegExp(aOptions,xTrans); + const OUString sTemp(OStringToOUString(rText,RTL_TEXTENCODING_UTF8)); + aRegExp.set_line(sTemp.getStr(),sTemp.getLength()); + + re_registers aRegs; + memset(static_cast(&aRegs), 0, sizeof(re_registers)); + sal_Int32 nStart = 0; + o_vFoundTags.resize(0); + aRegExp.re_search(&aRegs,nStart); + while(aRegs.num_of_match) + { + ImplMinimize(sTemp,aRegExp,aRegs); + o_vFoundTags.push_back( + rText.copy(aRegs.start[0],aRegs.end[0]-aRegs.start[0])); + nStart = aRegs.end[0]; + memset(static_cast(&aRegs), 0, sizeof(re_registers)); + aRegExp.re_search(&aRegs,nStart); + } +} + +//Escape special tags +OString ImplEscapeTags(const OString& rText) +{ + typedef std::vector StrVec; + const StrVec vTagsForEscape = + { "ahelp", "link", "item", "emph", "defaultinline", + "switchinline", "caseinline", "variable", + "bookmark_value", "image", "embedvar", "alt" }; + StrVec vFoundTags; + ImplFindAllTag(rText,vFoundTags); + OString sResult = rText; + for(StrVec::const_iterator pFound = vFoundTags.begin(); + pFound != vFoundTags.end(); ++pFound) + { + bool bEscapeThis = false; + for(StrVec::const_iterator pEscape = vTagsForEscape.begin(); + pEscape != vTagsForEscape.end(); ++pEscape) + { + if (ImplStartsWith(*pFound,"<" + *pEscape) || + *pFound == "") + { + bEscapeThis = true; + break; + } + } + if (bEscapeThis || *pFound=="
" || *pFound =="") + { + OString sToReplace = "\\<" + pFound->copy(1,pFound->getLength()-2). + replaceAll("\"","\\\"") + "\\>"; + sResult = sResult.replaceAll(*pFound, sToReplace); + } + } + return sResult; +} + +//Escape to get sdf/merge string +OString ImplEscapeSDFText(const OString& rText,const bool bHelpText = false) +{ + if ( bHelpText ) + return ImplEscapeTags(rText.replaceAll("\\","\\\\")); + else + return ImplEscapeText(rText,"\n\t\r","\\n\\t\\r"); +} +//Default constructor +PoEntry::PoEntry() + : GenPoEntry() + , m_sSourceFile( OString() ) + , m_sGroupId( OString() ) + , m_sLocalId( OString() ) + , m_sResourceType( OString() ) + , m_eType( TTEXT ) + , m_sHelpText( OString() ) +{ +} + //Construct PoEntry from sdfline PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) : m_sSourceFile( OString() ) @@ -168,39 +353,20 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) , m_sLocalId( OString() ) , m_sResourceType(OString() ) , m_eType( TTEXT ) + , m_sHelpText( OString() ) { - setWhiteSpace("\n"); std::vector vParts; ImplSplitAt(rSDFLine,'\t',vParts); if(vParts.size()!=15) throw; m_sSourceFile = vParts[SOURCEFILE]. copy(vParts[SOURCEFILE].lastIndexOf("\\")+1); - setReference(m_sSourceFile); + m_sResourceType = vParts[RESOURCETYPE]; m_sGroupId = vParts[GROUPID]; m_sLocalId = vParts[LOCALID]; - m_sResourceType = vParts[RESOURCETYPE]; m_eType = eType; m_sHelpText = vParts[HELPTEXT]; - - OString sContext = m_sGroupId + "\\n" + - (m_sLocalId.isEmpty() ? "" : m_sLocalId + "\\n") + - m_sResourceType; - switch(eType){ - case TTEXT: - sContext += ".text"; break; - case TQUICKHELPTEXT: - sContext += ".quickhelptext"; break; - case TTITLE: - sContext += ".title"; break; - default: - throw; break; - } - setContext(sContext); - setExtractCom(m_sHelpText); - setUnTransStr(vParts[eType]); - genKeyId(); } //Destructor @@ -208,16 +374,22 @@ PoEntry::~PoEntry() { } -//Unescape sdf text -OString ImplUnEscapeSDFText(const OString& rText,const bool bHelpText = false) +//Get translation string in sdf/merge format +OString PoEntry::getUnTransStr() const { - if ( bHelpText ) - return ImplUnEscapeText(rText,"\\<\\>\\\"\\\\","<>\"\\"); - else - return ImplUnEscapeText(rText,"\\n\\t\\r","\n\t\r"); + return ImplEscapeSDFText(GenPoEntry::getUnTransStr(), + m_sSourceFile.endsWith(".xhp")); +} + +//Get translated string in sdf/merge format +OString PoEntry::getTransStr() const +{ + return ImplEscapeSDFText(GenPoEntry::getTransStr(), + m_sSourceFile.endsWith(".xhp")); + } -//Set translation text when input is in sdf format +//Set translation string when input is in sdf format void PoEntry::setUnTransStr(const OString& rUnTransStr) { GenPoEntry::setUnTransStr( @@ -225,7 +397,7 @@ void PoEntry::setUnTransStr(const OString& rUnTransStr) rUnTransStr,m_sSourceFile.endsWith(".xhp"))); } -//Set translated text when input is in sdf format +//Set translated string when input is in sdf format void PoEntry::setTransStr(const OString& rTransStr) { GenPoEntry::setTransStr( @@ -233,6 +405,60 @@ void PoEntry::setTransStr(const OString& rTransStr) rTransStr,m_sSourceFile.endsWith(".xhp"))); } +//Write to file +void PoEntry::writeToFile(std::ofstream& rOFStream) +{ + setWhiteSpace("\n"); + setExtractCom(m_sHelpText); + setReference(m_sSourceFile); + + OString sContext = m_sGroupId + "\n" + + (m_sLocalId.isEmpty() ? "" : m_sLocalId + "\n") + + m_sResourceType; + switch(m_eType){ + case TTEXT: + sContext += ".text"; break; + case TQUICKHELPTEXT: + sContext += ".quickhelptext"; break; + case TTITLE: + sContext += ".title"; break; + default: + throw; break; + } + setContext(sContext); + genKeyId(); + GenPoEntry::writeToFile(rOFStream); +} + + +//Read from file +void PoEntry::readFromFile(std::ifstream& rIFStream) +{ + GenPoEntry::readFromFile(rIFStream); + m_sSourceFile = getReference(); + + OString sContext = getContext(); + m_sGroupId = sContext.getToken(0,'\n'); + + if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) + m_sResourceType = sContext.getToken(1,'\n').getToken(0,'.'); + else + { + m_sLocalId = sContext.getToken(1,'\n'); + m_sResourceType = sContext.getToken(2,'\n').getToken(0,'.'); + } + if (sContext.endsWith(".text")) + m_eType = TTEXT; + else if (sContext.endsWith(".quickhelptext")) + m_eType = TQUICKHELPTEXT; + else if (sContext.endsWith(".title")) + m_eType = TTITLE; + else + throw; + + m_sHelpText = getExtractCom(); +} + //Class PoHeader //Get actual time in "YEAR-MO-DA HO:MI+ZONE" form diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index a6e127356118..7e567f07d52e 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -63,7 +63,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, //Generate and open sdf cout << "Process start with language: " << LangEntryName.getStr() << endl; system( (rpo2loPath + - " -i " + rPath.getStr() + LangEntryName + + " -i " + rPath + "/" + LangEntryName + " -o " + SDFFileName + " -l " + LangEntryName + " -t " + rSDFPath).getStr()); @@ -77,7 +77,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, while(!aSDFInput.eof()) { OString sActUnTrans = sLine; - OString sPath = rPath + LangEntryName; + OString sPath = rPath + "/"+ LangEntryName; OString sActSourcePath = GetPath(sPath,sActUnTrans); //Make new po file, copy header with some changes if (!aOutPut.is_open()) -- cgit From dd83185b004e08fe0b291ede225d0e93be27c819 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Fri, 31 Aug 2012 18:19:32 +0200 Subject: Correct KeyId generator Use integer aritmetic and less cast Change-Id: I6fc0667fcbcee5f1a2dc964e2653c042338afa0c Reviewed-on: https://gerrit.libreoffice.org/523 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/source/po.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index a82a88b186f4..59199c22c293 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -32,14 +32,15 @@ OString ImplGenKeyId(const OString& rGenerator) boost::crc_32_type aCRC32; aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength()); sal_uInt32 nCRC = aCRC32.checksum(); - OString sKeyId = ""; - while ( sKeyId.getLength() < 4 ) + char sKeyId[5]; + for(int nIndex = 0; nIndex < 4; ++nIndex) { - //Concat a char from the [33,126] interval of ASCII - sKeyId += OString(char(int(double(nCRC & 255)/255*93)+33)); + //Get a char from the [33,126] interval of ASCII + sKeyId[nIndex] = static_cast((nCRC & 255) % 93 + 33); nCRC >>= 8; } - return sKeyId; + sKeyId[4] = 0; + return OString(sKeyId); } //Escape text -- cgit From 42a2fb1c24750dde53b737d1fb45e2bb7286a3f2 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 2 Sep 2012 21:10:35 +0200 Subject: Make interface for PoEntry Use composition insted of inheritance Make all necessary method. Make header file clear Make header file clear Plus cleanup. Change-Id: Idfcc7a4a4f51b402ec86a9685e8ad9fdb23fea71 Reviewed-on: https://gerrit.libreoffice.org/530 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/inc/po.hxx | 61 +++++++++++---------- l10ntools/source/po.cxx | 120 ++++++++++++++++++++++++++++++------------ regexp/inc/regexp/reclass.hxx | 6 +-- 3 files changed, 119 insertions(+), 68 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index df3004c1fe5e..b4b18c49d980 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -39,27 +39,20 @@ public: virtual OString getTransStr() const { return m_sTransStr; } virtual bool getFuzzy() const { return m_bFuzzy; } - virtual void setWhiteSpace(const OString& rWhiteSpace) - { m_sWhiteSpace = rWhiteSpace; } - virtual void setExtractCom(const OString& rExtractCom) - { m_sExtractCom = rExtractCom; } - virtual void setReference(const OString& rReference) - { m_sReference = rReference; } - virtual void setContext(const OString& rContext) - { m_sContext = rContext; } - virtual void setUnTransStr(const OString& rUnTransStr) - { m_sUnTransStr = rUnTransStr; } - virtual void setTransStr(const OString& rTransStr) - { m_sTransStr = rTransStr; } - virtual void setFuzzy(bool bFuzzy) - { m_bFuzzy = bFuzzy; } + virtual void setWhiteSpace(const OString& rWhiteSpace); + virtual void setExtractCom(const OString& rExtractCom); + virtual void setReference(const OString& rReference); + virtual void setContext(const OString& rContext); + virtual void setUnTransStr(const OString& rUnTransStr); + virtual void setTransStr(const OString& rTransStr); + virtual void setFuzzy(const bool bFuzzy); virtual void genKeyId(); virtual void writeToFile(std::ofstream& rOFStream); virtual void readFromFile(std::ifstream& rIFStream); }; -class PoEntry: public GenPoEntry +class PoEntry { public: enum SDFPARTS { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID, @@ -68,34 +61,43 @@ public: enum TYPE { TTEXT=TEXT, TQUICKHELPTEXT=QUICKHELPTEXT, TTITLE=TITLE }; private: + GenPoEntry m_aGenPo; OString m_sSourceFile; OString m_sGroupId; OString m_sLocalId; OString m_sResourceType; TYPE m_eType; OString m_sHelpText; - public: - PoEntry(); - PoEntry(const OString& i_rSDFLine, - const TYPE eType = TTEXT); - virtual ~PoEntry(); - - virtual OString getUnTransStr() const; - virtual OString getTransStr() const; - virtual void setUnTransStr(const OString& rUnTransStr); - virtual void setTransStr(const OString& rTransStr); - - virtual void writeToFile(std::ofstream& rOFStream); - virtual void readFromFile(std::ifstream& rIFStream); + PoEntry(); + PoEntry(const OString& i_rSDFLine, + const TYPE eType = TTEXT); + virtual ~PoEntry(); + + OString getSourceFile() const { return m_sSourceFile; } + OString getGroupId() const { return m_sGroupId; } + OString getLocalId() const { return m_sLocalId; } + OString getResourceType() const { return m_sResourceType; } + TYPE getType() const { return m_eType; } + OString getHelpText() const { return m_sHelpText; } + OString getUnTransStr() const; + OString getTransStr() const; + bool getFuzzy() const { return m_aGenPo.getFuzzy(); } + void setUnTransStr(const OString& rUnTransStr); + void setTransStr(const OString& rTransStr); + void setFuzzy(const bool bFuzzy); + + void writeToFile(std::ofstream& rOFStream); + void readFromFile(std::ifstream& rIFStream); }; -class PoHeader: public GenPoEntry +class PoHeader { private: + GenPoEntry m_aGenPo; OString m_sExtractionSource; OString m_sProjectIdVersion; OString m_sReportMsgidBugsTo; @@ -114,6 +116,7 @@ private: public: PoHeader( const OString& rExtSrc ); ~PoHeader(); + void writeToFile(std::ofstream& rOFStream); }; #endif // _PO_INCLUDED diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 59199c22c293..1a7c5aead7df 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -39,7 +39,7 @@ OString ImplGenKeyId(const OString& rGenerator) sKeyId[nIndex] = static_cast((nCRC & 255) % 93 + 33); nCRC >>= 8; } - sKeyId[4] = 0; + sKeyId[4] = '\0'; return OString(sKeyId); } @@ -130,6 +130,42 @@ GenPoEntry::~GenPoEntry() { } +//Set class members +void GenPoEntry::setWhiteSpace(const OString& rWhiteSpace) +{ + m_sWhiteSpace = rWhiteSpace; +} + +void GenPoEntry::setExtractCom(const OString& rExtractCom) +{ + m_sExtractCom = rExtractCom; +} + +void GenPoEntry::setReference(const OString& rReference) +{ + m_sReference = rReference; +} + +void GenPoEntry::setContext(const OString& rContext) +{ + m_sContext = rContext; +} + +void GenPoEntry::setUnTransStr(const OString& rUnTransStr) +{ + m_sUnTransStr = rUnTransStr; +} + +void GenPoEntry::setTransStr(const OString& rTransStr) +{ + m_sTransStr = rTransStr; +} + +void GenPoEntry::setFuzzy(const bool bFuzzy) +{ + m_bFuzzy = bFuzzy; +} + //Set keyid void GenPoEntry::genKeyId() { @@ -337,7 +373,7 @@ OString ImplEscapeSDFText(const OString& rText,const bool bHelpText = false) //Default constructor PoEntry::PoEntry() - : GenPoEntry() + : m_aGenPo( GenPoEntry() ) , m_sSourceFile( OString() ) , m_sGroupId( OString() ) , m_sLocalId( OString() ) @@ -349,7 +385,8 @@ PoEntry::PoEntry() //Construct PoEntry from sdfline PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) - : m_sSourceFile( OString() ) + : m_aGenPo( GenPoEntry() ) + , m_sSourceFile( OString() ) , m_sGroupId( OString() ) , m_sLocalId( OString() ) , m_sResourceType(OString() ) @@ -378,14 +415,14 @@ PoEntry::~PoEntry() //Get translation string in sdf/merge format OString PoEntry::getUnTransStr() const { - return ImplEscapeSDFText(GenPoEntry::getUnTransStr(), + return ImplEscapeSDFText(m_aGenPo.getUnTransStr(), m_sSourceFile.endsWith(".xhp")); } //Get translated string in sdf/merge format OString PoEntry::getTransStr() const { - return ImplEscapeSDFText(GenPoEntry::getTransStr(), + return ImplEscapeSDFText(m_aGenPo.getTransStr(), m_sSourceFile.endsWith(".xhp")); } @@ -393,25 +430,31 @@ OString PoEntry::getTransStr() const //Set translation string when input is in sdf format void PoEntry::setUnTransStr(const OString& rUnTransStr) { - GenPoEntry::setUnTransStr( - ImplUnEscapeSDFText( - rUnTransStr,m_sSourceFile.endsWith(".xhp"))); + m_aGenPo.setUnTransStr( + ImplUnEscapeSDFText( + rUnTransStr,m_sSourceFile.endsWith(".xhp"))); } //Set translated string when input is in sdf format void PoEntry::setTransStr(const OString& rTransStr) { - GenPoEntry::setTransStr( - ImplUnEscapeSDFText( - rTransStr,m_sSourceFile.endsWith(".xhp"))); + m_aGenPo.setTransStr( + ImplUnEscapeSDFText( + rTransStr,m_sSourceFile.endsWith(".xhp"))); +} + +//Set fuzzy flag +void PoEntry::setFuzzy(const bool bFuzzy) +{ + m_aGenPo.setFuzzy(bFuzzy); } //Write to file void PoEntry::writeToFile(std::ofstream& rOFStream) { - setWhiteSpace("\n"); - setExtractCom(m_sHelpText); - setReference(m_sSourceFile); + m_aGenPo.setWhiteSpace("\n"); + m_aGenPo.setExtractCom(m_sHelpText); + m_aGenPo.setReference(m_sSourceFile); OString sContext = m_sGroupId + "\n" + (m_sLocalId.isEmpty() ? "" : m_sLocalId + "\n") + @@ -426,19 +469,19 @@ void PoEntry::writeToFile(std::ofstream& rOFStream) default: throw; break; } - setContext(sContext); - genKeyId(); - GenPoEntry::writeToFile(rOFStream); + m_aGenPo.setContext(sContext); + m_aGenPo.genKeyId(); + m_aGenPo.writeToFile(rOFStream); } //Read from file void PoEntry::readFromFile(std::ifstream& rIFStream) { - GenPoEntry::readFromFile(rIFStream); - m_sSourceFile = getReference(); + m_aGenPo.readFromFile(rIFStream); + m_sSourceFile = m_aGenPo.getReference(); - OString sContext = getContext(); + OString sContext = m_aGenPo.getContext(); m_sGroupId = sContext.getToken(0,'\n'); if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) @@ -457,7 +500,7 @@ void PoEntry::readFromFile(std::ifstream& rIFStream) else throw; - m_sHelpText = getExtractCom(); + m_sHelpText = m_aGenPo.getExtractCom(); } //Class PoHeader @@ -474,7 +517,8 @@ OString ImplGetTime() //Constructor PoHeader::PoHeader( const OString& rExtSrc ) - : m_sExtractionSource( rExtSrc ) + : m_aGenPo( GenPoEntry() ) + , m_sExtractionSource( rExtSrc ) , m_sProjectIdVersion( "PACKAGE VERSION" ) , m_sReportMsgidBugsTo( OString("https://bugs.freedesktop.org/") + "enter_bug.cgi?product=LibreOffice&" + @@ -490,23 +534,29 @@ PoHeader::PoHeader( const OString& rExtSrc ) , m_sXGenerator( "LibreOffice" ) , m_sXAcceleratorMarker( "~" ) { - setExtractCom("extracted from " + rExtSrc); - setTransStr("Project-Id-Version: " + m_sProjectIdVersion + "\n" + - "Report-Msgid-Bugs-To: " + m_sReportMsgidBugsTo + "\n" + - "POT-Creation-Date: " + m_sPotCreationDate + "\n" + - "PO-Revision-Date: " + m_sPoRevisionDate + "\n" + - "Last-Translator: " + m_sLastTranslator + "\n" + - "Language-Team: " + m_sLanguageTeam + "\n" + - "MIME-Version: " + m_sMimeVersion + "\n" + - "Content-Type: " + m_sContentType + "; " + - "charset=" + m_sCharset + "\n" + - "Content-Transfer-Encoding: " + m_sEncoding + "\n" + - "X-Genarator: " + m_sXGenerator + "\n" + - "X-Accelerator_Marker: " + m_sXAcceleratorMarker + "\n"); + m_aGenPo.setExtractCom("extracted from " + rExtSrc); + m_aGenPo.setTransStr( + "Project-Id-Version: " + m_sProjectIdVersion + "\n" + + "Report-Msgid-Bugs-To: " + m_sReportMsgidBugsTo + "\n" + + "POT-Creation-Date: " + m_sPotCreationDate + "\n" + + "PO-Revision-Date: " + m_sPoRevisionDate + "\n" + + "Last-Translator: " + m_sLastTranslator + "\n" + + "Language-Team: " + m_sLanguageTeam + "\n" + + "MIME-Version: " + m_sMimeVersion + "\n" + + "Content-Type: " + m_sContentType + "; " + + "charset=" + m_sCharset + "\n" + + "Content-Transfer-Encoding: " + m_sEncoding + "\n" + + "X-Genarator: " + m_sXGenerator + "\n" + + "X-Accelerator_Marker: " + m_sXAcceleratorMarker + "\n"); } PoHeader::~PoHeader() { } +void PoHeader::writeToFile(std::ofstream& rOFStream) +{ + m_aGenPo.writeToFile(rOFStream); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/regexp/inc/regexp/reclass.hxx b/regexp/inc/regexp/reclass.hxx index 4be52bbe6503..ce4f50ef3b7b 100644 --- a/regexp/inc/regexp/reclass.hxx +++ b/regexp/inc/regexp/reclass.hxx @@ -33,6 +33,7 @@ #include #include #include +#include #if defined REGEXP_DLLIMPLEMENTATION #define REGEXP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT @@ -295,7 +296,7 @@ typedef union } register_info_type; -class REGEXP_DLLPUBLIC Regexpr +class REGEXP_DLLPUBLIC Regexpr: private boost::noncopyable { ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration > translit; @@ -357,9 +358,6 @@ class REGEXP_DLLPUBLIC Regexpr sal_Bool iswordend(const sal_Unicode *d, sal_Unicode *string, sal_Int32 ssize); void set_list_bit(sal_Unicode c, sal_Unicode *b); - Regexpr(const Regexpr&); - Regexpr& operator=(const Regexpr&); - public: // constructors Regexpr( const ::com::sun::star::util::SearchOptions & rOptions, -- cgit From 161f4ac95ae3df1daaede762862ea1c3ac4bb399 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 10 Sep 2012 20:31:38 +0200 Subject: Use po file for merge 1. step Make executables to waiting for po as input Add some function to po files Rewrite makefiles to use po files for merge Change KeyId generator not to use xml special charachters One filetype remain: properties Change-Id: If2bd2ae7afc61518c2d838a3cae301ef62dd9761 Reviewed-on: https://gerrit.libreoffice.org/593 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- l10ntools/Executable_cfgex.mk | 1 + l10ntools/Executable_helpex.mk | 1 + l10ntools/Executable_transex3.mk | 1 + l10ntools/Executable_ulfex.mk | 1 + l10ntools/Executable_xrmex.mk | 1 + l10ntools/inc/po.hxx | 18 +++- l10ntools/source/merge.cxx | 108 +++++++++++++++------ l10ntools/source/po.cxx | 175 ++++++++++++++++++++++++++--------- l10ntools/source/renewpo.cxx | 6 +- solenv/gbuild/AllLangResTarget.mk | 22 +++-- solenv/gbuild/Configuration.mk | 19 ++-- solenv/gbuild/ExtensionTarget.mk | 31 +++++-- solenv/gbuild/InstallModuleTarget.mk | 11 ++- solenv/gbuild/TargetLocations.mk | 2 +- solenv/inc/rules.mk | 12 +-- 15 files changed, 299 insertions(+), 110 deletions(-) diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk index 7dc23275da14..9fea979482bc 100644 --- a/l10ntools/Executable_cfgex.mk +++ b/l10ntools/Executable_cfgex.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,cfgex,\ $(eval $(call gb_Executable_use_libraries,cfgex,\ sal \ + i18nregexp \ )) $(eval $(call gb_Executable_add_scanners,cfgex,\ diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk index 470bd4c89d2c..3569dffb5156 100644 --- a/l10ntools/Executable_helpex.mk +++ b/l10ntools/Executable_helpex.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,helpex,\ $(eval $(call gb_Executable_use_libraries,helpex,\ sal \ + i18nregexp \ )) $(eval $(call gb_Executable_use_external,helpex,expat_utf8)) diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk index bc9a85272d9f..2d9590641d83 100644 --- a/l10ntools/Executable_transex3.mk +++ b/l10ntools/Executable_transex3.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,transex3,\ $(eval $(call gb_Executable_use_libraries,transex3,\ sal \ + i18nregexp \ )) $(eval $(call gb_Executable_add_scanners,transex3,\ diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk index e82c9b8ee812..f3fd559ac4f7 100644 --- a/l10ntools/Executable_ulfex.mk +++ b/l10ntools/Executable_ulfex.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,ulfex,\ $(eval $(call gb_Executable_use_libraries,ulfex,\ sal \ + i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,ulfex,\ diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk index 33255f4eb7e1..b86dbc4b80d2 100644 --- a/l10ntools/Executable_xrmex.mk +++ b/l10ntools/Executable_xrmex.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,xrmex,\ $(eval $(call gb_Executable_use_libraries,xrmex,\ sal \ + i18nregexp \ )) $(eval $(call gb_Executable_add_scanners,xrmex,\ diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index b4b18c49d980..81bafe7b7f10 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -25,6 +25,7 @@ private: OString m_sUnTransStr; OString m_sTransStr; bool m_bFuzzy; + bool m_bNull; OString m_sKeyId; public: @@ -38,6 +39,8 @@ public: virtual OString getUnTransStr() const { return m_sUnTransStr; } virtual OString getTransStr() const { return m_sTransStr; } virtual bool getFuzzy() const { return m_bFuzzy; } + virtual bool isNull() const { return m_bNull; } + virtual OString getKeyId() const { return m_sKeyId; } virtual void setWhiteSpace(const OString& rWhiteSpace); virtual void setExtractCom(const OString& rExtractCom); @@ -68,6 +71,8 @@ private: OString m_sResourceType; TYPE m_eType; OString m_sHelpText; + + void SetMembers(); public: PoEntry(); @@ -84,6 +89,8 @@ public: OString getUnTransStr() const; OString getTransStr() const; bool getFuzzy() const { return m_aGenPo.getFuzzy(); } + bool isNull() const { return m_aGenPo.isNull(); } + OString getKeyId() const { return m_aGenPo.getKeyId(); } void setUnTransStr(const OString& rUnTransStr); void setTransStr(const OString& rTransStr); void setFuzzy(const bool bFuzzy); @@ -91,6 +98,8 @@ public: void writeToFile(std::ofstream& rOFStream); void readFromFile(std::ifstream& rIFStream); + static bool IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2); + }; class PoHeader @@ -105,18 +114,23 @@ private: OString m_sPoRevisionDate; OString m_sLastTranslator; OString m_sLanguageTeam; + OString m_sLanguage; OString m_sMimeVersion; - OString m_sPluralForms; OString m_sContentType; - OString m_sCharset; OString m_sEncoding; + OString m_sPluralForms; OString m_sXGenerator; OString m_sXAcceleratorMarker; + void SetMembers(); public: + PoHeader(); PoHeader( const OString& rExtSrc ); ~PoHeader(); + + OString getLanguage() const { return m_sLanguage; } void writeToFile(std::ofstream& rOFStream); + void readFromFile(std::ifstream& rIFStream); }; #endif // _PO_INCLUDED diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 5da52c57d640..a1c4570056e6 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -34,6 +34,7 @@ #include #include "export.hxx" +#include "po.hxx" namespace { @@ -142,42 +143,95 @@ MergeDataFile::MergeDataFile( bool bCaseSensitive) { std::ifstream aInputStream(rFileName.getStr()); - const ::rtl::OString sHACK(RTL_CONSTASCII_STRINGPARAM("HACK")); - const ::rtl::OString sFileNormalized(lcl_NormalizeFilename(rFile)); - const bool isFileEmpty = !sFileNormalized.isEmpty(); - if (!aInputStream.is_open()) { - printf("Warning : Can't open %s\n", rFileName.getStr()); + printf("Warning : Can't open po path container file"); return; } - while (!aInputStream.eof()) + std::string sPoFileName; + aInputStream >> sPoFileName; + bool bFirstLang = true; + while(!aInputStream.eof()) { - std::string buf; - std::getline(aInputStream, buf); - rtl::OString sLine(buf.data(), buf.length()); - sal_Int32 n = 0; - // Skip all wrong filenames - const ::rtl::OString filename = lcl_NormalizeFilename(sLine.getToken(1, '\t', n)); // token 1 - if(isFileEmpty || sFileNormalized.equals("") || (!isFileEmpty && filename.equals(sFileNormalized)) ) + std::ifstream aPoFile(sPoFileName.c_str()); + const OString sHACK("HACK"); + const OString sFileName(lcl_NormalizeFilename(rFile)); + + if (!aPoFile.is_open()) { - const rtl::OString sTYP = sLine.getToken( 1, '\t', n ); // token 3 - const rtl::OString sGID = sLine.getToken( 0, '\t', n ); // token 4 - const rtl::OString sLID = sLine.getToken( 0, '\t', n ); // token 5 - rtl::OString sPFO = sLine.getToken( 1, '\t', n ); // token 7 - sPFO = sHACK; - rtl::OString nLANG = sLine.getToken( 1, '\t', n ); // token 9 - nLANG = nLANG.trim(); - const rtl::OString sTEXT = sLine.getToken( 0, '\t', n ); // token 10 - const rtl::OString sQHTEXT = sLine.getToken( 1, '\t', n ); // token 12 - const rtl::OString sTITLE = sLine.getToken( 0, '\t', n ); // token 13 - - if (!nLANG.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US"))) + printf("Warning : Can't open %s\n", sPoFileName.c_str()); + return; + } + + PoHeader aPoHeader; + aPoHeader.readFromFile(aPoFile); + const OString nLANG = aPoHeader.getLanguage(); + aLanguageSet.insert(nLANG); + PoEntry aNextPo; + do + { + aNextPo.readFromFile(aPoFile); + } while( !aNextPo.isNull() && aNextPo.getSourceFile() != sFileName ); + while( !aNextPo.isNull() && aNextPo.getSourceFile() == sFileName ) + { + PoEntry aActPo(aNextPo); + + bool bInSameComp = false; + OString sText; + OString sQHText; + OString sTitle; + OString sExText; + OString sExQHText; + OString sExTitle; + OString sQTZText; + OString sQTZQHText; + OString sQTZTitle; + do + { + if( bInSameComp ) + aActPo = PoEntry(aNextPo); + OString sTemp = aActPo.getTransStr(); + if( aActPo.getFuzzy() || sTemp.isEmpty() ) + sTemp = aActPo.getUnTransStr(); + switch( aActPo.getType() ) + { + case PoEntry::TTEXT: + sText = sTemp; + sExText = aActPo.getUnTransStr(); + sQTZText = aActPo.getKeyId(); + break; + case PoEntry::TQUICKHELPTEXT: + sQHText = sTemp; + sExQHText = aActPo.getUnTransStr(); + sQTZQHText = aActPo.getKeyId(); + break; + case PoEntry::TTITLE: + sTitle = sTemp; + sExTitle = aActPo.getUnTransStr(); + sQTZTitle = aActPo.getKeyId(); + break; + } + aNextPo.readFromFile(aPoFile); + } while(!aNextPo.isNull() && + (bInSameComp = PoEntry::IsInSameComp(aActPo,aNextPo))); + + InsertEntry( aActPo.getResourceType(), aActPo.getGroupId(), + aActPo.getLocalId(), sHACK, nLANG, sText, + sQHText, sTitle, sFileName, bCaseSensitive ); + if( bFirstLang ) { - aLanguageSet.insert(nLANG); - InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE, filename, bCaseSensitive ); + aLanguageSet.insert("qtz"); + InsertEntry( aActPo.getResourceType(), aActPo.getGroupId(), + aActPo.getLocalId(), sHACK, "qtz", + sQTZText + "‖" + sExText, + sQTZQHText + "‖" + sExQHText, + sQTZTitle + "‖" + sExTitle, + sFileName, bCaseSensitive ); } } + aPoFile.close(); + aInputStream >> sPoFileName; + bFirstLang = false; } aInputStream.close(); } diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 1a7c5aead7df..3be13fcc7361 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -32,11 +32,12 @@ OString ImplGenKeyId(const OString& rGenerator) boost::crc_32_type aCRC32; aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength()); sal_uInt32 nCRC = aCRC32.checksum(); + //Use all readable ASCII charachter exclude xml special tags: ",',&,<,> + const OString sSymbols = "!#$%()*+,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"; char sKeyId[5]; - for(int nIndex = 0; nIndex < 4; ++nIndex) + for( short nKeyInd = 0; nKeyInd < 4; ++nKeyInd ) { - //Get a char from the [33,126] interval of ASCII - sKeyId[nIndex] = static_cast((nCRC & 255) % 93 + 33); + sKeyId[nKeyInd] = sSymbols[(nCRC & 255) % 89]; nCRC >>= 8; } sKeyId[4] = '\0'; @@ -109,7 +110,7 @@ OString ImplGenNormString(const OString& rString) //Decide whether a string starts with an other string bool ImplStartsWith(const OString& rString,const OString& rStart) { - return rString.copy(0,rStart.getLength())==rStart; + return rString.match(rStart); } //Default constructor @@ -121,6 +122,7 @@ GenPoEntry::GenPoEntry() , m_sUnTransStr( OString() ) , m_sTransStr( OString() ) , m_bFuzzy( false ) + , m_bNull( false ) , m_sKeyId( OString() ) { } @@ -197,6 +199,12 @@ void GenPoEntry::writeToFile(std::ofstream& rOFStream) //Read from file void GenPoEntry::readFromFile(std::ifstream& rIFStream) { + *this = GenPoEntry(); + if( rIFStream.eof() ) + { + m_bNull = true; + return; + } m_sWhiteSpace = "\n"; OString* pLastMsg = 0; std::string sTemp; @@ -412,6 +420,34 @@ PoEntry::~PoEntry() { } +//Set members on the basis of m_aGenPo +void PoEntry::SetMembers() +{ + if( !m_aGenPo.isNull() ) + { + m_sSourceFile = m_aGenPo.getReference(); + OString sContext = m_aGenPo.getContext(); + m_sGroupId = sContext.getToken(0,'\n'); + + if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) + m_sResourceType = sContext.getToken(1,'\n').getToken(0,'.'); + else + { + m_sLocalId = sContext.getToken(1,'\n'); + m_sResourceType = sContext.getToken(2,'\n').getToken(0,'.'); + } + if (sContext.endsWith(".text")) + m_eType = TTEXT; + else if (sContext.endsWith(".quickhelptext")) + m_eType = TQUICKHELPTEXT; + else if (sContext.endsWith(".title")) + m_eType = TTITLE; + else{ + throw;} + m_sHelpText = m_aGenPo.getExtractCom(); + } +} + //Get translation string in sdf/merge format OString PoEntry::getUnTransStr() const { @@ -478,29 +514,18 @@ void PoEntry::writeToFile(std::ofstream& rOFStream) //Read from file void PoEntry::readFromFile(std::ifstream& rIFStream) { + *this = PoEntry(); m_aGenPo.readFromFile(rIFStream); - m_sSourceFile = m_aGenPo.getReference(); - - OString sContext = m_aGenPo.getContext(); - m_sGroupId = sContext.getToken(0,'\n'); - - if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) - m_sResourceType = sContext.getToken(1,'\n').getToken(0,'.'); - else - { - m_sLocalId = sContext.getToken(1,'\n'); - m_sResourceType = sContext.getToken(2,'\n').getToken(0,'.'); - } - if (sContext.endsWith(".text")) - m_eType = TTEXT; - else if (sContext.endsWith(".quickhelptext")) - m_eType = TQUICKHELPTEXT; - else if (sContext.endsWith(".title")) - m_eType = TTITLE; - else - throw; + SetMembers(); +} - m_sHelpText = m_aGenPo.getExtractCom(); +//Check whether po-s belong to the same localization component +bool PoEntry::IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2) +{ + return ( rPo1.m_sSourceFile == rPo2.m_sSourceFile && + rPo1.m_sGroupId == rPo2.m_sGroupId && + rPo1.m_sLocalId == rPo2.m_sLocalId && + rPo1.m_sResourceType == rPo2.m_sResourceType ); } //Class PoHeader @@ -515,7 +540,35 @@ OString ImplGetTime() return pBuff; } -//Constructor +//Get relevant part of actual token +OString ImplGetElement(const OString& rText, const sal_Int32 nToken) +{ + OString sToken = rText.getToken(nToken,'\n'); + sal_Int32 nFirstIndex = sToken.indexOf(':') + 2; + return sToken.copy( nFirstIndex,sToken.getLength()-nFirstIndex ); +} + +//Default Constructor +PoHeader::PoHeader() + : m_aGenPo( GenPoEntry() ) + , m_sExtractionSource( OString() ) + , m_sProjectIdVersion( OString() ) + , m_sReportMsgidBugsTo( OString() ) + , m_sPotCreationDate( OString() ) + , m_sPoRevisionDate( OString() ) + , m_sLastTranslator( OString() ) + , m_sLanguageTeam( OString() ) + , m_sLanguage( OString() ) + , m_sMimeVersion( OString() ) + , m_sContentType( OString() ) + , m_sEncoding( OString() ) + , m_sPluralForms( OString() ) + , m_sXGenerator( OString() ) + , m_sXAcceleratorMarker( OString() ) +{ +} + +//Template Constructor PoHeader::PoHeader( const OString& rExtSrc ) : m_aGenPo( GenPoEntry() ) , m_sExtractionSource( rExtSrc ) @@ -527,36 +580,74 @@ PoHeader::PoHeader( const OString& rExtSrc ) , m_sPoRevisionDate( "YEAR-MO-DA HO:MI+ZONE" ) , m_sLastTranslator( "FULL NAME " ) , m_sLanguageTeam( "LANGUAGE " ) + , m_sLanguage( OString() ) , m_sMimeVersion( "1.0" ) - , m_sContentType( "text/plain" ) - , m_sCharset( "UTF-8" ) + , m_sContentType( "text/plain; charset=UTF-8" ) , m_sEncoding( "8bit" ) + , m_sPluralForms( OString() ) , m_sXGenerator( "LibreOffice" ) , m_sXAcceleratorMarker( "~" ) { - m_aGenPo.setExtractCom("extracted from " + rExtSrc); - m_aGenPo.setTransStr( - "Project-Id-Version: " + m_sProjectIdVersion + "\n" + - "Report-Msgid-Bugs-To: " + m_sReportMsgidBugsTo + "\n" + - "POT-Creation-Date: " + m_sPotCreationDate + "\n" + - "PO-Revision-Date: " + m_sPoRevisionDate + "\n" + - "Last-Translator: " + m_sLastTranslator + "\n" + - "Language-Team: " + m_sLanguageTeam + "\n" + - "MIME-Version: " + m_sMimeVersion + "\n" + - "Content-Type: " + m_sContentType + "; " + - "charset=" + m_sCharset + "\n" + - "Content-Transfer-Encoding: " + m_sEncoding + "\n" + - "X-Genarator: " + m_sXGenerator + "\n" + - "X-Accelerator_Marker: " + m_sXAcceleratorMarker + "\n"); } PoHeader::~PoHeader() { } +//Set members on the basis of m_aGenPo +void PoHeader::SetMembers() +{ + if( !m_aGenPo.isNull() ) + { + m_sExtractionSource = m_aGenPo.getExtractCom(); + OString sTemp = m_aGenPo.getTransStr(); + + sal_Int32 nToken = 0; + m_sProjectIdVersion = ImplGetElement(sTemp,nToken++); + m_sReportMsgidBugsTo = ImplGetElement(sTemp,nToken++); + m_sPotCreationDate = ImplGetElement(sTemp,nToken++); + m_sPoRevisionDate = ImplGetElement(sTemp,nToken++); + m_sLastTranslator = ImplGetElement(sTemp,nToken++); + m_sLanguageTeam = ImplGetElement(sTemp,nToken++); + if( sTemp.getToken(nToken,'\n').match("Language:") ) + m_sLanguage = ImplGetElement(sTemp,nToken++); + m_sMimeVersion = ImplGetElement(sTemp,nToken++); + m_sContentType = ImplGetElement(sTemp,nToken++); + m_sEncoding = ImplGetElement(sTemp,nToken++); + if( sTemp.getToken(nToken,'\n').match("Plural-Forms:") ) + m_sPluralForms = ImplGetElement(sTemp,nToken++); + m_sXGenerator = ImplGetElement(sTemp,nToken++); + m_sXAcceleratorMarker = ImplGetElement(sTemp,nToken); + } +} + void PoHeader::writeToFile(std::ofstream& rOFStream) { + m_aGenPo.setExtractCom("extracted from " + m_sExtractionSource); + m_aGenPo.setTransStr( + "Project-Id-Version: " + m_sProjectIdVersion + "\n" + + "Report-Msgid-Bugs-To: " + m_sReportMsgidBugsTo + "\n" + + "POT-Creation-Date: " + m_sPotCreationDate + "\n" + + "PO-Revision-Date: " + m_sPoRevisionDate + "\n" + + "Last-Translator: " + m_sLastTranslator + "\n" + + "Language-Team: " + m_sLanguageTeam + "\n" + + ( m_sLanguage.isEmpty() ? "" : "Language: " + m_sLanguage + "\n" ) + + "MIME-Version: " + m_sMimeVersion + "\n" + + "Content-Type: " + m_sContentType + "\n" + + "Content-Transfer-Encoding: " + m_sEncoding + "\n" + + ( m_sPluralForms.isEmpty() ? "" : + "Plural-Forms: " + m_sPluralForms + "\n" ) + + "X-Genarator: " + m_sXGenerator + "\n" + + "X-Accelerator_Marker: " + m_sXAcceleratorMarker + "\n"); m_aGenPo.writeToFile(rOFStream); } +void PoHeader::readFromFile(std::ifstream& rIFStream) +{ + *this = PoHeader(); + m_aGenPo.readFromFile(rIFStream); + SetMembers(); +} + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index 7e567f07d52e..3e4e98f34c02 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -124,15 +124,15 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, { if (!sActUnTrans.getToken(vTypes[nIndex],'\t').isEmpty()) { - /**Because of xrmex lexer there are duplicated id's, - only use this if the lexer have already fixed*/ + /**Because of xrmex there are duplicated id's, + only use this if xrmex have already fixed if (sActUnTrans.getToken(PoEntry::GROUPID,'\t')== sActUnTrans.getToken(PoEntry::LOCALID,'\t') && sActUnTrans.getToken(PoEntry::SOURCEFILE,'\t'). endsWith(".xrm")) { sActUnTrans = DelLocalId(sActUnTrans); - } + }*/ PoEntry aPE(sActUnTrans, vTypes[nIndex]); aPE.setTransStr(sActTrans.getToken(vTypes[nIndex],'\t')); aPE.setFuzzy(sActTrans.isEmpty() ? 0 : diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index e7703df7cbe8..f03a410cf956 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -51,21 +51,31 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build gb_SrsPartMergeTarget_TRANSEXCOMMAND := \ $(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET) + +define gb_GetPoFiles +echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)), $(gb_POLOCATION)/$(lang)/$(1)) > $(2) +endef + define gb_SrsPartMergeTarget__command $(call gb_Output_announce,$(3),$(true),srs,1) +POFILES=`$(gb_MKTEMP)` && \ +$(call gb_GetPoFiles,$(PO),$${POFILES}) && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ -i $(3) \ -o $(1) \ - -m $(SDF) \ - -l all) + -m $${POFILES} \ + -l all) && \ +rm -rf $${POFILES} endef $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) $(gb_SrsPartMergeTarget_TRANSEXTARGET) - $(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p $(dir $@) && cp $< $@) + $(if $(strip $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(PO)),,x))),\ + mkdir -p $(dir $@) && cp $< $@,\ + $(call gb_SrsPartMergeTarget__command,$@,$*,$<)) # SrsPartTarget class @@ -110,7 +120,7 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := else $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1)) $(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1)) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) +$(call gb_SrsPartMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po endif endef @@ -123,8 +133,8 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_ mkdir -p $$(dir $$@) && \ cp $$< $$@) ifneq ($(strip $(WITH_LANG)),) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF) +$(call gb_SrsPartMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po +$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(PO) endif endef diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 61254cea46bc..2ae4275ba753 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -38,7 +38,7 @@ # => XcuMergeTarget: merge # => buildtools (cfgex) # => Xcu data source -# => localize.sdf +# => *.po # => XcsTarget (schema) # Per-repo pattern rules for each repository do not work for all targets @@ -249,18 +249,24 @@ gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_C # PRJNAME is computed from the stem (parameter $(2)) define gb_XcuMergeTarget__command $(call gb_Output_announce,$(2),$(true),XCU,5) +POFILES=`$(gb_MKTEMP)` && \ +$(call gb_GetPoFiles,$(PO),$${POFILES}) && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XcuMergeTarget_CFGEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ -i $(call gb_Helper_symlinked_native,$(3)) \ -o $(1) \ - -m $(SDF) \ - -l all) + -m $${POFILES} \ + -l all) && \ +rm -rf $${POFILES} + endef $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET) - $(if $(SDF),$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@) + $(if $(strip $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(PO)),,x))),\ + mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@,\ + $(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^))) $(call gb_XcuMergeTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCU,5) @@ -271,9 +277,8 @@ $(call gb_XcuMergeTarget_get_clean_target,%) : define gb_XcuMergeTarget_XcuMergeTarget $(call gb_XcuMergeTarget_get_target,$(1)) : \ $(call gb_Configuration__get_source,$(2),$(3)/$(4)) \ - $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) -$(call gb_XcuMergeTarget_get_target,$(1)) : \ - SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) + $(wildcard $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)) +$(call gb_XcuMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po endef diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 105e58e0bfd3..4e9e6df6af25 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -72,14 +72,18 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml : else $(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_XRMEXTARGET) $(call gb_Output_announce,$*/description.xml,$(true),XRM,3) + POFILES=`$(gb_MKTEMP)` && \ + $(call gb_GetPoFiles,$(PO),$${POFILES}) && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \ $(gb_ExtensionTarget_XRMEXCOMMAND) \ -p $(PRJNAME) \ -i $(call gb_Helper_symlinked_native,$(filter %.xml,$^)) \ -o $@ \ - -m $(SDF) \ - -l all) + -m $${POFILES} \ + -l all) && \ + rm -rf $${POFILES} + endif # rule to create oxt package in workdir @@ -112,8 +116,8 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml ifneq ($(strip $(gb_WITH_LANG)),) -$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf -$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $$(SDF) +$(call gb_ExtensionTarget_get_target,$(1)) : PO := $(2).po +$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $$(PO) endif endef @@ -197,16 +201,19 @@ define gb_ExtensionTarget_localize_properties $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2) ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_ExtensionTarget_LANGS)),$(subst en_US,$(lang),$(2))) -$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf -$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(SDF) +$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : PO := $(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po +$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(PO) endif $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \ $(gb_ExtensionTarget_PROPMERGETARGET) $$(call gb_Output_announce,$(2),$(true),PRP,3) + POFILES=`$(gb_MKTEMP)` && \ + $(call gb_GetPoFiles,$$(PO),$$$${POFILES}) && \ mkdir -p $$(dir $$@) && \ cp -f $$< $$@ \ - $(if $(strip $(gb_WITH_LANG)),&& $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$@ -m $$(SDF)) + $(if $(strip $(gb_WITH_LANG)),&& $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$@ -m $$$${POFILES}) && \ + rm -rf $$$${POFILES} endef @@ -221,13 +228,17 @@ endef define gb_ExtensionTarget_localize_help_onelang $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) -$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))localize.sdf -$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(SDF) +$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ + PO := $(patsubst /%/,%,$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))).po +$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(PO) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(gb_ExtensionTarget_HELPEXTARGET) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) $$(call gb_Output_announce,$(2),$(true),XHP,3) + POFILES=`$(gb_MKTEMP)` && \ + echo $(gb_POLOCATION)/$(4)/$$(PO) > $$$${POFILES} && \ mkdir -p $$(dir $$@) && \ - $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$(SDF) + $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$$${POFILES} && \ + rm -rf $$$${POFILES} endef diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 3d7fcd02ac89..1de6c8362f5e 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -113,9 +113,12 @@ gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf define gb_ScpMergeTarget__command $(call gb_Output_announce,$(2),$(true),SUM,1) +POFILES=`$(gb_MKTEMP)` && \ +$(call gb_GetPoFiles,$(SCP_PO),$${POFILES}) && \ $(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $(SCP_SDF) -l all \ -) + $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $${POFILES} -l all ) && \ +rm -rf $${POFILES} + endef $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir : @@ -133,8 +136,8 @@ $(call gb_ScpMergeTarget_get_clean_target,%) : define gb_ScpMergeTarget_ScpMergeTarget $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir -$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))/localize.sdf -$(call gb_ScpMergeTarget_get_target,$(1)) : $$(SCP_SDF) +$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_PO := $(patsubst %/,%,$(dir $(1))).po +$(call gb_ScpMergeTarget_get_target,$(1)) : $$(SCP_PO) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index d24c76825b4d..20d1487f7221 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -306,6 +306,6 @@ gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib # static variables declared here because they are used globally -gb_SDFLOCATION := $(WORKDIR)/CustomTarget/translations/translate/sdf +gb_POLOCATION := $(SRCDIR)/translations/source # vim: set noet sw=4: diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 93e3b02390ff..b4561b9c7693 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -702,16 +702,12 @@ $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf @$(RENAME) $@.$(INPATH) $@ @-$(RM) $@.$(INPATH) -# This is still needed????? +POLOCATION:=$(SRCDIR)$/translations/source +PORELPATH:=$(PRJNAME)$/$(PATH_IN_MODULE).po + $(COMMONMISC)/$(TARGET)/%.xrm : %.xrm $(COMMAND_ECHO)-$(MKDIR) $(@:d) $(COMMAND_ECHO)-$(RM) $@ - $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all + $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG)) $(POLOCATION)/$(lang)/$(PORELPATH))) -l all $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ $(COMMAND_ECHO)-$(RM) $@.$(INPATH) - -# dirty hack -# if local *.sdf file is missing -#%.sdf: -# echo > $@ - -- cgit From ab063326af9eeab5fcb50a52ec6d67cfc76f4f32 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Fri, 21 Sep 2012 22:57:08 +0200 Subject: remove inclusion of deprecated header Change-Id: If30210587f0562d7e5f24fb3acbdd7ef8b13a00f --- l10ntools/source/localize.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 598eccf60601..7c1ad3f0590f 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -39,7 +39,6 @@ #include "osl/file.hxx" #include "osl/process.h" #include "osl/thread.h" -#include "rtl/oustringostreaminserter.hxx" #include "rtl/string.h" #include "rtl/string.hxx" #include "rtl/textcvt.h" -- cgit From 27335522a2bfccb7254e146e1b35aa406772508d Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 23 Sep 2012 11:10:45 +0200 Subject: Use PoEntry and PoHeader more like an interface Delete all members except member with type GenPoEntry and use getter methods to define them. Plus correct renewpo. Change-Id: I97665b406467053fce8b4864b47456762887e715 Reviewed-on: https://gerrit.libreoffice.org/681 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/inc/po.hxx | 60 +++------- l10ntools/source/po.cxx | 261 ++++++++++++++++++------------------------- l10ntools/source/renewpo.cxx | 17 +-- 3 files changed, 136 insertions(+), 202 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index 81bafe7b7f10..686c9f393468 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -15,9 +15,7 @@ class GenPoEntry { - private: - OString m_sWhiteSpace; OString m_sExtractCom; OString m_sReference; @@ -57,40 +55,30 @@ public: class PoEntry { +private: + GenPoEntry m_aGenPo; + public: enum SDFPARTS { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID, LOCALID, HELPID, PLATFORM, WIDTH, LANGUAGEID, TEXT, HELPTEXT, QUICKHELPTEXT, TITLE, TIMESTAMP }; enum TYPE { TTEXT=TEXT, TQUICKHELPTEXT=QUICKHELPTEXT, TTITLE=TITLE }; -private: - - GenPoEntry m_aGenPo; - OString m_sSourceFile; - OString m_sGroupId; - OString m_sLocalId; - OString m_sResourceType; - TYPE m_eType; - OString m_sHelpText; - - void SetMembers(); -public: PoEntry(); - PoEntry(const OString& i_rSDFLine, + PoEntry(const OString& rSDFLine, const TYPE eType = TTEXT); - virtual ~PoEntry(); - - OString getSourceFile() const { return m_sSourceFile; } - OString getGroupId() const { return m_sGroupId; } - OString getLocalId() const { return m_sLocalId; } - OString getResourceType() const { return m_sResourceType; } - TYPE getType() const { return m_eType; } - OString getHelpText() const { return m_sHelpText; } + ~PoEntry(); + + OString getSourceFile() const; + OString getGroupId() const; + OString getLocalId() const; + OString getResourceType() const; + TYPE getType() const; OString getUnTransStr() const; OString getTransStr() const; - bool getFuzzy() const { return m_aGenPo.getFuzzy(); } - bool isNull() const { return m_aGenPo.isNull(); } - OString getKeyId() const { return m_aGenPo.getKeyId(); } + bool getFuzzy() const; + bool isNull() const; + OString getKeyId() const; void setUnTransStr(const OString& rUnTransStr); void setTransStr(const OString& rTransStr); void setFuzzy(const bool bFuzzy); @@ -104,31 +92,15 @@ public: class PoHeader { - private: GenPoEntry m_aGenPo; - OString m_sExtractionSource; - OString m_sProjectIdVersion; - OString m_sReportMsgidBugsTo; - OString m_sPotCreationDate; - OString m_sPoRevisionDate; - OString m_sLastTranslator; - OString m_sLanguageTeam; - OString m_sLanguage; - OString m_sMimeVersion; - OString m_sContentType; - OString m_sEncoding; - OString m_sPluralForms; - OString m_sXGenerator; - OString m_sXAcceleratorMarker; - - void SetMembers(); + public: PoHeader(); PoHeader( const OString& rExtSrc ); ~PoHeader(); - OString getLanguage() const { return m_sLanguage; } + OString getLanguage() const; void writeToFile(std::ofstream& rOFStream); void readFromFile(std::ifstream& rIFStream); }; diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 3be13fcc7361..f433aaba236e 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -382,37 +382,38 @@ OString ImplEscapeSDFText(const OString& rText,const bool bHelpText = false) //Default constructor PoEntry::PoEntry() : m_aGenPo( GenPoEntry() ) - , m_sSourceFile( OString() ) - , m_sGroupId( OString() ) - , m_sLocalId( OString() ) - , m_sResourceType( OString() ) - , m_eType( TTEXT ) - , m_sHelpText( OString() ) { } //Construct PoEntry from sdfline PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) : m_aGenPo( GenPoEntry() ) - , m_sSourceFile( OString() ) - , m_sGroupId( OString() ) - , m_sLocalId( OString() ) - , m_sResourceType(OString() ) - , m_eType( TTEXT ) - , m_sHelpText( OString() ) { std::vector vParts; ImplSplitAt(rSDFLine,'\t',vParts); if(vParts.size()!=15) throw; + m_aGenPo.setWhiteSpace("\n"); + + m_aGenPo.setReference(vParts[SOURCEFILE]. + copy(vParts[SOURCEFILE].lastIndexOf("\\")+1)); - m_sSourceFile = vParts[SOURCEFILE]. - copy(vParts[SOURCEFILE].lastIndexOf("\\")+1); - m_sResourceType = vParts[RESOURCETYPE]; - m_sGroupId = vParts[GROUPID]; - m_sLocalId = vParts[LOCALID]; - m_eType = eType; - m_sHelpText = vParts[HELPTEXT]; + m_aGenPo.setExtractCom(vParts[HELPTEXT]); + OString sContext = vParts[GROUPID] + "\n" + + (vParts[LOCALID].isEmpty() ? "" : vParts[LOCALID] + "\n") + + vParts[RESOURCETYPE]; + switch(eType){ + case TTEXT: + sContext += ".text"; break; + case TQUICKHELPTEXT: + sContext += ".quickhelptext"; break; + case TTITLE: + sContext += ".title"; break; + default: + throw; break; + } + m_aGenPo.setContext(sContext); setUnTransStr(vParts[eType]); + m_aGenPo.genKeyId(); } //Destructor @@ -420,46 +421,82 @@ PoEntry::~PoEntry() { } -//Set members on the basis of m_aGenPo -void PoEntry::SetMembers() +//Get name of file from which entry is extracted +OString PoEntry::getSourceFile() const { - if( !m_aGenPo.isNull() ) - { - m_sSourceFile = m_aGenPo.getReference(); - OString sContext = m_aGenPo.getContext(); - m_sGroupId = sContext.getToken(0,'\n'); + return m_aGenPo.getReference(); +} - if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) - m_sResourceType = sContext.getToken(1,'\n').getToken(0,'.'); - else - { - m_sLocalId = sContext.getToken(1,'\n'); - m_sResourceType = sContext.getToken(2,'\n').getToken(0,'.'); - } - if (sContext.endsWith(".text")) - m_eType = TTEXT; - else if (sContext.endsWith(".quickhelptext")) - m_eType = TQUICKHELPTEXT; - else if (sContext.endsWith(".title")) - m_eType = TTITLE; - else{ - throw;} - m_sHelpText = m_aGenPo.getExtractCom(); - } +//Get groupid +OString PoEntry::getGroupId() const +{ + return m_aGenPo.getContext().getToken(0,'\n'); +} + +//Get localid +OString PoEntry::getLocalId() const +{ + const OString sContext = m_aGenPo.getContext(); + if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) + return OString(); + else + return sContext.getToken(1,'\n'); +} + +//Get the type of component from which entry is extracted +OString PoEntry::getResourceType() const +{ + const OString sContext = m_aGenPo.getContext(); + if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) + return sContext.getToken(1,'\n').getToken(0,'.'); + else + return sContext.getToken(2,'\n').getToken(0,'.'); +} + +//Get the type of entry +PoEntry::TYPE PoEntry::getType() const +{ + const OString sContext = m_aGenPo.getContext(); + if (sContext.endsWith(".text")) + return TTEXT; + else if (sContext.endsWith(".quickhelptext")) + return TQUICKHELPTEXT; + else if (sContext.endsWith(".title")) + return TTITLE; + else throw; } +//Check wheather entry is fuzzy +bool PoEntry::getFuzzy() const +{ + return m_aGenPo.getFuzzy(); +} + +//Check wheather entry is null +bool PoEntry::isNull() const +{ + return m_aGenPo.isNull(); +} + +//Get keyid +OString PoEntry::getKeyId() const +{ + return m_aGenPo.getKeyId(); +} + + //Get translation string in sdf/merge format OString PoEntry::getUnTransStr() const { return ImplEscapeSDFText(m_aGenPo.getUnTransStr(), - m_sSourceFile.endsWith(".xhp")); + getSourceFile().endsWith(".xhp")); } //Get translated string in sdf/merge format OString PoEntry::getTransStr() const { return ImplEscapeSDFText(m_aGenPo.getTransStr(), - m_sSourceFile.endsWith(".xhp")); + getSourceFile().endsWith(".xhp")); } @@ -468,7 +505,7 @@ void PoEntry::setUnTransStr(const OString& rUnTransStr) { m_aGenPo.setUnTransStr( ImplUnEscapeSDFText( - rUnTransStr,m_sSourceFile.endsWith(".xhp"))); + rUnTransStr,getSourceFile().endsWith(".xhp"))); } //Set translated string when input is in sdf format @@ -476,7 +513,7 @@ void PoEntry::setTransStr(const OString& rTransStr) { m_aGenPo.setTransStr( ImplUnEscapeSDFText( - rTransStr,m_sSourceFile.endsWith(".xhp"))); + rTransStr,getSourceFile().endsWith(".xhp"))); } //Set fuzzy flag @@ -488,25 +525,6 @@ void PoEntry::setFuzzy(const bool bFuzzy) //Write to file void PoEntry::writeToFile(std::ofstream& rOFStream) { - m_aGenPo.setWhiteSpace("\n"); - m_aGenPo.setExtractCom(m_sHelpText); - m_aGenPo.setReference(m_sSourceFile); - - OString sContext = m_sGroupId + "\n" + - (m_sLocalId.isEmpty() ? "" : m_sLocalId + "\n") + - m_sResourceType; - switch(m_eType){ - case TTEXT: - sContext += ".text"; break; - case TQUICKHELPTEXT: - sContext += ".quickhelptext"; break; - case TTITLE: - sContext += ".title"; break; - default: - throw; break; - } - m_aGenPo.setContext(sContext); - m_aGenPo.genKeyId(); m_aGenPo.writeToFile(rOFStream); } @@ -516,16 +534,15 @@ void PoEntry::readFromFile(std::ifstream& rIFStream) { *this = PoEntry(); m_aGenPo.readFromFile(rIFStream); - SetMembers(); } //Check whether po-s belong to the same localization component bool PoEntry::IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2) { - return ( rPo1.m_sSourceFile == rPo2.m_sSourceFile && - rPo1.m_sGroupId == rPo2.m_sGroupId && - rPo1.m_sLocalId == rPo2.m_sLocalId && - rPo1.m_sResourceType == rPo2.m_sResourceType ); + return ( rPo1.getSourceFile() == rPo2.getSourceFile() && + rPo1.getGroupId() == rPo2.getGroupId() && + rPo1.getLocalId() == rPo2.getLocalId() && + rPo1.getResourceType() == rPo2.getResourceType() ); } //Class PoHeader @@ -540,113 +557,57 @@ OString ImplGetTime() return pBuff; } -//Get relevant part of actual token -OString ImplGetElement(const OString& rText, const sal_Int32 nToken) -{ - OString sToken = rText.getToken(nToken,'\n'); - sal_Int32 nFirstIndex = sToken.indexOf(':') + 2; - return sToken.copy( nFirstIndex,sToken.getLength()-nFirstIndex ); -} - //Default Constructor PoHeader::PoHeader() : m_aGenPo( GenPoEntry() ) - , m_sExtractionSource( OString() ) - , m_sProjectIdVersion( OString() ) - , m_sReportMsgidBugsTo( OString() ) - , m_sPotCreationDate( OString() ) - , m_sPoRevisionDate( OString() ) - , m_sLastTranslator( OString() ) - , m_sLanguageTeam( OString() ) - , m_sLanguage( OString() ) - , m_sMimeVersion( OString() ) - , m_sContentType( OString() ) - , m_sEncoding( OString() ) - , m_sPluralForms( OString() ) - , m_sXGenerator( OString() ) - , m_sXAcceleratorMarker( OString() ) { } //Template Constructor PoHeader::PoHeader( const OString& rExtSrc ) : m_aGenPo( GenPoEntry() ) - , m_sExtractionSource( rExtSrc ) - , m_sProjectIdVersion( "PACKAGE VERSION" ) - , m_sReportMsgidBugsTo( OString("https://bugs.freedesktop.org/") + - "enter_bug.cgi?product=LibreOffice&" + - "bug_status=UNCONFIRMED&component=UI" ) - , m_sPotCreationDate( ImplGetTime() ) - , m_sPoRevisionDate( "YEAR-MO-DA HO:MI+ZONE" ) - , m_sLastTranslator( "FULL NAME " ) - , m_sLanguageTeam( "LANGUAGE " ) - , m_sLanguage( OString() ) - , m_sMimeVersion( "1.0" ) - , m_sContentType( "text/plain; charset=UTF-8" ) - , m_sEncoding( "8bit" ) - , m_sPluralForms( OString() ) - , m_sXGenerator( "LibreOffice" ) - , m_sXAcceleratorMarker( "~" ) { + m_aGenPo.setExtractCom("extracted from " + rExtSrc); + m_aGenPo.setTransStr( + OString("Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?" + "product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" + "POT-Creation-Date: ") + ImplGetTime() + + OString("\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language-Team: LANGUAGE \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "X-Genarator: LibreOffice\n" + "X-Accelerator_Marker: ~\n")); } PoHeader::~PoHeader() { } -//Set members on the basis of m_aGenPo -void PoHeader::SetMembers() +//Get the language of header +OString PoHeader::getLanguage() const { - if( !m_aGenPo.isNull() ) - { - m_sExtractionSource = m_aGenPo.getExtractCom(); - OString sTemp = m_aGenPo.getTransStr(); - - sal_Int32 nToken = 0; - m_sProjectIdVersion = ImplGetElement(sTemp,nToken++); - m_sReportMsgidBugsTo = ImplGetElement(sTemp,nToken++); - m_sPotCreationDate = ImplGetElement(sTemp,nToken++); - m_sPoRevisionDate = ImplGetElement(sTemp,nToken++); - m_sLastTranslator = ImplGetElement(sTemp,nToken++); - m_sLanguageTeam = ImplGetElement(sTemp,nToken++); - if( sTemp.getToken(nToken,'\n').match("Language:") ) - m_sLanguage = ImplGetElement(sTemp,nToken++); - m_sMimeVersion = ImplGetElement(sTemp,nToken++); - m_sContentType = ImplGetElement(sTemp,nToken++); - m_sEncoding = ImplGetElement(sTemp,nToken++); - if( sTemp.getToken(nToken,'\n').match("Plural-Forms:") ) - m_sPluralForms = ImplGetElement(sTemp,nToken++); - m_sXGenerator = ImplGetElement(sTemp,nToken++); - m_sXAcceleratorMarker = ImplGetElement(sTemp,nToken); - } + const OString sLang = "Language: "; + const OString sTransStr = m_aGenPo.getTransStr(); + const sal_Int32 nFirstIndex = sTransStr.indexOf(sLang)+sLang.getLength(); + const sal_Int32 nCount = sTransStr.indexOf('\n',nFirstIndex)-nFirstIndex; + return sTransStr.copy(nFirstIndex,nCount); } +//Write out to file void PoHeader::writeToFile(std::ofstream& rOFStream) { - m_aGenPo.setExtractCom("extracted from " + m_sExtractionSource); - m_aGenPo.setTransStr( - "Project-Id-Version: " + m_sProjectIdVersion + "\n" + - "Report-Msgid-Bugs-To: " + m_sReportMsgidBugsTo + "\n" + - "POT-Creation-Date: " + m_sPotCreationDate + "\n" + - "PO-Revision-Date: " + m_sPoRevisionDate + "\n" + - "Last-Translator: " + m_sLastTranslator + "\n" + - "Language-Team: " + m_sLanguageTeam + "\n" + - ( m_sLanguage.isEmpty() ? "" : "Language: " + m_sLanguage + "\n" ) + - "MIME-Version: " + m_sMimeVersion + "\n" + - "Content-Type: " + m_sContentType + "\n" + - "Content-Transfer-Encoding: " + m_sEncoding + "\n" + - ( m_sPluralForms.isEmpty() ? "" : - "Plural-Forms: " + m_sPluralForms + "\n" ) + - "X-Genarator: " + m_sXGenerator + "\n" + - "X-Accelerator_Marker: " + m_sXAcceleratorMarker + "\n"); m_aGenPo.writeToFile(rOFStream); } +//Read from file void PoHeader::readFromFile(std::ifstream& rIFStream) { *this = PoHeader(); m_aGenPo.readFromFile(rIFStream); - SetMembers(); } diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index 3e4e98f34c02..398b23bf9a85 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -106,7 +106,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, getline(aSDFInput,s); sLine = OString(s.data(),s.length()); OString sActTrans; - if (IsSameEntry(sActUnTrans,sLine)) + if (!aSDFInput.eof() && IsSameEntry(sActUnTrans,sLine)) { sActTrans = sLine; getline(aSDFInput,s); @@ -134,16 +134,18 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, sActUnTrans = DelLocalId(sActUnTrans); }*/ PoEntry aPE(sActUnTrans, vTypes[nIndex]); - aPE.setTransStr(sActTrans.getToken(vTypes[nIndex],'\t')); - aPE.setFuzzy(sActTrans.isEmpty() ? 0 : - bool(sActTrans.getToken(PoEntry::DUMMY,'\t'). - copy(nDummyBit++,1).toInt32())); + const OString sActStr = + sActTrans.getToken(vTypes[nIndex],'\t'); + aPE.setTransStr(sActStr); + aPE.setFuzzy( sActStr.isEmpty() ? false : + static_cast(sActTrans.getToken(PoEntry::DUMMY,'\t'). + copy(nDummyBit++,1).toBoolean())); aPE.writeToFile(aOutPut); } } - //Check wheather next entry is in the same po file - OString sNextSourcePath = GetPath(sPath,sLine); + OString sNextSourcePath = + !aSDFInput.eof() ? GetPath(sPath,sLine) : ""; if (sNextSourcePath!=sActSourcePath) { aOutPut.close(); @@ -156,7 +158,6 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, //Close and remove sdf file aSDFInput.close(); system(("rm " + SDFFileName).getStr()); - aOutPut.close(); } -- cgit From 822ac662c758916af546a293a408ee6fbb9cfe7e Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 24 Sep 2012 01:07:22 +0200 Subject: Correct dependancies in makefiles Change-Id: I6345144f1b5a998a4a8fd70b51c9a40342a69582 Reviewed-on: https://gerrit.libreoffice.org/693 Tested-by: Andras Timar Reviewed-by: Andras Timar --- solenv/gbuild/AllLangResTarget.mk | 29 ++++++++++++------------- solenv/gbuild/Configuration.mk | 17 ++++++++------- solenv/gbuild/ExtensionTarget.mk | 41 ++++++++++++++++++++---------------- solenv/gbuild/InstallModuleTarget.mk | 14 ++++++------ 4 files changed, 53 insertions(+), 48 deletions(-) diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index f03a410cf956..24f9c67e1075 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -51,32 +51,26 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build gb_SrsPartMergeTarget_TRANSEXCOMMAND := \ $(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET) - -define gb_GetPoFiles -echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)), $(gb_POLOCATION)/$(lang)/$(1)) > $(2) -endef - define gb_SrsPartMergeTarget__command $(call gb_Output_announce,$(3),$(true),srs,1) -POFILES=`$(gb_MKTEMP)` && \ -$(call gb_GetPoFiles,$(PO),$${POFILES}) && \ +MERGEINPUT=`$(gb_MKTEMP)` && \ +echo $(POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ -i $(3) \ -o $(1) \ - -m $${POFILES} \ + -m $${MERGEINPUT} \ -l all) && \ -rm -rf $${POFILES} +rm -rf $${MERGEINPUT} endef $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) $(gb_SrsPartMergeTarget_TRANSEXTARGET) - $(if $(strip $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(PO)),,x))),\ - mkdir -p $(dir $@) && cp $< $@,\ - $(call gb_SrsPartMergeTarget__command,$@,$*,$<)) - + $(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\ + $(call gb_SrsPartMergeTarget__command,$@,$*,$<),\ + mkdir -p $(dir $@) && cp $< $@) # SrsPartTarget class @@ -120,7 +114,8 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := else $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1)) $(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1)) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po +$(call gb_SrsPartMergeTarget_get_target,$(1)) : \ + POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po) endif endef @@ -133,8 +128,10 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_ mkdir -p $$(dir $$@) && \ cp $$< $$@) ifneq ($(strip $(WITH_LANG)),) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po -$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(PO) +$(call gb_SrsPartMergeTarget_get_target,$(1)) : \ + POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po) +$(call gb_SrsPartMergeTarget_get_target,$(1)) : \ + $(wildcard $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)) endif endef diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 2ae4275ba753..240c4ab458dc 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -249,24 +249,24 @@ gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_C # PRJNAME is computed from the stem (parameter $(2)) define gb_XcuMergeTarget__command $(call gb_Output_announce,$(2),$(true),XCU,5) -POFILES=`$(gb_MKTEMP)` && \ -$(call gb_GetPoFiles,$(PO),$${POFILES}) && \ +MERGEINPUT=`$(gb_MKTEMP)` && \ +echo $(POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XcuMergeTarget_CFGEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ -i $(call gb_Helper_symlinked_native,$(3)) \ -o $(1) \ - -m $${POFILES} \ + -m $${MERGEINPUT} \ -l all) && \ -rm -rf $${POFILES} +rm -rf $${MERGEINPUT} endef $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET) - $(if $(strip $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(PO)),,x))),\ - mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@,\ - $(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^))) + $(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\ + $(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),\ + mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@) $(call gb_XcuMergeTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCU,5) @@ -278,7 +278,8 @@ define gb_XcuMergeTarget_XcuMergeTarget $(call gb_XcuMergeTarget_get_target,$(1)) : \ $(call gb_Configuration__get_source,$(2),$(3)/$(4)) \ $(wildcard $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)) -$(call gb_XcuMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po +$(call gb_XcuMergeTarget_get_target,$(1)) : \ + POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po) endef diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 4e9e6df6af25..e7eac815cd56 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -72,17 +72,17 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml : else $(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_XRMEXTARGET) $(call gb_Output_announce,$*/description.xml,$(true),XRM,3) - POFILES=`$(gb_MKTEMP)` && \ - $(call gb_GetPoFiles,$(PO),$${POFILES}) && \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $(POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \ $(gb_ExtensionTarget_XRMEXCOMMAND) \ -p $(PRJNAME) \ -i $(call gb_Helper_symlinked_native,$(filter %.xml,$^)) \ -o $@ \ - -m $${POFILES} \ + -m $${MERGEINPUT} \ -l all) && \ - rm -rf $${POFILES} + rm -rf $${MERGEINPUT} endif @@ -116,8 +116,10 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml ifneq ($(strip $(gb_WITH_LANG)),) -$(call gb_ExtensionTarget_get_target,$(1)) : PO := $(2).po -$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $$(PO) +$(call gb_ExtensionTarget_get_target,$(1)) : \ + POFILES := $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) +$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \ + $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) endif endef @@ -201,19 +203,21 @@ define gb_ExtensionTarget_localize_properties $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2) ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_ExtensionTarget_LANGS)),$(subst en_US,$(lang),$(2))) -$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : PO := $(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po -$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(PO) +$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ + POFILES := $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) +$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ + $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) endif $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \ $(gb_ExtensionTarget_PROPMERGETARGET) $$(call gb_Output_announce,$(2),$(true),PRP,3) - POFILES=`$(gb_MKTEMP)` && \ - $(call gb_GetPoFiles,$$(PO),$$$${POFILES}) && \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $$(POFILES) > $$$${MERGEINPUT} && \ mkdir -p $$(dir $$@) && \ cp -f $$< $$@ \ - $(if $(strip $(gb_WITH_LANG)),&& $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$@ -m $$$${POFILES}) && \ - rm -rf $$$${POFILES} + $(if $(strip $(gb_WITH_LANG)),&& $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$@ -m $$$${MERGEINPUT}) && \ + rm -rf $$$${MERGEINPUT} endef @@ -229,16 +233,17 @@ endef define gb_ExtensionTarget_localize_help_onelang $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ - PO := $(patsubst /%/,%,$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))).po -$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(PO) + POFILE := $(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))).po +$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ + $(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))).po $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(gb_ExtensionTarget_HELPEXTARGET) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) $$(call gb_Output_announce,$(2),$(true),XHP,3) - POFILES=`$(gb_MKTEMP)` && \ - echo $(gb_POLOCATION)/$(4)/$$(PO) > $$$${POFILES} && \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $$(POFILE) > $$$${MERGEINPUT} && \ mkdir -p $$(dir $$@) && \ - $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$$${POFILES} && \ - rm -rf $$$${POFILES} + $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$$${MERGEINPUT} && \ + rm -rf $$$${MERGEINPUT} endef diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 1de6c8362f5e..fbbe48ee5c6d 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -113,11 +113,11 @@ gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf define gb_ScpMergeTarget__command $(call gb_Output_announce,$(2),$(true),SUM,1) -POFILES=`$(gb_MKTEMP)` && \ -$(call gb_GetPoFiles,$(SCP_PO),$${POFILES}) && \ +MERGEINPUT=`$(gb_MKTEMP)` && \ +echo $(SCP_POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $${POFILES} -l all ) && \ -rm -rf $${POFILES} + $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $${MERGEINPUT} -l all ) && \ +rm -rf $${MERGEINPUT} endef @@ -136,8 +136,10 @@ $(call gb_ScpMergeTarget_get_clean_target,%) : define gb_ScpMergeTarget_ScpMergeTarget $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir -$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_PO := $(patsubst %/,%,$(dir $(1))).po -$(call gb_ScpMergeTarget_get_target,$(1)) : $$(SCP_PO) +$(call gb_ScpMergeTarget_get_target,$(1)) : \ + SCP_POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po) +$(call gb_ScpMergeTarget_get_target,$(1)) : \ + $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po) endef -- cgit From 25e2d8eefd0371bec1fc0ccbd68f0d4aa1de102c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Fri, 28 Sep 2012 22:11:54 +0200 Subject: depend on po files not on localize.sdf Change-Id: Ib386d1c87d0efbd81462924993e1c18165870991 --- solenv/gbuild/ExtensionTarget.mk | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 80ab5616caab..481c4b993b23 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -298,10 +298,12 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : HELPFILES += $(3) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) ifneq ($(strip $(gb_WITH_LANG)),) +ifneq ($(filter-out en-US,$(5)),) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ - SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf + POFILE := $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ - $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf + $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) +endif endif $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXTARGET)) | \ @@ -313,7 +315,7 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ mkdir -p $$(dir $$@) && \ $(if $(filter-out en-US,$(5)), \ $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) \ - -m $$(SDF), \ + -m $$(POFILE), \ cp $$< $$@)) endef @@ -333,10 +335,12 @@ define gb_ExtensionTarget__localize_helptreefile_onelang $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) ifneq ($(strip $(gb_WITH_LANG)),) +ifneq ($(filter-out en-US,$(5)),) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf + POFILE := $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(4))),.po,$(4)) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf + $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(4))),.po,$(4)) +endif endif $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_UPDATETREETARGET)) | \ @@ -347,7 +351,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) && \ $(if $(filter-out en-US,$(5)), \ - $(gb_ExtensionTarget_UPDATETREECOMMAND) $$< $(5) $$(SDF) $$@ $(6),\ + cp $$< $$@,\ cp $$< $$@)) endef -- cgit From a6e55d489b611e8dedf001c7897b6b60519fb89a Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sat, 29 Sep 2012 20:58:39 +0200 Subject: Make l10ntools works with i18nregexp Change-Id: I80d3dbc19856d518ed8a94dba227372f5f74ec47 Reviewed-on: https://gerrit.libreoffice.org/725 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/Executable_uiex.mk | 1 + l10ntools/prj/build.lst | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk index ca4d7266423a..052f9d017284 100644 --- a/l10ntools/Executable_uiex.mk +++ b/l10ntools/Executable_uiex.mk @@ -16,6 +16,7 @@ $(eval $(call gb_Executable_set_include,uiex,\ $(eval $(call gb_Executable_use_libraries,uiex,\ sal \ + i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,uiex,\ diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst index 5f7fca144415..888b2343a4b5 100644 --- a/l10ntools/prj/build.lst +++ b/l10ntools/prj/build.lst @@ -1,3 +1,3 @@ -tr l10ntools : EXPAT:expat LIBXSLT:libxslt sal NULL +tr l10ntools : EXPAT:expat LIBXSLT:libxslt sal regexp NULL tr l10ntools usr1 - all tr_mkout NULL tr l10ntools\prj nmake - all tr_prj NULL -- cgit From 9baaced8b636e23045495c9a018d0859a9df8e76 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sat, 29 Sep 2012 21:01:30 +0200 Subject: Not use initializer-list for vector Change-Id: I6ed72b28be3ad00224cbf7308b4f27a6fb25e24e Reviewed-on: https://gerrit.libreoffice.org/726 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/source/po.cxx | 10 ++++++---- l10ntools/source/renewpo.cxx | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index f433aaba236e..b2082a7ee80b 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -338,10 +338,12 @@ void ImplFindAllTag(const OString& rText,std::vector& o_vFoundTags) OString ImplEscapeTags(const OString& rText) { typedef std::vector StrVec; - const StrVec vTagsForEscape = - { "ahelp", "link", "item", "emph", "defaultinline", - "switchinline", "caseinline", "variable", - "bookmark_value", "image", "embedvar", "alt" }; + const OString vInitializer[] = { + "ahelp", "link", "item", "emph", "defaultinline", + "switchinline", "caseinline", "variable", + "bookmark_value", "image", "embedvar", "alt" }; + const StrVec vTagsForEscape( vInitializer, + vInitializer + sizeof(vInitializer) / sizeof(vInitializer[0]) ); StrVec vFoundTags; ImplFindAllTag(rText,vFoundTags); OString sResult = rText; diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index 398b23bf9a85..39152a7945fa 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -116,9 +116,10 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, { sActTrans =""; } - const vector vTypes = { PoEntry::TTEXT, - PoEntry::TQUICKHELPTEXT, - PoEntry::TTITLE }; + const PoEntry::TYPE vInitializer[] = + { PoEntry::TTEXT, PoEntry::TQUICKHELPTEXT, PoEntry::TTITLE }; + const vector vTypes( vInitializer, + vInitializer + sizeof(vInitializer) / sizeof(vInitializer[0]) ); unsigned short nDummyBit = 0; for( unsigned nIndex=0; nIndex Date: Fri, 28 Sep 2012 17:52:13 +0200 Subject: Make Po classes robuster -Make PoOfstream\PoIfstream classes for checked po input\output -Make copyability obvious -Handle runtime errors with exceptions -Use assertions to define exceptations for programmers Plus some correction -Use simplier indentation -In renewpo.cxx, define sdf file as a tempfile instead of make it in current location -Use constructor to renew poheader -Use const where needed Change-Id: Ic11ce3b9eee9a9fa9fbc4ccda154623160ad9d8a Reviewed-on: https://gerrit.libreoffice.org/728 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/inc/po.hxx | 74 +++++++++++-- l10ntools/source/localize.cxx | 52 +++++---- l10ntools/source/merge.cxx | 98 ++++++++++++----- l10ntools/source/po.cxx | 246 ++++++++++++++++++++++++++++++++++-------- l10ntools/source/renewpo.cxx | 88 +++++++++------ 5 files changed, 426 insertions(+), 132 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index 686c9f393468..76312a4a59e5 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -12,10 +12,15 @@ #include #include +#include + +class PoOfstream; +class PoIfstream; class GenPoEntry { private: + OString m_sWhiteSpace; OString m_sExtractCom; OString m_sReference; @@ -27,8 +32,10 @@ private: OString m_sKeyId; public: + GenPoEntry(); virtual ~GenPoEntry(); + //Default copy constructor and copy operator work well virtual OString getWhiteSpace() const { return m_sWhiteSpace; } virtual OString getExtractCom() const { return m_sExtractCom; } @@ -49,25 +56,33 @@ public: virtual void setFuzzy(const bool bFuzzy); virtual void genKeyId(); - virtual void writeToFile(std::ofstream& rOFStream); + virtual void writeToFile(std::ofstream& rOFStream) const; virtual void readFromFile(std::ifstream& rIFStream); }; class PoEntry { private: + GenPoEntry m_aGenPo; + bool m_bIsInitialized; public: - enum SDFPARTS { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID, + + friend class PoOfstream; + friend class PoIfstream; + + enum SDFPART { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID, LOCALID, HELPID, PLATFORM, WIDTH, LANGUAGEID, TEXT, HELPTEXT, QUICKHELPTEXT, TITLE, TIMESTAMP }; enum TYPE { TTEXT=TEXT, TQUICKHELPTEXT=QUICKHELPTEXT, TTITLE=TITLE }; + enum Exception { INVALIDSDFLINE }; PoEntry(); PoEntry(const OString& rSDFLine, const TYPE eType = TTEXT); ~PoEntry(); + //Default copy constructor and copy operator work well OString getSourceFile() const; OString getGroupId() const; @@ -77,15 +92,11 @@ public: OString getUnTransStr() const; OString getTransStr() const; bool getFuzzy() const; - bool isNull() const; OString getKeyId() const; void setUnTransStr(const OString& rUnTransStr); void setTransStr(const OString& rTransStr); void setFuzzy(const bool bFuzzy); - void writeToFile(std::ofstream& rOFStream); - void readFromFile(std::ifstream& rIFStream); - static bool IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2); }; @@ -93,16 +104,63 @@ public: class PoHeader { private: + GenPoEntry m_aGenPo; + bool m_bIsInitialized; public: + + friend class PoOfstream; + friend class PoIfstream; + PoHeader(); PoHeader( const OString& rExtSrc ); + PoHeader( std::ifstream& rOldPo ); ~PoHeader(); + //Default copy constructor and copy operator work well OString getLanguage() const; - void writeToFile(std::ofstream& rOFStream); - void readFromFile(std::ifstream& rIFStream); +}; + +class PoOfstream: private boost::noncopyable +{ +private: + + std::ofstream m_aOutPut; + bool m_bIsAfterHeader; + +public: + PoOfstream(); + ~PoOfstream(); + bool isOpen() const { return m_aOutPut.is_open(); } + + void open(const OString& rFileName); + void close(); + void writeHeader(const PoHeader& rHeader); + void writeEntry(const PoEntry& rPo); +}; + +class PoIfstream: private boost::noncopyable +{ +private: + + std::ifstream m_aInPut; + bool m_bIsAfterHeader; + bool m_bEof; + +public: + + enum Exception { INVALIDENTRY, INVALIDHEADER }; + + PoIfstream(); + ~PoIfstream(); + bool isOpen() const { return m_aInPut.is_open(); } + bool eof() const { return m_bEof; } + + void open(const OString& rFileName); + void close(); + void readHeader(PoHeader& rHeader); + void readEntry(PoEntry& rPo); }; #endif // _PO_INCLUDED diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index a9a20c8b13da..87ee83bc1c58 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -170,7 +170,7 @@ bool passesPositiveList(rtl::OUString const & url) { void handleCommand( rtl::OUString const & project, rtl::OUString const & projectRoot, rtl::OUString const & url, rtl::OUString const & actualDir, - std::ofstream & outPut, rtl::OUString const & executable, bool positive) + PoOfstream & rPoOutPut, rtl::OUString const & executable, bool positive) { if (positive ? passesPositiveList(url) : passesNegativeList(url)) { rtl::OUString inPath; @@ -241,7 +241,7 @@ void handleCommand( std::string s; std::getline(in, s); - if (!in.eof() && !outPut.is_open()) + if (!in.eof() && !rPoOutPut.isOpen()) { rtl::OUString outDirUrl; if (osl::FileBase::getFileURLFromSystemPath(actualDir. @@ -263,8 +263,14 @@ void handleCommand( std::cerr << "Error: Cannot convert pathname from UTF-16\n"; throw false; //TODO } - outPut.open(outFilePath.getStr(), - std::ios_base::out | std::ios_base::trunc); + rPoOutPut.open(outFilePath.getStr()); + if (!rPoOutPut.isOpen()) + { + std::cerr + << "Error: Cannot open po file " + << outFilePath.getStr() << "\n"; + throw false; //TODO + } rtl::OString relativPath; if (!inPath.copy(inPath.indexOf(project), inPath.lastIndexOf('/')-inPath.indexOf(project)). @@ -275,18 +281,28 @@ void handleCommand( std::cerr << "Error: Cannot convert pathname from UTF-16\n"; throw false; //TODO } - PoHeader(relativPath).writeToFile(outPut); + rPoOutPut.writeHeader(PoHeader(relativPath)); } while (!in.eof()) { OString sLine = OString(s.data(),s.length()); - - if (!sLine.getToken(PoEntry::TEXT,'\t').isEmpty()) - PoEntry(sLine).writeToFile(outPut); - if (!sLine.getToken(PoEntry::QUICKHELPTEXT,'\t').isEmpty()) - PoEntry(sLine,PoEntry::TQUICKHELPTEXT).writeToFile(outPut); - if (!sLine.getToken(PoEntry::TITLE,'\t').isEmpty()) - PoEntry(sLine,PoEntry::TTITLE).writeToFile(outPut); + try + { + if (!sLine.getToken(PoEntry::TEXT,'\t').isEmpty()) + rPoOutPut.writeEntry(PoEntry(sLine)); + if (!sLine.getToken(PoEntry::QUICKHELPTEXT,'\t').isEmpty()) + rPoOutPut.writeEntry(PoEntry(sLine,PoEntry::TQUICKHELPTEXT)); + if (!sLine.getToken(PoEntry::TITLE,'\t').isEmpty()) + rPoOutPut.writeEntry(PoEntry(sLine,PoEntry::TTITLE)); + } + catch(PoEntry::Exception& aException) + { + if(aException == PoEntry::INVALIDSDFLINE) + { + std::cerr << executable << "'s input is invalid\n"; + throw false; //TODO + } + } std::getline(in, s); }; in.close(); @@ -296,7 +312,7 @@ void handleCommand( void handleFile( rtl::OUString const & project, rtl::OUString const & projectRoot, rtl::OUString const & url, rtl::OUString const & actualDir, - std::ofstream & outPut) + PoOfstream & rPoOutPut) { struct Command { char const * extension; @@ -319,7 +335,7 @@ void handleFile( commands[i].extension, commands[i].extensionLength)) { handleCommand( - project, projectRoot, url, actualDir, outPut, + project, projectRoot, url, actualDir, rPoOutPut, rtl::OUString::createFromAscii(commands[i].executable), commands[i].positive); break; @@ -430,7 +446,7 @@ void handleDirectory( rtl::OUString const & url, int level, rtl::OUString const & project, rtl::OUString const & projectRoot, rtl::OUString const & actualDir) { - std::ofstream output; + PoOfstream aPoOutPut; osl::Directory dir(url); if (dir.open() != osl::FileBase::E_None) { std::cerr @@ -494,13 +510,13 @@ void handleDirectory( } } else { handleFile(project, projectRoot, - stat.getFileURL(), actualDir, output); + stat.getFileURL(), actualDir, aPoOutPut); } break; } } - if (output.is_open()) - output.close(); + if (aPoOutPut.isOpen()) + aPoOutPut.close(); if (dir.close() != osl::FileBase::E_None) { std::cerr << "Error: Cannot close directory\n"; throw false; //TODO diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index b87024a22dec..7e6c59598c95 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -45,6 +45,27 @@ namespace rFilename.lastIndexOf( '\\' ), rFilename.lastIndexOf( '/' ))+1); }; + + static bool lcl_ReadPoChecked( + PoEntry& o_rPoEntry, PoIfstream& rPoFile, + const std::string& rFileName) + { + try + { + rPoFile.readEntry( o_rPoEntry ); + } + catch( PoIfstream::Exception& aException ) + { + if( aException == PoIfstream::INVALIDENTRY ) + { + printf( + "Warning : %s contains invalid entry\n", + rFileName.c_str() ); + return false; + } + } + return true; + } } // @@ -142,8 +163,8 @@ MergeDataFile::MergeDataFile( const rtl::OString &rFile, bool bCaseSensitive) { - std::ifstream aInputStream(rFileName.getStr()); - if (!aInputStream.is_open()) + std::ifstream aInputStream( rFileName.getStr() ); + if ( !aInputStream.is_open() ) { printf("Warning : Can't open po path container file"); return; @@ -151,30 +172,45 @@ MergeDataFile::MergeDataFile( std::string sPoFileName; aInputStream >> sPoFileName; bool bFirstLang = true; - while(!aInputStream.eof()) + while( !aInputStream.eof() ) { - std::ifstream aPoFile(sPoFileName.c_str()); const OString sHACK("HACK"); - const OString sFileName(lcl_NormalizeFilename(rFile)); - - if (!aPoFile.is_open()) + const OString sFileName( lcl_NormalizeFilename(rFile) ); + PoIfstream aPoInput; + aPoInput.open( OString(sPoFileName.data(), sPoFileName.length()) ); + if ( !aPoInput.isOpen() ) { - printf("Warning : Can't open %s\n", sPoFileName.c_str()); + printf( "Warning : Can't open %s\n", sPoFileName.c_str() ); return; } - PoHeader aPoHeader; - aPoHeader.readFromFile(aPoFile); + try + { + aPoInput.readHeader( aPoHeader ); + } + catch( PoIfstream::Exception& aException ) + { + if( aException == PoIfstream::INVALIDHEADER ) + { + printf( + "Warning : %s has invalid header\n", + sPoFileName.c_str() ); + return; + } + } const OString nLANG = aPoHeader.getLanguage(); - aLanguageSet.insert(nLANG); + aLanguageSet.insert( nLANG ); PoEntry aNextPo; do { - aNextPo.readFromFile(aPoFile); - } while( !aNextPo.isNull() && aNextPo.getSourceFile() != sFileName ); - while( !aNextPo.isNull() && aNextPo.getSourceFile() == sFileName ) + if( !lcl_ReadPoChecked(aNextPo, aPoInput, sPoFileName) ) + { + return; + } + } while( !aPoInput.eof() && aNextPo.getSourceFile() != sFileName ); + while( !aPoInput.eof() && aNextPo.getSourceFile() == sFileName ) { - PoEntry aActPo(aNextPo); + PoEntry aActPo( aNextPo ); bool bInSameComp = false; OString sText; @@ -189,7 +225,7 @@ MergeDataFile::MergeDataFile( do { if( bInSameComp ) - aActPo = PoEntry(aNextPo); + aActPo = aNextPo; OString sTemp = aActPo.getTransStr(); if( aActPo.getFuzzy() || sTemp.isEmpty() ) sTemp = aActPo.getUnTransStr(); @@ -211,25 +247,29 @@ MergeDataFile::MergeDataFile( sQTZTitle = aActPo.getKeyId(); break; } - aNextPo.readFromFile(aPoFile); - } while(!aNextPo.isNull() && - (bInSameComp = PoEntry::IsInSameComp(aActPo,aNextPo))); + if( !lcl_ReadPoChecked(aNextPo, aPoInput, sPoFileName) ) + { + return; + } + } while( !aPoInput.eof() && + ( bInSameComp = PoEntry::IsInSameComp(aActPo, aNextPo) ) ); + + InsertEntry( + aActPo.getResourceType(), aActPo.getGroupId(), + aActPo.getLocalId(), sHACK, nLANG, sText, + sQHText, sTitle, sFileName, bCaseSensitive ); - InsertEntry( aActPo.getResourceType(), aActPo.getGroupId(), - aActPo.getLocalId(), sHACK, nLANG, sText, - sQHText, sTitle, sFileName, bCaseSensitive ); if( bFirstLang ) { aLanguageSet.insert("qtz"); - InsertEntry( aActPo.getResourceType(), aActPo.getGroupId(), - aActPo.getLocalId(), sHACK, "qtz", - sQTZText + "‖" + sExText, - sQTZQHText + "‖" + sExQHText, - sQTZTitle + "‖" + sExTitle, - sFileName, bCaseSensitive ); + InsertEntry( + aActPo.getResourceType(), aActPo.getGroupId(), + aActPo.getLocalId(), sHACK, "qtz", + sQTZText + "‖" + sExText, sQTZQHText + "‖" + sExQHText, + sQTZTitle + "‖" + sExTitle, sFileName, bCaseSensitive ); } } - aPoFile.close(); + aPoInput.close(); aInputStream >> sPoFileName; bFirstLang = false; } diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index b2082a7ee80b..cf0b9632d854 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -13,10 +13,13 @@ #include #include -#include #include #include +#include + #include +#include + #include #include "po.hxx" @@ -49,7 +52,7 @@ OString ImplEscapeText(const OString& rText, const OString& rUnEscaped= POUNESCAPED, const OString& rEscaped = POESCAPED) { - if(rEscaped.getLength()!=2*rUnEscaped.getLength()) throw; + assert( rEscaped.getLength() == 2*rUnEscaped.getLength() ); OString sResult = rText; int nCount = 0; for(sal_Int32 nIndex=0; nIndex vParts; ImplSplitAt(rSDFLine,'\t',vParts); - if(vParts.size()!=15) throw; + if( vParts.size()!=15 || + vParts[SOURCEFILE].isEmpty() || + vParts[GROUPID].isEmpty() || + vParts[RESOURCETYPE].isEmpty() || + vParts[eType].isEmpty() ) + { + throw INVALIDSDFLINE; + } m_aGenPo.setWhiteSpace("\n"); m_aGenPo.setReference(vParts[SOURCEFILE]. copy(vParts[SOURCEFILE].lastIndexOf("\\")+1)); m_aGenPo.setExtractCom(vParts[HELPTEXT]); - OString sContext = vParts[GROUPID] + "\n" + + OString sContext = + vParts[GROUPID] + "\n" + (vParts[LOCALID].isEmpty() ? "" : vParts[LOCALID] + "\n") + vParts[RESOURCETYPE]; switch(eType){ @@ -410,12 +423,13 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) sContext += ".quickhelptext"; break; case TTITLE: sContext += ".title"; break; - default: - throw; break; + /*Default case is unneeded because the type of eType has + only three element*/ } m_aGenPo.setContext(sContext); setUnTransStr(vParts[eType]); m_aGenPo.genKeyId(); + m_bIsInitialized = true; } //Destructor @@ -426,18 +440,21 @@ PoEntry::~PoEntry() //Get name of file from which entry is extracted OString PoEntry::getSourceFile() const { + assert( m_bIsInitialized ); return m_aGenPo.getReference(); } //Get groupid OString PoEntry::getGroupId() const { + assert( m_bIsInitialized ); return m_aGenPo.getContext().getToken(0,'\n'); } //Get localid OString PoEntry::getLocalId() const { + assert( m_bIsInitialized ); const OString sContext = m_aGenPo.getContext(); if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) return OString(); @@ -448,6 +465,7 @@ OString PoEntry::getLocalId() const //Get the type of component from which entry is extracted OString PoEntry::getResourceType() const { + assert( m_bIsInitialized ); const OString sContext = m_aGenPo.getContext(); if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) return sContext.getToken(1,'\n').getToken(0,'.'); @@ -459,30 +477,28 @@ OString PoEntry::getResourceType() const PoEntry::TYPE PoEntry::getType() const { const OString sContext = m_aGenPo.getContext(); - if (sContext.endsWith(".text")) + const OString sType = sContext.copy( sContext.indexOf('.') + 1 ); + assert( m_bIsInitialized && + (sType == "text" || sType == "quickhelptext" || sType == "title") ); + if ( sType == "text" ) return TTEXT; - else if (sContext.endsWith(".quickhelptext")) + else if ( sType == "quickhelptext" ) return TQUICKHELPTEXT; - else if (sContext.endsWith(".title")) + else return TTITLE; - else throw; } //Check wheather entry is fuzzy bool PoEntry::getFuzzy() const { + assert( m_bIsInitialized ); return m_aGenPo.getFuzzy(); } -//Check wheather entry is null -bool PoEntry::isNull() const -{ - return m_aGenPo.isNull(); -} - //Get keyid OString PoEntry::getKeyId() const { + assert( m_bIsInitialized ); return m_aGenPo.getKeyId(); } @@ -490,15 +506,19 @@ OString PoEntry::getKeyId() const //Get translation string in sdf/merge format OString PoEntry::getUnTransStr() const { - return ImplEscapeSDFText(m_aGenPo.getUnTransStr(), - getSourceFile().endsWith(".xhp")); + assert( m_bIsInitialized ); + return + ImplEscapeSDFText( + m_aGenPo.getUnTransStr(), getSourceFile().endsWith(".xhp") ); } //Get translated string in sdf/merge format OString PoEntry::getTransStr() const { - return ImplEscapeSDFText(m_aGenPo.getTransStr(), - getSourceFile().endsWith(".xhp")); + assert( m_bIsInitialized ); + return + ImplEscapeSDFText( + m_aGenPo.getTransStr(), getSourceFile().endsWith(".xhp") ); } @@ -524,20 +544,6 @@ void PoEntry::setFuzzy(const bool bFuzzy) m_aGenPo.setFuzzy(bFuzzy); } -//Write to file -void PoEntry::writeToFile(std::ofstream& rOFStream) -{ - m_aGenPo.writeToFile(rOFStream); -} - - -//Read from file -void PoEntry::readFromFile(std::ifstream& rIFStream) -{ - *this = PoEntry(); - m_aGenPo.readFromFile(rIFStream); -} - //Check whether po-s belong to the same localization component bool PoEntry::IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2) { @@ -559,15 +565,26 @@ OString ImplGetTime() return pBuff; } +OString ImplReplaceAttribute( + const OString& rSource, const OString& rOld, const OString& rNew ) +{ + const sal_Int32 nFirstIndex = rSource.indexOf( rOld ) + rOld.getLength()+2; + const sal_Int32 nCount = + rSource.indexOf( "\n", nFirstIndex ) - nFirstIndex; + return rSource.replaceFirst( rSource.copy(nFirstIndex, nCount), rNew ); +} + //Default Constructor PoHeader::PoHeader() : m_aGenPo( GenPoEntry() ) + , m_bIsInitialized( false ) { } //Template Constructor PoHeader::PoHeader( const OString& rExtSrc ) : m_aGenPo( GenPoEntry() ) + , m_bIsInitialized( false ) { m_aGenPo.setExtractCom("extracted from " + rExtSrc); m_aGenPo.setTransStr( @@ -583,6 +600,34 @@ PoHeader::PoHeader( const OString& rExtSrc ) "Content-Transfer-Encoding: 8bit\n" "X-Genarator: LibreOffice\n" "X-Accelerator_Marker: ~\n")); + m_bIsInitialized = true; +} + + +//Constructor for old headers to renew po files +PoHeader::PoHeader( std::ifstream& rOldPo ) + : m_aGenPo( GenPoEntry() ) + , m_bIsInitialized( false ) +{ + assert( rOldPo.is_open() ); + m_aGenPo.readFromFile( rOldPo ); + + m_aGenPo.setWhiteSpace( OString() ); + const OString sExtractCom = m_aGenPo.getExtractCom(); + m_aGenPo.setExtractCom( + sExtractCom.copy( 0, sExtractCom.getLength() - 3 ) ); + + OString sTransStr = m_aGenPo.getTransStr(); + sTransStr = + ImplReplaceAttribute( sTransStr, "Report-Msgid-Bugs-To", + "https://bugs.freedesktop.org/enter_bug.cgi?product=" + "LibreOffice&bug_status=UNCONFIRMED&component=UI" ); + sTransStr = + ImplReplaceAttribute( sTransStr, "X-Generator", "LibreOffice" ); + sTransStr = + ImplReplaceAttribute( sTransStr, "X-Accelerator-Marker", "~" ); + m_aGenPo.setTransStr( sTransStr ); + m_bIsInitialized = true; } PoHeader::~PoHeader() @@ -592,6 +637,7 @@ PoHeader::~PoHeader() //Get the language of header OString PoHeader::getLanguage() const { + assert( m_bIsInitialized ); const OString sLang = "Language: "; const OString sTransStr = m_aGenPo.getTransStr(); const sal_Int32 nFirstIndex = sTransStr.indexOf(sLang)+sLang.getLength(); @@ -599,18 +645,128 @@ OString PoHeader::getLanguage() const return sTransStr.copy(nFirstIndex,nCount); } -//Write out to file -void PoHeader::writeToFile(std::ofstream& rOFStream) +//Class PoOfstream + +PoOfstream::PoOfstream() + : m_aOutPut() + , m_bIsAfterHeader( false ) +{ +} + +PoOfstream::~PoOfstream() +{ + if( isOpen() ) + { + close(); + } +} + +void PoOfstream::open(const OString& rFileName) { - m_aGenPo.writeToFile(rOFStream); + assert( !isOpen() ); + m_aOutPut.open( rFileName.getStr(), + std::ios_base::out | std::ios_base::trunc ); + m_bIsAfterHeader = false; } -//Read from file -void PoHeader::readFromFile(std::ifstream& rIFStream) +void PoOfstream::close() +{ + assert( isOpen() ); + m_aOutPut.close(); +} + +void PoOfstream::writeHeader(const PoHeader& rPoHeader) +{ + assert( isOpen() && !m_bIsAfterHeader && rPoHeader.m_bIsInitialized ); + rPoHeader.m_aGenPo.writeToFile( m_aOutPut ); + m_bIsAfterHeader = true; +} + +void PoOfstream::writeEntry( const PoEntry& rPoEntry ) +{ + assert( isOpen() && m_bIsAfterHeader && rPoEntry.m_bIsInitialized ); + rPoEntry.m_aGenPo.writeToFile( m_aOutPut ); +} + +//Class PoIfstream + +PoIfstream::PoIfstream() + : m_aInPut() + , m_bIsAfterHeader( false ) + , m_bEof( false ) +{ +} + +PoIfstream::~PoIfstream() +{ + if( isOpen() ) + { + close(); + } +} + +void PoIfstream::open( const OString& rFileName ) +{ + assert( !isOpen() ); + m_aInPut.open( rFileName.getStr(), std::ios_base::in ); + m_bIsAfterHeader = false; + m_bEof = false; +} + +void PoIfstream::close() { - *this = PoHeader(); - m_aGenPo.readFromFile(rIFStream); + assert( isOpen() ); + m_aInPut.close(); } +void PoIfstream::readHeader( PoHeader& rPoHeader ) +{ + assert( isOpen() && !eof() && !m_bIsAfterHeader ); + GenPoEntry aGenPo; + aGenPo.readFromFile( m_aInPut ); + if( !aGenPo.getExtractCom().isEmpty() && + aGenPo.getUnTransStr().isEmpty() && + !aGenPo.getTransStr().isEmpty() ) + { + rPoHeader.m_aGenPo = aGenPo; + rPoHeader.m_bIsInitialized = true; + m_bIsAfterHeader = true; + } + else + { + throw INVALIDHEADER; + } +} + +void PoIfstream::readEntry( PoEntry& rPoEntry ) +{ + assert( isOpen() && !eof() && m_bIsAfterHeader ); + GenPoEntry aGenPo; + aGenPo.readFromFile( m_aInPut ); + if( aGenPo.isNull() ) + { + m_bEof = true; + rPoEntry = PoEntry(); + } + else + { + const OString sContext = aGenPo.getContext(); + const sal_Int32 nLastDot = sContext.lastIndexOf('.'); + const OString sType = sContext.copy( nLastDot + 1 ); + if( !aGenPo.getReference().isEmpty() && + sContext.indexOf('\n') > 0 && + (sType == "text" || sType == "quickhelptext" || sType == "title") && + nLastDot - sContext.lastIndexOf('\n') > 0 && + !aGenPo.getUnTransStr().isEmpty() ) + { + rPoEntry.m_aGenPo = aGenPo; + rPoEntry.m_bIsInitialized = true; + } + else + { + throw INVALIDENTRY; + } + } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index 39152a7945fa..83b3051134a9 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -12,7 +12,10 @@ #include #include #include + +#include #include + #include "po.hxx" using namespace std; @@ -58,10 +61,27 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, const OString& rpo2loPath, const OString& rSDFPath) { const OString LangEntryName = pLangEntry->d_name; - const OString SDFFileName = LangEntryName + ".sdf"; //Generate and open sdf cout << "Process start with language: " << LangEntryName.getStr() << endl; + OUString aTempUrl; + if (osl::FileBase::createTempFile(0, 0, &aTempUrl) + != osl::FileBase::E_None) + { + cerr << "osl::FileBase::createTempFile() failed\n"; + return; + } + OUString aTempPath; + if (osl::FileBase::getSystemPathFromFileURL(aTempUrl, aTempPath) + != osl::FileBase::E_None) + { + cerr + << "osl::FileBase::getSystemPathFromFileURL(" << aTempUrl + << ") failed\n"; + return; + } + const OString SDFFileName = + OUStringToOString(aTempPath, RTL_TEXTENCODING_UTF8); system( (rpo2loPath + " -i " + rPath + "/" + LangEntryName + " -o " + SDFFileName + @@ -69,7 +89,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, " -t " + rSDFPath).getStr()); cout << "Language sdf is ready!" << endl; - ofstream aOutPut; + PoOfstream aNewPo; ifstream aSDFInput(SDFFileName.getStr()); string s; getline(aSDFInput,s); @@ -77,40 +97,41 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, while(!aSDFInput.eof()) { OString sActUnTrans = sLine; - OString sPath = rPath + "/"+ LangEntryName; - OString sActSourcePath = GetPath(sPath,sActUnTrans); - //Make new po file, copy header with some changes - if (!aOutPut.is_open()) + const OString sPath = rPath + "/"+ LangEntryName; + const OString sActSourcePath = GetPath(sPath,sActUnTrans); + //Make new po file and add header + if (!aNewPo.isOpen()) { - aOutPut.open((sActSourcePath + ".po_tmp").getStr(), - std::ios_base::out | std::ios_base::trunc); - ifstream aPOInput((sActSourcePath + ".po").getStr()); - getline(aPOInput,s); - while(s!="") + const OString sNewPoFileName = sActSourcePath + ".po_tmp"; + aNewPo.open(sNewPoFileName); + if (!aNewPo.isOpen()) { - if (s.find("#. extracted from")!=string::npos) - s = string(s,0,s.length()-3); - if (s.find("Report-Msgid-Bugs-To")!=string::npos) - s = string("\"Report-Msgid-Bugs-To: ") + - "https://bugs.freedesktop.org/enter_bug.cgi?product=" + - "LibreOffice&bug_status=UNCONFIRMED&component=UI\\n\""; - if (s.find("X-Generator")!=string::npos) - s = "\"X-Generator: LibreOffice\\n\""; - aOutPut << s << endl; - getline(aPOInput,s); - }; - aPOInput.close(); + cerr + << "Cannot open temp file for new po: " + << sNewPoFileName.getStr() << endl; + return; + } + const OString sOldPoFileName = sActSourcePath + ".po"; + ifstream aOldPo(sOldPoFileName.getStr()); + if (!aOldPo.is_open()) + { + cerr + << "Cannot open old po file: " + << sOldPoFileName.getStr() << endl; + return; + } + aNewPo.writeHeader(PoHeader(aOldPo)); + aOldPo.close(); } //Set PoEntry and write out getline(aSDFInput,s); - sLine = OString(s.data(),s.length()); OString sActTrans; - if (!aSDFInput.eof() && IsSameEntry(sActUnTrans,sLine)) + if (!aSDFInput.eof() && + IsSameEntry(sActUnTrans,sLine = OString(s.data(),s.length()))) { sActTrans = sLine; getline(aSDFInput,s); - sLine = OString(s.data(),s.length()); } else { @@ -121,7 +142,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, const vector vTypes( vInitializer, vInitializer + sizeof(vInitializer) / sizeof(vInitializer[0]) ); unsigned short nDummyBit = 0; - for( unsigned nIndex=0; nIndex(sActTrans.getToken(PoEntry::DUMMY,'\t'). copy(nDummyBit++,1).toBoolean())); - aPE.writeToFile(aOutPut); + aNewPo.writeEntry(aPE); } } //Check wheather next entry is in the same po file - OString sNextSourcePath = - !aSDFInput.eof() ? GetPath(sPath,sLine) : ""; + OString sNextSourcePath = aSDFInput.eof() ? "" : + GetPath(sPath,sLine = OString(s.data(),s.length())); if (sNextSourcePath!=sActSourcePath) { - aOutPut.close(); + aNewPo.close(); system(("rm " + sActSourcePath +".po").getStr()); system(("mv "+ sActSourcePath +".po_tmp " + sActSourcePath +".po").getStr()); @@ -158,7 +179,10 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, //Close and remove sdf file aSDFInput.close(); - system(("rm " + SDFFileName).getStr()); + if (osl::File::remove(aTempUrl) != osl::FileBase::E_None) + { + cerr << "Warning: failure removing temporary " << aTempUrl << '\n'; + } } -- cgit From 0e138f246cc490df35046bba83e459164620ca77 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 12:08:04 +0200 Subject: Move setting of po msgid to constructor because this is part of initialization Change-Id: If6ebe46cea93e378c9060f2c3ced09ab44a3d82a Reviewed-on: https://gerrit.libreoffice.org/729 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/source/po.cxx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index cf0b9632d854..0649efedac0a 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -427,7 +427,9 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) only three element*/ } m_aGenPo.setContext(sContext); - setUnTransStr(vParts[eType]); + m_aGenPo.setUnTransStr( + ImplUnEscapeSDFText( + vParts[eType],vParts[SOURCEFILE].endsWith(".xhp"))); m_aGenPo.genKeyId(); m_bIsInitialized = true; } @@ -522,14 +524,6 @@ OString PoEntry::getTransStr() const } -//Set translation string when input is in sdf format -void PoEntry::setUnTransStr(const OString& rUnTransStr) -{ - m_aGenPo.setUnTransStr( - ImplUnEscapeSDFText( - rUnTransStr,getSourceFile().endsWith(".xhp"))); -} - //Set translated string when input is in sdf format void PoEntry::setTransStr(const OString& rTransStr) { -- cgit From 4869d45d8e6ba43f422ee3aa05b7c0baca28d1e0 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 12:47:56 +0200 Subject: Make error message clearer in localize which is written out when one of executables writes out invalid sdf line Change-Id: I167b31bf0f550222accdda8ee5a03d8e4a742d63 Reviewed-on: https://gerrit.libreoffice.org/730 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/source/localize.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 87ee83bc1c58..6bc92a8f3ee6 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -299,7 +299,11 @@ void handleCommand( { if(aException == PoEntry::INVALIDSDFLINE) { - std::cerr << executable << "'s input is invalid\n"; + std::cerr + << executable + << "'s output is invalid:\n" + << sLine.replaceAll("\t","\\t").getStr() + << std::endl; throw false; //TODO } } -- cgit From f1cbd2dc05c6765754891a909ff53f1852a878a5 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 13:11:54 +0200 Subject: Use ascii charachters to seperate qtzi Because previous used charachters cause warnings Change-Id: I8715fc2a05df9d84b34945618184c99d54de6579 Reviewed-on: https://gerrit.libreoffice.org/731 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/source/merge.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 7e6c59598c95..b9fe90f8ae4c 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -265,8 +265,8 @@ MergeDataFile::MergeDataFile( InsertEntry( aActPo.getResourceType(), aActPo.getGroupId(), aActPo.getLocalId(), sHACK, "qtz", - sQTZText + "‖" + sExText, sQTZQHText + "‖" + sExQHText, - sQTZTitle + "‖" + sExTitle, sFileName, bCaseSensitive ); + sQTZText + "||" + sExText, sQTZQHText + "||" + sExQHText, + sQTZTitle + "||" + sExTitle, sFileName, bCaseSensitive ); } } aPoInput.close(); -- cgit From 408acea40bf2e4dfaa5fc79779de0611b367128a Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 16:02:39 +0200 Subject: Add correct input for helpex Helpex waits for a file which contains path of po file not a path directly Delete unneeded slash Change-Id: I890f6a51ebef1ae40647859b11ab4c46c02eb13b Reviewed-on: https://gerrit.libreoffice.org/733 Reviewed-by: Andras Timar Tested-by: Andras Timar --- solenv/gbuild/ExtensionTarget.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 481c4b993b23..559e0cfa36b8 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -300,9 +300,9 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ ifneq ($(strip $(gb_WITH_LANG)),) ifneq ($(filter-out en-US,$(5)),) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ - POFILE := $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) + POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ - $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) + $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) endif endif $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ @@ -314,8 +314,11 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) && \ $(if $(filter-out en-US,$(5)), \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $$(POFILE) > $$$${MERGEINPUT} && \ $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) \ - -m $$(POFILE), \ + -m $$$${MERGEINPUT} && \ + rm -rf $$$${MERGEINPUT}, \ cp $$< $$@)) endef -- cgit From 004f4fae87fe4fe3c31948d55206291b6de64ba9 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 16:33:47 +0200 Subject: Correct escaping tags which worked wrong with some language like Asturian Change-Id: Icd5939316ac84a3e569a9cbc04e38edda59dead1 Reviewed-on: https://gerrit.libreoffice.org/735 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/source/po.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 0649efedac0a..f929ce70dc18 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -330,7 +330,9 @@ void ImplFindAllTag(const OString& rText,std::vector& o_vFoundTags) { ImplMinimize(sTemp,aRegExp,aRegs); o_vFoundTags.push_back( - rText.copy(aRegs.start[0],aRegs.end[0]-aRegs.start[0])); + OUStringToOString( + sTemp.copy(aRegs.start[0],aRegs.end[0]-aRegs.start[0]), + RTL_TEXTENCODING_UTF8)); nStart = aRegs.end[0]; memset(static_cast(&aRegs), 0, sizeof(re_registers)); aRegExp.re_search(&aRegs,nStart); -- cgit From 0359041aac89ef07325f6b8baa2d5ff304e833b5 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 17:54:37 +0200 Subject: Corrections for merge -Correct po type-checking -Use new "lang" variable instead of nonexistent one -Add input parameter to ulfex Change-Id: I1dc17363179d69d40144b6a998eb1bf223bd05e9 Reviewed-on: https://gerrit.libreoffice.org/736 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/source/po.cxx | 2 +- solenv/gbuild/ExtensionTarget.mk | 8 ++++---- solenv/gbuild/InstallModuleTarget.mk | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index f929ce70dc18..b9e1c17589ae 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -481,7 +481,7 @@ OString PoEntry::getResourceType() const PoEntry::TYPE PoEntry::getType() const { const OString sContext = m_aGenPo.getContext(); - const OString sType = sContext.copy( sContext.indexOf('.') + 1 ); + const OString sType = sContext.copy( sContext.lastIndexOf('.') + 1 ); assert( m_bIsInitialized && (sType == "text" || sType == "quickhelptext" || sType == "title") ); if ( sType == "text" ) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 559e0cfa36b8..4e53be562167 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -136,9 +136,9 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, , $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_ExtensionTarget_get_target,$(1)) : \ - POFILES := $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) + POFILES := $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \ - $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) + $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) endif $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ @@ -225,9 +225,9 @@ $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2) ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_ExtensionTarget_TRANS_LANGS)),$(subst en_US,$(lang),$(2))) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ - POFILES := $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) + POFILES := $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ - $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) + $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) endif $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \ diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index ace8ceb2283c..242a2597a3d1 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -132,7 +132,7 @@ $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET) - $(call gb_ScpMergeTarget__command,$@,$*) + $(call gb_ScpMergeTarget__command,$@,$*,$(SCP_SOURCE)) .PHONY : $(call gb_ScpMergeTarget_get_clean_target,%) $(call gb_ScpMergeTarget_get_clean_target,%) : -- cgit From 9d300551b3dacd3693607e1015bea1461c173e1a Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 18:26:15 +0200 Subject: Use new startsWith() method of OString Change-Id: If8787b007767aa2701ff1b13883bcf33df12a8fc Reviewed-on: https://gerrit.libreoffice.org/737 Reviewed-by: Andras Timar Tested-by: Andras Timar --- l10ntools/source/po.cxx | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index b9e1c17589ae..a922575e41fd 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -110,12 +110,6 @@ OString ImplGenNormString(const OString& rString) return ImplUnEscapeText(rString.copy(1,rString.getLength()-2)); } -//Decide whether a string starts with an other string -bool ImplStartsWith(const OString& rString,const OString& rStart) -{ - return rString.match(rStart); -} - //Default constructor GenPoEntry::GenPoEntry() : m_sWhiteSpace( OString() ) @@ -215,37 +209,37 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) while(!rIFStream.eof()) { OString sLine = OString(sTemp.data(),sTemp.length()); - if (ImplStartsWith(sLine,"#. ")) + if (sLine.startsWith("#. ")) { if (sLine.getLength()==7) m_sKeyId = sLine.copy(3); else m_sExtractCom = sLine.copy(3); } - else if (ImplStartsWith(sLine,"#: ")) + else if (sLine.startsWith("#: ")) { m_sReference = sLine.copy(3); } - else if (ImplStartsWith(sLine,"#, fuzzy")) + else if (sLine.startsWith("#, fuzzy")) { m_bFuzzy = true; } - else if (ImplStartsWith(sLine,"msgctxt ")) + else if (sLine.startsWith("msgctxt ")) { m_sContext = ImplGenNormString(sLine.copy(8)); pLastMsg = &m_sContext; } - else if (ImplStartsWith(sLine,"msgid ")) + else if (sLine.startsWith("msgid ")) { m_sUnTransStr = ImplGenNormString(sLine.copy(6)); pLastMsg = &m_sUnTransStr; } - else if (ImplStartsWith(sLine,"msgstr ")) + else if (sLine.startsWith("msgstr ")) { m_sTransStr = ImplGenNormString(sLine.copy(7)); pLastMsg = &m_sTransStr; } - else if (ImplStartsWith(sLine,"\"") && pLastMsg) + else if (sLine.startsWith("\"") && pLastMsg) { *pLastMsg += ImplGenNormString(sLine); } @@ -359,7 +353,7 @@ OString ImplEscapeTags(const OString& rText) for(StrVec::const_iterator pEscape = vTagsForEscape.begin(); pEscape != vTagsForEscape.end(); ++pEscape) { - if (ImplStartsWith(*pFound,"<" + *pEscape) || + if (pFound->startsWith("<" + *pEscape) || *pFound == "") { bEscapeThis = true; -- cgit From ecc7820a93ca5a8f678d75e13c2e94b1115382e2 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 19:01:17 +0200 Subject: Use po for merge of readme.xrm And delete old dmake rule Change-Id: Ia0a18b79579337ceb40e8a440e028cf0c2867bf5 Reviewed-on: https://gerrit.libreoffice.org/738 Reviewed-by: Andras Timar Tested-by: Andras Timar --- readlicense_oo/CustomTarget_readme.mk | 9 ++++++--- solenv/inc/rules.mk | 10 ---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk index 6c74fc6a1e70..2871631d06a8 100644 --- a/readlicense_oo/CustomTarget_readme.mk +++ b/readlicense_oo/CustomTarget_readme.mk @@ -36,16 +36,19 @@ readlicense_oo_README_XRM := $(readlicense_oo_DIR)/readme.xrm $(readlicense_oo_DIR)/readme.xrm : \ $(SRCDIR)/readlicense_oo/docs/readme.xrm \ $(readlicense_XRMEXTARGET) \ - $(gb_SDFLOCATION)/readlicense_oo/docs/localize.sdf \ + $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) \ | $(readlicense_oo_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1) $(call gb_Helper_abbreviate_dirs, \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) > $${MERGEINPUT} && \ $(readlicense_XRMEXCOMMAND) \ -p readlicense_oo \ -i $< \ -o $@ \ - -m $(gb_SDFLOCATION)/readlicense_oo/docs/localize.sdf \ - -l all) + -m $${MERGEINPUT} \ + -l all && \ + rm -rf $${MERGEINPUT}) endif diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index b4561b9c7693..327955fde0f5 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -701,13 +701,3 @@ $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf @$(COPY) $< $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ @-$(RM) $@.$(INPATH) - -POLOCATION:=$(SRCDIR)$/translations/source -PORELPATH:=$(PRJNAME)$/$(PATH_IN_MODULE).po - -$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm - $(COMMAND_ECHO)-$(MKDIR) $(@:d) - $(COMMAND_ECHO)-$(RM) $@ - $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG)) $(POLOCATION)/$(lang)/$(PORELPATH))) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) -- cgit From 2d9cf1aaf12456e3628791b742fc3e04ebc0d92b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 28 Sep 2012 13:11:19 +0100 Subject: WaE: some warnings on RHEL-6 gcc Change-Id: I7d852595fbe0395bc29aba86b2e110ffb5c28823 --- boost/boost.6397.warnings.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch index 82e3b5e88ee9..9c4c1ecb1b8c 100644 --- a/boost/boost.6397.warnings.patch +++ b/boost/boost.6397.warnings.patch @@ -255,3 +255,18 @@ }; +--- misc/boost_1_44_0/boost/multi_array.hpp 2012-09-28 13:06:44.796521371 +0100 ++++ misc/build/boost_1_44_0/boost/multi_array.hpp 2012-09-28 13:07:25.119002500 +0100 +@@ -423,9 +423,9 @@ + // Build index_gen objects to create views with the same shape + + // these need to be separate to handle non-zero index bases +- typedef detail::multi_array::index_gen index_gen; +- index_gen old_idxes; +- index_gen new_idxes; ++ typedef detail::multi_array::index_gen lcl_index_gen; ++ lcl_index_gen old_idxes; ++ lcl_index_gen new_idxes; + + std::transform(new_array.index_base_list_.begin(), + new_array.index_base_list_.end(), -- cgit From 3cd514df938252003ac3d3640156d6febf36fa76 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 21:36:02 +0200 Subject: chart2: remove obsolete gcc 3.0.4 workaround Change-Id: I61e17cf9c7a96ddf251154e4590420ae4b4fdf27 --- chart2/Library_chartcontroller.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 19220da8b5f9..7a0ea6fdbcb9 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -35,14 +35,6 @@ $(eval $(call gb_Library_set_include,chartcontroller,\ $(eval $(call gb_Library_use_sdk_api,chartcontroller)) -# TODO: is this still necessary? -# (from chart2/source/controller/dialogs/makefile.mk) -# # i26518 the gcc-3.0.4 requires to enhance the template-depth -# # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore -# .IF "$(COM)"=="GCC" -# CFLAGS+=-ftemplate-depth-128 -# .ENDIF - $(eval $(call gb_Library_use_libraries,chartcontroller,\ basegfx \ chartcore \ -- cgit From 6f6f7a17dc82248446dc4eddfd51af08362fc352 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 23:45:28 +0200 Subject: gbuild: split uwinapi out of gb_STDLIBS Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7 --- Library_merged.mk | 1 + UnoControls/Library_ctl.mk | 1 + accessibility/Library_acc.mk | 1 + accessibility/Library_java_uno_accessbridge.mk | 1 + animations/Library_animcore.mk | 1 + avmedia/Library_avmedia.mk | 1 + avmedia/Library_avmediaQuickTime.mk | 1 + avmedia/Library_avmediagst.mk | 1 + avmedia/Library_avmediagst_0_10.mk | 1 + avmedia/Library_avmediawin.mk | 1 + basctl/Library_basctl.mk | 1 + basebmp/CppunitTest_basebmp.mk | 1 + basebmp/Library_basebmp.mk | 1 + basebmp/StaticLibrary_basebmp.mk | 1 + basegfx/CppunitTest_basegfx.mk | 1 + basegfx/Library_basegfx.mk | 1 + basic/CppunitTest_basic_enable.mk | 1 + basic/CppunitTest_basic_nested_struct.mk | 1 + basic/CppunitTest_basic_scanner.mk | 1 + basic/Library_sb.mk | 1 + bean/Library_officebean.mk | 1 + binaryurp/CppunitTest_binaryurp_test-cache.mk | 1 + binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 1 + binaryurp/Library_binaryurp.mk | 1 + bridges/Library_java_uno.mk | 1 + canvas/Library_cairocanvas.mk | 1 + canvas/Library_canvasfactory.mk | 1 + canvas/Library_canvastools.mk | 1 + canvas/Library_directx9canvas.mk | 1 + canvas/Library_gdipluscanvas.mk | 1 + canvas/Library_nullcanvas.mk | 1 + canvas/Library_simplecanvas.mk | 1 + canvas/Library_vclcanvas.mk | 1 + chart2/Library_chartcontroller.mk | 1 + chart2/Library_chartcore.mk | 1 + cli_ure/Executable_climaker.mk | 1 + comphelper/CppunitTest_comphelper_test.mk | 1 + comphelper/Library_comphelper.mk | 1 + configmgr/Library_configmgr.mk | 1 + connectivity/Library_ado.mk | 1 + connectivity/Library_calc.mk | 1 + connectivity/Library_dbase.mk | 1 + connectivity/Library_dbpool2.mk | 1 + connectivity/Library_dbtools.mk | 1 + connectivity/Library_evoab.mk | 1 + connectivity/Library_file.mk | 1 + connectivity/Library_flat.mk | 1 + connectivity/Library_hsqldb.mk | 1 + connectivity/Library_jdbc.mk | 1 + connectivity/Library_mork.mk | 1 + connectivity/Library_mozab.mk | 1 + connectivity/Library_mozabdrv.mk | 1 + connectivity/Library_mozbootstrap.mk | 1 + connectivity/Library_mysql.mk | 1 + connectivity/Library_odbc.mk | 1 + connectivity/Library_odbcbase.mk | 1 + connectivity/Library_postgresql-sdbc-impl.mk | 1 + connectivity/Library_postgresql-sdbc.mk | 1 + connectivity/Library_sdbc2.mk | 1 + cppcanvas/Library_cppcanvas.mk | 1 + cppcanvas/Library_mtfrenderer.mk | 1 + cppu/CppunitTest_cppu_checkapi.mk | 1 + cppu/CppunitTest_cppu_qa_any.mk | 1 + cppu/CppunitTest_cppu_qa_recursion.mk | 1 + cppu/CppunitTest_cppu_qa_reference.mk | 1 + cppu/CppunitTest_cppu_qa_unotype.mk | 1 + cppu/CppunitTest_cppu_test_cppumaker.mk | 1 + cppu/Library_affine_uno.mk | 1 + cppu/Library_cppu.mk | 1 + cppu/Library_log_uno.mk | 1 + cppu/Library_purpenvhelper.mk | 1 + cppu/Library_unsafe_uno.mk | 1 + cppuhelper/CppunitTest_cppuhelper_checkapi.mk | 1 + cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 1 + cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 1 + cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 1 + cppuhelper/Library_cppuhelper.mk | 1 + cpputools/Executable_regcomp.mk | 1 + cpputools/Executable_regsingleton.mk | 1 + cpputools/Executable_uno.mk | 1 + cui/Library_cui.mk | 1 + dbaccess/CppunitTest_dbaccess_macros_test.mk | 1 + dbaccess/Executable_odbcconfig.mk | 1 + dbaccess/Library_dba.mk | 1 + dbaccess/Library_dbaxml.mk | 1 + dbaccess/Library_dbmm.mk | 1 + dbaccess/Library_dbu.mk | 1 + dbaccess/Library_sdbt.mk | 1 + desktop/Executable_crashrep.com.mk | 1 + desktop/Executable_officeloader.mk | 1 + desktop/Executable_quickstart.mk | 1 + desktop/Executable_sbase.mk | 1 + desktop/Executable_scalc.mk | 1 + desktop/Executable_sdraw.mk | 1 + desktop/Executable_simpress.mk | 1 + desktop/Executable_smath.mk | 1 + desktop/Executable_soffice.bin.mk | 1 + desktop/Executable_soffice.mk | 1 + desktop/Executable_soffice_bin.mk | 1 + desktop/Executable_sweb.mk | 1 + desktop/Executable_swriter.mk | 1 + desktop/Executable_unopkg.bin.mk | 1 + desktop/Library_deployment.mk | 1 + desktop/Library_deploymentgui.mk | 1 + desktop/Library_deploymentmisc.mk | 1 + desktop/Library_migrationoo2.mk | 1 + desktop/Library_migrationoo3.mk | 1 + desktop/Library_offacc.mk | 1 + desktop/Library_sofficeapp.mk | 1 + desktop/Library_spl.mk | 1 + desktop/Library_unopkgapp.mk | 1 + drawinglayer/Library_drawinglayer.mk | 1 + dtrans/Library_dnd.mk | 1 + dtrans/Library_dtrans.mk | 1 + dtrans/Library_ftransl.mk | 1 + dtrans/Library_mcnttype.mk | 1 + dtrans/Library_sysdtrans.mk | 1 + editeng/CppunitTest_editeng_borderline.mk | 1 + editeng/CppunitTest_editeng_core.mk | 1 + editeng/CppunitTest_editeng_lookuptree.mk | 1 + editeng/Library_editeng.mk | 1 + embeddedobj/Library_embobj.mk | 1 + embeddedobj/Library_emboleobj.mk | 1 + embedserv/Library_emser.mk | 1 + embedserv/Library_inprocserv.mk | 1 + eventattacher/Library_evtatt.mk | 1 + extensions/CppunitTest_extensions_test_update.mk | 1 + extensions/Library_abp.mk | 1 + extensions/Library_bib.mk | 1 + extensions/Library_dbp.mk | 1 + extensions/Library_log.mk | 1 + extensions/Library_pcr.mk | 1 + extensions/Library_pl.mk | 1 + extensions/Library_res.mk | 1 + extensions/Library_scn.mk | 1 + fileaccess/Library_fileacc.mk | 1 + filter/CppunitTest_filter_pict_test.mk | 1 + filter/CppunitTest_filter_tga_test.mk | 1 + filter/CppunitTest_filter_tiff_test.mk | 1 + filter/Executable_svg2odf.mk | 1 + filter/Library_PptImporter.mk | 1 + filter/Library_egi.mk | 1 + filter/Library_eme.mk | 1 + filter/Library_epb.mk | 1 + filter/Library_epg.mk | 1 + filter/Library_epp.mk | 1 + filter/Library_eps.mk | 1 + filter/Library_ept.mk | 1 + filter/Library_era.mk | 1 + filter/Library_eti.mk | 1 + filter/Library_exp.mk | 1 + filter/Library_filterconfig.mk | 1 + filter/Library_flash.mk | 1 + filter/Library_icd.mk | 1 + filter/Library_icg.mk | 1 + filter/Library_idx.mk | 1 + filter/Library_ime.mk | 1 + filter/Library_ipb.mk | 1 + filter/Library_ipd.mk | 1 + filter/Library_ips.mk | 1 + filter/Library_ipt.mk | 1 + filter/Library_ipx.mk | 1 + filter/Library_ira.mk | 1 + filter/Library_itg.mk | 1 + filter/Library_iti.mk | 1 + filter/Library_msfilter.mk | 1 + filter/Library_odfflatxml.mk | 1 + filter/Library_pdffilter.mk | 1 + filter/Library_placeware.mk | 1 + filter/Library_svgfilter.mk | 1 + filter/Library_t602filter.mk | 1 + filter/Library_textfd.mk | 1 + filter/Library_xmlfa.mk | 1 + filter/Library_xmlfd.mk | 1 + filter/Library_xsltdlg.mk | 1 + filter/Library_xsltfilter.mk | 3 ++- forms/Library_frm.mk | 1 + formula/Library_for.mk | 1 + formula/Library_forui.mk | 1 + fpicker/Library_fpicker.mk | 1 + fpicker/Library_fps.mk | 1 + fpicker/Library_fps_odma.mk | 1 + fpicker/Library_fps_office.mk | 1 + framework/Library_fwe.mk | 1 + framework/Library_fwi.mk | 1 + framework/Library_fwk.mk | 1 + framework/Library_fwl.mk | 1 + framework/Library_fwm.mk | 1 + hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 1 + hwpfilter/Library_hwp.mk | 1 + i18npool/CppunitTest_i18npool_test_breakiterator.mk | 1 + i18npool/CppunitTest_i18npool_test_characterclassification.mk | 1 + i18npool/CppunitTest_i18npool_test_languagetag.mk | 1 + i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk | 1 + i18npool/Executable_gencoll_rule.mk | 1 + i18npool/Executable_genconv_dict.mk | 1 + i18npool/Executable_gendict.mk | 1 + i18npool/Executable_genindex_data.mk | 1 + i18npool/Executable_saxparser.mk | 1 + i18npool/Library_collator_data.mk | 1 + i18npool/Library_dict_ja.mk | 1 + i18npool/Library_dict_zh.mk | 1 + i18npool/Library_i18nisolang1.mk | 1 + i18npool/Library_i18npool.mk | 1 + i18npool/Library_i18nsearch.mk | 1 + i18npool/Library_index_data.mk | 1 + i18npool/Library_localedata_en.mk | 1 + i18npool/Library_localedata_es.mk | 1 + i18npool/Library_localedata_euro.mk | 1 + i18npool/Library_localedata_others.mk | 1 + i18npool/Library_textconv_dict.mk | 1 + i18nutil/Library_i18nutil.mk | 1 + idl/Executable_svidl.mk | 1 + io/Library_acceptor.mk | 1 + io/Library_connector.mk | 1 + io/Library_streams.mk | 1 + io/Library_textinstream.mk | 1 + io/Library_textoutstream.mk | 1 + javaunohelper/Library_juh.mk | 1 + javaunohelper/Library_juhx.mk | 1 + jurt/Library_jpipe.mk | 1 + jurt/Library_jpipx.mk | 1 + jvmaccess/Library_jvmaccess.mk | 1 + jvmfwk/Executable_javaldx.mk | 1 + jvmfwk/Library_jvmfwk.mk | 1 + jvmfwk/Library_sunjavaplugin.mk | 1 + l10ntools/Executable_ulfconv.mk | 1 + lingucomponent/Library_guesslang.mk | 3 ++- lingucomponent/Library_hyphen.mk | 3 ++- lingucomponent/Library_lnth.mk | 3 ++- lingucomponent/Library_spell.mk | 3 ++- linguistic/Library_lng.mk | 1 + lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 1 + lotuswordpro/Library_lwpft.mk | 1 + o3tl/CppunitTest_o3tl_tests.mk | 1 + officecfg/CppunitTest_officecfg_cppheader_test.mk | 1 + oox/Library_oox.mk | 1 + package/Library_package2.mk | 1 + package/Library_xstor.mk | 1 + padmin/Executable_spadmin.bin.mk | 1 + padmin/Library_spa.mk | 1 + regexp/Library_regexp.mk | 1 + registry/Library_reg.mk | 1 + remotebridges/Library_uuresolver.mk | 1 + reportdesign/Library_rpt.mk | 1 + reportdesign/Library_rptui.mk | 1 + reportdesign/Library_rptxml.mk | 1 + rsc/Executable_rsc.mk | 1 + sal/CppunitTest_Module_DLL.mk | 1 + sal/CppunitTest_sal_bytesequence.mk | 1 + sal/CppunitTest_sal_checkapi.mk | 1 + sal/CppunitTest_sal_osl_condition.mk | 1 + sal/CppunitTest_sal_osl_file.mk | 1 + sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk | 1 + sal/CppunitTest_sal_osl_module.mk | 1 + sal/CppunitTest_sal_osl_mutex.mk | 1 + sal/CppunitTest_sal_osl_old_test_file.mk | 1 + sal/CppunitTest_sal_osl_pipe.mk | 1 + sal/CppunitTest_sal_osl_process.mk | 1 + sal/CppunitTest_sal_osl_profile.mk | 1 + sal/CppunitTest_sal_osl_security.mk | 1 + sal/CppunitTest_sal_osl_setthreadname.mk | 1 + sal/CppunitTest_sal_osl_thread.mk | 1 + sal/CppunitTest_sal_rtl_alloc.mk | 1 + sal/CppunitTest_sal_rtl_cipher.mk | 1 + sal/CppunitTest_sal_rtl_crc32.mk | 1 + sal/CppunitTest_sal_rtl_doublelock.mk | 1 + sal/CppunitTest_sal_rtl_locale.mk | 1 + sal/CppunitTest_sal_rtl_math.mk | 1 + sal/CppunitTest_sal_rtl_ostringbuffer.mk | 1 + sal/CppunitTest_sal_rtl_oustringbuffer.mk | 1 + sal/CppunitTest_sal_rtl_strings.mk | 1 + sal/CppunitTest_sal_rtl_uri.mk | 1 + sal/CppunitTest_sal_rtl_uuid.mk | 1 + sal/CppunitTest_sal_tcwf.mk | 1 + sal/CppunitTest_sal_types.mk | 1 + sal/Executable_cppunittester.mk | 1 + sal/Executable_osl_process_child.mk | 1 + sal/Library_sal.mk | 1 + sal/Library_sal_textenc.mk | 1 + salhelper/CppunitTest_salhelper_checkapi.mk | 1 + salhelper/Library_salhelper.mk | 1 + sax/CppunitTest_sax.mk | 1 + sax/Library_expwrap.mk | 1 + sax/Library_fastsax.mk | 1 + sax/Library_sax.mk | 1 + sc/CppunitTest_sc_annotationshapeobj.mk | 1 + sc/CppunitTest_sc_cellrangeobj.mk | 1 + sc/CppunitTest_sc_chart_regression_test.mk | 1 + sc/CppunitTest_sc_databaserangeobj.mk | 1 + sc/CppunitTest_sc_datapilotfieldobj.mk | 1 + sc/CppunitTest_sc_datapilottableobj.mk | 1 + sc/CppunitTest_sc_editfieldobj_cell.mk | 1 + sc/CppunitTest_sc_editfieldobj_header.mk | 1 + sc/CppunitTest_sc_filters_test.mk | 1 + sc/CppunitTest_sc_macros_test.mk | 1 + sc/CppunitTest_sc_modelobj.mk | 1 + sc/CppunitTest_sc_namedrangeobj.mk | 1 + sc/CppunitTest_sc_namedrangesobj.mk | 1 + sc/CppunitTest_sc_rangelst_test.mk | 1 + sc/CppunitTest_sc_subsequent_filters_test.mk | 1 + sc/CppunitTest_sc_tableautoformatfield.mk | 1 + sc/CppunitTest_sc_tablesheetobj.mk | 1 + sc/CppunitTest_sc_tablesheetsobj.mk | 1 + sc/CppunitTest_sc_ucalc.mk | 1 + sc/Library_sc.mk | 1 + sc/Library_scd.mk | 1 + sc/Library_scfilt.mk | 1 + sc/Library_scui.mk | 1 + sc/Library_vbaobj.mk | 1 + scaddins/Library_analysis.mk | 1 + scaddins/Library_date.mk | 1 + sccomp/Library_solver.mk | 1 + scripting/Library_basprov.mk | 1 + scripting/Library_dlgprov.mk | 1 + scripting/Library_protocolhandler.mk | 1 + scripting/Library_scriptframe.mk | 1 + scripting/Library_stringresource.mk | 1 + scripting/Library_vbaevents.mk | 1 + sd/CppunitTest_sd_filters_test.mk | 1 + sd/CppunitTest_sd_regression_test.mk | 1 + sd/CppunitTest_sd_uimpress.mk | 1 + sd/Library_sd.mk | 1 + sd/Library_sdd.mk | 1 + sd/Library_sdfilt.mk | 1 + sd/Library_sdui.mk | 1 + sdext/CppunitTest_pdfimport.mk | 1 + sfx2/CppunitTest_sfx2_metadatable.mk | 1 + sfx2/Library_qstart.mk | 1 + sfx2/Library_sfx.mk | 1 + shell/Executable_lngconvex.mk | 1 + shell/Library_cmdmail.mk | 1 + shell/Library_desktopbe.mk | 1 + shell/Library_localebe.mk | 1 + shell/Library_recentfile.mk | 1 + shell/Library_syssh.mk | 1 + shell/Library_syssh_win.mk | 1 + shell/Library_wininetbe.mk | 1 + slideshow/CppunitTest_slideshow.mk | 1 + slideshow/Executable_demoshow.mk | 1 + slideshow/Library_OGLTrans.mk | 1 + slideshow/Library_slideshow.mk | 1 + solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 - solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 - solenv/gbuild/platform/windows.mk | 1 + sot/CppunitTest_sot_test_sot.mk | 1 + sot/Library_sot.mk | 1 + starmath/CppunitTest_starmath_qa_cppunit.mk | 1 + starmath/Library_sm.mk | 1 + starmath/Library_smd.mk | 1 + stoc/Library_bootstrap.mk | 1 + stoc/Library_introspection.mk | 1 + stoc/Library_invocadapt.mk | 1 + stoc/Library_invocation.mk | 1 + stoc/Library_javaloader.mk | 1 + stoc/Library_javavm.mk | 1 + stoc/Library_namingservice.mk | 1 + stoc/Library_proxyfac.mk | 1 + stoc/Library_reflection.mk | 1 + stoc/Library_stocservices.mk | 1 + store/Library_store.mk | 1 + svl/CppunitTest_svl_lngmisc.mk | 1 + svl/CppunitTest_svl_urihelper.mk | 1 + svl/Library_fsstorage.mk | 1 + svl/Library_passwordcontainer.mk | 1 + svl/Library_svl.mk | 1 + svtools/CppunitTest_svtools_filters_test.mk | 1 + svtools/Executable_bmp.mk | 1 + svtools/Executable_bmpsum.mk | 1 + svtools/Executable_g2g.mk | 1 + svtools/Executable_langsupport.mk | 1 + svtools/Library_hatchwindowfactory.mk | 1 + svtools/Library_svt.mk | 1 + svx/Executable_gengal.bin.mk | 1 + svx/Library_svx.mk | 1 + svx/Library_svxcore.mk | 1 + svx/Library_textconversiondlgs.mk | 1 + sw/CppunitTest_sw_filters_test.mk | 1 + sw/CppunitTest_sw_layout_test.mk | 1 + sw/CppunitTest_sw_macros_test.mk | 1 + sw/CppunitTest_sw_regression_test.mk | 1 + sw/CppunitTest_sw_subsequent_odfexport.mk | 1 + sw/CppunitTest_sw_subsequent_odfimport.mk | 1 + sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 1 + sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 1 + sw/CppunitTest_sw_subsequent_rtfexport.mk | 1 + sw/CppunitTest_sw_subsequent_rtfimport.mk | 1 + sw/CppunitTest_sw_subsequent_ww8export.mk | 1 + sw/CppunitTest_sw_subsequent_ww8import.mk | 1 + sw/CppunitTest_sw_swdoc_test.mk | 1 + sw/Library_msword.mk | 1 + sw/Library_sw.mk | 1 + sw/Library_swd.mk | 1 + sw/Library_swui.mk | 1 + sw/Library_vbaswobj.mk | 1 + test/Library_subsequenttest.mk | 1 + test/Library_test.mk | 1 + toolkit/Library_tk.mk | 1 + tools/CppunitTest_tools_test.mk | 1 + tools/Executable_bestreversemap.mk | 1 + tools/Executable_mkunroll.mk | 1 + tools/Executable_rscdep.mk | 1 + tools/Executable_so_checksum.mk | 1 + tools/Library_tl.mk | 1 + tubes/CppunitTest_tubes_test.mk | 1 + tubes/Library_tubes.mk | 3 ++- ucb/Library_cached1.mk | 1 + ucb/Library_srtrs1.mk | 1 + ucb/Library_ucb1.mk | 1 + ucb/Library_ucpcmis1.mk | 1 + ucb/Library_ucpdav1.mk | 1 + ucb/Library_ucpexpand1.mk | 1 + ucb/Library_ucpext.mk | 1 + ucb/Library_ucpfile1.mk | 1 + ucb/Library_ucpftp1.mk | 1 + ucb/Library_ucphier1.mk | 1 + ucb/Library_ucpodma1.mk | 1 + ucb/Library_ucppkg1.mk | 1 + ucb/Library_ucptdoc1.mk | 1 + ucbhelper/Library_ucbhelper.mk | 1 + unotest/Library_unobootstrapprotector.mk | 1 + unotest/Library_unoexceptionprotector.mk | 1 + unotest/Library_unotest.mk | 1 + unotools/Library_utl.mk | 1 + unoxml/Library_unordf.mk | 1 + unoxml/Library_unoxml.mk | 1 + uui/Library_uui.mk | 1 + vbahelper/Library_msforms.mk | 1 + vbahelper/Library_vbahelper.mk | 1 + vcl/Library_vcl.mk | 1 + writerfilter/CppunitTest_writerfilter_doctok.mk | 1 + writerfilter/CppunitTest_writerfilter_rtftok.mk | 1 + writerfilter/Library_writerfilter.mk | 1 + writerfilter/Library_writerfilter_uno.mk | 1 + writerperfect/Library_wpftdraw.mk | 1 + writerperfect/Library_wpftwriter.mk | 1 + xmloff/Library_xo.mk | 1 + xmloff/Library_xof.mk | 1 + xmlreader/Library_xmlreader.mk | 1 + xmlscript/Library_xmlscript.mk | 1 + xmlsecurity/CppunitTest_qa_certext.mk | 1 + xmlsecurity/Library_xmlsecurity.mk | 1 + xmlsecurity/Library_xsec_fw.mk | 1 + xmlsecurity/Library_xsec_xmlsec.mk | 1 + 444 files changed, 448 insertions(+), 8 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index c08fb9f1c7ec..0c6cb408fd46 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ tl \ ucbhelper \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index 0727c5f2780e..e5ac6d72ce4e 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,ctl,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 9693ddf8e151..7da687e3695c 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,acc,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index 40f209fe2966..5e0b98fad2ee 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\ salhelper \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index 013704d37a68..370e1855a9ba 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,animcore,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 03f0441d7ac7..2eed8e188686 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 3b40326dc954..4f367776207d 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ sal \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 528960bfa1b1..20261158c4b1 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\ sal \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index 84b5ad469ac8..dace38183760 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\ sal \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 9bca5f1fa89a..3eb9fe2e4962 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 3e7db4cd7da8..f83840635926 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\ ucbhelper \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index f11b46297e30..fc7275a64801 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -27,6 +27,7 @@ endif $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\ basegfx \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 95230ba646a5..661f5aa2bd22 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_external,basebmp,vigra_headers)) $(eval $(call gb_Library_use_libraries,basebmp,\ basegfx \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk index 07f4f0359dd3..25b923df532b 100644 --- a/basebmp/StaticLibrary_basebmp.mk +++ b/basebmp/StaticLibrary_basebmp.mk @@ -18,6 +18,7 @@ $(eval $(call gb_StaticLibrary_use_external,basebmp,vigra_headers)) $(eval $(call gb_StaticLibrary_use_libraries,basebmp,\ basegfx \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 8b72a3782ad1..121faf6af57c 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 60f81a815ca6..e3b11aecfd97 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_libraries,basegfx,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index 76a9ecd02664..3bd2bc87337a 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ vcl \ xmlscript \ test \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index 098840c5cd54..fcadba3b0c84 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ vcl \ xmlscript \ test \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index 1c248b6f95d7..af058148e32f 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ utl \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index fa0e8201e941..de50d0c70f9f 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,sb,\ utl \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 8cafec328542..78cc7dba7297 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -48,6 +48,7 @@ ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_libraries,officebean,\ jawt \ + $(gb_UWINAPI) \ )) else diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 8e7a441d5614..7818b21b9163 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache)) $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 57036ed59c82..2c8c907fa7e1 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 2b936fb85d1d..879025b84606 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index 2d6f59579108..3bee8a12e679 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,java_uno,\ jvmaccess \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 9f59fef1e4e8..74ded07486cf 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ tl \ i18nisolang1 \ canvastools \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 8ee787685098..974231a039a1 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 156608221eda..4e70f654c6ad 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ tk \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 1a01475e263e..08ffdf4017fe 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ tl \ utl \ i18nisolang1 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index da8ffa62552a..6ae93a809466 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -61,6 +61,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ tl \ utl \ i18nisolang1 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index 689bd7eef377..a130dfb39fbe 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\ cppuhelper \ sal \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index 470a99314db3..d5edd33bbfbe 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 911858385b44..922e5ca45dfc 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ tk \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 7a0ea6fdbcb9..3baaee9b5713 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index fe63ec80c010..6ca04479fad0 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index 9e67d66a1a26..bdea302bb619 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Executable_use_libraries,climaker,\ ,msvcmrt \ ) \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index 942539ba6b5d..f77cf84ee57c 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 76c75f1f2ee2..71d03cc9894c 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,comphelper,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 68f9306f6991..588ddd819c86 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -72,6 +72,7 @@ $(eval $(call gb_Library_use_libraries,configmgr, \ sal \ salhelper \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index d9d120f88594..4bd5d78cc247 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,ado,\ uuid \ dbtools \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 93431fcf3b4b..ffd3f71640fe 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,calc,\ dbtools \ file \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 5dd69321af53..68f4ea449d80 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,dbase,\ file \ utl \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index 127a3e7cfad9..e128c937ee41 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ dbtools \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index c82e568e780d..1cce1c6e246f 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ tl \ comphelper \ i18nisolang1 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 882cdb0da054..78cf2d73957e 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,evoab,\ salhelper \ dbtools \ file \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 74186792ece6..8c21f99fed5e 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,file,\ dbtools \ utl \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index a69d0f221ae9..601f96f06b4f 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,flat,\ dbtools \ file \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index a3aef6d8906f..1ffd932298dd 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 70e553d0d3b8..704f050b6755 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ utl \ jvmfwk \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 9a73cd09b447..c2b95a0416db 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,mork, \ dbtools \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index afde265bf630..7872b26932db 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ cppuhelper \ dbtools \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index b1c29ee0f811..0e4c541ea6c4 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ dbtools \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index aab40dcc030b..649f9907c06a 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 5e17042fd5e0..388af52f2263 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mysql,\ sal \ dbtools \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index d6c3dc547cf6..4b0e61baa48b 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,odbc,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 4d25b1c9fdd4..9655773afa00 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ salhelper \ dbtools \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index b77f16c80702..439524882f8d 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 202614dd52ff..7646af16ef12 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index eb8789caacd6..032937a81e6e 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ dbtools \ utl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 7b9ff2ff6557..283ad64dda71 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\ svt \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index 4c4575d2763a..e86b99303fd4 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\ comphelper \ cppcanvas \ basegfx \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk index 98832d086fb0..e68cc5cd5241 100644 --- a/cppu/CppunitTest_cppu_checkapi.mk +++ b/cppu/CppunitTest_cppu_checkapi.mk @@ -49,6 +49,7 @@ $(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\ cppu \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 200abe92a144..04f33de964ba 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index 9ff9af3c9bd6..671bd7f4eccf 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index a49d546d61c8..4eef2ae78385 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index 9e4619c1aac0..963ace47a15b 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index a3bb717dbdee..41da8e269314 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index 68cf8d9b5b7c..2103eb49b77b 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,affine_uno)) $(eval $(call gb_Library_use_libraries,affine_uno,\ purpenvhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index 3a2ed529b3dd..de47490923b5 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_defs,cppu,\ $(eval $(call gb_Library_use_libraries,cppu,\ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index b0fa63ed720f..04d9b7d8d588 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,log_uno,\ cppu \ purpenvhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index db2a90e54909..05606523a758 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_sdk_api,purpenvhelper)) $(eval $(call gb_Library_use_libraries,purpenvhelper,\ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index be343aa2e99a..afeb4cc6af22 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,unsafe_uno)) $(eval $(call gb_Library_use_libraries,unsafe_uno,\ purpenvhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk index 60a66b6e9cf5..4369cfc2ea33 100644 --- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk +++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk @@ -49,6 +49,7 @@ $(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\ cppuhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 3432a83797d8..726c220ff4ea 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index 658afbcc0b56..2d6c943ecc30 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index 455ea6d9ee20..391c13e4ac74 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 964135bb9db0..705bd7cdc921 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ sal \ salhelper \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk index 75653d01e4ee..4743fdef91ae 100644 --- a/cpputools/Executable_regcomp.mk +++ b/cpputools/Executable_regcomp.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk index 0bc2a393d176..64892fd28696 100644 --- a/cpputools/Executable_regsingleton.mk +++ b/cpputools/Executable_regsingleton.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index 252de3fc1a65..1b2a878951be 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Executable_use_libraries,uno,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index bfde9e1a75cf..3ed7c2508731 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_libraries,cui,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index c35ebd5a5d14..6a28adaf748f 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -68,6 +68,7 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index 1e0f87eaa062..fb4a0d87211a 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\ $(eval $(call gb_Library_use_sdk_api,odbcconfig)) $(eval $(call gb_Executable_use_libraries,odbcconfig,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index e32b93dca420..863bcbbaba5e 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -63,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,dba,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index e8b063a7b6c2..0d38f503aa85 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 393349f93364..89d9c0e83920 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ utl \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 80d32b19ccff..7e0fe1cfaa15 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 3e5aca5e54ce..ee61c037f875 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index 96ed6f76cc60..d75f80614d29 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\ )) $(eval $(call gb_Executable_use_libraries,crashrep_com,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index e3a766f2dd27..08c413a53387 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\ $(eval $(call gb_Executable_use_libraries,officeloader,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index b3fbde1eaaf1..8500b1decd4a 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ ole32 \ oleaut32 \ shell32 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 375cba33385f..7a517aa8f06e 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\ )) $(eval $(call gb_Executable_use_libraries,sbase,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index ce90099a532b..7ba226e06146 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\ )) $(eval $(call gb_Executable_use_libraries,scalc,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 4642445173b4..558b8d340a8b 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ )) $(eval $(call gb_Executable_use_libraries,sdraw,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index c3026435e3f4..66002ce86f4f 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\ )) $(eval $(call gb_Executable_use_libraries,simpress,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 4c7c4afb8232..3315f718b1e5 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,smath,\ )) $(eval $(call gb_Executable_use_libraries,smath,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index d1c6aec55939..126f728cea36 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice.bin,\ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ sal \ sofficeapp \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 18efbbdf8770..17ac2d07cd8d 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_use_libraries,soffice,\ advapi32 \ shell32 \ shlwapi \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index e87b8a041d2b..efddda2f1fc0 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 870cf7d6c86a..1a62d5db772e 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\ )) $(eval $(call gb_Executable_use_libraries,sweb,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index acd299b641ca..68047ecdac1d 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,swriter,\ )) $(eval $(call gb_Executable_use_libraries,swriter,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 9303eefeefb1..ab71f1d1a56d 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ sal \ tl \ unopkgapp \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index 3910fb910757..f5fb20e062f0 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\ ucbhelper \ utl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index f5f48e47d118..865add0e01a3 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 72ac02bd7c2a..93f66de60f26 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ ucbhelper \ utl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 838b475da267..3187188728af 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index d39497e32ea3..fd7201f4321c 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index f75728dab7bc..18653a3fca65 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,offacc,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 9e4fa379374b..ea039d4a8f8a 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index 0d45c5991078..a950d31438c1 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,spl,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 081fee923a33..0d6222ab0e3d 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 41c75093f599..518fe885b45c 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\ tk \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 8331586779a3..dd15f23d33c0 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,dnd,\ shell32 \ uuid \ uwinapi \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index 79f18d82dfed..307bf030d865 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,dtrans,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index 1b9e8735aef9..83d91bb76066 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,ftransl,\ ole32 \ sal \ uwinapi \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index 04ae079e6672..80ad2bd23525 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 1b87a60417c5..ef358cf7c40f 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,sysdtrans,\ shell32 \ uuid \ uwinapi \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 368073ce0966..32eea423ea6c 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ salhelper \ i18nisolang1 \ i18nutil \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index 90117c8d386d..cc12b6df0e4a 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -57,6 +57,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk index a69999ee235a..8911f87d8cec 100644 --- a/editeng/CppunitTest_editeng_lookuptree.mk +++ b/editeng/CppunitTest_editeng_lookuptree.mk @@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \ salhelper \ i18nisolang1 \ i18nutil \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 91f7e4a53cfc..f65f2eb1d35b 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -151,6 +151,7 @@ $(eval $(call gb_Library_use_libraries,editeng,\ salhelper \ i18nisolang1 \ i18nutil \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 58e3f02a74af..d4e57c034fa0 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 97801d9bc798..3b280bc8e33a 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 8628a05af104..50a80d613b45 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,emser,\ oleaut32 \ sal \ uuid \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 85ee9dac95c3..256871f62686 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ gdi32 \ ole32 \ uuid \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index 02363a0e81b2..06eb7948e832 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,evtatt,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index b59d5ca32b70..ad617f690582 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ sal \ test \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index 92f0848491cb..708d89f5a7b6 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -83,6 +83,7 @@ $(eval $(call gb_Library_use_libraries,abp,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index 5ce36cddc0de..aa4e368942a4 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,bib,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index cb52f4d32e6f..1f9c76917c72 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_libraries,dbp,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index 4e7e0d0f6be3..9fd561c884db 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,log,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 3504126847ef..847ba21c5604 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,pcr,\ cppu \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index c1451f8c3519..e6c5f0d7e1cf 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -130,6 +130,7 @@ $(eval $(call gb_Library_use_libraries,pl,\ cppu \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index bc3de6021b89..cd7bc522b424 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,res,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 4dd0044941c8..7cca92e09eed 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,scn,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index 2b44b1618cc1..ea8336544d78 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,fileacc,\ tl \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index 59a3244824e9..20cbe8613239 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ tl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index b8e1e3d04f76..fc05c5b68ac8 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \ tl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index 7f0852f6d568..4da2def1178f 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \ tl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index 8f1fb73e6782..bc22022a7d9a 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index abd5af774dc4..dc676fc1eb04 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index d7537892529c..76f996ec5a5b 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,egi,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index efd589924959..fc67818d2918 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,eme,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index 63f630c3c1df..d9ab41e401d0 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,epb,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index 51666771c8f9..dd5aba2718e6 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,epg,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 83469263cd83..545522dae843 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,epp,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index 2ba9b40a7051..a1d80c7c8605 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,eps,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index c1d9267ec555..2c8f8a406742 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,ept,\ basegfx \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_era.mk b/filter/Library_era.mk index 5035ab350a7f..9c37c67e6b6b 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,era,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index 3d634045ecf1..e1f3eefe6b40 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,eti,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index b447fdbf4134..8c2c06a8d136 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,exp,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index 3dd322a7ad69..b6404a177ba9 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\ cppu \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 77668e02bd38..808f7a57172f 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,flash,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index e38f7451fbf7..bee43bbe7ceb 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,icd,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 0e319abf9ec3..7d9241fe9e2e 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,icg,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index 62fb96d71d40..6040d65538d2 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,idx,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index 65927bb255b2..d93303030f58 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ime,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index 281d832bfa08..813954141b66 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ipb,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index c81aeb264354..6f87872d92eb 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ipd,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index 19a908e0f1a1..face1d7f1fb3 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ips,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index 5924518751b2..768af3940040 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,ipt,\ tl \ basegfx \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index 8382b1aec39d..5cea98191964 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ipx,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index 31d689cda70c..914c53e19cfd 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ira,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index 5ce1c045892a..2a9a03e15f1f 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,itg,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index 85a4ac75354d..e736ffafe2e0 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,iti,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index c7eebae6df41..0de501dfeb09 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,msfilter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index a3d28afe39e2..3df371a63c8c 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index 46e9973c4e4e..77be3737a741 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index 4bb4ef1d29d3..e4d6684a26c1 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,placeware,\ cppu \ sal \ sax \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index f2927556848f..886882cf18fe 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index 8bf24468a019..082601caf7e0 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,t602filter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index 9ab5a7c45572..594ce61f7456 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,textfd,\ cppu \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index f9260d57f8c2..acb109aee92e 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index 19f0509f44fa..b42e79ee2c70 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,xmlfd,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index ba4f0435ea5b..805e0e71f3cb 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 94fca8145310..293c28b0af20 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -35,8 +35,9 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ ucbhelper \ cppuhelper \ cppu \ + salhelper \ sal \ - salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 126bc5f339f2..2b4361fde1ca 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,frm,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/formula/Library_for.mk b/formula/Library_for.mk index ce93f1695e7a..4678e9f4aeda 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,for,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 5aaea81d65b7..3090ed411160 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,forui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index 780a28a4fd88..fdba80e5e721 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,fpicker,\ svl \ svt \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 431fc279fe00..95e315743eca 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,fps,\ oleaut32 \ shell32 \ uuid \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index 1eae7a8585f9..08eff663bfac 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index fb48ef2edda7..2db54954bdeb 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 5c87ddb46812..3d3598c6d1c2 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,fwe,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 5d51f55caa4f..b33194267453 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_libraries,fwi,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index b312d88dad76..348812634bbf 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_libraries,fwk,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 155af1aec42d..f02de16d2026 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,fwl,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index 5043a3d121d1..bd656521ea40 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,fwm,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index aa5903bd8317..834c9ae1212a 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \ sal \ test \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 1fa67d21d2d7..612a124e7ccd 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,hwp,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 3a7855d8e3f4..0fe4577ecff0 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ cppuhelper \ sal \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index b4e0a81cd826..9c6b549da697 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification cppuhelper \ sal \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk index fd7c6047644d..cdb846894122 100644 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk @@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index 68e5076099c6..a2ea6f51430e 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ cppuhelper \ sal \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index b1d0bd46b1a4..5999b06466b8 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 85a49b15e655..58a3011afb16 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\ $(eval $(call gb_Executable_use_libraries,genconv_dict,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index 3941b10a09f0..a49f2eb4c726 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,gendict,\ $(eval $(call gb_Executable_use_libraries,gendict,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index 3665f44e9aec..c1279d00964b 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,genindex_data,\ $(eval $(call gb_Executable_use_libraries,genindex_data,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index 5e61b3280270..eb4efdf838a7 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index bd6ee6048f1c..507a3455c9b6 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,collator_data)) $(eval $(call gb_Library_use_libraries,collator_data,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index 89784694b4f7..658d8334cf6c 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,dict_ja)) $(eval $(call gb_Library_use_libraries,dict_ja,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index 2a910e502136..c21addb7f2cb 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,dict_zh)) $(eval $(call gb_Library_use_libraries,dict_zh,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 72134c2d87b5..4ff6fff4331a 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\ $(eval $(call gb_Library_use_libraries,i18nisolang1,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index bdd0fd66087a..73d38e954cb3 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ i18nisolang1 \ i18nutil \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index bfe6450c5899..b55f8cdfe731 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\ cppuhelper \ i18nregexp \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index 9a7270c82c1f..c5bf1f4004ac 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,index_data)) $(eval $(call gb_Library_use_libraries,index_data,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index fe944a792350..4cd77fc77448 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,localedata_en)) $(eval $(call gb_Library_use_libraries,localedata_en,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 0d8f1ea77283..145123225e2c 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_es)) $(eval $(call gb_Library_use_libraries,localedata_es,\ localedata_en \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index 96a823e3efd0..c1b4569d01d9 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_euro)) $(eval $(call gb_Library_use_libraries,localedata_euro,\ localedata_en \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index 08f38bf1c775..d331b8906506 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_others)) $(eval $(call gb_Library_use_libraries,localedata_others,\ localedata_en \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index e98a4525bf6f..e274c549e850 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_set_include,textconv_dict,\ $(eval $(call gb_Library_use_sdk_api,textconv_dict)) $(eval $(call gb_Library_use_libraries,textconv_dict,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index 84f33c0451b9..b9cbbdcc151e 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,i18nutil,\ comphelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index 4eb371c60c88..bdf0aa40e124 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_sdk_api,svidl)) $(eval $(call gb_Executable_use_libraries,svidl,\ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index 80062249654c..a07da5d58765 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,acceptor,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_connector.mk b/io/Library_connector.mk index c2147e7d3f31..2bbe7257e922 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,connector,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_streams.mk b/io/Library_streams.mk index 696bc4716c77..bb79154ff61a 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,streams,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk index d9c67a245fc1..b921a206792d 100644 --- a/io/Library_textinstream.mk +++ b/io/Library_textinstream.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,textinstream,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk index 0fdaf7ffd9c9..17fe1ec591a3 100644 --- a/io/Library_textoutstream.mk +++ b/io/Library_textoutstream.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,textoutstream,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index 13364691be1a..ecacfd9978d0 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,juh,\ $(eval $(call gb_Library_use_libraries,juh,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index 7f1f604e7f1b..ce8ac747934e 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,juhx,\ jvmaccess \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 16707557f8f7..eb9656737b3a 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_Library,jpipe)) $(eval $(call gb_Library_use_libraries,jpipe,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk index 21087c2d291f..c36dce20b949 100644 --- a/jurt/Library_jpipx.mk +++ b/jurt/Library_jpipx.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,jpipx)) $(eval $(call gb_Library_use_libraries,jpipx,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index d4227a78c259..2a957ee006ce 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,jvmaccess,\ cppu \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index 9f5e080d6c81..177947cd0b15 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Executable_Executable,javaldx)) $(eval $(call gb_Executable_use_libraries,javaldx,\ jvmfwk \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 4dc9c092e792..c4a459728324 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_api,jvmfwk,\ $(eval $(call gb_Library_use_libraries,jvmfwk,\ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 694cecc31fdf..517892fa8e8e 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/l10ntools/Executable_ulfconv.mk b/l10ntools/Executable_ulfconv.mk index 8ed5bb0e5f2c..7a92c2edd596 100644 --- a/l10ntools/Executable_ulfconv.mk +++ b/l10ntools/Executable_ulfconv.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Executable_Executable,ulfconv)) $(eval $(call gb_Executable_use_libraries,ulfconv,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index a2e3ad8bbbc3..bfd8ffa7a805 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -32,12 +32,13 @@ $(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/langu $(eval $(call gb_Library_use_sdk_api,guesslang)) $(eval $(call gb_Library_use_libraries,guesslang,\ - $(gb_STDLIBS) \ cppu \ cppuhelper \ sal \ tl \ utl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,guesslang,\ diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index 1fd9e79aaa61..ce28dd9e9b67 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,hyphen,\ $(eval $(call gb_Library_use_sdk_api,hyphen)) $(eval $(call gb_Library_use_libraries,hyphen,\ - $(gb_STDLIBS) \ cppu \ cppuhelper \ i18nisolang1 \ @@ -45,6 +44,8 @@ $(eval $(call gb_Library_use_libraries,hyphen,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_static_libraries,hyphen,\ diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index a406d83ada5b..96a57d04e246 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,lnth,\ $(eval $(call gb_Library_use_sdk_api,lnth)) $(eval $(call gb_Library_use_libraries,lnth,\ - $(gb_STDLIBS) \ comphelper \ cppu \ cppuhelper \ @@ -46,6 +45,8 @@ $(eval $(call gb_Library_use_libraries,lnth,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_static_libraries,lnth,\ diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index a9349e089ca6..2868b3e0d8ce 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,spell,\ $(eval $(call gb_Library_use_sdk_api,spell)) $(eval $(call gb_Library_use_libraries,spell,\ - $(gb_STDLIBS) \ cppu \ cppuhelper \ i18nisolang1 \ @@ -45,6 +44,8 @@ $(eval $(call gb_Library_use_libraries,spell,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_static_libraries,spell,\ diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index d451348f460b..3e9900ba0f21 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,lng,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 3a089135415b..c96fbbcf148c 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \ test \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 5d6ffb2e99d1..676446b8fe42 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ ucbhelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 29e1ff8a6a1f..30de08e70d06 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc)) $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index 886888bc21c4..af41d6fdceb1 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test)) $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 7c70c1821d45..56443e46671a 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -75,6 +75,7 @@ $(eval $(call gb_Library_use_libraries,oox,\ vcl \ xo \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index e5b5023de7a8..a453af4a9a5b 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,package2,\ sal \ sax \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index a91533f98f87..15c2cb47dd98 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,xstor,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 04f301ed3844..3bcf1989c3bc 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Executable_use_libraries,spadmin.bin,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 7644c19fd99f..6ee2ef230ae6 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,spa,\ i18nisolang1 \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index e7714c4bddd3..1b3b73197f8f 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_defs,i18nregexp,\ $(eval $(call gb_Library_use_libraries,i18nregexp,\ sal \ i18nutil \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index 4dd10b76a895..2701c472dfd2 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_defs,reg,\ $(eval $(call gb_Library_use_libraries,reg,\ sal \ store \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk index a289b6499eca..d8079bac6860 100644 --- a/remotebridges/Library_uuresolver.mk +++ b/remotebridges/Library_uuresolver.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,uuresolver,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index ae4318ffea52..300874c586d0 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,rpt,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 3755165032b1..4949dea74ea2 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,rptui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index bdc3cdaeda02..c1ee286f9d65 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,rptxml,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 6382f8545a4b..25af0b595ea1 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Executable_use_libraries,rsc,\ comphelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index f74e84753a89..d2f5079723e3 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\ $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk index 6ceb12af917c..cdb62c7e4334 100644 --- a/sal/CppunitTest_sal_bytesequence.mk +++ b/sal/CppunitTest_sal_bytesequence.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\ $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index 280fd7306acb..8b7ca18c9339 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -44,6 +44,7 @@ $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk index 9ea1a2a7c2e7..4c90de256844 100644 --- a/sal/CppunitTest_sal_osl_condition.mk +++ b/sal/CppunitTest_sal_osl_condition.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index ff46564c855e..dfd5d592f999 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk index cfbb95d89e25..199f94cc3fc1 100644 --- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk +++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfile $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk index d64498a561cc..7b75f8a3e0fc 100644 --- a/sal/CppunitTest_sal_osl_module.mk +++ b/sal/CppunitTest_sal_osl_module.mk @@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk index cfc92f5e3253..131761d1d078 100644 --- a/sal/CppunitTest_sal_osl_mutex.mk +++ b/sal/CppunitTest_sal_osl_mutex.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk index 0e92b707b972..3828b7784b9a 100644 --- a/sal/CppunitTest_sal_osl_old_test_file.mk +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk index 8e6b5bfe796e..4aa70952531b 100644 --- a/sal/CppunitTest_sal_osl_pipe.mk +++ b/sal/CppunitTest_sal_osl_pipe.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_pipe, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \ sal \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index 60c728ab40ff..6a53add92dae 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk index 7eb2b9dc087a..1195b7d55eb1 100644 --- a/sal/CppunitTest_sal_osl_profile.mk +++ b/sal/CppunitTest_sal_osl_profile.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index 1e2aac169e06..a583b7c423dc 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index 69a350254365..6d6f8df52238 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk index 22fdb6831355..b014c83e46ba 100644 --- a/sal/CppunitTest_sal_osl_thread.mk +++ b/sal/CppunitTest_sal_osl_thread.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk index 5ed812526d60..e6a52823b2a9 100644 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ b/sal/CppunitTest_sal_rtl_alloc.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk index aee5f0fe1cb7..78cca6b7b39a 100644 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ b/sal/CppunitTest_sal_rtl_cipher.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk index 32da6ec443c6..1c5b6d19c71d 100644 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ b/sal/CppunitTest_sal_rtl_crc32.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk index aeaa91b4f588..9c11d796de49 100644 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ b/sal/CppunitTest_sal_rtl_doublelock.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk index 96d11fe389e3..613251ef6c13 100644 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ b/sal/CppunitTest_sal_rtl_locale.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk index 09856b7d686a..df570a552b0d 100644 --- a/sal/CppunitTest_sal_rtl_math.mk +++ b/sal/CppunitTest_sal_rtl_math.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk index 721996298bb3..f0ea74c7ca97 100644 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk index 570717eb559b..f2384f709cdc 100644 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk @@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index 2762133e24f3..bdab2fb48987 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -40,6 +40,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk index 1da1b1b55bb6..69e701b794ab 100644 --- a/sal/CppunitTest_sal_rtl_uri.mk +++ b/sal/CppunitTest_sal_rtl_uri.mk @@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uri,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk index 9a92af246696..8be994595e1f 100644 --- a/sal/CppunitTest_sal_rtl_uuid.mk +++ b/sal/CppunitTest_sal_rtl_uuid.mk @@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uuid,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk index d96f57c688f3..7efbad135f36 100644 --- a/sal/CppunitTest_sal_tcwf.mk +++ b/sal/CppunitTest_sal_tcwf.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\ $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index bc904e23c23e..720f5ee3cf0b 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\ $(eval $(call gb_CppunitTest_use_libraries,sal_types,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index e9d4170b58fe..c8d8f4756222 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index 90548762fb52..d43400d6d86f 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Executable_Executable,osl_process_child)) $(eval $(call gb_Executable_use_libraries,osl_process_child,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 4da0e3b6653c..653aa0bdafad 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -81,6 +81,7 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index 3ad5dbfb8832..94f69911cebc 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,sal_textenc)) $(eval $(call gb_Library_use_libraries,sal_textenc,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk index 92a876866f3e..6ebc52ef5b19 100644 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ b/salhelper/CppunitTest_salhelper_checkapi.mk @@ -44,6 +44,7 @@ $(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index c9f7c8a1c49e..2787529cf2ae 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_defs,salhelper,\ $(eval $(call gb_Library_use_libraries,salhelper,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index fd8fb5e9fd45..0e889e2418b1 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \ sal \ comphelper \ cppu \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 39b83b7c4816..6007467b11cc 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -26,6 +26,7 @@ $(eval $(call gb_Library_use_libraries,expwrap,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index f87a22cc6656..b28b653e4bfd 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,fastsax,\ cppuhelper \ sal \ sax \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 3dc8942795a1..4c72db00051b 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Library_use_libraries,sax,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index d707bc8f33c9..a33164371afe 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index b6b71a0b4514..c91923061d58 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 7d67779ee0b4..c7fbb6731750 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index 6c3f4a0c013c..b7d1fb6be404 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 6a4b89ba6897..f0788fb0fd6b 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 40e3f83df1eb..1636112f43b0 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 7b3e45b2696b..6e5fa7076955 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 56378223778c..7b47240e0138 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index ef47365af404..c61b4a2fbbf6 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -77,6 +77,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 839c9e39c38b..a24f391b9c09 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 44ac9f51af3c..42a48f870730 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 666181118538..ff9ad582d92e 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 99a215dbebff..192bbbd70c08 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 67762d9e0c80..6933c2583da0 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index ecb4bf74bdca..982ec6e4b35a 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index ece36aae60c3..b72bb005305f 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index d904e745a830..2bacb8f2725c 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 1e097a02434f..c7b7fcd827cf 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 6710f8a523f7..3948bcfb04ec 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -76,6 +76,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index bbbab8f84bb0..96cb69132a70 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -83,6 +83,7 @@ $(eval $(call gb_Library_use_libraries,sc,\ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 6b74917f62f6..4c39cf1f40d3 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,scd,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 8816bc3db13a..d38d40b97027 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 6d67de093be3..7f94c6193f5e 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,scui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 37dfd24178ca..30eb16d059ff 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ utl \ vbahelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index 7a4c361f3a20..e1fe08c217b5 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,analysis,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index 57820806fc97..f224c80f7a8a 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,date,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 2db18f5c22dd..42a4fa3d72e8 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,solver,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index a71e3e61dcee..5debc0acd8e5 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,basprov,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index 7e91ed87d391..c9e3b2140e94 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\ vbahelper \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index 35e47be7047a..d99f60fd4fe1 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\ sal \ sfx \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index ee5f420e9e08..86d6a05bc894 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\ sal \ tl \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index faca2a0f660c..eeb11a1c8668 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,stringresource,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index 83ec86c505c7..45c35ff163ac 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\ sfx \ sb \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 439423076efb..99a19042cb21 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -70,6 +70,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index af34ec512982..e0a5000359de 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index baba9fa72f95..5209b6445001 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 6eda34578214..b0535d506bbd 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -103,6 +103,7 @@ $(eval $(call gb_Library_use_libraries,sd,\ utl \ vcl \ xmlsecurity \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index 68d6b6dd8b64..404ea819e63a 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,sdd,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 3250fbfa114b..2402116a33e2 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 35bdede5b41a..7fcf0b01bae2 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -64,6 +64,7 @@ $(eval $(call gb_Library_use_libraries,sdui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index 26f6835e3a9b..1ea6bc6c22f1 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -53,6 +53,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\ sal \ test \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index ae2132d05915..6c1d68d8c189 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sfx2_metadatable)) $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ sal \ sfx \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index ccd254c889f5..12c1812a96b4 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ utl \ vcl \ sfx \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 3ed3a02ce483..5e01c7d01f70 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,sfx,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index edc88da25dbf..9ed4dd0f01e8 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\ i18nisolang1 \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 1b74fa595264..0ae262bee72c 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index 90821f6c1822..fbc05a0e318c 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 02cdeb7835a1..008a00481008 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index 758829962040..c6c25e89a5b2 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -46,6 +46,7 @@ endif $(eval $(call gb_Library_use_libraries,recentfile,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index 9a08ca481439..252aa827d7c4 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,syssh,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index 61810d714142..481728a3c4a8 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,syssh,\ ole32 \ sal \ shell32 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk index 9853c2cba6f6..d02c6cc5027b 100644 --- a/shell/Library_wininetbe.mk +++ b/shell/Library_wininetbe.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index bf1c0b5cad5d..42be84b0d0f6 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index f658f7f1eb9c..86d14c4b3106 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 51e9bbdffe16..199699fd24cd 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ cppuhelper \ sal \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 68c940aa21ca..22b6f5d6bfd6 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 308200e6f613..a59782c6dd75 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -109,7 +109,6 @@ endif gb_STDLIBS := \ mingwthrd \ mingw32 \ - uwinapi \ mingwex \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 3e375ba4c142..9deca874330a 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -188,7 +188,6 @@ gb_CXXFLAGS := \ -Zm500 \ gb_STDLIBS := \ - uwinapi \ advapi32 \ ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index f33029f83edf..4d019f80359f 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -38,5 +38,6 @@ gb_OSDEFS := \ -DWNT \ -DNOMINMAX \ +gb_UWINAPI := uwinapi # vim:set noexpandtab: diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index 22143e1b7bb6..da79a6556c8b 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ sot \ tl \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index ddb21b2ce9a6..50a80db23884 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,sot,\ tl \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 959d3d66f297..892af74daa71 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 17c6c7a6dd9a..2ecb8d8e7ed3 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,sm,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 86d4fb28f8ed..3ab12ab75593 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,smd,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index 2676d47ae8e4..e1ef1806ae64 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ sal \ salhelper \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index d94330dec5b9..2f2f07d4c926 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,introspection,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index fc9cb7238964..38dd68b657f0 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index 00288ebd3074..df8d3c78d468 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,invocation,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index 816bb621674b..e0ff05a968df 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ jvmaccess \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index edf394e16e29..d8b5b464f44e 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,javavm,\ jvmfwk \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index 10debb0abdbf..124bfaa3055c 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index 6e13d58b761f..cf87b477597d 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index 2d383e55619c..644f9f28f1b3 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,reflection,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 02a9ecfb5eb2..8f4ec53dd618 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/store/Library_store.mk b/store/Library_store.mk index 804901c15e23..39029be71fe5 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_defs,store,\ $(eval $(call gb_Library_use_libraries,store,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index fd090143c092..c356f403a56b 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ sal \ salhelper \ svl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index 3586a42b29bd..b0cbcd0e6a35 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -48,6 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ svl \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index fc65cb13aa8a..86c00f45418f 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,fsstorage,\ tl \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index b9d5dc0e2a09..1b89ea3ed3da 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,passwordcontainer,\ comphelper \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 768f2db56a0f..8f7940d2b76b 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,svl,\ tl \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index 96a1a8d551a4..65b4e1bea3ab 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \ tl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index 4a4ccb8bf8f4..f8fee180d891 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Executable_use_libraries,bmp,\ comphelper \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index c341d4730ca9..a00b928bd39a 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Executable_use_libraries,bmpsum,\ comphelper \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index d3c5bd024d2f..0936abd454cf 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Executable_use_libraries,g2g,\ svt \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index a16e12cda2eb..532b78bbecb6 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index 52ab67c58d82..1c7cb22309d7 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ tk \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index cfdadd9be371..7a2379b8c2cd 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,svt,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 7b06bad00624..11aad40f4d46 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ cppuhelper \ vcl \ svxcore \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index a26c1c38e6a7..a939a086a82a 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ vcl \ xo \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 89983fdd7966..f94e359aa6a6 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -82,6 +82,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 50b5074adbb7..9b2fdff4b386 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 5a02e31872f9..47d7a35e3075 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -55,6 +55,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 6d0b024ef5c5..080bd6aeb1d7 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index c8d94e795018..e42eb0c9276b 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index d4e28d66bc71..538542b37ef7 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index a59be4022800..10e7ab20769f 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ unotest \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index cba3ebd24779..aceaa697b7e6 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \ unotest \ vcl \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index eafc644b6a5f..5a9587948a21 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ unotest \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index c06de2a849da..8fc2dfedecaa 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \ unotest \ sw \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index fb787a3c4cea..1609b6f41ffc 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ unotest \ utl \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 3f4747c7cd7d..7ce087e36e40 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \ unotest \ vcl \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index 4595de555c2b..9f4677b5b29e 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \ utl \ sw \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index 6e70c9ddad60..16c36843407a 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \ test \ unotest \ sw \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 74bb52a7f834..8b53bdf32009 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 54bb731aee69..365c69096b96 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,msword,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 1d1801345a5e..b58f71a72b3e 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Library_use_libraries,sw,\ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index a96018ee57b8..73f5fb857781 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,swd,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 86c7372b2eee..4de06513c59a 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,swui,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index e77dc7823d43..310a90f4dbff 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -63,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ utl \ vbahelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index aad5ebac3fb9..1eca2f36e502 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ utl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/test/Library_test.mk b/test/Library_test.mk index cea736feffa1..e730c8b944fa 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,test,\ utl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 72df762e19a9..0388f3cb62bd 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,tk,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index 13c663afc7cd..ba876eab4a8c 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_use_api,tools_test, \ $(eval $(call gb_CppunitTest_use_libraries,tools_test, \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk index 4f12051d4d76..a30b5e5e0fe2 100644 --- a/tools/Executable_bestreversemap.mk +++ b/tools/Executable_bestreversemap.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Executable_set_include,bestreversemap,\ $(eval $(call gb_Executable_use_libraries,bestreversemap,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index 43d436ca9d6b..e97405bec6dc 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Executable_use_libraries,mkunroll,\ basegfx \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index c3d778335aef..12635cd3a7b5 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\ comphelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index e384ad57f067..260607035582 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Executable_set_include,so_checksum,\ $(eval $(call gb_Executable_use_libraries,so_checksum,\ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 23d534fa02c3..b588874d04ca 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,tl,\ i18nisolang1 \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk index f60a1b0fd174..1a54526c9872 100644 --- a/tubes/CppunitTest_tubes_test.mk +++ b/tubes/CppunitTest_tubes_test.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,tubes_test, \ sal \ tubes \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index 5ef4cb407980..b077841a25d6 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_defs,tubes,\ )) $(eval $(call gb_Library_use_libraries,tubes,\ - $(gb_STDLIBS) \ comphelper \ cppu \ sal \ @@ -50,6 +49,8 @@ $(eval $(call gb_Library_use_libraries,tubes,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,tubes,\ diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index 85b1fc29c596..93ac31c15548 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,cached1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index 7beb741e7465..c349e1cec703 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index a501f877a184..109cf2a55be6 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ cppuhelper \ sal \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index 1fb12264652a..d7fac5b45f89 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ salhelper \ ucbhelper \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 91b3a975c1ce..3f8e2f42cb0e 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index 51c79e703c5c..dda77b3e430a 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ cppuhelper \ sal \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 9e730003d3e9..eb436aee0a6c 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index ed68c8938fb1..4f729b1dec08 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ cppuhelper \ sal \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index e588649e2f30..8b197d56b72c 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ cppuhelper \ sal \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index ac33d001c686..9d33231e23fa 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index d531b5494fad..e67f9aa84660 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index 8b0e8ec0fe12..f1212d0f629a 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index 82b8aba0fc37..97c18b33505b 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index e5a61fd7a01b..f394025ac0f8 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_libraries,ucbhelper,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 0119fbdea40a..4fba9a027607 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index 1f5a584d11b6..f7d50c76a9b7 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index f4dd2222a007..809968835707 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,unotest,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 97e1d70f35fd..0b7eef7b73fb 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,utl,\ salhelper \ tl \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index efab7a8f62e8..f9395a83d160 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,unordf,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 81ecfef4f776..3dccdccaec18 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,unoxml,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index 87cff350a831..e9030b96fe6e 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,uui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 1b0e56526cf7..9a5493c12cb8 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,msforms,\ tl \ vbahelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index a18f06e6a482..8bbe47457870 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,vbahelper,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 86435a2ba352..df68439c72c1 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -84,6 +84,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ cppu \ sal \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index fd2fe872b30f..cf48c49851cf 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ cppuhelper \ sal \ writerfilter \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 6e583e9227f5..78f2a008abc6 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ unotest \ vcl \ writerfilter \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index c0088eac61f3..83006badc658 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -80,6 +80,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index 1eeccd538349..d7a72fc4c0c8 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ cppuhelper \ sal \ writerfilter \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 57b48a045f54..412b0c982430 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\ tl \ utl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index 25f77c40673c..a4295a5019b6 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ ucbhelper \ utl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 468f966a90f5..73be015cb824 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,xo,\ svl \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 4efd62b0ff72..15e65da4c325 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,xof,\ salhelper \ sax \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index e254b197b22b..7035278e9c44 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_add_defs,xmlreader,\ $(eval $(call gb_Library_use_libraries,xmlreader,\ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) # cppu is only needed due to the cppumaker -C hack diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index 2ca986a385aa..3f83379ba8b3 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -23,6 +23,7 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 7fd7af10deb3..7501f23cc110 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ svl \ test \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index aae123bd8c47..09766bc188f4 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 4ea0768b4d51..99b393f532de 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index e2048f60454a..5195db72d41a 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ svl \ tl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) -- cgit From 816ec4b0933e36ac468230365359c3b9d8d52986 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 00:49:12 +0200 Subject: gbuild: replace direct gb_STDLIBS use with ... ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69 --- Library_merged.mk | 3 ++- UnoControls/Library_ctl.mk | 3 ++- accessibility/Library_acc.mk | 3 ++- accessibility/Library_java_uno_accessbridge.mk | 3 ++- animations/Library_animcore.mk | 3 ++- avmedia/Library_avmedia.mk | 3 ++- avmedia/Library_avmediaQuickTime.mk | 3 ++- avmedia/Library_avmediagst.mk | 3 ++- avmedia/Library_avmediagst_0_10.mk | 3 ++- avmedia/Library_avmediawin.mk | 3 ++- basctl/Library_basctl.mk | 3 ++- basebmp/CppunitTest_basebmp.mk | 3 ++- basebmp/Library_basebmp.mk | 3 ++- basebmp/StaticLibrary_basebmp.mk | 1 - basegfx/CppunitTest_basegfx.mk | 3 ++- basegfx/Library_basegfx.mk | 3 ++- basic/CppunitTest_basic_enable.mk | 3 ++- basic/CppunitTest_basic_nested_struct.mk | 3 ++- basic/CppunitTest_basic_scanner.mk | 3 ++- basic/Library_sb.mk | 3 ++- bean/Library_officebean.mk | 4 +--- binaryurp/CppunitTest_binaryurp_test-cache.mk | 3 ++- binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 3 ++- binaryurp/Library_binaryurp.mk | 3 ++- bridges/Library_gcc3_linux_arm.mk | 3 ++- bridges/Library_gcc3_linux_intel.mk | 3 ++- bridges/Library_gcc3_linux_mips.mk | 3 ++- bridges/Library_java_uno.mk | 3 ++- canvas/Library_cairocanvas.mk | 3 ++- canvas/Library_canvasfactory.mk | 3 ++- canvas/Library_canvastools.mk | 3 ++- canvas/Library_directx9canvas.mk | 3 ++- canvas/Library_gdipluscanvas.mk | 3 ++- canvas/Library_nullcanvas.mk | 3 ++- canvas/Library_simplecanvas.mk | 3 ++- canvas/Library_vclcanvas.mk | 3 ++- chart2/Library_chartcontroller.mk | 3 ++- chart2/Library_chartcore.mk | 3 ++- cli_ure/Executable_climaker.mk | 3 ++- clucene/Library_clucene.mk | 5 +---- comphelper/CppunitTest_comphelper_test.mk | 3 ++- comphelper/Library_comphelper.mk | 3 ++- configmgr/Library_configmgr.mk | 3 ++- connectivity/Library_ado.mk | 3 ++- connectivity/Library_calc.mk | 3 ++- connectivity/Library_dbase.mk | 3 ++- connectivity/Library_dbpool2.mk | 3 ++- connectivity/Library_dbtools.mk | 3 ++- connectivity/Library_evoab.mk | 3 ++- connectivity/Library_file.mk | 3 ++- connectivity/Library_flat.mk | 3 ++- connectivity/Library_hsqldb.mk | 3 ++- connectivity/Library_jdbc.mk | 3 ++- connectivity/Library_kab1.mk | 3 ++- connectivity/Library_kabdrv1.mk | 3 ++- connectivity/Library_macab1.mk | 3 ++- connectivity/Library_macabdrv1.mk | 3 ++- connectivity/Library_mork.mk | 3 ++- connectivity/Library_mozab.mk | 3 ++- connectivity/Library_mozabdrv.mk | 3 ++- connectivity/Library_mozbootstrap.mk | 3 ++- connectivity/Library_mysql.mk | 3 ++- connectivity/Library_odbc.mk | 3 ++- connectivity/Library_odbcbase.mk | 3 ++- connectivity/Library_postgresql-sdbc-impl.mk | 3 ++- connectivity/Library_postgresql-sdbc.mk | 3 ++- connectivity/Library_sdbc2.mk | 3 ++- connectivity/Library_tdeab1.mk | 3 ++- connectivity/Library_tdeabdrv1.mk | 3 ++- cppcanvas/Library_cppcanvas.mk | 3 ++- cppcanvas/Library_mtfrenderer.mk | 3 ++- cppu/CppunitTest_cppu_checkapi.mk | 3 ++- cppu/CppunitTest_cppu_qa_any.mk | 3 ++- cppu/CppunitTest_cppu_qa_recursion.mk | 3 ++- cppu/CppunitTest_cppu_qa_reference.mk | 3 ++- cppu/CppunitTest_cppu_qa_unotype.mk | 3 ++- cppu/CppunitTest_cppu_test_cppumaker.mk | 3 ++- cppu/Library_affine_uno.mk | 3 ++- cppu/Library_cppu.mk | 3 ++- cppu/Library_log_uno.mk | 3 ++- cppu/Library_purpenvhelper.mk | 3 ++- cppu/Library_unsafe_uno.mk | 3 ++- cppuhelper/CppunitTest_cppuhelper_checkapi.mk | 3 ++- cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 3 ++- cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 3 ++- cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 3 ++- cppuhelper/Library_cppuhelper.mk | 3 ++- cpputools/Executable_regcomp.mk | 3 ++- cpputools/Executable_regsingleton.mk | 3 ++- cpputools/Executable_uno.mk | 3 ++- cui/Library_cui.mk | 3 ++- dbaccess/CppunitTest_dbaccess_macros_test.mk | 3 ++- dbaccess/Executable_odbcconfig.mk | 3 ++- dbaccess/Library_dba.mk | 3 ++- dbaccess/Library_dbaxml.mk | 3 ++- dbaccess/Library_dbmm.mk | 3 ++- dbaccess/Library_dbu.mk | 3 ++- dbaccess/Library_sdbt.mk | 3 ++- desktop/Executable_crashrep.com.mk | 3 ++- desktop/Executable_officeloader.mk | 3 ++- desktop/Executable_oosplash.mk | 3 ++- desktop/Executable_quickstart.mk | 3 ++- desktop/Executable_sbase.mk | 3 ++- desktop/Executable_scalc.mk | 3 ++- desktop/Executable_sdraw.mk | 3 ++- desktop/Executable_simpress.mk | 3 ++- desktop/Executable_smath.mk | 3 ++- desktop/Executable_soffice.bin.mk | 3 ++- desktop/Executable_soffice.mk | 3 ++- desktop/Executable_soffice_bin.mk | 3 ++- desktop/Executable_sweb.mk | 3 ++- desktop/Executable_swriter.mk | 3 ++- desktop/Executable_unopkg.bin.mk | 3 ++- desktop/Library_deployment.mk | 3 ++- desktop/Library_deploymentgui.mk | 3 ++- desktop/Library_deploymentmisc.mk | 3 ++- desktop/Library_migrationoo2.mk | 3 ++- desktop/Library_migrationoo3.mk | 3 ++- desktop/Library_offacc.mk | 3 ++- desktop/Library_sofficeapp.mk | 3 ++- desktop/Library_spl.mk | 3 ++- desktop/Library_spl_unx.mk | 3 ++- desktop/Library_unopkgapp.mk | 3 ++- drawinglayer/Library_drawinglayer.mk | 3 ++- dtrans/Library_dnd.mk | 3 ++- dtrans/Library_dtrans.mk | 3 ++- dtrans/Library_ftransl.mk | 3 ++- dtrans/Library_mcnttype.mk | 3 ++- dtrans/Library_sysdtrans.mk | 3 ++- editeng/CppunitTest_editeng_borderline.mk | 3 ++- editeng/CppunitTest_editeng_core.mk | 3 ++- editeng/CppunitTest_editeng_lookuptree.mk | 3 ++- editeng/Library_editeng.mk | 3 ++- embeddedobj/Library_embobj.mk | 3 ++- embeddedobj/Library_emboleobj.mk | 3 ++- embedserv/Library_emser.mk | 3 ++- embedserv/Library_inprocserv.mk | 3 ++- eventattacher/Library_evtatt.mk | 3 ++- extensions/CppunitTest_extensions_test_update.mk | 3 ++- extensions/Library_abp.mk | 3 ++- extensions/Library_bib.mk | 3 ++- extensions/Library_dbp.mk | 3 ++- extensions/Library_log.mk | 3 ++- extensions/Library_pcr.mk | 3 ++- extensions/Library_pl.mk | 3 ++- extensions/Library_res.mk | 3 ++- extensions/Library_scn.mk | 3 ++- fileaccess/Library_fileacc.mk | 3 ++- filter/CppunitTest_filter_pict_test.mk | 3 ++- filter/CppunitTest_filter_tga_test.mk | 3 ++- filter/CppunitTest_filter_tiff_test.mk | 3 ++- filter/Executable_svg2odf.mk | 3 ++- filter/Library_PptImporter.mk | 3 ++- filter/Library_egi.mk | 3 ++- filter/Library_eme.mk | 3 ++- filter/Library_epb.mk | 3 ++- filter/Library_epg.mk | 3 ++- filter/Library_epp.mk | 3 ++- filter/Library_eps.mk | 3 ++- filter/Library_ept.mk | 3 ++- filter/Library_era.mk | 3 ++- filter/Library_eti.mk | 3 ++- filter/Library_exp.mk | 3 ++- filter/Library_filterconfig.mk | 3 ++- filter/Library_flash.mk | 3 ++- filter/Library_icd.mk | 3 ++- filter/Library_icg.mk | 3 ++- filter/Library_idx.mk | 3 ++- filter/Library_ime.mk | 3 ++- filter/Library_ipb.mk | 3 ++- filter/Library_ipd.mk | 3 ++- filter/Library_ips.mk | 3 ++- filter/Library_ipt.mk | 3 ++- filter/Library_ipx.mk | 3 ++- filter/Library_ira.mk | 3 ++- filter/Library_itg.mk | 3 ++- filter/Library_iti.mk | 3 ++- filter/Library_msfilter.mk | 3 ++- filter/Library_odfflatxml.mk | 3 ++- filter/Library_pdffilter.mk | 3 ++- filter/Library_placeware.mk | 3 ++- filter/Library_svgfilter.mk | 3 ++- filter/Library_t602filter.mk | 3 ++- filter/Library_textfd.mk | 3 ++- filter/Library_xmlfa.mk | 3 ++- filter/Library_xmlfd.mk | 3 ++- filter/Library_xsltdlg.mk | 3 ++- filter/Library_xsltfilter.mk | 3 ++- forms/Library_frm.mk | 3 ++- formula/Library_for.mk | 3 ++- formula/Library_forui.mk | 3 ++- fpicker/Library_fpicker.mk | 3 ++- fpicker/Library_fps.mk | 3 ++- fpicker/Library_fps_aqua.mk | 3 ++- fpicker/Library_fps_odma.mk | 3 ++- fpicker/Library_fps_office.mk | 3 ++- framework/Library_fwe.mk | 3 ++- framework/Library_fwi.mk | 3 ++- framework/Library_fwk.mk | 3 ++- framework/Library_fwl.mk | 3 ++- framework/Library_fwm.mk | 3 ++- framework/Library_lomenubar.mk | 3 ++- hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 3 ++- hwpfilter/Library_hwp.mk | 3 ++- i18npool/CppunitTest_i18npool_test_breakiterator.mk | 3 ++- i18npool/CppunitTest_i18npool_test_characterclassification.mk | 3 ++- i18npool/CppunitTest_i18npool_test_languagetag.mk | 3 ++- i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk | 3 ++- i18npool/Executable_gencoll_rule.mk | 3 ++- i18npool/Executable_genconv_dict.mk | 3 ++- i18npool/Executable_gendict.mk | 3 ++- i18npool/Executable_genindex_data.mk | 3 ++- i18npool/Executable_saxparser.mk | 3 ++- i18npool/Library_collator_data.mk | 3 ++- i18npool/Library_dict_ja.mk | 3 ++- i18npool/Library_dict_zh.mk | 3 ++- i18npool/Library_i18nisolang1.mk | 3 ++- i18npool/Library_i18npool.mk | 3 ++- i18npool/Library_i18nsearch.mk | 3 ++- i18npool/Library_index_data.mk | 3 ++- i18npool/Library_localedata_en.mk | 3 ++- i18npool/Library_localedata_es.mk | 3 ++- i18npool/Library_localedata_euro.mk | 3 ++- i18npool/Library_localedata_others.mk | 3 ++- i18npool/Library_textconv_dict.mk | 3 ++- i18nutil/Library_i18nutil.mk | 3 ++- idl/Executable_svidl.mk | 3 ++- io/Library_acceptor.mk | 3 ++- io/Library_connector.mk | 3 ++- io/Library_streams.mk | 3 ++- io/Library_textinstream.mk | 3 ++- io/Library_textoutstream.mk | 3 ++- javaunohelper/Library_juh.mk | 3 ++- javaunohelper/Library_juhx.mk | 3 ++- jurt/Library_jpipe.mk | 3 ++- jurt/Library_jpipx.mk | 3 ++- jvmaccess/Library_jvmaccess.mk | 3 ++- jvmfwk/Executable_javaldx.mk | 3 ++- jvmfwk/Library_jvmfwk.mk | 3 ++- jvmfwk/Library_sunjavaplugin.mk | 3 ++- l10ntools/Executable_ulfconv.mk | 3 ++- lingucomponent/Library_MacOSXSpell.mk | 3 ++- lingucomponent/Library_guesslang.mk | 3 ++- lingucomponent/Library_hyphen.mk | 3 ++- lingucomponent/Library_lnth.mk | 3 ++- lingucomponent/Library_spell.mk | 3 ++- linguistic/Library_lng.mk | 3 ++- lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 3 ++- lotuswordpro/Library_lwpft.mk | 3 ++- o3tl/CppunitTest_o3tl_tests.mk | 3 ++- officecfg/CppunitTest_officecfg_cppheader_test.mk | 3 ++- oox/Library_oox.mk | 3 ++- package/Library_package2.mk | 3 ++- package/Library_xstor.mk | 3 ++- padmin/Executable_spadmin.bin.mk | 3 ++- padmin/Library_spa.mk | 3 ++- regexp/Library_regexp.mk | 3 ++- registry/Library_reg.mk | 3 ++- remotebridges/Library_uuresolver.mk | 3 ++- reportdesign/Library_rpt.mk | 3 ++- reportdesign/Library_rptui.mk | 3 ++- reportdesign/Library_rptxml.mk | 3 ++- rsc/Executable_rsc.mk | 3 ++- sal/CppunitTest_Module_DLL.mk | 3 ++- sal/CppunitTest_sal_bytesequence.mk | 3 ++- sal/CppunitTest_sal_checkapi.mk | 3 ++- sal/CppunitTest_sal_osl_condition.mk | 3 ++- sal/CppunitTest_sal_osl_file.mk | 3 ++- sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk | 3 ++- sal/CppunitTest_sal_osl_module.mk | 3 ++- sal/CppunitTest_sal_osl_mutex.mk | 3 ++- sal/CppunitTest_sal_osl_old_test_file.mk | 3 ++- sal/CppunitTest_sal_osl_pipe.mk | 3 ++- sal/CppunitTest_sal_osl_process.mk | 7 +++++-- sal/CppunitTest_sal_osl_profile.mk | 3 ++- sal/CppunitTest_sal_osl_security.mk | 3 ++- sal/CppunitTest_sal_osl_setthreadname.mk | 3 ++- sal/CppunitTest_sal_osl_thread.mk | 3 ++- sal/CppunitTest_sal_rtl_alloc.mk | 3 ++- sal/CppunitTest_sal_rtl_cipher.mk | 3 ++- sal/CppunitTest_sal_rtl_crc32.mk | 3 ++- sal/CppunitTest_sal_rtl_doublelock.mk | 3 ++- sal/CppunitTest_sal_rtl_locale.mk | 3 ++- sal/CppunitTest_sal_rtl_math.mk | 3 ++- sal/CppunitTest_sal_rtl_ostringbuffer.mk | 3 ++- sal/CppunitTest_sal_rtl_oustringbuffer.mk | 3 ++- sal/CppunitTest_sal_rtl_strings.mk | 3 ++- sal/CppunitTest_sal_rtl_uri.mk | 3 ++- sal/CppunitTest_sal_rtl_uuid.mk | 3 ++- sal/CppunitTest_sal_tcwf.mk | 3 ++- sal/CppunitTest_sal_types.mk | 3 ++- sal/Executable_cppunittester.mk | 3 ++- sal/Executable_osl_process_child.mk | 3 ++- sal/Library_sal.mk | 3 ++- sal/Library_sal_textenc.mk | 3 ++- sal/Library_uwinapi.mk | 3 ++- salhelper/CppunitTest_salhelper_checkapi.mk | 3 ++- salhelper/Library_salhelper.mk | 3 ++- sax/CppunitTest_sax.mk | 3 ++- sax/Library_expwrap.mk | 3 ++- sax/Library_fastsax.mk | 3 ++- sax/Library_sax.mk | 3 ++- sc/CppunitTest_sc_annotationshapeobj.mk | 3 ++- sc/CppunitTest_sc_cellrangeobj.mk | 3 ++- sc/CppunitTest_sc_chart_regression_test.mk | 3 ++- sc/CppunitTest_sc_databaserangeobj.mk | 3 ++- sc/CppunitTest_sc_datapilotfieldobj.mk | 3 ++- sc/CppunitTest_sc_datapilottableobj.mk | 3 ++- sc/CppunitTest_sc_editfieldobj_cell.mk | 3 ++- sc/CppunitTest_sc_editfieldobj_header.mk | 3 ++- sc/CppunitTest_sc_filters_test.mk | 3 ++- sc/CppunitTest_sc_macros_test.mk | 3 ++- sc/CppunitTest_sc_modelobj.mk | 3 ++- sc/CppunitTest_sc_namedrangeobj.mk | 3 ++- sc/CppunitTest_sc_namedrangesobj.mk | 3 ++- sc/CppunitTest_sc_rangelst_test.mk | 3 ++- sc/CppunitTest_sc_subsequent_filters_test.mk | 3 ++- sc/CppunitTest_sc_tableautoformatfield.mk | 3 ++- sc/CppunitTest_sc_tablesheetobj.mk | 3 ++- sc/CppunitTest_sc_tablesheetsobj.mk | 3 ++- sc/CppunitTest_sc_ucalc.mk | 3 ++- sc/Library_sc.mk | 3 ++- sc/Library_scd.mk | 3 ++- sc/Library_scfilt.mk | 3 ++- sc/Library_scui.mk | 3 ++- sc/Library_vbaobj.mk | 3 ++- scaddins/Library_analysis.mk | 3 ++- scaddins/Library_date.mk | 3 ++- sccomp/Library_solver.mk | 3 ++- scripting/Library_basprov.mk | 3 ++- scripting/Library_dlgprov.mk | 3 ++- scripting/Library_protocolhandler.mk | 3 ++- scripting/Library_scriptframe.mk | 3 ++- scripting/Library_stringresource.mk | 3 ++- scripting/Library_vbaevents.mk | 3 ++- sd/CppunitTest_sd_filters_test.mk | 3 ++- sd/CppunitTest_sd_regression_test.mk | 3 ++- sd/CppunitTest_sd_uimpress.mk | 3 ++- sd/Library_sd.mk | 3 ++- sd/Library_sdd.mk | 3 ++- sd/Library_sdfilt.mk | 3 ++- sd/Library_sdui.mk | 3 ++- sdext/CppunitTest_pdfimport.mk | 3 ++- sfx2/CppunitTest_sfx2_metadatable.mk | 3 ++- sfx2/Library_qstart.mk | 3 ++- sfx2/Library_sfx.mk | 3 ++- shell/Executable_lngconvex.mk | 3 ++- shell/Library_cmdmail.mk | 3 ++- shell/Library_desktopbe.mk | 3 ++- shell/Library_gconfbe.mk | 3 ++- shell/Library_kde4be.mk | 3 ++- shell/Library_kdebe.mk | 3 ++- shell/Library_localebe.mk | 3 ++- shell/Library_macbe.mk | 3 ++- shell/Library_recentfile.mk | 3 ++- shell/Library_syssh.mk | 3 ++- shell/Library_syssh_win.mk | 3 ++- shell/Library_tdebe.mk | 3 ++- shell/Library_wininetbe.mk | 3 ++- slideshow/CppunitTest_slideshow.mk | 3 ++- slideshow/Executable_demoshow.mk | 3 ++- slideshow/Library_OGLTrans.mk | 3 ++- slideshow/Library_slideshow.mk | 3 ++- solenv/gbuild/CppunitTest.mk | 1 + solenv/gbuild/Executable.mk | 1 + solenv/gbuild/Library.mk | 1 + solenv/gbuild/LinkTarget.mk | 7 +++++++ solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk | 2 +- solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk | 2 +- solenv/gbuild/platform/WNT_INTEL_GCC.mk | 6 +++--- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +- solenv/gbuild/platform/android.mk | 2 +- solenv/gbuild/platform/solaris.mk | 6 +++--- sot/CppunitTest_sot_test_sot.mk | 3 ++- sot/Library_sot.mk | 3 ++- starmath/CppunitTest_starmath_qa_cppunit.mk | 3 ++- starmath/Library_sm.mk | 3 ++- starmath/Library_smd.mk | 3 ++- stoc/Library_bootstrap.mk | 3 ++- stoc/Library_introspection.mk | 3 ++- stoc/Library_invocadapt.mk | 3 ++- stoc/Library_invocation.mk | 3 ++- stoc/Library_javaloader.mk | 3 ++- stoc/Library_javavm.mk | 3 ++- stoc/Library_namingservice.mk | 3 ++- stoc/Library_proxyfac.mk | 3 ++- stoc/Library_reflection.mk | 3 ++- stoc/Library_stocservices.mk | 3 ++- store/Library_store.mk | 3 ++- svl/CppunitTest_svl_lngmisc.mk | 3 ++- svl/CppunitTest_svl_urihelper.mk | 3 ++- svl/Library_fsstorage.mk | 3 ++- svl/Library_passwordcontainer.mk | 3 ++- svl/Library_svl.mk | 3 ++- svtools/CppunitTest_svtools_filters_test.mk | 3 ++- svtools/Executable_bmp.mk | 3 ++- svtools/Executable_bmpsum.mk | 3 ++- svtools/Executable_g2g.mk | 3 ++- svtools/Executable_langsupport.mk | 3 ++- svtools/Library_hatchwindowfactory.mk | 3 ++- svtools/Library_svt.mk | 3 ++- svx/Executable_gengal.bin.mk | 3 ++- svx/Library_svx.mk | 3 ++- svx/Library_svxcore.mk | 3 ++- svx/Library_textconversiondlgs.mk | 3 ++- sw/CppunitTest_sw_filters_test.mk | 3 ++- sw/CppunitTest_sw_layout_test.mk | 3 ++- sw/CppunitTest_sw_macros_test.mk | 3 ++- sw/CppunitTest_sw_regression_test.mk | 3 ++- sw/CppunitTest_sw_subsequent_odfexport.mk | 3 ++- sw/CppunitTest_sw_subsequent_odfimport.mk | 3 ++- sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 3 ++- sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 3 ++- sw/CppunitTest_sw_subsequent_rtfexport.mk | 3 ++- sw/CppunitTest_sw_subsequent_rtfimport.mk | 3 ++- sw/CppunitTest_sw_subsequent_ww8export.mk | 3 ++- sw/CppunitTest_sw_subsequent_ww8import.mk | 3 ++- sw/CppunitTest_sw_swdoc_test.mk | 3 ++- sw/Library_msword.mk | 3 ++- sw/Library_sw.mk | 3 ++- sw/Library_swd.mk | 3 ++- sw/Library_swui.mk | 3 ++- sw/Library_vbaswobj.mk | 3 ++- test/Library_subsequenttest.mk | 3 ++- test/Library_test.mk | 3 ++- toolkit/Library_tk.mk | 3 ++- tools/CppunitTest_tools_test.mk | 3 ++- tools/Executable_bestreversemap.mk | 3 ++- tools/Executable_mkunroll.mk | 3 ++- tools/Executable_rscdep.mk | 3 ++- tools/Executable_so_checksum.mk | 3 ++- tools/Library_tl.mk | 3 ++- touch/Library_libotouch.mk | 3 ++- tubes/CppunitTest_tubes_test.mk | 3 ++- tubes/Library_tubes.mk | 3 ++- ucb/Library_cached1.mk | 3 ++- ucb/Library_srtrs1.mk | 3 ++- ucb/Library_ucb1.mk | 3 ++- ucb/Library_ucpcmis1.mk | 3 ++- ucb/Library_ucpdav1.mk | 3 ++- ucb/Library_ucpexpand1.mk | 3 ++- ucb/Library_ucpext.mk | 3 ++- ucb/Library_ucpfile1.mk | 3 ++- ucb/Library_ucpftp1.mk | 3 ++- ucb/Library_ucpgio1.mk | 3 ++- ucb/Library_ucpgvfs1.mk | 3 ++- ucb/Library_ucphier1.mk | 3 ++- ucb/Library_ucpodma1.mk | 3 ++- ucb/Library_ucppkg1.mk | 3 ++- ucb/Library_ucptdoc1.mk | 3 ++- ucbhelper/Library_ucbhelper.mk | 3 ++- unotest/Library_unobootstrapprotector.mk | 3 ++- unotest/Library_unoexceptionprotector.mk | 3 ++- unotest/Library_unotest.mk | 3 ++- unotools/Library_utl.mk | 3 ++- unoxml/Library_unordf.mk | 3 ++- unoxml/Library_unoxml.mk | 3 ++- uui/Library_uui.mk | 3 ++- vbahelper/Library_msforms.mk | 3 ++- vbahelper/Library_vbahelper.mk | 3 ++- vcl/Executable_kdefilepicker.mk | 3 ++- vcl/Executable_tdefilepicker.mk | 3 ++- vcl/Library_desktop_detector.mk | 3 ++- vcl/Library_vcl.mk | 3 ++- vcl/Library_vclplug_gen.mk | 3 ++- vcl/Library_vclplug_gtk.mk | 3 ++- vcl/Library_vclplug_gtk3.mk | 3 ++- vcl/Library_vclplug_kde.mk | 3 ++- vcl/Library_vclplug_kde4.mk | 3 ++- vcl/Library_vclplug_svp.mk | 3 ++- vcl/Library_vclplug_tde.mk | 3 ++- writerfilter/CppunitTest_writerfilter_doctok.mk | 3 ++- writerfilter/CppunitTest_writerfilter_rtftok.mk | 3 ++- writerfilter/Library_writerfilter.mk | 3 ++- writerfilter/Library_writerfilter_uno.mk | 3 ++- writerperfect/Library_wpftdraw.mk | 3 ++- writerperfect/Library_wpftwriter.mk | 3 ++- xml2cmp/Executable_xml2cmp.mk | 8 +++----- xmloff/Library_xo.mk | 3 ++- xmloff/Library_xof.mk | 3 ++- xmlreader/Library_xmlreader.mk | 3 ++- xmlscript/Library_xmlscript.mk | 3 ++- xmlsecurity/CppunitTest_qa_certext.mk | 3 ++- xmlsecurity/Library_xmlsecurity.mk | 3 ++- xmlsecurity/Library_xsec_fw.mk | 3 ++- xmlsecurity/Library_xsec_xmlsec.mk | 3 ++- 486 files changed, 972 insertions(+), 496 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 0c6cb408fd46..8914e598e5fc 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,merged,\ ucbhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,merged)) + $(eval $(call gb_Library_use_externals,merged,\ cups \ icui18n \ diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index e5ac6d72ce4e..fd7e1736962a 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,ctl,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ctl)) + $(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl)) $(eval $(call gb_Library_add_exception_objects,ctl,\ diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 7da687e3695c..667dcc30e09e 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,acc,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,acc)) + $(eval $(call gb_Library_add_exception_objects,acc,\ accessibility/source/extended/AccessibleBrowseBox \ accessibility/source/extended/AccessibleBrowseBoxBase \ diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index 5e0b98fad2ee..1579f8a35e3a 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,java_uno_accessbridge)) + $(eval $(call gb_Library_add_exception_objects,java_uno_accessbridge,\ accessibility/bridge/source/java/WindowsAccessBridgeAdapter \ )) diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index 370e1855a9ba..f4ada9c4f3af 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,animcore,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,animcore)) + $(eval $(call gb_Library_add_exception_objects,animcore,\ animations/source/animcore/animcore \ animations/source/animcore/factreg \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 2eed8e188686..f597bb35647d 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -57,9 +57,10 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmedia)) + $(eval $(call gb_Library_add_exception_objects,avmedia,\ avmedia/source/framework/mediacontrol \ avmedia/source/framework/mediaitem \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 4f367776207d..1daa4aafbe10 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediaQuickTime)) + $(eval $(call gb_Library_use_externals,avmediaQuickTime,\ cocoa \ qtkit \ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 20261158c4b1..394873f04a16 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediagst)) + $(eval $(call gb_Library_add_exception_objects,avmediagst,\ avmedia/source/gstreamer/gstmanager \ avmedia/source/gstreamer/gstplayer \ diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index dace38183760..3369dbf57833 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediagst_0_10)) + $(eval $(call gb_Library_add_libs,avmediagst_0_10,\ $(GSTREAMER_0_10_LIBS) \ -lgstinterfaces-0.10 \ diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 3eb9fe2e4962..64750496d43c 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediawin)) + $(eval $(call gb_Library_add_libs,avmediawin,\ strmiids.lib \ )) diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index f83840635926..6cd860ee73f9 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,basctl,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basctl)) + $(eval $(call gb_Library_add_exception_objects,basctl,\ basctl/source/accessibility/accessibledialogcontrolshape \ basctl/source/accessibility/accessibledialogwindow \ diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index fc7275a64801..5747cb6b59c8 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -28,9 +28,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basebmp_cpputest)) + $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_cpputest,\ basebmp/test/basictest \ basebmp/test/bmpmasktest \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 661f5aa2bd22..fd385a8b1eb5 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -19,9 +19,10 @@ $(eval $(call gb_Library_use_libraries,basebmp,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basebmp)) + $(eval $(call gb_Library_set_include,basebmp,\ -I$(SRCDIR)/basebmp/inc/ \ $$(INCLUDE) \ diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk index 25b923df532b..200f46e96f58 100644 --- a/basebmp/StaticLibrary_basebmp.mk +++ b/basebmp/StaticLibrary_basebmp.mk @@ -19,7 +19,6 @@ $(eval $(call gb_StaticLibrary_use_libraries,basebmp,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) $(eval $(call gb_StaticLibrary_set_include,basebmp,\ diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 121faf6af57c..a531848951b8 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basegfx_cpputest)) + $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_cpputest,\ basegfx/test/basegfx1d \ basegfx/test/basegfx2d \ diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index e3b11aecfd97..6d974ec6395a 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -22,9 +22,10 @@ $(eval $(call gb_Library_use_libraries,basegfx,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basegfx)) + $(eval $(call gb_Library_set_include,basegfx,\ -I$(SRCDIR)/basegfx/inc \ -I$(SRCDIR)/basegfx/source/inc \ diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index 3bd2bc87337a..c09080ce2276 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -29,9 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ xmlscript \ test \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index fcadba3b0c84..e43404a27094 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -30,9 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ xmlscript \ test \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index af058148e32f..36806d0e276d 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -30,9 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ oleaut32 \ diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index de50d0c70f9f..c29a58c4b366 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,sb,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sb)) + ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Library_add_exception_objects,sb,\ diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 78cc7dba7297..2b8e2164f045 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -64,8 +64,6 @@ $(eval $(call gb_Library_add_ldflags,officebean,\ endif -$(eval $(call gb_Library_use_libraries,officebean,\ - $(gb_STDLIBS) \ -)) +$(eval $(call gb_Library_add_standard_system_libs,officebean)) # vim: set noet sw=4 ts=4: diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 7818b21b9163..ecde720b9f58 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -31,9 +31,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache)) $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-cache)) + $(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\ binaryurp/qa/test-cache \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 2c8c907fa7e1..aed5a30d78a3 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -34,9 +34,10 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-unmarshal)) + $(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\ binaryurp \ )) diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 879025b84606..99e223a68d22 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,binaryurp)) + $(eval $(call gb_Library_add_exception_objects,binaryurp,\ binaryurp/source/binaryany \ binaryurp/source/bridge \ diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index c37275a02dba..ae0df1bad934 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ dl \ ) \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) + $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/shared/bridge \ bridges/source/cpp_uno/shared/component \ diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk index 503eb462b3df..526a1c95b322 100644 --- a/bridges/Library_gcc3_linux_intel.mk +++ b/bridges/Library_gcc3_linux_intel.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ dl \ ) \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) + $(eval $(call gb_Library_add_asmobjects,gcc3_uno,\ bridges/source/cpp_uno/gcc3_linux_intel/call \ )) diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk index f03752ac74c5..4cd01957c3dd 100644 --- a/bridges/Library_gcc3_linux_mips.mk +++ b/bridges/Library_gcc3_linux_mips.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ dl \ ) \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) + $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/gcc3_linux_mips/except \ bridges/source/cpp_uno/shared/bridge \ diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index 3bee8a12e679..df834277c41d 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,java_uno,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,java_uno)) + $(eval $(call gb_Library_add_exception_objects,java_uno,\ bridges/source/jni_uno/jni_bridge \ bridges/source/jni_uno/jni_data \ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 74ded07486cf..85ea94cda4ed 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -69,9 +69,10 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ i18nisolang1 \ canvastools \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cairocanvas)) + $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_cachedbitmap \ canvas/source/cairo/cairo_cairo \ diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 974231a039a1..1b66f16a6b57 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,canvasfactory)) + $(eval $(call gb_Library_add_exception_objects,canvasfactory,\ canvas/source/factory/cf_service \ )) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 4e70f654c6ad..d08d76934fac 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,canvastools)) + $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/cachedprimitivebase \ canvas/source/tools/canvascustomspritehelper \ diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 08ffdf4017fe..fb2a28b6a928 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ utl \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) + $(eval $(call gb_Library_use_libraries,directx9canvas,\ d3d9 \ gdi32 \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 6ae93a809466..cfe70a926995 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -62,9 +62,10 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ utl \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) + $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ gdi32 \ gdiplus \ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index a130dfb39fbe..ea7376e41bf5 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\ sal \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,nullcanvas)) + $(eval $(call gb_Library_add_exception_objects,nullcanvas,\ canvas/source/null/null_canvasbitmap \ canvas/source/null/null_canvascustomsprite \ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index d5edd33bbfbe..1fa62e75d91c 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,simplecanvas)) + $(eval $(call gb_Library_add_exception_objects,simplecanvas,\ canvas/source/simplecanvas/simplecanvasimpl \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 922e5ca45dfc..53599b5555bf 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclcanvas)) + $(eval $(call gb_Library_add_exception_objects,vclcanvas,\ canvas/source/vcl/backbuffer \ canvas/source/vcl/bitmapbackbuffer \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 3baaee9b5713..d5d4ec39e4f1 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,chartcontroller)) + $(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller)) $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 6ca04479fad0..429416d6a955 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,chartcore)) + $(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore)) # view pieces ... diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index bdea302bb619..e6abcf5f55bf 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Executable_use_libraries,climaker,\ ) \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,climaker)) + $(eval $(call gb_Executable_add_exception_objects,climaker,\ cli_ure/source/climaker/climaker_app \ cli_ure/source/climaker/climaker_emit \ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index 39ef5ca79b34..d80af92de302 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -50,10 +50,7 @@ $(eval $(call gb_Library_add_defs,clucene,\ $(LFS_CFLAGS) \ )) -# clucene does not depend on sal nor needs uwinapi here -$(eval $(call gb_Library_use_libraries,clucene,\ - $(filter-out uwinapi,$(gb_STDLIBS)) \ -)) +$(eval $(call gb_Library_add_standard_system_libs,clucene)) ifeq ($(OS),LINUX) $(eval $(call gb_Library_use_libraries,clucene,\ diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index f77cf84ee57c..11592b7cc976 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,comphelper_test)) + $(eval $(call gb_CppunitTest_set_include,comphelper_test,\ -I$(SRCDIR)/comphelper/inc \ $$(INCLUDE) \ diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 71d03cc9894c..c54d59d85339 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,comphelper,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,comphelper)) + $(eval $(call gb_Library_use_sdk_api,comphelper)) $(eval $(call gb_Library_add_exception_objects,comphelper,\ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 588ddd819c86..7dd348d45562 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -73,7 +73,8 @@ $(eval $(call gb_Library_use_libraries,configmgr, \ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,configmgr)) + $(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr)) diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 4bd5d78cc247..bd24464a5331 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,ado,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ado)) + $(eval $(call gb_Library_add_exception_objects,ado,\ connectivity/source/drivers/ado/ADatabaseMetaDataImpl \ connectivity/source/drivers/ado/Aolevariant \ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index ffd3f71640fe..489542bbe743 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,calc,\ file \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,calc)) + $(eval $(call gb_Library_add_exception_objects,calc,\ connectivity/source/drivers/calc/CResultSet \ connectivity/source/drivers/calc/CStatement \ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 68f4ea449d80..14c61ec5fcd8 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,dbase,\ utl \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbase)) + $(eval $(call gb_Library_add_exception_objects,dbase,\ connectivity/source/drivers/dbase/DCode \ connectivity/source/drivers/dbase/DResultSet \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index e128c937ee41..ac008feb4bac 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbpool2)) + $(eval $(call gb_Library_add_exception_objects,dbpool2,\ connectivity/source/cpool/ZConnectionWrapper \ connectivity/source/cpool/ZDriverWrapper \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 1cce1c6e246f..74d8fea6058e 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ comphelper \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbtools)) + ifeq ($(filter-out NETBSD MACOSX,$(OS)),) $(eval $(call gb_Library_use_libraries,dbtools,\ ucbhelper \ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 78cf2d73957e..4606b8865e1d 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,evoab,\ dbtools \ file \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,evoab)) + $(eval $(call gb_Library_add_exception_objects,evoab,\ connectivity/source/drivers/evoab2/NDriver \ connectivity/source/drivers/evoab2/NTable \ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 8c21f99fed5e..c3326b4af484 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,file,\ utl \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,file)) + $(eval $(call gb_Library_add_exception_objects,file,\ connectivity/source/drivers/file/FCatalog \ connectivity/source/drivers/file/FColumns \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 601f96f06b4f..84345d803895 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,flat,\ file \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,flat)) + $(eval $(call gb_Library_add_exception_objects,flat,\ connectivity/source/drivers/flat/EResultSet \ connectivity/source/drivers/flat/EStatement \ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index 1ffd932298dd..b8b0e0f4372d 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hsqldb)) + $(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb)) $(eval $(call gb_Library_add_exception_objects,hsqldb,\ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 704f050b6755..71edd85d90d5 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ jvmfwk \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jdbc)) + $(eval $(call gb_Library_add_exception_objects,jdbc,\ connectivity/source/drivers/jdbc/Array \ connectivity/source/drivers/jdbc/Blob \ diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index 86f713d15ef9..8f2c04ee1263 100644 --- a/connectivity/Library_kab1.mk +++ b/connectivity/Library_kab1.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,kab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kab1)) + $(eval $(call gb_Library_add_exception_objects,kab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 6a0f16c427f0..097848e6e567 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,kabdrv1,\ salhelper \ dbtools \ comphelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kabdrv1)) + $(eval $(call gb_Library_add_exception_objects,kabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index 842394c40bfa..7058eb553ae6 100644 --- a/connectivity/Library_macab1.mk +++ b/connectivity/Library_macab1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,macab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macab1)) + $(eval $(call gb_Library_set_include,macab1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index 471c6c777ff3..bfb78473a161 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macabdrv1)) + $(eval $(call gb_Library_set_include,macabdrv1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index c2b95a0416db..009a3c79b01f 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -28,9 +28,10 @@ $(eval $(call gb_Library_use_libraries,mork, \ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mork)) + $(eval $(call gb_Library_use_sdk_api,mork)) $(eval $(call gb_Library_add_exception_objects,mork, \ diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index 7872b26932db..394d227ea51f 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ dbtools \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozab2)) + $(eval $(call gb_Library_add_exception_objects,mozab2,\ connectivity/source/drivers/mozab/MDriver \ connectivity/source/drivers/mozab/MServices \ diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index 0e4c541ea6c4..b7f95a811fa0 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozabdrv)) + $(eval $(call gb_Library_use_externals,mozabdrv,\ mozilla \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index 649f9907c06a..edfb4986d943 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozbootstrap)) + $(eval $(call gb_Library_add_exception_objects,mozbootstrap,\ connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap \ connectivity/source/drivers/mozab/bootstrap/MNSFolders \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 388af52f2263..71bdd14bec67 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,mysql,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mysql)) + $(eval $(call gb_Library_add_exception_objects,mysql,\ connectivity/source/drivers/mysql/YDriver \ connectivity/source/drivers/mysql/YTables \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 4b0e61baa48b..32961f472a61 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,odbc,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,odbc)) + $(eval $(call gb_Library_add_exception_objects,odbc,\ connectivity/source/drivers/odbc/oservices \ connectivity/source/drivers/odbc/ORealDriver \ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 9655773afa00..f2b2d41d5b12 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,odbcbase)) + $(eval $(call gb_Library_add_exception_objects,odbcbase,\ connectivity/source/drivers/odbcbase/OPreparedStatement \ connectivity/source/drivers/odbcbase/OStatement \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 439524882f8d..50900b1b7f66 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ shell32 \ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 7646af16ef12..60fbfc97f9f7 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc)) + $(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc)) $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 032937a81e6e..60db324099f8 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ utl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdbc2)) + $(eval $(call gb_Library_add_exception_objects,sdbc2,\ connectivity/source/manager/mdrivermanager \ connectivity/source/manager/mregistration \ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 9cc62e2433f1..8c402457d7fc 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,tdeab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tdeab1)) + $(eval $(call gb_Library_add_exception_objects,tdeab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index b2ceb087b798..40601d7cf416 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,tdeabdrv1,\ salhelper \ dbtools \ comphelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tdeabdrv1)) + $(eval $(call gb_Library_add_exception_objects,tdeabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 283ad64dda71..a37d36e0ab70 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cppcanvas)) + $(eval $(call gb_Library_add_exception_objects,cppcanvas,\ cppcanvas/source/mtfrenderer/bitmapaction \ cppcanvas/source/mtfrenderer/cachedprimitivebase \ diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index e86b99303fd4..eb7dbc43f161 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\ cppcanvas \ basegfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mtfrenderer)) + $(eval $(call gb_Library_use_sdk_api,mtfrenderer)) $(eval $(call gb_Library_add_exception_objects,mtfrenderer,\ diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk index e68cc5cd5241..af9e7ea16b48 100644 --- a/cppu/CppunitTest_cppu_checkapi.mk +++ b/cppu/CppunitTest_cppu_checkapi.mk @@ -50,7 +50,8 @@ $(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\ cppu \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 04f33de964ba..2b5f4653ee32 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_any)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index 671bd7f4eccf..dffd187d01a1 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_recursion)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index 4eef2ae78385..d2b59a27d5f9 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_reference)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index 963ace47a15b..ddc84583ff05 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_unotype)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index 41da8e269314..7472a3619da2 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_test_cppumaker)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \ cppu \ udkapi \ diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index 2103eb49b77b..644c82054e85 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,affine_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,affine_uno)) + $(eval $(call gb_Library_add_exception_objects,affine_uno,\ cppu/source/AffineBridge/AffineBridge \ )) diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index de47490923b5..4bdbb01d2565 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,cppu,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cppu)) + $(eval $(call gb_Library_add_cobjects,cppu,\ cppu/source/uno/EnvDcp \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index 04d9b7d8d588..aacb8ed73495 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,log_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,log_uno)) + $(eval $(call gb_Library_add_exception_objects,log_uno,\ cppu/source/LogBridge/LogBridge \ )) diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index 05606523a758..de60f76c5ce0 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,purpenvhelper,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,purpenvhelper)) + $(eval $(call gb_Library_add_exception_objects,purpenvhelper,\ cppu/source/helper/purpenv/helper_purpenv_Environment \ cppu/source/helper/purpenv/helper_purpenv_Mapping \ diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index afeb4cc6af22..9b3eb68418f4 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,unsafe_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unsafe_uno)) + $(eval $(call gb_Library_add_exception_objects,unsafe_uno,\ cppu/source/UnsafeBridge/UnsafeBridge \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk index 4369cfc2ea33..e5ef4b2b895c 100644 --- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk +++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk @@ -50,7 +50,8 @@ $(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\ cppuhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 726c220ff4ea..7b50f334646d 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -40,7 +40,8 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_ifcontainer)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index 2d6c943ecc30..ee832217dd03 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -36,7 +36,8 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_unourl)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index 391c13e4ac74..6dd88b393cb1 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -40,7 +40,8 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_qa_weak)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 705bd7cdc921..fcb37211671f 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cppuhelper)) + $(eval $(call gb_Library_add_cobjects,cppuhelper,\ cppuhelper/source/findsofficepath \ )) diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk index 4743fdef91ae..017a8d6332c7 100644 --- a/cpputools/Executable_regcomp.mk +++ b/cpputools/Executable_regcomp.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,regcomp)) + $(eval $(call gb_Executable_add_exception_objects,regcomp,\ cpputools/source/registercomponent/registercomponent \ )) diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk index 64892fd28696..19d507fe6a81 100644 --- a/cpputools/Executable_regsingleton.mk +++ b/cpputools/Executable_regsingleton.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,regsingleton)) + $(eval $(call gb_Executable_add_exception_objects,regsingleton,\ cpputools/source/regsingleton/regsingleton \ )) diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index 1b2a878951be..65280c0b2269 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Executable_use_libraries,uno,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,uno)) + $(eval $(call gb_Executable_use_externals,uno,\ libxml2 \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 3ed7c2508731..059044fcafc4 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -69,9 +69,10 @@ $(eval $(call gb_Library_use_libraries,cui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cui)) + $(eval $(call gb_Library_use_externals,cui,\ icuuc \ )) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 6a28adaf748f..06ac3147070c 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -69,9 +69,10 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,dbaccess_macros_test)) + $(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index fb4a0d87211a..809832fad7a3 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_sdk_api,odbcconfig)) $(eval $(call gb_Executable_use_libraries,odbcconfig,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,odbcconfig)) + $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\ dbaccess/win32/source/odbcconfig/odbcconfig \ )) diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 863bcbbaba5e..8ec7dcd47e35 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -64,9 +64,10 @@ $(eval $(call gb_Library_use_libraries,dba,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dba)) + $(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba)) $(eval $(call gb_Library_add_exception_objects,dba,\ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index 0d38f503aa85..e9db12444e8d 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbaxml)) + $(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml)) $(eval $(call gb_Library_add_exception_objects,dbaxml,\ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 89d9c0e83920..3da15cfea101 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbmm)) + $(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm)) $(eval $(call gb_Library_add_exception_objects,dbmm,\ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 7e0fe1cfaa15..579deb6618ba 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -71,9 +71,10 @@ $(eval $(call gb_Library_use_libraries,dbu,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbu)) + ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_libraries,dbu,\ ole32 \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index ee61c037f875..306b9ec99075 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdbt)) + $(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt)) $(eval $(call gb_Library_add_exception_objects,sdbt,\ diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index d75f80614d29..1c712acd537b 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\ $(eval $(call gb_Executable_use_libraries,crashrep_com,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,crashrep_com)) + $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\ desktop/win32/source/guistdio/guistdio \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index 08c413a53387..d881087c969c 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Executable_set_include,officeloader,\ $(eval $(call gb_Executable_use_libraries,officeloader,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,officeloader)) + # I'm not suer wht was the intent, but that break the link #$(eval $(call gb_Executable_set_ldflags,officeloader,\ # $(filter -bind_at_load,$$(LDFLAGS)) \ diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index a4451f3d4325..0cded218f54f 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,oosplash,\ $(eval $(call gb_Executable_use_libraries,oosplash,\ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,oosplash)) + $(eval $(call gb_Executable_add_cobjects,oosplash,\ desktop/unx/source/args \ desktop/unx/source/file_image_unx \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 8500b1decd4a..8e2bc84ad6ef 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ oleaut32 \ shell32 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,quickstart)) + ifeq ($(COM),GCC) $(eval $(call gb_Executable_use_libraries,quickstart,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 7a517aa8f06e..2da4803c9f31 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sbase,\ $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sbase)) + $(eval $(call gb_Executable_add_libs,sbase,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 7ba226e06146..9d8c906240f7 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,scalc,\ $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,scalc)) + $(eval $(call gb_Executable_add_libs,scalc,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 558b8d340a8b..37605330bfb8 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sdraw)) + $(eval $(call gb_Executable_add_libs,sdraw,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 66002ce86f4f..da674755db7e 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,simpress,\ $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,simpress)) + $(eval $(call gb_Executable_add_libs,simpress,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 3315f718b1e5..261fada2d03c 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,smath,\ $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,smath)) + $(eval $(call gb_Executable_add_libs,smath,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 126f728cea36..98271c98d55b 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ sal \ sofficeapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice.bin)) + $(eval $(call gb_Executable_add_cobjects,soffice.bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 17ac2d07cd8d..afe746dc01d9 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Executable_use_libraries,soffice,\ shell32 \ shlwapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice)) + $(eval $(call gb_Executable_use_static_libraries,soffice,\ ooopathutils \ winextendloaderenv \ diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index efddda2f1fc0..83c725701c27 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice_bin)) + $(eval $(call gb_Executable_add_cobjects,soffice_bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 1a62d5db772e..2bade4a68e1e 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sweb,\ $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sweb)) + $(eval $(call gb_Executable_add_libs,sweb,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 68047ecdac1d..2e9d22fb1e9d 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,swriter,\ $(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,swriter)) + $(eval $(call gb_Executable_add_libs,swriter,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index ab71f1d1a56d..d2ff1a3db48b 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ tl \ unopkgapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,$(desktop_UNOPKGBIN))) + $(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\ desktop/source/pkgchk/unopkg/unopkg_main \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index f5fb20e062f0..9937fdf0abe5 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,deployment,\ utl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deployment)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deployment,\ berkeleydb \ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 865add0e01a3..f81be8c52f41 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,deploymentgui,\ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 93f66de60f26..e5b179abc38d 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ utl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deploymentmisc)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deploymentmisc,\ berkeleydb \ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 3187188728af..8c803522193b 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,migrationoo2)) + $(eval $(call gb_Library_use_externals,migrationoo2,\ berkeleydb \ )) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index fd7201f4321c..41bc2c1b4a07 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,migrationoo3)) + $(eval $(call gb_Library_use_externals,migrationoo3,\ berkeleydb \ )) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 18653a3fca65..769cf5a56945 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,offacc,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,offacc)) + $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc)) $(eval $(call gb_Library_add_exception_objects,offacc,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index ea039d4a8f8a..af9f39f7d72c 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sofficeapp)) + ifeq ($(GUIBASE),cocoatouch) $(eval $(call gb_Library_add_cflags,sofficeapp,\ $(gb_OBJCFLAGS) \ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index a950d31438c1..97c0cbf67dac 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,spl,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spl)) + $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl)) $(eval $(call gb_Library_add_exception_objects,spl,\ diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index 08412d5ac192..92059c690010 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,spl_unx,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spl_unx)) + $(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash)) $(eval $(call gb_Library_add_exception_objects,spl_unx,\ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 0d6222ab0e3d..4958c6fa47ca 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unopkgapp)) + $(eval $(call gb_Library_add_exception_objects,unopkgapp,\ desktop/source/pkgchk/unopkg/unopkg_app \ desktop/source/pkgchk/unopkg/unopkg_cmdenv \ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 518fe885b45c..0b0a62cab133 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,drawinglayer)) + $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/animation/animationtiming \ drawinglayer/source/attribute/fillbitmapattribute \ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index dd15f23d33c0..7b6f08621c23 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,dnd,\ uuid \ uwinapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dnd)) + $(eval $(call gb_Library_use_static_libraries,dnd,\ dtobj \ )) diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index 307bf030d865..e6e48bebd32b 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,dtrans,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dtrans)) + $(eval $(call gb_Library_add_exception_objects,dtrans,\ dtrans/source/generic/clipboardmanager \ dtrans/source/generic/dtrans \ diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index 83d91bb76066..ae12a2bee575 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,ftransl,\ sal \ uwinapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ftransl)) + $(eval $(call gb_Library_use_static_libraries,ftransl,\ dtobj \ )) diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index 80ad2bd23525..aa112dc51705 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mcnttype)) + $(eval $(call gb_Library_add_exception_objects,mcnttype,\ dtrans/source/cnttype/mcnttfactory \ dtrans/source/cnttype/mcnttype \ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index ef358cf7c40f..698b9d605936 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,sysdtrans,\ uuid \ uwinapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sysdtrans)) + $(eval $(call gb_Library_use_static_libraries,sysdtrans,\ dtobj \ )) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 32eea423ea6c..6b513bba5388 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -53,9 +53,10 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ i18nisolang1 \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_borderline)) + $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index cc12b6df0e4a..561effdb67da 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -58,9 +58,10 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_core)) + $(eval $(call gb_CppunitTest_use_externals,editeng_core,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk index 8911f87d8cec..a61c85495baa 100644 --- a/editeng/CppunitTest_editeng_lookuptree.mk +++ b/editeng/CppunitTest_editeng_lookuptree.mk @@ -53,9 +53,10 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \ i18nisolang1 \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_lookuptree)) + $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\ icuuc \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index f65f2eb1d35b..308e7595de12 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -152,9 +152,10 @@ $(eval $(call gb_Library_use_libraries,editeng,\ i18nisolang1 \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,editeng)) + $(eval $(call gb_Library_use_external,editeng,icuuc)) # Runtime dependency for unit-tests diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index d4e57c034fa0..083166c77c1c 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,embobj,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,embobj)) + $(eval $(call gb_Library_add_exception_objects,embobj,\ embeddedobj/source/commonembedding/embedobj \ embeddedobj/source/commonembedding/inplaceobj \ diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 3b280bc8e33a..d3ca7501e8cd 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,emboleobj)) + $(eval $(call gb_Library_add_exception_objects,emboleobj,\ embeddedobj/source/msole/closepreventer \ embeddedobj/source/msole/oleembed \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 50a80d613b45..617458b94b1e 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,emser,\ sal \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,emser)) + ifeq ($(USE_DEBUG_RUNTIME),) $(eval $(call gb_Library_add_libs,emser,\ $(ATL_LIB)/atls.lib \ diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 256871f62686..122858ed9413 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ ole32 \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,inprocserv)) + ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,inprocserv,\ /EXPORT:DllCanUnloadNow \ diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index 06eb7948e832..3ea419418096 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,evtatt,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,evtatt)) + $(eval $(call gb_Library_add_exception_objects,evtatt,\ eventattacher/source/eventattacher \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index ad617f690582..766552e29396 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -40,9 +40,10 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ test \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update)) + ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\ shell32 \ diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index 708d89f5a7b6..82ac86bef87d 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -84,7 +84,8 @@ $(eval $(call gb_Library_use_libraries,abp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,abp)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index aa4e368942a4..6ba529538ad3 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,bib,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,bib)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 1f9c76917c72..caf72dc5114a 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -70,7 +70,8 @@ $(eval $(call gb_Library_use_libraries,dbp,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbp)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index 9fd561c884db..a366362cfea3 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -53,7 +53,8 @@ $(eval $(call gb_Library_use_libraries,log,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,log)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 847ba21c5604..974701566838 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,pcr,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,pcr)) + $(eval $(call gb_Library_add_exception_objects,pcr,\ extensions/source/propctrlr/MasterDetailLinkDialog \ extensions/source/propctrlr/browserline \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index e6c5f0d7e1cf..45b1b75d58b7 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -131,9 +131,10 @@ $(eval $(call gb_Library_use_libraries,pl,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,pl)) + $(eval $(call gb_Library_add_exception_objects,pl,\ extensions/source/plugin/base/context \ extensions/source/plugin/base/evtlstnr \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index cd7bc522b424..22587cc65e9c 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,res,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,res)) + $(eval $(call gb_Library_add_exception_objects,res,\ extensions/source/resource/ResourceIndexAccess \ extensions/source/resource/oooresourceloader \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 7cca92e09eed..75872b73465f 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,scn,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scn)) + $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scnserv \ extensions/source/scanner/scanner \ diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index ea8336544d78..01a54320119a 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,fileacc,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fileacc)) + $(eval $(call gb_Library_set_componentfile,fileacc,fileaccess/source/fileacc)) $(eval $(call gb_Library_add_exception_objects,fileacc,fileaccess/source/FileAccess)) diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index 20cbe8613239..a84cffa41506 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_pict_test)) + $(eval $(call gb_CppunitTest_use_api,filter_pict_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index fc05c5b68ac8..597cd2cbfa55 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tga_test)) + $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index 4da2def1178f..ce29bb29c6f8 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tiff_test)) + $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\ udkapi \ offapi \ diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index bc22022a7d9a..ad38d5eba6fd 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,svg2odf)) + $(eval $(call gb_Executable_add_exception_objects,svg2odf,\ filter/source/svg/test/svg2odf \ filter/source/svg/test/odfserializer \ diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index dc676fc1eb04..22e613952383 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,PptImporter)) + $(eval $(call gb_Library_add_exception_objects,PptImporter,\ filter/source/msfilter/powerpoint/pptimporter \ filter/source/msfilter/powerpoint/pptimporteruno \ diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index 76f996ec5a5b..68c45f9f1adb 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,egi,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,egi)) + $(eval $(call gb_Library_add_exception_objects,egi,\ filter/source/graphicfilter/egif/egif \ filter/source/graphicfilter/egif/giflzwc \ diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index fc67818d2918..aed74813581c 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,eme,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,eme)) + $(eval $(call gb_Library_add_exception_objects,eme,\ filter/source/graphicfilter/eos2met/eos2met \ )) diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index d9ab41e401d0..dabe92c4d75c 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,epb,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,epb)) + $(eval $(call gb_Library_add_exception_objects,epb,\ filter/source/graphicfilter/epbm/epbm \ )) diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index dd5aba2718e6..cf1ab1f69b65 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,epg,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,epg)) + $(eval $(call gb_Library_add_exception_objects,epg,\ filter/source/graphicfilter/epgm/epgm \ )) diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 545522dae843..9ca7ff0d0c4d 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,epp,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,epp)) + $(eval $(call gb_Library_add_exception_objects,epp,\ filter/source/graphicfilter/eppm/eppm \ )) diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index a1d80c7c8605..7ce9d29b04a4 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,eps,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,eps)) + $(eval $(call gb_Library_add_exception_objects,eps,\ filter/source/graphicfilter/eps/eps \ )) diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index 2c8f8a406742..5281662571a4 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,ept,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ept)) + $(eval $(call gb_Library_add_exception_objects,ept,\ filter/source/graphicfilter/epict/epict \ )) diff --git a/filter/Library_era.mk b/filter/Library_era.mk index 9c37c67e6b6b..b558d014c8dd 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,era,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,era)) + $(eval $(call gb_Library_add_exception_objects,era,\ filter/source/graphicfilter/eras/eras \ )) diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index e1f3eefe6b40..45c1aa1a9fd8 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,eti,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,eti)) + $(eval $(call gb_Library_add_exception_objects,eti,\ filter/source/graphicfilter/etiff/etiff \ )) diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index 8c2c06a8d136..de4e0873178c 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,exp,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,exp)) + $(eval $(call gb_Library_add_exception_objects,exp,\ filter/source/graphicfilter/expm/expm \ )) diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index b6404a177ba9..accb75de4a39 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,filterconfig)) + $(eval $(call gb_Library_add_exception_objects,filterconfig,\ filter/source/config/cache/basecontainer \ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 808f7a57172f..13843bd93578 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,flash,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,flash)) + $(eval $(call gb_Library_use_externals,flash,zlib)) $(eval $(call gb_Library_add_exception_objects,flash,\ diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index bee43bbe7ceb..ca60b884d51b 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_use_libraries,icd,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,icd)) + $(eval $(call gb_Library_add_exception_objects,icd,\ filter/source/graphicfilter/ipcd/ipcd \ )) diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 7d9241fe9e2e..614107ef2be3 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,icg,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,icg)) + $(eval $(call gb_Library_add_exception_objects,icg,\ filter/source/graphicfilter/icgm/actimpr \ filter/source/graphicfilter/icgm/bitmap \ diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index 6040d65538d2..6cd2083284b9 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,idx,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,idx)) + $(eval $(call gb_Library_add_exception_objects,idx,\ filter/source/graphicfilter/idxf/dxf2mtf \ filter/source/graphicfilter/idxf/dxfblkrd \ diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index d93303030f58..8aa08162ddb6 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ime,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ime)) + $(eval $(call gb_Library_add_exception_objects,ime,\ filter/source/graphicfilter/ios2met/ios2met \ )) diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index 813954141b66..34db6b034768 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ipb,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipb)) + $(eval $(call gb_Library_add_exception_objects,ipb,\ filter/source/graphicfilter/ipbm/ipbm \ )) diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index 6f87872d92eb..d84768c10561 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ipd,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipd)) + $(eval $(call gb_Library_add_exception_objects,ipd,\ filter/source/graphicfilter/ipsd/ipsd \ )) diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index face1d7f1fb3..01226fc530db 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ips,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ips)) + $(eval $(call gb_Library_add_exception_objects,ips,\ filter/source/graphicfilter/ieps/ieps \ )) diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index 768af3940040..f6047a0c2460 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_use_libraries,ipt,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipt)) + $(eval $(call gb_Library_add_exception_objects,ipt,\ filter/source/graphicfilter/ipict/ipict \ filter/source/graphicfilter/ipict/shape \ diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index 5cea98191964..b266f3b39879 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ipx,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipx)) + $(eval $(call gb_Library_add_exception_objects,ipx,\ filter/source/graphicfilter/ipcx/ipcx \ )) diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index 914c53e19cfd..d1f2b8a14cc1 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ira,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ira)) + $(eval $(call gb_Library_add_exception_objects,ira,\ filter/source/graphicfilter/iras/iras \ )) diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index 2a9a03e15f1f..fb7ae312fc3f 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,itg,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,itg)) + $(eval $(call gb_Library_add_exception_objects,itg,\ filter/source/graphicfilter/itga/itga \ )) diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index e736ffafe2e0..895b2cd172e7 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,iti,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,iti)) + $(eval $(call gb_Library_add_exception_objects,iti,\ filter/source/graphicfilter/itiff/ccidecom \ filter/source/graphicfilter/itiff/itiff \ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 0de501dfeb09..2061f571015e 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,msfilter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,msfilter)) + $(eval $(call gb_Library_add_exception_objects,msfilter,\ filter/source/msfilter/countryid \ filter/source/msfilter/escherex \ diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index 3df371a63c8c..b7a99a4568e8 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,odfflatxml)) + $(eval $(call gb_Library_add_exception_objects,odfflatxml,\ filter/source/odfflatxml/OdfFlatXml \ )) diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index 77be3737a741..1801ccf6086f 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,pdffilter)) + $(eval $(call gb_Library_add_exception_objects,pdffilter,\ filter/source/pdf/impdialog \ filter/source/pdf/pdfdialog \ diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index e4d6684a26c1..eee399f1b859 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,placeware,\ sal \ sax \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,placeware)) + $(eval $(call gb_Library_add_exception_objects,placeware,\ filter/source/placeware/exporter \ filter/source/placeware/filter \ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 886882cf18fe..c3b752e4d0f2 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svgfilter)) + $(eval $(call gb_Library_use_externals,svgfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,svgfilter,\ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index 082601caf7e0..b3d649db3ad2 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,t602filter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,t602filter)) + $(eval $(call gb_Library_add_exception_objects,t602filter,\ filter/source/t602/filterenv \ filter/source/t602/t602filter \ diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index 594ce61f7456..3acc160d3954 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,textfd,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textfd)) + $(eval $(call gb_Library_add_exception_objects,textfd,\ filter/source/textfilterdetect/fdcomp \ filter/source/textfilterdetect/filterdetect \ diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index acb109aee92e..5cd70bb6ab76 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlfa)) + $(eval $(call gb_Library_add_exception_objects,xmlfa,\ filter/source/xmlfilteradaptor/XmlFilterAdaptor \ filter/source/xmlfilteradaptor/genericfilter \ diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index b42e79ee2c70..99c6a8e91a62 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,xmlfd,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlfd)) + $(eval $(call gb_Library_add_exception_objects,xmlfd,\ filter/source/xmlfilterdetect/fdcomp \ filter/source/xmlfilterdetect/filterdetect \ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 805e0e71f3cb..2f87b27acfa7 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsltdlg)) + $(eval $(call gb_Library_add_exception_objects,xsltdlg,\ filter/source/xsltdialog/typedetectionexport \ filter/source/xsltdialog/typedetectionimport \ diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 293c28b0af20..3dec5645a86f 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ salhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsltfilter)) + $(eval $(call gb_Library_use_externals,xsltfilter,\ libxml2 \ libxslt \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 2b4361fde1ca..809bef707b6e 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,frm,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,frm)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,frm,\ icuin \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 4678e9f4aeda..4e392b7fa15c 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,for,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,for)) + $(eval $(call gb_Library_set_componentfile,for,formula/util/for)) $(eval $(call gb_Library_add_exception_objects,for,\ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 3090ed411160..b92cf91da298 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,forui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,forui)) + $(eval $(call gb_Library_add_exception_objects,forui,\ formula/source/ui/dlg/formula \ formula/source/ui/dlg/FormulaHelper \ diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index fdba80e5e721..c18687564d4d 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,fpicker,\ svt \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fpicker)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fpicker,\ odma_lib \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 95e315743eca..05f84ea2b1ba 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,fps,\ shell32 \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps)) + ifeq ($(COM),MSC) $(eval $(call gb_Library_add_libs,fps,\ Delayimp.lib /DELAYLOAD:shell32.dll \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index cb7e1a9e7c77..2c7665855779 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,fps_aqua,\ sal \ tl \ vcl \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_aqua)) + $(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\ fpicker/source/aqua/AquaFilePickerDelegate \ fpicker/source/aqua/CFStringUtilities \ diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index 08eff663bfac..dbb1fe382339 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_odma)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fps_odma,\ odma_lib \ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 2db54954bdeb..5582ffb076e2 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_office)) + $(eval $(call gb_Library_add_exception_objects,fps_office,\ fpicker/source/office/asyncfilepicker \ fpicker/source/office/commonpicker \ diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 3d3598c6d1c2..fcc35cc1fecc 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,fwe,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwe)) + $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/classes/actiontriggercontainer \ framework/source/fwe/classes/actiontriggerpropertyset \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index b33194267453..ac51b15602a6 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -55,9 +55,10 @@ $(eval $(call gb_Library_use_libraries,fwi,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwi)) + $(eval $(call gb_Library_add_exception_objects,fwi,\ framework/source/fwi/classes/converter \ framework/source/fwi/classes/propertysethelper \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 348812634bbf..3a4ed045cae0 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -55,9 +55,10 @@ $(eval $(call gb_Library_use_libraries,fwk,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwk)) + $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/accelerators/acceleratorcache \ framework/source/accelerators/acceleratorconfiguration \ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index f02de16d2026..45c605663651 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,fwl,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwl)) + $(eval $(call gb_Library_add_exception_objects,fwl,\ framework/source/classes/fwlresid \ framework/source/dispatch/mailtodispatcher \ diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index bd656521ea40..bc0daca7caff 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,fwm,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwm)) + $(eval $(call gb_Library_add_exception_objects,fwm,\ framework/source/dispatch/systemexec \ framework/source/jobs/helponstartup \ diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk index 3536625dbac0..b9f8c5fef6fa 100644 --- a/framework/Library_lomenubar.mk +++ b/framework/Library_lomenubar.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,lomenubar,\ cppuhelper \ comphelper \ X11 \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lomenubar)) + $(eval $(call gb_Library_add_exception_objects,lomenubar,\ framework/source/lomenubar/MenuItemInfo \ framework/source/lomenubar/AwtKeyToDbusmenuString \ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index 834c9ae1212a..f4a269873d5e 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \ test \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,hwpfilter_test_hwpfilter)) + $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\ offapi \ udkapi \ diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 612a124e7ccd..5ca70188fcf3 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,hwp,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hwp)) + $(eval $(call gb_Library_use_external,hwp,zlib)) ifeq ($(OS),WNT) diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 0fe4577ecff0..c51f0a1630ce 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_breakiterator)) + $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ i18npool/qa/cppunit/test_breakiterator \ )) diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index 9c6b549da697..086dec586d1f 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_characterclassification)) + $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\ i18npool/qa/cppunit/test_characterclassification \ )) diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk index cdb846894122..7043f320c028 100644 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk @@ -21,9 +21,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_languagetag)) + ifeq ($(ENABLE_LIBLANGTAG),YES) $(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\ liblangtag \ diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index a2ea6f51430e..ed943389e970 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_ordinalsuffix)) + $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_ordinalsuffix,\ i18npool/qa/cppunit/test_ordinalsuffix \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 5999b06466b8..82aafdb4cea0 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,gencoll_rule)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 58a3011afb16..22ea9c5d54d1 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\ $(eval $(call gb_Executable_use_libraries,genconv_dict,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,genconv_dict)) + $(eval $(call gb_Executable_add_exception_objects,genconv_dict,\ i18npool/source/textconversion/genconv_dict \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index a49f2eb4c726..38aae75eb138 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,gendict,\ $(eval $(call gb_Executable_use_libraries,gendict,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,gendict)) + $(eval $(call gb_Executable_add_exception_objects,gendict,\ i18npool/source/breakiterator/gendict \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index c1279d00964b..c6b532192466 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,genindex_data,\ $(eval $(call gb_Executable_use_libraries,genindex_data,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,genindex_data)) + ifeq ($(OS),WNT) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index eb4efdf838a7..b61799d690d1 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,saxparser)) + $(eval $(call gb_Executable_add_exception_objects,saxparser,\ i18npool/source/localedata/LocaleNode \ i18npool/source/localedata/filewriter \ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index 507a3455c9b6..a136cef873e0 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,collator_data)) $(eval $(call gb_Library_use_libraries,collator_data,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,collator_data)) + $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\ CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index 658d8334cf6c..a22555b231f5 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,dict_ja)) $(eval $(call gb_Library_use_libraries,dict_ja,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dict_ja)) + $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\ CustomTarget/i18npool/breakiterator/dict_ja \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index c21addb7f2cb..8b80f193de23 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,dict_zh)) $(eval $(call gb_Library_use_libraries,dict_zh,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dict_zh)) + $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\ CustomTarget/i18npool/breakiterator/dict_zh \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 4ff6fff4331a..422d9cde94f6 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\ $(eval $(call gb_Library_use_libraries,i18nisolang1,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nisolang1)) + $(eval $(call gb_Library_add_exception_objects,i18nisolang1,\ i18npool/source/isolang/insys \ i18npool/source/isolang/isolang \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 73d38e954cb3..81486613da42 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ i18nutil \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18npool)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,i18npool,\ icuin \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index b55f8cdfe731..828ec2ba37ca 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\ i18nregexp \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nsearch)) + $(eval $(call gb_Library_add_exception_objects,i18nsearch,\ i18npool/source/search/levdis \ i18npool/source/search/textsearch \ diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index c5bf1f4004ac..79f1cd93a64b 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,index_data)) $(eval $(call gb_Library_use_libraries,index_data,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,index_data)) + $(eval $(call gb_Library_add_generated_exception_objects,index_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\ CustomTarget/i18npool/indexentry/$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index 4cd77fc77448..a5cf7a780676 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,localedata_en)) $(eval $(call gb_Library_use_libraries,localedata_en,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_en)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\ CustomTarget/i18npool/localedata/localedata_en_AU \ CustomTarget/i18npool/localedata/localedata_en_BZ \ diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 145123225e2c..75ba17341a33 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_es)) $(eval $(call gb_Library_use_libraries,localedata_es,\ localedata_en \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_es)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\ CustomTarget/i18npool/localedata/localedata_es_AR \ CustomTarget/i18npool/localedata/localedata_es_BO \ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index c1b4569d01d9..ad3ebc679071 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_euro)) $(eval $(call gb_Library_use_libraries,localedata_euro,\ localedata_en \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_euro)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_an_ES \ CustomTarget/i18npool/localedata/localedata_ast_ES \ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index d331b8906506..b18593db55bf 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_others)) $(eval $(call gb_Library_use_libraries,localedata_others,\ localedata_en \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_others)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_af_NA \ CustomTarget/i18npool/localedata/localedata_af_ZA \ diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index e274c549e850..a568534c0a97 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_sdk_api,textconv_dict)) $(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textconv_dict)) + $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),\ CustomTarget/i18npool/textconversion/$(notdir $(basename $(txt)))) \ diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index b9cbbdcc151e..fab587956517 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,i18nutil,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nutil)) + $(eval $(call gb_Library_add_exception_objects,i18nutil,\ i18nutil/source/utility/casefolding \ i18nutil/source/utility/oneToOneMapping \ diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index bdf0aa40e124..fdde856cd925 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,svidl,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,svidl)) + $(eval $(call gb_Executable_add_exception_objects,svidl,\ idl/source/cmptools/hash \ idl/source/cmptools/lex \ diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index a07da5d58765..f00e15bed383 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,acceptor,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,acceptor)) + $(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor)) $(eval $(call gb_Library_add_exception_objects,acceptor,\ diff --git a/io/Library_connector.mk b/io/Library_connector.mk index 2bbe7257e922..826b074507c3 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,connector,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,connector)) + $(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connector)) $(eval $(call gb_Library_add_exception_objects,connector,\ diff --git a/io/Library_streams.mk b/io/Library_streams.mk index bb79154ff61a..8bf18f4db6d2 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,streams,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,streams)) + $(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams)) $(eval $(call gb_Library_add_exception_objects,streams,\ diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk index b921a206792d..80ada3ef8d17 100644 --- a/io/Library_textinstream.mk +++ b/io/Library_textinstream.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,textinstream,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textinstream)) + $(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream)) $(eval $(call gb_Library_add_exception_objects,textinstream,\ diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk index 17fe1ec591a3..b6b0ff2bf899 100644 --- a/io/Library_textoutstream.mk +++ b/io/Library_textoutstream.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,textoutstream,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textoutstream)) + $(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream)) $(eval $(call gb_Library_add_exception_objects,textoutstream,\ diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index ecacfd9978d0..dd1644f4005a 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,juh,\ $(eval $(call gb_Library_use_libraries,juh,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,juh)) + ifneq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Library_add_exception_objects,juh,\ javaunohelper/source/preload \ diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index ce8ac747934e..eeef545357b7 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,juhx,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,juhx)) + $(eval $(call gb_Library_add_exception_objects,juhx,\ javaunohelper/source/bootstrap \ javaunohelper/source/javaunohelper \ diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index eb9656737b3a..3f50e7a34a8e 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_Library,jpipe)) $(eval $(call gb_Library_use_libraries,jpipe,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jpipe)) + ifeq ($(OS),WNT) # The real library is called jpipx on Windows. We build only a wrapper diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk index c36dce20b949..14d91cb9b839 100644 --- a/jurt/Library_jpipx.mk +++ b/jurt/Library_jpipx.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,jpipx)) $(eval $(call gb_Library_use_libraries,jpipx,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jpipx)) + $(eval $(call gb_Library_add_cobjects,jpipx,\ jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \ )) diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index 2a957ee006ce..6e8578dd0147 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,jvmaccess,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jvmaccess)) + $(eval $(call gb_Library_add_exception_objects,jvmaccess,\ jvmaccess/source/classpath \ jvmaccess/source/unovirtualmachine \ diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index 177947cd0b15..aedb7dbc0b3a 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Executable_use_libraries,javaldx,\ jvmfwk \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,javaldx)) + $(eval $(call gb_Executable_add_exception_objects,javaldx,\ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index c4a459728324..73a2e6bd5e5c 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,jvmfwk,\ advapi32 \ diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 517892fa8e8e..e25d993fac2d 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sunjavaplugin)) + ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ lo-bootstrap \ diff --git a/l10ntools/Executable_ulfconv.mk b/l10ntools/Executable_ulfconv.mk index 7a92c2edd596..b981e56e2e59 100644 --- a/l10ntools/Executable_ulfconv.mk +++ b/l10ntools/Executable_ulfconv.mk @@ -12,9 +12,10 @@ $(eval $(call gb_Executable_Executable,ulfconv)) $(eval $(call gb_Executable_use_libraries,ulfconv,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,ulfconv)) + $(eval $(call gb_Executable_add_exception_objects,ulfconv,\ l10ntools/source/ulfconv/ulfconv \ )) diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index f3f37e2f7b69..57d5a65568d1 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,MacOSXSpell,\ $(eval $(call gb_Library_use_sdk_api,MacOSXSpell)) $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ - $(gb_STDLIBS) \ cppu \ cppuhelper \ lng \ @@ -48,6 +47,8 @@ $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ utl \ )) +$(eval $(call gb_Library_add_standard_system_libs,MacOSXSpell)) + $(eval $(call gb_Library_use_externals,MacOSXSpell,\ cocoa \ hunspell \ diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index bfd8ffa7a805..73bfcb648061 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,guesslang,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,guesslang)) + $(eval $(call gb_Library_use_externals,guesslang,\ libexttextcat \ )) diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index ce28dd9e9b67..ed316051e1ed 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,hyphen,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hyphen)) + $(eval $(call gb_Library_use_static_libraries,hyphen,\ ulingu \ )) diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index 96a57d04e246..98e2eeeed8db 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,lnth,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lnth)) + $(eval $(call gb_Library_use_static_libraries,lnth,\ ulingu \ )) diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index 2868b3e0d8ce..5b8d7b142d0b 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,spell,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spell)) + $(eval $(call gb_Library_use_static_libraries,spell,\ ulingu \ )) diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index 3e9900ba0f21..bf26844f67dc 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,lng,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lng)) + $(eval $(call gb_Library_use_external,lng,icuuc)) $(eval $(call gb_Library_add_exception_objects,lng,\ diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index c96fbbcf148c..6f4b3b62ff73 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,lotuswordpro_test_lotuswordpro)) + $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\ offapi \ udkapi \ diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 676446b8fe42..4620f6c819c2 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lwpft)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,lwpft,\ icuin \ diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 30de08e70d06..eed591bfdc81 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -33,9 +33,10 @@ $(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc)) $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,o3tl_tests)) + $(eval $(call gb_CppunitTest_add_exception_objects,o3tl_tests,\ o3tl/qa/cow_wrapper_clients \ o3tl/qa/test-cow_wrapper \ diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index af41d6fdceb1..47c14a001172 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -31,9 +31,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test)) $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,officecfg_cppheader_test)) + $(eval $(call gb_CppunitTest_add_exception_objects,officecfg_cppheader_test, \ officecfg/qa/cppheader \ )) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 56443e46671a..d97fa4aac2ac 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -76,9 +76,10 @@ $(eval $(call gb_Library_use_libraries,oox,\ xo \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,oox)) + $(eval $(call gb_Library_use_external,oox,openssl)) $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index a453af4a9a5b..c56a1863fa6c 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,package2,\ sax \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,package2)) + $(eval $(call gb_Library_use_externals,package2,\ zlib \ )) diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 15c2cb47dd98..498f35d0fe8b 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,xstor,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xstor)) + $(eval $(call gb_Library_add_exception_objects,xstor,\ package/source/xstor/disposelistener \ package/source/xstor/ocompinstream \ diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 3bcf1989c3bc..d699894b33fd 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Executable_use_libraries,spadmin.bin,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,spadmin.bin)) + $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ padmin/source/desktopcontext \ padmin/source/pamain \ diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 6ee2ef230ae6..1db89d5f6ce8 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,spa,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spa)) + $(eval $(call gb_Library_add_exception_objects,spa,\ padmin/source/adddlg \ diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index 1b3b73197f8f..0b3e6021d138 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,i18nregexp,\ sal \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nregexp)) + $(eval $(call gb_Library_add_exception_objects,i18nregexp,\ regexp/source/reclass \ )) diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index 2701c472dfd2..c6b1cd96fae1 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,reg,\ sal \ store \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,reg)) + $(eval $(call gb_Library_add_exception_objects,reg,\ registry/source/keyimpl \ registry/source/reflread \ diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk index d8079bac6860..cf8c0083d5c5 100644 --- a/remotebridges/Library_uuresolver.mk +++ b/remotebridges/Library_uuresolver.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,uuresolver,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,uuresolver)) + $(eval $(call gb_Library_add_exception_objects,uuresolver,\ remotebridges/source/unourl_resolver/unourl_resolver \ )) diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 300874c586d0..deb1b13bf9b6 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,rpt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,rpt)) + $(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt)) $(eval $(call gb_Library_add_exception_objects,rpt,\ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 4949dea74ea2..7e5d9f197fdf 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,rptui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,rptui)) + $(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui)) $(eval $(call gb_Library_add_exception_objects,rptui,\ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index c1ee286f9d65..b0fc1bacc198 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,rptxml,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,rptxml)) + $(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml)) $(eval $(call gb_Library_add_exception_objects,rptxml,\ diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 25af0b595ea1..3dd0feca4add 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Executable_use_libraries,rsc,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,rsc)) + $(eval $(call gb_Executable_add_grammars,rsc,\ rsc/source/parser/rscyacc \ )) diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index d2f5079723e3..fe58e255a2df 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -37,7 +37,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\ $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,Module_DLL)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk index cdb62c7e4334..222f77a7b53c 100644 --- a/sal/CppunitTest_sal_bytesequence.mk +++ b/sal/CppunitTest_sal_bytesequence.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\ $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_bytesequence)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index 8b7ca18c9339..b61a739dbe2c 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -45,7 +45,8 @@ $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk index 4c90de256844..0dad649efa4c 100644 --- a/sal/CppunitTest_sal_osl_condition.mk +++ b/sal/CppunitTest_sal_osl_condition.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_condition)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index dfd5d592f999..ea64e55daca7 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_file)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk index 199f94cc3fc1..af121a42f62e 100644 --- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk +++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfile $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_getsystempathfromfileurl)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk index 7b75f8a3e0fc..93a24b4fdd8d 100644 --- a/sal/CppunitTest_sal_osl_module.mk +++ b/sal/CppunitTest_sal_osl_module.mk @@ -38,7 +38,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_module)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk index 131761d1d078..7768b1e5ce99 100644 --- a/sal/CppunitTest_sal_osl_mutex.mk +++ b/sal/CppunitTest_sal_osl_mutex.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_mutex)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk index 3828b7784b9a..3b9040c2f519 100644 --- a/sal/CppunitTest_sal_osl_old_test_file.mk +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_old_test_file)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk index 4aa70952531b..a71937b15342 100644 --- a/sal/CppunitTest_sal_osl_pipe.mk +++ b/sal/CppunitTest_sal_osl_pipe.mk @@ -36,7 +36,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \ sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_pipe)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index 6a53add92dae..4ee7e3f6eba6 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -20,7 +20,9 @@ # For minor contributions see the git repository. # # Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +#se_libraries,sal_osl_process,\ + sal \ + $(g either the GNU General Public License Version 3 or later (the "GPLv3+"), or # the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. @@ -34,9 +36,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_process)) + # Depend on to be tested executable $(call gb_CppunitTest_get_target,sal_osl_process) : \ $(call gb_Executable_get_target,osl_process_child) diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk index 1195b7d55eb1..87d587f6632f 100644 --- a/sal/CppunitTest_sal_osl_profile.mk +++ b/sal/CppunitTest_sal_osl_profile.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_profile)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index a583b7c423dc..edb6a96ed88c 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_security)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index 6d6f8df52238..f7024cae6f07 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_setthreadname)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk index b014c83e46ba..6feb7d59b584 100644 --- a/sal/CppunitTest_sal_osl_thread.mk +++ b/sal/CppunitTest_sal_osl_thread.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_thread)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk index e6a52823b2a9..83405ab0a8b6 100644 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ b/sal/CppunitTest_sal_rtl_alloc.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_alloc)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk index 78cca6b7b39a..ce2cc1da5a19 100644 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ b/sal/CppunitTest_sal_rtl_cipher.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_cipher)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk index 1c5b6d19c71d..1a2390f5fd2e 100644 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ b/sal/CppunitTest_sal_rtl_crc32.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_crc32)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk index 9c11d796de49..e4fd8f2bf4b4 100644 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ b/sal/CppunitTest_sal_rtl_doublelock.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_doublelock)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk index 613251ef6c13..ce1f0ab9ce1c 100644 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ b/sal/CppunitTest_sal_rtl_locale.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_locale)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk index df570a552b0d..c502ab226659 100644 --- a/sal/CppunitTest_sal_rtl_math.mk +++ b/sal/CppunitTest_sal_rtl_math.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_math)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk index f0ea74c7ca97..8c38783b7a93 100644 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_ostringbuffer)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk index f2384f709cdc..bb316eeda619 100644 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk @@ -38,7 +38,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_oustringbuffer)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index bdab2fb48987..67299a3ab9d2 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -41,9 +41,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_strings)) + # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk index 69e701b794ab..67ce1eab2732 100644 --- a/sal/CppunitTest_sal_rtl_uri.mk +++ b/sal/CppunitTest_sal_rtl_uri.mk @@ -23,9 +23,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uri,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uri)) + # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk index 8be994595e1f..74ea9e057f6c 100644 --- a/sal/CppunitTest_sal_rtl_uuid.mk +++ b/sal/CppunitTest_sal_rtl_uuid.mk @@ -22,7 +22,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uuid,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uuid)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk index 7efbad135f36..fd202e2adec8 100644 --- a/sal/CppunitTest_sal_tcwf.mk +++ b/sal/CppunitTest_sal_tcwf.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\ $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_tcwf)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index 720f5ee3cf0b..942e8f318c35 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\ $(eval $(call gb_CppunitTest_use_libraries,sal_types,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_types)) + # vim: set noet sw=4 ts=4: diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index c8d8f4756222..9cf275e91476 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,cppunit/cppunittester)) + $(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit)) $(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\ diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index d43400d6d86f..3f3cce24c160 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Executable_Executable,osl_process_child)) $(eval $(call gb_Executable_use_libraries,osl_process_child,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,osl_process_child)) + $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\ sal/qa/osl/process/osl_process_child \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 653aa0bdafad..f5b3b3d4e689 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -82,9 +82,10 @@ $(eval $(call gb_Library_use_libraries,sal,\ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sal)) + ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_externals,sal,\ carbon \ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index 94f69911cebc..c50fa94ce6e4 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,sal_textenc)) $(eval $(call gb_Library_use_libraries,sal_textenc,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sal_textenc)) + $(eval $(call gb_Library_add_defs,sal_textenc,\ $(LFS_CFLAGS) \ )) diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index aa06e116f93a..c5356c9f00d0 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,uwinapi,\ user32 \ version \ ) \ - $(filter-out uwinapi,$(gb_STDLIBS)) \ )) +$(eval $(call gb_Library_add_standard_system_libs,uwinapi)) + $(eval $(call gb_Library_add_defs,uwinapi,\ $(if $(filter $(COM),GCC), \ -Wno-unused-parameter -Wno-return-type) \ diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk index 6ebc52ef5b19..fb2361db4fa4 100644 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ b/salhelper/CppunitTest_salhelper_checkapi.mk @@ -45,7 +45,8 @@ $(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,salhelper_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index 2787529cf2ae..b416cc82c589 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_add_defs,salhelper,\ $(eval $(call gb_Library_use_libraries,salhelper,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,salhelper)) + $(eval $(call gb_Library_add_exception_objects,salhelper,\ salhelper/source/condition \ salhelper/source/dynload \ diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index 0e889e2418b1..3cfa8cacfdd5 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \ comphelper \ cppu \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sax_cpputest)) + $(eval $(call gb_CppunitTest_add_exception_objects,sax_cpputest, \ sax/qa/cppunit/test_converter \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 6007467b11cc..e7028b450435 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -27,9 +27,10 @@ $(eval $(call gb_Library_use_libraries,expwrap,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,expwrap)) + $(eval $(call gb_Library_use_static_libraries,expwrap,\ sax_shared \ )) diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index b28b653e4bfd..d7465316c1c3 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,fastsax,\ sal \ sax \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fastsax)) + $(eval $(call gb_Library_use_static_libraries,fastsax,\ sax_shared \ )) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 4c72db00051b..93cd25c66e62 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -26,9 +26,10 @@ $(eval $(call gb_Library_use_libraries,sax,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sax)) + $(eval $(call gb_Library_add_defs,sax,\ -DSAX_DLLIMPLEMENTATION \ )) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index a33164371afe..b6bdef73cddb 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_annonationshapeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_annonationshapeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index c91923061d58..195dea16e5d0 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_cellrangesbase)) + $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index c7fbb6731750..4eeb3645c745 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_chart_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index b7d1fb6be404..b09b0318b1da 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_databaserangeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index f0788fb0fd6b..f8988749dbb0 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilotfieldobj)) + $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 1636112f43b0..31832f2364ab 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilottableobj)) + $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 6e5fa7076955..1826fb887bd5 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_cell)) + $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 7b47240e0138..009aa66f1fb8 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_header)) + $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index c61b4a2fbbf6..09df0f2a96b5 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -78,9 +78,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index a24f391b9c09..3fc1b7c77df6 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_macros_test)) + $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 42a48f870730..cb8f0a53cf9d 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_modelobj)) + $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index ff9ad582d92e..9d30c411f359 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 192bbbd70c08..893abdf5ea9a 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangesobj)) + $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 6933c2583da0..9bd621db1f74 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_rangelst_test)) + $(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 982ec6e4b35a..2f5dd35a7ae1 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -72,9 +72,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_subsequent_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index b72bb005305f..e526b1750618 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_tableautoformatfield)) + $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 2bacb8f2725c..0c9220419fd0 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetobj)) + $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index c7b7fcd827cf..2f9cb97fd71d 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetsobj)) + $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 3948bcfb04ec..24cc9b7e50c7 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -77,9 +77,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_ucalc)) + $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/source/core/inc \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 96cb69132a70..ed74a69202b6 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -84,9 +84,10 @@ $(eval $(call gb_Library_use_libraries,sc,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sc)) + $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/attarray \ sc/source/core/data/attrib \ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 4c39cf1f40d3..b22f0c0eaca1 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,scd,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scd)) + $(eval $(call gb_Library_add_exception_objects,scd,\ sc/source/ui/unoobj/detreg \ sc/source/ui/unoobj/scdetect \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index d38d40b97027..8a8e6fe0d183 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scfilt)) + $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 7f94c6193f5e..86f7f8c4d0f8 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,scui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scui)) + $(eval $(call gb_Library_add_exception_objects,scui,\ sc/source/ui/attrdlg/attrdlg \ sc/source/ui/attrdlg/scdlgfact \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 30eb16d059ff..e0e71a0da812 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -59,9 +59,10 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaobj)) + $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/excelvbahelper \ sc/source/ui/vba/service \ diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index e1fe08c217b5..78b7bea0676c 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,analysis,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,analysis)) + $(eval $(call gb_Library_add_exception_objects,analysis,\ scaddins/source/analysis/analysis \ scaddins/source/analysis/analysishelper \ diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index f224c80f7a8a..d5db83125da3 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,date,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,date)) + $(eval $(call gb_Library_add_exception_objects,date,\ scaddins/source/datefunc/datefunc \ )) diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 42a4fa3d72e8..013855cbd344 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,solver,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,solver)) + $(eval $(call gb_Library_use_external,solver,lpsolve55)) $(eval $(call gb_Library_add_exception_objects,solver,\ diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index 5debc0acd8e5..8941931b7ee4 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,basprov,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basprov)) + $(eval $(call gb_Library_add_exception_objects,basprov,\ scripting/source/basprov/baslibnode \ scripting/source/basprov/basmethnode \ diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index c9e3b2140e94..6ffb4fe0d029 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dlgprov)) + $(eval $(call gb_Library_add_exception_objects,dlgprov,\ scripting/source/dlgprov/DialogModelProvider \ scripting/source/dlgprov/dlgevtatt \ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index d99f60fd4fe1..a9ca47acfd26 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\ sfx \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,protocolhandler)) + $(eval $(call gb_Library_add_exception_objects,protocolhandler,\ scripting/source/protocolhandler/scripthandler \ )) diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 86d6a05bc894..025c5952cd8d 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\ tl \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scriptframe)) + $(eval $(call gb_Library_add_exception_objects,scriptframe,\ scripting/source/provider/ActiveMSPList \ scripting/source/provider/BrowseNodeFactoryImpl \ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index eeb11a1c8668..3ec938c4cb52 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,stringresource,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,stringresource)) + $(eval $(call gb_Library_add_exception_objects,stringresource,\ scripting/source/stringresource/stringresource \ )) diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index 45c35ff163ac..e469d786e4e0 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\ sb \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaevents)) + $(eval $(call gb_Library_add_exception_objects,vbaevents,\ scripting/source/vbaevents/eventhelper \ scripting/source/vbaevents/service \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 99a19042cb21..1d9f6fb297ce 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -71,9 +71,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index e0a5000359de..85ea7eb91f1b 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 5209b6445001..70f742949bc4 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -72,9 +72,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress)) + ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ ws2_32 \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index b0535d506bbd..3ac73b8f0857 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -104,9 +104,10 @@ $(eval $(call gb_Library_use_libraries,sd,\ vcl \ xmlsecurity \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sd)) + $(eval $(call gb_Library_use_externals,sd,\ libxml2 \ dbus \ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index 404ea819e63a..c668637a588c 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,sdd,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdd)) + $(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd)) $(eval $(call gb_Library_add_exception_objects,sdd,\ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 2402116a33e2..b0b0d967731e 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdfilt)) + $(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt)) $(eval $(call gb_Library_add_exception_objects,sdfilt,\ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 7fcf0b01bae2..7949f732e34e 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -65,9 +65,10 @@ $(eval $(call gb_Library_use_libraries,sdui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdui)) + $(eval $(call gb_Library_add_exception_objects,sdui,\ sd/source/filter/html/htmlattr \ sd/source/filter/html/pubdlg \ diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index 1ea6bc6c22f1..8d40f2431493 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -54,9 +54,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\ test \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sdext_pdfimport)) + $(eval $(call gb_CppunitTest_use_static_libraries,sdext_pdfimport,\ pdfimport_s \ )) diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 6c1d68d8c189..81706c523065 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -29,9 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ sal \ sfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sfx2_metadatable)) + $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ $$(INCLUDE) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 12c1812a96b4..22925b03f315 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ vcl \ sfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,qstart_gtk)) + $(eval $(call gb_Library_use_externals,qstart_gtk,\ gio \ gtk \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 5e01c7d01f70..23badc19286e 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,sfx,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sfx)) + $(eval $(call gb_Library_use_external,sfx,libxml2)) $(eval $(call gb_Library_add_exception_objects,sfx,\ diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index 9ed4dd0f01e8..b32ba7e89b97 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,lngconvex)) + $(eval $(call gb_Executable_add_exception_objects,lngconvex,\ shell/source/tools/lngconvex/cmdline \ shell/source/tools/lngconvex/lngconvex \ diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 0ae262bee72c..58c13032f883 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cmdmail)) + $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) $(eval $(call gb_Library_add_exception_objects,cmdmail,\ diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index fbc05a0e318c..28a0e8760ab0 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,desktopbe1)) + $(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1)) $(eval $(call gb_Library_add_exception_objects,desktopbe1,\ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index 5e513237caba..d2deb022d20d 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,gconfbe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gconfbe1)) + $(eval $(call gb_Library_set_componentfile,gconfbe1,shell/source/backends/gconfbe/gconfbe1)) $(eval $(call gb_Library_add_exception_objects,gconfbe1,\ diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index c31fb68afea8..c20863655d9f 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,kde4be1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kde4be1)) + $(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1)) $(eval $(call gb_Library_add_exception_objects,kde4be1,\ diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index a367c8d62bf8..8637341d6ff0 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,kdebe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kdebe1)) + $(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1)) $(eval $(call gb_Library_add_exception_objects,kdebe1,\ diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 008a00481008..96022b731a24 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localebe1)) + $(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1)) $(eval $(call gb_Library_add_exception_objects,localebe1,\ diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 9057373a51a4..236cc6ce6e0a 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,macbe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macbe1)) + $(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1)) $(eval $(call gb_Library_add_objcxxobjects,macbe1,\ diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index c6c25e89a5b2..c95b2d1ee343 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -47,9 +47,10 @@ endif $(eval $(call gb_Library_use_libraries,recentfile,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,recentfile)) + $(eval $(call gb_Library_use_static_libraries,recentfile,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index 252aa827d7c4..e16e957b7986 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,syssh,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,syssh)) + $(eval $(call gb_Library_use_static_libraries,syssh,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index 481728a3c4a8..b6ba2b4333fa 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,syssh,\ sal \ shell32 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,syssh)) + $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh)) $(eval $(call gb_Library_add_exception_objects,syssh,\ diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index a6ca92b2e391..a9472456af73 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,tdebe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tdebe1)) + $(eval $(call gb_Library_set_componentfile,tdebe1,shell/source/backends/kdebe/tdebe1)) $(eval $(call gb_Library_add_exception_objects,tdebe1,\ diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk index d02c6cc5027b..c2dbd1341e30 100644 --- a/shell/Library_wininetbe.mk +++ b/shell/Library_wininetbe.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,wininetbe1)) + $(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1)) $(eval $(call gb_Library_add_exception_objects,wininetbe1,\ diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 42be84b0d0f6..133ae060e6fa 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -67,9 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,slideshow)) + $(eval $(call gb_CppunitTest_add_exception_objects,slideshow,\ slideshow/test/slidetest \ slideshow/test/testshape \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 86d14c4b3106..3ed481ed774f 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,demoshow)) + $(eval $(call gb_Executable_add_exception_objects,demoshow,\ slideshow/test/demoshow \ )) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 199699fd24cd..380f935d9e0e 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ sal \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,OGLTrans)) + $(eval $(call gb_Library_use_external,OGLTrans,mesa_headers)) $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans)) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 22b6f5d6bfd6..d065532a696c 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,slideshow)) + $(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow)) $(eval $(call gb_Library_add_exception_objects,slideshow,\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 5de9b9320c25..ee844de24330 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -341,6 +341,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ + add_standard_system_libs \ use_sdk_api \ use_udk_api \ use_internal_api \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index db901f079512..1ddedfdad41b 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -105,6 +105,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ + add_standard_system_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 01ee922935ae..10ca542b58c5 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -185,6 +185,7 @@ $(eval $(foreach method,\ set_ldflags \ set_x64 \ add_libs \ + add_standard_system_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 8dddeb390402..5b953005ef24 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -648,6 +648,13 @@ define gb_LinkTarget_add_libs $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) endef +# add platform specific standard libraries to linker command for linktarget $(1) +# there are currently 94 Libraries/Executables/CppunitTests not using +# gb_STDLIBS... probably this should need to be added explicitly +define gb_LinkTarget_add_standard_system_libs +$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(gb_STDLIBS) +endef + define gb_LinkTarget_add_api $$(call gb_Output_error,\ gb_LinkTarget_add_api: use gb_LinkTarget_use_api instead.) diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk index acebb04da5e6..50267d307251 100644 --- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk @@ -29,7 +29,7 @@ gb_CPUDEFS := -DX86 gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_STDLIBS := pthread +gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk index 5eaa617bd6b3..34f35a36f7fd 100644 --- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk @@ -28,7 +28,7 @@ #please make generic modifications to unxgcc.mk gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_STDLIBS := pthread +gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index a59782c6dd75..d2e53537d2e9 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -107,9 +107,9 @@ gb_LinkTarget_LDFLAGS += -shared-libgcc endif gb_STDLIBS := \ - mingwthrd \ - mingw32 \ - mingwex \ + -lmingwthrd \ + -lmingw32 \ + -lmingwex \ # LinkTarget class diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 9deca874330a..739427e65659 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -188,7 +188,7 @@ gb_CXXFLAGS := \ -Zm500 \ gb_STDLIBS := \ - advapi32 \ + advapi32.lib \ ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) gb_CFLAGS_WERROR := -WX -DLIBO_WERROR diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index cb071aee1865..f32fcc5bcb3e 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -9,7 +9,7 @@ # Link almost everything with -lgnustl_shared gb_STDLIBS := \ - gnustl_shared + -lgnustl_shared \ gb_Library_PLAINLIBS_NONE := \ android \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 6c77d71247f0..be54115de350 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -237,9 +237,9 @@ gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) gb_STDLIBS := \ - m \ - nsl \ - socket \ + -lm \ + -lnsl \ + -lsocket \ gb_Library_PLAINLIBS_NONE += \ dl \ diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index da79a6556c8b..0941434cf7f0 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ tl \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sot_test_sot)) + $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ offapi \ udkapi \ diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 50a80db23884..c11af837e39f 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,sot,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sot)) + $(eval $(call gb_Library_add_exception_objects,sot,\ sot/source/unoolestorage/xolesimplestorage \ sot/source/unoolestorage/register \ diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 892af74daa71..df89cdb9dd9d 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -61,9 +61,10 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,starmath_qa_cppunit)) + $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ starmath/qa/cppunit/test_nodetotextvisitors \ starmath/qa/cppunit/test_starmath \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 2ecb8d8e7ed3..554b49ce16e0 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,sm,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sm)) + $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/accessibility \ starmath/source/action \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 3ab12ab75593..0837c2db16f3 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,smd,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,smd)) + $(eval $(call gb_Library_add_exception_objects,smd,\ starmath/source/detreg \ starmath/source/smdetect \ diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index e1ef1806ae64..46d72b7633d9 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,bootstrap)) + $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap)) $(eval $(call gb_Library_add_exception_objects,bootstrap,\ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index 2f2f07d4c926..a1e058c86304 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,introspection,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,introspection)) + $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection)) $(eval $(call gb_Library_add_exception_objects,introspection,\ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 38dd68b657f0..7fe31573d480 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,invocadapt)) + $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt)) $(eval $(call gb_Library_add_exception_objects,invocadapt,\ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index df8d3c78d468..b2544c77372b 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,invocation,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,invocation)) + $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation)) $(eval $(call gb_Library_add_exception_objects,invocation,\ diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index e0ff05a968df..2303d92c0195 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,javaloader)) + $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader)) $(eval $(call gb_Library_add_exception_objects,javaloader,\ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index d8b5b464f44e..a0fc87853263 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,javavm,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,javavm)) + $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm)) $(eval $(call gb_Library_add_exception_objects,javavm,\ diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index 124bfaa3055c..ed115ed30c42 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,namingservice)) + $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice)) $(eval $(call gb_Library_add_exception_objects,namingservice,\ diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index cf87b477597d..8eb08e55265d 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,proxyfac)) + $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac)) $(eval $(call gb_Library_add_exception_objects,proxyfac,\ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index 644f9f28f1b3..aa5198a84bdd 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,reflection,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,reflection)) + $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection)) $(eval $(call gb_Library_add_exception_objects,reflection,\ diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 8f4ec53dd618..2a8b7b8f31e5 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,stocservices)) + $(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices)) $(eval $(call gb_Library_add_exception_objects,stocservices,\ diff --git a/store/Library_store.mk b/store/Library_store.mk index 39029be71fe5..43d81da71f0a 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_add_defs,store,\ $(eval $(call gb_Library_use_libraries,store,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,store)) + $(eval $(call gb_Library_add_exception_objects,store,\ store/source/object \ store/source/lockbyte \ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index c356f403a56b..791f2716e659 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -40,9 +40,10 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ salhelper \ svl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_lngmisc)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ oleaut32 \ diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index b0cbcd0e6a35..ef2f3f040ce5 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_urihelper)) + $(eval $(call gb_CppunitTest_use_ure,svl_urihelper)) diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 86c00f45418f..558dc60d7eac 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,fsstorage,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fsstorage)) + $(eval $(call gb_Library_add_exception_objects,fsstorage,\ svl/source/fsstor/fsfactory \ svl/source/fsstor/fsstorage \ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 1b89ea3ed3da..a7c9886d925e 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,passwordcontainer,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,passwordcontainer)) + $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ svl/source/passwordcontainer/passwordcontainer \ svl/source/passwordcontainer/syscreds \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 8f7940d2b76b..46af0f9970ca 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,svl,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svl)) + $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/config/asiancfg \ svl/source/config/cjkoptions \ diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index 65b4e1bea3ab..aff901c79df6 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,svtools_filters_test)) + $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\ udkapi \ offapi \ diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index f8fee180d891..e837abd32d58 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Executable_use_libraries,bmp,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bmp)) + $(eval $(call gb_Executable_add_exception_objects,bmp,\ svtools/bmpmaker/bmp \ svtools/bmpmaker/bmpcore \ diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index a00b928bd39a..7ae8dbf46dd3 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Executable_use_libraries,bmpsum,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bmpsum)) + $(eval $(call gb_Executable_add_exception_objects,bmpsum,\ svtools/bmpmaker/bmpsum \ )) diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index 0936abd454cf..3dace37d6c7f 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Executable_use_libraries,g2g,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,g2g)) + $(eval $(call gb_Executable_add_exception_objects,g2g,\ svtools/bmpmaker/g2g \ )) diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index 532b78bbecb6..704e51b636ee 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,langsupport)) + $(eval $(call gb_Executable_add_exception_objects,langsupport,\ svtools/langsupport/langsupport \ )) diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index 1c7cb22309d7..1827cb1ae389 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hatchwindowfactory)) + $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ svtools/source/hatchwindow/documentcloser \ svtools/source/hatchwindow/hatchwindow \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 7a2379b8c2cd..1f40a65b5001 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,svt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svt)) + $(eval $(call gb_Library_use_externals,svt,\ icuuc \ jpeg \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 11aad40f4d46..696212b9d6c7 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ vcl \ svxcore \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,$(svx_GENGALBIN))) + $(eval $(call gb_Executable_add_exception_objects,$(svx_GENGALBIN),\ svx/source/gengal/gengal \ )) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index a939a086a82a..796aa222aac1 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,svx,\ xo \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svx)) + $(eval $(call gb_Library_use_external,svx,icuuc)) $(eval $(call gb_Library_add_exception_objects,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index f94e359aa6a6..929c8cf49ae6 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -83,9 +83,10 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svxcore)) + $(eval $(call gb_Library_use_external,svxcore,icuuc)) $(eval $(call gb_Library_add_exception_objects,svxcore,\ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 9b2fdff4b386..13a11c1c1937 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textconversiondlgs)) + $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ svx/source/unodialogs/textconversiondlgs/services \ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 47d7a35e3075..53d990751bb5 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -56,9 +56,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 080bd6aeb1d7..ccbe8cd678ce 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -67,9 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_layout_test)) + $(eval $(call gb_CppunitTest_set_include,sw_layout_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index e42eb0c9276b..30915f2ae77f 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_macros_test)) + $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index 538542b37ef7..69c10d366a67 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sw_regression_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 10e7ab20769f..03af297f98d9 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfexport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index aceaa697b7e6..7d52f510aed5 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \ vcl \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfimport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index 5a9587948a21..1523e5ca4f52 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlexport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index 8fc2dfedecaa..30d793c32c76 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \ sw \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlimport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index 1609b6f41ffc..e9c721ec5611 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ utl \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfexport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 7ce087e36e40..6e9339e37a18 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \ vcl \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfimport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index 9f4677b5b29e..35a6af3814ce 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \ sw \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8export)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index 16c36843407a..f4bf71c30725 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \ unotest \ sw \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8import)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 8b53bdf32009..268a620e9161 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_swdoc_test)) + $(eval $(call gb_CppunitTest_use_externals,sw_swdoc_test,\ icuuc \ libxml2 \ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 365c69096b96..f1f3a8c7a9b6 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,msword,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,msword)) + $(eval $(call gb_Library_use_externals,msword,\ icuuc \ libxml2 \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index b58f71a72b3e..5dd22de249c2 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -77,9 +77,10 @@ $(eval $(call gb_Library_use_libraries,sw,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sw)) + $(eval $(call gb_Library_use_externals,sw,\ icuuc \ libxml2 \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 73f5fb857781..780b069f4bfd 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,swd,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,swd)) + $(eval $(call gb_Library_add_exception_objects,swd,\ sw/source/filter/basflt/iodetect \ sw/source/ui/uno/detreg \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 4de06513c59a..040717b7900a 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,swui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,swui)) + $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/chrdlg/break \ sw/source/ui/chrdlg/chardlg \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index 310a90f4dbff..aeed2a85a0ff 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -64,9 +64,10 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaswobj)) + $(eval $(call gb_Library_use_externals,vbaswobj,\ libxml2 \ )) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 1eca2f36e502..886702d022d7 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,subsequenttest)) + ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,subsequenttest) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/test/Library_test.mk b/test/Library_test.mk index e730c8b944fa..61579bf8d0a3 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,test,\ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,test)) + ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,test) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 0388f3cb62bd..20f97124e355 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,tk,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tk)) + $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/asynccallback \ toolkit/source/awt/stylesettings \ diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index ba876eab4a8c..6fce0cdcbf4a 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -47,9 +47,10 @@ $(eval $(call gb_CppunitTest_use_libraries,tools_test, \ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,tools_test)) + $(eval $(call gb_CppunitTest_use_static_libraries,tools_test, \ ooopathutils \ )) diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk index a30b5e5e0fe2..5fae14f4f6e4 100644 --- a/tools/Executable_bestreversemap.mk +++ b/tools/Executable_bestreversemap.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Executable_set_include,bestreversemap,\ $(eval $(call gb_Executable_use_libraries,bestreversemap,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bestreversemap)) + $(eval $(call gb_Executable_add_exception_objects,bestreversemap,\ tools/source/reversemap/bestreversemap \ )) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index e97405bec6dc..c92e01296759 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Executable_use_libraries,mkunroll,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,mkunroll)) + $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ tools/bootstrp/mkunroll/mkunroll \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 12635cd3a7b5..b408da57beb4 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,rscdep)) + $(eval $(call gb_Executable_use_sdk_api,rscdep)) $(eval $(call gb_Executable_add_exception_objects,rscdep,\ diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index 260607035582..c7cfd90e695a 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -29,10 +29,11 @@ $(eval $(call gb_Executable_use_libraries,so_checksum,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial +$(eval $(call gb_Executable_add_standard_system_libs,so_checksum)) + $(eval $(call gb_Executable_add_exception_objects,so_checksum,\ tools/bootstrp/md5 \ tools/bootstrp/so_checksum \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index b588874d04ca..3981bac35735 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,tl,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tl)) + $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/datetime/datetime \ diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk index fda47419328f..261d305f3ffe 100644 --- a/touch/Library_libotouch.mk +++ b/touch/Library_libotouch.mk @@ -20,9 +20,10 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,libotouch,\ )) $(eval $(call gb_Library_use_libraries,libotouch,\ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,libotouch)) + $(eval $(call gb_Library_add_exception_objects,libotouch,\ touch/source/uno/Document \ touch/source/generic/libotouch \ diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk index 1a54526c9872..728067ddb4c3 100644 --- a/tubes/CppunitTest_tubes_test.mk +++ b/tubes/CppunitTest_tubes_test.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,tubes_test, \ tubes \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,tubes_test)) + $(eval $(call gb_CppunitTest_use_externals,tubes_test,\ telepathy \ )) diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index b077841a25d6..fd1d2a1685a7 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,tubes,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tubes)) + $(eval $(call gb_Library_use_externals,tubes,\ gtk \ telepathy \ diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index 93ac31c15548..e5f4b858179e 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,cached1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cached1)) + $(eval $(call gb_Library_add_exception_objects,cached1,\ ucb/source/cacher/cachedcontentresultset \ ucb/source/cacher/cachedcontentresultsetstub \ diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index c349e1cec703..38a48be65839 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,srtrs1)) + $(eval $(call gb_Library_add_exception_objects,srtrs1,\ ucb/source/sorter/sortdynres \ ucb/source/sorter/sortmain \ diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 109cf2a55be6..5b04efbc31b7 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucb1)) + $(eval $(call gb_Library_add_exception_objects,ucb1,\ ucb/source/core/cmdenv \ ucb/source/core/identify \ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index d7fac5b45f89..6d3a61a37174 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ ucbhelper \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpcmis1)) + $(eval $(call gb_Library_use_externals,ucpcmis1,\ cmis \ curl \ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 3f8e2f42cb0e..e0b9801e2672 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpdav1)) + $(eval $(call gb_Library_use_externals,ucpdav1,\ libxml2 \ neon \ diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index dda77b3e430a..ade70cf4b568 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpexpand1)) + $(eval $(call gb_Library_add_exception_objects,ucpexpand1,\ ucb/source/ucp/expand/ucpexpand \ )) diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index eb436aee0a6c..4a1de1b2460f 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpext)) + $(eval $(call gb_Library_add_exception_objects,ucpext,\ ucb/source/ucp/ext/ucpext_content \ ucb/source/ucp/ext/ucpext_datasupplier \ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index 4f729b1dec08..532e5802de59 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpfile1)) + $(eval $(call gb_Library_add_exception_objects,ucpfile1,\ ucb/source/ucp/file/bc \ ucb/source/ucp/file/filcmd \ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index 8b197d56b72c..aa37b20a71af 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpftp1)) + $(eval $(call gb_Library_use_externals,ucpftp1,\ curl \ zlib \ diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk index d986f2c3737c..e863fc7602fe 100644 --- a/ucb/Library_ucpgio1.mk +++ b/ucb/Library_ucpgio1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,ucpgio1,\ sal \ salhelper \ ucbhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpgio1)) + $(eval $(call gb_Library_use_externals,ucpgio1,\ gio \ )) diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk index 577b65d6eec1..42f0dc663741 100644 --- a/ucb/Library_ucpgvfs1.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,ucpgvfs1,\ sal \ salhelper \ ucbhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpgvfs1)) + $(eval $(call gb_Library_add_exception_objects,ucpgvfs1,\ ucb/source/ucp/gvfs/gvfs_content \ ucb/source/ucp/gvfs/gvfs_directory \ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 9d33231e23fa..4f4325bc5b20 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucphier1)) + $(eval $(call gb_Library_add_exception_objects,ucphier1,\ ucb/source/ucp/hierarchy/dynamicresultset \ ucb/source/ucp/hierarchy/hierarchycontentcaps \ diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index e67f9aa84660..d11376325a3a 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpodma1)) + $(eval $(call gb_Library_use_static_libraries,ucpodma1,\ odma_lib \ )) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index f1212d0f629a..40983cf0b43b 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucppkg1)) + $(eval $(call gb_Library_add_exception_objects,ucppkg1,\ ucb/source/ucp/package/pkgcontentcaps \ ucb/source/ucp/package/pkgcontent \ diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index 97c18b33505b..9138ca2af3eb 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucptdoc1)) + $(eval $(call gb_Library_add_exception_objects,ucptdoc1,\ ucb/source/ucp/tdoc/tdoc_contentcaps \ ucb/source/ucp/tdoc/tdoc_content \ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index f394025ac0f8..d6e32e8effbd 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -19,9 +19,10 @@ $(eval $(call gb_Library_use_libraries,ucbhelper,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucbhelper)) + $(eval $(call gb_Library_add_defs,ucbhelper,\ -DUCBHELPER_DLLIMPLEMENTATION \ )) diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 4fba9a027607..1da0fd52ccb1 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unobootstrapprotector)) + $(eval $(call gb_Library_use_externals,unobootstrapprotector,\ cppunit \ )) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index f7d50c76a9b7..ca5f9c064242 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unoexceptionprotector)) + $(eval $(call gb_Library_use_externals,unoexceptionprotector,\ cppunit \ )) diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 809968835707..3c851a3cee54 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,unotest,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unotest)) + $(eval $(call gb_Library_use_externals,unotest,\ cppunit \ )) diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 0b7eef7b73fb..ef33f7f5c48f 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,utl,\ tl \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,utl)) + # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,utl,\ diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index f9395a83d160..bc8aef2e2f3f 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,unordf,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unordf)) + $(eval $(call gb_Library_use_externals,unordf,librdf)) $(eval $(call gb_Library_use_externals,unordf,libxslt)) $(eval $(call gb_Library_use_externals,unordf,libxml2)) diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 3dccdccaec18..8d47855670e7 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,unoxml,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unoxml)) + $(eval $(call gb_Library_use_external,unoxml,libxml2)) $(eval $(call gb_Library_add_exception_objects,unoxml,\ diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index e9030b96fe6e..797f8eaf0512 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,uui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,uui)) + $(eval $(call gb_Library_add_exception_objects,uui,\ uui/source/alreadyopen \ uui/source/filechanged \ diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 9a5493c12cb8..e8c009b3e59f 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,msforms,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,msforms)) + # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,msforms,\ diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 8bbe47457870..06a146904a5c 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,vbahelper,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbahelper)) + # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,vbahelper,\ diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk index 9e185e155544..c0adf2735b6f 100644 --- a/vcl/Executable_kdefilepicker.mk +++ b/vcl/Executable_kdefilepicker.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Executable_add_defs,kdefilepicker,\ $(eval $(call gb_Executable_use_libraries,kdefilepicker,\ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,kdefilepicker)) + $(eval $(call gb_Executable_add_libs,kdefilepicker,\ $(KDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk index a92bb5ede1cb..7458f4197b2c 100644 --- a/vcl/Executable_tdefilepicker.mk +++ b/vcl/Executable_tdefilepicker.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Executable_set_include,tdefilepicker,\ $(eval $(call gb_Executable_use_libraries,tdefilepicker,\ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,tdefilepicker)) + $(eval $(call gb_Executable_add_libs,tdefilepicker,\ $(TDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 91438e9c2d54..af8578988c34 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -59,9 +59,10 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,desktop_detector)) + $(eval $(call gb_Library_use_externals,desktop_detector,\ icule \ icuuc \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index df68439c72c1..a7ee6ca8e3d9 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -85,9 +85,10 @@ $(eval $(call gb_Library_use_libraries,vcl,\ sal \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vcl)) + ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_libraries,vcl,\ objc \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 88e997b0c7a8..0261c036465b 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_gen)) + $(eval $(call gb_Library_use_externals,vclplug_gen,\ cairo \ icule \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 4684aa18f474..2d3b46eaa686 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk)) + $(eval $(call gb_Library_use_externals,vclplug_gtk,\ dbus \ gtk \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 187773c6b719..138904a0a004 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -73,9 +73,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk3)) + $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ )) diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 5f405cc6f47a..7aa5ee5e230b 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -62,9 +62,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde)) + $(eval $(call gb_Library_use_externals,vclplug_kde,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 057ea274354a..3fbb80319a80 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde4)) + $(eval $(call gb_Library_use_externals,vclplug_kde4,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index f859b1ef4104..63c9d725af73 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ jvmaccess \ cppu \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_svp)) + $(eval $(call gb_Library_use_externals,vclplug_svp,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index b698cb45552f..5e61c6315d7a 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -67,9 +67,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_tde)) + $(eval $(call gb_Library_use_externals,vclplug_tde,\ icule \ icuuc \ diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index cf48c49851cf..b5b8e7e928b8 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -38,9 +38,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ sal \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_doctok)) + $(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\ $$(INCLUDE) \ -I$(SRCDIR)/writerfilter/inc \ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 78f2a008abc6..a50d72151a30 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ vcl \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_rtftok)) + $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\ offapi \ udkapi \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 83006badc658..5429ea7af4c6 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -81,9 +81,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,writerfilter)) + $(eval $(call gb_Library_use_external,writerfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter,\ diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index d7a72fc4c0c8..bc0bd83c9205 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ sal \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,writerfilter_uno)) + $(eval $(call gb_Library_use_external,writerfilter_uno,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\ diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 412b0c982430..38e961df7ebf 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\ utl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,wpftdraw)) + $(eval $(call gb_Library_use_static_libraries,wpftdraw,\ writerperfect \ )) diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index a4295a5019b6..3752308b6fa3 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ utl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,wpftwriter)) + $(eval $(call gb_Library_use_static_libraries,wpftwriter,\ writerperfect \ )) diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk index 878e9e20fe53..9704b7642b3e 100644 --- a/xml2cmp/Executable_xml2cmp.mk +++ b/xml2cmp/Executable_xml2cmp.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\ xml2cmp/source/xcd/dependy \ )) -#uwinapi is part of STDLIBS on windows, but it is created in sal, which -#depends on this module. -$(eval $(call gb_Executable_use_libraries,xml2cmp,\ - $(filter-out uwinapi,$(gb_STDLIBS)) \ -)) +$(eval $(call gb_Executable_add_standard_system_libs,xml2cmp)) + +# vim: set noet sw=4 ts=4: diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 73be015cb824..d51a29352829 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,xo,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xo)) + $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/chart/ColorPropertySet \ xmloff/source/chart/PropertyMaps \ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 15e65da4c325..e1870a4d6029 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,xof,\ sax \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xof)) + $(eval $(call gb_Library_add_exception_objects,xof,\ xmloff/source/transform/ChartOASISTContext \ xmloff/source/transform/ChartOOoTContext \ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index 7035278e9c44..b3cd8f704aff 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -38,10 +38,11 @@ $(eval $(call gb_Library_use_libraries,xmlreader,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) # cppu is only needed due to the cppumaker -C hack +$(eval $(call gb_Library_add_standard_system_libs,xmlreader)) + $(eval $(call gb_Library_add_exception_objects,xmlreader,\ xmlreader/source/pad \ xmlreader/source/span \ diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index 3f83379ba8b3..00353edc75e2 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -24,9 +24,10 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlscript)) + $(eval $(call gb_Library_set_include,xmlscript,\ -I$(SRCDIR)/xmlscript/source/inc \ $$(INCLUDE) \ diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 7501f23cc110..201b8bf540cb 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ test \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,xmlsecurity_qa_certext)) + $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_qa_certext,\ xmlsecurity/qa/certext/SanCertExt \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 09766bc188f4..3333e21f5fce 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlsecurity)) + $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ xmlsecurity/source/component/certificatecontainer \ xmlsecurity/source/component/documentdigitalsignatures \ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 99b393f532de..1aea707bcb5e 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsec_fw)) + $(eval $(call gb_Library_add_exception_objects,xsec_fw,\ xmlsecurity/source/framework/buffernode \ xmlsecurity/source/framework/decryptorimpl \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 5195db72d41a..41cbfafcaad1 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ tl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsec_xmlsec)) + $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ )) -- cgit From 5b166c5cc860aecc26c656cddf513d042850a58c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 18:27:10 +0200 Subject: gbuild: remove libraries handled by RepositoryExternal.mk Change-Id: I159b7942cfa26f81ada421403835ff0f1e4b09ef --- solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 -- solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 - solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 -- solenv/gbuild/platform/solaris.mk | 2 -- solenv/gbuild/platform/unxgcc.mk | 2 -- 5 files changed, 9 deletions(-) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index daef8275892c..491d0cb9bb0d 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -211,10 +211,8 @@ gb_Library__FRAMEWORKS := \ gb_Library_PLAINLIBS_NONE += \ objc \ - jpeg \ m \ pthread \ - z \ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index d2e53537d2e9..c6e351493911 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -228,7 +228,6 @@ gb_Library_PLAINLIBS_NONE += \ ddraw \ gdi32 \ gdiplus \ - gnu_getopt \ imm32 \ kernel32 \ jawt \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 739427e65659..8680c2e63d43 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -414,11 +414,9 @@ gb_Library_PLAINLIBS_NONE += \ delayimp \ gdi32 \ gdiplus \ - gnu_getopt \ imm32\ kernel32 \ jawt \ - ldap \ libcmt \ libcmtd \ mpr \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index be54115de350..1975a15ac2a0 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -243,8 +243,6 @@ gb_STDLIBS := \ gb_Library_PLAINLIBS_NONE += \ dl \ - fontconfig \ - freetype \ GL \ GLU \ ICE \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0e18a741e248..aca89d933099 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -241,8 +241,6 @@ gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) gb_Library_PLAINLIBS_NONE += \ dl \ - fontconfig \ - freetype \ GL \ GLU \ ICE \ -- cgit From 35811f025fd68bf19f3a9fdfdbd47f31458c846f Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 21:45:47 +0200 Subject: gbuild: clean up usage of weird x11_extensions module etc. Move libraries using those headers to RepositoryExternal.mk and also move pkg-config invocation to configure. Change-Id: I17a240fcba83a98f3f248f15b34d245f941c62e2 --- RepositoryExternal.mk | 62 +++++++++++++++++++++++++++++++++++++++ canvas/Library_cairocanvas.mk | 6 +++- config_host.mk.in | 2 ++ configure.in | 3 ++ solenv/gbuild/platform/solaris.mk | 1 - solenv/gbuild/platform/unxgcc.mk | 1 - vcl/Library_vcl.mk | 7 +---- vcl/Library_vclplug_gen.mk | 23 ++++----------- 8 files changed, 78 insertions(+), 27 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 05880d958992..d653b208dba2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1940,6 +1940,68 @@ endef endif # SYSTEM_LIBORCUS + +### X11 stuff ### + +ifeq ($(GUIBASE),unx) + +# TODO: do we really need these X11 headers in the repo? +ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),) + +define gb_LinkTarget__use_x11extensions +$(call gb_LinkTarget_use_packages,$(1),\ + x11_extensions_inc \ +) +endef + +else # !X11_EXTENSIONS + +gb_LinkTarget__use_x11extensions := + +endif # X11_EXTENSIONS + +ifeq ($(XRANDR_DLOPEN),FALSE) + +define gb_LinkTarget__use_Xrandr +$(call gb_LinkTarget__use_x11extensions,$(1)) + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(XRANDR_CFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(XRANDR_LIBS) \ +) +endef + +else # XRANDR_DLOPEN + +define gb_LinkTarget__use_Xrandr +$(call gb_LinkTarget__use_x11extensions,$(1)) + +$(call gb_LinkTarget_add_defs,$(1),\ + -DXRANDR_DLOPEN \ +) +endef + +endif # XRANDR_DLOPEN + +define gb_LinkTarget__use_Xrender +$(call gb_LinkTarget__use_x11extensions,$(1)) + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(XRENDER_CFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(XRENDER_LIBS) \ +) +endef + +endif # GUIBASE=unx + # MacOSX-only frameworks ############################################ # (in alphabetical order) diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 85ea94cda4ed..a30333a3069f 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -91,7 +91,9 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_textlayout \ )) -$(eval $(call gb_Library_use_external,cairocanvas,cairo)) +$(eval $(call gb_Library_use_externals,cairocanvas,\ + cairo \ +)) ifeq ($(OS),WNT) @@ -116,6 +118,8 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ # freetype? fontconfig? -> test on Solaris $(eval $(call gb_Library_use_libraries,cairocanvas,\ X11 \ +)) +$(eval $(call gb_Library_use_externals,cairocanvas,\ Xrender \ )) endif diff --git a/config_host.mk.in b/config_host.mk.in index 81890c69a363..231009810aa1 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -654,5 +654,7 @@ export XMLLINT=@XMLLINT@ export XRANDR_CFLAGS=@XRANDR_CFLAGS@ export XRANDR_DLOPEN=@XRANDR_DLOPEN@ export XRANDR_LIBS=@XRANDR_LIBS@ +export XRENDER_CFLAGS=@XRENDER_CFLAGS@ +export XRENDER_LIBS=@XRENDER_LIBS@ export XSLTML_TARBALL=@XSLTML_TARBALL@ export XSLTPROC=@XSLTPROC@ diff --git a/configure.in b/configure.in index 17b13c61bf05..c1abd8aa2ddb 100644 --- a/configure.in +++ b/configure.in @@ -8535,6 +8535,7 @@ dnl =================================================================== AC_MSG_CHECKING([whether to use Xrender]) if test "$WANT_X11" = "yes" -a "$test_xrender" = "yes"; then AC_MSG_RESULT([yes]) + PKG_CHECK_MODULES(XRENDER, xrender) AC_CHECK_LIB([Xrender], [XRenderQueryVersion], [:], [AC_MSG_ERROR(libXrender not found or functional)], []) AC_MSG_CHECKING([which Xrender headers to use]) @@ -8548,6 +8549,8 @@ if test "$WANT_X11" = "yes" -a "$test_xrender" = "yes"; then else AC_MSG_RESULT([no]) fi +AC_SUBST(XRENDER_CFLAGS) +AC_SUBST(XRENDER_LIBS) dnl =================================================================== dnl Check for XRandr diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 1975a15ac2a0..ba4b4ab005c4 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -254,7 +254,6 @@ gb_Library_PLAINLIBS_NONE += \ ICE \ X11 \ Xext \ - Xrender \ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index aca89d933099..4946cf29d55e 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -250,7 +250,6 @@ gb_Library_PLAINLIBS_NONE += \ ICE \ X11 \ Xext \ - Xrender \ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index a7ee6ca8e3d9..ce6d41e4a107 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -44,12 +44,6 @@ endif $(eval $(call gb_Library_use_package,vcl,vcl_inc)) -ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),) -$(eval $(call gb_Library_use_packages,vclplug_gen,\ - x11_extensions_inc \ -)) -endif - $(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager)) $(eval $(call gb_Library_set_include,vcl,\ @@ -526,6 +520,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ dbus \ fontconfig \ freetype \ + x11extensions \ )) endif diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 0261c036465b..46c5f522820c 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -61,6 +61,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\ cairo \ icule \ icuuc \ + Xrender \ )) $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ @@ -111,23 +112,13 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\ ## handle RandR ifneq ($(ENABLE_RANDR),) -$(eval $(call gb_Library_add_defs,vclplug_gen,\ - -DUSE_RANDR \ -)) -ifeq ($(XRANDR_DLOPEN),FALSE) -$(eval $(call gb_Library_set_include,vclplug_gen,\ - $$(INCLUDE) \ - $$(XRANDR_CFLAGS) \ -)) -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - $(XRANDR_LIBS) \ +$(eval $(call gb_Library_use_externals,vclplug_gen,\ + Xrandr \ )) -else $(eval $(call gb_Library_add_defs,vclplug_gen,\ - -DXRANDR_DLOPEN \ + -DUSE_RANDR \ )) endif -endif $(eval $(call gb_Library_add_defs,vclplug_gen,\ $(if $(VALGRIND_CFLAGS), \ @@ -172,11 +163,6 @@ endif endif endif -## handle Render linking -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - $(shell pkg-config --libs xrender) \ -)) - ifeq ($(OS),LINUX) $(eval $(call gb_Library_use_libraries,vclplug_gen,\ dl \ @@ -184,4 +170,5 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ pthread \ )) endif + # vim: set noet sw=4 ts=4: -- cgit From 4ad9285d302ee820d9ab1ea759497423ae9ec022 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 22:54:29 +0200 Subject: vcl: clean up that Xinerama linkage... ... odd duplication apparently due to wrong conversion from dmakefile. Change-Id: I9a9e183373ec43fb0b1eadc2c233ce659bebd107 --- vcl/Library_vclplug_gen.mk | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 46c5f522820c..d9a9d236944c 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -129,8 +129,8 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\ ## handle Xinerama ifneq ($(USE_XINERAMA),NO) -ifneq ($(OS),SOLARIS) -# not Solaris +ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun) +# not Solaris/Xsun $(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XORG \ )) @@ -143,25 +143,12 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ )) endif -else -# Solaris +else # Solaris/Xsun $(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XSUN \ )) -ifeq ($(USE_XINERAMA_VERSION),Xorg) -# Solaris, Xorg -ifeq ($(XINERAMA_LINK),dynamic) -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - -lXinerama \ -)) -else -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ -)) -endif -endif -endif endif +endif # USE_XINERAMA ifeq ($(OS),LINUX) $(eval $(call gb_Library_use_libraries,vclplug_gen,\ -- cgit From ecddbecedccf2bf67e569544854c6fbd1269dd88 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 00:18:12 +0200 Subject: gbuild: clean up Mac OS X framework handling: There are currently 3 different mechanisms being used for frameworks, which is of course intolerable so we invent a 4th one and standardize on it: gb_LinkTarget_use_darwin_frameworks (This doesn't mean using add_libs or externals was wrong, it was just inconsistent... and i don't see an obvious benefit of using externals here) Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d --- Library_merged.mk | 18 +++--- RepositoryExternal.mk | 90 ------------------------------ apple_remote/Library_AppleRemote.mk | 17 ++---- avmedia/Library_avmediaQuickTime.mk | 8 +-- canvas/Library_cairocanvas.mk | 4 +- connectivity/Library_macabdrv1.mk | 6 +- extensions/Library_OOoSpotlightImporter.mk | 8 +-- extensions/Library_pl.mk | 8 +-- fpicker/Library_fps_aqua.mk | 6 +- lingucomponent/Library_MacOSXSpell.mk | 5 +- sal/Library_sal.mk | 6 +- sfx2/Library_sfx.mk | 6 +- shell/Library_localebe.mk | 6 +- shell/Library_macbe.mk | 6 +- slideshow/Library_OGLTrans.mk | 2 +- solenv/gbuild/CppunitTest.mk | 1 + solenv/gbuild/Executable.mk | 1 + solenv/gbuild/Library.mk | 1 + solenv/gbuild/platform/IOS_ARM_GCC.mk | 16 ++---- solenv/gbuild/platform/macosx.mk | 20 ++----- vcl/Library_vcl.mk | 20 +++---- 21 files changed, 77 insertions(+), 178 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 8914e598e5fc..847e5474e576 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -131,12 +131,12 @@ $(eval $(call gb_Library_use_libraries,merged,\ AppleRemote \ objc \ )) -$(eval $(call gb_Library_use_externals,merged,\ - carbon \ - cocoa \ - corefoundation \ - coreservices \ - quicktime \ +$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ + Carbon \ + Cocoa \ + CoreFoundation \ + CoreServices \ + QuickTime \ )) endif @@ -162,9 +162,9 @@ $(eval $(call gb_Library_use_externals,merged,\ endif ifeq ($(OS),IOS) -$(eval $(call gb_Library_use_externals,merged,\ - corefoundation \ - uikit \ +$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ + CoreFoundation \ + UIKit \ )) endif diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d653b208dba2..2f79d77ec35d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2002,96 +2002,6 @@ endef endif # GUIBASE=unx -# MacOSX-only frameworks ############################################ -# (in alphabetical order) - -define gb_LinkTarget__use_carbon -$(call gb_LinkTarget_add_libs,$(1), \ - -framework Carbon \ -) - -endef - -define gb_LinkTarget__use_cocoa -$(call gb_LinkTarget_add_libs,$(1), \ - -framework Cocoa \ -) - -endef - -define gb_LinkTarget__use_iokit -$(call gb_LinkTarget_add_libs,$(1), \ - -framework IOKit \ -) - -endef - -define gb_LinkTarget__use_qtkit -$(call gb_LinkTarget_add_libs,$(1), \ - -framework QTKit \ -) - -endef - -define gb_LinkTarget__use_quicktime -$(call gb_LinkTarget_add_libs,$(1), \ - -framework QuickTime \ -) - -endef - -# Common MacOSX and iOS frameworks - -define gb_LinkTarget__use_corefoundation -$(call gb_LinkTarget_add_libs,$(1), \ - -framework CoreFoundation \ -) - -endef - -define gb_LinkTarget__use_coregraphics -$(call gb_Library_add_libs,$(1), \ - -framework CoreGraphics \ -) - -endef - -define gb_LinkTarget__use_coreservices -$(call gb_Library_add_libs,$(1), \ - -framework CoreServices \ -) - -endef - -define gb_LinkTarget__use_coretext -$(call gb_Library_add_libs,$(1), \ - -framework CoreText \ -) - -endef - -define gb_LinkTarget__use_foundation -$(call gb_LinkTarget_add_libs,$(1), \ - -framework Foundation \ -) - -endef - -define gb_LinkTarget__use_systemconfiguration -$(call gb_LinkTarget_add_libs,$(1), \ - -framework SystemConfiguration \ -) - -endef - -# iOS-only frameworks - -define gb_LinkTarget__use_uikit -$(call gb_LinkTarget_add_libs,$(1), \ - -framework UIKit \ -) - -endef ifeq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/apple_remote/Library_AppleRemote.mk b/apple_remote/Library_AppleRemote.mk index 37a19282e043..c5fdbef72b08 100644 --- a/apple_remote/Library_AppleRemote.mk +++ b/apple_remote/Library_AppleRemote.mk @@ -1,4 +1,3 @@ - # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- # # Version: MPL 1.1 / GPLv3+ / LGPLv3+ @@ -33,16 +32,10 @@ $(eval $(call gb_Library_use_package,AppleRemote,\ apple_remote_inc \ )) -$(eval $(call gb_Library_use_externals,AppleRemote,\ - cocoa \ - carbon \ - iokit \ -)) - -$(eval $(call gb_Library_add_libs,AppleRemote,\ - -framework Cocoa \ - -framework Carbon \ - -framework IOKit \ +$(eval $(call gb_Library_use_system_darwin_frameworks,AppleRemote,\ + Cocoa \ + Carbon \ + IOKit \ )) $(eval $(call gb_Library_add_objcobjects,AppleRemote,\ @@ -55,3 +48,5 @@ $(eval $(call gb_Library_add_objcobjects,AppleRemote,\ apple_remote/source/MultiClickRemoteBehavior \ apple_remote/source/RemoteMainController \ )) + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 1daa4aafbe10..7906a37c9665 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -49,10 +49,10 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ $(eval $(call gb_Library_add_standard_system_libs,avmediaQuickTime)) -$(eval $(call gb_Library_use_externals,avmediaQuickTime,\ - cocoa \ - qtkit \ - quicktime \ +$(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\ + Cocoa \ + QTKit \ + QuickTime \ )) $(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index a30333a3069f..1bfb26f86c8c 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -43,8 +43,8 @@ $(eval $(call gb_Library_add_cxxflags,cairocanvas,\ $(gb_OBJCXXFLAGS) \ )) -$(eval $(call gb_Library_add_libs,cairocanvas,\ - -framework Cocoa \ +$(eval $(call gb_Library_use_system_darwin_frameworks,cairocanvas,\ + Cocoa \ )) endif diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index bfb78473a161..feb754356a51 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -29,9 +29,9 @@ $(eval $(call gb_Library_Library,macabdrv1)) $(eval $(call gb_Library_use_sdk_api,macabdrv1)) -$(eval $(call gb_Library_add_libs,macabdrv1,\ - -framework Carbon \ - -framework AddressBook \ +$(eval $(call gb_Library_use_system_darwin_frameworks,macabdrv1,\ + Carbon \ + AddressBook \ )) $(eval $(call gb_Library_use_libraries,macabdrv1,\ diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk index 112c7a6bbbed..ef48cb3253fe 100644 --- a/extensions/Library_OOoSpotlightImporter.mk +++ b/extensions/Library_OOoSpotlightImporter.mk @@ -38,10 +38,10 @@ $(eval $(call gb_Library_add_objcobjects,OOoSpotlightImporter,\ extensions/source/macosx/spotlight/main \ )) -$(eval $(call gb_Library_add_ldflags,OOoSpotlightImporter,\ - -framework CoreFoundation \ - -framework Foundation \ - -framework CoreServices \ +$(eval $(call gb_Library_use_system_darwin_frameworks,OOoSpotlightImporter,\ + CoreFoundation \ + Foundation \ + CoreServices \ )) $(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib)) diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 45b1b75d58b7..34b147320771 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -84,10 +84,10 @@ $(eval $(call gb_Library_add_objcxxobjects,pl,\ extensions/source/plugin/aqua/sysplug \ )) -$(eval $(call gb_Library_use_externals,pl,\ - cocoa \ - carbon \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,pl,\ + Cocoa \ + Carbon \ + CoreFoundation \ )) else # GUIBASE!=aqua diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index 2c7665855779..1f1d3e4f2fd9 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -35,9 +35,9 @@ $(eval $(call gb_Library_use_packages,fps_aqua,\ $(eval $(call gb_Library_use_sdk_api,fps_aqua)) -$(eval $(call gb_Library_add_libs,fps_aqua,\ - -framework Cocoa \ - -framework CoreFoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,fps_aqua,\ + Cocoa \ + CoreFoundation \ )) $(eval $(call gb_Library_use_libraries,fps_aqua,\ diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index 57d5a65568d1..b2bcd1952396 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -49,8 +49,11 @@ $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ $(eval $(call gb_Library_add_standard_system_libs,MacOSXSpell)) +$(eval $(call gb_Library_use_system_darwin_frameworks,MacOSXSpell,\ + Cocoa \ +)) + $(eval $(call gb_Library_use_externals,MacOSXSpell,\ - cocoa \ hunspell \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index f5b3b3d4e689..c42728ff9ac1 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -87,9 +87,9 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(eval $(call gb_Library_add_standard_system_libs,sal)) ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_externals,sal,\ - carbon \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,sal,\ + Carbon \ + CoreFoundation \ )) endif diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 23badc19286e..c384a1b98046 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -280,8 +280,10 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_objcxxobjects,sfx,\ sfx2/source/appl/shutdowniconaqua \ )) -$(eval $(call gb_Library_use_libraries,sfx,\ - objc \ +$(eval $(call gb_Library_add_libs,sfx,\ + -lobjc \ +)) +$(eval $(call gb_Library_use_system_darwin_frameworks,sfx,\ Cocoa \ )) endif diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 96022b731a24..0cefa0b8908f 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,localebe1)) $(eval $(call gb_Library_use_sdk_api,localebe1)) ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_externals,localebe1,\ - corefoundation \ - coreservices \ +$(eval $(call gb_Library_use_system_darwin_frameworks,localebe1,\ + CoreFoundation \ + CoreServices \ )) endif diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 236cc6ce6e0a..6746fc0bffb8 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -29,9 +29,9 @@ $(eval $(call gb_Library_Library,macbe1)) $(eval $(call gb_Library_use_sdk_api,macbe1)) -$(eval $(call gb_Library_use_externals,macbe1,\ - cocoa \ - systemconfiguration \ +$(eval $(call gb_Library_use_system_darwin_frameworks,macbe1,\ + Cocoa \ + SystemConfiguration \ )) $(eval $(call gb_Library_use_libraries,macbe1,\ diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 380f935d9e0e..c3c2b6d768c0 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -74,7 +74,7 @@ $(eval $(call gb_Library_add_objcxxobjects,OGLTrans,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) -$(eval $(call gb_Library_use_libraries,OGLTrans,\ +$(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\ Cocoa \ GLUT \ OpenGL \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index ee844de24330..02af2fbda472 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -342,6 +342,7 @@ $(eval $(foreach method,\ set_ldflags \ add_libs \ add_standard_system_libs \ + use_system_darwin_frameworks \ use_sdk_api \ use_udk_api \ use_internal_api \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 1ddedfdad41b..243e3cda7b24 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -106,6 +106,7 @@ $(eval $(foreach method,\ set_ldflags \ add_libs \ add_standard_system_libs \ + use_system_darwin_frameworks \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 10ca542b58c5..131806f8d273 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -186,6 +186,7 @@ $(eval $(foreach method,\ set_x64 \ add_libs \ add_standard_system_libs \ + use_system_darwin_frameworks \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 491d0cb9bb0d..a36d6a36182d 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -136,11 +136,9 @@ gb_LinkTarget_OBJCXXFLAGS += -g gb_LinkTarget_OBJCFLAGS += -g endif -# FIXME framework handling very hackish define gb_LinkTarget__get_liblinkflags -$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS) $(gb_Library_UNOLIBS_OOO),$(1)),$(call gb_Library_get_filename,$(lib)))) \ -$(foreach lib,$(filter $(gb_Library_UNOLIBS_OOO),$(1)),$(SOLARVER)/$(INPATH)/lib/$(lib)$(gb_Library_UNOEXT)) \ -$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1))) +$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library_UNOLIBS_OOO),$(1)),$(call gb_Library_get_filename,$(lib)))) \ +$(foreach lib,$(filter $(gb_Library_UNOLIBS_OOO),$(1)),$(SOLARVER)/$(INPATH)/lib/$(lib)$(gb_Library_UNOEXT)) endef define gb_LinkTarget__get_layer @@ -190,6 +188,10 @@ $(call gb_Output_announce,$(2),$(true),LNK,4) $(call gb_LinkTarget__command_staticlink,$(1)) endef +define gb_LinkTarget_use_system_darwin_frameworks +$(call gb_LinkTarget_add_libs,$(1),$(foreach fw,$(2),-framework $(fw))) +endef + # Library class @@ -203,12 +205,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library__FRAMEWORKS := \ - Foundation \ - CoreFoundation \ - CoreGraphics \ - CoreText \ - gb_Library_PLAINLIBS_NONE += \ objc \ m \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 8317c40f9f06..17e7aab47ccb 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -168,12 +168,6 @@ gb_LinkTarget_OBJCFLAGS += -g gb_LinkTarget_OBJCXXFLAGS += -g endif -# FIXME framework handling very hackish -define gb_LinkTarget__get_liblinkflags -$(patsubst lib%.dylib,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \ -$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1))) -endef - define gb_LinkTarget__get_layer $(if $(filter Executable,$(1)),\ $$(call gb_Executable_get_layer,$(2)),\ @@ -201,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ - $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ + $(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ @@ -246,6 +240,10 @@ $(if $(filter Library Bundle CppunitTest Executable,$(TARGETTYPE)),$(call gb_Lin $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1))) endef +define gb_LinkTarget_use_system_darwin_frameworks +$(call gb_LinkTarget_add_libs,$(1),$(foreach fw,$(2),-framework $(fw))) +endef + # Library class @@ -261,16 +259,8 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library__FRAMEWORKS := \ - Cocoa \ - GLUT \ - OpenGL \ - gb_Library_PLAINLIBS_NONE += \ - GLUT \ - Cocoa \ objc \ - OpenGL \ m \ pthread \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ce6d41e4a107..194ef1c4bdd0 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -362,8 +362,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/aqua/source/gdi/coretext/salgdi \ )) -$(eval $(call gb_Library_use_externals,vcl,\ - coretext \ +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + CoreText \ )) else # ATSUI @@ -443,11 +443,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ $(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) -$(eval $(call gb_Library_use_externals,vcl,\ - $(if $(filter 64,$(BITNESS_OVERRIDE)),,quicktime) \ - cocoa \ - carbon \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + $(if $(filter 64,$(BITNESS_OVERRIDE)),,QuickTime) \ + Cocoa \ + Carbon \ + CoreFoundation \ )) $(eval $(call gb_Library_use_libraries,vcl,\ @@ -610,9 +610,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/ios/source/window/salmenu \ vcl/ios/source/window/salobj \ )) -$(eval $(call gb_Library_use_externals,vcl,\ - uikit \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + UIKit \ + CoreFoundation \ )) endif -- cgit From 654a5c7b30991aa8b1ff342d02beeba8165913f3 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 00:54:49 +0200 Subject: gbuild: gb_Library_PLAINLIBS_NONE cleanup for Mac Change-Id: I66f8229e186e312ed3242695db9ef0768ab4d9a0 --- Library_merged.mk | 12 +++++++----- RepositoryExternal.mk | 4 ++-- clucene/Library_clucene.mk | 8 ++++---- padmin/Executable_spadmin.bin.mk | 4 ++-- padmin/Library_spa.mk | 6 +++--- sal/Library_sal.mk | 13 ++++++++----- solenv/gbuild/platform/IOS_ARM_GCC.mk | 5 ----- solenv/gbuild/platform/macosx.mk | 5 ----- svx/Executable_gengal.bin.mk | 6 +++--- vcl/Library_desktop_detector.mk | 9 +++++---- vcl/Library_vcl.mk | 12 ++++++------ vcl/Library_vclplug_gen.mk | 8 ++++---- vcl/Library_vclplug_gtk.mk | 9 +++++---- vcl/Library_vclplug_gtk3.mk | 9 +++++---- vcl/Library_vclplug_kde.mk | 9 +++++---- vcl/Library_vclplug_kde4.mk | 9 +++++---- vcl/Library_vclplug_svp.mk | 9 +++++---- vcl/Library_vclplug_tde.mk | 9 +++++---- 18 files changed, 74 insertions(+), 72 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 847e5474e576..6a2a9ecbdbb9 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -99,10 +99,10 @@ $(eval $(call gb_Library_use_externals,merged,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,merged,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,merged,\ + -lm \ + -ldl \ + -lpthread \ )) endif @@ -129,7 +129,9 @@ endif ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_libraries,merged,\ AppleRemote \ - objc \ +)) +$(eval $(call gb_Library_add_libs,merged,\ + -lobjc \ )) $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ Carbon \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2f79d77ec35d..2da039709050 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1464,8 +1464,8 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ) ifeq ($(OS),MACOSX) -$(call gb_LinkTarget_use_libraries,$(1),\ - objc \ +$(call gb_LinkTarget_add_libs,$(1),\ + -lobjc \ ) else ifeq ($(OS),WNT) $(call gb_LinkTarget_use_libraries,$(1),\ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index d80af92de302..77ac8ef48606 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -53,10 +53,10 @@ $(eval $(call gb_Library_add_defs,clucene,\ $(eval $(call gb_Library_add_standard_system_libs,clucene)) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,clucene,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,clucene,\ + -lm \ + -ldl \ + -lpthread \ )) endif diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index d699894b33fd..2450e9889a52 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -51,8 +51,8 @@ $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ )) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ - pthread \ +$(eval $(call gb_Executable_add_libs,spadmin.bin,\ + -lpthread \ )) endif diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 1db89d5f6ce8..42bb40dd7b48 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -53,9 +53,9 @@ $(eval $(call gb_Library_add_exception_objects,spa,\ )) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_use_libraries,spa,\ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,spa,\ + -lm \ + -lpthread \ )) endif diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index c42728ff9ac1..1d6f75431cca 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -57,11 +57,6 @@ $(eval $(call gb_Library_add_defs,sal,\ )) $(eval $(call gb_Library_use_libraries,sal,\ - $(if $(filter $(GUI),UNX), \ - $(if $(filter $(OS),ANDROID),, \ - pthread \ - ) \ - ) \ $(if $(filter $(OS),LINUX), \ dl \ ) \ @@ -84,6 +79,14 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_add_libs,sal,\ + $(if $(filter $(GUI),UNX), \ + $(if $(filter $(OS),ANDROID),, \ + -lpthread \ + ) \ + ) \ +)) + $(eval $(call gb_Library_add_standard_system_libs,sal)) ifeq ($(OS),MACOSX) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index a36d6a36182d..21301fa95e84 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -205,11 +205,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library_PLAINLIBS_NONE += \ - objc \ - m \ - pthread \ - gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 17e7aab47ccb..f1b6666cc482 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -259,11 +259,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library_PLAINLIBS_NONE += \ - objc \ - m \ - pthread \ - gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 696212b9d6c7..b679787d856f 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -81,9 +81,9 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ - dl \ - pthread \ +$(eval $(call gb_Executable_add_libs,$(svx_GENGALBIN),\ + -ldl \ + -lpthread \ )) endif diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index af8578988c34..a155c3e0d281 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -73,10 +73,11 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,desktop_detector,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,desktop_detector,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 194ef1c4bdd0..341439ab23fe 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -84,8 +84,8 @@ $(eval $(call gb_Library_use_libraries,vcl,\ $(eval $(call gb_Library_add_standard_system_libs,vcl)) ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_libraries,vcl,\ - objc \ +$(eval $(call gb_Library_add_libs,vcl,\ + -lobjc \ )) endif @@ -666,10 +666,10 @@ endif endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vcl,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vcl,\ + -lm \ + -ldl \ + -lpthread \ )) endif diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index d9a9d236944c..67a440b18e54 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -151,10 +151,10 @@ endif endif # USE_XINERAMA ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_gen,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ + -lm \ + -ldl \ + -lpthread \ )) endif diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 2d3b46eaa686..42ea2a485495 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -111,10 +111,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_gtk,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_gtk,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 138904a0a004..b906fcf64bd5 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -115,10 +115,11 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_gtk3,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_gtk3,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 7aa5ee5e230b..bfcf782345b4 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -83,10 +83,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ $(eval $(call gb_Library_set_warnings_not_errors,vclplug_kde)) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_kde,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_kde,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 3fbb80319a80..9fd110fc506b 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -83,10 +83,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_kde4,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_kde4,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 63c9d725af73..750342c3225b 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -78,10 +78,11 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_svp,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_svp,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_svp,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index 5e61c6315d7a..a55b8dd8025a 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -92,10 +92,11 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_tde,\ $(eval $(call gb_Library_set_warnings_not_errors,vclplug_tde)) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_tde,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_tde,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: -- cgit From c9a74445152980bc5d3976b885b1302df5266b6b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 00:58:46 +0200 Subject: gbuild: gb_Library_PLAINLIBS_NONE cleanup for android Change-Id: I0b99b6effb57bcd9ab5687f8896940620986b785 --- solenv/gbuild/platform/android.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index f32fcc5bcb3e..58e7029f9851 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -11,10 +11,6 @@ gb_STDLIBS := \ -lgnustl_shared \ -gb_Library_PLAINLIBS_NONE := \ - android \ - gnustl_shared \ - # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : -- cgit From 578e195cf3120508422a317cc7fac870ae0a3a7f Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 12:25:50 +0200 Subject: gbuild: gb_Library_PLAINLIBS_NONE cleanup for unxgcc/solaris Change-Id: Ia7f64bdd0fd81c5dcc08d828db4602b65e2da949 --- RepositoryExternal.mk | 6 +++--- bridges/Library_gcc3_aix_powerpc.mk | 5 ++++- bridges/Library_gcc3_ios_arm.mk | 5 ++++- bridges/Library_gcc3_linux_alpha.mk | 5 ++++- bridges/Library_gcc3_linux_arm.mk | 9 ++++++--- bridges/Library_gcc3_linux_hppa.mk | 5 ++++- bridges/Library_gcc3_linux_ia64.mk | 5 ++++- bridges/Library_gcc3_linux_intel.mk | 9 ++++++--- bridges/Library_gcc3_linux_m68k.mk | 5 ++++- bridges/Library_gcc3_linux_mips.mk | 9 ++++++--- bridges/Library_gcc3_linux_powerpc.mk | 5 ++++- bridges/Library_gcc3_linux_powerpc64.mk | 5 ++++- bridges/Library_gcc3_linux_s390.mk | 5 ++++- bridges/Library_gcc3_linux_s390x.mk | 5 ++++- bridges/Library_gcc3_linux_sparc.mk | 5 ++++- bridges/Library_gcc3_linux_x86-64.mk | 5 ++++- bridges/Library_gcc3_solaris_intel.mk | 5 ++++- bridges/Library_gcc3_solaris_sparc.mk | 5 ++++- canvas/Library_cairocanvas.mk | 4 ++-- extensions/Executable_nsplugin.mk | 17 ++++++++++------- extensions/Library_scn.mk | 4 ++-- framework/Library_lomenubar.mk | 5 ++++- neon/Library_neon.mk | 4 ++-- padmin/Executable_spadmin.bin.mk | 4 ++-- padmin/Library_spa.mk | 4 ++-- pyuno/Library_pyuno_wrapper.mk | 4 ++-- sal/Library_sal.mk | 14 +++++++------- shell/Executable_gnome_open_url.mk | 4 ++-- slideshow/Library_OGLTrans.mk | 8 ++++---- solenv/gbuild/platform/solaris.mk | 14 -------------- solenv/gbuild/platform/unxgcc.mk | 12 ------------ toolkit/Library_tk.mk | 4 ++-- ucb/Library_ucpdav1.mk | 8 ++++---- vcl/Library_desktop_detector.mk | 11 +++++++---- vcl/Library_vclplug_gen.mk | 11 +++++++---- vcl/Library_vclplug_gtk.mk | 11 +++++++---- vcl/Library_vclplug_gtk3.mk | 11 +++++++---- vcl/Library_vclplug_kde.mk | 11 +++++++---- vcl/Library_vclplug_kde4.mk | 11 +++++++---- vcl/Library_vclplug_tde.mk | 11 +++++++---- xmlsecurity/Library_xsec_xmlsec.mk | 4 ++-- 41 files changed, 173 insertions(+), 121 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2da039709050..2a5585e0b8a7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -914,9 +914,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ssl \ ) ifeq ($(OS),SOLARIS) -$(call gb_LinkTarget_use_libraries,$(1),\ - nsl \ - socket \ +$(call gb_LinkTarget_add_libs,$(1),\ + -lnsl \ + -lsocket \ ) endif endif diff --git a/bridges/Library_gcc3_aix_powerpc.mk b/bridges/Library_gcc3_aix_powerpc.mk index 4cf7a7048526..0b541926e2b1 100644 --- a/bridges/Library_gcc3_aix_powerpc.mk +++ b/bridges/Library_gcc3_aix_powerpc.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_ios_arm.mk b/bridges/Library_gcc3_ios_arm.mk index e121354bbf27..6744aa4c8863 100644 --- a/bridges/Library_gcc3_ios_arm.mk +++ b/bridges/Library_gcc3_ios_arm.mk @@ -40,9 +40,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_alpha.mk b/bridges/Library_gcc3_linux_alpha.mk index 22cd307a852b..77d331d390c3 100644 --- a/bridges/Library_gcc3_linux_alpha.mk +++ b/bridges/Library_gcc3_linux_alpha.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index ae0df1bad934..6a0fcba73cb2 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -36,11 +36,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +ifneq ($(OS),ANDROID) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) +endif + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - $(if $(filter-out ANDROID,$(OS)),\ - dl \ - ) \ sal \ )) diff --git a/bridges/Library_gcc3_linux_hppa.mk b/bridges/Library_gcc3_linux_hppa.mk index 8aa77b5df83f..fea698d9f4ad 100644 --- a/bridges/Library_gcc3_linux_hppa.mk +++ b/bridges/Library_gcc3_linux_hppa.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_ia64.mk b/bridges/Library_gcc3_linux_ia64.mk index 8f8f61c00bcd..6f71829dc9f3 100644 --- a/bridges/Library_gcc3_linux_ia64.mk +++ b/bridges/Library_gcc3_linux_ia64.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk index 526a1c95b322..97a37033f30a 100644 --- a/bridges/Library_gcc3_linux_intel.mk +++ b/bridges/Library_gcc3_linux_intel.mk @@ -39,11 +39,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ ) \ )) +ifneq ($(OS),ANDROID) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) +endif + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - $(if $(filter-out ANDROID,$(OS)),\ - dl \ - ) \ sal \ )) diff --git a/bridges/Library_gcc3_linux_m68k.mk b/bridges/Library_gcc3_linux_m68k.mk index db74e2a26126..5175d374246b 100644 --- a/bridges/Library_gcc3_linux_m68k.mk +++ b/bridges/Library_gcc3_linux_m68k.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk index 4cd01957c3dd..91613d9ddcd4 100644 --- a/bridges/Library_gcc3_linux_mips.mk +++ b/bridges/Library_gcc3_linux_mips.mk @@ -36,11 +36,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +ifneq ($(OS),ANDROID) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) +endif + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - $(if $(filter-out ANDROID,$(OS)),\ - dl \ - ) \ sal \ )) diff --git a/bridges/Library_gcc3_linux_powerpc.mk b/bridges/Library_gcc3_linux_powerpc.mk index 0ae99a60e916..cbf62694e062 100644 --- a/bridges/Library_gcc3_linux_powerpc.mk +++ b/bridges/Library_gcc3_linux_powerpc.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_powerpc64.mk b/bridges/Library_gcc3_linux_powerpc64.mk index 037d4054599d..acb1f3f1a3c9 100644 --- a/bridges/Library_gcc3_linux_powerpc64.mk +++ b/bridges/Library_gcc3_linux_powerpc64.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_s390.mk b/bridges/Library_gcc3_linux_s390.mk index cd9dbf3444f4..2624e9e176d5 100644 --- a/bridges/Library_gcc3_linux_s390.mk +++ b/bridges/Library_gcc3_linux_s390.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_s390x.mk b/bridges/Library_gcc3_linux_s390x.mk index a04ebad91250..d2400e98b157 100644 --- a/bridges/Library_gcc3_linux_s390x.mk +++ b/bridges/Library_gcc3_linux_s390x.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_sparc.mk b/bridges/Library_gcc3_linux_sparc.mk index 778cbb12a6e8..5b2a9dc5bc19 100644 --- a/bridges/Library_gcc3_linux_sparc.mk +++ b/bridges/Library_gcc3_linux_sparc.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_x86-64.mk b/bridges/Library_gcc3_linux_x86-64.mk index 244bdda8dae2..b1e596778730 100644 --- a/bridges/Library_gcc3_linux_x86-64.mk +++ b/bridges/Library_gcc3_linux_x86-64.mk @@ -41,9 +41,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ ) \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_solaris_intel.mk b/bridges/Library_gcc3_solaris_intel.mk index c333ca8d3db0..f3175faea884 100644 --- a/bridges/Library_gcc3_solaris_intel.mk +++ b/bridges/Library_gcc3_solaris_intel.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_solaris_sparc.mk b/bridges/Library_gcc3_solaris_sparc.mk index 3829f219b8d9..5dab7c0345d0 100644 --- a/bridges/Library_gcc3_solaris_sparc.mk +++ b/bridges/Library_gcc3_solaris_sparc.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 1bfb26f86c8c..b85321f1b0d6 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -116,8 +116,8 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ )) # freetype? fontconfig? -> test on Solaris -$(eval $(call gb_Library_use_libraries,cairocanvas,\ - X11 \ +$(eval $(call gb_Library_add_libs,cairocanvas,\ + -lX11 \ )) $(eval $(call gb_Library_use_externals,cairocanvas,\ Xrender \ diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index da860e821e7c..1117bce24681 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -42,19 +42,22 @@ $(eval $(call gb_Executable_use_static_libraries,nsplugin,\ npsoenv \ )) -$(eval $(call gb_Executable_use_libraries,nsplugin,\ - cppu \ - cppuhelper \ - sal \ +$(eval $(call gb_Executable_add_libs,nsplugin,\ $(if $(filter $(OS),LINUX), \ - dl \ + -ldl \ ) \ $(if $(filter $(OS),SOLARIS), \ - nsl \ - socket \ + -lnsl \ + -lsocket \ ) \ )) +$(eval $(call gb_Executable_use_libraries,nsplugin,\ + cppu \ + cppuhelper \ + sal \ +)) + ifeq ($(GUI),WNT) $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ extensions/source/nsplugin/source/nsp_windows \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 75872b73465f..a72cabcb6371 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -69,8 +69,8 @@ $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scanunx \ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,scn,\ - dl \ +$(eval $(call gb_Library_add_libs,scn,\ + -ldl \ )) endif endif diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk index b9f8c5fef6fa..ad4742f70e49 100644 --- a/framework/Library_lomenubar.mk +++ b/framework/Library_lomenubar.mk @@ -43,7 +43,10 @@ $(eval $(call gb_Library_use_libraries,lomenubar,\ cppu \ cppuhelper \ comphelper \ - X11 \ +)) + +$(eval $(call gb_Library_add_libs,lomenubar,\ + -lX11 \ )) $(eval $(call gb_Library_add_standard_system_libs,lomenubar)) diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index dc4c4345bb1f..17ac265b0aed 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -69,8 +69,8 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,neon,\ - dl \ +$(eval $(call gb_Library_add_libs,neon,\ + -ldl \ )) endif diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 2450e9889a52..7d4b08ab5e69 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -57,8 +57,8 @@ $(eval $(call gb_Executable_add_libs,spadmin.bin,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ - dl \ +$(eval $(call gb_Executable_add_libs,spadmin.bin,\ + -ldl \ )) endif diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 42bb40dd7b48..45c7b5c76729 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -60,8 +60,8 @@ $(eval $(call gb_Library_add_libs,spa,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,spa,\ - dl \ +$(eval $(call gb_Library_add_libs,spa,\ + -ldl \ )) endif diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index 0f46beaac557..8ec4a1088a85 100644 --- a/pyuno/Library_pyuno_wrapper.mk +++ b/pyuno/Library_pyuno_wrapper.mk @@ -51,8 +51,8 @@ endif ifneq ($(GUI)$(COM),WNTMSC) ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) -$(eval $(call gb_Library_use_libraries,pyuno_wrapper,\ - dl \ +$(eval $(call gb_Library_add_libs,pyuno_wrapper,\ + -ldl \ )) endif diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 1d6f75431cca..36ace0d32738 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -57,13 +57,6 @@ $(eval $(call gb_Library_add_defs,sal,\ )) $(eval $(call gb_Library_use_libraries,sal,\ - $(if $(filter $(OS),LINUX), \ - dl \ - ) \ - $(if $(filter $(OS),SOLARIS), \ - nsl \ - socket \ - ) \ $(if $(filter $(OS),WNT), \ advapi32 \ comdlg32 \ @@ -85,6 +78,13 @@ $(eval $(call gb_Library_add_libs,sal,\ -lpthread \ ) \ ) \ + $(if $(filter $(OS),LINUX), \ + -ldl \ + ) \ + $(if $(filter $(OS),SOLARIS), \ + -lnsl \ + -lsocket \ + ) \ )) $(eval $(call gb_Library_add_standard_system_libs,sal)) diff --git a/shell/Executable_gnome_open_url.mk b/shell/Executable_gnome_open_url.mk index 68bf0a186f1d..0353ffa82344 100644 --- a/shell/Executable_gnome_open_url.mk +++ b/shell/Executable_gnome_open_url.mk @@ -28,8 +28,8 @@ $(eval $(call gb_Executable_Executable,gnome-open-url.bin)) ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) -$(eval $(call gb_Executable_use_libraries,gnome-open-url.bin,\ - dl \ +$(eval $(call gb_Executable_add_libs,gnome-open-url.bin,\ + -ldl \ )) endif diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index c3c2b6d768c0..cf911a1d4f2a 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -100,10 +100,10 @@ $(eval $(call gb_Library_add_exception_objects,OGLTrans,\ slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl \ )) -$(eval $(call gb_Library_use_libraries,OGLTrans,\ - GL \ - GLU \ - X11 \ +$(eval $(call gb_Library_add_libs,OGLTrans,\ + -lGL \ + -lGLU \ + -lX11 \ )) endif diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index ba4b4ab005c4..4b26f028fca9 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -241,20 +241,6 @@ gb_STDLIBS := \ -lnsl \ -lsocket \ -gb_Library_PLAINLIBS_NONE += \ - dl \ - GL \ - GLU \ - ICE \ - m \ - nsl \ - pthread \ - socket \ - SM \ - ICE \ - X11 \ - Xext \ - gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 4946cf29d55e..0957e4a3d71b 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -239,18 +239,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library_PLAINLIBS_NONE += \ - dl \ - GL \ - GLU \ - ICE \ - m \ - pthread \ - SM \ - ICE \ - X11 \ - Xext \ - gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 20f97124e355..d1e1fee6fe98 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -142,8 +142,8 @@ endif ifneq ($(GUIBASE),headless) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_use_libraries,tk,\ - X11 \ +$(eval $(call gb_Library_add_libs,tk,\ + -lX11 \ )) endif endif diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index e0b9801e2672..b6149a1dd3e8 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -80,10 +80,10 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ endif ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_use_libraries,ucpdav1,\ - dl \ - nsl \ - socket \ +$(eval $(call gb_Library_add_libs,ucpdav1,\ + -ldl \ + -lnsl \ + -lsocket \ )) endif diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index a155c3e0d281..6ade59bbd86a 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -55,10 +55,6 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,desktop_detector)) @@ -68,6 +64,13 @@ $(eval $(call gb_Library_use_externals,desktop_detector,\ icuuc \ )) +$(eval $(call gb_Library_add_libs,desktop_detector,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ vcl/unx/generic/desktopdetect/desktopdetector \ )) diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 67a440b18e54..67795ef553a9 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -49,10 +49,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_gen)) @@ -64,6 +60,13 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\ Xrender \ )) +$(eval $(call gb_Library_add_libs,vclplug_gen,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/app/i18n_cb \ vcl/unx/generic/app/i18n_ic \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 42ea2a485495..3fb0d8038b69 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -57,10 +57,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk)) @@ -73,6 +69,13 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk,\ icuuc \ )) +$(eval $(call gb_Library_add_libs,vclplug_gtk,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ vcl/unx/gtk/a11y/atkaction \ vcl/unx/gtk/a11y/atkbridge \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index b906fcf64bd5..f924e80d8c33 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -69,10 +69,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk3)) @@ -81,6 +77,13 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ )) +$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ vcl/unx/gtk3/a11y/gtk3atkaction \ vcl/unx/gtk3/a11y/gtk3atkbridge \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index bfcf782345b4..d61717c00e2c 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -58,10 +58,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_kde)) @@ -72,6 +68,13 @@ $(eval $(call gb_Library_use_externals,vclplug_kde,\ kde \ )) +$(eval $(call gb_Library_add_libs,vclplug_kde,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ vcl/unx/kde/kdedata \ vcl/unx/kde/salnativewidgets-kde \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 9fd110fc506b..f8450203ccd2 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -56,10 +56,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_kde4)) @@ -70,6 +66,13 @@ $(eval $(call gb_Library_use_externals,vclplug_kde4,\ kde4 \ )) +$(eval $(call gb_Library_add_libs,vclplug_kde4,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ vcl/unx/kde4/KDEData \ vcl/unx/kde4/KDE4FilePicker \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index a55b8dd8025a..efd3daaff151 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -63,10 +63,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_tde)) @@ -76,6 +72,13 @@ $(eval $(call gb_Library_use_externals,vclplug_tde,\ icuuc \ )) +$(eval $(call gb_Library_add_libs,vclplug_tde,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_tde,\ vcl/unx/kde/kdedata \ vcl/unx/kde/salnativewidgets-kde \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 41cbfafcaad1..3966e76e4052 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -181,8 +181,8 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ endif # ifeq ($(SYSTEM_NSS),YES) ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - dl \ +$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ + -ldl \ )) endif -- cgit From 8831c592e80288be39a9e5f4d20e617b55682003 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:31:46 +0200 Subject: gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT: add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d --- Library_merged.mk | 4 +- RepositoryExternal.mk | 4 +- RepositoryFixes.mk | 6 +-- avmedia/Library_avmediawin.mk | 10 ++--- basctl/Library_basctl.mk | 2 +- basic/CppunitTest_basic_enable.mk | 2 +- basic/CppunitTest_basic_nested_struct.mk | 2 +- basic/CppunitTest_basic_scanner.mk | 2 +- bean/Library_officebean.mk | 5 ++- canvas/Library_canvastools.mk | 2 +- canvas/Library_directx9canvas.mk | 2 +- canvas/Library_gdipluscanvas.mk | 2 +- cli_ure/Executable_climaker.mk | 7 +++- cli_ure/Library_cli_cppuhelper_native.mk | 7 +++- cli_ure/Library_cli_uno.mk | 5 ++- connectivity/Library_ado.mk | 9 +++-- connectivity/Library_postgresql-sdbc-impl.mk | 2 +- cui/Library_cui.mk | 2 +- dbaccess/Library_dbu.mk | 2 +- desktop/Executable_quickstart.mk | 11 ++++-- desktop/Executable_soffice.mk | 5 ++- desktop/Library_deploymentgui.mk | 2 +- dtrans/Library_dnd.mk | 10 +++-- dtrans/Library_ftransl.mk | 10 +++-- dtrans/Library_sysdtrans.mk | 10 +++-- embeddedobj/Library_emboleobj.mk | 3 ++ embedserv/Library_emser.mk | 7 +++- embedserv/Library_inprocserv.mk | 5 ++- extensions/CppunitTest_extensions_test_update.mk | 2 +- extensions/Executable_nsplugin.mk | 18 ++++----- extensions/Library_ldapbe2.mk | 2 +- extensions/Library_npsoplugin.mk | 18 ++++----- extensions/Library_oleautobridge.mk | 3 ++ extensions/Library_oleautobridge2.mk | 3 ++ extensions/Library_pl.mk | 6 +-- extensions/Library_so_activex.mk | 8 ++-- extensions/Library_so_activex_x64.mk | 8 ++-- extensions/Library_updchk.mk | 2 +- fpicker/Library_fps.mk | 5 ++- framework/Library_fwi.mk | 2 +- hwpfilter/Library_hwp.mk | 2 +- jvmfwk/Library_jvmfwk.mk | 4 +- jvmfwk/Library_sunjavaplugin.mk | 5 +-- neon/Library_neon.mk | 2 +- sal/Library_sal.mk | 19 +++++----- sal/Library_uwinapi.mk | 2 +- sc/Library_scui.mk | 6 +-- sc/Library_vbaobj.mk | 6 +-- sd/CppunitTest_sd_uimpress.mk | 2 +- sd/Library_sd.mk | 2 +- sfx2/Library_sfx.mk | 12 +++--- shell/Executable_senddoc.mk | 5 ++- shell/Library_ooofilt.mk | 6 +-- shell/Library_ooofilt_x64.mk | 4 +- shell/Library_propertyhdl.mk | 2 +- shell/Library_propertyhdl_x64.mk | 4 +- shell/Library_shlxthdl.mk | 2 +- shell/Library_shlxthdl_x64.mk | 4 +- shell/Library_smplmail.mk | 5 ++- shell/Library_syssh_win.mk | 7 +++- slideshow/Library_OGLTrans.mk | 2 +- solenv/gbuild/CppunitTest.mk | 1 + solenv/gbuild/Executable.mk | 1 + solenv/gbuild/Library.mk | 1 + solenv/gbuild/platform/WNT_INTEL_GCC.mk | 44 ++-------------------- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 47 ++---------------------- svl/CppunitTest_svl_lngmisc.mk | 2 +- svtools/Library_svt.mk | 2 +- svx/Executable_gengal.bin.mk | 11 +++--- tools/Library_tl.mk | 10 ++--- ucb/Library_ucpdav1.mk | 2 +- vcl/Library_vcl.mk | 32 +++++++--------- xmlsecurity/Library_xsec_xmlsec.mk | 2 +- 73 files changed, 222 insertions(+), 253 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 6a2a9ecbdbb9..98d4cbf9ffde 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -107,14 +107,14 @@ $(eval $(call gb_Library_add_libs,merged,\ endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,merged,\ +$(eval $(call gb_Library_use_system_win32_libs,merged,\ advapi32 \ gdi32 \ gdiplus \ imm32 \ mpr \ msimg32 \ - $(gb_Library_win32_OLDNAMES) \ + oldnames \ ole32 \ oleaut32 \ shell32 \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2a5585e0b8a7..1196385a9a93 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1468,7 +1468,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ -lobjc \ ) else ifeq ($(OS),WNT) -$(call gb_LinkTarget_use_libraries,$(1),\ +$(call gb_LinkTarget_use_system_win32_libs,$(1),\ advapi32 \ gdi32 \ ) @@ -1614,7 +1614,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ifeq ($(GUI)$(COM),WNTMSC) $(call gb_LinkTarget_use_external,$(1),openssl) -$(call gb_LinkTarget_use_libraries,$(1),\ +$(call gb_LinkTarget_use_system_win32_libs,$(1),\ secur32 \ ws2_32 \ ) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index e49661874ccc..2eb16df6c43d 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -132,21 +132,17 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema -gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE) -gb_Library_NOILIBFILENAMES += \ +gb_Library_NOILIBFILENAMES := \ glib-2.0 \ gmodule-2.0 \ graphite2_off \ icudt icuin icule icuuc \ langtag \ lcms2 \ - msvcprt \ nspr4 \ nss3 \ - shlwapi \ smime3 \ uwinapi \ - version \ gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 64750496d43c..ed1cc2d426fa 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -41,9 +41,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ comphelper \ cppu \ cppuhelper \ - gdi32 \ - ole32 \ - oleaut32 \ sal \ tl \ utl \ @@ -53,8 +50,11 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ $(eval $(call gb_Library_add_standard_system_libs,avmediawin)) -$(eval $(call gb_Library_add_libs,avmediawin,\ - strmiids.lib \ +$(eval $(call gb_Library_use_system_win32_libs,avmediawin,\ + gdi32 \ + ole32 \ + oleaut32 \ + strmiids \ )) $(eval $(call gb_Library_add_exception_objects,avmediawin,\ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 6cd860ee73f9..ce2b096cbcac 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -124,7 +124,7 @@ $(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,basctl,\ +$(eval $(call gb_Library_use_system_win32_libs,basctl,\ advapi32 \ gdi32 \ shell32 \ diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index c09080ce2276..6e871736c1bf 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \ oleaut32 \ )) endif diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index e43404a27094..a768ddf007c7 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \ oleaut32 \ )) endif diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index 36806d0e276d..88876b75db9a 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \ oleaut32 \ )) endif diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 2b8e2164f045..94f4a0451c1e 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -47,10 +47,13 @@ endif ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_libraries,officebean,\ - jawt \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,officebean,\ + jawt \ +)) + else $(eval $(call gb_Library_add_libs,officebean,\ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index d08d76934fac..cb363de2ef04 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -87,7 +87,7 @@ endif endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,canvastools,\ +$(eval $(call gb_Library_use_system_win32_libs,canvastools,\ winmm \ )) endif diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index fb2a28b6a928..d45b9066ca9b 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ $(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) -$(eval $(call gb_Library_use_libraries,directx9canvas,\ +$(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\ d3d9 \ gdi32 \ gdiplus \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index cfe70a926995..b053b153e5e2 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ $(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) -$(eval $(call gb_Library_use_libraries,gdipluscanvas,\ +$(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\ gdi32 \ gdiplus \ )) diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index e6abcf5f55bf..73dcb63bd21d 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -24,13 +24,16 @@ $(eval $(call gb_Executable_use_internal_bootstrap_api,climaker,\ $(eval $(call gb_Executable_use_libraries,climaker,\ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Executable_use_system_win32_libs,climaker,\ mscoree \ $(if $(USE_DEBUG_RUNTIME) \ ,msvcmrtd \ ,msvcmrt \ ) \ - sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_standard_system_libs,climaker)) diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index 22985750b659..745c69c9480c 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -33,16 +33,19 @@ $(eval $(call gb_Library_use_packages,cli_cppuhelper_native,\ )) $(eval $(call gb_Library_use_libraries,cli_cppuhelper_native,\ - advapi32 \ cppu \ cppuhelper \ + sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper_native,\ + advapi32 \ delayimp \ mscoree \ $(if $(USE_DEBUG_RUNTIME)\ ,msvcmrtd \ ,msvcmrt \ ) \ - sal \ )) $(eval $(call gb_Library_add_exception_objects,cli_cppuhelper_native,\ diff --git a/cli_ure/Library_cli_uno.mk b/cli_ure/Library_cli_uno.mk index 55288dee2aae..3166365bb1d4 100644 --- a/cli_ure/Library_cli_uno.mk +++ b/cli_ure/Library_cli_uno.mk @@ -19,12 +19,15 @@ $(eval $(call gb_Library_use_udk_api,cli_uno)) $(eval $(call gb_Library_use_libraries,cli_uno,\ cppu \ + sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,cli_uno,\ mscoree \ $(if $(USE_DEBUG_RUNTIME)\ ,msvcmrtd \ ,msvcmrt \ ) \ - sal \ )) $(eval $(call gb_Library_add_exception_objects,cli_uno,\ diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index bd24464a5331..ed088bc89ee5 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -42,14 +42,17 @@ $(eval $(call gb_Library_add_cxxflags,ado,\ )) endif +$(eval $(call gb_Library_use_system_win32_libs,ado,\ + ole32 \ + oleaut32 \ + uuid \ +)) + $(eval $(call gb_Library_use_libraries,ado,\ cppu \ cppuhelper \ sal \ salhelper \ - ole32 \ - oleaut32 \ - uuid \ dbtools \ comphelper \ $(gb_UWINAPI) \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 50900b1b7f66..a76eb7b735b6 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ $(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ +$(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\ shell32 \ wldap32 \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 059044fcafc4..23321fc64cce 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -78,7 +78,7 @@ $(eval $(call gb_Library_use_externals,cui,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,cui,\ +$(eval $(call gb_Library_use_system_win32_libs,cui,\ advapi32 \ shlwapi \ )) diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 579deb6618ba..8d35b1f3da53 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -76,7 +76,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\ $(eval $(call gb_Library_add_standard_system_libs,dbu)) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,dbu,\ +$(eval $(call gb_Library_use_system_win32_libs,dbu,\ ole32 \ oleaut32 \ uuid \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 8e2bc84ad6ef..aecd9b37dd2b 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -33,12 +33,15 @@ $(eval $(call gb_Executable_set_include,quickstart,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_use_libraries,quickstart,\ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ comdlg32 \ gdi32 \ ole32 \ oleaut32 \ shell32 \ +)) + +$(eval $(call gb_Executable_use_libraries,quickstart,\ $(gb_UWINAPI) \ )) @@ -46,14 +49,14 @@ $(eval $(call gb_Executable_add_standard_system_libs,quickstart)) ifeq ($(COM),GCC) -$(eval $(call gb_Executable_use_libraries,quickstart,\ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ uuid \ )) else -$(eval $(call gb_Executable_add_libs,quickstart,\ - comsupp.lib \ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ + comsupp \ )) endif diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index afe746dc01d9..302c978a0096 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -30,10 +30,13 @@ $(eval $(call gb_Executable_Executable,soffice)) $(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) $(eval $(call gb_Executable_use_libraries,soffice,\ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Executable_use_system_win32_libs,soffice,\ advapi32 \ shell32 \ shlwapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_standard_system_libs,soffice)) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index f81be8c52f41..712a020262ab 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,deploymentgui,\ +$(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\ ole32 \ )) diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 7b6f08621c23..60027e2fef61 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -37,17 +37,19 @@ $(eval $(call gb_Library_set_include,dnd,\ $(eval $(call gb_Library_use_sdk_api,dnd)) $(eval $(call gb_Library_use_libraries,dnd,\ - advapi32 \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,dnd,\ + advapi32 \ gdi32 \ ole32 \ oleaut32 \ - sal \ shell32 \ uuid \ - uwinapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,dnd)) diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index ae12a2bee575..f4c4e272999f 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -37,16 +37,18 @@ $(eval $(call gb_Library_set_include,ftransl,\ $(eval $(call gb_Library_use_sdk_api,ftransl)) $(eval $(call gb_Library_use_libraries,ftransl,\ - advapi32 \ cppu \ cppuhelper \ - gdi32 \ - ole32 \ sal \ - uwinapi \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,ftransl,\ + advapi32 \ + gdi32 \ + ole32 \ +)) + $(eval $(call gb_Library_add_standard_system_libs,ftransl)) $(eval $(call gb_Library_use_static_libraries,ftransl,\ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 698b9d605936..93e7b696604b 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -42,17 +42,19 @@ $(eval $(call gb_Library_add_defs,sysdtrans,\ )) $(eval $(call gb_Library_use_libraries,sysdtrans,\ - advapi32 \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\ + advapi32 \ gdi32 \ ole32 \ oleaut32 \ - sal \ shell32 \ uuid \ - uwinapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,sysdtrans)) diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index d3ca7501e8cd..b4c8e6bb7be9 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -63,6 +63,9 @@ ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,emboleobj,\ embobj \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,emboleobj,\ gdi32 \ ole32 \ oleaut32 \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 617458b94b1e..c261f9448e64 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -45,12 +45,15 @@ $(eval $(call gb_Library_use_libraries,emser,\ comphelper \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,emser,\ gdi32 \ ole32 \ oleaut32 \ - sal \ uuid \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,emser)) diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 122858ed9413..ffe596a86b0c 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -32,10 +32,13 @@ $(eval $(call gb_Library_set_include,inprocserv,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_libraries,inprocserv,\ +$(eval $(call gb_Library_use_system_win32_libs,inprocserv,\ gdi32 \ ole32 \ uuid \ +)) + +$(eval $(call gb_Library_use_libraries,inprocserv,\ $(gb_UWINAPI) \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 766552e29396..b5e88d2ba1e0 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update)) ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\ shell32 \ ole32 \ )) diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 1117bce24681..05bf003cd550 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -67,18 +67,18 @@ $(eval $(call gb_Executable_use_static_libraries,nsplugin,\ ooopathutils \ )) -$(eval $(call gb_Executable_use_libraries,nsplugin,\ - ws2_32 \ - shell32 \ - ole32 \ - kernel32 \ - user32 \ - gdi32 \ - winspool \ - comdlg32 \ +$(eval $(call gb_Executable_use_system_win32_libs,nsplugin,\ advapi32 \ + comdlg32 \ + gdi32 \ + kernel32 \ + ole32 \ oleaut32 \ + shell32 \ + user32 \ uuid \ + winspool \ + ws2_32 \ )) endif # WNT diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index d503cf6bb8cc..3b9c341445af 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,ldapbe2,\ +$(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\ wldap32 \ )) else # 0S!=WNT diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 7e8b400d6eb8..6528b3d3c4b7 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -69,18 +69,18 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ ooopathutils \ )) -$(eval $(call gb_Library_use_libraries,npsoplugin,\ - ws2_32 \ - shell32 \ - ole32 \ - kernel32 \ - user32 \ - gdi32 \ - winspool \ - comdlg32 \ +$(eval $(call gb_Library_use_system_win32_libs,npsoplugin,\ advapi32 \ + comdlg32 \ + gdi32 \ + kernel32 \ + ole32 \ oleaut32 \ + shell32 \ + user32 \ uuid \ + winspool \ + ws2_32 \ )) $(eval $(call gb_Library_add_defs,npsoplugin,\ diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 43404503b1dc..d86a604b1b9a 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -43,6 +43,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge,\ cppuhelper \ cppu \ sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\ advapi32 \ ole32 \ oleaut32 \ diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk index e258e0fa1cc1..c7f1a0152034 100644 --- a/extensions/Library_oleautobridge2.mk +++ b/extensions/Library_oleautobridge2.mk @@ -47,6 +47,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge2,\ cppuhelper \ cppu \ sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,oleautobridge2,\ advapi32 \ ole32 \ oleaut32 \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 34b147320771..dc5e6c4f9cde 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -63,10 +63,10 @@ $(eval $(call gb_Library_add_libs,pl,\ endif # OS=SOLARIS ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,pl,\ - version \ - ole32 \ +$(eval $(call gb_Library_use_system_win32_libs,pl,\ advapi32 \ + ole32 \ + version \ )) $(eval $(call gb_Library_add_exception_objects,pl,\ diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 33cccab682fd..733de14eab86 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -54,14 +54,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ )) -$(eval $(call gb_Library_use_libraries,so_activex,\ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,so_activex,\ advapi32 \ + gdi32 \ ole32 \ oleaut32 \ - gdi32 \ - urlmon \ shlwapi \ + urlmon \ + uuid \ )) ifneq ($(USE_DEBUG_RUNTIME),) diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 7bcf286cb4f0..9bc43840d8a3 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -57,14 +57,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ )) -$(eval $(call gb_Library_use_libraries,so_activex_x64,\ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ advapi32 \ + gdi32 \ ole32 \ oleaut32 \ - gdi32 \ - urlmon \ shlwapi \ + urlmon \ + uuid \ )) ifneq ($(USE_DEBUG_RUNTIME),) diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index cd291c8b695d..d03cb0c6060c 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,updchk,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,updchk,\ +$(eval $(call gb_Library_use_system_win32_libs,updchk,\ ole32 \ shell32 \ wininet \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 05f84ea2b1ba..b3b3fc3a3d4a 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -52,6 +52,10 @@ $(eval $(call gb_Library_use_libraries,fps,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,fps,\ advapi32 \ comdlg32 \ gdi32 \ @@ -60,7 +64,6 @@ $(eval $(call gb_Library_use_libraries,fps,\ oleaut32 \ shell32 \ uuid \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,fps)) diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index ac51b15602a6..eab6f7a4f44c 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,fwi,\ +$(eval $(call gb_Library_use_system_win32_libs,fwi,\ advapi32 \ )) endif diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 5ca70188fcf3..7b44aa42984a 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_external,hwp,zlib)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,hwp,\ +$(eval $(call gb_Library_use_system_win32_libs,hwp,\ ole32 \ uuid \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 73a2e6bd5e5c..5051a2b9bb17 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -50,8 +50,8 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ $(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,jvmfwk,\ - advapi32 \ +$(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ + advapi32 \ )) endif diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index e25d993fac2d..61ff7bdfe5ac 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -62,9 +62,8 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ - advapi32 \ - uwinapi \ +$(eval $(call gb_Library_use_system_win32_libs,sunjavaplugin,\ + advapi32 \ )) endif diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index 17ac265b0aed..239a43491b3a 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,neon,\ +$(eval $(call gb_Library_use_system_win32_libs,neon,\ ws2_32 \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 36ace0d32738..ecec9fffd76c 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -57,21 +57,22 @@ $(eval $(call gb_Library_add_defs,sal,\ )) $(eval $(call gb_Library_use_libraries,sal,\ - $(if $(filter $(OS),WNT), \ - advapi32 \ - comdlg32 \ - mpr \ - ole32 \ - shell32 \ - user32 \ - ws2_32 \ - ) \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,sal,\ + advapi32 \ + comdlg32 \ + mpr \ + ole32 \ + shell32 \ + user32 \ + ws2_32 \ +)) + $(eval $(call gb_Library_add_libs,sal,\ $(if $(filter $(GUI),UNX), \ $(if $(filter $(OS),ANDROID),, \ diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index c5356c9f00d0..75a3a9cffca4 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,uwinapi)) -$(eval $(call gb_Library_use_libraries,uwinapi,\ +$(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ $(if $(filter $(COM),MSC), \ kernel32 \ msvcrt \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 86f7f8c4d0f8..807d7fd7591d 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -121,10 +121,10 @@ $(eval $(call gb_Library_add_exception_objects,scui,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,scui,\ +$(eval $(call gb_Library_use_system_win32_libs,scui,\ advapi32 \ - $(gb_Library_win32_OLDNAMES) \ - uwinapi \ + oldnames \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index e0e71a0da812..791175d5e08c 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -143,10 +143,10 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,vbaobj,\ +$(eval $(call gb_Library_use_system_win32_libs,vbaobj,\ advapi32 \ - $(gb_Library_win32_OLDNAMES) \ - uwinapi \ + oldnames \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 70f742949bc4..4d175957c35a 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ $(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress)) ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\ ws2_32 \ )) endif diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 3ac73b8f0857..d8dd7c095133 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -114,7 +114,7 @@ $(eval $(call gb_Library_use_externals,sd,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,sd,\ +$(eval $(call gb_Library_use_system_win32_libs,sd,\ ws2_32 \ )) endif diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index c384a1b98046..1ec228446b2f 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -295,12 +295,12 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/syspathw32 \ )) -$(eval $(call gb_Library_use_libraries,sfx,\ - gdi32 \ - advapi32 \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,sfx,\ + advapi32 \ + gdi32 \ + ole32 \ + shell32 \ + uuid \ )) endif diff --git a/shell/Executable_senddoc.mk b/shell/Executable_senddoc.mk index 47c5b82827f7..13083ce77eb5 100644 --- a/shell/Executable_senddoc.mk +++ b/shell/Executable_senddoc.mk @@ -27,8 +27,11 @@ $(eval $(call gb_Executable_Executable,senddoc)) -$(eval $(call gb_Executable_use_libraries,senddoc,\ +$(eval $(call gb_Executable_use_system_win32_libs,senddoc,\ kernel32 \ +)) + +$(eval $(call gb_Executable_use_libraries,senddoc,\ sal \ )) diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 62c18edf4a90..2607fea33401 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -53,19 +53,19 @@ $(eval $(call gb_Library_use_externals,ooofilt,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,ooofilt,\ +$(eval $(call gb_Library_use_system_win32_libs,ooofilt,\ advapi32 \ comctl32 \ kernel32 \ msvcprt \ + oldnames \ ole32 \ shell32 \ uuid \ - $(gb_Library_win32_OLDNAMES) \ )) ifneq ($(PRODUCT),full) -$(eval $(call gb_Library_use_libraries,ooofilt,\ +$(eval $(call gb_Library_use_system_win32_libs,ooofilt,\ msvcrt \ )) endif diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 3ddaeec9d6c2..f0232ba75e82 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,ooofilt_x64,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,ooofilt_x64,\ +$(eval $(call gb_Library_use_system_win32_libs,ooofilt_x64,\ advapi32 \ comctl32 \ gdi32 \ @@ -67,13 +67,13 @@ $(eval $(call gb_Library_use_libraries,ooofilt_x64,\ kernel32 \ msvcprt \ msvcrt \ + oldnames \ ole32 \ oleaut32 \ propsys \ shell32 \ user32 \ uuid \ - $(gb_Library_win32_OLDNAMES) \ )) $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\ diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 5ca9e91d6732..82e7db10a4ce 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_externals,propertyhdl,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,propertyhdl,\ +$(eval $(call gb_Library_use_system_win32_libs,propertyhdl,\ advapi32 \ comctl32 \ gdi32 \ diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 323335f55d64..46cfd15909e8 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,propertyhdl_x64,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,propertyhdl_x64,\ +$(eval $(call gb_Library_use_system_win32_libs,propertyhdl_x64,\ advapi32 \ comctl32 \ gdi32 \ @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,propertyhdl_x64,\ kernel32 \ msvcprt \ msvcrt \ + oldnames \ ole32 \ oleaut32 \ propsys \ @@ -74,7 +75,6 @@ $(eval $(call gb_Library_use_libraries,propertyhdl_x64,\ shlwapi \ user32 \ uuid \ - $(gb_Library_win32_OLDNAMES) \ )) $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\ diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index e4794cf4312d..9118f08f5018 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_externals,shlxthdl,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,shlxthdl,\ +$(eval $(call gb_Library_use_system_win32_libs,shlxthdl,\ advapi32 \ comctl32 \ gdi32 \ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index 2b5555a7c715..aa6ff0462480 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,shlxthdl_x64,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,shlxthdl_x64,\ +$(eval $(call gb_Library_use_system_win32_libs,shlxthdl_x64,\ advapi32 \ comctl32 \ gdi32 \ @@ -67,13 +67,13 @@ $(eval $(call gb_Library_use_libraries,shlxthdl_x64,\ kernel32 \ msvcprt \ msvcrt \ + oldnames \ ole32 \ oleaut32 \ shell32 \ shlwapi \ user32 \ uuid \ - $(gb_Library_win32_OLDNAMES) \ )) $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\ diff --git a/shell/Library_smplmail.mk b/shell/Library_smplmail.mk index 0b4cc0d01590..0e8cce656519 100644 --- a/shell/Library_smplmail.mk +++ b/shell/Library_smplmail.mk @@ -29,8 +29,11 @@ $(eval $(call gb_Library_Library,smplmail)) $(eval $(call gb_Library_use_sdk_api,smplmail)) -$(eval $(call gb_Library_use_libraries,smplmail,\ +$(eval $(call gb_Library_use_system_win32_libs,smplmail,\ advapi32 \ +)) + +$(eval $(call gb_Library_use_libraries,smplmail,\ cppu \ cppuhelper \ sal \ diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index b6ba2b4333fa..d1b5d0db498a 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -32,12 +32,15 @@ $(eval $(call gb_Library_use_sdk_api,syssh)) $(eval $(call gb_Library_use_libraries,syssh,\ cppu \ cppuhelper \ - ole32 \ sal \ - shell32 \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,syssh,\ + ole32 \ + shell32 \ +)) + $(eval $(call gb_Library_add_standard_system_libs,syssh)) $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh)) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index cf911a1d4f2a..012262256290 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -81,7 +81,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\ )) else ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_Library_use_libraries,OGLTrans,\ +$(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\ gdi32 \ glu32 \ opengl32 \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 02af2fbda472..c7c7861275e4 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -343,6 +343,7 @@ $(eval $(foreach method,\ add_libs \ add_standard_system_libs \ use_system_darwin_frameworks \ + use_system_win32_libs \ use_sdk_api \ use_udk_api \ use_internal_api \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 243e3cda7b24..0288c1755f71 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -107,6 +107,7 @@ $(eval $(foreach method,\ add_libs \ add_standard_system_libs \ use_system_darwin_frameworks \ + use_system_win32_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 131806f8d273..e4003a9d2682 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -187,6 +187,7 @@ $(eval $(foreach method,\ add_libs \ add_standard_system_libs \ use_system_darwin_frameworks \ + use_system_win32_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index c6e351493911..427c622326ad 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -186,6 +186,10 @@ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_d $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1))) endef +define gb_LinkTarget_use_system_win32_libs +$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),-l$(patsubst oldnames,moldname,$(lib)))) +endef + # Library class @@ -213,46 +217,6 @@ gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT) gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT) gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT) -gb_Library_win32_OLDNAMES := moldname - -gb_Library_PLAINLIBS_NONE += \ - mingwthrd \ - mingw32 \ - mingwex \ - advapi32 \ - comctl32 \ - comdlg32 \ - crypt32 \ - d3d9 \ - d3dx \ - ddraw \ - gdi32 \ - gdiplus \ - imm32 \ - kernel32 \ - jawt \ - msi \ - msimg32 \ - msvcrt \ - msvcprt \ - mpr \ - $(gb_Library_win32_OLDNAMES) \ - ole32 \ - oleaut32 \ - propsys \ - shell32 \ - shlwapi \ - urlmon \ - user32 \ - usp10 \ - uuid \ - winmm \ - version \ - wininet \ - winspool \ - wldap32 \ - ws2_32 \ - gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 8680c2e63d43..600fa43b57c7 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -374,6 +374,9 @@ $(call gb_Helper_abbreviate_dirs,\ ; exit $$RC) endef +define gb_LinkTarget_use_system_win32_libs +$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),$(lib).lib)) +endef # Flags common for PE executables (EXEs and DLLs) gb_Windows_PE_TARGETTYPEFLAGS := \ @@ -401,50 +404,6 @@ gb_Library_get_rpath := gb_Library_SYSPRE := i gb_Library_PLAINEXT := .lib -gb_Library_win32_OLDNAMES := oldnames - -gb_Library_PLAINLIBS_NONE += \ - advapi32 \ - comctl32 \ - comdlg32 \ - crypt32 \ - d3d9 \ - d3dx \ - ddraw \ - delayimp \ - gdi32 \ - gdiplus \ - imm32\ - kernel32 \ - jawt \ - libcmt \ - libcmtd \ - mpr \ - mscoree \ - msi \ - msimg32 \ - msvcmrt \ - msvcmrtd \ - msvcrt \ - msvcprt \ - $(gb_Library_win32_OLDNAMES) \ - ole32 \ - oleaut32 \ - propsys \ - secur32 \ - shell32 \ - shlwapi \ - urlmon \ - user32 \ - usp10 \ - uuid \ - version \ - wininet \ - winmm \ - winspool \ - wldap32 \ - ws2_32 \ - gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index 791f2716e659..505f63ea9683 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,svl_lngmisc)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,svl_lngmisc, \ oleaut32 \ )) endif diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 1f40a65b5001..e001aa4b62cc 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -271,7 +271,7 @@ $(eval $(call gb_Library_add_cobjects,svt,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,svt,\ +$(eval $(call gb_Library_use_system_win32_libs,svt,\ advapi32 \ gdi32 \ ole32 \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index b679787d856f..1cb9d8f78e25 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -71,12 +71,11 @@ $(eval $(call gb_Executable_use_static_libraries,$(svx_GENGALBIN),\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ - kernel32 \ - msvcrt \ - $(gb_Library_win32_OLDNAMES) \ - user32 \ - uwinapi \ +$(eval $(call gb_Executable_use_system_win32_libs,$(svx_GENGALBIN),\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ )) endif diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 3981bac35735..b7802267c891 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -117,11 +117,11 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/win/source/dll/toolsdll \ )) -$(eval $(call gb_Library_use_libraries,tl,\ - mpr \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,tl,\ + mpr \ + ole32 \ + shell32 \ + uuid \ )) endif diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index b6149a1dd3e8..c8053c180c9f 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -74,7 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,ucpdav1,\ +$(eval $(call gb_Library_use_system_win32_libs,ucpdav1,\ ws2_32 \ )) endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 341439ab23fe..02dae7d43f95 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -314,11 +314,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/glyphs/graphite_serverfont \ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,vcl,\ - version \ -)) -endif $(eval $(call gb_Library_use_external,vcl,graphite)) @@ -640,21 +635,20 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/win/source/window/salobj \ )) -$(eval $(call gb_Library_use_libraries,vcl,\ - advapi32 \ - gdi32 \ - gdiplus \ - imm32 \ - mpr \ - msimg32 \ - $(gb_Library_win32_OLDNAMES) \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,vcl,\ + advapi32 \ + gdi32 \ + gdiplus \ + imm32 \ + mpr \ + msimg32 \ + oldnames \ + ole32 \ + shell32 \ usp10 \ - uwinapi \ - winspool \ - version \ + uuid \ + version \ + winspool \ )) $(eval $(call gb_Library_add_nativeres,vcl,vcl/src)) diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 3966e76e4052..27479a3fc63f 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -101,7 +101,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ xmlsec1-mscrypto \ )) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ +$(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\ crypt32 \ advapi32 \ )) -- cgit From 78ea81418a7a24867a0651b7e096684ee57dd880 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:43:53 +0200 Subject: bean: just use AWTLIB on all platfroms to simplify this Change-Id: I6c8bc792a57750b7fd5f36e3eb97f76870a7a632 --- bean/Library_officebean.mk | 16 +--------------- configure.in | 6 +++++- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 94f4a0451c1e..64caf3dea54f 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -44,29 +44,15 @@ $(eval $(call gb_Library_add_cobjects,officebean,\ )) endif -ifeq ($(GUI),WNT) - $(eval $(call gb_Library_use_libraries,officebean,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_system_win32_libs,officebean,\ - jawt \ -)) - -else - $(eval $(call gb_Library_add_libs,officebean,\ - $(AWTLIB) \ -)) - -$(eval $(call gb_Library_add_ldflags,officebean,\ $(JAVALIB) \ + $(AWTLIB) \ )) - -endif - $(eval $(call gb_Library_add_standard_system_libs,officebean)) # vim: set noet sw=4 ts=4: diff --git a/configure.in b/configure.in index c1abd8aa2ddb..be6397872024 100644 --- a/configure.in +++ b/configure.in @@ -5982,7 +5982,11 @@ if test "$SOLAR_JAVA" != ""; then LD_LIBRARY_PATH=$save_LD_LIBRARY_PATH fi if test -z "$AWTLIB"; then - AWTLIB=-ljawt + if test $_os = WINNT -a "$WITH_MINGW" != yes; then + AWTLIB=jawt.lib + else + AWTLIB=-ljawt + fi fi AC_MSG_RESULT([$AWTLIB]) AC_SUBST(AWTLIB) -- cgit From 33bf3bd544b200825c081fe367bf64e68714c9b4 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:47:42 +0200 Subject: gbuild: OpenBSD: remove custom gb_LinkTarget__command_dynamiclink: Should no longer be necessary with the new handling of gb_STDLIBS. Change-Id: Ia94a7266806e2d09d7608f642b25933e42499525 --- solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk | 23 ----------------------- solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk | 23 ----------------------- 2 files changed, 46 deletions(-) diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk index 50267d307251..73090f0e7e20 100644 --- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk @@ -33,29 +33,6 @@ gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk -define gb_LinkTarget__command_dynamiclink -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ - $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ - $(subst \d,$$,$(RPATH)) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ - -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ - $(LIBS) \ - $(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ - -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1))) - $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1)) -endef - gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk index 34f35a36f7fd..89ef15e54887 100644 --- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk @@ -32,29 +32,6 @@ gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk -define gb_LinkTarget__command_dynamiclink -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ - $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ - $(subst \d,$$,$(RPATH)) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ - -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ - $(LIBS) \ - $(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ - -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1))) - $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1)) -endef - gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS # vim: set noet sw=4: -- cgit From f011af716e2978cbf9fcb7748dc868c503edddff Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: gbuild: invert handling of standard system libraries: Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a --- Library_merged.mk | 2 -- UnoControls/Library_ctl.mk | 2 -- accessibility/Library_acc.mk | 2 -- accessibility/Library_java_uno_accessbridge.mk | 2 -- animations/Library_animcore.mk | 2 -- avmedia/Library_avmedia.mk | 2 -- avmedia/Library_avmediaQuickTime.mk | 2 -- avmedia/Library_avmediagst.mk | 2 -- avmedia/Library_avmediagst_0_10.mk | 2 -- avmedia/Library_avmediawin.mk | 2 -- basctl/Library_basctl.mk | 2 -- basebmp/CppunitTest_basebmp.mk | 2 -- basebmp/Library_basebmp.mk | 2 -- basegfx/CppunitTest_basegfx.mk | 2 -- basegfx/Library_basegfx.mk | 2 -- basic/CppunitTest_basic_enable.mk | 2 -- basic/CppunitTest_basic_nested_struct.mk | 2 -- basic/CppunitTest_basic_scanner.mk | 2 -- basic/Library_sb.mk | 2 -- bean/Library_officebean.mk | 2 -- binaryurp/CppunitTest_binaryurp_test-cache.mk | 2 -- binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 2 -- binaryurp/Library_binaryurp.mk | 2 -- bridges/Library_gcc3_linux_arm.mk | 2 -- bridges/Library_gcc3_linux_intel.mk | 2 -- bridges/Library_gcc3_linux_mips.mk | 2 -- bridges/Library_java_uno.mk | 2 -- canvas/Library_cairocanvas.mk | 2 -- canvas/Library_canvasfactory.mk | 2 -- canvas/Library_canvastools.mk | 2 -- canvas/Library_directx9canvas.mk | 2 -- canvas/Library_gdipluscanvas.mk | 2 -- canvas/Library_nullcanvas.mk | 2 -- canvas/Library_simplecanvas.mk | 2 -- canvas/Library_vclcanvas.mk | 2 -- chart2/Library_chartcontroller.mk | 2 -- chart2/Library_chartcore.mk | 2 -- cli_ure/Executable_climaker.mk | 2 -- clucene/Library_clucene.mk | 2 -- comphelper/CppunitTest_comphelper_test.mk | 2 -- comphelper/Library_comphelper.mk | 2 -- configmgr/Library_configmgr.mk | 2 -- connectivity/Library_ado.mk | 2 -- connectivity/Library_calc.mk | 2 -- connectivity/Library_dbase.mk | 2 -- connectivity/Library_dbpool2.mk | 2 -- connectivity/Library_dbtools.mk | 2 -- connectivity/Library_evoab.mk | 2 -- connectivity/Library_file.mk | 2 -- connectivity/Library_flat.mk | 2 -- connectivity/Library_hsqldb.mk | 2 -- connectivity/Library_jdbc.mk | 2 -- connectivity/Library_kab1.mk | 2 -- connectivity/Library_kabdrv1.mk | 2 -- connectivity/Library_macab1.mk | 2 -- connectivity/Library_macabdrv1.mk | 2 -- connectivity/Library_mork.mk | 2 -- connectivity/Library_mozab.mk | 2 -- connectivity/Library_mozabdrv.mk | 2 -- connectivity/Library_mozbootstrap.mk | 2 -- connectivity/Library_mysql.mk | 2 -- connectivity/Library_odbc.mk | 2 -- connectivity/Library_odbcbase.mk | 2 -- connectivity/Library_postgresql-sdbc-impl.mk | 2 -- connectivity/Library_postgresql-sdbc.mk | 2 -- connectivity/Library_sdbc2.mk | 2 -- connectivity/Library_tdeab1.mk | 2 -- connectivity/Library_tdeabdrv1.mk | 2 -- cppcanvas/Library_cppcanvas.mk | 2 -- cppcanvas/Library_mtfrenderer.mk | 2 -- cppu/CppunitTest_cppu_checkapi.mk | 2 -- cppu/CppunitTest_cppu_qa_any.mk | 2 -- cppu/CppunitTest_cppu_qa_recursion.mk | 2 -- cppu/CppunitTest_cppu_qa_reference.mk | 2 -- cppu/CppunitTest_cppu_qa_unotype.mk | 2 -- cppu/CppunitTest_cppu_test_cppumaker.mk | 2 -- cppu/Library_affine_uno.mk | 2 -- cppu/Library_cppu.mk | 2 -- cppu/Library_log_uno.mk | 2 -- cppu/Library_purpenvhelper.mk | 2 -- cppu/Library_unsafe_uno.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_checkapi.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 2 -- cppuhelper/Library_cppuhelper.mk | 2 -- cpputools/Executable_regcomp.mk | 2 -- cpputools/Executable_regsingleton.mk | 2 -- cpputools/Executable_uno.mk | 2 -- cui/Library_cui.mk | 2 -- dbaccess/CppunitTest_dbaccess_macros_test.mk | 2 -- dbaccess/Executable_odbcconfig.mk | 2 -- dbaccess/Library_dba.mk | 2 -- dbaccess/Library_dbaxml.mk | 2 -- dbaccess/Library_dbmm.mk | 2 -- dbaccess/Library_dbu.mk | 2 -- dbaccess/Library_sdbt.mk | 2 -- desktop/Executable_crashrep.com.mk | 2 -- desktop/Executable_officeloader.mk | 2 -- desktop/Executable_oosplash.mk | 2 -- desktop/Executable_quickstart.mk | 2 -- desktop/Executable_sbase.mk | 2 -- desktop/Executable_scalc.mk | 2 -- desktop/Executable_sdraw.mk | 2 -- desktop/Executable_simpress.mk | 2 -- desktop/Executable_smath.mk | 2 -- desktop/Executable_soffice.bin.mk | 2 -- desktop/Executable_soffice.mk | 2 -- desktop/Executable_soffice_bin.mk | 2 -- desktop/Executable_sweb.mk | 2 -- desktop/Executable_swriter.mk | 2 -- desktop/Executable_unopkg.bin.mk | 2 -- desktop/Library_deployment.mk | 2 -- desktop/Library_deploymentgui.mk | 2 -- desktop/Library_deploymentmisc.mk | 2 -- desktop/Library_migrationoo2.mk | 2 -- desktop/Library_migrationoo3.mk | 2 -- desktop/Library_offacc.mk | 2 -- desktop/Library_sofficeapp.mk | 2 -- desktop/Library_spl.mk | 2 -- desktop/Library_spl_unx.mk | 2 -- desktop/Library_unopkgapp.mk | 2 -- drawinglayer/Library_drawinglayer.mk | 2 -- dtrans/Library_dnd.mk | 2 -- dtrans/Library_dtrans.mk | 2 -- dtrans/Library_ftransl.mk | 2 -- dtrans/Library_mcnttype.mk | 2 -- dtrans/Library_sysdtrans.mk | 2 -- editeng/CppunitTest_editeng_borderline.mk | 2 -- editeng/CppunitTest_editeng_core.mk | 2 -- editeng/CppunitTest_editeng_lookuptree.mk | 2 -- editeng/Library_editeng.mk | 2 -- embeddedobj/Library_embobj.mk | 2 -- embeddedobj/Library_emboleobj.mk | 2 -- embedserv/Library_emser.mk | 2 -- embedserv/Library_inprocserv.mk | 2 -- eventattacher/Library_evtatt.mk | 2 -- extensions/CppunitTest_extensions_test_update.mk | 2 -- extensions/Library_abp.mk | 2 -- extensions/Library_bib.mk | 2 -- extensions/Library_dbp.mk | 2 -- extensions/Library_log.mk | 2 -- extensions/Library_pcr.mk | 2 -- extensions/Library_pl.mk | 2 -- extensions/Library_res.mk | 2 -- extensions/Library_scn.mk | 2 -- fileaccess/Library_fileacc.mk | 2 -- filter/CppunitTest_filter_pict_test.mk | 2 -- filter/CppunitTest_filter_tga_test.mk | 2 -- filter/CppunitTest_filter_tiff_test.mk | 2 -- filter/Executable_svg2odf.mk | 2 -- filter/Library_PptImporter.mk | 2 -- filter/Library_egi.mk | 2 -- filter/Library_eme.mk | 2 -- filter/Library_epb.mk | 2 -- filter/Library_epg.mk | 2 -- filter/Library_epp.mk | 2 -- filter/Library_eps.mk | 2 -- filter/Library_ept.mk | 2 -- filter/Library_era.mk | 2 -- filter/Library_eti.mk | 2 -- filter/Library_exp.mk | 2 -- filter/Library_filterconfig.mk | 2 -- filter/Library_flash.mk | 2 -- filter/Library_icd.mk | 2 -- filter/Library_icg.mk | 2 -- filter/Library_idx.mk | 2 -- filter/Library_ime.mk | 2 -- filter/Library_ipb.mk | 2 -- filter/Library_ipd.mk | 2 -- filter/Library_ips.mk | 2 -- filter/Library_ipt.mk | 2 -- filter/Library_ipx.mk | 2 -- filter/Library_ira.mk | 2 -- filter/Library_itg.mk | 2 -- filter/Library_iti.mk | 2 -- filter/Library_msfilter.mk | 2 -- filter/Library_odfflatxml.mk | 2 -- filter/Library_pdffilter.mk | 2 -- filter/Library_placeware.mk | 2 -- filter/Library_svgfilter.mk | 2 -- filter/Library_t602filter.mk | 2 -- filter/Library_textfd.mk | 2 -- filter/Library_xmlfa.mk | 2 -- filter/Library_xmlfd.mk | 2 -- filter/Library_xsltdlg.mk | 2 -- filter/Library_xsltfilter.mk | 2 -- forms/Library_frm.mk | 2 -- formula/Library_for.mk | 2 -- formula/Library_forui.mk | 2 -- fpicker/Library_fpicker.mk | 2 -- fpicker/Library_fps.mk | 2 -- fpicker/Library_fps_aqua.mk | 2 -- fpicker/Library_fps_odma.mk | 2 -- fpicker/Library_fps_office.mk | 2 -- framework/Library_fwe.mk | 2 -- framework/Library_fwi.mk | 2 -- framework/Library_fwk.mk | 2 -- framework/Library_fwl.mk | 2 -- framework/Library_fwm.mk | 2 -- framework/Library_lomenubar.mk | 2 -- hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 2 -- hwpfilter/Library_hwp.mk | 2 -- i18npool/CppunitTest_i18npool_test_breakiterator.mk | 2 -- i18npool/CppunitTest_i18npool_test_characterclassification.mk | 2 -- i18npool/CppunitTest_i18npool_test_languagetag.mk | 2 -- i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk | 2 -- i18npool/Executable_gencoll_rule.mk | 2 -- i18npool/Executable_genconv_dict.mk | 2 -- i18npool/Executable_gendict.mk | 2 -- i18npool/Executable_genindex_data.mk | 2 -- i18npool/Executable_saxparser.mk | 2 -- i18npool/Library_collator_data.mk | 2 -- i18npool/Library_dict_ja.mk | 2 -- i18npool/Library_dict_zh.mk | 2 -- i18npool/Library_i18nisolang1.mk | 2 -- i18npool/Library_i18npool.mk | 2 -- i18npool/Library_i18nsearch.mk | 2 -- i18npool/Library_index_data.mk | 2 -- i18npool/Library_localedata_en.mk | 2 -- i18npool/Library_localedata_es.mk | 2 -- i18npool/Library_localedata_euro.mk | 2 -- i18npool/Library_localedata_others.mk | 2 -- i18npool/Library_textconv_dict.mk | 2 -- i18nutil/Library_i18nutil.mk | 2 -- idl/Executable_svidl.mk | 2 -- io/Library_acceptor.mk | 2 -- io/Library_connector.mk | 2 -- io/Library_streams.mk | 2 -- io/Library_textinstream.mk | 2 -- io/Library_textoutstream.mk | 2 -- javaunohelper/Library_juh.mk | 2 -- javaunohelper/Library_juhx.mk | 2 -- jurt/Library_jpipe.mk | 2 -- jurt/Library_jpipx.mk | 2 -- jvmaccess/Library_jvmaccess.mk | 2 -- jvmfwk/Executable_javaldx.mk | 2 -- jvmfwk/Library_jvmfwk.mk | 2 -- jvmfwk/Library_sunjavaplugin.mk | 2 -- l10ntools/Executable_ulfconv.mk | 2 -- lingucomponent/Library_MacOSXSpell.mk | 2 -- lingucomponent/Library_guesslang.mk | 2 -- lingucomponent/Library_hyphen.mk | 2 -- lingucomponent/Library_lnth.mk | 2 -- lingucomponent/Library_spell.mk | 2 -- linguistic/Library_lng.mk | 2 -- lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 2 -- lotuswordpro/Library_lwpft.mk | 2 -- o3tl/CppunitTest_o3tl_tests.mk | 2 -- officecfg/CppunitTest_officecfg_cppheader_test.mk | 2 -- oox/Library_oox.mk | 2 -- package/Library_package2.mk | 2 -- package/Library_xstor.mk | 2 -- padmin/Executable_spadmin.bin.mk | 2 -- padmin/Library_spa.mk | 2 -- regexp/Library_regexp.mk | 2 -- registry/Library_reg.mk | 2 -- remotebridges/Library_uuresolver.mk | 2 -- reportdesign/Library_rpt.mk | 2 -- reportdesign/Library_rptui.mk | 2 -- reportdesign/Library_rptxml.mk | 2 -- rsc/Executable_rsc.mk | 2 -- sal/CppunitTest_Module_DLL.mk | 2 -- sal/CppunitTest_sal_bytesequence.mk | 2 -- sal/CppunitTest_sal_checkapi.mk | 2 -- sal/CppunitTest_sal_osl_condition.mk | 2 -- sal/CppunitTest_sal_osl_file.mk | 2 -- sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk | 2 -- sal/CppunitTest_sal_osl_module.mk | 2 -- sal/CppunitTest_sal_osl_mutex.mk | 2 -- sal/CppunitTest_sal_osl_old_test_file.mk | 2 -- sal/CppunitTest_sal_osl_pipe.mk | 2 -- sal/CppunitTest_sal_osl_process.mk | 2 -- sal/CppunitTest_sal_osl_profile.mk | 2 -- sal/CppunitTest_sal_osl_security.mk | 2 -- sal/CppunitTest_sal_osl_setthreadname.mk | 2 -- sal/CppunitTest_sal_osl_thread.mk | 2 -- sal/CppunitTest_sal_rtl_alloc.mk | 2 -- sal/CppunitTest_sal_rtl_cipher.mk | 2 -- sal/CppunitTest_sal_rtl_crc32.mk | 2 -- sal/CppunitTest_sal_rtl_doublelock.mk | 2 -- sal/CppunitTest_sal_rtl_locale.mk | 2 -- sal/CppunitTest_sal_rtl_math.mk | 2 -- sal/CppunitTest_sal_rtl_ostringbuffer.mk | 2 -- sal/CppunitTest_sal_rtl_oustringbuffer.mk | 2 -- sal/CppunitTest_sal_rtl_strings.mk | 2 -- sal/CppunitTest_sal_rtl_uri.mk | 2 -- sal/CppunitTest_sal_rtl_uuid.mk | 2 -- sal/CppunitTest_sal_tcwf.mk | 2 -- sal/CppunitTest_sal_types.mk | 2 -- sal/Executable_cppunittester.mk | 2 -- sal/Executable_osl_process_child.mk | 2 -- sal/Library_lo-bootstrap.mk | 2 ++ sal/Library_sal.mk | 2 -- sal/Library_sal_textenc.mk | 2 -- sal/Library_uwinapi.mk | 2 -- salhelper/CppunitTest_salhelper_checkapi.mk | 2 -- salhelper/Library_salhelper.mk | 2 -- sax/CppunitTest_sax.mk | 2 -- sax/Library_expwrap.mk | 2 -- sax/Library_fastsax.mk | 2 -- sax/Library_sax.mk | 2 -- sc/CppunitTest_sc_annotationshapeobj.mk | 2 -- sc/CppunitTest_sc_cellrangeobj.mk | 2 -- sc/CppunitTest_sc_chart_regression_test.mk | 2 -- sc/CppunitTest_sc_databaserangeobj.mk | 2 -- sc/CppunitTest_sc_datapilotfieldobj.mk | 2 -- sc/CppunitTest_sc_datapilottableobj.mk | 2 -- sc/CppunitTest_sc_editfieldobj_cell.mk | 2 -- sc/CppunitTest_sc_editfieldobj_header.mk | 2 -- sc/CppunitTest_sc_filters_test.mk | 2 -- sc/CppunitTest_sc_macros_test.mk | 2 -- sc/CppunitTest_sc_modelobj.mk | 2 -- sc/CppunitTest_sc_namedrangeobj.mk | 2 -- sc/CppunitTest_sc_namedrangesobj.mk | 2 -- sc/CppunitTest_sc_rangelst_test.mk | 2 -- sc/CppunitTest_sc_subsequent_filters_test.mk | 2 -- sc/CppunitTest_sc_tableautoformatfield.mk | 2 -- sc/CppunitTest_sc_tablesheetobj.mk | 2 -- sc/CppunitTest_sc_tablesheetsobj.mk | 2 -- sc/CppunitTest_sc_ucalc.mk | 2 -- sc/Library_sc.mk | 2 -- sc/Library_scd.mk | 2 -- sc/Library_scfilt.mk | 2 -- sc/Library_scui.mk | 2 -- sc/Library_vbaobj.mk | 2 -- scaddins/Library_analysis.mk | 2 -- scaddins/Library_date.mk | 2 -- sccomp/Library_solver.mk | 2 -- scripting/Library_basprov.mk | 2 -- scripting/Library_dlgprov.mk | 2 -- scripting/Library_protocolhandler.mk | 2 -- scripting/Library_scriptframe.mk | 2 -- scripting/Library_stringresource.mk | 2 -- scripting/Library_vbaevents.mk | 2 -- sd/CppunitTest_sd_filters_test.mk | 2 -- sd/CppunitTest_sd_regression_test.mk | 2 -- sd/CppunitTest_sd_uimpress.mk | 2 -- sd/Library_sd.mk | 2 -- sd/Library_sdd.mk | 2 -- sd/Library_sdfilt.mk | 2 -- sd/Library_sdui.mk | 2 -- sdext/CppunitTest_pdfimport.mk | 2 -- sfx2/CppunitTest_sfx2_metadatable.mk | 2 -- sfx2/Library_qstart.mk | 2 -- sfx2/Library_sfx.mk | 2 -- shell/Executable_lngconvex.mk | 2 -- shell/Library_cmdmail.mk | 2 -- shell/Library_desktopbe.mk | 2 -- shell/Library_gconfbe.mk | 2 -- shell/Library_kde4be.mk | 2 -- shell/Library_kdebe.mk | 2 -- shell/Library_localebe.mk | 2 -- shell/Library_macbe.mk | 2 -- shell/Library_recentfile.mk | 2 -- shell/Library_syssh.mk | 2 -- shell/Library_syssh_win.mk | 2 -- shell/Library_tdebe.mk | 2 -- shell/Library_wininetbe.mk | 2 -- slideshow/CppunitTest_slideshow.mk | 2 -- slideshow/Executable_demoshow.mk | 2 -- slideshow/Library_OGLTrans.mk | 2 -- slideshow/Library_slideshow.mk | 2 -- solenv/gbuild/CppunitTest.mk | 3 ++- solenv/gbuild/Executable.mk | 3 ++- solenv/gbuild/Library.mk | 3 ++- solenv/gbuild/LinkTarget.mk | 10 +++++----- sot/CppunitTest_sot_test_sot.mk | 2 -- sot/Library_sot.mk | 2 -- starmath/CppunitTest_starmath_qa_cppunit.mk | 2 -- starmath/Library_sm.mk | 2 -- starmath/Library_smd.mk | 2 -- stoc/Library_bootstrap.mk | 2 -- stoc/Library_introspection.mk | 2 -- stoc/Library_invocadapt.mk | 2 -- stoc/Library_invocation.mk | 2 -- stoc/Library_javaloader.mk | 2 -- stoc/Library_javavm.mk | 2 -- stoc/Library_namingservice.mk | 2 -- stoc/Library_proxyfac.mk | 2 -- stoc/Library_reflection.mk | 2 -- stoc/Library_stocservices.mk | 2 -- store/Library_store.mk | 2 -- svl/CppunitTest_svl_lngmisc.mk | 2 -- svl/CppunitTest_svl_urihelper.mk | 2 -- svl/Library_fsstorage.mk | 2 -- svl/Library_passwordcontainer.mk | 2 -- svl/Library_svl.mk | 2 -- svtools/CppunitTest_svtools_filters_test.mk | 2 -- svtools/Executable_bmp.mk | 2 -- svtools/Executable_bmpsum.mk | 2 -- svtools/Executable_g2g.mk | 2 -- svtools/Executable_langsupport.mk | 2 -- svtools/Library_hatchwindowfactory.mk | 2 -- svtools/Library_svt.mk | 2 -- svx/Executable_gengal.bin.mk | 2 -- svx/Library_svx.mk | 2 -- svx/Library_svxcore.mk | 2 -- svx/Library_textconversiondlgs.mk | 2 -- sw/CppunitTest_sw_filters_test.mk | 2 -- sw/CppunitTest_sw_layout_test.mk | 2 -- sw/CppunitTest_sw_macros_test.mk | 2 -- sw/CppunitTest_sw_regression_test.mk | 2 -- sw/CppunitTest_sw_subsequent_odfexport.mk | 2 -- sw/CppunitTest_sw_subsequent_odfimport.mk | 2 -- sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 2 -- sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 2 -- sw/CppunitTest_sw_subsequent_rtfexport.mk | 2 -- sw/CppunitTest_sw_subsequent_rtfimport.mk | 2 -- sw/CppunitTest_sw_subsequent_ww8export.mk | 2 -- sw/CppunitTest_sw_subsequent_ww8import.mk | 2 -- sw/CppunitTest_sw_swdoc_test.mk | 2 -- sw/Library_msword.mk | 2 -- sw/Library_sw.mk | 2 -- sw/Library_swd.mk | 2 -- sw/Library_swui.mk | 2 -- sw/Library_vbaswobj.mk | 2 -- test/Library_subsequenttest.mk | 2 -- test/Library_test.mk | 2 -- toolkit/Library_tk.mk | 2 -- tools/CppunitTest_tools_test.mk | 2 -- tools/Executable_bestreversemap.mk | 2 -- tools/Executable_mkunroll.mk | 2 -- tools/Executable_rscdep.mk | 2 -- tools/Executable_so_checksum.mk | 2 -- tools/Library_tl.mk | 2 -- touch/Library_libotouch.mk | 2 -- tubes/CppunitTest_tubes_test.mk | 2 -- tubes/Library_tubes.mk | 2 -- ucb/Library_cached1.mk | 2 -- ucb/Library_srtrs1.mk | 2 -- ucb/Library_ucb1.mk | 2 -- ucb/Library_ucpcmis1.mk | 2 -- ucb/Library_ucpdav1.mk | 2 -- ucb/Library_ucpexpand1.mk | 2 -- ucb/Library_ucpext.mk | 2 -- ucb/Library_ucpfile1.mk | 2 -- ucb/Library_ucpftp1.mk | 2 -- ucb/Library_ucpgio1.mk | 2 -- ucb/Library_ucpgvfs1.mk | 2 -- ucb/Library_ucphier1.mk | 2 -- ucb/Library_ucpodma1.mk | 2 -- ucb/Library_ucppkg1.mk | 2 -- ucb/Library_ucptdoc1.mk | 2 -- ucbhelper/Library_ucbhelper.mk | 2 -- unotest/Library_unobootstrapprotector.mk | 2 -- unotest/Library_unoexceptionprotector.mk | 2 -- unotest/Library_unotest.mk | 2 -- unotools/Library_utl.mk | 2 -- unoxml/Library_unordf.mk | 2 -- unoxml/Library_unoxml.mk | 2 -- uui/Library_uui.mk | 2 -- vbahelper/Library_msforms.mk | 2 -- vbahelper/Library_vbahelper.mk | 2 -- vcl/Executable_kdefilepicker.mk | 2 -- vcl/Executable_tdefilepicker.mk | 2 -- vcl/Library_desktop_detector.mk | 2 -- vcl/Library_vcl.mk | 2 -- vcl/Library_vclplug_gen.mk | 2 -- vcl/Library_vclplug_gtk.mk | 2 -- vcl/Library_vclplug_gtk3.mk | 2 -- vcl/Library_vclplug_kde.mk | 2 -- vcl/Library_vclplug_kde4.mk | 2 -- vcl/Library_vclplug_svp.mk | 2 -- vcl/Library_vclplug_tde.mk | 2 -- writerfilter/CppunitTest_writerfilter_doctok.mk | 2 -- writerfilter/CppunitTest_writerfilter_rtftok.mk | 2 -- writerfilter/Library_writerfilter.mk | 2 -- writerfilter/Library_writerfilter_uno.mk | 2 -- writerperfect/Library_wpftdraw.mk | 2 -- writerperfect/Library_wpftwriter.mk | 2 -- xml2cmp/Executable_xml2cmp.mk | 2 -- xmloff/Library_xo.mk | 2 -- xmloff/Library_xof.mk | 2 -- xmlreader/Library_xmlreader.mk | 2 -- xmlscript/Library_xmlscript.mk | 2 -- xmlsecurity/CppunitTest_qa_certext.mk | 2 -- xmlsecurity/Library_xmlsecurity.mk | 2 -- xmlsecurity/Library_xsec_fw.mk | 2 -- xmlsecurity/Library_xsec_xmlsec.mk | 2 -- 480 files changed, 13 insertions(+), 958 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 98d4cbf9ffde..f6bf68aaa5c9 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,merged)) - $(eval $(call gb_Library_use_externals,merged,\ cups \ icui18n \ diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index fd7e1736962a..ee4e0335abd7 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,ctl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ctl)) - $(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl)) $(eval $(call gb_Library_add_exception_objects,ctl,\ diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 667dcc30e09e..d10769f49041 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,acc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,acc)) - $(eval $(call gb_Library_add_exception_objects,acc,\ accessibility/source/extended/AccessibleBrowseBox \ accessibility/source/extended/AccessibleBrowseBoxBase \ diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index 1579f8a35e3a..3b4c27c39b96 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,java_uno_accessbridge)) - $(eval $(call gb_Library_add_exception_objects,java_uno_accessbridge,\ accessibility/bridge/source/java/WindowsAccessBridgeAdapter \ )) diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index f4ada9c4f3af..9f4d5b4912bf 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,animcore,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,animcore)) - $(eval $(call gb_Library_add_exception_objects,animcore,\ animations/source/animcore/animcore \ animations/source/animcore/factreg \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index f597bb35647d..40f952eba89b 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -59,8 +59,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmedia)) - $(eval $(call gb_Library_add_exception_objects,avmedia,\ avmedia/source/framework/mediacontrol \ avmedia/source/framework/mediaitem \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 7906a37c9665..defe843ab900 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmediaQuickTime)) - $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\ Cocoa \ QTKit \ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 394873f04a16..8bb85617aa05 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmediagst)) - $(eval $(call gb_Library_add_exception_objects,avmediagst,\ avmedia/source/gstreamer/gstmanager \ avmedia/source/gstreamer/gstplayer \ diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index 3369dbf57833..18387a9e05ef 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmediagst_0_10)) - $(eval $(call gb_Library_add_libs,avmediagst_0_10,\ $(GSTREAMER_0_10_LIBS) \ -lgstinterfaces-0.10 \ diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index ed1cc2d426fa..5d6649c37baa 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmediawin)) - $(eval $(call gb_Library_use_system_win32_libs,avmediawin,\ gdi32 \ ole32 \ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index ce2b096cbcac..b6e1c3b7dc5f 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,basctl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,basctl)) - $(eval $(call gb_Library_add_exception_objects,basctl,\ basctl/source/accessibility/accessibledialogcontrolshape \ basctl/source/accessibility/accessibledialogwindow \ diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index 5747cb6b59c8..4879303502de 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -30,8 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basebmp_cpputest)) - $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_cpputest,\ basebmp/test/basictest \ basebmp/test/bmpmasktest \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index fd385a8b1eb5..5f3de82840ff 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -21,8 +21,6 @@ $(eval $(call gb_Library_use_libraries,basebmp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,basebmp)) - $(eval $(call gb_Library_set_include,basebmp,\ -I$(SRCDIR)/basebmp/inc/ \ $$(INCLUDE) \ diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index a531848951b8..e9c3bb887ea4 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basegfx_cpputest)) - $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_cpputest,\ basegfx/test/basegfx1d \ basegfx/test/basegfx2d \ diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 6d974ec6395a..8cc7a86b7ae9 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -24,8 +24,6 @@ $(eval $(call gb_Library_use_libraries,basegfx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,basegfx)) - $(eval $(call gb_Library_set_include,basegfx,\ -I$(SRCDIR)/basegfx/inc \ -I$(SRCDIR)/basegfx/source/inc \ diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index 6e871736c1bf..5f6587dec684 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -31,8 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable)) - ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index a768ddf007c7..268f29a43b1c 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -32,8 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct)) - ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index 88876b75db9a..193c4a5835a5 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -32,8 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner)) - ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \ oleaut32 \ diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index c29a58c4b366..457a52bf6bdf 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,sb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sb)) - ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Library_add_exception_objects,sb,\ diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 64caf3dea54f..d17f795ce22c 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -53,6 +53,4 @@ $(eval $(call gb_Library_add_libs,officebean,\ $(AWTLIB) \ )) -$(eval $(call gb_Library_add_standard_system_libs,officebean)) - # vim: set noet sw=4 ts=4: diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index ecde720b9f58..93b716ca5990 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -33,8 +33,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-cache)) - $(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\ binaryurp/qa/test-cache \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index aed5a30d78a3..09fbcce439fa 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -36,8 +36,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-unmarshal)) - $(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\ binaryurp \ )) diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 99e223a68d22..223d9c8113d5 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,binaryurp)) - $(eval $(call gb_Library_add_exception_objects,binaryurp,\ binaryurp/source/binaryany \ binaryurp/source/bridge \ diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index 6a0fcba73cb2..94711eaecbab 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) - $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/shared/bridge \ bridges/source/cpp_uno/shared/component \ diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk index 97a37033f30a..502093241a98 100644 --- a/bridges/Library_gcc3_linux_intel.mk +++ b/bridges/Library_gcc3_linux_intel.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) - $(eval $(call gb_Library_add_asmobjects,gcc3_uno,\ bridges/source/cpp_uno/gcc3_linux_intel/call \ )) diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk index 91613d9ddcd4..a5dfe34b0f7c 100644 --- a/bridges/Library_gcc3_linux_mips.mk +++ b/bridges/Library_gcc3_linux_mips.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) - $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/gcc3_linux_mips/except \ bridges/source/cpp_uno/shared/bridge \ diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index df834277c41d..d9b8112b0282 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,java_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,java_uno)) - $(eval $(call gb_Library_add_exception_objects,java_uno,\ bridges/source/jni_uno/jni_bridge \ bridges/source/jni_uno/jni_data \ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index b85321f1b0d6..b9c93e21dff3 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -71,8 +71,6 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cairocanvas)) - $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_cachedbitmap \ canvas/source/cairo/cairo_cairo \ diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 1b66f16a6b57..ec143c36000a 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,canvasfactory)) - $(eval $(call gb_Library_add_exception_objects,canvasfactory,\ canvas/source/factory/cf_service \ )) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index cb363de2ef04..752c02befcaf 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,canvastools)) - $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/cachedprimitivebase \ canvas/source/tools/canvascustomspritehelper \ diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index d45b9066ca9b..22a989a308b0 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) - $(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\ d3d9 \ gdi32 \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index b053b153e5e2..327f9c1b2927 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -64,8 +64,6 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) - $(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\ gdi32 \ gdiplus \ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index ea7376e41bf5..0032336e2867 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,nullcanvas)) - $(eval $(call gb_Library_add_exception_objects,nullcanvas,\ canvas/source/null/null_canvasbitmap \ canvas/source/null/null_canvascustomsprite \ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index 1fa62e75d91c..02587dd0b3f7 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,simplecanvas)) - $(eval $(call gb_Library_add_exception_objects,simplecanvas,\ canvas/source/simplecanvas/simplecanvasimpl \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 53599b5555bf..e22d0dcc7e90 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclcanvas)) - $(eval $(call gb_Library_add_exception_objects,vclcanvas,\ canvas/source/vcl/backbuffer \ canvas/source/vcl/bitmapbackbuffer \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index d5d4ec39e4f1..be78baa95a4c 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,chartcontroller)) - $(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller)) $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 429416d6a955..15b6226acd60 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,chartcore)) - $(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore)) # view pieces ... diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index 73dcb63bd21d..0ccd386f8502 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,climaker,\ ) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,climaker)) - $(eval $(call gb_Executable_add_exception_objects,climaker,\ cli_ure/source/climaker/climaker_app \ cli_ure/source/climaker/climaker_emit \ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index 77ac8ef48606..16bfbd5bf6aa 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_add_defs,clucene,\ $(LFS_CFLAGS) \ )) -$(eval $(call gb_Library_add_standard_system_libs,clucene)) - ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,clucene,\ -lm \ diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index 11592b7cc976..b3f443de2cf2 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -44,8 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,comphelper_test)) - $(eval $(call gb_CppunitTest_set_include,comphelper_test,\ -I$(SRCDIR)/comphelper/inc \ $$(INCLUDE) \ diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index c54d59d85339..38156d6d6712 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,comphelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,comphelper)) - $(eval $(call gb_Library_use_sdk_api,comphelper)) $(eval $(call gb_Library_add_exception_objects,comphelper,\ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 7dd348d45562..f7e39baa373a 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -75,6 +75,4 @@ $(eval $(call gb_Library_use_libraries,configmgr, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,configmgr)) - $(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr)) diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index ed088bc89ee5..68abe62a2a1f 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,ado,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ado)) - $(eval $(call gb_Library_add_exception_objects,ado,\ connectivity/source/drivers/ado/ADatabaseMetaDataImpl \ connectivity/source/drivers/ado/Aolevariant \ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 489542bbe743..aedd21bb3347 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,calc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,calc)) - $(eval $(call gb_Library_add_exception_objects,calc,\ connectivity/source/drivers/calc/CResultSet \ connectivity/source/drivers/calc/CStatement \ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 14c61ec5fcd8..0dbb517bd6ae 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,dbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbase)) - $(eval $(call gb_Library_add_exception_objects,dbase,\ connectivity/source/drivers/dbase/DCode \ connectivity/source/drivers/dbase/DResultSet \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index ac008feb4bac..fbccc3ae0737 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbpool2)) - $(eval $(call gb_Library_add_exception_objects,dbpool2,\ connectivity/source/cpool/ZConnectionWrapper \ connectivity/source/cpool/ZDriverWrapper \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 74d8fea6058e..964f9f372950 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbtools)) - ifeq ($(filter-out NETBSD MACOSX,$(OS)),) $(eval $(call gb_Library_use_libraries,dbtools,\ ucbhelper \ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 4606b8865e1d..687245571f13 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,evoab,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,evoab)) - $(eval $(call gb_Library_add_exception_objects,evoab,\ connectivity/source/drivers/evoab2/NDriver \ connectivity/source/drivers/evoab2/NTable \ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index c3326b4af484..8ee3d104022d 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,file,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,file)) - $(eval $(call gb_Library_add_exception_objects,file,\ connectivity/source/drivers/file/FCatalog \ connectivity/source/drivers/file/FColumns \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 84345d803895..32e46440dc66 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,flat,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,flat)) - $(eval $(call gb_Library_add_exception_objects,flat,\ connectivity/source/drivers/flat/EResultSet \ connectivity/source/drivers/flat/EStatement \ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index b8b0e0f4372d..8521ae3107d9 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,hsqldb)) - $(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb)) $(eval $(call gb_Library_add_exception_objects,hsqldb,\ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 71edd85d90d5..23b755374e55 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jdbc)) - $(eval $(call gb_Library_add_exception_objects,jdbc,\ connectivity/source/drivers/jdbc/Array \ connectivity/source/drivers/jdbc/Blob \ diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index 8f2c04ee1263..7fd80cb65b65 100644 --- a/connectivity/Library_kab1.mk +++ b/connectivity/Library_kab1.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,kab1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,kab1)) - $(eval $(call gb_Library_add_exception_objects,kab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 097848e6e567..ecdd90568d98 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,kabdrv1,\ comphelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,kabdrv1)) - $(eval $(call gb_Library_add_exception_objects,kabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index 7058eb553ae6..e55422cf924f 100644 --- a/connectivity/Library_macab1.mk +++ b/connectivity/Library_macab1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,macab1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,macab1)) - $(eval $(call gb_Library_set_include,macab1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index feb754356a51..c4e77daaa417 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,macabdrv1)) - $(eval $(call gb_Library_set_include,macabdrv1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 009a3c79b01f..b11cb4f586af 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_use_libraries,mork, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mork)) - $(eval $(call gb_Library_use_sdk_api,mork)) $(eval $(call gb_Library_add_exception_objects,mork, \ diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index 394d227ea51f..4b4b78927229 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mozab2)) - $(eval $(call gb_Library_add_exception_objects,mozab2,\ connectivity/source/drivers/mozab/MDriver \ connectivity/source/drivers/mozab/MServices \ diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index b7f95a811fa0..b73efc2ec13d 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mozabdrv)) - $(eval $(call gb_Library_use_externals,mozabdrv,\ mozilla \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index edfb4986d943..cdea5e935bd7 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mozbootstrap)) - $(eval $(call gb_Library_add_exception_objects,mozbootstrap,\ connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap \ connectivity/source/drivers/mozab/bootstrap/MNSFolders \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 71bdd14bec67..4e05e402e1e1 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,mysql,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mysql)) - $(eval $(call gb_Library_add_exception_objects,mysql,\ connectivity/source/drivers/mysql/YDriver \ connectivity/source/drivers/mysql/YTables \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 32961f472a61..3f7ccbf02301 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,odbc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,odbc)) - $(eval $(call gb_Library_add_exception_objects,odbc,\ connectivity/source/drivers/odbc/oservices \ connectivity/source/drivers/odbc/ORealDriver \ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index f2b2d41d5b12..8335f7e0b1b5 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,odbcbase)) - $(eval $(call gb_Library_add_exception_objects,odbcbase,\ connectivity/source/drivers/odbcbase/OPreparedStatement \ connectivity/source/drivers/odbcbase/OStatement \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index a76eb7b735b6..7e525a9af7f0 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\ shell32 \ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 60fbfc97f9f7..1a9f8eb1dd6c 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc)) - $(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc)) $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 60db324099f8..7f030f1d53cd 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdbc2)) - $(eval $(call gb_Library_add_exception_objects,sdbc2,\ connectivity/source/manager/mdrivermanager \ connectivity/source/manager/mregistration \ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 8c402457d7fc..59f2f80cf039 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,tdeab1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,tdeab1)) - $(eval $(call gb_Library_add_exception_objects,tdeab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index 40601d7cf416..b2df458fd4a0 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,tdeabdrv1,\ comphelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,tdeabdrv1)) - $(eval $(call gb_Library_add_exception_objects,tdeabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index a37d36e0ab70..3fa5f1a13cd0 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cppcanvas)) - $(eval $(call gb_Library_add_exception_objects,cppcanvas,\ cppcanvas/source/mtfrenderer/bitmapaction \ cppcanvas/source/mtfrenderer/cachedprimitivebase \ diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index eb7dbc43f161..ac3f4185c3d0 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mtfrenderer)) - $(eval $(call gb_Library_use_sdk_api,mtfrenderer)) $(eval $(call gb_Library_add_exception_objects,mtfrenderer,\ diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk index af9e7ea16b48..c47643aea6c5 100644 --- a/cppu/CppunitTest_cppu_checkapi.mk +++ b/cppu/CppunitTest_cppu_checkapi.mk @@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 2b5f4653ee32..0a0342e5162a 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_any)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index dffd187d01a1..20d70508ed86 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_recursion)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index d2b59a27d5f9..2531f4247119 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_reference)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index ddc84583ff05..094e185fd9c6 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_unotype)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index 7472a3619da2..f235be8f122a 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_test_cppumaker)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \ cppu \ udkapi \ diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index 644c82054e85..1edc2876947d 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,affine_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,affine_uno)) - $(eval $(call gb_Library_add_exception_objects,affine_uno,\ cppu/source/AffineBridge/AffineBridge \ )) diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index 4bdbb01d2565..d6dbc58c66ed 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,cppu,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cppu)) - $(eval $(call gb_Library_add_cobjects,cppu,\ cppu/source/uno/EnvDcp \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index aacb8ed73495..e70d16b20fcb 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,log_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,log_uno)) - $(eval $(call gb_Library_add_exception_objects,log_uno,\ cppu/source/LogBridge/LogBridge \ )) diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index de60f76c5ce0..bddf619b2884 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,purpenvhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,purpenvhelper)) - $(eval $(call gb_Library_add_exception_objects,purpenvhelper,\ cppu/source/helper/purpenv/helper_purpenv_Environment \ cppu/source/helper/purpenv/helper_purpenv_Mapping \ diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index 9b3eb68418f4..f71fea1a1a88 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,unsafe_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unsafe_uno)) - $(eval $(call gb_Library_add_exception_objects,unsafe_uno,\ cppu/source/UnsafeBridge/UnsafeBridge \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk index e5ef4b2b895c..68fd0ec4bc1f 100644 --- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk +++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk @@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 7b50f334646d..b176884a0616 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -42,6 +42,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_ifcontainer)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index ee832217dd03..d67382b75d8e 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -38,6 +38,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_unourl)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index 6dd88b393cb1..f9fe2742186b 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -42,6 +42,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_qa_weak)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index fcb37211671f..59020c27ef96 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cppuhelper)) - $(eval $(call gb_Library_add_cobjects,cppuhelper,\ cppuhelper/source/findsofficepath \ )) diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk index 017a8d6332c7..844fd94d683a 100644 --- a/cpputools/Executable_regcomp.mk +++ b/cpputools/Executable_regcomp.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,regcomp)) - $(eval $(call gb_Executable_add_exception_objects,regcomp,\ cpputools/source/registercomponent/registercomponent \ )) diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk index 19d507fe6a81..0d3354dc6e99 100644 --- a/cpputools/Executable_regsingleton.mk +++ b/cpputools/Executable_regsingleton.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,regsingleton)) - $(eval $(call gb_Executable_add_exception_objects,regsingleton,\ cpputools/source/regsingleton/regsingleton \ )) diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index 65280c0b2269..1825fbdc227f 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Executable_use_libraries,uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,uno)) - $(eval $(call gb_Executable_use_externals,uno,\ libxml2 \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 23321fc64cce..5c66e71eed8b 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -71,8 +71,6 @@ $(eval $(call gb_Library_use_libraries,cui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cui)) - $(eval $(call gb_Library_use_externals,cui,\ icuuc \ )) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 06ac3147070c..4db6c7183576 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -71,8 +71,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,dbaccess_macros_test)) - $(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index 809832fad7a3..0bc3e0da4bb4 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,odbcconfig,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,odbcconfig)) - $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\ dbaccess/win32/source/odbcconfig/odbcconfig \ )) diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 8ec7dcd47e35..40a075ea10a3 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_libraries,dba,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dba)) - $(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba)) $(eval $(call gb_Library_add_exception_objects,dba,\ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index e9db12444e8d..821852218459 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbaxml)) - $(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml)) $(eval $(call gb_Library_add_exception_objects,dbaxml,\ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 3da15cfea101..dd0a73b9b179 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbmm)) - $(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm)) $(eval $(call gb_Library_add_exception_objects,dbmm,\ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 8d35b1f3da53..f63efabcbdce 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -73,8 +73,6 @@ $(eval $(call gb_Library_use_libraries,dbu,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbu)) - ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_system_win32_libs,dbu,\ ole32 \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 306b9ec99075..cc80dca441d5 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdbt)) - $(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt)) $(eval $(call gb_Library_add_exception_objects,sdbt,\ diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index 1c712acd537b..c42d6301a085 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,crashrep_com,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,crashrep_com)) - $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\ desktop/win32/source/guistdio/guistdio \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index d881087c969c..d29e0d31108b 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Executable_use_libraries,officeloader,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,officeloader)) - # I'm not suer wht was the intent, but that break the link #$(eval $(call gb_Executable_set_ldflags,officeloader,\ # $(filter -bind_at_load,$$(LDFLAGS)) \ diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 0cded218f54f..3fa96d4f57ce 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,oosplash,\ sal \ )) -$(eval $(call gb_Executable_add_standard_system_libs,oosplash)) - $(eval $(call gb_Executable_add_cobjects,oosplash,\ desktop/unx/source/args \ desktop/unx/source/file_image_unx \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index aecd9b37dd2b..555917edf714 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,quickstart)) - ifeq ($(COM),GCC) $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 2da4803c9f31..3036b5de5cb2 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,sbase)) - $(eval $(call gb_Executable_add_libs,sbase,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 9d8c906240f7..aa4ce8f7e219 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,scalc)) - $(eval $(call gb_Executable_add_libs,scalc,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 37605330bfb8..c3f20a674b2a 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,sdraw)) - $(eval $(call gb_Executable_add_libs,sdraw,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index da674755db7e..34d7e13f3913 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,simpress)) - $(eval $(call gb_Executable_add_libs,simpress,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 261fada2d03c..9ff184704fa2 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,smath)) - $(eval $(call gb_Executable_add_libs,smath,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 98271c98d55b..4de733cb3036 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,soffice.bin)) - $(eval $(call gb_Executable_add_cobjects,soffice.bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 302c978a0096..d28a20a1ddc9 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,soffice,\ shlwapi \ )) -$(eval $(call gb_Executable_add_standard_system_libs,soffice)) - $(eval $(call gb_Executable_use_static_libraries,soffice,\ ooopathutils \ winextendloaderenv \ diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index 83c725701c27..5bcf14ac10b5 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,soffice_bin)) - $(eval $(call gb_Executable_add_cobjects,soffice_bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 2bade4a68e1e..2182da57db77 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,sweb)) - $(eval $(call gb_Executable_add_libs,sweb,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 2e9d22fb1e9d..e82215317179 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,swriter)) - $(eval $(call gb_Executable_add_libs,swriter,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index d2ff1a3db48b..a15831627d6a 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,$(desktop_UNOPKGBIN))) - $(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\ desktop/source/pkgchk/unopkg/unopkg_main \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index 9937fdf0abe5..8298eb9915cf 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,deployment)) - ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deployment,\ berkeleydb \ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 712a020262ab..a7955115d3f8 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index e5b179abc38d..2124ea59be1a 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,deploymentmisc)) - ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deploymentmisc,\ berkeleydb \ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 8c803522193b..36f430d4dcac 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,migrationoo2)) - $(eval $(call gb_Library_use_externals,migrationoo2,\ berkeleydb \ )) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index 41bc2c1b4a07..6c0783b53b9d 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,migrationoo3)) - $(eval $(call gb_Library_use_externals,migrationoo3,\ berkeleydb \ )) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 769cf5a56945..8272b4d49920 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,offacc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,offacc)) - $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc)) $(eval $(call gb_Library_add_exception_objects,offacc,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index af9f39f7d72c..377fe1ac2172 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sofficeapp)) - ifeq ($(GUIBASE),cocoatouch) $(eval $(call gb_Library_add_cflags,sofficeapp,\ $(gb_OBJCFLAGS) \ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index 97c0cbf67dac..cc5086db0f68 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,spl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,spl)) - $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl)) $(eval $(call gb_Library_add_exception_objects,spl,\ diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index 92059c690010..577a018849d3 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,spl_unx,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,spl_unx)) - $(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash)) $(eval $(call gb_Library_add_exception_objects,spl_unx,\ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 4958c6fa47ca..5ce00afd5de6 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unopkgapp)) - $(eval $(call gb_Library_add_exception_objects,unopkgapp,\ desktop/source/pkgchk/unopkg/unopkg_app \ desktop/source/pkgchk/unopkg/unopkg_cmdenv \ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 0b0a62cab133..39d53d5d58bb 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,drawinglayer)) - $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/animation/animationtiming \ drawinglayer/source/attribute/fillbitmapattribute \ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 60027e2fef61..952b3cc51115 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_system_win32_libs,dnd,\ uuid \ )) -$(eval $(call gb_Library_add_standard_system_libs,dnd)) - $(eval $(call gb_Library_use_static_libraries,dnd,\ dtobj \ )) diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index e6e48bebd32b..1313b9bff939 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,dtrans,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dtrans)) - $(eval $(call gb_Library_add_exception_objects,dtrans,\ dtrans/source/generic/clipboardmanager \ dtrans/source/generic/dtrans \ diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index f4c4e272999f..f85460203a9d 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_system_win32_libs,ftransl,\ ole32 \ )) -$(eval $(call gb_Library_add_standard_system_libs,ftransl)) - $(eval $(call gb_Library_use_static_libraries,ftransl,\ dtobj \ )) diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index aa112dc51705..167f2a13fe38 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mcnttype)) - $(eval $(call gb_Library_add_exception_objects,mcnttype,\ dtrans/source/cnttype/mcnttfactory \ dtrans/source/cnttype/mcnttype \ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 93e7b696604b..6be9786b72fa 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -57,8 +57,6 @@ $(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\ uuid \ )) -$(eval $(call gb_Library_add_standard_system_libs,sysdtrans)) - $(eval $(call gb_Library_use_static_libraries,sysdtrans,\ dtobj \ )) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 6b513bba5388..106892a7f526 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -55,8 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_borderline)) - $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index 561effdb67da..d98ddc76e2dd 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -60,8 +60,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_core)) - $(eval $(call gb_CppunitTest_use_externals,editeng_core,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk index a61c85495baa..499b6ed35e30 100644 --- a/editeng/CppunitTest_editeng_lookuptree.mk +++ b/editeng/CppunitTest_editeng_lookuptree.mk @@ -55,8 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_lookuptree)) - $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\ icuuc \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 308e7595de12..178d0168dd15 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -154,8 +154,6 @@ $(eval $(call gb_Library_use_libraries,editeng,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,editeng)) - $(eval $(call gb_Library_use_external,editeng,icuuc)) # Runtime dependency for unit-tests diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 083166c77c1c..47963a0fd05f 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,embobj,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,embobj)) - $(eval $(call gb_Library_add_exception_objects,embobj,\ embeddedobj/source/commonembedding/embedobj \ embeddedobj/source/commonembedding/inplaceobj \ diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index b4c8e6bb7be9..32dfe09731ce 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,emboleobj)) - $(eval $(call gb_Library_add_exception_objects,emboleobj,\ embeddedobj/source/msole/closepreventer \ embeddedobj/source/msole/oleembed \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index c261f9448e64..4d7e0d0b504a 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_system_win32_libs,emser,\ uuid \ )) -$(eval $(call gb_Library_add_standard_system_libs,emser)) - ifeq ($(USE_DEBUG_RUNTIME),) $(eval $(call gb_Library_add_libs,emser,\ $(ATL_LIB)/atls.lib \ diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index ffe596a86b0c..3c1bf0d0aa75 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,inprocserv)) - ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,inprocserv,\ /EXPORT:DllCanUnloadNow \ diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index 3ea419418096..4e18e3c57e00 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,evtatt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,evtatt)) - $(eval $(call gb_Library_add_exception_objects,evtatt,\ eventattacher/source/eventattacher \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index b5e88d2ba1e0..51e5fc4458c9 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -42,8 +42,6 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update)) - ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\ shell32 \ diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index 82ac86bef87d..b4a556976bc6 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -86,6 +86,4 @@ $(eval $(call gb_Library_use_libraries,abp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,abp)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index 6ba529538ad3..4e46e07c1da8 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -70,6 +70,4 @@ $(eval $(call gb_Library_use_libraries,bib,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,bib)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index caf72dc5114a..47b64e5ed832 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -72,6 +72,4 @@ $(eval $(call gb_Library_use_libraries,dbp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbp)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index a366362cfea3..d09c1d04f552 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -55,6 +55,4 @@ $(eval $(call gb_Library_use_libraries,log,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,log)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 974701566838..690a3cd28256 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,pcr,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,pcr)) - $(eval $(call gb_Library_add_exception_objects,pcr,\ extensions/source/propctrlr/MasterDetailLinkDialog \ extensions/source/propctrlr/browserline \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index dc5e6c4f9cde..8cbbd1baf207 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -133,8 +133,6 @@ $(eval $(call gb_Library_use_libraries,pl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,pl)) - $(eval $(call gb_Library_add_exception_objects,pl,\ extensions/source/plugin/base/context \ extensions/source/plugin/base/evtlstnr \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index 22587cc65e9c..953e369e4d48 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,res,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,res)) - $(eval $(call gb_Library_add_exception_objects,res,\ extensions/source/resource/ResourceIndexAccess \ extensions/source/resource/oooresourceloader \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index a72cabcb6371..df976e6aa026 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,scn,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scn)) - $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scnserv \ extensions/source/scanner/scanner \ diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index 01a54320119a..a5df4474c901 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,fileacc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fileacc)) - $(eval $(call gb_Library_set_componentfile,fileacc,fileaccess/source/fileacc)) $(eval $(call gb_Library_add_exception_objects,fileacc,fileaccess/source/FileAccess)) diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index a84cffa41506..082ea8c53e9f 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_pict_test)) - $(eval $(call gb_CppunitTest_use_api,filter_pict_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index 597cd2cbfa55..2829dbd17005 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tga_test)) - $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index ce29bb29c6f8..1fe899c228a9 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tiff_test)) - $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\ udkapi \ offapi \ diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index ad38d5eba6fd..ca0b39b4ddd5 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,svg2odf)) - $(eval $(call gb_Executable_add_exception_objects,svg2odf,\ filter/source/svg/test/svg2odf \ filter/source/svg/test/odfserializer \ diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index 22e613952383..f1d172aeda4f 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,PptImporter)) - $(eval $(call gb_Library_add_exception_objects,PptImporter,\ filter/source/msfilter/powerpoint/pptimporter \ filter/source/msfilter/powerpoint/pptimporteruno \ diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index 68c45f9f1adb..21bfacd47d8e 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,egi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,egi)) - $(eval $(call gb_Library_add_exception_objects,egi,\ filter/source/graphicfilter/egif/egif \ filter/source/graphicfilter/egif/giflzwc \ diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index aed74813581c..603dd60fca50 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,eme,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,eme)) - $(eval $(call gb_Library_add_exception_objects,eme,\ filter/source/graphicfilter/eos2met/eos2met \ )) diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index dabe92c4d75c..ef5cf034a0a6 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,epb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,epb)) - $(eval $(call gb_Library_add_exception_objects,epb,\ filter/source/graphicfilter/epbm/epbm \ )) diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index cf1ab1f69b65..4f0bf50af97e 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,epg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,epg)) - $(eval $(call gb_Library_add_exception_objects,epg,\ filter/source/graphicfilter/epgm/epgm \ )) diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 9ca7ff0d0c4d..7ff57d7fa1b9 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,epp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,epp)) - $(eval $(call gb_Library_add_exception_objects,epp,\ filter/source/graphicfilter/eppm/eppm \ )) diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index 7ce9d29b04a4..5dda0d59957d 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,eps,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,eps)) - $(eval $(call gb_Library_add_exception_objects,eps,\ filter/source/graphicfilter/eps/eps \ )) diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index 5281662571a4..7e798f514647 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,ept,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ept)) - $(eval $(call gb_Library_add_exception_objects,ept,\ filter/source/graphicfilter/epict/epict \ )) diff --git a/filter/Library_era.mk b/filter/Library_era.mk index b558d014c8dd..80d576adbc02 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,era,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,era)) - $(eval $(call gb_Library_add_exception_objects,era,\ filter/source/graphicfilter/eras/eras \ )) diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index 45c1aa1a9fd8..1bdf01f16235 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,eti,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,eti)) - $(eval $(call gb_Library_add_exception_objects,eti,\ filter/source/graphicfilter/etiff/etiff \ )) diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index de4e0873178c..b9e8bfb3d9ad 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,exp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,exp)) - $(eval $(call gb_Library_add_exception_objects,exp,\ filter/source/graphicfilter/expm/expm \ )) diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index accb75de4a39..358239e8b32f 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,filterconfig)) - $(eval $(call gb_Library_add_exception_objects,filterconfig,\ filter/source/config/cache/basecontainer \ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 13843bd93578..fd06b4c30f8b 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,flash,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,flash)) - $(eval $(call gb_Library_use_externals,flash,zlib)) $(eval $(call gb_Library_add_exception_objects,flash,\ diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index ca60b884d51b..0edc312dd344 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,icd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,icd)) - $(eval $(call gb_Library_add_exception_objects,icd,\ filter/source/graphicfilter/ipcd/ipcd \ )) diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 614107ef2be3..da26358dbdf5 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,icg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,icg)) - $(eval $(call gb_Library_add_exception_objects,icg,\ filter/source/graphicfilter/icgm/actimpr \ filter/source/graphicfilter/icgm/bitmap \ diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index 6cd2083284b9..9b02248305b9 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,idx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,idx)) - $(eval $(call gb_Library_add_exception_objects,idx,\ filter/source/graphicfilter/idxf/dxf2mtf \ filter/source/graphicfilter/idxf/dxfblkrd \ diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index 8aa08162ddb6..3de90cee440c 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ime,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ime)) - $(eval $(call gb_Library_add_exception_objects,ime,\ filter/source/graphicfilter/ios2met/ios2met \ )) diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index 34db6b034768..cf2a5773e910 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ipb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ipb)) - $(eval $(call gb_Library_add_exception_objects,ipb,\ filter/source/graphicfilter/ipbm/ipbm \ )) diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index d84768c10561..844bd3498ae9 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ipd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ipd)) - $(eval $(call gb_Library_add_exception_objects,ipd,\ filter/source/graphicfilter/ipsd/ipsd \ )) diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index 01226fc530db..feed47ad0223 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ips,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ips)) - $(eval $(call gb_Library_add_exception_objects,ips,\ filter/source/graphicfilter/ieps/ieps \ )) diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index f6047a0c2460..86722c627490 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,ipt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ipt)) - $(eval $(call gb_Library_add_exception_objects,ipt,\ filter/source/graphicfilter/ipict/ipict \ filter/source/graphicfilter/ipict/shape \ diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index b266f3b39879..50c87ec33be6 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ipx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ipx)) - $(eval $(call gb_Library_add_exception_objects,ipx,\ filter/source/graphicfilter/ipcx/ipcx \ )) diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index d1f2b8a14cc1..80e2231d9834 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ira,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ira)) - $(eval $(call gb_Library_add_exception_objects,ira,\ filter/source/graphicfilter/iras/iras \ )) diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index fb7ae312fc3f..2e64888e2da6 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,itg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,itg)) - $(eval $(call gb_Library_add_exception_objects,itg,\ filter/source/graphicfilter/itga/itga \ )) diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index 895b2cd172e7..d186dc03163c 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,iti,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,iti)) - $(eval $(call gb_Library_add_exception_objects,iti,\ filter/source/graphicfilter/itiff/ccidecom \ filter/source/graphicfilter/itiff/itiff \ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 2061f571015e..ea042bba87a1 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,msfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,msfilter)) - $(eval $(call gb_Library_add_exception_objects,msfilter,\ filter/source/msfilter/countryid \ filter/source/msfilter/escherex \ diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index b7a99a4568e8..b7d66b66488a 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,odfflatxml)) - $(eval $(call gb_Library_add_exception_objects,odfflatxml,\ filter/source/odfflatxml/OdfFlatXml \ )) diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index 1801ccf6086f..1f108429f44e 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,pdffilter)) - $(eval $(call gb_Library_add_exception_objects,pdffilter,\ filter/source/pdf/impdialog \ filter/source/pdf/pdfdialog \ diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index eee399f1b859..742be659e46b 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,placeware,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,placeware)) - $(eval $(call gb_Library_add_exception_objects,placeware,\ filter/source/placeware/exporter \ filter/source/placeware/filter \ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index c3b752e4d0f2..bc8520b80724 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svgfilter)) - $(eval $(call gb_Library_use_externals,svgfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,svgfilter,\ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index b3d649db3ad2..12c7af621f0f 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,t602filter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,t602filter)) - $(eval $(call gb_Library_add_exception_objects,t602filter,\ filter/source/t602/filterenv \ filter/source/t602/t602filter \ diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index 3acc160d3954..bcb4d90b55de 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,textfd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textfd)) - $(eval $(call gb_Library_add_exception_objects,textfd,\ filter/source/textfilterdetect/fdcomp \ filter/source/textfilterdetect/filterdetect \ diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index 5cd70bb6ab76..54f98948ae92 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xmlfa)) - $(eval $(call gb_Library_add_exception_objects,xmlfa,\ filter/source/xmlfilteradaptor/XmlFilterAdaptor \ filter/source/xmlfilteradaptor/genericfilter \ diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index 99c6a8e91a62..af18c641d101 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,xmlfd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xmlfd)) - $(eval $(call gb_Library_add_exception_objects,xmlfd,\ filter/source/xmlfilterdetect/fdcomp \ filter/source/xmlfilterdetect/filterdetect \ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 2f87b27acfa7..293721047d58 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsltdlg)) - $(eval $(call gb_Library_add_exception_objects,xsltdlg,\ filter/source/xsltdialog/typedetectionexport \ filter/source/xsltdialog/typedetectionimport \ diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 3dec5645a86f..1563c14fe4ab 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsltfilter)) - $(eval $(call gb_Library_use_externals,xsltfilter,\ libxml2 \ libxslt \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 809bef707b6e..e86803163839 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,frm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,frm)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,frm,\ icuin \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 4e392b7fa15c..848103af2e7c 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,for,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,for)) - $(eval $(call gb_Library_set_componentfile,for,formula/util/for)) $(eval $(call gb_Library_add_exception_objects,for,\ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index b92cf91da298..07ff194f14dc 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,forui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,forui)) - $(eval $(call gb_Library_add_exception_objects,forui,\ formula/source/ui/dlg/formula \ formula/source/ui/dlg/FormulaHelper \ diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index c18687564d4d..0a85dd4a00ae 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,fpicker,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fpicker)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fpicker,\ odma_lib \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index b3b3fc3a3d4a..eb1cd0c28687 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_system_win32_libs,fps,\ uuid \ )) -$(eval $(call gb_Library_add_standard_system_libs,fps)) - ifeq ($(COM),MSC) $(eval $(call gb_Library_add_libs,fps,\ Delayimp.lib /DELAYLOAD:shell32.dll \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index 1f1d3e4f2fd9..241be777d272 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,fps_aqua,\ vcl \ )) -$(eval $(call gb_Library_add_standard_system_libs,fps_aqua)) - $(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\ fpicker/source/aqua/AquaFilePickerDelegate \ fpicker/source/aqua/CFStringUtilities \ diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index dbb1fe382339..63e9834fe068 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fps_odma)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fps_odma,\ odma_lib \ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 5582ffb076e2..58e3011fe7b6 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fps_office)) - $(eval $(call gb_Library_add_exception_objects,fps_office,\ fpicker/source/office/asyncfilepicker \ fpicker/source/office/commonpicker \ diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index fcc35cc1fecc..38f5f9a7adc0 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,fwe,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwe)) - $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/classes/actiontriggercontainer \ framework/source/fwe/classes/actiontriggerpropertyset \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index eab6f7a4f44c..3dddcc13b999 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -57,8 +57,6 @@ $(eval $(call gb_Library_use_libraries,fwi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwi)) - $(eval $(call gb_Library_add_exception_objects,fwi,\ framework/source/fwi/classes/converter \ framework/source/fwi/classes/propertysethelper \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 3a4ed045cae0..84ad3c6a3654 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -57,8 +57,6 @@ $(eval $(call gb_Library_use_libraries,fwk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwk)) - $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/accelerators/acceleratorcache \ framework/source/accelerators/acceleratorconfiguration \ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 45c605663651..b01dbbf47ff0 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,fwl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwl)) - $(eval $(call gb_Library_add_exception_objects,fwl,\ framework/source/classes/fwlresid \ framework/source/dispatch/mailtodispatcher \ diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index bc0daca7caff..ad0d53637eab 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,fwm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwm)) - $(eval $(call gb_Library_add_exception_objects,fwm,\ framework/source/dispatch/systemexec \ framework/source/jobs/helponstartup \ diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk index ad4742f70e49..dbf2110db63c 100644 --- a/framework/Library_lomenubar.mk +++ b/framework/Library_lomenubar.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_add_libs,lomenubar,\ -lX11 \ )) -$(eval $(call gb_Library_add_standard_system_libs,lomenubar)) - $(eval $(call gb_Library_add_exception_objects,lomenubar,\ framework/source/lomenubar/MenuItemInfo \ framework/source/lomenubar/AwtKeyToDbusmenuString \ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index f4a269873d5e..ac3779f4b391 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,hwpfilter_test_hwpfilter)) - $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\ offapi \ udkapi \ diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 7b44aa42984a..2681f966ab08 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,hwp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,hwp)) - $(eval $(call gb_Library_use_external,hwp,zlib)) ifeq ($(OS),WNT) diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index c51f0a1630ce..24f67623d6d4 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_breakiterator)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ i18npool/qa/cppunit/test_breakiterator \ )) diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index 086dec586d1f..62f852d7a2d2 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_characterclassification)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\ i18npool/qa/cppunit/test_characterclassification \ )) diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk index 7043f320c028..610791cedbae 100644 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk @@ -23,8 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_languagetag)) - ifeq ($(ENABLE_LIBLANGTAG),YES) $(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\ liblangtag \ diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index ed943389e970..c9236da6a47c 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_ordinalsuffix)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_ordinalsuffix,\ i18npool/qa/cppunit/test_ordinalsuffix \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 82aafdb4cea0..d0ef67acc5a9 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,gencoll_rule)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 22ea9c5d54d1..70ec6c97dd2f 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,genconv_dict,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,genconv_dict)) - $(eval $(call gb_Executable_add_exception_objects,genconv_dict,\ i18npool/source/textconversion/genconv_dict \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index 38aae75eb138..3b63cfc5eea5 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,gendict,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,gendict)) - $(eval $(call gb_Executable_add_exception_objects,gendict,\ i18npool/source/breakiterator/gendict \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index c6b532192466..2c36e3e3123a 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,genindex_data,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,genindex_data)) - ifeq ($(OS),WNT) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index b61799d690d1..ba0be63c5fc9 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,saxparser)) - $(eval $(call gb_Executable_add_exception_objects,saxparser,\ i18npool/source/localedata/LocaleNode \ i18npool/source/localedata/filewriter \ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index a136cef873e0..952cbc667335 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,collator_data,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,collator_data)) - $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\ CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index a22555b231f5..70e33cca4d02 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,dict_ja,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dict_ja)) - $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\ CustomTarget/i18npool/breakiterator/dict_ja \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index 8b80f193de23..56d4dc987c75 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,dict_zh,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dict_zh)) - $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\ CustomTarget/i18npool/breakiterator/dict_zh \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 422d9cde94f6..3432d9d25329 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,i18nisolang1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nisolang1)) - $(eval $(call gb_Library_add_exception_objects,i18nisolang1,\ i18npool/source/isolang/insys \ i18npool/source/isolang/isolang \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 81486613da42..1e26716a3d5b 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18npool)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,i18npool,\ icuin \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index 828ec2ba37ca..d4499c8cade1 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nsearch)) - $(eval $(call gb_Library_add_exception_objects,i18nsearch,\ i18npool/source/search/levdis \ i18npool/source/search/textsearch \ diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index 79f1cd93a64b..d60870770a44 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,index_data,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,index_data)) - $(eval $(call gb_Library_add_generated_exception_objects,index_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\ CustomTarget/i18npool/indexentry/$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index a5cf7a780676..d5a2c9349460 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,localedata_en,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_en)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\ CustomTarget/i18npool/localedata/localedata_en_AU \ CustomTarget/i18npool/localedata/localedata_en_BZ \ diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 75ba17341a33..4b9931715054 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,localedata_es,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_es)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\ CustomTarget/i18npool/localedata/localedata_es_AR \ CustomTarget/i18npool/localedata/localedata_es_BO \ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index ad3ebc679071..1122d0c2b1a5 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,localedata_euro,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_euro)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_an_ES \ CustomTarget/i18npool/localedata/localedata_ast_ES \ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index b18593db55bf..66aab48d2466 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,localedata_others,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_others)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_af_NA \ CustomTarget/i18npool/localedata/localedata_af_ZA \ diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index a568534c0a97..23afa2113a7c 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textconv_dict)) - $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),\ CustomTarget/i18npool/textconversion/$(notdir $(basename $(txt)))) \ diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index fab587956517..94f5e20e5ea1 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,i18nutil,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nutil)) - $(eval $(call gb_Library_add_exception_objects,i18nutil,\ i18nutil/source/utility/casefolding \ i18nutil/source/utility/oneToOneMapping \ diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index fdde856cd925..8ae41a5894f9 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,svidl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,svidl)) - $(eval $(call gb_Executable_add_exception_objects,svidl,\ idl/source/cmptools/hash \ idl/source/cmptools/lex \ diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index f00e15bed383..07a702576f2c 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,acceptor,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,acceptor)) - $(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor)) $(eval $(call gb_Library_add_exception_objects,acceptor,\ diff --git a/io/Library_connector.mk b/io/Library_connector.mk index 826b074507c3..10e8e8aa1634 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,connector,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,connector)) - $(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connector)) $(eval $(call gb_Library_add_exception_objects,connector,\ diff --git a/io/Library_streams.mk b/io/Library_streams.mk index 8bf18f4db6d2..6ba413c8ddd9 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,streams,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,streams)) - $(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams)) $(eval $(call gb_Library_add_exception_objects,streams,\ diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk index 80ada3ef8d17..fbbe8756dd53 100644 --- a/io/Library_textinstream.mk +++ b/io/Library_textinstream.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,textinstream,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textinstream)) - $(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream)) $(eval $(call gb_Library_add_exception_objects,textinstream,\ diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk index b6b0ff2bf899..0aeacdf2f64f 100644 --- a/io/Library_textoutstream.mk +++ b/io/Library_textoutstream.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,textoutstream,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textoutstream)) - $(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream)) $(eval $(call gb_Library_add_exception_objects,textoutstream,\ diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index dd1644f4005a..8d1a3e83f908 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,juh,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,juh)) - ifneq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Library_add_exception_objects,juh,\ javaunohelper/source/preload \ diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index eeef545357b7..a3bb96408978 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,juhx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,juhx)) - $(eval $(call gb_Library_add_exception_objects,juhx,\ javaunohelper/source/bootstrap \ javaunohelper/source/javaunohelper \ diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 3f50e7a34a8e..0cd0d4f0293c 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,jpipe,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jpipe)) - ifeq ($(OS),WNT) # The real library is called jpipx on Windows. We build only a wrapper diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk index 14d91cb9b839..c8978c86a5ac 100644 --- a/jurt/Library_jpipx.mk +++ b/jurt/Library_jpipx.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,jpipx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jpipx)) - $(eval $(call gb_Library_add_cobjects,jpipx,\ jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \ )) diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index 6e8578dd0147..8a00566dc7b8 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,jvmaccess,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jvmaccess)) - $(eval $(call gb_Library_add_exception_objects,jvmaccess,\ jvmaccess/source/classpath \ jvmaccess/source/unovirtualmachine \ diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index aedb7dbc0b3a..0e64f3ffc5d8 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Executable_use_libraries,javaldx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,javaldx)) - $(eval $(call gb_Executable_add_exception_objects,javaldx,\ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 5051a2b9bb17..697642c4479f 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ advapi32 \ diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 61ff7bdfe5ac..d32dc70aa22c 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sunjavaplugin)) - ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ lo-bootstrap \ diff --git a/l10ntools/Executable_ulfconv.mk b/l10ntools/Executable_ulfconv.mk index b981e56e2e59..b8a2001a2359 100644 --- a/l10ntools/Executable_ulfconv.mk +++ b/l10ntools/Executable_ulfconv.mk @@ -14,8 +14,6 @@ $(eval $(call gb_Executable_use_libraries,ulfconv,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,ulfconv)) - $(eval $(call gb_Executable_add_exception_objects,ulfconv,\ l10ntools/source/ulfconv/ulfconv \ )) diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index b2bcd1952396..8f5d57a0cc7a 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ utl \ )) -$(eval $(call gb_Library_add_standard_system_libs,MacOSXSpell)) - $(eval $(call gb_Library_use_system_darwin_frameworks,MacOSXSpell,\ Cocoa \ )) diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index 73bfcb648061..ef37895044a8 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,guesslang,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,guesslang)) - $(eval $(call gb_Library_use_externals,guesslang,\ libexttextcat \ )) diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index ed316051e1ed..aec8dba3502e 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,hyphen,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,hyphen)) - $(eval $(call gb_Library_use_static_libraries,hyphen,\ ulingu \ )) diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index 98e2eeeed8db..608c4213d7be 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,lnth,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,lnth)) - $(eval $(call gb_Library_use_static_libraries,lnth,\ ulingu \ )) diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index 5b8d7b142d0b..96e2abdc6c8c 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,spell,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,spell)) - $(eval $(call gb_Library_use_static_libraries,spell,\ ulingu \ )) diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index bf26844f67dc..a7fad43ca28f 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,lng,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,lng)) - $(eval $(call gb_Library_use_external,lng,icuuc)) $(eval $(call gb_Library_add_exception_objects,lng,\ diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 6f4b3b62ff73..123e382c76e5 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,lotuswordpro_test_lotuswordpro)) - $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\ offapi \ udkapi \ diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 4620f6c819c2..ab1f8a2f2ed6 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,lwpft)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,lwpft,\ icuin \ diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index eed591bfdc81..361e7ecc044d 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -35,8 +35,6 @@ $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,o3tl_tests)) - $(eval $(call gb_CppunitTest_add_exception_objects,o3tl_tests,\ o3tl/qa/cow_wrapper_clients \ o3tl/qa/test-cow_wrapper \ diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index 47c14a001172..8ee29d0feb43 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -33,8 +33,6 @@ $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,officecfg_cppheader_test)) - $(eval $(call gb_CppunitTest_add_exception_objects,officecfg_cppheader_test, \ officecfg/qa/cppheader \ )) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index d97fa4aac2ac..878d4815ec31 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -78,8 +78,6 @@ $(eval $(call gb_Library_use_libraries,oox,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,oox)) - $(eval $(call gb_Library_use_external,oox,openssl)) $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index c56a1863fa6c..72fb5f5ead99 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,package2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,package2)) - $(eval $(call gb_Library_use_externals,package2,\ zlib \ )) diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 498f35d0fe8b..45c03ad5ca20 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,xstor,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xstor)) - $(eval $(call gb_Library_add_exception_objects,xstor,\ package/source/xstor/disposelistener \ package/source/xstor/ocompinstream \ diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 7d4b08ab5e69..af674ea30f76 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Executable_use_libraries,spadmin.bin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,spadmin.bin)) - $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ padmin/source/desktopcontext \ padmin/source/pamain \ diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 45c7b5c76729..65df95fdb755 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,spa,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,spa)) - $(eval $(call gb_Library_add_exception_objects,spa,\ padmin/source/adddlg \ diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index 0b3e6021d138..b23e4c15452c 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,i18nregexp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nregexp)) - $(eval $(call gb_Library_add_exception_objects,i18nregexp,\ regexp/source/reclass \ )) diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index c6b1cd96fae1..b8eae85b98ac 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,reg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,reg)) - $(eval $(call gb_Library_add_exception_objects,reg,\ registry/source/keyimpl \ registry/source/reflread \ diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk index cf8c0083d5c5..bf9cab438c72 100644 --- a/remotebridges/Library_uuresolver.mk +++ b/remotebridges/Library_uuresolver.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,uuresolver,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,uuresolver)) - $(eval $(call gb_Library_add_exception_objects,uuresolver,\ remotebridges/source/unourl_resolver/unourl_resolver \ )) diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index deb1b13bf9b6..f6db9c2c8684 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -62,8 +62,6 @@ $(eval $(call gb_Library_use_libraries,rpt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,rpt)) - $(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt)) $(eval $(call gb_Library_add_exception_objects,rpt,\ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 7e5d9f197fdf..695b06ed3a34 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -62,8 +62,6 @@ $(eval $(call gb_Library_use_libraries,rptui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,rptui)) - $(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui)) $(eval $(call gb_Library_add_exception_objects,rptui,\ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index b0fc1bacc198..ba8c96a65324 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,rptxml,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,rptxml)) - $(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml)) $(eval $(call gb_Library_add_exception_objects,rptxml,\ diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 3dd0feca4add..2138f87a963c 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Executable_use_libraries,rsc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,rsc)) - $(eval $(call gb_Executable_add_grammars,rsc,\ rsc/source/parser/rscyacc \ )) diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index fe58e255a2df..8d7bb0f84be4 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -39,6 +39,4 @@ $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,Module_DLL)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk index 222f77a7b53c..2add4a5cc033 100644 --- a/sal/CppunitTest_sal_bytesequence.mk +++ b/sal/CppunitTest_sal_bytesequence.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_bytesequence)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index b61a739dbe2c..06e42a997987 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -47,6 +47,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk index 0dad649efa4c..4bf9cee70e4a 100644 --- a/sal/CppunitTest_sal_osl_condition.mk +++ b/sal/CppunitTest_sal_osl_condition.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_condition)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index ea64e55daca7..9b70af7e1e34 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_file)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk index af121a42f62e..1344908d6d46 100644 --- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk +++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_getsystempathfromfileurl)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk index 93a24b4fdd8d..1748e1c4d992 100644 --- a/sal/CppunitTest_sal_osl_module.mk +++ b/sal/CppunitTest_sal_osl_module.mk @@ -40,6 +40,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_module)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk index 7768b1e5ce99..64312325b711 100644 --- a/sal/CppunitTest_sal_osl_mutex.mk +++ b/sal/CppunitTest_sal_osl_mutex.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_mutex)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk index 3b9040c2f519..1823ac353ef7 100644 --- a/sal/CppunitTest_sal_osl_old_test_file.mk +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_old_test_file)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk index a71937b15342..f3f454275a5e 100644 --- a/sal/CppunitTest_sal_osl_pipe.mk +++ b/sal/CppunitTest_sal_osl_pipe.mk @@ -38,6 +38,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_pipe)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index 4ee7e3f6eba6..8065f7ec9de6 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -38,8 +38,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_process)) - # Depend on to be tested executable $(call gb_CppunitTest_get_target,sal_osl_process) : \ $(call gb_Executable_get_target,osl_process_child) diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk index 87d587f6632f..1a29e3dedbea 100644 --- a/sal/CppunitTest_sal_osl_profile.mk +++ b/sal/CppunitTest_sal_osl_profile.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_profile)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index edb6a96ed88c..bc6fe2d1b6ef 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_security)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index f7024cae6f07..b0c055f34227 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_setthreadname)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk index 6feb7d59b584..d445bda953ad 100644 --- a/sal/CppunitTest_sal_osl_thread.mk +++ b/sal/CppunitTest_sal_osl_thread.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_thread)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk index 83405ab0a8b6..cde6e807466b 100644 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ b/sal/CppunitTest_sal_rtl_alloc.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_alloc)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk index ce2cc1da5a19..68cc9faa0b4b 100644 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ b/sal/CppunitTest_sal_rtl_cipher.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_cipher)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk index 1a2390f5fd2e..01632a77e004 100644 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ b/sal/CppunitTest_sal_rtl_crc32.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_crc32)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk index e4fd8f2bf4b4..97f17a2e64f7 100644 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ b/sal/CppunitTest_sal_rtl_doublelock.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_doublelock)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk index ce1f0ab9ce1c..1742c1e775b1 100644 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ b/sal/CppunitTest_sal_rtl_locale.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_locale)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk index c502ab226659..c854f4cd756d 100644 --- a/sal/CppunitTest_sal_rtl_math.mk +++ b/sal/CppunitTest_sal_rtl_math.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_math)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk index 8c38783b7a93..1bb445893a94 100644 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_ostringbuffer)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk index bb316eeda619..e28d9f453fa0 100644 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk @@ -40,6 +40,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_oustringbuffer)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index 67299a3ab9d2..4d4f59828dab 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -43,8 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_strings)) - # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk index 67ce1eab2732..65b6713a6608 100644 --- a/sal/CppunitTest_sal_rtl_uri.mk +++ b/sal/CppunitTest_sal_rtl_uri.mk @@ -25,8 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uri)) - # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk index 74ea9e057f6c..df0e6858cd9d 100644 --- a/sal/CppunitTest_sal_rtl_uuid.mk +++ b/sal/CppunitTest_sal_rtl_uuid.mk @@ -24,6 +24,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uuid)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk index fd202e2adec8..729a26467b80 100644 --- a/sal/CppunitTest_sal_tcwf.mk +++ b/sal/CppunitTest_sal_tcwf.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_tcwf)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index 942e8f318c35..5fb59d18d1c5 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_types,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_types)) - # vim: set noet sw=4 ts=4: diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index 9cf275e91476..b5826942378f 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,cppunit/cppunittester)) - $(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit)) $(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\ diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index 3f3cce24c160..47e057b689e9 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Executable_use_libraries,osl_process_child,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,osl_process_child)) - $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\ sal/qa/osl/process/osl_process_child \ )) diff --git a/sal/Library_lo-bootstrap.mk b/sal/Library_lo-bootstrap.mk index dea6bb4ab30c..958b0f18e5cf 100644 --- a/sal/Library_lo-bootstrap.mk +++ b/sal/Library_lo-bootstrap.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Library_Library,lo-bootstrap)) # We explicitly *don't* want gb_STDLIBS to be linked here +$(eval $(call gb_Library_disable_standard_system_libs,lo-bootstrap)) + $(eval $(call gb_Library_add_libs,lo-bootstrap,\ -llog \ -landroid \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index ecec9fffd76c..73335befab10 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -88,8 +88,6 @@ $(eval $(call gb_Library_add_libs,sal,\ ) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sal)) - ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,sal,\ Carbon \ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index c50fa94ce6e4..5d5d40e0bb1b 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,sal_textenc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sal_textenc)) - $(eval $(call gb_Library_add_defs,sal_textenc,\ $(LFS_CFLAGS) \ )) diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index 75a3a9cffca4..f62e043be150 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ ) \ )) -$(eval $(call gb_Library_add_standard_system_libs,uwinapi)) - $(eval $(call gb_Library_add_defs,uwinapi,\ $(if $(filter $(COM),GCC), \ -Wno-unused-parameter -Wno-return-type) \ diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk index fb2361db4fa4..08c820836bea 100644 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ b/salhelper/CppunitTest_salhelper_checkapi.mk @@ -47,6 +47,4 @@ $(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,salhelper_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index b416cc82c589..7c66678cbf4d 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,salhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,salhelper)) - $(eval $(call gb_Library_add_exception_objects,salhelper,\ salhelper/source/condition \ salhelper/source/dynload \ diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index 3cfa8cacfdd5..edb8429fbd9f 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sax_cpputest)) - $(eval $(call gb_CppunitTest_add_exception_objects,sax_cpputest, \ sax/qa/cppunit/test_converter \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index e7028b450435..a6ac2f972f7d 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -29,8 +29,6 @@ $(eval $(call gb_Library_use_libraries,expwrap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,expwrap)) - $(eval $(call gb_Library_use_static_libraries,expwrap,\ sax_shared \ )) diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index d7465316c1c3..37411b3575b5 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,fastsax,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fastsax)) - $(eval $(call gb_Library_use_static_libraries,fastsax,\ sax_shared \ )) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 93cd25c66e62..6083db3d1685 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_use_libraries,sax,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sax)) - $(eval $(call gb_Library_add_defs,sax,\ -DSAX_DLLIMPLEMENTATION \ )) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index b6bdef73cddb..9522e2779ea4 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_annonationshapeobj)) - $(eval $(call gb_CppunitTest_set_include,sc_annonationshapeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 195dea16e5d0..814e9cbbc1a1 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_cellrangesbase)) - $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 4eeb3645c745..1ca505b5b1d7 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_chart_regression_test)) - $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index b09b0318b1da..b1fd1bc89872 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_databaserangeobj)) - $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index f8988749dbb0..d221fe5c4bd2 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilotfieldobj)) - $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 31832f2364ab..77f2b0be4e28 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilottableobj)) - $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 1826fb887bd5..3f75acb58ba3 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_cell)) - $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 009aa66f1fb8..32ac4577c5e8 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_header)) - $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 09df0f2a96b5..5f4c1aa0cbd3 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 3fc1b7c77df6..c74f49433687 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_macros_test)) - $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index cb8f0a53cf9d..4548f4bc37f4 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_modelobj)) - $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 9d30c411f359..ffca9b399833 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangeobj)) - $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 893abdf5ea9a..49a87b49acf4 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangesobj)) - $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 9bd621db1f74..a97a4b1e258c 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_rangelst_test)) - $(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 2f5dd35a7ae1..613ff558c774 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -74,8 +74,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_subsequent_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index e526b1750618..23cab33b98cc 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_tableautoformatfield)) - $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 0c9220419fd0..1bf3bd956973 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetobj)) - $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 2f9cb97fd71d..478dcb090552 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetsobj)) - $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 24cc9b7e50c7..4f761856a68a 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -79,8 +79,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_ucalc)) - $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/source/core/inc \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index ed74a69202b6..9bc420fdbde0 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -86,8 +86,6 @@ $(eval $(call gb_Library_use_libraries,sc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sc)) - $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/attarray \ sc/source/core/data/attrib \ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index b22f0c0eaca1..25e2a6e1badf 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,scd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scd)) - $(eval $(call gb_Library_add_exception_objects,scd,\ sc/source/ui/unoobj/detreg \ sc/source/ui/unoobj/scdetect \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 8a8e6fe0d183..7a5256e4ec7a 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scfilt)) - $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 807d7fd7591d..0cc40992aa37 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,scui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scui)) - $(eval $(call gb_Library_add_exception_objects,scui,\ sc/source/ui/attrdlg/attrdlg \ sc/source/ui/attrdlg/scdlgfact \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 791175d5e08c..6272d2238220 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -61,8 +61,6 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vbaobj)) - $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/excelvbahelper \ sc/source/ui/vba/service \ diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index 78b7bea0676c..dda698588fa0 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,analysis,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,analysis)) - $(eval $(call gb_Library_add_exception_objects,analysis,\ scaddins/source/analysis/analysis \ scaddins/source/analysis/analysishelper \ diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index d5db83125da3..03730e0afe7f 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,date,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,date)) - $(eval $(call gb_Library_add_exception_objects,date,\ scaddins/source/datefunc/datefunc \ )) diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 013855cbd344..578bd8824bc5 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,solver,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,solver)) - $(eval $(call gb_Library_use_external,solver,lpsolve55)) $(eval $(call gb_Library_add_exception_objects,solver,\ diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index 8941931b7ee4..602aa1df85af 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,basprov,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,basprov)) - $(eval $(call gb_Library_add_exception_objects,basprov,\ scripting/source/basprov/baslibnode \ scripting/source/basprov/basmethnode \ diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index 6ffb4fe0d029..c8efe563bb34 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dlgprov)) - $(eval $(call gb_Library_add_exception_objects,dlgprov,\ scripting/source/dlgprov/DialogModelProvider \ scripting/source/dlgprov/dlgevtatt \ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index a9ca47acfd26..291b1ecb03c1 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,protocolhandler)) - $(eval $(call gb_Library_add_exception_objects,protocolhandler,\ scripting/source/protocolhandler/scripthandler \ )) diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 025c5952cd8d..2ecc9ec70a48 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scriptframe)) - $(eval $(call gb_Library_add_exception_objects,scriptframe,\ scripting/source/provider/ActiveMSPList \ scripting/source/provider/BrowseNodeFactoryImpl \ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index 3ec938c4cb52..29c5eb9e0a3b 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,stringresource,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,stringresource)) - $(eval $(call gb_Library_add_exception_objects,stringresource,\ scripting/source/stringresource/stringresource \ )) diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index e469d786e4e0..acab48fe2811 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vbaevents)) - $(eval $(call gb_Library_add_exception_objects,vbaevents,\ scripting/source/vbaevents/eventhelper \ scripting/source/vbaevents/service \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 1d9f6fb297ce..f5fc02664e14 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -73,8 +73,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 85ea7eb91f1b..abee99bf17de 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_regression_test)) - $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 4d175957c35a..03453fff113c 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -74,8 +74,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress)) - ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\ ws2_32 \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index d8dd7c095133..05a7baf7c9d1 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -106,8 +106,6 @@ $(eval $(call gb_Library_use_libraries,sd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sd)) - $(eval $(call gb_Library_use_externals,sd,\ libxml2 \ dbus \ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index c668637a588c..f0c23cd51c49 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,sdd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdd)) - $(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd)) $(eval $(call gb_Library_add_exception_objects,sdd,\ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index b0b0d967731e..1c4c152bc4b6 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdfilt)) - $(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt)) $(eval $(call gb_Library_add_exception_objects,sdfilt,\ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 7949f732e34e..98c1fe96c573 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -67,8 +67,6 @@ $(eval $(call gb_Library_use_libraries,sdui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdui)) - $(eval $(call gb_Library_add_exception_objects,sdui,\ sd/source/filter/html/htmlattr \ sd/source/filter/html/pubdlg \ diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index 8d40f2431493..f81f930d44a4 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -56,8 +56,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sdext_pdfimport)) - $(eval $(call gb_CppunitTest_use_static_libraries,sdext_pdfimport,\ pdfimport_s \ )) diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 81706c523065..277c56417f1c 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -31,8 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sfx2_metadatable)) - $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ $$(INCLUDE) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 22925b03f315..3ecdb9cd263d 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,qstart_gtk)) - $(eval $(call gb_Library_use_externals,qstart_gtk,\ gio \ gtk \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 1ec228446b2f..baf71388e393 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -70,8 +70,6 @@ $(eval $(call gb_Library_use_libraries,sfx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sfx)) - $(eval $(call gb_Library_use_external,sfx,libxml2)) $(eval $(call gb_Library_add_exception_objects,sfx,\ diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index b32ba7e89b97..e5ecb8b998bb 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,lngconvex)) - $(eval $(call gb_Executable_add_exception_objects,lngconvex,\ shell/source/tools/lngconvex/cmdline \ shell/source/tools/lngconvex/lngconvex \ diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 58c13032f883..9f2c8ba1eeda 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cmdmail)) - $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) $(eval $(call gb_Library_add_exception_objects,cmdmail,\ diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index 28a0e8760ab0..f52735eeaa64 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,desktopbe1)) - $(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1)) $(eval $(call gb_Library_add_exception_objects,desktopbe1,\ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index d2deb022d20d..7ec447b38005 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,gconfbe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,gconfbe1)) - $(eval $(call gb_Library_set_componentfile,gconfbe1,shell/source/backends/gconfbe/gconfbe1)) $(eval $(call gb_Library_add_exception_objects,gconfbe1,\ diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index c20863655d9f..b7053cb0401d 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,kde4be1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,kde4be1)) - $(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1)) $(eval $(call gb_Library_add_exception_objects,kde4be1,\ diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index 8637341d6ff0..13dd3530bfce 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,kdebe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,kdebe1)) - $(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1)) $(eval $(call gb_Library_add_exception_objects,kdebe1,\ diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 0cefa0b8908f..11db1106248a 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localebe1)) - $(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1)) $(eval $(call gb_Library_add_exception_objects,localebe1,\ diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 6746fc0bffb8..3aab6ea02292 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,macbe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,macbe1)) - $(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1)) $(eval $(call gb_Library_add_objcxxobjects,macbe1,\ diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index c95b2d1ee343..cd27d3f48cd2 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,recentfile,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,recentfile)) - $(eval $(call gb_Library_use_static_libraries,recentfile,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index e16e957b7986..5cbdcb2c8533 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,syssh,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,syssh)) - $(eval $(call gb_Library_use_static_libraries,syssh,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index d1b5d0db498a..986dca817dd2 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_system_win32_libs,syssh,\ shell32 \ )) -$(eval $(call gb_Library_add_standard_system_libs,syssh)) - $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh)) $(eval $(call gb_Library_add_exception_objects,syssh,\ diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index a9472456af73..de6d19810532 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,tdebe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,tdebe1)) - $(eval $(call gb_Library_set_componentfile,tdebe1,shell/source/backends/kdebe/tdebe1)) $(eval $(call gb_Library_add_exception_objects,tdebe1,\ diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk index c2dbd1341e30..d578aa616b52 100644 --- a/shell/Library_wininetbe.mk +++ b/shell/Library_wininetbe.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,wininetbe1)) - $(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1)) $(eval $(call gb_Library_add_exception_objects,wininetbe1,\ diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 133ae060e6fa..838fdd58dd26 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -69,8 +69,6 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,slideshow)) - $(eval $(call gb_CppunitTest_add_exception_objects,slideshow,\ slideshow/test/slidetest \ slideshow/test/testshape \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 3ed481ed774f..a31584a22f1f 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,demoshow)) - $(eval $(call gb_Executable_add_exception_objects,demoshow,\ slideshow/test/demoshow \ )) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 012262256290..bae4d99946f8 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,OGLTrans)) - $(eval $(call gb_Library_use_external,OGLTrans,mesa_headers)) $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans)) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index d065532a696c..3813ce364c14 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,slideshow)) - $(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow)) $(eval $(call gb_Library_add_exception_objects,slideshow,\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index c7c7861275e4..5d0788aab372 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -104,6 +104,7 @@ endef define gb_CppunitTest__CppunitTest_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),CppunitTest) +$(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) $(call gb_LinkTarget_add_defs,$(2),\ $(gb_CppunitTest_DEFS) \ ) @@ -341,7 +342,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ - add_standard_system_libs \ + disable_standard_system_libs \ use_system_darwin_frameworks \ use_system_win32_libs \ use_sdk_api \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 0288c1755f71..8c178175ad4f 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -54,6 +54,7 @@ endef define gb_Executable__Executable_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),Executable) +$(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_Executable_get_target,$(1))).dir $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) @@ -105,7 +106,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ - add_standard_system_libs \ + disable_standard_system_libs \ use_system_darwin_frameworks \ use_system_win32_libs \ set_library_path_flags \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index e4003a9d2682..518211152cda 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -69,6 +69,7 @@ endef define gb_Library__Library_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),Library) +$(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) $(call gb_LinkTarget_add_defs,$(2),\ $(gb_Library_DEFS) \ ) @@ -185,7 +186,7 @@ $(eval $(foreach method,\ set_ldflags \ set_x64 \ add_libs \ - add_standard_system_libs \ + disable_standard_system_libs \ use_system_darwin_frameworks \ use_system_win32_libs \ set_library_path_flags \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 5b953005ef24..617fc562bb2e 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -648,11 +648,11 @@ define gb_LinkTarget_add_libs $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) endef -# add platform specific standard libraries to linker command for linktarget $(1) -# there are currently 94 Libraries/Executables/CppunitTests not using -# gb_STDLIBS... probably this should need to be added explicitly -define gb_LinkTarget_add_standard_system_libs -$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(gb_STDLIBS) +# remove platform specific standard libraries for linktarget $(1) +# assumption is that adding these standard libs is always useful, but in very +# exceptional cases this disable method may be used +define gb_LinkTarget_disable_standard_system_libs +$(call gb_LinkTarget_get_target,$(1)) : LIBS := $$(filter-out $$(gb_STDLIBS),$$(LIBS)) endef define gb_LinkTarget_add_api diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index 0941434cf7f0..62b1b28980f0 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sot_test_sot)) - $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ offapi \ udkapi \ diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index c11af837e39f..36b4e19fbf61 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,sot,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sot)) - $(eval $(call gb_Library_add_exception_objects,sot,\ sot/source/unoolestorage/xolesimplestorage \ sot/source/unoolestorage/register \ diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index df89cdb9dd9d..efde9b438482 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -63,8 +63,6 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,starmath_qa_cppunit)) - $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ starmath/qa/cppunit/test_nodetotextvisitors \ starmath/qa/cppunit/test_starmath \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 554b49ce16e0..af0e885146ee 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,sm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sm)) - $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/accessibility \ starmath/source/action \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 0837c2db16f3..a8db56e8b6ad 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,smd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,smd)) - $(eval $(call gb_Library_add_exception_objects,smd,\ starmath/source/detreg \ starmath/source/smdetect \ diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index 46d72b7633d9..a7576114f947 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,bootstrap)) - $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap)) $(eval $(call gb_Library_add_exception_objects,bootstrap,\ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index a1e058c86304..be2eaf6711e2 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Library_use_libraries,introspection,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,introspection)) - $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection)) $(eval $(call gb_Library_add_exception_objects,introspection,\ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 7fe31573d480..81165cd9fc40 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,invocadapt)) - $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt)) $(eval $(call gb_Library_add_exception_objects,invocadapt,\ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index b2544c77372b..e5970024345d 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,invocation,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,invocation)) - $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation)) $(eval $(call gb_Library_add_exception_objects,invocation,\ diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index 2303d92c0195..d30ccd1cdf15 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,javaloader)) - $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader)) $(eval $(call gb_Library_add_exception_objects,javaloader,\ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index a0fc87853263..78d018cf9cc3 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,javavm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,javavm)) - $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm)) $(eval $(call gb_Library_add_exception_objects,javavm,\ diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index ed115ed30c42..0b049f5aefa3 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,namingservice)) - $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice)) $(eval $(call gb_Library_add_exception_objects,namingservice,\ diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index 8eb08e55265d..75166f0f6809 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,proxyfac)) - $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac)) $(eval $(call gb_Library_add_exception_objects,proxyfac,\ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index aa5198a84bdd..71fd2cdbc81f 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,reflection,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,reflection)) - $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection)) $(eval $(call gb_Library_add_exception_objects,reflection,\ diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 2a8b7b8f31e5..3da842d80946 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,stocservices)) - $(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices)) $(eval $(call gb_Library_add_exception_objects,stocservices,\ diff --git a/store/Library_store.mk b/store/Library_store.mk index 43d81da71f0a..f66c1ebce6db 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,store,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,store)) - $(eval $(call gb_Library_add_exception_objects,store,\ store/source/object \ store/source/lockbyte \ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index 505f63ea9683..8f19199517d5 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -42,8 +42,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_lngmisc)) - ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,svl_lngmisc, \ oleaut32 \ diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index ef2f3f040ce5..b432734626cc 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -51,6 +51,4 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_urihelper)) - $(eval $(call gb_CppunitTest_use_ure,svl_urihelper)) diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 558dc60d7eac..06423e41911b 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,fsstorage,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fsstorage)) - $(eval $(call gb_Library_add_exception_objects,fsstorage,\ svl/source/fsstor/fsfactory \ svl/source/fsstor/fsstorage \ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index a7c9886d925e..5cde5678563a 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,passwordcontainer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,passwordcontainer)) - $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ svl/source/passwordcontainer/passwordcontainer \ svl/source/passwordcontainer/syscreds \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 46af0f9970ca..c6a2ff2ae6b4 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -62,8 +62,6 @@ $(eval $(call gb_Library_use_libraries,svl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svl)) - $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/config/asiancfg \ svl/source/config/cjkoptions \ diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index aff901c79df6..b6db6efc463f 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -44,8 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,svtools_filters_test)) - $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\ udkapi \ offapi \ diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index e837abd32d58..3a7537cc2e7a 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Executable_use_libraries,bmp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,bmp)) - $(eval $(call gb_Executable_add_exception_objects,bmp,\ svtools/bmpmaker/bmp \ svtools/bmpmaker/bmpcore \ diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index 7ae8dbf46dd3..e6fabb7984bc 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Executable_use_libraries,bmpsum,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,bmpsum)) - $(eval $(call gb_Executable_add_exception_objects,bmpsum,\ svtools/bmpmaker/bmpsum \ )) diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index 3dace37d6c7f..5abc4ea558cb 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Executable_use_libraries,g2g,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,g2g)) - $(eval $(call gb_Executable_add_exception_objects,g2g,\ svtools/bmpmaker/g2g \ )) diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index 704e51b636ee..71db2aeb7d0e 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,langsupport)) - $(eval $(call gb_Executable_add_exception_objects,langsupport,\ svtools/langsupport/langsupport \ )) diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index 1827cb1ae389..a25abdb3bcf3 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,hatchwindowfactory)) - $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ svtools/source/hatchwindow/documentcloser \ svtools/source/hatchwindow/hatchwindow \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index e001aa4b62cc..d78caa23be90 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,svt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svt)) - $(eval $(call gb_Library_use_externals,svt,\ icuuc \ jpeg \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 1cb9d8f78e25..60bedc43dc7c 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,$(svx_GENGALBIN))) - $(eval $(call gb_Executable_add_exception_objects,$(svx_GENGALBIN),\ svx/source/gengal/gengal \ )) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 796aa222aac1..6ccba764b892 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,svx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svx)) - $(eval $(call gb_Library_use_external,svx,icuuc)) $(eval $(call gb_Library_add_exception_objects,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 929c8cf49ae6..ec1b98f5bc0d 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -85,8 +85,6 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svxcore)) - $(eval $(call gb_Library_use_external,svxcore,icuuc)) $(eval $(call gb_Library_add_exception_objects,svxcore,\ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 13a11c1c1937..f16bf445963d 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textconversiondlgs)) - $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ svx/source/unodialogs/textconversiondlgs/services \ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 53d990751bb5..7b0d48fa14b4 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -58,8 +58,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index ccbe8cd678ce..af54e0af27da 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -69,8 +69,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_layout_test)) - $(eval $(call gb_CppunitTest_set_include,sw_layout_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 30915f2ae77f..a321a29935e2 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -70,8 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_macros_test)) - $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index 69c10d366a67..32d2bdb46c55 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -70,8 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_regression_test)) - $(eval $(call gb_CppunitTest_set_include,sw_regression_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 03af297f98d9..4ba12b90b0db 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfexport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index 7d52f510aed5..9c9a1560d5ca 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfimport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index 1523e5ca4f52..588349cad511 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlexport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index 30d793c32c76..d8b9bc428383 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlimport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index e9c721ec5611..bd45fad4bb34 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfexport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 6e9339e37a18..062ef8dd87f7 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfimport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index 35a6af3814ce..5fccb5d848a1 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8export)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index f4bf71c30725..c00f966ae7d8 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -44,8 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8import)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 268a620e9161..f25b9691aa21 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -70,8 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_swdoc_test)) - $(eval $(call gb_CppunitTest_use_externals,sw_swdoc_test,\ icuuc \ libxml2 \ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index f1f3a8c7a9b6..cba74d917d2e 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -70,8 +70,6 @@ $(eval $(call gb_Library_use_libraries,msword,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,msword)) - $(eval $(call gb_Library_use_externals,msword,\ icuuc \ libxml2 \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 5dd22de249c2..ba3fcb23c2af 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -79,8 +79,6 @@ $(eval $(call gb_Library_use_libraries,sw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sw)) - $(eval $(call gb_Library_use_externals,sw,\ icuuc \ libxml2 \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 780b069f4bfd..856efac25051 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,swd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,swd)) - $(eval $(call gb_Library_add_exception_objects,swd,\ sw/source/filter/basflt/iodetect \ sw/source/ui/uno/detreg \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 040717b7900a..eaa68dac9404 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -70,8 +70,6 @@ $(eval $(call gb_Library_use_libraries,swui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,swui)) - $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/chrdlg/break \ sw/source/ui/chrdlg/chardlg \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index aeed2a85a0ff..7f593ec04b18 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vbaswobj)) - $(eval $(call gb_Library_use_externals,vbaswobj,\ libxml2 \ )) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 886702d022d7..0bc9359755c1 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,subsequenttest)) - ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,subsequenttest) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/test/Library_test.mk b/test/Library_test.mk index 61579bf8d0a3..4b395be0f009 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,test,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,test)) - ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,test) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index d1e1fee6fe98..b7994783559d 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,tk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,tk)) - $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/asynccallback \ toolkit/source/awt/stylesettings \ diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index 6fce0cdcbf4a..e753f49220d0 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -49,8 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,tools_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,tools_test)) - $(eval $(call gb_CppunitTest_use_static_libraries,tools_test, \ ooopathutils \ )) diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk index 5fae14f4f6e4..33a51dd6d74d 100644 --- a/tools/Executable_bestreversemap.mk +++ b/tools/Executable_bestreversemap.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Executable_use_libraries,bestreversemap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,bestreversemap)) - $(eval $(call gb_Executable_add_exception_objects,bestreversemap,\ tools/source/reversemap/bestreversemap \ )) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index c92e01296759..d030d1d85f4e 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Executable_use_libraries,mkunroll,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,mkunroll)) - $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ tools/bootstrp/mkunroll/mkunroll \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index b408da57beb4..d00cba5c46eb 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,rscdep)) - $(eval $(call gb_Executable_use_sdk_api,rscdep)) $(eval $(call gb_Executable_add_exception_objects,rscdep,\ diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index c7cfd90e695a..fcd72c2ddded 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Executable_use_libraries,so_checksum,\ )) # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial -$(eval $(call gb_Executable_add_standard_system_libs,so_checksum)) - $(eval $(call gb_Executable_add_exception_objects,so_checksum,\ tools/bootstrp/md5 \ tools/bootstrp/so_checksum \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index b7802267c891..cd8afecf5b73 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,tl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,tl)) - $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/datetime/datetime \ diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk index 261d305f3ffe..7e26f3d4ff86 100644 --- a/touch/Library_libotouch.mk +++ b/touch/Library_libotouch.mk @@ -22,8 +22,6 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,libotouch,\ $(eval $(call gb_Library_use_libraries,libotouch,\ )) -$(eval $(call gb_Library_add_standard_system_libs,libotouch)) - $(eval $(call gb_Library_add_exception_objects,libotouch,\ touch/source/uno/Document \ touch/source/generic/libotouch \ diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk index 728067ddb4c3..923d75b056a3 100644 --- a/tubes/CppunitTest_tubes_test.mk +++ b/tubes/CppunitTest_tubes_test.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,tubes_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,tubes_test)) - $(eval $(call gb_CppunitTest_use_externals,tubes_test,\ telepathy \ )) diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index fd1d2a1685a7..1f79acade6c7 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,tubes,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,tubes)) - $(eval $(call gb_Library_use_externals,tubes,\ gtk \ telepathy \ diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index e5f4b858179e..1d9ca407cfc4 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,cached1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cached1)) - $(eval $(call gb_Library_add_exception_objects,cached1,\ ucb/source/cacher/cachedcontentresultset \ ucb/source/cacher/cachedcontentresultsetstub \ diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index 38a48be65839..587b0745f53b 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,srtrs1)) - $(eval $(call gb_Library_add_exception_objects,srtrs1,\ ucb/source/sorter/sortdynres \ ucb/source/sorter/sortmain \ diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 5b04efbc31b7..5dabe48bbd4a 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucb1)) - $(eval $(call gb_Library_add_exception_objects,ucb1,\ ucb/source/core/cmdenv \ ucb/source/core/identify \ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index 6d3a61a37174..a19f10be8853 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpcmis1)) - $(eval $(call gb_Library_use_externals,ucpcmis1,\ cmis \ curl \ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index c8053c180c9f..a38a8f103146 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpdav1)) - $(eval $(call gb_Library_use_externals,ucpdav1,\ libxml2 \ neon \ diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index ade70cf4b568..04a29d601286 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpexpand1)) - $(eval $(call gb_Library_add_exception_objects,ucpexpand1,\ ucb/source/ucp/expand/ucpexpand \ )) diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 4a1de1b2460f..3e6c5f599a56 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpext)) - $(eval $(call gb_Library_add_exception_objects,ucpext,\ ucb/source/ucp/ext/ucpext_content \ ucb/source/ucp/ext/ucpext_datasupplier \ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index 532e5802de59..12890b1e70fe 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpfile1)) - $(eval $(call gb_Library_add_exception_objects,ucpfile1,\ ucb/source/ucp/file/bc \ ucb/source/ucp/file/filcmd \ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index aa37b20a71af..c0925d24dcaf 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpftp1)) - $(eval $(call gb_Library_use_externals,ucpftp1,\ curl \ zlib \ diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk index e863fc7602fe..27c7dea74ae3 100644 --- a/ucb/Library_ucpgio1.mk +++ b/ucb/Library_ucpgio1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,ucpgio1,\ ucbhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpgio1)) - $(eval $(call gb_Library_use_externals,ucpgio1,\ gio \ )) diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk index 42f0dc663741..3165c5f933c3 100644 --- a/ucb/Library_ucpgvfs1.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,ucpgvfs1,\ ucbhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpgvfs1)) - $(eval $(call gb_Library_add_exception_objects,ucpgvfs1,\ ucb/source/ucp/gvfs/gvfs_content \ ucb/source/ucp/gvfs/gvfs_directory \ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 4f4325bc5b20..767fbd15208a 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucphier1)) - $(eval $(call gb_Library_add_exception_objects,ucphier1,\ ucb/source/ucp/hierarchy/dynamicresultset \ ucb/source/ucp/hierarchy/hierarchycontentcaps \ diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index d11376325a3a..1c0f950e632a 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpodma1)) - $(eval $(call gb_Library_use_static_libraries,ucpodma1,\ odma_lib \ )) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index 40983cf0b43b..c3c3671f082d 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucppkg1)) - $(eval $(call gb_Library_add_exception_objects,ucppkg1,\ ucb/source/ucp/package/pkgcontentcaps \ ucb/source/ucp/package/pkgcontent \ diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index 9138ca2af3eb..532d06828fce 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucptdoc1)) - $(eval $(call gb_Library_add_exception_objects,ucptdoc1,\ ucb/source/ucp/tdoc/tdoc_contentcaps \ ucb/source/ucp/tdoc/tdoc_content \ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index d6e32e8effbd..73b1afc30c4e 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -21,8 +21,6 @@ $(eval $(call gb_Library_use_libraries,ucbhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucbhelper)) - $(eval $(call gb_Library_add_defs,ucbhelper,\ -DUCBHELPER_DLLIMPLEMENTATION \ )) diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 1da0fd52ccb1..1d1e0e127d79 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unobootstrapprotector)) - $(eval $(call gb_Library_use_externals,unobootstrapprotector,\ cppunit \ )) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index ca5f9c064242..f5ed3f9f2486 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unoexceptionprotector)) - $(eval $(call gb_Library_use_externals,unoexceptionprotector,\ cppunit \ )) diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 3c851a3cee54..178777fca719 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,unotest,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unotest)) - $(eval $(call gb_Library_use_externals,unotest,\ cppunit \ )) diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index ef33f7f5c48f..7dafedab43ea 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,utl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,utl)) - # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,utl,\ diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index bc8aef2e2f3f..348b919dce17 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,unordf,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unordf)) - $(eval $(call gb_Library_use_externals,unordf,librdf)) $(eval $(call gb_Library_use_externals,unordf,libxslt)) $(eval $(call gb_Library_use_externals,unordf,libxml2)) diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 8d47855670e7..502537750478 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Library_use_libraries,unoxml,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unoxml)) - $(eval $(call gb_Library_use_external,unoxml,libxml2)) $(eval $(call gb_Library_add_exception_objects,unoxml,\ diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index 797f8eaf0512..69335bf0ad26 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,uui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,uui)) - $(eval $(call gb_Library_add_exception_objects,uui,\ uui/source/alreadyopen \ uui/source/filechanged \ diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index e8c009b3e59f..63d0f67aeb5c 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,msforms,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,msforms)) - # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,msforms,\ diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 06a146904a5c..1da2b8e07dae 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,vbahelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vbahelper)) - # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,vbahelper,\ diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk index c0adf2735b6f..40a95922917d 100644 --- a/vcl/Executable_kdefilepicker.mk +++ b/vcl/Executable_kdefilepicker.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Executable_use_libraries,kdefilepicker,\ sal \ )) -$(eval $(call gb_Executable_add_standard_system_libs,kdefilepicker)) - $(eval $(call gb_Executable_add_libs,kdefilepicker,\ $(KDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk index 7458f4197b2c..4c912e4779ad 100644 --- a/vcl/Executable_tdefilepicker.mk +++ b/vcl/Executable_tdefilepicker.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Executable_use_libraries,tdefilepicker,\ sal \ )) -$(eval $(call gb_Executable_add_standard_system_libs,tdefilepicker)) - $(eval $(call gb_Executable_add_libs,tdefilepicker,\ $(TDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 6ade59bbd86a..0b44caba6104 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -57,8 +57,6 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,desktop_detector)) - $(eval $(call gb_Library_use_externals,desktop_detector,\ icule \ icuuc \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 02dae7d43f95..6eebaeb1e015 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -81,8 +81,6 @@ $(eval $(call gb_Library_use_libraries,vcl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vcl)) - ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_libs,vcl,\ -lobjc \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 67795ef553a9..269ee1ee6e51 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_gen)) - $(eval $(call gb_Library_use_externals,vclplug_gen,\ cairo \ icule \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 3fb0d8038b69..4ff18dafb5eb 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -59,8 +59,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk)) - $(eval $(call gb_Library_use_externals,vclplug_gtk,\ dbus \ gtk \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index f924e80d8c33..2c34e1d529e7 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -71,8 +71,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk3)) - $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ )) diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index d61717c00e2c..9b725b33edba 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde)) - $(eval $(call gb_Library_use_externals,vclplug_kde,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index f8450203ccd2..48a13c9dbebc 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde4)) - $(eval $(call gb_Library_use_externals,vclplug_kde4,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 750342c3225b..66ccd12b7d4b 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_svp)) - $(eval $(call gb_Library_use_externals,vclplug_svp,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index efd3daaff151..9431131171ce 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_tde)) - $(eval $(call gb_Library_use_externals,vclplug_tde,\ icule \ icuuc \ diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index b5b8e7e928b8..26b89a1ceb54 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -40,8 +40,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_doctok)) - $(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\ $$(INCLUDE) \ -I$(SRCDIR)/writerfilter/inc \ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index a50d72151a30..ae981d84b8ba 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_rtftok)) - $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\ offapi \ udkapi \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 5429ea7af4c6..1d7c66763a80 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -83,8 +83,6 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,writerfilter)) - $(eval $(call gb_Library_use_external,writerfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter,\ diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index bc0bd83c9205..7c98491a81b4 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,writerfilter_uno)) - $(eval $(call gb_Library_use_external,writerfilter_uno,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\ diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 38e961df7ebf..fb76ddacaa26 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,wpftdraw)) - $(eval $(call gb_Library_use_static_libraries,wpftdraw,\ writerperfect \ )) diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index 3752308b6fa3..bf4759c2ddcc 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,wpftwriter)) - $(eval $(call gb_Library_use_static_libraries,wpftwriter,\ writerperfect \ )) diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk index 9704b7642b3e..600302977d5c 100644 --- a/xml2cmp/Executable_xml2cmp.mk +++ b/xml2cmp/Executable_xml2cmp.mk @@ -46,6 +46,4 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\ xml2cmp/source/xcd/dependy \ )) -$(eval $(call gb_Executable_add_standard_system_libs,xml2cmp)) - # vim: set noet sw=4 ts=4: diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index d51a29352829..11b46e8372f3 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,xo,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xo)) - $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/chart/ColorPropertySet \ xmloff/source/chart/PropertyMaps \ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index e1870a4d6029..e816b46002bf 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,xof,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xof)) - $(eval $(call gb_Library_add_exception_objects,xof,\ xmloff/source/transform/ChartOASISTContext \ xmloff/source/transform/ChartOOoTContext \ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index b3cd8f704aff..b9b16e864b52 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,xmlreader,\ )) # cppu is only needed due to the cppumaker -C hack -$(eval $(call gb_Library_add_standard_system_libs,xmlreader)) - $(eval $(call gb_Library_add_exception_objects,xmlreader,\ xmlreader/source/pad \ xmlreader/source/span \ diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index 00353edc75e2..c7c77557f630 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -26,8 +26,6 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xmlscript)) - $(eval $(call gb_Library_set_include,xmlscript,\ -I$(SRCDIR)/xmlscript/source/inc \ $$(INCLUDE) \ diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 201b8bf540cb..c42e02408fd7 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,xmlsecurity_qa_certext)) - $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_qa_certext,\ xmlsecurity/qa/certext/SanCertExt \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 3333e21f5fce..097e016aa3af 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xmlsecurity)) - $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ xmlsecurity/source/component/certificatecontainer \ xmlsecurity/source/component/documentdigitalsignatures \ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 1aea707bcb5e..24de37ee7c66 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsec_fw)) - $(eval $(call gb_Library_add_exception_objects,xsec_fw,\ xmlsecurity/source/framework/buffernode \ xmlsecurity/source/framework/decryptorimpl \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 27479a3fc63f..4eceb305587a 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsec_xmlsec)) - $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ )) -- cgit From ca2fd69e0450d83f145d1ef7559e090db162a777 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:53:11 +0200 Subject: vcl: remove gb_STDLIBS that crept in today Change-Id: Icb760daeca27289e424a72fb743d4e3bbd0e526d --- vcl/Executable_ui-previewer.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 06cf218802da..51d12d027827 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Executable_use_libraries,ui-previewer,\ tl \ ucbhelper \ vcl \ - $(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\ -- cgit From adbdb8e4d94c04de73d071e0a9ccdd95e3f5e82a Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 28 Sep 2012 10:15:33 -0500 Subject: hide clucene warnings under the carpet to avoid poluting make's output Change-Id: I1f6e4d187ae6200fe1d2444c07af9ca42a010bc1 --- clucene/Library_clucene.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index 16bfbd5bf6aa..72a1dcccf104 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -50,6 +50,12 @@ $(eval $(call gb_Library_add_defs,clucene,\ $(LFS_CFLAGS) \ )) +# clucene is riddled with warnings... let's spare use +# the pointless spamming +$(eval $(call gb_Library_add_cxxflags,clucene,\ + -w \ +)) + ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,clucene,\ -lm \ -- cgit From b4b9fb5cfd850dec59307a98d52c96874b78ff7e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 17:57:08 +0200 Subject: fix WNT build: missed one oleaut32 Change-Id: Ic079200f6a3f1a1e7ac38f971e4da40a8dd39dd0 --- basic/Library_sb.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 457a52bf6bdf..73eb63163628 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -138,8 +138,7 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,sb,\ - uwinapi \ +$(eval $(call gb_Library_use_system_win32_libs,sb,\ oleaut32 \ )) endif -- cgit From bf1802ffa34e48000892322d95e01fda6a07a094 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 28 Sep 2012 18:05:28 +0200 Subject: sw/qa: more getProperty() usage in extras Change-Id: Ic4782f3d315b6ef860153fdeb1890bba083f9630 --- sw/qa/extras/rtfimport/rtfimport.cxx | 56 +++++++----------------------------- 1 file changed, 10 insertions(+), 46 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 68401dd214e8..96503a788933 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -199,19 +199,9 @@ void Test::testFdo45553() uno::Reference xRange(xRangeEnum->nextElement(), uno::UNO_QUERY); OUString aStr = xRange->getString(); if ( aStr == "space-before" ) - { - sal_Int32 nMargin = 0; - uno::Reference xPropertySet(xRange, uno::UNO_QUERY); - xPropertySet->getPropertyValue("ParaTopMargin") >>= nMargin; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(120)), nMargin); - } + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(120)), getProperty(xRange, "ParaTopMargin")); else if ( aStr == "space-after" ) - { - sal_Int32 nMargin = 0; - uno::Reference xPropertySet(xRange, uno::UNO_QUERY); - xPropertySet->getPropertyValue("ParaBottomMargin") >>= nMargin; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(240)), nMargin); - } + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(240)), getProperty(xRange, "ParaBottomMargin")); } } } @@ -249,12 +239,8 @@ void Test::testN695479() uno::Reference xPropertySet(xIndexAccess->getByIndex(0), uno::UNO_QUERY); // Negative ABSH should mean fixed size. - sal_Int16 nSizeType = 0; - xPropertySet->getPropertyValue("SizeType") >>= nSizeType; - CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, nSizeType); - sal_Int32 nHeight = 0; - xPropertySet->getPropertyValue("Height") >>= nHeight; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(300)), nHeight); + CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, getProperty(xPropertySet, "SizeType")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(300)), getProperty(xPropertySet, "Height")); uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); uno::Reference xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); @@ -272,24 +258,16 @@ void Test::testN695479() CPPUNIT_ASSERT_EQUAL(OUString("plain"), xText->getString()); if (i == 0) - { // Additonally, the frist frame should have double border at the bottom. - table::BorderLine2 aBorder; - xPropertySet->getPropertyValue("BottomBorder") >>= aBorder; - CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE, aBorder.LineStyle); - } + CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE, getProperty(xPropertySet, "BottomBorder").LineStyle); } else if (xServiceInfo->supportsService("com.sun.star.drawing.LineShape")) { // The older "drawing objects" syntax should be recognized. bDrawFound = true; xPropertySet.set(xServiceInfo, uno::UNO_QUERY); - sal_Int16 nHori = 0; - xPropertySet->getPropertyValue("HoriOrientRelation") >>= nHori; - CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_PRINT_AREA, nHori); - sal_Int16 nVert = 0; - xPropertySet->getPropertyValue("VertOrientRelation") >>= nVert; - CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, nVert); + CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_PRINT_AREA, getProperty(xPropertySet, "HoriOrientRelation")); + CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty(xPropertySet, "VertOrientRelation")); } } CPPUNIT_ASSERT(bFrameFound); @@ -311,13 +289,7 @@ void Test::testFdo45187() // There should be two shapes. CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws->getCount()); // They should be anchored to different paragraphs. - uno::Reference xPropertySet(xDraws->getByIndex(0), uno::UNO_QUERY); - awt::Point aFirstPoint; - xPropertySet->getPropertyValue("AnchorPosition") >>= aFirstPoint; - xPropertySet.set(xDraws->getByIndex(1), uno::UNO_QUERY); - awt::Point aSecondPoint; - xPropertySet->getPropertyValue("AnchorPosition") >>= aSecondPoint; - CPPUNIT_ASSERT(aFirstPoint.Y != aSecondPoint.Y); + CPPUNIT_ASSERT(getProperty(xDraws->getByIndex(0), "AnchorPosition").Y != getProperty(xDraws->getByIndex(1), "AnchorPosition").Y); } void Test::testFdo46662() @@ -334,17 +306,9 @@ void Test::testFdo46662() const beans::PropertyValue& rProp = aProps[i]; if ( rProp.Name == "ParentNumbering" ) - { - sal_Int16 nValue; - rProp.Value >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int16(2), nValue); - } + CPPUNIT_ASSERT_EQUAL(sal_Int16(2), rProp.Value.get()); else if ( rProp.Name == "Suffix" ) - { - OUString sValue; - rProp.Value >>= sValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sValue.getLength()); - } + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rProp.Value.get().getLength()); } } -- cgit From 386b13b2b032d4ed3d6772c225266b3bbb5235c8 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 28 Sep 2012 11:50:31 +0100 Subject: improve conditional formatting height calculations. Change-Id: If5080892b820d268ffef22111d0caee217586b56 --- sc/source/ui/condformat/condformatdlg.cxx | 37 +++++++++++++------------------ 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 3be5bc2ba239..ef69309bc64b 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -511,30 +511,25 @@ void ScCondFrmtEntry::HideColorScaleElements() void ScCondFrmtEntry::SetHeight() { - if(mbActive) + long nPad = LogicToPixel(Size(42,2), MapMode(MAP_APPFONT)).getHeight(); + + // Calculate maximum height we need from visible widgets + sal_uInt16 nChildren = GetChildCount(); + + long nMaxHeight = 0; + for(sal_uInt16 i = 0; i < nChildren; i++) { - Size aSize = GetSizePixel(); - switch (meType) - { - case CONDITION: - case FORMULA: - aSize.Height() = 120; - break; - case COLORSCALE: - aSize.Height() = 200; - break; - case DATABAR: - aSize.Height() = 200; - break; - default: - break; - } - SetSizePixel(aSize); + Window *pChild = GetChild(i); + if(!pChild || !pChild->IsVisible()) + continue; + Point aPos = pChild->GetPosPixel(); + Size aSize = pChild->GetSizePixel(); + nMaxHeight = std::max(aPos.Y() + aSize.Height(), nMaxHeight); } - else + Size aSize = GetSizePixel(); + if(nMaxHeight > 0) { - Size aSize = GetSizePixel(); - aSize.Height() = 40; + aSize.Height() = nMaxHeight + nPad; SetSizePixel(aSize); } } -- cgit From fb6df25eb2ec520f10bdca117ace3fae482332bb Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 28 Sep 2012 12:43:47 +0100 Subject: auto-expand the first conditional format in the list. Change-Id: I65280d39b560b4b7eed3e21a6e6c7b02c124f10a --- sc/source/ui/condformat/condformatdlg.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index ef69309bc64b..51fc4856dfeb 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -1005,6 +1005,8 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum { maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, pFormat->GetEntry(nIndex), maPos )); } + if (nCount > 0) + maEntries.begin()->Select(); } RecalcAll(); -- cgit From b8c43b5332dcb5f8928c7b3b4a1aa639b911527b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 28 Sep 2012 13:38:52 +0100 Subject: double-click on a conditional format inspects / edits it. Change-Id: Icdfeae938627b63decd26571e86bc1e80e07f6c6 --- sc/source/ui/condformat/condformatmgr.cxx | 1 + sc/source/ui/inc/condformatmgr.hxx | 1 + 2 files changed, 2 insertions(+) diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index ebaad9b8ba0a..b40a52319053 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -180,6 +180,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc maBtnRemove.SetClickHdl(LINK(this, ScCondFormatManagerDlg, RemoveBtnHdl)); maBtnEdit.SetClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); + maCtrlManager.GetListControl().SetDoubleClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); maBtnAdd.Hide(); } diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 2f75dde4b9d6..3735e639b480 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -71,6 +71,7 @@ public: ScConditionalFormat* GetSelection(); void DeleteSelection(); void Update(); + ScCondFormatManagerWindow &GetListControl() { return maWdManager; } private: ScCondFormatManagerWindow maWdManager; -- cgit From 165b1f82608c75488a50a3bef1ddc33ffbe49c38 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 28 Sep 2012 13:40:47 +0100 Subject: fdo#54940 - make editing relative refs more intuitive to me Change-Id: Ib7681de7b1aad9b6dda183e3c4fa1b1010270d3f --- sc/inc/rangelst.hxx | 1 + sc/source/core/tool/rangelst.cxx | 15 +++++++++++++++ sc/source/ui/condformat/condformatmgr.cxx | 5 +++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 74bb7be1d99a..8bf3bed47266 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -81,6 +81,7 @@ public: bool Intersects( const ScRange& ) const; bool In( const ScRange& ) const; size_t GetCellCount() const; + ScAddress GetTopLeftCorner() const; ScRange* Remove(size_t nPos); void RemoveAll(); diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index c9c4c3e19097..b7347f62dcbd 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -1145,6 +1145,21 @@ void ScRangeList::push_back(ScRange* p) maRanges.push_back(p); } +ScAddress ScRangeList::GetTopLeftCorner() const +{ + if(empty()) + return ScAddress(); + + ScAddress aAddr = maRanges[0]->aStart; + for(size_t i = 1, n = size(); i < n; ++i) + { + if(maRanges[i]->aStart < aAddr) + aAddr = maRanges[i]->aStart; + } + + return aAddr; +} + // === ScRangePairList ======================================================== ScRangePairList::~ScRangePairList() diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index b40a52319053..62b1fdc40be4 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -77,7 +77,7 @@ String ScCondFormatManagerWindow::createEntryString(const ScConditionalFormat& r String aStr; aRange.Format(aStr, SCA_VALID, mpDoc, mpDoc->GetAddressConvention()); aStr += '\t'; - aStr += ScCondFormatHelper::GetExpression(rFormat, mrPos); + aStr += ScCondFormatHelper::GetExpression(rFormat, aRange.GetTopLeftCorner()); return aStr; } @@ -209,7 +209,8 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) if(!pFormat) return 0; - ScCondFormatDlg* pDlg = new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(), maPos); + ScCondFormatDlg* pDlg = new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(), + pFormat->GetRange().GetTopLeftCorner()); if(pDlg->Execute() == RET_OK) { sal_Int32 nKey = pFormat->GetKey(); -- cgit From 74f8d6ea4e3fd9eda0601c9483fc9a7bd52c2c52 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 28 Sep 2012 18:09:43 +0200 Subject: add the remaining parts to previous commit Change-Id: Ia0b9ed9eed30991f38234bf56c49b26392491f30 --- sc/source/ui/view/cellsh1.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index a1cdc8c45766..e9211c109d8a 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2061,11 +2061,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab()); if(pCondFormat) { - pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT ); + pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), pCondFormat->GetRange().GetTopLeftCorner(), RID_SCDLG_CONDFORMAT ); } else { - pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aPos, RID_SCDLG_CONDFORMAT ); + pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT ); } if(pDlg->Execute() == RET_OK) -- cgit From 8a7fa6f9d96b1857d51a604f36d09fe88e59d413 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 29 Sep 2012 01:13:00 +0900 Subject: The graphite page was moved Change-Id: I99bc4cd9e600dc0b2e9f74fba7615c6677cf90ca --- graphite/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphite/README b/graphite/README index 1cdf77576bd4..aac0d0df366c 100644 --- a/graphite/README +++ b/graphite/README @@ -1,4 +1,4 @@ Library for providing rendering capabilities for complex non-Roman writing systems. From: -[http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=RenderingGraphite] +[http://graphite.sil.org/] -- cgit From 4cf877162079dc9f6e6b3fb753a761387eed9b19 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 18:18:36 +0200 Subject: another oops in svx... Change-Id: I0f9de9ed23d160a8c3cf6a9db8eece95b4e8795a --- svx/Library_svx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 6ccba764b892..26acd01aa954 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -221,7 +221,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ )) else ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,svx,\ +$(eval $(call gb_Library_use_system_win32_libs,svx,\ advapi32 \ )) $(eval $(call gb_Library_add_exception_objects,svx,\ -- cgit From 7cd973eeaa4c03c56871af8ed5033b2d777a6c3d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 28 Sep 2012 18:26:44 +0200 Subject: rhbz#826526 Inform user about unsupported PDF encryption formats ...with a crudely reused "Version Incompatibility" message box (TODO: improve), rather than keeping asking for a password. Change-Id: I8239232704a4426af7a14a729840d184a502d2df --- sdext/source/pdfimport/inc/pdfihelper.hxx | 4 ++ sdext/source/pdfimport/inc/pdfparse.hxx | 3 ++ sdext/source/pdfimport/misc/pwdinteract.cxx | 41 ++++++++++++++++- sdext/source/pdfimport/pdfparse/pdfentries.cxx | 15 ++++-- sdext/source/pdfimport/wrapper/wrapper.cxx | 64 +++++++++++++++----------- 5 files changed, 95 insertions(+), 32 deletions(-) diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index d8f7d3c60e44..ad4774aadd46 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -196,6 +196,10 @@ namespace pdfi bool bFirstTry, const rtl::OUString& rDocName ); + + void reportUnsupportedEncryptionFormat( + com::sun::star::uno::Reference< + com::sun::star::task::XInteractionHandler > const & handler); } #define USTR(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index df3e4259ab1a..5e87b89a164a 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -253,6 +253,9 @@ struct PDFFile : public PDFContainer virtual PDFEntry* clone() const; bool isEncrypted() const; + + bool usesSupportedEncryptionFormat() const; + // this method checks whether rPwd is compatible with // either user or owner password and sets up decrypt data in that case // returns true if decryption can be done diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index e5fb674047bc..81cdcb832208 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -26,9 +26,14 @@ * ************************************************************************/ +#include "sal/config.h" + +#include #include "pdfihelper.hxx" +#include +#include #include #include #include @@ -36,8 +41,9 @@ #include #include +#include #include - +#include using namespace com::sun::star; @@ -125,6 +131,32 @@ void SAL_CALL PDFPasswordRequest::select() throw (uno::RuntimeException) m_bSelected = true; } +class UnsupportedEncryptionFormatRequest: + public cppu::WeakImplHelper1< task::XInteractionRequest >, + private boost::noncopyable +{ +public: + UnsupportedEncryptionFormatRequest() {} + +private: + virtual ~UnsupportedEncryptionFormatRequest() {} + + virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException) { + return uno::makeAny( + task::ErrorCodeRequest( + OUString(), uno::Reference< uno::XInterface >(), + ERRCODE_IO_WRONGVERSION)); + //TODO: should be something more informative than crudely reused + // ERRCODE_IO_WRONGVERSION + } + + virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > + SAL_CALL getContinuations() throw (uno::RuntimeException) { + return + uno::Sequence< uno::Reference< task::XInteractionContinuation > >(); + } +}; + } // namespace namespace pdfi @@ -159,6 +191,13 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, return bSuccess; } +void reportUnsupportedEncryptionFormat( + uno::Reference< task::XInteractionHandler > const & handler) +{ + assert(handler.is()); + handler->handle(new UnsupportedEncryptionFormatRequest); +} + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 259d700adc78..9a7855492685 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -1224,17 +1224,22 @@ static bool check_user_password( const OString& rPwd, PDFFileImplData* pData ) return bValid; } +bool PDFFile::usesSupportedEncryptionFormat() const +{ + return m_pData->m_bStandardHandler && + m_pData->m_nAlgoVersion >= 1 && + m_pData->m_nAlgoVersion <= 2 && + m_pData->m_nStandardRevision >= 2 && + m_pData->m_nStandardRevision <= 3; +} + bool PDFFile::setupDecryptionData( const OString& rPwd ) const { if( !impl_getData()->m_bIsEncrypted ) return rPwd.isEmpty(); // check if we can handle this encryption at all - if( ! m_pData->m_bStandardHandler || - m_pData->m_nAlgoVersion < 1 || - m_pData->m_nAlgoVersion > 2 || - m_pData->m_nStandardRevision < 2 || - m_pData->m_nStandardRevision > 3 ) + if( ! usesSupportedEncryptionFormat() ) return false; if( ! m_pData->m_aCipher ) diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 61d4b29af31b..2d76fff27419 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -927,38 +927,50 @@ static bool checkEncryption( const rtl::OUString& o_rIsEncrypted = pPDFFile->isEncrypted(); if( o_rIsEncrypted ) { - bool bAuthenticated = false; - if( !io_rPwd.isEmpty() ) + if( pPDFFile->usesSupportedEncryptionFormat() ) { - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, - RTL_TEXTENCODING_ISO_8859_1 ); - bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); - } - if( bAuthenticated ) - bSuccess = true; - else - { - if( i_xIHdl.is() ) + bool bAuthenticated = false; + if( !io_rPwd.isEmpty() ) + { + rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + RTL_TEXTENCODING_ISO_8859_1 ); + bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); + } + if( bAuthenticated ) + bSuccess = true; + else { - bool bEntered = false; - do + if( i_xIHdl.is() ) { - bEntered = getPassword( i_xIHdl, io_rPwd, ! bEntered, i_rDocName ); - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, - RTL_TEXTENCODING_ISO_8859_1 ); - bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); - } while( bEntered && ! bAuthenticated ); + bool bEntered = false; + do + { + bEntered = getPassword( i_xIHdl, io_rPwd, ! bEntered, i_rDocName ); + rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + RTL_TEXTENCODING_ISO_8859_1 ); + bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); + } while( bEntered && ! bAuthenticated ); + } + + OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" ); + bSuccess = bAuthenticated; + } + if( bAuthenticated ) + { + rtl::OUStringBuffer aBuf( 128 ); + aBuf.appendAscii( "_OOO_pdfi_Credentials_" ); + aBuf.append( pPDFFile->getDecryptionKey() ); + io_rPwd = aBuf.makeStringAndClear(); } - - OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" ); - bSuccess = bAuthenticated; } - if( bAuthenticated ) + else if( i_xIHdl.is() ) { - rtl::OUStringBuffer aBuf( 128 ); - aBuf.appendAscii( "_OOO_pdfi_Credentials_" ); - aBuf.append( pPDFFile->getDecryptionKey() ); - io_rPwd = aBuf.makeStringAndClear(); + reportUnsupportedEncryptionFormat( i_xIHdl ); + //TODO: this should either be handled further down the + // call stack, or else information that this has already + // been handled should be passed down the call stack, so + // that SfxBaseModel::load does not show an additional + // "General Error" message box } } else -- cgit From 3c9b81c301fcde1230e6b2ef393dcd9b693d83bb Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 28 Sep 2012 16:59:02 +0100 Subject: fix xlsx export missing alignment attributes with cellstyle fdo#55417 Change-Id: I510d0f399c58b5a9b192f3566e093c636cae2c0a --- sc/source/filter/excel/xestyle.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index ebbe25621d94..a90483151e88 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2025,7 +2025,6 @@ void XclExpXF::Init( const SfxItemSet& rItemSet, sal_Int16 nScript, GETITEMVALUE( rItemSet, SfxUInt32Item, ATTR_VALUE_FORMAT, sal_uLong ) : nForceScNumFmt; mnXclNumFmt = GetNumFmtBuffer().Insert( mnScNumFmt ); mbFmtUsed = ScfTools::CheckItem( rItemSet, ATTR_VALUE_FORMAT, IsStyleXF() ); - // alignment mbAlignUsed = maAlignment.FillFromItemSet( rItemSet, bForceLineBreak, GetBiff(), IsStyleXF() ); @@ -2112,10 +2111,12 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); sal_Int32 nXfId = 0; + const XclExpXF* pStyleXF = NULL; if( IsCellXF() ) { sal_uInt16 nXFIndex = rStrm.GetRoot().GetXFBuffer().GetXFIndex( mnParentXFId ); nXfId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( nXFIndex ); + pStyleXF = rStrm.GetRoot().GetXFBuffer().GetXFById( mnParentXFId ); } rStyleSheet->startElement( XML_xf, @@ -2135,8 +2136,13 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) FSEND ); if( mbAlignUsed ) maAlignment.SaveXml( rStrm ); + else if ( pStyleXF ) + pStyleXF->GetAlignmentData().SaveXml( rStrm ); if( mbProtUsed ) maProtection.SaveXml( rStrm ); + else if ( pStyleXF ) + pStyleXF->GetProtectionData().SaveXml( rStrm ); + // OOXTODO: XML_extLst rStyleSheet->endElement( XML_xf ); } -- cgit From 3f2dd33e269a8a70a331b275b8a079a4b5eb7879 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 28 Sep 2012 12:21:53 -0400 Subject: Unwind some of the resource ID nastiness between sc and svx. Never reference SC resource ID's in svx. That's just asking for trouble. Change-Id: I893de42891fbc05a2824360c52f2b74ead60f60c --- sc/inc/sc.hrc | 9 ++-- sc/sdi/scalc.sdi | 120 +++++++++++++++++++++++++++++++++++++++++++++++ svx/inc/svx/svxids.hrc | 16 ++----- svx/sdi/svx.sdi | 125 ------------------------------------------------- 4 files changed, 129 insertions(+), 141 deletions(-) diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index b5e6b8a15fd8..51cebf39f182 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -238,6 +238,7 @@ #define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34) #define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35) #define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36) +#define SID_ENTER_STRING (SC_MESSAGE_START + 37) // messages for opening dialogs: #define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50) @@ -369,13 +370,15 @@ #define SID_TEXT_TO_COLUMNS (DATA_MENU_START + 19) #define SID_CONSOLIDATE (DATA_MENU_START + 20) #define SID_AUTOFILTER_HIDE (DATA_MENU_START + 21) - #define SID_SBA_IMPORT (DATA_MENU_START + 22) - #define SID_SORT_DESCENDING (DATA_MENU_START + 23) #define SID_SORT_ASCENDING (DATA_MENU_START + 24) +#define SID_OUTLINE_HIDE (DATA_MENU_START + 25) +#define SID_OUTLINE_SHOW (DATA_MENU_START + 26) +#define SID_OUTLINE_MAKE (DATA_MENU_START + 27) +#define SID_OUTLINE_REMOVE (DATA_MENU_START + 28) -#define DATA_MENU_END (DATA_MENU_START + 25) +#define DATA_MENU_END (DATA_MENU_START + 29) #define TAB_POPUP_START (DATA_MENU_END) #define RID_POPUP_TAB (TAB_POPUP_START) diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 451ffca2ce8c..f9d70578e9bf 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -8172,3 +8172,123 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC ToolBoxConfig = FALSE, GroupId = GID_OPTIONS; ] + +SfxVoidItem ShowDetail SID_OUTLINE_SHOW +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_DATA; +] + +SfxVoidItem HideDetail SID_OUTLINE_HIDE +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_DATA; +] + +SfxVoidItem Group SID_OUTLINE_MAKE +(SfxStringItem RowOrCol SID_OUTLINE_MAKE) +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_DATA; +] + +SfxVoidItem Ungroup SID_OUTLINE_REMOVE +(SfxStringItem RowOrCol SID_OUTLINE_REMOVE) +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_DATA; +] + +SfxVoidItem EnterString SID_ENTER_STRING +(SfxStringItem StringName SID_ENTER_STRING) +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_INTERN; +] diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index a932a117bb99..8d6e56f1e8c2 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -231,19 +231,6 @@ #define ID_VAL_USELASTCOLUMNSTYLE (SID_SD_START+327) #define ID_VAL_USEBANDINGCOLUMNSTYLE (SID_SD_START+328) -// -------------------------------------------------------------------------- -// Calc-Id's -// -------------------------------------------------------------------------- - -#define SID_OUTLINE_HIDE (SID_SC_START + 329) -#define SID_OUTLINE_SHOW (SID_SC_START + 330) -#define SID_OUTLINE_MAKE (SID_SC_START + 331) -#define SID_OUTLINE_REMOVE (SID_SC_START + 332) -#define SID_FRAME_UP (SID_SC_START + 407) -#define SID_FRAME_DOWN (SID_SC_START + 408) -#define SID_ENTER_STRING (SID_SC_START + 476) -#define SID_ATTR_SPECIALCHAR (SID_SC_START + 581) - // -------------------------------------------------------------------------- // Writer-Id's // -------------------------------------------------------------------------- @@ -937,6 +924,9 @@ #define SID_ATTR_PAGE_SHARED_FIRST (SID_SVX_START+1114) #define SID_SAVE_GRAPHIC (SID_SVX_START+1115) #define SID_COMPRESS_GRAPHIC (SID_SVX_START+1116) +#define SID_FRAME_UP (SID_SVX_START+1117) +#define SID_FRAME_DOWN (SID_SVX_START+1118) +#define SID_ATTR_SPECIALCHAR (SID_SVX_START+1119) // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id #define SID_SVX_FIRSTFREE (SID_COMPRESS_GRAPHIC + 1) diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index eea97a40a5bd..97c15711a3a6 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -5574,31 +5574,6 @@ SfxBoolItem GridVisible SID_GRID_VISIBLE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- -SfxVoidItem Group SID_OUTLINE_MAKE -(SfxStringItem RowOrCol SID_OUTLINE_MAKE) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_DATA; -] - //-------------------------------------------------------------------------- SfxBoolItem GroupBox SID_FM_GROUPBOX @@ -5734,31 +5709,6 @@ SfxBoolItem HFixedLine SID_INSERT_HFIXEDLINE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- -SfxVoidItem HideDetail SID_OUTLINE_HIDE -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_DATA; -] - //-------------------------------------------------------------------------- SfxBoolItem HScrollbar SID_INSERT_HSCROLLBAR @@ -6072,31 +6022,6 @@ SfxVoidItem InPlaceObjectResize SID_OBJECTRESIZE GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- -SfxVoidItem EnterString SID_ENTER_STRING -(SfxStringItem StringName SID_ENTER_STRING) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - //-------------------------------------------------------------------------- SfxVoidItem InsertAnnotation SID_INSERT_POSTIT (SvxPostItAuthorItem Author SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date SID_ATTR_POSTIT_DATE,SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT) @@ -10137,31 +10062,6 @@ SvxShadowedItem Shadowed SID_ATTR_CHAR_SHADOWED GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- -SfxVoidItem ShowDetail SID_OUTLINE_SHOW -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_DATA; -] - //-------------------------------------------------------------------------- SfxBoolItem ShowFmExplorer SID_FM_SHOW_FMEXPLORER @@ -11507,31 +11407,6 @@ SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- -SfxVoidItem Ungroup SID_OUTLINE_REMOVE -(SfxStringItem RowOrCol SID_OUTLINE_REMOVE) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_DATA; -] - //-------------------------------------------------------------------------- SfxBoolItem URLButton SID_INSERT_URLBUTTON -- cgit From 873e0883eb0a0c58da2582c50ab32a9d8cf35ed1 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 28 Sep 2012 19:02:44 +0100 Subject: halt corrupted styles with multi-saved xlsx document fdo#55418 Change-Id: I2d53c88ab121edeec2bf53f7fd177a0edcc05a25 --- sc/source/filter/excel/xestyle.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index a90483151e88..339dd10df17b 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2235,7 +2235,10 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm ) } else sName = XclXmlUtils::ToOString( maName ); - sal_Int32 nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( maXFId.mnXFId ); + // get the index in sortedlist associated with the mnXId + sal_Int32 nXFId = rStrm.GetRoot().GetXFBuffer().GetXFIndex( maXFId.mnXFId ); + // get the style index associated with index into sortedlist + nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( nXFId ); rStrm.GetCurrentStream()->singleElement( XML_cellStyle, XML_name, sName.getStr(), XML_xfId, OString::valueOf( nXFId ).getStr(), -- cgit From cd00b5eed8d1a590c8779c0db0ed78ebac4638f5 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 28 Sep 2012 20:14:17 +0200 Subject: fetime of mpCondFormat is more complex, fdo#55379 Change-Id: I2b34f9fefdfdfa245ab73f8691090cbde8bcd34e --- sc/source/filter/xml/xmlstyli.cxx | 11 +++++------ sc/source/filter/xml/xmlstyli.hxx | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index a05276fd5373..2b6c58b2615e 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -390,12 +390,15 @@ XMLTableStyleContext::XMLTableStyleContext( ScXMLImport& rImport, nNumberFormat(-1), nLastSheet(-1), bParentSet(false), - mpCondFormat(NULL) + mpCondFormat(NULL), + mbDeleteCondFormat(true) { } XMLTableStyleContext::~XMLTableStyleContext() { + if(mbDeleteCondFormat) + delete mpCondFormat; } SvXMLImportContext *XMLTableStyleContext::CreateChildContext( @@ -442,11 +445,6 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceEqualEntries(*mpCondFormat)) { - // we don't need the new cond format entry now - // the found one is the same and we just need to add the range to it - delete mpCondFormat; - mpCondFormat = NULL; - ScRangeList& rRangeList = itr->GetRangeList(); sal_uInt32 nCondId = itr->GetKey(); size_t n = rRange.size(); @@ -468,6 +466,7 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceAddCondFormat(mpCondFormat, nTab ); mpCondFormat->SetKey(nIndex); mpCondFormat->AddRange(rRange); diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index def350985b0f..28ea475e9c37 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -101,6 +101,7 @@ class XMLTableStyleContext : public XMLPropStyleContext SCTAB nLastSheet; bool bParentSet; ScConditionalFormat* mpCondFormat; + bool mbDeleteCondFormat; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } -- cgit From 602d3370d5c85813aeb895d1e130b66691b2fcd5 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 28 Sep 2012 20:16:18 +0200 Subject: use a as prefix for local variables Change-Id: Id4652eb986c02044e27cd4e91863d5ed97465860 --- sc/source/filter/xml/xmlstyli.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 2b6c58b2615e..687c841b27b4 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -428,13 +428,13 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceGetRangeList(); sal_uInt32 nCondId = itr->GetKey(); - size_t n = rRange.size(); + size_t n = aRangeList.size(); for(size_t i = 0; i < n; ++i) { - const ScRange* pRange = rRange[i]; + const ScRange* pRange = aRangeList[i]; rRangeList.Join(*pRange); } ScPatternAttr aPattern( pDoc->GetPool() ); aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nCondId ) ); ScMarkData aMarkData; - aMarkData.MarkFromRangeList(rRange, true); + aMarkData.MarkFromRangeList(aRangeList, true); pDoc->ApplySelectionPattern( aPattern , aMarkData); break; @@ -469,12 +469,12 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceAddCondFormat(mpCondFormat, nTab ); mpCondFormat->SetKey(nIndex); - mpCondFormat->AddRange(rRange); + mpCondFormat->AddRange(aRangeList); ScPatternAttr aPattern( pDoc->GetPool() ); aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); ScMarkData aMarkData; - aMarkData.MarkFromRangeList(rRange, true); + aMarkData.MarkFromRangeList(aRangeList, true); pDoc->ApplySelectionPattern( aPattern , aMarkData); } -- cgit From fd028e32bfdde35fb01ac69db3d3da359d8c8ff2 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 28 Sep 2012 21:01:14 +0200 Subject: vba procedures and macro names will result in crash, fdo#55174 Change-Id: I23073ecc56482670d185b39452a7d8b9d6eb38c8 --- sc/source/filter/oox/defnamesbuffer.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 6a3a3aaefa1c..6a62f019917a 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -426,6 +426,10 @@ DefinedName::getTokens() void DefinedName::convertFormula() { + // macro function or vba procedure + if(!mpScRangeData) + return; + // convert and set formula of the defined name if ( getFilterType() == FILTER_OOXML ) { -- cgit From e8bf43c514d6c519e94deb2fbc5a1ccb4c96d3f0 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 21:37:26 +0200 Subject: vcl: fix gtk3 build breakage due to forgotten use_libraries Change-Id: I53faf1a5c88b6ffd954fd98814cdf27b77f1c3db --- vcl/Library_vclplug_gtk3.mk | 15 ++++++--------- vcl/Library_vclplug_tde.mk | 13 +++++-------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 2c34e1d529e7..a04472353db2 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -50,8 +50,12 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\ $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3)) $(eval $(call gb_Library_add_libs,vclplug_gtk3,\ - $$(GTK3_LIBS) \ - $$(GTHREAD_LIBS) \ + $(GTK3_LIBS) \ + $(GTHREAD_LIBS) \ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ )) $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ @@ -75,13 +79,6 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ )) -$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ - -lX11 \ - -lXext \ - -lSM \ - -lICE \ -)) - $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ vcl/unx/gtk3/a11y/gtk3atkaction \ vcl/unx/gtk3/a11y/gtk3atkbridge \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index 9431131171ce..600f00a9aa35 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -45,7 +45,11 @@ $(eval $(call gb_Library_add_defs,vclplug_tde,\ $(eval $(call gb_Library_use_sdk_api,vclplug_tde)) $(eval $(call gb_Library_add_libs,vclplug_tde,\ - $$(TDE_LIBS) \ + $(TDE_LIBS) \ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ )) $(eval $(call gb_Library_use_libraries,vclplug_tde,\ @@ -70,13 +74,6 @@ $(eval $(call gb_Library_use_externals,vclplug_tde,\ icuuc \ )) -$(eval $(call gb_Library_add_libs,vclplug_tde,\ - -lX11 \ - -lXext \ - -lSM \ - -lICE \ -)) - $(eval $(call gb_Library_add_exception_objects,vclplug_tde,\ vcl/unx/kde/kdedata \ vcl/unx/kde/salnativewidgets-kde \ -- cgit From aa03698b88e95636d838dfc1274473ac3c0fa659 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 21:47:29 +0200 Subject: RepositoryExternal: internal libpng requires zlib as well Change-Id: Ib23b2a6bd9301a03321ddb5c8a488b579fa8d1a2 --- RepositoryExternal.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1196385a9a93..78e82b697c1f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1371,6 +1371,7 @@ define gb_LinkTarget__use_png $(call gb_LinkTarget_use_static_libraries,$(1),\ png \ ) +$(call gb_LinkTarget__use_zlib,$(1)) endef -- cgit From ac9d8ed30b81bde14f67aff2c228d30085bfedd5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 28 Sep 2012 13:07:19 +0300 Subject: Workaround for boost problem with the 10.7 SDK Change-Id: I970326f084ef20fc9887e62adf95547c2468aebd --- solenv/gbuild/platform/macosx.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index f1b6666cc482..1aad554722ba 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -75,6 +75,14 @@ gb_COMPILERDEFS += \ endif +# Without this I get struct/class clashes for "complex" when compiling +# some source files in vcl, at least with the 10.7 SDK. +ifneq ($(filter 1070,$(MACOSX_SDK_VERSION)),) +gb_COMPILERDEFS += \ + -DBOOST_DETAIL_NO_CONTAINER_FWD \ + +endif + ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE) gb_CXXFLAGS += -Wno-long-double endif -- cgit From 8c2662b331993f32da64bd46d4180218f55f2653 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 28 Sep 2012 13:21:59 +0300 Subject: No need for BITNESS_OVERRIDE in makefilery as CPU etc work fine Change-Id: I59f4d5ad275af62c997723908754112c062a31be --- avmedia/Module_avmedia.mk | 2 +- config_host.mk.in | 1 - configure.in | 2 -- postprocess/packcomponents/makefile.mk | 2 +- scp2/InstallModule_ooo.mk | 3 --- scp2/source/ooo/file_library_ooo.scp | 2 +- solenv/inc/wntmsc.mk | 12 ++++++------ vcl/Library_vcl.mk | 2 +- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 115ee13a5b06..f712344da4c7 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\ endif ifeq ($(GUIBASE),aqua) -ifneq ($(BITNESS_OVERRIDE),64) +ifneq ($(CPUNAME),X86_64) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaQuickTime \ )) diff --git a/config_host.mk.in b/config_host.mk.in index 231009810aa1..7a511eaaeb3b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -56,7 +56,6 @@ export CDR_LIBS=@CDR_LIBS@ export CDR_TARBALL=@CDR_TARBALL@ export CHECK_PARALLELISM=@CHECK_PARALLELISM@ export CLASSPATH=@CLASSPATH@ -export BITNESS_OVERRIDE=@BITNESS_OVERRIDE@ export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@ export CLUCENE_LIBS=@CLUCENE_LIBS@ export CLUCENE_TARBALL=@CLUCENE_TARBALL@ diff --git a/configure.in b/configure.in index be6397872024..aca0eafc5f6c 100644 --- a/configure.in +++ b/configure.in @@ -2865,8 +2865,6 @@ AC_SUBST(ENABLE_DIRECTX) AC_SUBST(DISABLE_ACTIVEX) AC_SUBST(DISABLE_ATL) -AC_SUBST(BITNESS_OVERRIDE) - if test "$cross_compiling" = "yes"; then CROSS_COMPILING=YES SCPDEFS="$SCPDEFS -DCROSS_COMPILING" diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 998a13f009f5..8b2aea2781c2 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -328,7 +328,7 @@ my_components += \ .END .IF "$(GUIBASE)" == "aqua" -.IF "$(BITNESS_OVERRIDE)" != "64" +.IF "$(CPUNAME)" != "X86_64" my_components += \ component/avmedia/source/quicktime/avmediaQuickTime .ENDIF diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 459cbf644564..5ca6b6c97408 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -166,9 +166,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\ -DWITHOUT_MYSPELL_DICTS \ ) \ - $(if $(BITNESS_OVERRIDE),\ - -DBITNESS_OVERRIDE=$(BITNESS_OVERRIDE) \ - ) \ )) ifeq ($(DISABLE_PYTHON),TRUE) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 828c4765f13d..3cc740ba3daa 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -528,7 +528,7 @@ File gid_File_Lib_MacOSXSpell Dir = SCP2_OOO_BIN_DIR; End -#if !defined(BITNESS_OVERRIDE) || BITNESS_OVERRIDE==32 +#ifndef X86_64 File gid_File_Lib_avmediaQuickTime LIB_FILE_BODY; Styles = (PACKED); diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index 4e8b7bea18c3..ef6e58978020 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -29,7 +29,7 @@ JAVAFLAGSDEBUG=-g -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" ASM=ml AFLAGS=/c /Cp /coff /safeseh .ELSE @@ -89,7 +89,7 @@ CFLAGS+=-GS CFLAGS+=-c -nologo -Gs $(NOLOGO) -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS .ELSE CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS @@ -119,7 +119,7 @@ CFLAGS+= -Z7 CFLAGSEXCEPTIONS=-EHa CFLAGS_NO_EXCEPTIONS= -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" # enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL .ENDIF @@ -204,7 +204,7 @@ _VC_MANIFEST_BASENAME=__VC80 _VC_MANIFEST_BASENAME=__VC90 .ENDIF -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197 .ELSE LINK=link /MACHINE:X64 @@ -217,7 +217,7 @@ LINKFLAGS=/MAP /OPT:NOREF .ENDIF # excetion handling protection -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" LINKFLAGS+=-safeseh .ENDIF @@ -301,7 +301,7 @@ LIBMGR=lib $(NOLOGO) IMPLIB=lib LIBFLAGS= -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" IMPLIBFLAGS=-machine:IX86 .ELSE IMPLIBFLAGS=-machine:X64 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 6eebaeb1e015..6aaa675cba8d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -437,7 +437,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ - $(if $(filter 64,$(BITNESS_OVERRIDE)),,QuickTime) \ + $(if $(filter X86_64,$(CPUNAME)),,QuickTime) \ Cocoa \ Carbon \ CoreFoundation \ -- cgit From 78253a7836050e1ddd2f0c67d739c956319f3a9a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 29 Sep 2012 08:37:16 +0300 Subject: Make --enable-64-bit automatically turn on --enable-coretext Change-Id: I4d2749d8da44fd8b469315c2be0093c19fc20be1 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index aca0eafc5f6c..7ba3b7a9060a 100644 --- a/configure.in +++ b/configure.in @@ -10645,7 +10645,7 @@ dnl =================================================================== ENABLE_CORETEXT=NO if test "$_os" = "Darwin"; then AC_MSG_CHECKING([whether to use CoreText framework]) - if test "$enable_coretext" = "yes"; then + if test "$enable_coretext" = yes -o "$BITNESS_OVERRIDE" = 64; then AC_MSG_RESULT([yes]) ENABLE_CORETEXT=YES else -- cgit From aac912e02fee8f9c894d4fe38ee7aec0af725637 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:02:03 -0500 Subject: gbuildify tomcat Change-Id: Ibd7b71292450db8e3e98f9ede5a836182eb38770 --- Makefile.top | 2 +- config_host.mk.in | 1 + configure.in | 3 +++ ooo.lst.in | 2 +- tomcat/ExternalProject_tomcat.mk | 36 ++++++++++++++++++++++++++++++++++++ tomcat/Makefile | 7 +++++++ tomcat/Module_tomcat.mk | 22 ++++++++++++++++++++++ tomcat/Package_tomcat.mk | 16 ++++++++++++++++ tomcat/UnpackedTarball_tomcat.mk | 17 +++++++++++++++++ tomcat/build.xml | 31 +++++++++++++++++++++++++++++++ tomcat/prj/build.lst | 2 +- tomcat/prj/d.lst | 2 +- tomcat/prj/dmake | 0 tomcat/tomcat.patch | 35 ----------------------------------- 14 files changed, 137 insertions(+), 39 deletions(-) create mode 100644 tomcat/ExternalProject_tomcat.mk create mode 100644 tomcat/Makefile create mode 100644 tomcat/Module_tomcat.mk create mode 100644 tomcat/Package_tomcat.mk create mode 100644 tomcat/UnpackedTarball_tomcat.mk create mode 100644 tomcat/build.xml delete mode 100644 tomcat/prj/dmake delete mode 100644 tomcat/tomcat.patch diff --git a/Makefile.top b/Makefile.top index 642ec0036c50..d32a0baa204b 100644 --- a/Makefile.top +++ b/Makefile.top @@ -157,6 +157,7 @@ swext\ tail_build\ test\ testtools\ +tomcat\ toolkit\ tools\ touch\ @@ -249,7 +250,6 @@ soltools\ stax\ stlport\ sysui\ -tomcat\ xpdf\ zlib\ diff --git a/config_host.mk.in b/config_host.mk.in index 7a511eaaeb3b..9814f16d775c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -592,6 +592,7 @@ export TELEPATHY_LIBS=@TELEPATHY_LIBS@ export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@ @x_Cygwin@ export TMP=@TMP_DIRECTORY@ export TMPDIR=@TEMP_DIRECTORY@ +export TOMCAT_TARBALL=@TOMCAT_TARBALL@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@ export SYSTEM_UCPP=@SYSTEM_UCPP@ export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@ diff --git a/configure.in b/configure.in index 7ba3b7a9060a..ac9266cb8d3f 100644 --- a/configure.in +++ b/configure.in @@ -9702,6 +9702,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES"; then AC_MSG_RESULT([internal]) SYSTEM_SERVLETAPI=NO BUILD_TYPE="$BUILD_TYPE TOMCAT" + TOMCAT_TARBALL="2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz" fi fi AC_SUBST(SYSTEM_SERVLETAPI) @@ -9972,6 +9973,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then APACHE_COMMONS_HTTPCLIENT_TARBALL=2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz APACHE_COMMONS_LANG_TARBALL=2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz APACHE_COMMONS_LOGGING_TARBALL=3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + TOMCAT_TARBALL="2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz" BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi fi @@ -9984,6 +9986,7 @@ AC_SUBST(COMMONS_CODEC_JAR) AC_SUBST(COMMONS_LANG_JAR) AC_SUBST(COMMONS_HTTPCLIENT_JAR) AC_SUBST(COMMONS_LOGGING_JAR) +AC_SUBST(TOMCAT_TARBALL) # scripting provider for BeanShell extension? AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell]) diff --git a/ooo.lst.in b/ooo.lst.in index 0c4e9a1f7673..6c5c763793c1 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -10,7 +10,7 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz -2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz +@TOMCAT_TARBALL@ @APACHE_COMMONS_HTTPCLIENT_TARBALL@ @APACHE_COMMONS_LANG_TARBALL@ @FONT_LINLIBERTINEG_TARBALL@ diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk new file mode 100644 index 000000000000..48c063f7c8f8 --- /dev/null +++ b/tomcat/ExternalProject_tomcat.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk + +$(eval $(call gb_ExternalProject_ExternalProject,tomcat)) + +$(eval $(call gb_ExternalProject_use_unpacked,tomcat,tomcat)) + +$(eval $(call gb_ExternalProject_register_targets,tomcat,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,tomcat,build) : + cd "$(call gb_UnpackedTarball_get_dir,tomcat)/jakarta-servletapi-5" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/Makefile b/tomcat/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/tomcat/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/Module_tomcat.mk b/tomcat/Module_tomcat.mk new file mode 100644 index 000000000000..ffe909089a3a --- /dev/null +++ b/tomcat/Module_tomcat.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,tomcat)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter TOMCAT,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,tomcat,\ + ExternalProject_tomcat \ + Package_tomcat \ + UnpackedTarball_tomcat \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/Package_tomcat.mk b/tomcat/Package_tomcat.mk new file mode 100644 index 000000000000..8cd451254f69 --- /dev/null +++ b/tomcat/Package_tomcat.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,tomcat_inc,$(call gb_UnpackedTarball_get_dir,tomcat))) + +$(eval $(call gb_Package_use_external_project,tomcat_inc,tomcat)) + +$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/UnpackedTarball_tomcat.mk b/tomcat/UnpackedTarball_tomcat.mk new file mode 100644 index 000000000000..6e6a71631491 --- /dev/null +++ b/tomcat/UnpackedTarball_tomcat.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,tomcat)) + +$(eval $(call gb_UnpackedTarball_set_tarball,tomcat,$(TOMCAT_TARBALL))) + + +$(eval $(call gb_UnpackedTarball_add_file,tomcat,jakarta-servletapi-5/build.xml,tomcat/build.xml)) + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/build.xml b/tomcat/build.xml new file mode 100644 index 000000000000..2d54d3df39da --- /dev/null +++ b/tomcat/build.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + diff --git a/tomcat/prj/build.lst b/tomcat/prj/build.lst index 184f6dd19b3e..eca653ba9490 100644 --- a/tomcat/prj/build.lst +++ b/tomcat/prj/build.lst @@ -1,2 +1,2 @@ to tomcat : solenv NULL -to tomcat nmake - all to_mkout NULL +to tomcat/prj nmake - all to_prj NULL diff --git a/tomcat/prj/d.lst b/tomcat/prj/d.lst index 41530ac07cf4..8b137891791f 100644 --- a/tomcat/prj/d.lst +++ b/tomcat/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\misc\build\jakarta-tomcat-5.0.30-src\jakarta-servletapi-5\jsr154\dist\lib\servlet-api.jar %_DEST%\bin\servlet-api.jar + diff --git a/tomcat/prj/dmake b/tomcat/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch deleted file mode 100644 index 1815660b1b5b..000000000000 --- a/tomcat/tomcat.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- misc/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml Thu Jun 19 16:03:59 2008 -+++ misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml Thu Jun 19 15:56:18 2008 -@@ -1,1 +1,31 @@ --dummy -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -- cgit From e9816ef937adb070f8252a2e6041fbe3a8e3d7c4 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:21:20 -0500 Subject: beautify Module_tailbuild a bit Change-Id: If54d57c962c6cb97c539e46f2ea747668706770e --- Module_tail_build.mk | 258 ++++++++++++++++++++---------------------------- solenv/gbuild/Helper.mk | 4 + 2 files changed, 113 insertions(+), 149 deletions(-) diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 3155b7b419e0..cf86f3c39c9f 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -25,74 +25,58 @@ $(eval $(call gb_Module_Module,tail_end)) $(eval $(call gb_Module_add_moduledirs,tail_end,\ - accessibility \ - $(if $(filter AFMS,$(BUILD_TYPE)),\ - afms \ - ) \ - animations \ - apple_remote \ + accessibility \ + $(call gb_Helper_optional,AFMS,afms) \ + animations \ + apple_remote \ autodoc \ - avmedia \ - basctl \ - basebmp \ + avmedia \ + basctl \ + basebmp \ basegfx \ - basic \ - bean \ + basic \ + bean \ binaryurp \ - $(if $(filter BLUEZ,$(BUILD_TYPE)),\ - bluez_bluetooth \ - ) \ + $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ bridges \ - canvas \ - chart2 \ + canvas \ + chart2 \ cli_ure \ - $(if $(filter CLUCENE,$(BUILD_TYPE)),\ - clucene \ - ) \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - codemaker \ - ) \ - comphelper \ - configmgr \ - connectivity \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional,DESKTOP,codemaker) \ + comphelper \ + configmgr \ + connectivity \ cosv \ - cppcanvas \ + cppcanvas \ cppu \ cppuhelper \ cpputools \ - cui \ - dbaccess \ - desktop \ - $(if $(filter DICTIONARIES,$(BUILD_TYPE)),\ - dictionaries \ - ) \ - dtrans \ - drawinglayer \ - editeng \ - embeddedobj \ + cui \ + dbaccess \ + desktop \ + $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ + dtrans \ + drawinglayer \ + editeng \ + embeddedobj \ embedserv \ - eventattacher \ - extensions \ + eventattacher \ + extensions \ extras \ - fileaccess \ - filter \ - forms \ - formula \ - fpicker \ - framework \ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - helpcompiler \ - ) \ - $(if $(filter HSQLDB,$(BUILD_TYPE)),\ - hsqldb \ - ) \ - hwpfilter \ + fileaccess \ + filter \ + forms \ + formula \ + fpicker \ + framework \ + $(call gb_Helper_optional,DESKTOP,helpcompiler) \ + $(call gb_Helper_optional,HSQLDB,hsqldb) \ + hwpfilter \ i18npool \ i18nutil \ - idl \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - idlc \ - ) \ + idl \ + $(call gb_Helper_optional,DESKTOP,idlc) \ io \ javaunohelper \ jurt \ @@ -106,118 +90,94 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ libwpd \ libwpg \ libwps \ - lingucomponent \ - linguistic \ - lotuswordpro \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - l10ntools \ - ) \ - MathMLDTD \ + lingucomponent \ + linguistic \ + lotuswordpro \ + $(call gb_Helper_optional,DESKTOP,l10ntools) \ + MathMLDTD \ mdds \ - Mesa \ - $(if $(filter MORE_FONTS,$(BUILD_TYPE)),\ - more_fonts \ - ) \ - $(if $(filter NEON,$(BUILD_TYPE)),\ - neon \ - ) \ - $(if $(filter NLPSOLVER,$(BUILD_TYPE)),\ - nlpsolver \ - ) \ - np_sdk \ + Mesa \ + $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ + $(call gb_Helper_optional,NEON,neon) \ + $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ + np_sdk \ o3tl \ offapi \ officecfg \ - oovbaapi \ - oox \ - package \ - padmin \ - psprint_config \ - $(if $(filter PYUNO,$(BUILD_TYPE)),\ - pyuno \ - ) \ - $(if $(filter QADEVOOO,$(BUILD_TYPE)),\ - qadevOOo \ - ) \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - rdbmaker \ - ) \ - readlicense_oo \ - regexp \ - registry \ - remotebridges \ - reportbuilder \ - reportdesign \ + oovbaapi \ + oox \ + package \ + padmin \ + psprint_config \ + $(call gb_Helper_optional,PYUNO,pyuno) \ + $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ + $(call gb_Helper_optional,DESKTOP,rdbmaker) \ + readlicense_oo \ + regexp \ + registry \ + remotebridges \ + reportbuilder \ + reportdesign \ ridljar \ - rsc \ + rsc \ salhelper \ - sane \ + sane \ sax \ - sc \ - scaddins \ - sccomp \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - scp2 \ - ) \ - scripting \ - sd \ - sdext \ - sfx2 \ - shell \ - slideshow \ - smoketest \ - sot \ - starmath \ + sc \ + scaddins \ + sccomp \ + $(call gb_Helper_optional,DESKTOP,scp2) \ + scripting \ + sd \ + sdext \ + sfx2 \ + shell \ + slideshow \ + smoketest \ + sot \ + starmath \ stoc \ store \ - svl \ - svtools \ - svx \ - sw \ - swext \ - test \ - testtools \ - toolkit \ + svl \ + svtools \ + svx \ + sw \ + swext \ + test \ + testtools \ + toolkit \ tools \ touch \ - $(if $(filter TRANSLATIONS,$(BUILD_TYPE)),\ - translations \ - ) \ - tubes \ - twain \ - ucb \ + $(call gb_Helper_optional,TRANSLATIONS,translations) \ + tubes \ + twain \ + ucb \ ucbhelper \ - $(if $(filter UCPP,$(BUILD_TYPE)),\ - ucpp \ - ) \ + $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ udm \ - unixODBC \ - UnoControls \ - unodevtools \ + unixODBC \ + UnoControls \ + unodevtools \ unoil \ unotest \ - unotools \ - unoxml \ + unotools \ + unoxml \ ure \ - uui \ - vbahelper \ - vcl \ + uui \ + vbahelper \ + vcl \ vigra \ - wizards \ - writerfilter \ - writerperfect \ - $(if $(filter X11_EXTENSIONS,$(BUILD_TYPE)), \ - x11_extensions \ - ) \ - xmerge \ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - xmlhelp \ - ) \ - xmloff \ + wizards \ + writerfilter \ + writerperfect \ + $(call gb_Helper_optional,EXTENSIONS,x11_extensions) \ + xmerge \ + $(call gb_Helper_optional,DESKTOP,xmlhelp) \ + xmloff \ xmlreader \ - xmlscript \ - xmlsecurity \ + xmlscript \ + xmlsecurity \ xsltml \ )) @@ -228,7 +188,7 @@ $(eval $(call gb_Module_add_targets,tail_end,\ endif # Especially when building everything with symbols, the linking of the largest -# libraries takes enormous amounts of RAM. To prevent annoying OOM situations +# libraries takes enormous amounts of RAM. To prevent annoying OOM situations # etc., try to prevent linking these in parallel by adding artificial build # order dependencies here. define tailbuild_serialize1 diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index a75a6e0c05f9..c210cd716a61 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -189,4 +189,8 @@ endef # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use # for libraries from the OUTDIR +define gb_Helper_optional +$(if $(filter $(1),$(BUILD_TYPE)),$(2)) +endef + # vim: set noet sw=4 ts=4: -- cgit From 84d8fe80471589c7299ea806bdd62ce2563071e2 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:34:58 -0500 Subject: add apache_commons to tail_build Change-Id: I0365a5170011ad44b9a0ab8f1129a756884694d5 --- Module_tail_build.mk | 1 + apache-commons/Module_apache-commons.mk | 31 +++++++++++++++++++++++++++++++ apache-commons/Module_apache_commons.mk | 32 -------------------------------- tail_build/prj/build.lst | 2 +- 4 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 apache-commons/Module_apache-commons.mk delete mode 100644 apache-commons/Module_apache_commons.mk diff --git a/Module_tail_build.mk b/Module_tail_build.mk index cf86f3c39c9f..a9635e11bf70 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ accessibility \ $(call gb_Helper_optional,AFMS,afms) \ animations \ + $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ apple_remote \ autodoc \ avmedia \ diff --git a/apache-commons/Module_apache-commons.mk b/apache-commons/Module_apache-commons.mk new file mode 100644 index 000000000000..a89f69e6e94b --- /dev/null +++ b/apache-commons/Module_apache-commons.mk @@ -0,0 +1,31 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,apache_commons)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,apache_commons,\ + ExternalProject_apache_commons_codec \ + ExternalProject_apache_commons_httpclient \ + ExternalProject_apache_commons_lang \ + ExternalProject_apache_commons_logging \ + Package_apache_commons_codec \ + Package_apache_commons_httpclient \ + Package_apache_commons_lang \ + Package_apache_commons_logging \ + UnpackedTarball_apache_commons_codec \ + UnpackedTarball_apache_commons_httpclient \ + UnpackedTarball_apache_commons_lang \ + UnpackedTarball_apache_commons_logging \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/apache-commons/Module_apache_commons.mk b/apache-commons/Module_apache_commons.mk deleted file mode 100644 index 07cba6a99424..000000000000 --- a/apache-commons/Module_apache_commons.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Module_Module,apache_commons)) - -ifneq ($(SOLAR_JAVA),) -$(info "f:$(filter APACHE_COMMONS,$(BUILD_TYPE))") -ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),) -$(eval $(call gb_Module_add_targets,apache_commons,\ - ExternalProject_apache_commons_codec \ - ExternalProject_apache_commons_httpclient \ - ExternalProject_apache_commons_lang \ - ExternalProject_apache_commons_logging \ - Package_apache_commons_codec \ - Package_apache_commons_httpclient \ - Package_apache_commons_lang \ - Package_apache_commons_logging \ - UnpackedTarball_apache_commons_codec \ - UnpackedTarball_apache_commons_httpclient \ - UnpackedTarball_apache_commons_lang \ - UnpackedTarball_apache_commons_logging \ -)) -endif -endif - -# vim: set noet sw=4 ts=4: diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 41b00d57d1e9..5e84fda48129 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL +tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL -- cgit From a49bf649a2395c7fcac5b2cb2f19036e03de938e Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:42:25 -0500 Subject: add tomcat to tail_build Change-Id: Ida93051b4b631d24e738584a8a3ff2e24ea7bd7a --- Module_tail_build.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Module_tail_build.mk b/Module_tail_build.mk index a9635e11bf70..db82ee13c720 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -146,6 +146,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ swext \ test \ testtools \ + $(call gb_Helper_optional,TOMCAT,tomcat) \ toolkit \ tools \ touch \ -- cgit From 5e651590b29827a725f23190044617293ced1d74 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:42:48 -0500 Subject: hide external library neon's warnings Change-Id: Ie394ee8fc7a7e4c34965242920225c5dc2297c0b --- neon/Library_neon.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index 239a43491b3a..92b13ac97c11 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -19,6 +19,12 @@ $(eval $(call gb_Library_use_externals,neon,\ $(eval $(call gb_Library_set_visibility_default,neon)) +# neon has its share of warning... let's spare use +# the pointless spamming +$(eval $(call gb_Library_add_cflags,neon,\ + -w \ +)) + $(eval $(call gb_Library_set_warnings_not_errors,neon)) $(eval $(call gb_Library_add_generated_cobjects,neon,\ -- cgit From e50b3f0ecc8febf8ad2fe52a6fc6e81e1afe2d8d Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Thu, 27 Sep 2012 16:19:14 -0500 Subject: add supporting target and options to generate patches for ExternalProjects also add the support for the convention that a patch filename encode the -p value if it end with .[0-9] for instance foo.patch.2 indicate a -p2 patch usage: generate a 'reference' copy of the expanded and patched file structure $> make clucene.clean $> patches=t make clucene go to the module $> cd clucene edit files in $WORKDIR/UnpackedTarball/clucene force a rebuild of things that depend on that UnpackedTarball $> make clucene.rebuild create a -p1 patch named clucene.new.patch.1 in the module's directory $> make clucene.genpatch you can then rename it, place it where appropriate in the module hierarchy, update the UnpackedTarball_lucene.mk to apply it. rinse and repeat from the top (yes the make lucene.clean is needed to regenerate a 'reference' expanded and patched tarball) Change-Id: I419c54a5981cffa385521596ba5016d2ca7ef52a Reviewed-on: https://gerrit.libreoffice.org/712 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- solenv/gbuild/TargetLocations.mk | 1 + solenv/gbuild/UnpackedTarball.mk | 31 ++++++++++++++++++++++++++++++- solenv/gbuild/gbuild.mk | 8 ++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 16549233fa6c..55300ad1a6d6 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -171,6 +171,7 @@ gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1) gb_UnpackedTarball_get_dir = $(WORKDIR)/UnpackedTarball/$(1) +gb_UnpackedTarball_get_pristine_dir = $(WORKDIR)/UnpackedTarball/$(1).org gb_UnpackedTarball_get_final_target = $(WORKDIR)/UnpackedTarball/$(1).update gb_UnpackedTarball_get_target = $(WORKDIR)/UnpackedTarball/$(1).done gb_UnpackedTarball_get_preparation_target = $(WORKDIR)/UnpackedTarball/$(1).prepare diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index a9cf53e09764..c96d4ced7cc2 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -131,7 +131,9 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTOUNIX,$(file)) && ) \ $(if $(UNPACKED_PATCHES),\ for p in $(UNPACKED_PATCHES); do \ - $(GNUPATCH) -s -p$(UNPACKED_PATCHLEVEL) < "$$p" || exit 1;\ + pl=$(UNPACKED_PATCHLEVEL); \ + s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) pl="$$s"; ;; esac ; \ + $(GNUPATCH) -s -p$$pl < "$$p" || exit 1;\ done && \ ) \ $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTODOS,$(file)) && ) \ @@ -145,6 +147,10 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(UNPACKED_POST_ACTION),\ $(UNPACKED_POST_ACTION) && \ ) \ + $(if $(gb_KEEP_PRISTINE), \ + rm -fr $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \ + cp -r $(call gb_UnpackedTarball_get_dir,$(2)) $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \ + ) \ touch $(1) \ ) || \ ( \ @@ -174,6 +180,7 @@ $(call gb_UnpackedTarball_get_clean_target,%) : $(call gb_UnpackedTarball_get_target,$*) \ $(call gb_UnpackedTarball_get_preparation_target,$*) \ $(call gb_UnpackedTarball_get_dir,$*) \ + $(call gb_UnpackedTarball_get_pristine_dir,$*) \ $(foreach subdir,$(UNPACKED_SUBDIRS),$(gb_EXTERNAL_HEADERS_DIR)/$(subdir)) \ ) @@ -365,4 +372,26 @@ $(foreach file,$(2),$(call gb_UnpackedTarball_mark_output_file,$(1),$(file))) endef +# force the rebuild of an external target +# this only works when running as partial build. +# +%.rebuild : + if [ -f $(call gb_UnpackedTarball_get_target,$*) ] ; then \ + touch $(call gb_UnpackedTarball_get_target,$*) ; \ + make ;\ + fi + +%.genpatch : + if [ -d $(call gb_UnpackedTarball_get_dir,$*) -a -d $(call gb_UnpackedTarball_get_pristine_dir,$*) ] ; then \ + ( \ + patch_file=$$(pwd)/$*.new.patch.1; \ + cd $(call gb_UnpackedTarball_get_dir,) ; \ + diff -ur $*.org $* > $$patch_file; \ + echo "Patch $$patch_file generated" ; \ + ); \ + else \ + echo "Error: No pristine tarball avaialable for $*" 1>&2 ; \ + fi + + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 91bb68b39c8e..02f8998de1e1 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -71,6 +71,8 @@ endef COMMA :=, +CLOSE_PAREN :=) + # optional extensions that should never be essential ifneq ($(wildcard $(GBUILDDIR)/extensions/pre_*.mk),) include $(wildcard $(GBUILDDIR)/extensions/pre_*.mk) @@ -145,6 +147,12 @@ gb_FULLDEPS := $(true) endif endif +ifneq ($(strip $(patches)$(PATCHES)),) +gb_KEEP_PRISTINE := $(true) +else +gb_KEEP_PRISTINE := $(false) +endif + # save user-supplied flags for latter use # TODO remove after the old build system is abolished ifneq ($(strip $(ENVCFLAGS)),) -- cgit From b7ab3be54c3416b0ddcf6245d477589a4beb496c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 29 Sep 2012 11:05:17 +0200 Subject: fix dep on internal ucpp Change-Id: I42bbb3e53aaaad0e6b7df44ec2def038ac1a31eb --- solenv/gbuild/gbuild.mk | 86 ++++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 02f8998de1e1..74b0368ec209 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -171,6 +171,52 @@ include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk $(eval $(call gb_Helper_collect_libtargets)) +# Set up build tools that can be either internal or system. It is +# necessary to do it before we start including gbuild class makefiles, +# so the classes can add dependencies on them. +# +# TODO: As more external modules are converted, we would need more of +# these (e.g., ICU tools). Maybe the definitions should be moved to +# RepositoryExternal.mk ? +ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES) +gb_XSLTPROCTARGET := +gb_XSLTPROC := xsltproc +else +gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) +gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) +endif + +ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) +gb_XMLLINTTARGET := +gb_XMLLINT := xsltproc +else +gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) +gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) +endif + +ifeq ($(SYSTEM_PYTHON),YES) +gb_PYTHONTARGET := +gb_PYTHON := $(PYTHON) +else ifeq ($(OS),MACOSX) +#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in +#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME +#dirs for in-tree internal python +gb_PYTHONTARGET := +gb_PYTHON := $(PYTHON) +else ifeq ($(DISABLE_PYTHON),TRUE) +# Build-time python +gb_PYTHON := python +else +gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) +gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) +endif + +ifneq (,$(SYSTEM_UCPP)) +gb_UCPPTARGET := +else +gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) +endif + gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions @@ -379,46 +425,6 @@ endif endef - -ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES) -gb_XSLTPROCTARGET := -gb_XSLTPROC := xsltproc -else -gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) -gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) -endif - -ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) -gb_XMLLINTTARGET := -gb_XMLLINT := xsltproc -else -gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) -gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) -endif - -ifeq ($(SYSTEM_PYTHON),YES) -gb_PYTHONTARGET := -gb_PYTHON := $(PYTHON) -else ifeq ($(OS),MACOSX) -#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in -#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME -#dirs for in-tree internal python -gb_PYTHONTARGET := -gb_PYTHON := $(PYTHON) -else ifeq ($(DISABLE_PYTHON),TRUE) -# Build-time python -gb_PYTHON := python -else -gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) -gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) -endif - -ifneq (,$(SYSTEM_UCPP)) -gb_UCPPTARGET := -else -gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) -endif - .PHONY: help help: @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt -- cgit From b3f10b9772e4ae726b3d938b28fdf3d7d622db30 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 29 Sep 2012 11:08:09 +0200 Subject: add missing dep on cosv headers Change-Id: I444874a8b59ac82c807087fb1a1d958ab1f75b12 --- udm/StaticLibrary_udm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk index 01fe7eedaa23..3901a45bd727 100644 --- a/udm/StaticLibrary_udm.mk +++ b/udm/StaticLibrary_udm.mk @@ -10,6 +10,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm)) $(eval $(call gb_StaticLibrary_use_packages,udm,\ + cosv_inc \ udm_inc \ )) -- cgit From 62ca77267c18783ecbf7c7c3259b2fda6560aff7 Mon Sep 17 00:00:00 2001 From: Korrawit Pruegsanusak Date: Sat, 29 Sep 2012 11:40:56 +0700 Subject: sc/qa/unit: recover xDocSh->DoClose() which was removed in fde638b3ac35997aa3e38a37fed56d6eb661806b Change-Id: I57caf615f0ca49d0b90cb4c68b8ce8edf8f72a97 Reviewed-on: https://gerrit.libreoffice.org/723 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard --- sc/qa/unit/subsequent_filters-test.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index fb286e818424..10db9aeb80fc 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -355,6 +355,8 @@ void ScFiltersTest::testRangeNameXLSX() ScDocument* pDoc = xDocSh->GetDocument(); testRangeNameImpl(pDoc); + + xDocSh->DoClose(); } void ScFiltersTest::testHardRecalcODS() -- cgit From f1b1ae76246c3d63567b4982e46229cbde324c8e Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 26 Sep 2012 23:59:18 +0200 Subject: soltools conversion to gbuild The following tools are considered to be obsolete and are discontinued: ldump, giparser, testhxx and support. Change-Id: I70813c046edb30546463cda9eb8a1b96c3e840a3 --- Makefile.top | 2 +- Repository.mk | 5 +++ solenv/gbuild/InstallModuleTarget.mk | 4 +- soltools/Executable_adjustvisibility.mk | 16 +++++++ soltools/Executable_checkdll.mk | 22 ++++++++++ soltools/Executable_cpp.mk | 36 +++++++++++++++ soltools/Executable_javadep.mk | 16 +++++++ soltools/Executable_makedepend.mk | 43 ++++++++++++++++++ soltools/Makefile | 7 +++ soltools/Module_soltools.mk | 41 +++++++++++++++++ soltools/Package_inc.mk | 11 +++++ soltools/adjustvisibility/makefile.mk | 50 --------------------- soltools/checkdll/makefile.mk | 50 --------------------- soltools/cpp/makefile.mk | 72 ------------------------------ soltools/giparser/makefile.mk | 54 ----------------------- soltools/ldump/makefile.mk | 50 --------------------- soltools/mkdepend/makefile.mk | 78 --------------------------------- soltools/prj/build.lst | 14 +----- soltools/prj/d.lst | 11 ----- soltools/prj/dmake | 0 soltools/support/makefile.mk | 51 --------------------- soltools/testhxx/makefile.mk | 49 --------------------- soltools/util/makefile.pmk | 35 --------------- soltools/winunistd/makefile.mk | 43 ------------------ 24 files changed, 201 insertions(+), 559 deletions(-) create mode 100644 soltools/Executable_adjustvisibility.mk create mode 100644 soltools/Executable_checkdll.mk create mode 100644 soltools/Executable_cpp.mk create mode 100644 soltools/Executable_javadep.mk create mode 100644 soltools/Executable_makedepend.mk create mode 100644 soltools/Makefile create mode 100644 soltools/Module_soltools.mk create mode 100644 soltools/Package_inc.mk delete mode 100644 soltools/adjustvisibility/makefile.mk delete mode 100644 soltools/checkdll/makefile.mk delete mode 100644 soltools/cpp/makefile.mk delete mode 100644 soltools/giparser/makefile.mk delete mode 100644 soltools/ldump/makefile.mk delete mode 100644 soltools/mkdepend/makefile.mk delete mode 100644 soltools/prj/dmake delete mode 100644 soltools/support/makefile.mk delete mode 100644 soltools/testhxx/makefile.mk delete mode 100644 soltools/util/makefile.pmk delete mode 100644 soltools/winunistd/makefile.mk diff --git a/Makefile.top b/Makefile.top index d32a0baa204b..2fb2a7c5d1c4 100644 --- a/Makefile.top +++ b/Makefile.top @@ -145,6 +145,7 @@ shell\ slideshow\ smoketest\ solenv\ +soltools\ sot\ starmath\ stoc\ @@ -246,7 +247,6 @@ redland\ rhino\ saxon\ setup_native\ -soltools\ stax\ stlport\ sysui\ diff --git a/Repository.mk b/Repository.mk index cb511a076a22..933662fa76e0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -29,11 +29,14 @@ $(eval $(call gb_Helper_register_executables,NONE, \ HelpIndexer \ HelpLinker \ + adjustvisibility \ bestreversemap \ bmp \ bmpsum \ cfgex \ + checkdll \ checksingleton \ + cpp \ cppunit/cppunittester \ g2g \ gencoll_rule \ @@ -43,8 +46,10 @@ $(eval $(call gb_Helper_register_executables,NONE, \ gsicheck \ helpex \ idxdict \ + javadepend \ lngconvex \ localize \ + makedepend \ mkunroll \ mork_helper \ osl_process_child \ diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 242a2597a3d1..66e5ad526428 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -74,9 +74,7 @@ endef # ScpPreprocessTarget class -# TODO change to gb_Executable_get_target_for_build after soltools has -# been gbuildified -gb_ScpPreprocessTarget_TARGET := $(OUTDIR_FOR_BUILD)/bin/cpp.lcc +gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp) gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET) gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp diff --git a/soltools/Executable_adjustvisibility.mk b/soltools/Executable_adjustvisibility.mk new file mode 100644 index 000000000000..6a8ce614b7dd --- /dev/null +++ b/soltools/Executable_adjustvisibility.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,adjustvisibility)) + +$(eval $(call gb_Executable_add_exception_objects,adjustvisibility,\ + soltools/adjustvisibility/adjustvisibility \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Executable_checkdll.mk b/soltools/Executable_checkdll.mk new file mode 100644 index 000000000000..45e18246d6db --- /dev/null +++ b/soltools/Executable_checkdll.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,checkdll)) + +$(eval $(call gb_Executable_add_cobjects,checkdll,\ + soltools/checkdll/checkdll \ +)) + +ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) +$(eval $(call gb_Executable_add_libs,checkdll,\ + -ldl \ +)) +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk new file mode 100644 index 000000000000..29fb1f853fa8 --- /dev/null +++ b/soltools/Executable_cpp.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,cpp)) + +$(eval $(call gb_Executable_add_cobjects,cpp,\ + soltools/cpp/_cpp \ + soltools/cpp/_eval \ + soltools/cpp/_include \ + soltools/cpp/_lex \ + soltools/cpp/_macro \ + soltools/cpp/_mcrvalid \ + soltools/cpp/_nlist \ + soltools/cpp/_tokens \ + soltools/cpp/_unix \ +)) + +ifneq ($(or $(filter AIX MACOSX,$(OS)),$(filter NO,$(HAVE_GETOPT))),) +$(eval $(call gb_Executable_add_cobjects,cpp,\ + soltools/cpp/_getopt \ +)) +endif + +ifeq ($(HAVE_GETOPT),YES) +$(eval $(call gb_Executable_add_defs,cpp,\ + -DHAVE_GETOPT \ +)) +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Executable_javadep.mk b/soltools/Executable_javadep.mk new file mode 100644 index 000000000000..a0fc0369f8e1 --- /dev/null +++ b/soltools/Executable_javadep.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,javadep)) + +$(eval $(call gb_Executable_add_cobjects,javadep,\ + soltools/javadep/javadep \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk new file mode 100644 index 000000000000..e6e7ac6d5ff6 --- /dev/null +++ b/soltools/Executable_makedepend.mk @@ -0,0 +1,43 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,makedepend)) + +$(eval $(call gb_Executable_add_exception_objects,makedepend,\ + soltools/mkdepend/collectdircontent \ +)) + +$(eval $(call gb_Executable_add_defs,makedepend,\ + -DNO_X11 \ + -DXP_PC \ + -DHW_THREADS \ +)) + +ifeq ($(COM),MSC) +$(eval $(call gb_Executable_add_defs,makedepend,\ + -wd4100 \ + -wd4131 \ + -wd4706 \ +)) + +$(eval $(call gb_Executable_use_libraries,makedepend,\ + msvcprt \ +)) +endif + +$(eval $(call gb_Executable_add_cobjects,makedepend,\ + soltools/mkdepend/cppsetup \ + soltools/mkdepend/ifparser \ + soltools/mkdepend/include \ + soltools/mkdepend/main \ + soltools/mkdepend/parse \ + soltools/mkdepend/pr \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Makefile b/soltools/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/soltools/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk new file mode 100644 index 000000000000..ebd855ad30fc --- /dev/null +++ b/soltools/Module_soltools.mk @@ -0,0 +1,41 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,soltools)) + +ifneq ($(CROSS_COMPILING),YES) +$(eval $(call gb_Module_add_targets,soltools,\ + Executable_cpp \ + Executable_javadep \ + Executable_makedepend \ +)) + +ifeq ($(GUI),UNX) +$(eval $(call gb_Module_add_targets,soltools,\ + Executable_checkdll \ +)) +# +# the same as the condition outside of ifneq ($(CROSS_COMPILING),YES) +# ifeq ($(GUI)$(COM),WNTMSC) +# +else +$(eval $(call gb_Module_add_targets,soltools,\ + Package_inc \ +)) +endif # UNX + +ifeq ($(OS)$(COM),SOLARISC52) +$(eval $(call gb_Module_add_targets,soltools,\ + Executable_adjustvisibility \ +)) +endif # SOLARISC52 + +endif # CROSS_COMPILING + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Package_inc.mk b/soltools/Package_inc.mk new file mode 100644 index 000000000000..863945fe63f6 --- /dev/null +++ b/soltools/Package_inc.mk @@ -0,0 +1,11 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,soltools_inc,$(SRCDIR)/soltools/winunistd)) +$(eval $(call gb_Package_add_file,soltools_inc,inc/unistd.h,unistd.h)) diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk deleted file mode 100644 index 1f8d3aac3fd2..000000000000 --- a/soltools/adjustvisibility/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=adjustvisibility -TARGETTYPE=CUI -ENABLE_EXCEPTIONS=TRUE -noadjust=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -# This tool is for SunStudio on Solaris only -.IF "$(OS)$(COM)"=="SOLARISC52" - -APP1TARGET = adjustvisibility -APP1OBJS = $(OBJ)$/adjustvisibility.obj -DEPOBJFILES = $(APP1OBJ) -APP1STDLIBS = -lelf -APP1RPATH = NONE - -#APP1STDLIBS+=-lstlport -APP1STDLIBS+=-lCstd - -.ENDIF "$(OS)$(COM)"=="SOLARISC52" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk deleted file mode 100644 index 5ca0fb262381..000000000000 --- a/soltools/checkdll/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=checkdll -TARGETTYPE=CUI -NO_DEFAULT_STL=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - - -.IF "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES" -LIBSALCPPRT=$(0) -APP1TARGET = checkdll -APP1OBJS = $(OBJ)$/checkdll.obj -DEPOBJFILES = $(APP1OBJS) -.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" \ - && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" -STDLIB += -ldl -.ENDIF -.IF "$(OS)"=="NETBSD" -APP1STDLIBS += -Wl,--whole-archive -lgcc -Wl,--no-whole-archive -.ENDIF -.ENDIF # "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk deleted file mode 100644 index 82bc13b84d88..000000000000 --- a/soltools/cpp/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=cpp -TARGETTYPE=CUI -NO_DEFAULT_STL=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -UWINAPILIB=$(0) -LIBSALCPPRT=$(0) - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/_cpp.obj \ - $(OBJ)$/_eval.obj \ - $(OBJ)$/_include.obj \ - $(OBJ)$/_lex.obj \ - $(OBJ)$/_macro.obj \ - $(OBJ)$/_mcrvalid.obj \ - $(OBJ)$/_nlist.obj \ - $(OBJ)$/_tokens.obj \ - $(OBJ)$/_unix.obj - -# nonstandard cpp options needed for Mac (-isysroot), -# needs the custom stgetopt defined here :/ -.IF "$(OS)" == "MACOSX" || "$(OS)" == "AIX" || "$(HAVE_GETOPT)" != "YES" -OBJFILES += $(OBJ)$/_getopt.obj -.ENDIF -.IF "$(HAVE_GETOPT)" == "YES" -CDEFS += -DHAVE_GETOPT -.ENDIF - -APP1TARGET = $(TARGET) -APP1STACK = 1000000 -APP1LIBS = $(LB)$/$(TARGET).lib -APP1DEPN = $(LB)$/$(TARGET).lib - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk deleted file mode 100644 index 9959782c7369..000000000000 --- a/soltools/giparser/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=soltools_giparser -TARGETTYPE=CUI -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -OBJFILES=\ - $(OBJ)$/gen_info.obj \ - $(OBJ)$/gi_list.obj \ - $(OBJ)$/gi_parse.obj - -SLOFILES=\ - $(SLO)$/gen_info.obj \ - $(SLO)$/gi_list.obj \ - $(SLO)$/gi_parse.obj - -# --- Targets ------------------------------------------------------ - - -.INCLUDE : target.mk - diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk deleted file mode 100644 index eb5533115d56..000000000000 --- a/soltools/ldump/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=ldump -TARGET=ldump -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -UWINAPILIB=$(0) -LIBSALCPPRT=$(0) - -# --- Files -------------------------------------------------------- - -# ldump only supports windows environment -.IF "$(GUI)"=="WNT" -.IF "$(COM)"!="GCC" -#ldump4 reimplements feature set of ldump2 and ldump3 -APP1TARGET= ldump4 -.IF "$(GUI)"=="WNT" -APP1STACK= 16000 -.ENDIF -APP1OBJS= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj - -.ENDIF #"$(COM)"!="GCC" -.ENDIF #"$(GUI)"=="WNT" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk deleted file mode 100644 index 7a5fcbcb67ba..000000000000 --- a/soltools/mkdepend/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJNAME=soltools -TARGET=make_makedepend -PRJ=.. -TARGETTYPE=CUI -LIBTARGET=NO -# noadjust here to have dependencies over there -noadjust=TRUE -nodep=true -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -LIBSALCPPRT= -UWINAPILIB= - -CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS - -.IF "$(COM)" == "MSC" -# C4100: unreferenced formal parameter -# C4131: uses old-style declarator -# C4242: conversion from 'int' to 'char', possible loss of data -# C4706: assignment within conditional expression -CDEFS+=-wd4100 -wd4131 -wd4242 -wd4706 -.ENDIF - -OBJFILES= \ - $(OBJ)$/cppsetup.obj \ - $(OBJ)$/ifparser.obj \ - $(OBJ)$/include.obj \ - $(OBJ)$/main.obj \ - $(OBJ)$/parse.obj \ - $(OBJ)$/pr.obj \ - $(OBJ)$/collectdircontent.obj \ - $(NULL) - -APP1TARGET=makedepend -APP1OBJS=$(OBJFILES) -APP1RPATH=NONE - -.IF "$(COM)"=="MSC" -APP1STDLIBS+=msvcprt.lib -.ENDIF # "$(COM)"=="MSC" - -.IF "$(OS)$(COM)"=="SOLARISC52" -#APP1STDLIBS+=-lstlport -APP1STDLIBS+=-lCstd -.ENDIF - - -.INCLUDE : target.mk - - diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst index 9ee36a789905..341c34a21d9c 100644 --- a/soltools/prj/build.lst +++ b/soltools/prj/build.lst @@ -1,13 +1,3 @@ so soltools : solenv NULL -so soltools usr1 - all so_usr1 NULL -so soltools\inc get - all so_inc NULL -so soltools\ldump nmake - w so_ldump so_mkdep NULL -so soltools\winunistd nmake - n so_wunistd NULL -so soltools\mkdepend nmake - all so_mkdep so_wunistd.n NULL -so soltools\checkdll nmake - u so_chkdl so_adjvis.u so_mkdep NULL -so soltools\cpp nmake - all so_cpp__ so_mkdep so_adjvis.u NULL -so soltools\javadep nmake - all so_jvdep so_mkdep so_adjvis.u NULL -so soltools\support nmake - all so_supp so_mkdep so_adjvis.u NULL -so soltools\giparser nmake - all so_gip so_supp so_adjvis.u NULL -so soltools\adjustvisibility nmake - u so_adjvis so_mkdep NULL -so soltools\testhxx nmake - all so_testhxx so_mkdep NULL +so soltools usr1 - all so_usr1 NULL +so soltools\prj nmake - all ro_prj NULL diff --git a/soltools/prj/d.lst b/soltools/prj/d.lst index 409b94aa069e..e69de29bb2d1 100644 --- a/soltools/prj/d.lst +++ b/soltools/prj/d.lst @@ -1,11 +0,0 @@ -..\%__SRC%\bin\ldump4.exe %_DEST%\bin\ldump4.exe -..\%__SRC%\bin\makedepend.exe %_DEST%\bin\makedepend.exe -..\%__SRC%\bin\makedepend %_DEST%\bin\makedepend -..\%__SRC%\bin\adjustvisibility %_DEST%\bin\adjustvisibility -..\%__SRC%\bin\javadep.exe %_DEST%\bin\javadep.exe -..\%__SRC%\bin\javadep %_DEST%\bin\javadep -..\%__SRC%\bin\checkdll %_DEST%\bin\checkdll -..\%__SRC%\bin\cpp.exe %_DEST%\bin\cpplcc.exe -..\%__SRC%\bin\cpp %_DEST%\bin\cpp.lcc -..\%__SRC%\inc\unistd.h %_DEST%\inc\unistd.h -..\%__SRC%\bin\testhxx* %_DEST%\bin\testhxx* diff --git a/soltools/prj/dmake b/soltools/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk deleted file mode 100644 index 3bd39b88c1fc..000000000000 --- a/soltools/support/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=soltools_support -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/simstr.obj - -SLOFILES= \ - $(SLO)$/simstr.obj - - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk deleted file mode 100644 index 9348eabcad9d..000000000000 --- a/soltools/testhxx/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# -PRJ := .. -PRJNAME := soltools -TARGET := testhxx -LIBTARGET := NO -ENABLE_EXCEPTIONS := TRUE - -CAPTURE_COMMAND = echo -CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj - -.INCLUDE: $(PRJ)$/util$/makefile.pmk -.INCLUDE: settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -SLOFILES = $(SLO)$/testhxx.obj - -.INCLUDE: target.mk - -ALLTAR: $(BIN)$/$(TARGET) - -$(BIN)$/$(TARGET) .ERRREMOVE : $(MISC)$/testhxx.output create.pl - $(PERL) -w create.pl < $(MISC)$/testhxx.output > $@ - chmod +x $@ - -$(MISC)$/testhxx.output: $(SLO)$/testhxx.obj - $(TOUCH) $< - $(TOUCH) $@ diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk deleted file mode 100644 index 00384bf0a10a..000000000000 --- a/soltools/util/makefile.pmk +++ /dev/null @@ -1,35 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -# find 'makedepend' in own output tree -MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend - -# find 'adjustvisibility' in own output tree -ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility - -.IF "$(OS)"=="SOLARIS" -# hack due to #i53089# -.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)" -HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x")) -.ELSE # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" -HELP_COMPATH:=$(COMPATH) -.ENDIF # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" -.IF "$(COM)"!="GCC" -SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd -.ENDIF -.ENDIF diff --git a/soltools/winunistd/makefile.mk b/soltools/winunistd/makefile.mk deleted file mode 100644 index f9519fd1a464..000000000000 --- a/soltools/winunistd/makefile.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=winunistd -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(GUI)"=="WNT" -.IF "$(COM)"!="GCC" -# provide dummy header for generated sources -$(INCCOM)$/unistd.h : unistd.h - @$(COPY) $< $@ - -.ENDIF # "$(COM)"!="GCC" -.ENDIF # "$(GUI)"=="WNT" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -- cgit From 67e0482236192c18f4ec24f675d13446313d85e4 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 29 Mar 2011 09:47:28 +0200 Subject: fs34b: after the test, close all documents opened during the test --- dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java index 1facca3d8497..0da7775e7c30 100644 --- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java @@ -59,6 +59,7 @@ public class CopyTableWizard extends CRMBasedTestCase { private DatabaseApplication source; + private DbaseDatabase destinationDB = null; private DatabaseApplication dest; public CopyTableWizard() @@ -73,6 +74,9 @@ public class CopyTableWizard extends CRMBasedTestCase public void after() { dest.store(); + if ( destinationDB != null ) + destinationDB.close(); + destinationDB = null; super.after(); } @@ -83,8 +87,9 @@ public class CopyTableWizard extends CRMBasedTestCase try { createTestCase(); - source = new DatabaseApplication(this.m_database.getDatabase()); - dest = new DatabaseApplication(new DbaseDatabase(getMSF())); + source = new DatabaseApplication(m_database.getDatabase()); + destinationDB = new DbaseDatabase( getMSF() ); + dest = new DatabaseApplication( destinationDB ); } catch (java.lang.Exception ex) { -- cgit From 3e882cf60af64cae76f41ee3373c57e930206827 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Mon, 28 Mar 2011 12:10:16 +0200 Subject: fs34b: #i117552# check if query before call getByName in every case --- dbaccess/source/ui/browser/unodatbr.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 6000c5a49538..843114fbb351 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2184,12 +2184,13 @@ void SbaTableQueryBrowser::populateTree(const Reference& _xNameAcce { if( !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent)) { - Reference xChild(_xNameAccess->getByName(*pIter),UNO_QUERY); DBTreeListUserData* pEntryData = new DBTreeListUserData; pEntryData->eType = _eEntryType; - if ( _eEntryType == etQuery && xChild.is() ) + if ( _eEntryType == etQuery ) { - pEntryData->eType = etQueryContainer; + Reference xChild(_xNameAccess->getByName(*pIter),UNO_QUERY); + if ( xChild.is() ) + pEntryData->eType = etQueryContainer; } implAppendEntry( _pParent, *pIter, pEntryData, pEntryData->eType ); } -- cgit From e09e9bfb89e9e65c17acb1f027a9003beddd6d66 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 27 Sep 2012 13:52:10 +0100 Subject: re-base on ALv2 code. --- accessibility/Makefile | 7 ++++ .../accessibility/java_uno_accessbridge.component | 43 +++++++++------------- .../source/java/WindowsAccessBridgeAdapter.cxx | 37 +++++++------------ .../extended/AccessibleBrowseBoxBase.hxx | 37 +++++++------------ .../extended/AccessibleGridControl.hxx | 37 +++++++------------ .../extended/AccessibleGridControlBase.hxx | 37 +++++++------------ .../extended/AccessibleGridControlTable.hxx | 37 +++++++------------ .../extended/AccessibleGridControlTableBase.hxx | 37 +++++++------------ .../extended/AccessibleGridControlTableCell.hxx | 37 +++++++------------ .../extended/accessibleiconchoicectrlentry.hxx | 37 +++++++------------ .../extended/textwindowaccessibility.hxx | 37 +++++++------------ .../accessibility/helper/IComboListBoxHelper.hxx | 37 +++++++------------ .../source/extended/AccessibleBrowseBoxBase.cxx | 37 +++++++------------ .../extended/AccessibleBrowseBoxHeaderBar.cxx | 37 +++++++------------ .../source/extended/AccessibleBrowseBoxTable.cxx | 37 +++++++------------ .../extended/AccessibleBrowseBoxTableBase.cxx | 37 +++++++------------ .../extended/AccessibleBrowseBoxTableCell.cxx | 37 +++++++------------ .../source/extended/AccessibleGridControl.cxx | 37 +++++++------------ .../source/extended/AccessibleGridControlBase.cxx | 37 +++++++------------ .../extended/AccessibleGridControlHeader.cxx | 37 +++++++------------ .../extended/AccessibleGridControlHeaderCell.cxx | 37 +++++++------------ .../source/extended/AccessibleGridControlTable.cxx | 37 +++++++------------ .../extended/AccessibleGridControlTableBase.cxx | 37 +++++++------------ .../extended/AccessibleGridControlTableCell.cxx | 37 +++++++------------ .../source/extended/AccessibleToolPanelDeck.cxx | 36 +++++++----------- .../extended/AccessibleToolPanelDeckTabBar.cxx | 36 +++++++----------- .../extended/AccessibleToolPanelDeckTabBarItem.cxx | 36 +++++++----------- .../extended/accessibleeditbrowseboxcell.cxx | 37 +++++++------------ .../source/extended/accessibleiconchoicectrl.cxx | 37 +++++++------------ .../extended/accessibleiconchoicectrlentry.cxx | 37 +++++++------------ .../source/extended/accessiblelistboxentry.cxx | 37 +++++++------------ accessibility/source/extended/accessibletabbar.cxx | 37 +++++++------------ .../source/extended/accessibletabbarpage.cxx | 37 +++++++------------ .../source/extended/accessibletabbarpagelist.cxx | 37 +++++++------------ .../source/extended/accessibletablistbox.cxx | 37 +++++++------------ .../source/extended/accessibletablistboxtable.cxx | 37 +++++++------------ .../source/extended/textwindowaccessibility.cxx | 37 +++++++------------ accessibility/source/helper/acc_factory.cxx | 37 +++++++------------ accessibility/source/helper/accresmgr.cxx | 37 +++++++------------ .../source/helper/characterattributeshelper.cxx | 37 +++++++------------ .../standard/accessiblemenuitemcomponent.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblebox.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblebutton.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblecheckbox.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblecombobox.cxx | 37 +++++++------------ .../standard/vclxaccessibledropdowncombobox.cxx | 37 +++++++------------ .../standard/vclxaccessibledropdownlistbox.cxx | 37 +++++++------------ .../source/standard/vclxaccessibleedit.cxx | 37 +++++++------------ .../standard/vclxaccessiblefixedhyperlink.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblefixedtext.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblelistbox.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblelistitem.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblemenu.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblemenubar.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblemenuitem.cxx | 37 +++++++------------ .../standard/vclxaccessiblemenuseparator.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblepopupmenu.cxx | 37 +++++++------------ .../source/standard/vclxaccessibleradiobutton.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblescrollbar.cxx | 37 +++++++------------ .../source/standard/vclxaccessiblestatusbar.cxx | 37 +++++++------------ .../standard/vclxaccessiblestatusbaritem.cxx | 37 +++++++------------ .../source/standard/vclxaccessibletabcontrol.cxx | 37 +++++++------------ .../source/standard/vclxaccessibletabpage.cxx | 37 +++++++------------ .../source/standard/vclxaccessibletextfield.cxx | 37 +++++++------------ .../source/standard/vclxaccessibletoolbox.cxx | 37 +++++++------------ .../source/standard/vclxaccessibletoolboxitem.cxx | 37 +++++++------------ dbaccess/Makefile | 7 ++++ dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 37 +++++++------------ dbaccess/source/core/api/KeySet.cxx | 38 +++++++------------ dbaccess/source/ui/browser/dbtreeview.cxx | 37 +++++++------------ dbaccess/source/ui/browser/unodatbr.cxx | 37 +++++++------------ dbaccess/source/ui/querydesign/QTableWindow.cxx | 37 +++++++------------ dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 37 +++++++------------ .../source/ui/tabledesign/TableDesignHelpBar.cxx | 37 +++++++------------ embeddedobj/Makefile | 7 ++++ embeddedobj/qa/embedding/makefile.mk | 33 ++++++----------- embeddedobj/source/commonembedding/embedobj.cxx | 37 +++++++------------ embeddedobj/source/commonembedding/inplaceobj.cxx | 37 +++++++------------ embeddedobj/source/commonembedding/miscobj.cxx | 37 +++++++------------ embeddedobj/source/commonembedding/persistence.cxx | 37 +++++++------------ embeddedobj/source/commonembedding/register.cxx | 37 +++++++------------ .../source/commonembedding/specialobject.cxx | 37 +++++++------------ embeddedobj/source/commonembedding/visobj.cxx | 37 +++++++------------ embeddedobj/source/commonembedding/xfactory.cxx | 37 +++++++------------ embeddedobj/source/general/docholder.cxx | 37 +++++++------------ embeddedobj/source/general/dummyobject.cxx | 37 +++++++------------ embeddedobj/source/general/intercept.cxx | 37 +++++++------------ embeddedobj/source/general/xcreator.cxx | 37 +++++++------------ embeddedobj/source/inc/commonembobj.hxx | 37 +++++++------------ embeddedobj/source/inc/docholder.hxx | 37 +++++++------------ embeddedobj/source/inc/dummyobject.hxx | 37 +++++++------------ embeddedobj/source/inc/oleembobj.hxx | 37 +++++++------------ embeddedobj/source/msole/closepreventer.cxx | 43 +++++++++------------- embeddedobj/source/msole/emboleobj.component | 43 +++++++++------------- .../source/msole/emboleobj.windows.component | 43 +++++++++------------- embeddedobj/source/msole/graphconvert.cxx | 37 +++++++------------ embeddedobj/source/msole/olecomponent.cxx | 37 +++++++------------ embeddedobj/source/msole/oleembed.cxx | 37 +++++++------------ embeddedobj/source/msole/olemisc.cxx | 37 +++++++------------ embeddedobj/source/msole/olepersist.cxx | 37 +++++++------------ embeddedobj/source/msole/oleregister.cxx | 37 +++++++------------ embeddedobj/source/msole/olevisual.cxx | 37 +++++++------------ embeddedobj/source/msole/ownview.cxx | 37 +++++++------------ embeddedobj/source/msole/xdialogcreator.cxx | 37 +++++++------------ embeddedobj/source/msole/xolefactory.cxx | 37 +++++++------------ embeddedobj/test/Container1/nativelib/nativeview.c | 37 +++++++------------ embeddedobj/test/MainThreadExecutor/register.cxx | 37 +++++++------------ embeddedobj/test/MainThreadExecutor/xexecutor.cxx | 37 +++++++------------ embeddedobj/test/MainThreadExecutor/xexecutor.hxx | 37 +++++++------------ embeddedobj/test/mtexecutor/bitmapcreator.cxx | 37 +++++++------------ embeddedobj/test/mtexecutor/mainthreadexecutor.cxx | 37 +++++++------------ embeddedobj/test/mtexecutor/mteregister.cxx | 37 +++++++------------ embeddedobj/util/embobj.component | 43 +++++++++------------- l10ntools/Makefile | 7 ++++ l10ntools/inc/cfgmerge.hxx | 37 +++++++------------ l10ntools/inc/export.hxx | 37 +++++++------------ l10ntools/inc/gsicheck.hxx | 37 +++++++------------ l10ntools/inc/helpmerge.hxx | 37 +++++++------------ l10ntools/inc/l10ntools/directory.hxx | 18 +++++++++ l10ntools/inc/l10ntools/file.hxx | 18 +++++++++ l10ntools/inc/lngmerge.hxx | 37 +++++++------------ l10ntools/inc/tagtest.hxx | 37 +++++++------------ l10ntools/inc/xmlparse.hxx | 37 +++++++------------ l10ntools/inc/xrmmerge.hxx | 37 +++++++------------ l10ntools/scripts/fast_merge.pl | 33 ++++++----------- l10ntools/scripts/keyidGen.pl | 35 +++++++----------- l10ntools/source/cfg_yy_wrapper.c | 18 +++++++++ l10ntools/source/cfglex.l | 19 +++++++++- l10ntools/source/cfgmerge.cxx | 37 +++++++------------ l10ntools/source/directory.cxx | 37 +++++++------------ l10ntools/source/export.cxx | 37 +++++++------------ l10ntools/source/export2.cxx | 37 +++++++------------ l10ntools/source/file.cxx | 43 +++++++++------------- l10ntools/source/filter/merge/FCFGMerge.cfg | 33 ++++++----------- l10ntools/source/helpex.cxx | 37 +++++++------------ l10ntools/source/helpmerge.cxx | 37 +++++++------------ l10ntools/source/lngex.cxx | 37 +++++++------------ l10ntools/source/lngmerge.cxx | 37 +++++++------------ l10ntools/source/localize.cxx | 37 +++++++------------ l10ntools/source/merge.cxx | 37 +++++++------------ l10ntools/source/src_yy_wrapper.c | 18 +++++++++ l10ntools/source/srclex.l | 19 +++++++++- l10ntools/source/tagtest.cxx | 37 +++++++------------ l10ntools/source/xmlparse.cxx | 37 +++++++------------ l10ntools/source/xrm_yy_wrapper.c | 18 +++++++++ l10ntools/source/xrmlex.l | 19 +++++++++- l10ntools/source/xrmmerge.cxx | 37 +++++++------------ ucpp/Makefile | 7 ++++ 148 files changed, 2080 insertions(+), 3117 deletions(-) diff --git a/accessibility/Makefile b/accessibility/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/accessibility/Makefile +++ b/accessibility/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component index 5fc897f2d5aa..a1194a1c7744 100644 --- a/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component +++ b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component @@ -1,30 +1,21 @@ - + diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx index e2dcbf94fd72..cb0fa441fc49 100644 --- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx +++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef WNT #include diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index 4f95f5ad831d..da27f56be52b 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXBASE_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 81bdf2a7cd8b..44cdbd8c7384 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROL_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index c032e38d3959..2aca835f6faa 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLBASE_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx index 95acb0d31371..76eaae442023 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLTABLE_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx index 54491c24272e..aac97c540813 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx index 15309e9d17d2..a06758f66ea1 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLECELL_HXX #define ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLECELL_HXX diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx index e8d28fe18dc5..93116ff88e10 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRLENTRY_HXX_ #define ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRLENTRY_HXX_ diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index e1d2ce19df06..6adbd2a0fd41 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX #define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx index c4d32196cd99..c4eca89dd011 100644 --- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_HELPER_COMBOLISTBOXHELPER_HXX #define ACCESSIBILITY_HELPER_COMBOLISTBOXHELPER_HXX diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 42d71501435c..dfcd8e56428a 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxBase.hxx" #include diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index b59ad51d85f6..f5703766399c 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx" #include diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index d5cf0ef1c6ee..77dd2d4ba7da 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxTable.hxx" #include diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index cebe6681775d..981302ea6d15 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx" #include diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index 9d0f65e61bc6..556e53aa0ee3 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx" diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index e8058eab628d..ace45d2c8c3e 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControl.hxx" #include "accessibility/extended/AccessibleGridControlTable.hxx" diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 4583363da7e5..8d71c2605b86 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlBase.hxx" #include diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 609000d3d62a..3f431f9c49d5 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlHeader.hxx" #include "accessibility/extended/AccessibleGridControlHeaderCell.hxx" diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 8ad0a949ff6c..548c21b05e5b 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlHeaderCell.hxx" diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index b0e2e4e6c02b..3b08eadfd62f 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlTable.hxx" #include "accessibility/extended/AccessibleGridControlTableCell.hxx" diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index a869352eb2f9..f6d75707dade 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlTableBase.hxx" #include diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index f32eec0a1f1f..1f700880b1f0 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlTableCell.hxx" diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index bba762fc2b19..e9865de31801 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleToolPanelDeck.hxx" diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 896ebad79647..a1dd5ab94835 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleToolPanelDeckTabBar.hxx" diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 998f83e20e58..a17ce8d153b7 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx" diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index dad1e74dcf32..e9c312267140 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 16202db1ad39..869ec89571f4 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/accessibleiconchoicectrl.hxx" #include "accessibility/extended/accessibleiconchoicectrlentry.hxx" diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 7de4248be5aa..01ea6fdbca68 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index b491aa99edb4..68f056315e2a 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/accessiblelistboxentry.hxx" #include diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 05259f1b4735..ee34dd868206 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 0751ae8cd79b..5d84d4956c97 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index f54616e7a7be..eed67bed01a0 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index cca3a4431078..a277a447f1aa 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/accessibletablistbox.hxx" diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 0c0570d24624..1ddaff3ec234 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/accessibletablistboxtable.hxx" diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 3fb4c8f6cd35..9f48b1a1ae2c 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 1f14f7dd5800..dc16fe664992 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index 9ab4d1d91942..3df874460a48 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx index a609e9936282..56fd3f8327d8 100644 --- a/accessibility/source/helper/characterattributeshelper.cxx +++ b/accessibility/source/helper/characterattributeshelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 2d38b685529c..b60504cd4bc1 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index d48fec71ff31..6676b15e3159 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 8ba61069761d..e433811259a3 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index 878e7648d8c1..d3b72f6cb22f 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index 7da7de7a50ae..5468b2e865cd 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index 808ada19f8ef..63e4241e7597 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 504d289800a9..cd5c507cefa2 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 95fda2b55abd..60b8414c0c6f 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx index 96d000de97d8..827ef624f97b 100644 --- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx index aca45fb554aa..786ca60b48fc 100644 --- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 0f8f35d960e5..1ee48a81fac0 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index af2a57c94d0c..a4bc12f3d217 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index b45e35b7a9db..625a0db49416 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index cea52f42fc32..6f9f6a98aa02 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 6ec29ad89b28..ff70acb4160d 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx index b239ea48c92a..633bdf1e5fac 100644 --- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index 7ecfde472283..5e90402186e4 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index c821700a0a65..2c6df31227c8 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 5dc9e0ea6fb4..c87cdc4c6831 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index 327cf7bfc13f..a5c3da98c2cf 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 889e25b96dbe..650dcfd4b921 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index e34ef52868dc..a40796bead2c 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 7a1f1545ad25..144e62562031 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index f38331f27714..44c6df487765 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index e2ca26e28172..759ed9687bcf 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 347fcf1548d7..e7e9f30815cb 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/dbaccess/Makefile b/dbaccess/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/dbaccess/Makefile +++ b/dbaccess/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java index 0da7775e7c30..68fba3ddb793 100644 --- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ package complex.dbaccess; import com.sun.star.accessibility.XAccessible; diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index c2dadcdf5893..6a520cf49fe1 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -1,31 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle andor its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "KeySet.hxx" #include "core_resource.hxx" diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 332681de8edd..b557766fe3d3 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "dbtreeview.hxx" diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 843114fbb351..2b47defe48ad 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "browserids.hxx" diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index f77aba68a657..0bcbb0e0ed48 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "QTableWindow.hxx" #include "QueryTableView.hxx" diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index c0746df95719..cbbf61bf0a21 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "FieldDescGenWin.hxx" #include diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index cbc2d3e3a75b..60907222b68b 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "TableDesignHelpBar.hxx" #include diff --git a/embeddedobj/Makefile b/embeddedobj/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/embeddedobj/Makefile +++ b/embeddedobj/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/embeddedobj/qa/embedding/makefile.mk b/embeddedobj/qa/embedding/makefile.mk index 2ed625910b89..483440c22f91 100644 --- a/embeddedobj/qa/embedding/makefile.mk +++ b/embeddedobj/qa/embedding/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* PRJ = ..$/.. TARGET = EmbeddingUnitTest diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index ae8ef08665d6..df75afe66b9b 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx index 5d8fe3300656..731603a6e8e9 100644 --- a/embeddedobj/source/commonembedding/inplaceobj.cxx +++ b/embeddedobj/source/commonembedding/inplaceobj.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index ae8f302051c8..2946d7fc3537 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index f881f108f022..a54f3a9f3bd0 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index fe20fe0e79e4..d8fcaf7631f6 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index c176a7f46851..62543b846d69 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx index 4c8d353a556a..56cdc983f5d5 100644 --- a/embeddedobj/source/commonembedding/visobj.cxx +++ b/embeddedobj/source/commonembedding/visobj.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index 3bef21d016fa..ec29edae881a 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 2f9e617230e5..65235d0f4d17 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index eac8a8aa94af..057fe8a7c245 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 8c9be5039b7e..88256898534e 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 99c265ebe583..599fc7ce2df2 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index 5d366b119888..bf0dc1aed03d 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _INC_COMMONEMBOBJ_HXX_ #define _INC_COMMONEMBOBJ_HXX_ diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index b5401b0aade2..7c8f1057f3de 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _DOCHOLDER_HXX_ #define _DOCHOLDER_HXX_ diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx index 9bee699f7750..8f1f1e9594dc 100644 --- a/embeddedobj/source/inc/dummyobject.hxx +++ b/embeddedobj/source/inc/dummyobject.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _INC_DUMMYOBJECT_HXX_ #define _INC_DUMMYOBJECT_HXX_ diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 52e03da7d7d8..747ab415833e 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _INC_OLEEMBOBJ_HXX_ #define _INC_OLEEMBOBJ_HXX_ diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx index 4b9484d95d06..a7b845b8c56f 100644 --- a/embeddedobj/source/msole/closepreventer.cxx +++ b/embeddedobj/source/msole/closepreventer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "closepreventer.hxx" diff --git a/embeddedobj/source/msole/emboleobj.component b/embeddedobj/source/msole/emboleobj.component index 96f8ed0d8d57..e9b5ea14eaa9 100644 --- a/embeddedobj/source/msole/emboleobj.component +++ b/embeddedobj/source/msole/emboleobj.component @@ -1,30 +1,21 @@ - + diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component index 644a1d4f19a1..d70f7dc397bd 100644 --- a/embeddedobj/source/msole/emboleobj.windows.component +++ b/embeddedobj/source/msole/emboleobj.windows.component @@ -1,30 +1,21 @@ - + diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index 77caf58c7910..b1f69c4cdf6a 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 4389a2cc505d..2acb811863b9 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index d829944a6d1d..9938ae91fdcd 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 5947ae2bba9b..b0fddcaa3df2 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index edebfc3e1a3d..31563944c214 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index 608e69ffa395..28b40291a9b3 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 617d8e4d7ea4..c517a7445248 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index a9bec9648a3e..d92b305d0b63 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index c5e8a5f9a9a4..5cd43ac71f68 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index 27cd1017aebc..2d5b35a0863f 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c index 0de1018050cc..8f5e4c7ad5e8 100644 --- a/embeddedobj/test/Container1/nativelib/nativeview.c +++ b/embeddedobj/test/Container1/nativelib/nativeview.c @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - *************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef WNT diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx index 6a2e10d6d66d..ab21864711c6 100644 --- a/embeddedobj/test/MainThreadExecutor/register.cxx +++ b/embeddedobj/test/MainThreadExecutor/register.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx index 58c211809b72..f5cb25e20146 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xexecutor.hxx" #include diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx index 4b200d33eecc..97213d543aec 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef __XFACTORY_HXX_ #define __XFACTORY_HXX_ diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx index 4fe00521030b..fdc86df45e9e 100644 --- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx +++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "bitmapcreator.hxx" diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx index 7612156feea0..828abef803be 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "mainthreadexecutor.hxx" diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx index 937f1750fcad..33f98dc272d7 100644 --- a/embeddedobj/test/mtexecutor/mteregister.cxx +++ b/embeddedobj/test/mtexecutor/mteregister.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/util/embobj.component b/embeddedobj/util/embobj.component index f7a9c2e7b3fb..1fdab5080375 100644 --- a/embeddedobj/util/embobj.component +++ b/embeddedobj/util/embobj.component @@ -1,30 +1,21 @@ - + diff --git a/l10ntools/Makefile b/l10ntools/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/l10ntools/Makefile +++ b/l10ntools/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx index c554aaf9246f..316c9dee2181 100644 --- a/l10ntools/inc/cfgmerge.hxx +++ b/l10ntools/inc/cfgmerge.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CFG_MERGE_HXX #define _CFG_MERGE_HXX diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index be243600d6a6..9a4ce788ec77 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _EXPORT_HXX #define _EXPORT_HXX diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx index 467925e46767..8d8992d2f6de 100644 --- a/l10ntools/inc/gsicheck.hxx +++ b/l10ntools/inc/gsicheck.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _GSICHECK_HXX_ #define _GSICHECK_HXX_ diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx index bc2a6afa253f..34dfdc7eb472 100644 --- a/l10ntools/inc/helpmerge.hxx +++ b/l10ntools/inc/helpmerge.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "export.hxx" #include "xmlparse.hxx" diff --git a/l10ntools/inc/l10ntools/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx index d70e5fe333fa..ad192ec7dc55 100644 --- a/l10ntools/inc/l10ntools/directory.hxx +++ b/l10ntools/inc/l10ntools/directory.hxx @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #include #include #include diff --git a/l10ntools/inc/l10ntools/file.hxx b/l10ntools/inc/l10ntools/file.hxx index fae252e5f926..8c900ddd333f 100644 --- a/l10ntools/inc/l10ntools/file.hxx +++ b/l10ntools/inc/l10ntools/file.hxx @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #include "rtl/ustring.hxx" namespace transex diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx index dd9cbf6359d0..6391d1c25b3f 100644 --- a/l10ntools/inc/lngmerge.hxx +++ b/l10ntools/inc/lngmerge.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx index b546be2bab1e..a6ccec4d73ea 100644 --- a/l10ntools/inc/tagtest.hxx +++ b/l10ntools/inc/tagtest.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TAGTEST_HXX_ #define _TAGTEST_HXX_ diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 36fdd608e45c..0fedb2b7a6d8 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef BOOTSTRP_XMLPARSE_HXX #define BOOTSTRP_XMLPARSE_HXX diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx index b80d37aaa5fa..e9839cee2288 100644 --- a/l10ntools/inc/xrmmerge.hxx +++ b/l10ntools/inc/xrmmerge.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl index 7074beaa3ff5..bd204870169d 100644 --- a/l10ntools/scripts/fast_merge.pl +++ b/l10ntools/scripts/fast_merge.pl @@ -1,32 +1,23 @@ : eval 'exec perl -wS $0 ${1+"$@"}' if 0; -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# This file is part of the LibreOffice project. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# OpenOffice.org - a multi-platform office productivity suite +# This file incorporates work covered by the following license notice: # -# This file is part of OpenOffice.org. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* use strict; use Class::Struct; diff --git a/l10ntools/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl index cf95b2937830..6747ef15b022 100644 --- a/l10ntools/scripts/keyidGen.pl +++ b/l10ntools/scripts/keyidGen.pl @@ -1,32 +1,23 @@ -: +: eval 'exec perl -S $0 ${1+"$@"}' if 0; -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# This file is part of the LibreOffice project. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# OpenOffice.org - a multi-platform office productivity suite +# This file incorporates work covered by the following license notice: # -# This file is part of OpenOffice.org. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* # # add keyids to sdf file # diff --git a/l10ntools/source/cfg_yy_wrapper.c b/l10ntools/source/cfg_yy_wrapper.c index b22d2a77cd87..485ce0ab6b7e 100644 --- a/l10ntools/source/cfg_yy_wrapper.c +++ b/l10ntools/source/cfg_yy_wrapper.c @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + // Helper to suppress warnings in lex generated c code, see #i57362# #include "cfg_yy.c" diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l index 16ddf289fda3..3ace0a7c3563 100644 --- a/l10ntools/source/cfglex.l +++ b/l10ntools/source/cfglex.l @@ -1,7 +1,24 @@ %{ /* - * lexer for parsing cfg source files + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +/* + * lexer for parsing cfg source files */ /* enlarge token buffer to tokenize whole strings */ diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index cca19c9bc1b1..41db0973fb47 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "common.hxx" #include "sal/config.h" diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx index c2c73ea6a863..468bfbd67837 100644 --- a/l10ntools/source/directory.cxx +++ b/l10ntools/source/directory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 9cc3a56c296a..8fe8057188c3 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index 013ae90d164f..726f36a59541 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/file.cxx b/l10ntools/source/file.cxx index d9d50553a979..be4fdde8c687 100644 --- a/l10ntools/source/file.cxx +++ b/l10ntools/source/file.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/l10ntools/source/filter/merge/FCFGMerge.cfg b/l10ntools/source/filter/merge/FCFGMerge.cfg index cae30bdd0260..4516a777bc57 100644 --- a/l10ntools/source/filter/merge/FCFGMerge.cfg +++ b/l10ntools/source/filter/merge/FCFGMerge.cfg @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* #************************************************ # Specify the verbose mode of this tool. diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index 7896fdd8598a..470b4f1383bc 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 2d4435c5e74c..05b3800bbc81 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index 0e910badfff7..ab2f0afe0eb5 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 09cac112adeb..264b50c74f56 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 6bc92a8f3ee6..941f8d92f941 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index b9fe90f8ae4c..a58807594681 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/src_yy_wrapper.c b/l10ntools/source/src_yy_wrapper.c index da9c17fdc464..3fdcc392bfc4 100644 --- a/l10ntools/source/src_yy_wrapper.c +++ b/l10ntools/source/src_yy_wrapper.c @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + // Helper to suppress warnings in lex generated c code, see #i57362# #include "src_yy.c" diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l index 01be0df7ea3b..9215702b3c98 100644 --- a/l10ntools/source/srclex.l +++ b/l10ntools/source/srclex.l @@ -1,8 +1,25 @@ %{ /* - * lexer for parsing resource source files (*.src) + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +/* + * lexer for parsing resource source files (*.src) */ /* enlarge token buffer to tokenize whole strings */ diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx index 062c5c78a583..ada1a36582f1 100644 --- a/l10ntools/source/tagtest.cxx +++ b/l10ntools/source/tagtest.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. +/* + * This file is part of the LibreOffice project. * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. + * This file incorporates work covered by the following license notice: * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index 48e0d3f97512..dc2e3d639606 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/xrm_yy_wrapper.c b/l10ntools/source/xrm_yy_wrapper.c index 191d16f30146..36f902e0fdf6 100644 --- a/l10ntools/source/xrm_yy_wrapper.c +++ b/l10ntools/source/xrm_yy_wrapper.c @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + // Helper to suppress warnings in lex generated c code, see #i57362# #include "xrm_yy.c" diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l index eadb19f3fbfb..dfe74d7c1a56 100644 --- a/l10ntools/source/xrmlex.l +++ b/l10ntools/source/xrmlex.l @@ -1,7 +1,24 @@ %{ /* - * lexer for parsing xml-property source files (*.xml) + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +/* + * lexer for parsing xml-property source files (*.xml) */ /* enlarge token buffer to tokenize whole strings */ diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 7d2a01f2215e..a22996d8db43 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/ucpp/Makefile b/ucpp/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/ucpp/Makefile +++ b/ucpp/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -- cgit From 24c0959ae2afe4b7a04f82f166cd78bb9fb62f93 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 29 Sep 2012 17:44:08 +0200 Subject: fix windows build Change-Id: If71b9a162b7deca5cc032bda206a8f580292ab91 --- soltools/Module_soltools.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index ebd855ad30fc..047e4c07e7f8 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -20,14 +20,6 @@ ifeq ($(GUI),UNX) $(eval $(call gb_Module_add_targets,soltools,\ Executable_checkdll \ )) -# -# the same as the condition outside of ifneq ($(CROSS_COMPILING),YES) -# ifeq ($(GUI)$(COM),WNTMSC) -# -else -$(eval $(call gb_Module_add_targets,soltools,\ - Package_inc \ -)) endif # UNX ifeq ($(OS)$(COM),SOLARISC52) @@ -38,4 +30,10 @@ endif # SOLARISC52 endif # CROSS_COMPILING +ifeq ($(GUI)$(COM),WNTMSC) +$(eval $(call gb_Module_add_targets,soltools,\ + Package_inc \ +)) +endif # WNTMSC + # vim:set shiftwidth=4 softtabstop=4 expandtab: -- cgit From 3639d59401b3c9319dca0288b42bc69d67b39b3b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 29 Sep 2012 17:47:33 +0200 Subject: the build tools need to know executable extension Change-Id: I44479648dd75142864503650494fb2e3f95fe719 --- solenv/gbuild/gbuild.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 74b0368ec209..4afc09530edf 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -171,6 +171,18 @@ include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk $(eval $(call gb_Helper_collect_libtargets)) +gb_Library_DLLPOSTFIX := lo + +# Include platform/cpu/compiler specific config/definitions +include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk + +ifeq ($(CROSS_COMPILING),YES) +# We can safely Assume all cross-compilation is from Unix systems. +gb_Executable_EXT_for_build := +else +gb_Executable_EXT_for_build := $(gb_Executable_EXT) +endif + # Set up build tools that can be either internal or system. It is # necessary to do it before we start including gbuild class makefiles, # so the classes can add dependencies on them. @@ -217,18 +229,6 @@ else gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) endif -gb_Library_DLLPOSTFIX := lo - -# Include platform/cpu/compiler specific config/definitions -include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk - -ifeq ($(CROSS_COMPILING),YES) -# We can safely Assume all cross-compilation is from Unix systems. -gb_Executable_EXT_for_build := -else -gb_Executable_EXT_for_build := $(gb_Executable_EXT) -endif - include $(GBUILDDIR)/Tempfile.mk include $(SRCDIR)/RepositoryFixes.mk -- cgit From ee34432562393a4549e9e77f71146e43c5d02233 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 29 Sep 2012 13:43:20 +0200 Subject: Some clean up Change-Id: Ia17a714b55da06bd38c7b5d60881f1b3838da992 --- sdext/source/pdfimport/misc/pwdinteract.cxx | 74 ++++++++++++++--------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 81cdcb832208..7b470deda692 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -40,9 +40,10 @@ #include #include -#include #include -#include +#include +#include +#include #include using namespace com::sun::star; @@ -50,15 +51,14 @@ using namespace com::sun::star; namespace { -typedef ::cppu::WeakComponentImplHelper2< - com::sun::star::task::XInteractionRequest, - com::sun::star::task::XInteractionPassword > PDFPasswordRequestBase; - -class PDFPasswordRequest : private cppu::BaseMutex, - public PDFPasswordRequestBase +class PDFPasswordRequest: + public cppu::WeakImplHelper2< + task::XInteractionRequest, task::XInteractionPassword >, + private boost::noncopyable { private: - task::DocumentPasswordRequest m_aRequest; + mutable osl::Mutex m_aMutex; + uno::Any m_aRequest; rtl::OUString m_aPassword; bool m_bSelected; @@ -77,54 +77,51 @@ public: virtual void SAL_CALL select() throw (uno::RuntimeException); bool isSelected() const { osl::MutexGuard const guard( m_aMutex ); return m_bSelected; } + +private: + virtual ~PDFPasswordRequest() {} }; PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const rtl::OUString& rName ) : - PDFPasswordRequestBase( m_aMutex ), - m_aRequest(), - m_aPassword(), + m_aRequest( + uno::makeAny( + task::DocumentPasswordRequest( + OUString(), uno::Reference< uno::XInterface >(), + task::InteractionClassification_QUERY, + (bFirstTry + ? task::PasswordRequestMode_PASSWORD_ENTER + : task::PasswordRequestMode_PASSWORD_REENTER), + rName))), m_bSelected(false) -{ - m_aRequest.Mode = bFirstTry ? - task::PasswordRequestMode_PASSWORD_ENTER : - task::PasswordRequestMode_PASSWORD_REENTER; - m_aRequest.Classification = task::InteractionClassification_QUERY; - m_aRequest.Name = rName; -} +{} -uno::Any SAL_CALL PDFPasswordRequest::getRequest() throw (uno::RuntimeException) +uno::Any PDFPasswordRequest::getRequest() throw (uno::RuntimeException) { - osl::MutexGuard const guard( m_aMutex ); - - uno::Any aRet; - aRet <<= m_aRequest; - return aRet; + return m_aRequest; } -uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL PDFPasswordRequest::getContinuations() throw (uno::RuntimeException) +uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordRequest::getContinuations() throw (uno::RuntimeException) { - osl::MutexGuard const guard( m_aMutex ); - uno::Sequence< uno::Reference< task::XInteractionContinuation > > aRet( 1 ); - aRet.getArray()[0] = static_cast(this); + aRet[0] = this; return aRet; } -void SAL_CALL PDFPasswordRequest::setPassword( const rtl::OUString& rPwd ) throw (uno::RuntimeException) +void PDFPasswordRequest::setPassword( const rtl::OUString& rPwd ) throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); m_aPassword = rPwd; } -rtl::OUString SAL_CALL PDFPasswordRequest::getPassword() throw (uno::RuntimeException) +rtl::OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); return m_aPassword; } -void SAL_CALL PDFPasswordRequest::select() throw (uno::RuntimeException) +void PDFPasswordRequest::select() throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); @@ -170,22 +167,21 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, { bool bSuccess = false; - PDFPasswordRequest* pRequest; - uno::Reference< task::XInteractionRequest > xReq( - pRequest = new PDFPasswordRequest( bFirstTry, rDocName ) ); + rtl::Reference< PDFPasswordRequest > xReq( + new PDFPasswordRequest( bFirstTry, rDocName ) ); try { - xHandler->handle( xReq ); + xHandler->handle( xReq.get() ); } catch( uno::Exception& ) { } - OSL_TRACE( "request %s selected", pRequest->isSelected() ? "was" : "was not" ); - if( pRequest->isSelected() ) + OSL_TRACE( "request %s selected", xReq->isSelected() ? "was" : "was not" ); + if( xReq->isSelected() ) { bSuccess = true; - rOutPwd = pRequest->getPassword(); + rOutPwd = xReq->getPassword(); } return bSuccess; -- cgit From f5f06fb016766cc40817f1fcc3feec0b464845b0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 29 Sep 2012 17:20:22 +0200 Subject: Use comphelper::getComponentContext ...and some further clean up. Change-Id: Id294c0f38fe0041646fc86cacbd2e19734c746a9 --- basctl/source/basicide/baside3.cxx | 17 ++-- basctl/source/basicide/basides3.cxx | 6 +- basctl/source/basicide/moduldlg.cxx | 7 +- basctl/source/basicide/scriptdocument.cxx | 5 +- basctl/source/dlged/dlged.cxx | 12 +-- basctl/source/dlged/propbrw.cxx | 4 +- basic/source/classes/eventatt.cxx | 33 +++----- basic/source/classes/sbunoobj.cxx | 96 +++++++--------------- basic/source/classes/sbxmod.cxx | 10 +-- basic/source/uno/dlgcont.cxx | 28 ++----- basic/source/uno/namecont.cxx | 55 ++++--------- comphelper/source/misc/componentcontext.cxx | 23 +----- connectivity/Library_postgresql-sdbc.mk | 1 + .../source/drivers/postgresql/pq_driver.cxx | 23 ++---- connectivity/source/resource/sharedresources.cxx | 9 +- cui/source/customize/cfg.cxx | 10 +-- cui/source/customize/cfgutil.cxx | 6 +- cui/source/dialogs/scriptdlg.cxx | 9 +- cui/source/options/treeopt.cxx | 11 +-- desktop/Library_offacc.mk | 1 + desktop/inc/app.hxx | 2 - desktop/source/app/app.cxx | 5 +- desktop/source/app/appinit.cxx | 19 ----- desktop/source/offacc/acceptor.cxx | 18 +--- embeddedobj/source/general/docholder.cxx | 11 +-- extensions/Executable_nsplugin.mk | 1 + extensions/source/nsplugin/source/so_instance.cxx | 5 +- fileaccess/source/FileAccess.cxx | 12 +-- filter/source/xsltfilter/XSLTFilter.cxx | 9 +- framework/inc/macros/xserviceinfo.hxx | 8 +- framework/source/fwe/classes/addonsoptions.cxx | 11 +-- framework/source/fwe/xml/menudocumenthandler.cxx | 14 +--- .../source/layoutmanager/toolbarlayoutmanager.cxx | 1 + framework/source/lomenubar/FrameHelper.cxx | 10 +-- .../source/uielement/addonstoolbarmanager.cxx | 10 +-- .../uielement/imagebuttontoolbarcontroller.cxx | 13 +-- framework/source/uielement/menubarmanager.cxx | 8 +- framework/source/uielement/popupmenucontroller.cxx | 4 +- framework/source/uielement/statusbarmanager.cxx | 9 +- framework/source/uielement/toolbarmanager.cxx | 7 +- linguistic/source/lngsvcmgr.cxx | 24 ++---- oox/source/core/xmlfilterbase.cxx | 26 +----- oox/source/export/chartexport.cxx | 28 ++----- reportdesign/source/ui/report/propbrw.cxx | 10 +-- sc/source/core/data/dpobject.cxx | 8 +- sc/source/core/tool/addincol.cxx | 18 +--- sc/source/ui/docshell/docsh.cxx | 50 ++++++----- sc/source/ui/miscdlgs/solverutil.cxx | 33 +++----- sc/source/ui/vba/excelvbahelper.cxx | 6 +- sc/source/ui/vba/vbahelper.cxx | 15 ++-- sc/source/ui/vba/vbaworksheet.cxx | 6 +- scripting/Library_protocolhandler.mk | 1 + scripting/source/protocolhandler/scripthandler.cxx | 9 +- scripting/source/vbaevents/eventhelper.cxx | 12 +-- sd/source/core/CustomAnimationPreset.cxx | 20 ++--- sd/source/core/TransitionPreset.cxx | 22 ++--- sfx2/source/dialog/dockwin.cxx | 15 ++-- sfx2/source/doc/doctemplates.cxx | 51 +++--------- svl/source/misc/urihelper.cxx | 13 +-- svtools/Library_hatchwindowfactory.mk | 1 + svtools/source/hatchwindow/documentcloser.cxx | 17 +--- svtools/source/misc/templatefoldercache.cxx | 36 ++------ svx/source/form/fmPropBrw.cxx | 4 +- sw/source/filter/ww8/ww8toolbar.cxx | 4 +- sw/source/ui/config/mailconfigpage.cxx | 5 +- sw/source/ui/dbui/mailmergehelper.cxx | 16 +--- sw/source/ui/inc/mailmergehelper.hxx | 20 +---- ucb/Library_ucphier1.mk | 1 + ucb/source/core/ucbcmds.cxx | 9 +- ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 28 ++----- ucb/source/ucp/webdav/webdavcontent.cxx | 9 +- unotools/source/config/lingucfg.cxx | 13 +-- vbahelper/source/vbahelper/vbahelper.cxx | 12 +-- vcl/aqua/source/app/salinst.cxx | 22 +---- xmlhelp/source/cxxhelp/provider/databases.cxx | 25 +----- xmlhelp/source/cxxhelp/provider/provider.cxx | 13 +-- xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 18 +--- xmloff/source/chart/SchXMLExport.cxx | 31 ++----- xmloff/source/chart/SchXMLImport.cxx | 18 +--- xmloff/source/chart/SchXMLTools.cxx | 27 ++---- 80 files changed, 339 insertions(+), 900 deletions(-) diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 619704312955..e5fc1ce20e04 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -724,10 +724,7 @@ bool DialogWindow::SaveDialog() // export dialog model to xml Reference< container::XNameContainer > xDialogModel = GetDialog(); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() ); Reference< XInputStream > xInput( xISP->createInputStream() ); @@ -1002,10 +999,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri if( xSFI->exists( aCurPath ) ) xInput = xSFI->openFileRead( aCurPath ); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() ); ::rtl::OUString aXmlDlgName; @@ -1327,10 +1322,8 @@ void DialogWindow::StoreData() if( xDialogModel.is() ) { - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() ); xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) ); } diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx index 5f6d86b039a2..d642a2ae1785 100644 --- a/basctl/source/basicide/basides3.cxx +++ b/basctl/source/basicide/basides3.cxx @@ -81,10 +81,8 @@ DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl: Reference< container::XNameContainer > xDialogModel( xMSF->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY ); Reference< XInputStream > xInput( xISP->createInputStream() ); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() ); LocalizationMgr::setStringResourceAtDialog( rDocument, rLibName, aDlgName, xDialogModel ); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 0d0d867c4e4a..4a8cdb5e6261 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -28,7 +28,6 @@ #include "iderdll.hxx" #include -#include #include #include #include @@ -288,10 +287,8 @@ void Shell::CopyDialogResources( Reference< container::XNameContainer > xDialogModel = Reference< container::XNameContainer >( xMSF->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY ); Reference< io::XInputStream > xInput( io_xISP->createInputStream() ); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.isDocument() ? rSourceDoc.getDocument() : Reference< frame::XModel >() ); if( xDialogModel.is() ) diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index dfede33a0f73..cdf91fbc37e5 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -960,9 +960,8 @@ namespace basctl { ::rtl::OUString aDecodedURL( aAuthority.copy( sizeof ( "vnd.sun.star.expand:" ) - 1 ) ); aDecodedURL = ::rtl::Uri::decode( aDecodedURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); - Reference< XComponentContext > xContext; - Reference< XPropertySet > xProps( xMSF, UNO_QUERY_THROW ); - xContext.set( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )) ), UNO_QUERY_THROW ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); Reference< XMacroExpander > xMacroExpander( xContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ), diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 9dfb43182c94..422a9d80eba2 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -742,10 +742,8 @@ void DlgEditor::Copy() } // export clipboard dialog model to xml - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument ); Reference< XInputStream > xStream( xISP->createInputStream() ); Sequence< sal_Int8 > DialogModelBytes; @@ -920,10 +918,8 @@ void DlgEditor::Paste() if ( xClipDialogModel.is() ) { - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( ::xmlscript::createInputStream( rtl::ByteSequence(DialogModelBytes.getArray(), DialogModelBytes.getLength()) ) , xClipDialogModel, xContext, m_xDocument ); } diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 11529c240369..986a69b8baae 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -127,10 +127,8 @@ void PropBrw::ImplReCreateController() try { - Reference< XPropertySet > xFactoryProperties( m_xORB, UNO_QUERY_THROW ); Reference< XComponentContext > xOwnContext( - xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY_THROW ); + comphelper::getComponentContext( m_xORB ) ); // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 1c111e2d2eda..79e2c3b707ee 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -94,23 +94,18 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere } else { - Reference< XComponentContext > xContext; - Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); - if ( xContext.is() ) - { - Reference< provider::XScriptProviderFactory > xFactory( - xContext->getValueByName( + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< provider::XScriptProviderFactory > xFactory( + xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory")) ), - UNO_QUERY ); - OSL_ENSURE( xFactory.is(), "SFURL_firing_impl: failed to get master script provider factory" ); - if ( xFactory.is() ) - { - Any aCtx; - aCtx <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); - xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); - } + UNO_QUERY ); + OSL_ENSURE( xFactory.is(), "SFURL_firing_impl: failed to get master script provider factory" ); + if ( xFactory.is() ) + { + Any aCtx; + aCtx <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); + xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); } } @@ -469,10 +464,8 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit if( !xISP.is() ) return; - Reference< XComponentContext > xContext; - Reference< XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); // Import the DialogModel Reference< XInputStream > xInput( xISP->createInputStream() ); diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index c79263493714..6735dfe6299c 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -162,26 +162,6 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj ) } } -Reference< XComponentContext > getComponentContext_Impl( void ) -{ - static Reference< XComponentContext > xContext; - - // Do we have already CoreReflection; if not obtain it - if( !xContext.is() ) - { - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet > xProps( xFactory, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= xContext; - OSL_ASSERT( xContext.is() ); - } - } - return xContext; -} - // save CoreReflection statically Reference< XIdlReflection > getCoreReflection_Impl( void ) { @@ -190,7 +170,8 @@ Reference< XIdlReflection > getCoreReflection_Impl( void ) // Do we have already CoreReflection; if not obtain it if( !xCoreReflection.is() ) { - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( xContext.is() ) { xContext->getValueByName( @@ -233,7 +214,8 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl( void ) // Do we have already CoreReflection; if not obtain it if( !xAccess.is() ) { - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( xContext.is() ) { xContext->getValueByName( @@ -260,7 +242,8 @@ Reference< XTypeConverter > getTypeConverter_Impl( void ) // Do we have already CoreReflection; if not obtain it if( !xTypeConverter.is() ) { - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( xContext.is() ) { xTypeConverter = Converter::create(xContext); @@ -287,7 +270,8 @@ SbUnoObject* createOLEObject_Impl( const ::rtl::OUString& aType ) { bNeedsInit = false; - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( xContext.is() ) { Reference xSMgr = xContext->getServiceManager(); @@ -3694,33 +3678,24 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, } // "Call" ctor using createInstanceWithArgumentsAndContext - Reference < XComponentContext > xContext; - if( xFirstParamContext.is() ) - { - xContext = xFirstParamContext; - } - else - { - Reference < XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - xContext.set( xProps->getPropertyValue( rtl::OUString( "DefaultContext" ) ), UNO_QUERY_THROW ); - } + Reference < XComponentContext > xContext( + xFirstParamContext.is() + ? xFirstParamContext + : comphelper::getProcessComponentContext() ); Reference< XMultiComponentFactory > xServiceMgr( xContext->getServiceManager() ); Any aRetAny; - if( xServiceMgr.is() ) + ::rtl::OUString aServiceName = GetName(); + Reference < XInterface > xRet; + try { - ::rtl::OUString aServiceName = GetName(); - Reference < XInterface > xRet; - try - { - xRet = xServiceMgr->createInstanceWithArgumentsAndContext( aServiceName, args, xContext ); - } - catch( const Exception& ) - { - implHandleAnyException( ::cppu::getCaughtException() ); - } - aRetAny <<= xRet; + xRet = xServiceMgr->createInstanceWithArgumentsAndContext( aServiceName, args, xContext ); + } + catch( const Exception& ) + { + implHandleAnyException( ::cppu::getCaughtException() ); } + aRetAny <<= xRet; unoToSbxValue( pVar, aRetAny ); // Copy back out parameters? @@ -3835,8 +3810,7 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, if( !xContextToUse.is() ) { - Reference < XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - xContextToUse.set( xProps->getPropertyValue( rtl::OUString( "DefaultContext" ) ), UNO_QUERY_THROW ); + xContextToUse = comphelper::getProcessComponentContext(); --nAllowedParamCount; } @@ -4205,22 +4179,12 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWr SbxVariableRef refVar = rPar.Get(0); - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet> xPSMPropertySet( xFactory, UNO_QUERY ); - if( xPSMPropertySet.is() ) - { - Any aContextAny = xPSMPropertySet->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ); + Any aContextAny( comphelper::getProcessComponentContext() ); - SbUnoObjectRef xUnoObj = new SbUnoObject - ( ::rtl::OUString( "DefaultContext" ), - aContextAny ); - refVar->PutObject( (SbUnoObject*)xUnoObj ); - } - else - { - refVar->PutObject( NULL ); - } + SbUnoObjectRef xUnoObj = new SbUnoObject + ( ::rtl::OUString( "DefaultContext" ), + aContextAny ); + refVar->PutObject( (SbUnoObject*)xUnoObj ); } //======================================================================== @@ -4544,7 +4508,8 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl:: { Reference< XInterface > xRet; - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< XMultiComponentFactory > xServiceMgr( xContext->getServiceManager() ); Reference< XInvocation > xProxy = new ModuleInvocationProxy( aPrefix, xScopeObj ); @@ -4665,7 +4630,8 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP // For now: Take first interface that allows to instantiate COM wrapper // TODO: Check if support for multiple interfaces is needed - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< XMultiComponentFactory > xServiceMgr( xContext->getServiceManager() ); Reference< XSingleServiceFactory > xComImplementsFactory ( diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 3257a4ad5214..759b9b25f74b 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -139,7 +139,6 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV { if ( pMod->GetModuleType() == ModuleType::DOCUMENT ) { - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); // Use proxy factory service to create aggregatable proxy. SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,pMod->GetObject() ); Reference< XInterface > xIf; @@ -157,11 +156,10 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV { try { - Reference< XMultiComponentFactory > xMFac( xFactory, UNO_QUERY_THROW ); - Reference< XPropertySet> xPSMPropertySet( xMFac, UNO_QUERY_THROW ); - Reference< XComponentContext > xCtx; - xPSMPropertySet->getPropertyValue( - String( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xCtx; + Reference< XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); + Reference< XMultiComponentFactory > xMFac( + xCtx->getServiceManager() ); Reference< XProxyFactory > xProxyFac( xMFac->createInstanceWithContext( rtl::OUString( "com.sun.star.reflection.ProxyFactory" ), xCtx ), UNO_QUERY_THROW ); m_xAggProxy = xProxyFac->createProxy( xIf ); } diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 3f1101c4eac0..2cfe035a21b7 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -117,23 +116,12 @@ bool SAL_CALL SfxDialogLibraryContainer::isLibraryElementValid( Any aElement ) c bool writeOasis2OOoLibraryElement( Reference< XInputStream > xInput, Reference< XOutputStream > xOutput ) { - Reference< XMultiServiceFactory > xMSF( - comphelper::getProcessServiceFactory() ); - - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() ); - if (! xSMgr.is()) - { - return sal_False; - } - Reference< xml::sax::XParser > xParser( xSMgr->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( @@ -267,10 +255,8 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e Reference< io::XInputStream > xInput( xISP->createInputStream() ); Reference< XNameContainer > xDialogModel( mxMSF->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY ); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( mxMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( mxMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, mxOwnerDocument ); std::vector< rtl::OUString > vEmbeddedImageURLs; GraphicObject::InspectForGraphicObjectImageURL( Reference< XInterface >( xDialogModel, UNO_QUERY ), vEmbeddedImageURLs ); @@ -351,10 +337,8 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement if( !xInput.is() ) return aRetAny; - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( mxMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( mxMSF ) ); InputSource source; source.aInputStream = xInput; diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index f8d946edd69c..77ced57a2eec 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -2725,29 +2725,20 @@ OUString SfxLibraryContainer::expand_url( const OUString& url ) { if( !mxMacroExpander.is() ) { - Reference< XPropertySet > xProps( mxMSF, UNO_QUERY_THROW ); - if( xProps.is() ) + Reference< XComponentContext > xContext( + comphelper::getComponentContext( mxMSF ) ); + Reference< util::XMacroExpander > xExpander; + xContext->getValueByName( + OUSTR("/singletons/com.sun.star.util.theMacroExpander") ) >>= xExpander; + if(! xExpander.is()) { - Reference< XComponentContext > xContext; - xProps->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext; - SAL_WARN_IF(!xContext.is(), "basic", "no DefaultContext"); - if( xContext.is() ) - { - Reference< util::XMacroExpander > xExpander; - xContext->getValueByName( - OUSTR("/singletons/com.sun.star.util.theMacroExpander") ) >>= xExpander; - if(! xExpander.is()) - { - throw uno::DeploymentException( - OUSTR("no macro expander singleton available!"), Reference< XInterface >() ); - } - MutexGuard guard( Mutex::getGlobalMutex() ); - if( !mxMacroExpander.is() ) - { - mxMacroExpander = xExpander; - } - } + throw uno::DeploymentException( + OUSTR("no macro expander singleton available!"), Reference< XInterface >() ); + } + MutexGuard guard( Mutex::getGlobalMutex() ); + if( !mxMacroExpander.is() ) + { + mxMacroExpander = xExpander; } } @@ -3172,7 +3163,8 @@ void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListen #define sDialogLibMediaType "application/vnd.sun.star.dialog-library" ScriptExtensionIterator::ScriptExtensionIterator( void ) - : m_eState( USER_EXTENSIONS ) + : m_xContext( comphelper::getProcessComponentContext() ) + , m_eState( USER_EXTENSIONS ) , m_bUserPackagesLoaded( false ) , m_bSharedPackagesLoaded( false ) , m_bBundledPackagesLoaded( false ) @@ -3180,22 +3172,7 @@ ScriptExtensionIterator::ScriptExtensionIterator( void ) , m_iSharedPackage( 0 ) , m_iBundledPackage( 0 ) , m_pScriptSubPackageIterator( NULL ) -{ - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet > xProps( xFactory, UNO_QUERY_THROW ); - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= m_xContext; - SAL_WARN_IF(!m_xContext.is(), "basic", "no DefaultContext"); - } - if( !m_xContext.is() ) - { - throw RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptExtensionIterator::init(), no XComponentContext")), - Reference< XInterface >() ); - } -} +{} rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDialogLib ) { diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx index df7db6a16185..8ec65d33542e 100644 --- a/comphelper/source/misc/componentcontext.cxx +++ b/comphelper/source/misc/componentcontext.cxx @@ -18,7 +18,7 @@ */ #include - +#include #include #include #include @@ -53,8 +53,6 @@ namespace comphelper { if ( m_xContext.is() ) m_xORB = m_xContext->getServiceManager(); - if ( !m_xORB.is() ) - throw NullPointerException(); } //------------------------------------------------------------------------ @@ -63,23 +61,8 @@ namespace comphelper if ( !_rxLegacyFactory.is() ) throw NullPointerException(); - try - { - Reference< XPropertySet > xFactoryProperties( _rxLegacyFactory, UNO_QUERY_THROW ); - m_xContext = Reference< XComponentContext >( - xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY ); - } - catch( const RuntimeException& ) { throw; } - catch( const Exception& ) - { - throw RuntimeException(); - } - - if ( m_xContext.is() ) - m_xORB = m_xContext->getServiceManager(); - if ( !m_xORB.is() ) - throw NullPointerException(); + m_xContext = comphelper::getComponentContext( _rxLegacyFactory ); + m_xORB = m_xContext->getServiceManager(); } //------------------------------------------------------------------------ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 1a9f8eb1dd6c..4ce53d8eada0 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc,\ $(eval $(call gb_Library_use_sdk_api,postgresql-sdbc)) $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index ed8480c318c4..5a8dd9c15bf3 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -57,13 +57,12 @@ #include +#include #include #include #include #include -#include - #include "pq_driver.hxx" using rtl::OUString; @@ -86,7 +85,6 @@ using com::sun::star::uno::XComponentContext; using com::sun::star::uno::Any; using com::sun::star::beans::PropertyValue; -using com::sun::star::beans::XPropertySet; using com::sun::star::sdbc::XConnection; using com::sun::star::sdbc::SQLException; @@ -352,26 +350,17 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( // XSingleComponentFactory interface ... void * pRet = 0; Reference< XSingleComponentFactory > xFactory; - Reference< XInterface > xSmgr( (XInterface * ) pServiceManager ); + Reference< com::sun::star::lang::XMultiServiceFactory > xSmgr( + static_cast< XInterface * >(pServiceManager), + com::sun::star::uno::UNO_QUERY_THROW ); for( sal_Int32 i = 0 ; g_entries[i].create ; i ++ ) { OUString implName = g_entries[i].getImplementationName(); if( 0 == implName.compareToAscii( pImplName ) ) { - Reference< XComponentContext > defaultContext; - Reference< XPropertySet > propSet( xSmgr, UNO_QUERY ); - if( propSet.is() ) - { - try - { - propSet->getPropertyValue( ASCII_STR( "DefaultContext" ) ) >>= defaultContext; - } - catch( com::sun::star::uno::Exception & ) - { - // if there is no default context, ignore it - } - } + Reference< XComponentContext > defaultContext( + comphelper::getComponentContext( xSmgr ) ); xFactory = new pq_sdbc_driver::OOneInstanceComponentFactory( implName, g_entries[i].create, diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index 246591063547..902807829cb5 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -35,8 +34,6 @@ namespace connectivity /** === begin UNO using === **/ using ::com::sun::star::uno::Reference; - using ::com::sun::star::beans::XPropertySet; - using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::Exception; /** === end UNO using === **/ @@ -82,12 +79,8 @@ namespace connectivity { try { - Reference< XPropertySet > xFactoryProps( - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); Reference< XComponentContext > xContext( - xFactoryProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY_THROW - ); + comphelper::getProcessComponentContext() ); m_pResourceBundle.reset( new ::comphelper::OfficeResourceBundle( xContext, "cnr" ) ); } catch( const Exception& ) diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index f7dc04eae4c4..5b9b3170f65e 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -888,15 +888,9 @@ SaveInData::SaveInData( bDocConfig( isDocConfig ), bReadOnly( sal_False ), m_xCfgMgr( xCfgMgr ), - m_xParentCfgMgr( xParentCfgMgr ) + m_xParentCfgMgr( xParentCfgMgr ), + m_xComponentContext( comphelper::getProcessComponentContext() ) { - uno::Reference< beans::XPropertySet > xProps( - ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - - xProps->getPropertyValue( - OUString("DefaultContext" )) - >>= m_xComponentContext; - m_aSeparatorSeq.realloc( 1 ); m_aSeparatorSeq[0].Name = OUString( ITEM_DESCRIPTOR_TYPE ); m_aSeparatorSeq[0].Value <<= css::ui::ItemType::SEPARATOR_LINE; diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 405c6fa83e10..4d2be18383e7 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -596,12 +596,10 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul OSL_TRACE("** ** About to initialise SF Scripts"); // Add Scripting Framework entries Reference< browse::XBrowseNode > rootNode; - Reference< XComponentContext > xCtx; + Reference< XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); try { - Reference < beans::XPropertySet > xProps( - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - xCtx.set( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW ); Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ) ), UNO_QUERY_THROW ); rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) ); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 2c7b1544dd74..e91e53fb67d3 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -164,7 +164,8 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) deleteAllTree(); Reference< browse::XBrowseNode > rootNode; - Reference< XComponentContext > xCtx; + Reference< XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); Sequence< Reference< browse::XBrowseNode > > children; @@ -175,12 +176,6 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) try { - Reference < beans::XPropertySet > xProps( - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - - xCtx.set( xProps->getPropertyValue( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("DefaultContext" ))), UNO_QUERY_THROW ); - Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName( singleton ), UNO_QUERY_THROW ); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 19c6a5070690..57189590616b 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -835,13 +835,10 @@ void OfaTreeOptionsDialog::ActivateLastSelection() if ( bMustExpand ) { - Reference< XComponentContext > xContext; - Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= xContext; - if ( xContext.is() ) - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( - xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY ); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( + xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY ); } SvLBoxEntry* pTemp = aTreeLB.First(); diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 8272b4d49920..6e3c84589d76 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_set_include,offacc,\ $(eval $(call gb_Library_use_sdk_api,offacc)) $(eval $(call gb_Library_use_libraries,offacc,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 7b8359d44d15..4f56c32560e7 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -144,8 +144,6 @@ class Desktop : public Application void RegisterServices(); void DeregisterServices(); - void DestroyApplicationServiceManager( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMgr ); - void CreateTemporaryDirectory(); void RemoveTemporaryDirectory(); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 4741ce6833a8..cff9f8ed65e6 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -665,8 +665,9 @@ void Desktop::DeInit() // close splashscreen if it's still open CloseSplashScreen(); - Reference xXMultiServiceFactory(::comphelper::getProcessServiceFactory()); - DestroyApplicationServiceManager( xXMultiServiceFactory ); + Reference< XComponent >( + comphelper::getProcessComponentContext(), UNO_QUERY_THROW )-> + dispose(); // nobody should get a destroyd service factory... ::comphelper::setProcessServiceFactory( NULL ); diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 367b77ab08fd..157621ac92ed 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -128,25 +128,6 @@ void Desktop::InitApplicationServiceManager() comphelper::setProcessServiceFactory(sm); } -void Desktop::DestroyApplicationServiceManager( Reference< XMultiServiceFactory >& xSMgr ) -{ - Reference< XPropertySet > xProps( xSMgr, UNO_QUERY ); - if ( xProps.is() ) - { - try - { - Reference< XComponent > xComp; - if (xProps->getPropertyValue( OUString( "DefaultContext" )) >>= xComp ) - { - xComp->dispose(); - } - } - catch (const UnknownPropertyException&) - { - } - } -} - void Desktop::RegisterServices() { if( !m_bServicesRegistered ) diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 2fd0da302885..4510f65dcbc5 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -31,10 +31,9 @@ #include #include #include -#include #include #include - +#include #include namespace desktop @@ -45,15 +44,6 @@ extern "C" void workerfunc (void * acc) ((Acceptor*)acc)->run(); } -static Reference getComponentContext( const Reference& rFactory) -{ - Reference rContext; - Reference< XPropertySet > rPropSet( rFactory, UNO_QUERY ); - Any a = rPropSet->getPropertyValue( ::rtl::OUString( "DefaultContext" ) ); - a >>= rContext; - return rContext; -} - Mutex Acceptor::m_aMutex; Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) @@ -66,7 +56,7 @@ Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) { m_rSMgr = rFactory; // get component context - m_rContext = getComponentContext(m_rSMgr); + m_rContext = comphelper::getComponentContext(m_rSMgr); m_rAcceptor = Reference< XAcceptor > (m_rSMgr->createInstance( rtl::OUString("com.sun.star.connection.Acceptor" )), UNO_QUERY ); @@ -266,7 +256,7 @@ Reference SAL_CALL AccInstanceProvider::getInstance (const OUString& } else if(aName.compareToAscii( "StarOffice.ComponentContext" ) == 0 ) { - rInstance = getComponentContext( m_rSMgr ); + rInstance = comphelper::getComponentContext( m_rSMgr ); } else if ( aName.compareToAscii("StarOffice.NamingService" ) == 0 ) { @@ -278,7 +268,7 @@ Reference SAL_CALL AccInstanceProvider::getInstance (const OUString& rNamingService->registerObject( OUString("StarOffice.ServiceManager" ), m_rSMgr ); rNamingService->registerObject( - OUString("StarOffice.ComponentContext" ), getComponentContext( m_rSMgr )); + OUString("StarOffice.ComponentContext" ), comphelper::getComponentContext( m_rSMgr )); rInstance = rNamingService; } } diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 65235d0f4d17..75643c901bda 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include #include @@ -635,15 +634,9 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenuesForInplace( uno::Reference< lang::XSingleComponentFactory > xIndAccessFact( xContMenu, uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xComponentContext; - - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= - xComponentContext; - uno::Reference< container::XIndexContainer > xMergedMenu( - xIndAccessFact->createInstanceWithContext( xComponentContext ), + xIndAccessFact->createInstanceWithContext( + comphelper::getProcessComponentContext() ), uno::UNO_QUERY_THROW ); FindConnectPoints( xContMenu, nContPoints ); diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 05bf003cd550..0f6af603c9ee 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Executable_add_libs,nsplugin,\ )) $(eval $(call gb_Executable_use_libraries,nsplugin,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index b70a3e60ab40..c9b6ee9212df 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -239,8 +240,8 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) } //create stream for the document - Reference< beans::XPropertySet > xFactoryProperties( mxRemoteMSF, uno::UNO_QUERY ); - Reference< uno::XComponentContext > xContext( xFactoryProperties->getPropertyValue( "DefaultContext" ), UNO_QUERY ); + Reference< uno::XComponentContext > xContext( + comphelper::getComponentContext( mxRemoteMSF ) ); Reference< ucb::XSimpleFileAccess2 > xSimpleFileAccess( ucb::SimpleFileAccess::create(xContext) ); Reference xInputStream = xSimpleFileAccess->openFileRead( m_sURL ); diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 478a340bf823..b4c45db5beda 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -253,15 +252,8 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource, try { - Reference< XComponentContext > xCtx; - Reference< XPropertySet > xPropSet( mxSMgr, UNO_QUERY_THROW ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( - "DefaultContext" ) ) - >>= xCtx; - } + Reference< XComponentContext > xCtx( + comphelper::getComponentContext( mxSMgr ) ); Reference< XMacroExpander > xExpander; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index a5b28d571c9b..ba8503f7238a 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -58,7 +58,6 @@ #include #include #include -#include #include @@ -190,12 +189,8 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) ::rtl::OUString sExpandedUrl; try { - css::uno::Reference xContext; - css::uno::Reference xProps(m_rServiceFactory, - UNO_QUERY_THROW); - xContext.set(xProps->getPropertyValue(::rtl::OUString( - "DefaultContext" )), - UNO_QUERY_THROW); + css::uno::Reference xContext( + comphelper::getComponentContext(m_rServiceFactory)); css::uno::Reference xMacroExpander( xContext->getValueByName( diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 7d9fa130a6d0..bcca5c25f6a0 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -41,8 +41,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -143,10 +143,8 @@ ________________________________________________________________________________ throw( css::uno::Exception ) \ { \ /* retrieve component context from the given service manager */ \ - static const ::rtl::OUString PROP_DEFAULTCONTEXT("DefaultContext"); \ - css::uno::Reference< css::beans::XPropertySet > xSMGRProps(xServiceManager, css::uno::UNO_QUERY_THROW); \ - css::uno::Reference< css::uno::XComponentContext > xComponentContext; \ - xSMGRProps->getPropertyValue( PROP_DEFAULTCONTEXT ) >>= xComponentContext; \ + css::uno::Reference< css::uno::XComponentContext > xComponentContext( \ + comphelper::getComponentContext( xServiceManager ) ); \ /* create new instance of service */ \ CLASS* pClass = new CLASS( xComponentContext ); \ /* hold it alive by increasing his ref count!!! */ \ diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index c1789c81a313..06dbc83c5d8c 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -35,7 +35,6 @@ #include #include "com/sun/star/util/XMacroExpander.hpp" #include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" #include #include #include @@ -415,15 +414,11 @@ AddonsOptions_Impl::AddonsOptions_Impl() m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_MERGECONTEXT ] = PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT; m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_TOOLBARITEMS ] = PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS; - Reference< XComponentContext > xContext; - Reference< com::sun::star::beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - if ( xContext.is() ) - { - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), UNO_QUERY ); - } ReadConfigurationData(); diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 680835d77bbd..24a133184a07 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -376,10 +375,8 @@ throw( SAXException, RuntimeException ) m_bMenuMode = sal_True; // Container must be factory to create sub container - Reference< XComponentContext > xComponentContext; - Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= - xComponentContext; + Reference< XComponentContext > xComponentContext( + comphelper::getProcessComponentContext() ); Reference< XIndexContainer > xSubItemContainer; if ( m_xContainerFactory.is() ) @@ -573,6 +570,7 @@ OReadMenuPopupHandler::OReadMenuPopupHandler( m_bMenuMode( sal_False ), m_xMenuContainer( rMenuContainer ), m_xContainerFactory( rFactory ), + m_xComponentContext( comphelper::getProcessComponentContext() ), m_nNextElementExpected( ELEM_CLOSE_NONE ) { } @@ -612,12 +610,6 @@ throw( SAXException, RuntimeException ) m_bMenuMode = sal_True; // Container must be factory to create sub container - if ( !m_xComponentContext.is() ) - { - const Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - m_xComponentContext.set(xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW ); - } - Reference< XIndexContainer > xSubItemContainer; if ( m_xContainerFactory.is() ) xSubItemContainer = Reference< XIndexContainer >( m_xContainerFactory->createInstanceWithContext( m_xComponentContext ), UNO_QUERY ); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 0fbd031d0b12..3a490d4b11b8 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -34,6 +34,7 @@ #include #include +#include #include #include #include diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx index f7e0ba6a414a..bc90ebabb2dd 100644 --- a/framework/source/lomenubar/FrameHelper.cxx +++ b/framework/source/lomenubar/FrameHelper.cxx @@ -591,9 +591,8 @@ FrameHelper::rebuildMenu (Reference < XMenu > xMenu, //we need to access that info through a special XPopupMenuController if (isSpecialSubmenu (oUCommand)) { - Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY); - Reference xContext (xMSFProps->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))), - UNO_QUERY); + Reference xContext( + comphelper::getComponentContext(m_xMSF)); Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(oUCommand, m_args, @@ -736,9 +735,8 @@ FrameHelper::dispatchCommand (OUString command) { target = OUString(RTL_CONSTASCII_USTRINGPARAM("_default")); - Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY); - Reference xContext (xMSFProps->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))), - UNO_QUERY); + Reference xContext( + comphelper::getComponentContext(m_xMSF)); Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:RecentFileList")), m_args, xContext), diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index ad1ddc476da2..1bc24dda35e1 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -50,12 +50,11 @@ #include #include #include -#include #include #include #include #include - +#include #include #include #include @@ -235,11 +234,8 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue } Reference< XMultiComponentFactory > xToolbarControllerFactory( m_xToolbarControllerRegistration, UNO_QUERY ); - Reference< XComponentContext > xComponentContext; - Reference< XPropertySet > xProps( m_xServiceManager, UNO_QUERY ); - - if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext; + Reference< XComponentContext > xComponentContext( + comphelper::getComponentContext( m_xServiceManager ) ); sal_uInt32 nElements( 0 ); sal_Bool bAppendSeparator( sal_False ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index f7d39231d665..4fd83d43869f 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -38,7 +38,6 @@ #include #include "com/sun/star/util/XMacroExpander.hpp" #include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" #include #include @@ -81,16 +80,12 @@ uno::Reference< util::XMacroExpander > GetMacroExpander() if ( !xMacroExpander.is() ) { - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - if ( xContext.is() ) - { - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), UNO_QUERY ); - xMacroExpander = m_xMacroExpander; - } + xMacroExpander = m_xMacroExpander; } } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index c7b9d7c92ebe..b79f1795bce8 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -1217,11 +1216,8 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa aPropValue.Value <<= m_xFrame; aSeq[1] <<= aPropValue; - Reference< XComponentContext > xComponentContext; - Reference< XPropertySet > xProps( getServiceFactory(), UNO_QUERY ); - - xProps->getPropertyValue( rtl::OUString( "DefaultContext" )) >>= - xComponentContext; + Reference< XComponentContext > xComponentContext( + comphelper::getComponentContext( getServiceFactory() ) ); Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerFactory->createInstanceWithArgumentsAndContext( diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index c1afcd45c876..47e1a9cb4502 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -177,8 +177,8 @@ bool PopupMenuController::CreatePopupMenuController() throw (Exception) aPropValue.Value <<= m_xFrame; aSeq[1] <<= aPropValue; - Reference< XPropertySet > xProps( getServiceManager(), UNO_QUERY_THROW ); - Reference< XComponentContext > xComponentContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW ); + Reference< XComponentContext > xComponentContext( + comphelper::getComponentContext( getServiceManager() ) ); Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerRegistration->createInstanceWithArgumentsAndContext( getCommandURL(), aSeq, xComponentContext ), UNO_QUERY ); if ( xPopupMenuController.is() ) diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 692c81dc07e0..7766746ee883 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -50,7 +50,7 @@ #include #include #include - +#include #include #include @@ -335,13 +335,10 @@ void StatusBarManager::CreateControllers() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::CreateControllers" ); uno::Reference< lang::XMultiComponentFactory > xStatusbarControllerFactory( m_xStatusbarControllerRegistration, uno::UNO_QUERY ); - uno::Reference< uno::XComponentContext > xComponentContext; - uno::Reference< beans::XPropertySet > xProps( m_xServiceManager, uno::UNO_QUERY ); + uno::Reference< uno::XComponentContext > xComponentContext( + comphelper::getComponentContext( m_xServiceManager ) ); uno::Reference< awt::XWindow > xStatusbarWindow = VCLUnoHelper::GetInterface( m_pStatusBar ); - if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext; - for ( sal_uInt16 i = 0; i < m_pStatusBar->GetItemCount(); i++ ) { sal_uInt16 nId = m_pStatusBar->GetItemId( i ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index bf39ac075d17..208fe1dc81af 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -897,17 +897,14 @@ void ToolBarManager::CreateControllers() RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::CreateControllers" ); Reference< XMultiComponentFactory > xToolbarControllerFactory( m_xToolbarControllerRegistration, UNO_QUERY ); - Reference< XComponentContext > xComponentContext; - Reference< XPropertySet > xProps( m_xServiceManager, UNO_QUERY ); + Reference< XComponentContext > xComponentContext( + comphelper::getComponentContext( m_xServiceManager ) ); Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar ); css::util::URL aURL; sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); SvtCommandOptions aCmdOptions; - if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( "DefaultContext" )) >>= xComponentContext; - for ( sal_uInt16 i = 0; i < m_pToolBar->GetItemCount(); i++ ) { sal_uInt16 nId = m_pToolBar->GetItemId( i ); diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 0a5de43332f2..acb037817002 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1088,10 +1088,8 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl() { try { - uno::Reference < uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference < uno::XComponentContext > xContext( + comphelper::getComponentContext( xFac ) ); xSvc = uno::Reference< linguistic2::XSpellChecker >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } catch (const uno::Exception &) @@ -1152,10 +1150,8 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl() { try { - uno::Reference < uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference < uno::XComponentContext > xContext( + comphelper::getComponentContext( xFac ) ); xSvc = uno::Reference< linguistic2::XProofreader >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } catch (const uno::Exception &) @@ -1215,10 +1211,8 @@ void LngSvcMgr::GetAvailableHyphSvcs_Impl() { try { - uno::Reference < uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference < uno::XComponentContext > xContext( + comphelper::getComponentContext( xFac ) ); xSvc = uno::Reference< linguistic2::XHyphenator >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } @@ -1281,10 +1275,8 @@ void LngSvcMgr::GetAvailableThesSvcs_Impl() { try { - uno::Reference < uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference < uno::XComponentContext > xContext( + comphelper::getComponentContext( xFac ) ); xSvc = uno::Reference< linguistic2::XThesaurus >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } catch (const uno::Exception &) diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 06773dc4be9e..70b39364e099 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -56,7 +55,6 @@ using ::com::sun::star::xml::dom::DocumentBuilder; using ::com::sun::star::xml::dom::XDocument; using ::com::sun::star::xml::dom::XDocumentBuilder; using ::com::sun::star::xml::sax::XFastSAXSerializable; -using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::lang::XComponent; namespace oox { @@ -194,26 +192,6 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxCo maFastParser.registerNamespace( ids[i].Second ); } - -static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiServiceFactory > aFactory) -{ - Reference< XComponentContext > xContext; - try - { - Reference< XPropertySet > xFactProp( aFactory, UNO_QUERY ); - if( xFactProp.is() ) - xFactProp->getPropertyValue( "DefaultContext") >>= xContext; - } - catch( Exception& ) - {} - - return xContext; -} - -// ============================================================================ - -// ============================================================================ - XmlFilterBase::XmlFilterBase( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : FilterBase( rxContext ), mxImpl( new XmlFilterBaseImpl( rxContext ) ), @@ -233,7 +211,7 @@ void XmlFilterBase::importDocumentProperties() throw() Reference< XMultiServiceFactory > xFactory( getServiceFactory(), UNO_QUERY ); MediaDescriptor aMediaDesc( getMediaDescriptor() ); Reference< XInputStream > xInputStream; - Reference< XComponentContext > xContext = lcl_getComponentContext(getServiceFactory()); + Reference< XComponentContext > xContext = comphelper::getComponentContext(getServiceFactory()); ::oox::core::FilterDetect aDetector( xContext ); xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc ); Reference< XComponent > xModel( getModel(), UNO_QUERY ); @@ -357,7 +335,7 @@ Reference XmlFilterBase::importFragment( const ::rtl::OUString& aFrag { // create the dom parser Reference< XComponentContext > xContext = - lcl_getComponentContext(getServiceFactory()); + comphelper::getComponentContext(getServiceFactory()); Reference xDomBuilder( DocumentBuilder::create(xContext) ); // create DOM from fragment diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 65195432d41e..08cc68c29f9e 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -121,21 +121,6 @@ namespace oox { namespace drawingml { if ( GETA(propName) ) \ mAny >>= variable; -Reference< uno::XComponentContext > lcl_getComponentContext() -{ - Reference< uno::XComponentContext > xContext; - try - { - Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if( xFactProp.is()) - xFactProp->getPropertyValue(OUString("DefaultContext")) >>= xContext; - } - catch( uno::Exception& ) - {} - - return xContext; -} - class lcl_MatchesRole : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > { public: @@ -217,13 +202,12 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen Reference< chart2::data::XDataSource > lcl_createDataSource( const Sequence< Reference< chart2::data::XLabeledDataSequence > > & aData ) { - Reference< chart2::data::XDataSink > xSink; - Reference< uno::XComponentContext > xContext( lcl_getComponentContext()); - if( xContext.is() ) - xSink.set( - xContext->getServiceManager()->createInstanceWithContext( - OUString("com.sun.star.chart2.data.DataSource"), - xContext ), uno::UNO_QUERY_THROW ); + Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< chart2::data::XDataSink > xSink( + xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.chart2.data.DataSource", xContext ), + uno::UNO_QUERY_THROW ); if( xSink.is()) xSink->setData( aData ); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 3ad3355426bc..42a195cca4de 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -132,16 +132,10 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen if (m_xMeAsFrame.is()) { - Reference< XComponentContext > xOwnContext; + Reference< XComponentContext > xOwnContext( + comphelper::getComponentContext( m_xORB ) ); try { - // our own component context - Reference< XPropertySet > xFactoryProperties( m_xORB, UNO_QUERY_THROW ); - xOwnContext.set( - xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY_THROW ); - - // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_pDesignView->getController().getModel() )), diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index a9462b6465e1..8c5e0c4a0274 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2628,9 +2628,6 @@ uno::Sequence ScDPObject::GetRegisteredSources() return aSeq; } -// use getContext from addincol.cxx -uno::Reference getContext(uno::Reference xMSF); - uno::Reference ScDPObject::CreateSource( const ScDPServiceDesc& rDesc ) { rtl::OUString aImplName = rDesc.aServiceName; @@ -2664,9 +2661,10 @@ uno::Reference ScDPObject::CreateSource( const ScDPS // passing the context to the component (see ScUnoAddInCollection::Initialize) uno::Reference xInterface; - uno::Reference xCtx = getContext(xManager); + uno::Reference xCtx( + comphelper::getComponentContext(xManager)); uno::Reference xCFac( xIntFac, uno::UNO_QUERY ); - if (xCtx.is() && xCFac.is()) + if (xCFac.is()) xInterface = xCFac->createInstanceWithContext(xCtx); if (!xInterface.is()) diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 33c92320c7b7..ac3b81272a76 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -281,19 +281,6 @@ void ScUnoAddInCollection::Clear() bInitialized = false; } -uno::Reference getContext(uno::Reference xMSF) -{ - uno::Reference xCtx; - try { - uno::Reference xPropset(xMSF, uno::UNO_QUERY); - xPropset->getPropertyValue( - ::rtl::OUString("DefaultContext")) >>= xCtx; - } - catch ( uno::Exception & ) { - } - return xCtx; -} - void ScUnoAddInCollection::Initialize() { OSL_ENSURE( !bInitialized, "Initialize twice?" ); @@ -321,9 +308,10 @@ void ScUnoAddInCollection::Initialize() // passing the context to the component uno::Reference xInterface; - uno::Reference xCtx = getContext(xManager); + uno::Reference xCtx( + comphelper::getComponentContext(xManager)); uno::Reference xCFac( xIntFac, uno::UNO_QUERY ); - if (xCtx.is() && xCFac.is()) + if (xCFac.is()) { xInterface = xCFac->createInstanceWithContext(xCtx); if (xInterface.is()) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 211473104ebf..645911d8e5a5 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -683,36 +683,34 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) try { - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); - uno::Reference< beans::XPropertySet > xProp( xServiceManager, uno::UNO_QUERY_THROW ); - xProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ) >>= xContext; - if ( xContext.is() ) + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + uno::Reference< lang::XMultiServiceFactory > xServiceManager( + xContext->getServiceManager(), + uno::UNO_QUERY_THROW ); + uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); + uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ) ); + if ( xEnum.is() ) { - uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); - uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ) ); - if ( xEnum.is() ) + while ( xEnum->hasMoreElements() ) { - while ( xEnum->hasMoreElements() ) + uno::Any aAny = xEnum->nextElement(); + uno::Reference< lang::XSingleComponentFactory > xFactory; + aAny >>= xFactory; + if ( xFactory.is() ) { - uno::Any aAny = xEnum->nextElement(); - uno::Reference< lang::XSingleComponentFactory > xFactory; - aAny >>= xFactory; - if ( xFactory.is() ) - { - uno::Reference< task::XJob > xJob( xFactory->createInstanceWithContext( xContext ), uno::UNO_QUERY_THROW ); - uno::Sequence< beans::NamedValue > aArgsForJob(1); - ScViewData* pViewData = GetViewData(); - SfxViewShell* pViewShell = ( pViewData ? pViewData->GetViewShell() : NULL ); - SfxViewFrame* pViewFrame = ( pViewShell ? pViewShell->GetViewFrame() : NULL ); - SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL ); - uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 ); - uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); - aArgsForJob[0] = beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SpreadsheetView" )), + uno::Reference< task::XJob > xJob( xFactory->createInstanceWithContext( xContext ), uno::UNO_QUERY_THROW ); + uno::Sequence< beans::NamedValue > aArgsForJob(1); + ScViewData* pViewData = GetViewData(); + SfxViewShell* pViewShell = ( pViewData ? pViewData->GetViewShell() : NULL ); + SfxViewFrame* pViewFrame = ( pViewShell ? pViewShell->GetViewFrame() : NULL ); + SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL ); + uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 ); + uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); + aArgsForJob[0] = beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SpreadsheetView" )), uno::makeAny( xSpreadsheetView ) ); - xJob->execute( aArgsForJob ); - } + xJob->execute( aArgsForJob ); } } } diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 356eef7440e2..8ed768e1f760 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -29,6 +29,7 @@ #include "solverutil.hxx" #include +#include #include #include #include @@ -84,19 +85,13 @@ void ScSolverUtil::GetImplementations( uno::Sequence& rImplNames, rImplNames.realloc(0); // clear rDescriptions.realloc(0); - uno::Reference xCtx; - uno::Reference xMSF = comphelper::getProcessServiceFactory(); - uno::Reference xPropset(xMSF, uno::UNO_QUERY); - try - { - xPropset->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xCtx; - } - catch ( uno::Exception & ) - { - } + uno::Reference xCtx( + comphelper::getProcessComponentContext() ); + uno::Reference xMSF( + xCtx->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference xEnAc( xMSF, uno::UNO_QUERY ); - if ( xCtx.is() && xEnAc.is() ) + if ( xEnAc.is() ) { uno::Reference xEnum = xEnAc->createContentEnumeration( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); @@ -140,19 +135,13 @@ uno::Reference ScSolverUtil::GetSolver( const rtl::OUString& rIm { uno::Reference xSolver; - uno::Reference xCtx; - uno::Reference xMSF = comphelper::getProcessServiceFactory(); - uno::Reference xPropset(xMSF, uno::UNO_QUERY); - try - { - xPropset->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xCtx; - } - catch ( uno::Exception & ) - { - } + uno::Reference xCtx( + comphelper::getProcessComponentContext() ); + uno::Reference xMSF( + xCtx->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference xEnAc( xMSF, uno::UNO_QUERY ); - if ( xCtx.is() && xEnAc.is() ) + if ( xEnAc.is() ) { uno::Reference xEnum = xEnAc->createContentEnumeration( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index cfbb7e79b64b..ec54e24a5051 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -118,10 +118,10 @@ private: bool bInitialWarningState; static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException ) { - static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - static uno::Reference xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW ); + static uno::Reference xContext( + comphelper::getProcessComponentContext() ); static uno::Reference xServiceManager( - xContext->getServiceManager(), uno::UNO_QUERY_THROW ); + xContext->getServiceManager() ); static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW ); return xProps; } diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index a2a2217531f7..ce5e680f1c26 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -124,10 +124,10 @@ private: bool bInitialWarningState; static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException ) { - static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - static uno::Reference xContext( xTmpProps->getPropertyValue( rtl::OUString( "DefaultContext" )), uno::UNO_QUERY_THROW ); + static uno::Reference xContext( + comphelper::getProcessComponentContext() ); static uno::Reference xServiceManager( - xContext->getServiceManager(), uno::UNO_QUERY_THROW ); + xContext->getServiceManager() ); static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); return xProps; } @@ -279,11 +279,10 @@ getCurrentDocument() throw (uno::RuntimeException) if ( false == ( aModel >>= xModel ) || !xModel.is() ) { - // trying last gasp try the current component - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - // test if vba service is present - uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( "DefaultContext" )), uno::UNO_QUERY_THROW ); - uno::Reference xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); + uno::Reference xSMgr( + xCtx->getServiceManager() ); uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW ); xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY ); if ( !xModel.is() ) diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 528941b090d7..d5fe171afde2 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -167,10 +167,10 @@ openNewDoc(rtl::OUString aSheetName ) uno::Reference xModel; try { - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); uno::Reference xServiceManager( - xContext->getServiceManager(), uno::UNO_QUERY_THROW ); + xContext->getServiceManager() ); uno::Reference xComponentLoader( xServiceManager->createInstanceWithContext( diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index 291b1ecb03c1..d2a684ab852f 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,protocolhandler,\ $(eval $(call gb_Library_use_sdk_api,protocolhandler)) $(eval $(call gb_Library_use_libraries,protocolhandler,\ + comphelper \ cppu \ cppuhelper \ fwe \ diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index ed41ebcfadc2..1881c917c4ae 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -50,7 +51,6 @@ #include "com/sun/star/uri/XUriReference.hpp" #include "com/sun/star/uri/XUriReferenceFactory.hpp" #include "com/sun/star/uri/XVndSunStarScriptUrl.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -383,13 +383,8 @@ void ScriptProtocolHandler::createScriptProvider() // if nothing of this is successful, use the master script provider if ( !m_xScriptProvider.is() ) { - Reference< XPropertySet > xProps( m_xFactory, UNO_QUERY_THROW ); - - ::rtl::OUString dc( - "DefaultContext" ); - Reference< XComponentContext > xCtx( - xProps->getPropertyValue( dc ), UNO_QUERY_THROW ); + comphelper::getComponentContext( m_xFactory ) ); ::rtl::OUString tmspf( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory"); diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 00981f075898..7249d143a8d0 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -368,14 +368,10 @@ eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescrip } -ScriptEventHelper::ScriptEventHelper( const Reference< XInterface >& xControl ) : m_xControl( xControl ) -{ - Reference < beans::XPropertySet > xProps( - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - m_xCtx.set( xProps->getPropertyValue( rtl::OUString( - "DefaultContext" )), - uno::UNO_QUERY_THROW ); -} +ScriptEventHelper::ScriptEventHelper( const Reference< XInterface >& xControl ): + m_xCtx( comphelper::getProcessComponentContext() ), + m_xControl( xControl ) +{} Sequence< rtl::OUString > ScriptEventHelper::getEventListeners() diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index bf8fd5027a2a..8eb74eeaabcf 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -316,19 +315,14 @@ void CustomAnimationPresets::importEffects() { try { - // Get service factory - Reference< XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); - DBG_ASSERT( xServiceFactory.is(), "sd::CustomAnimationPresets::import(), got no service manager" ); - if( !xServiceFactory.is() ) - return; - - uno::Reference< beans::XPropertySet > xProps( xServiceFactory, UNO_QUERY ); - uno::Reference< uno::XComponentContext > xContext; - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< XMultiServiceFactory > xServiceFactory( + xContext->getServiceManager(), UNO_QUERY_THROW ); - uno::Reference< util::XMacroExpander > xMacroExpander; - if( xContext.is() ) - xMacroExpander.set( xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), UNO_QUERY ); + uno::Reference< util::XMacroExpander > xMacroExpander( + xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), + UNO_QUERY ); Reference< XMultiServiceFactory > xConfigProvider( xServiceFactory->createInstance("com.sun.star.configuration.ConfigurationProvider" ), diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index dd03514cd5d4..3c77ead958fe 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -152,19 +151,14 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) try { - // Get service factory - Reference< XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); - DBG_ASSERT( xServiceFactory.is(), "sd::CustomAnimationPresets::import(), got no service manager" ); - if( !xServiceFactory.is() ) - return false; - - uno::Reference< beans::XPropertySet > xProps( xServiceFactory, UNO_QUERY ); - uno::Reference< uno::XComponentContext > xContext; - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; - - uno::Reference< util::XMacroExpander > xMacroExpander; - if( xContext.is() ) - xMacroExpander.set( xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), UNO_QUERY ); + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< XMultiServiceFactory > xServiceFactory( + xContext->getServiceManager(), UNO_QUERY_THROW ); + + uno::Reference< util::XMacroExpander > xMacroExpander( + xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), + UNO_QUERY ); // import ui strings Reference< XMultiServiceFactory > xConfigProvider( diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 7106771db298..d95318b00704 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -163,17 +163,12 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , uno::Reference< awt::XWindow > xWindow; try { - uno::Reference< beans::XPropertySet > xProps( xServiceManager, uno::UNO_QUERY ); - uno::Reference< uno::XComponentContext > xContext; + uno::Reference< uno::XComponentContext > xContext( + comphelper::getComponentContext( xServiceManager ) ); - if ( xProps.is() ) - xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - if ( xContext.is() ) - { - xWindow = uno::Reference< awt::XWindow>( - xFactoryMgr->createInstanceWithArgumentsAndContext( aArgs, xContext ), - uno::UNO_QUERY ); - } + xWindow = uno::Reference< awt::XWindow>( + xFactoryMgr->createInstanceWithArgumentsAndContext( aArgs, xContext ), + uno::UNO_QUERY ); static uno::WeakReference< frame::XModuleManager2 > m_xModuleManager; diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index c7a2fa62d6b5..25ed45909bcc 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -581,29 +581,18 @@ void SfxDocTplService_Impl::getDirList() maTemplateDirs = Sequence< OUString >( nCount ); - uno::Reference< XComponentContext > xCtx; + uno::Reference< XComponentContext > xCtx( + comphelper::getComponentContext( mxFactory ) ); uno::Reference< util::XMacroExpander > xExpander; - uno::Reference< XPropertySet > xPropSet( mxFactory, UNO_QUERY ); const rtl::OUString aPrefix( "vnd.sun.star.expand:" ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( - "DefaultContext" ) ) - >>= xCtx; - } + xCtx->getValueByName( + rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ) + >>= xExpander; - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ) - >>= xExpander; - - OSL_ENSURE( xExpander.is(), - "Unable to obtain macro expander singleton!" ); - } + OSL_ENSURE( xExpander.is(), + "Unable to obtain macro expander singleton!" ); for ( sal_uInt16 i=0; i xCtx; - uno::Reference< XPropertySet > xPropSet( mxFactory, UNO_QUERY ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( - "DefaultContext" ) ) - >>= xCtx; - } - - OSL_ENSURE( xCtx.is(), - "Unable to obtain component context from " - "service manager!" ); + uno::Reference< XComponentContext > xCtx( + comphelper::getComponentContext( mxFactory ) ); - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( - "/singletons/" - "com.sun.star.util.theOfficeInstallationDirectories" ) ) + xCtx->getValueByName( + rtl::OUString( + "/singletons/" + "com.sun.star.util.theOfficeInstallationDirectories" ) ) >>= mxOfficeInstDirs; - } OSL_ENSURE( mxOfficeInstDirs.is(), "Unable to obtain office installation directory " diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index ed96a698f48c..2ae2890f4c63 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -18,8 +18,6 @@ */ #include -#include -#include "com/sun/star/lang/XMultiComponentFactory.hpp" #include "com/sun/star/ucb/Command.hpp" #include "com/sun/star/ucb/IllegalIdentifierException.hpp" #include "com/sun/star/ucb/UniversalContentBroker.hpp" @@ -291,15 +289,8 @@ rtl::OUString URIHelper::simpleNormalizedMakeRelative( { com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > rel( URIHelper::normalizedMakeRelative( - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >( - (com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet >( - comphelper::getProcessServiceFactory(), - com::sun::star::uno::UNO_QUERY_THROW)-> - getPropertyValue("DefaultContext")), - com::sun::star::uno::UNO_QUERY_THROW), - baseUriReference, uriReference)); + comphelper::getProcessComponentContext(), baseUriReference, + uriReference)); return rel.is() ? rel->getUriReference() : uriReference; } diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index a25abdb3bcf3..03f2566bfae9 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\ $(eval $(call gb_Library_use_sdk_api,hatchwindowfactory)) $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index fe934549d202..0cf4d7d120fd 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -22,9 +22,8 @@ #include #include #include -#include #include - +#include #include #include #include @@ -267,18 +266,8 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::impl_staticGetSupport uno::Reference< uno::XInterface > SAL_CALL ODocumentCloser::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xPropSet( xServiceManager, uno::UNO_QUERY ); - if ( xPropSet.is() ) - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ) >>= xContext; - - if ( !xContext.is() ) - { - throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to obtain component context from service manager!" ) ), - uno::Reference< uno::XInterface >() ); - } - + uno::Reference< uno::XComponentContext > xContext( + comphelper::getComponentContext( xServiceManager ) ); return static_cast< cppu::OWeakObject * >( new ODocumentCloser( xContext ) ); } diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 139d84ad7336..b49d74aa0648 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -837,36 +836,15 @@ namespace svt osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOfficeInstDirs.is() ) { - // @@@ This is bad! - uno::Reference< lang::XMultiServiceFactory > xSMgr - = comphelper::getProcessServiceFactory(); - OSL_ENSURE( xSMgr.is(), "No service manager!" ); - - uno::Reference< beans::XPropertySet > xPropSet( - xSMgr, uno::UNO_QUERY ); - if ( xPropSet.is() ) - { - uno::Reference< uno::XComponentContext > xCtx; - xPropSet->getPropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ) - >>= xCtx; - - OSL_ENSURE( xCtx.is(), - "Unable to obtain component context from service manager!" ); - - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); + xCtx->getValueByName( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theOfficeInstallationDirectories" ) ) ) - >>= m_xOfficeInstDirs; - } + >>= m_xOfficeInstDirs; - OSL_ENSURE( m_xOfficeInstDirs.is(), - "Unable to obtain office directories singleton!" ); - - } + OSL_ENSURE( m_xOfficeInstDirs.is(), + "Unable to obtain office directories singleton!" ); } } return m_xOfficeInstDirs; diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 044eb783380e..e83c2d89d16a 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -570,10 +570,8 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) xControlMap = pFormPage->GetImpl().getControlToShapeMap(); // our own component context - Reference< XPropertySet > xFactoryProperties( m_xORB, UNO_QUERY_THROW ); Reference< XComponentContext > xOwnContext( - xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY_THROW ); + comphelper::getComponentContext( m_xORB ) ); // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index ff1ae4971bf4..48910c0bead1 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -370,8 +370,8 @@ bool Customization::ImportMenu( CTBWrapper& rWrapper, CustomToolBarImportHelper& } uno::Reference< lang::XSingleComponentFactory > xSCF( xIndexContainer, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xContext( xProps->getPropertyValue( "DefaultContext" ), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); // create the popup menu uno::Sequence< beans::PropertyValue > aPopupMenu( 4 ); aPopupMenu[0].Name = "CommandURL"; diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index da6591eea945..430312c0883e 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -339,8 +339,9 @@ void SwTestAccountSettingsDialog::Test() try { uno::Reference< mail::XMailService > xInMailService; - uno::Reference< mail::XMailServiceProvider > xMailServiceProvider = - mail::MailServiceProvider::create(getCurrentCmpCtx(rMgr)); + uno::Reference< mail::XMailServiceProvider > xMailServiceProvider( + mail::MailServiceProvider::create( + comphelper::getComponentContext(rMgr))); uno::Reference< mail::XMailService > xMailService = xMailServiceProvider->create( mail::MailServiceType_SMTP); diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 9f756c267c69..91fd9fcdced8 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -110,8 +110,9 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( if (rMgr.is()) try { - uno::Reference< mail::XMailServiceProvider > xMailServiceProvider = - mail::MailServiceProvider::create(getCurrentCmpCtx(rMgr)); + uno::Reference< mail::XMailServiceProvider > xMailServiceProvider( + mail::MailServiceProvider::create( + comphelper::getComponentContext(rMgr))); xSmtpServer = uno::Reference< mail::XSmtpService > ( xMailServiceProvider->create( mail::MailServiceType_SMTP @@ -673,17 +674,6 @@ void SwConnectionListener::disposing(const lang::EventObject& /*aEvent*/) { } -uno::Reference< uno::XComponentContext> getCurrentCmpCtx( - uno::Reference rSrvMgr) -{ - uno::Reference< beans::XPropertySet > xPropSet = - uno::Reference< beans::XPropertySet>(rSrvMgr, uno::UNO_QUERY); - Any aAny = xPropSet->getPropertyValue( ::rtl::OUString("DefaultContext")); - uno::Reference< uno::XComponentContext> rCmpCtx; - aAny >>= rCmpCtx; - return rCmpCtx; -} - SwMailTransferable::SwMailTransferable(const rtl::OUString& rBody, const rtl::OUString& rMimeType) : cppu::WeakComponentImplHelper2< datatransfer::XTransferable, beans::XPropertySet >(m_aMutex), m_aMimeType( rMimeType ), diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx index d7024d3c39a3..7796046c0b0b 100644 --- a/sw/source/ui/inc/mailmergehelper.hxx +++ b/sw/source/ui/inc/mailmergehelper.hxx @@ -45,18 +45,10 @@ class SwMailMergeConfigItem; -namespace com{ namespace sun{ namespace star{ - namespace uno{ - class XComponentContext; - } - namespace lang{ - class XMultiServiceFactory; - } - namespace mail{ - class XSmtpService; - class XMailService; - } -}}} +namespace com { namespace sun { namespace star { namespace mail { + class XMailService; + class XSmtpService; +} } } } namespace SwMailMergeHelper { @@ -317,10 +309,6 @@ public: {m_sSenderAddress = rSenderAddress;} }; -SW_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> - getCurrentCmpCtx( - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> rSrvMgr); #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 767fbd15208a..83798585807c 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucp $(eval $(call gb_Library_use_sdk_api,ucphier1)) $(eval $(call gb_Library_use_libraries,ucphier1,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 0f6794b59b1c..4585efb6a3e3 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -1705,12 +1704,8 @@ void UniversalContentBroker::globalTransfer( uno::Reference< ucb::XCommandEnvironment > xLocalEnv; if (xEnv.is()) { - uno::Reference< beans::XPropertySet > const xProps( - m_xSMgr, uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xCtx; - xCtx.set( xProps->getPropertyValue( - rtl::OUString( "DefaultContext" ) ), - uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getComponentContext( m_xSMgr ) ); xLocalEnv.set( ucb::CommandEnvironment::create( xCtx, diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index cf0db7a82a90..dfed6f6600be 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -36,9 +36,9 @@ *************************************************************************/ #include #include -#include #include #include +#include #include #include "hierarchyprovider.hxx" #include "hierarchycontent.hxx" @@ -279,30 +279,16 @@ HierarchyContentProvider::getOfficeInstallationDirectories() { OSL_ENSURE( m_xSMgr.is(), "No service manager!" ); - uno::Reference< uno::XComponentContext > xCtx; - uno::Reference< beans::XPropertySet > xPropSet( - m_xSMgr, uno::UNO_QUERY ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( "DefaultContext" ) ) - >>= xCtx; - } - - OSL_ENSURE( xCtx.is(), - "Unable to obtain component context from " - "service manager!" ); + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getComponentContext( m_xSMgr ) ); - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( "/singletons/com.sun.star.util.theOfficeInstallationDirectories" ) ) + xCtx->getValueByName( + rtl::OUString( "/singletons/com.sun.star.util.theOfficeInstallationDirectories" ) ) >>= m_xOfficeInstDirs; // Be silent. singleton only available in an Office environment. -// OSL_ENSURE( m_xOfficeInstDirs.is(), -// "Unable to obtain office directories singleton!" ); - } +// OSL_ENSURE( m_xOfficeInstDirs.is(), +// "Unable to obtain office directories singleton!" ); } } return m_xOfficeInstDirs; diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 64a369a40548..bfabf8cedfac 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -33,6 +33,7 @@ *************************************************************************/ +#include #include #include "osl/doublecheckedlocking.h" #include @@ -199,12 +200,8 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) { try { - uno::Reference< beans::XPropertySet > const xProps( - m_xSMgr, uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xCtx; - xCtx.set( xProps->getPropertyValue( - rtl::OUString( "DefaultContext" ) ), - uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getComponentContext( m_xSMgr ) ); uno::Reference< task::XInteractionHandler > xIH( task::PasswordContainerInteractionHandler::create( xCtx ) ); diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index be309293d466..e8956c464d18 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -24,7 +24,6 @@ #include #include #include "com/sun/star/util/XMacroExpander.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" #include #include #include @@ -939,16 +938,12 @@ static uno::Reference< util::XMacroExpander > lcl_GetMacroExpander() { if ( !xMacroExpander.is() ) { - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))) >>= xContext; - if ( xContext.is() ) - { - aG_xMacroExpander = uno::Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + aG_xMacroExpander = uno::Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.util.theMacroExpander"))), uno::UNO_QUERY ); - xMacroExpander = aG_xMacroExpander; - } + xMacroExpander = aG_xMacroExpander; } } diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 9db368e72b68..dece6b5d4ef5 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -155,15 +154,8 @@ dispatchRequests (const uno::Reference< frame::XModel>& xModel, const OUString & uno::Reference xDispatchProvider (xFrame,uno::UNO_QUERY_THROW); try { - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - uno::Reference xContext( xProps->getPropertyValue( "DefaultContext" ), uno::UNO_QUERY_THROW ); - if ( !xContext.is() ) - return; - - uno::Reference xServiceManager = xContext->getServiceManager(); - if ( !xServiceManager.is() ) - return; - + uno::Reference xContext( + comphelper::getProcessComponentContext() ); uno::Reference xParser( util::URLTransformer::create(xContext) ); xParser->parseStrict (url); } diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index f8a883528804..ecf17755e15f 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -59,8 +59,6 @@ #include -#include -#include #include #include #include @@ -1083,23 +1081,9 @@ void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rRetur // to UTF-8 before encoding non ascii characters, which is not what other apps expect. static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) { - rtl::OUString extUrl; - - uno::Reference< lang::XMultiServiceFactory > sm = comphelper::getProcessServiceFactory(); - if (sm.is()) - { - uno::Reference< beans::XPropertySet > pset; - sm->queryInterface( getCppuType( &pset )) >>= pset; - if (pset.is()) - { - uno::Reference< uno::XComponentContext > context; - static const rtl::OUString DEFAULT_CONTEXT( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ); - pset->getPropertyValue(DEFAULT_CONTEXT) >>= context; - if (context.is()) - extUrl = uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl); - } - } - return extUrl; + uno::Reference< uno::XComponentContext > context( + comphelper::getProcessComponentContext()); + return uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl); } // #i104525# many versions of OSX have problems with some URLs: diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 1472bea879f2..8537685ae278 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -36,6 +36,7 @@ #include #include "inputstream.hxx" #include +#include #include #include @@ -44,7 +45,6 @@ #include "com/sun/star/deployment/ExtensionManager.hpp" #include "com/sun/star/deployment/thePackageManagerFactory.hpp" #include -#include #include #include #include @@ -1406,12 +1406,14 @@ ExtensionIteratorBase::ExtensionIteratorBase( Reference< XComponentContext > xCo , m_aInitialModule( aInitialModule ) , m_aLanguage( aLanguage ) { + assert( m_xContext.is() ); init(); } ExtensionIteratorBase::ExtensionIteratorBase( Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage ) - : m_rDatabases( rDatabases ) + : m_xContext( comphelper::getProcessComponentContext() ) + , m_rDatabases( rDatabases ) , m_eState( INITIAL_MODULE ) , m_aInitialModule( aInitialModule ) , m_aLanguage( aLanguage ) @@ -1421,25 +1423,6 @@ ExtensionIteratorBase::ExtensionIteratorBase( Databases& rDatabases, void ExtensionIteratorBase::init() { - if( !m_xContext.is() ) - { - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet > xProps( xFactory, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= m_xContext; - OSL_ASSERT( m_xContext.is() ); - } - } - if( !m_xContext.is() ) - { - throw RuntimeException( - ::rtl::OUString( "ExtensionIteratorBase::init(), no XComponentContext" ), - Reference< XInterface >() ); - } - m_xSFA = ucb::SimpleFileAccess::create(m_xContext); m_bUserPackagesLoaded = false; diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 79e4c0a1e5bb..e3deabafd57e 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include @@ -345,15 +345,8 @@ void ContentProvider::init() rtl::Bootstrap::expandMacros(aPath); aImagesZipPaths[ 1 ] = aPath; - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( m_xSMgr, uno::UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= xContext; - OSL_ASSERT( xContext.is() ); - } + uno::Reference< uno::XComponentContext > xContext( + comphelper::getComponentContext( m_xSMgr ) ); sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic"); m_pDatabases = new Databases( showBasic, diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 39c72815a06e..cb44797bd343 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -53,7 +53,6 @@ #include #include #include -#include #include "urlparameter.hxx" #include "databases.hxx" @@ -993,21 +992,8 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, if( bAddExtensionPath ) { - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet > xProps( xFactory, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - Reference< XComponentContext > xContext; - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= xContext; - } - if( !xContext.is() ) - { - throw RuntimeException( - ::rtl::OUString( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" ), - Reference< XInterface >() ); - } + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); rtl::OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionRegistryPath, xContext ); rtl::OString aExpandedExtensionPath = rtl::OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() ); diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 9b2bcb708192..4640b85eda55 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -296,21 +296,6 @@ public: namespace { -Reference< uno::XComponentContext > lcl_getComponentContext() -{ - Reference< uno::XComponentContext > xContext; - try - { - Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if( xFactProp.is()) - xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext; - } - catch( const uno::Exception& ) - { - } - - return xContext; -} class lcl_MatchesRole : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > { @@ -400,15 +385,13 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen Reference< chart2::data::XDataSource > lcl_createDataSource( const Sequence< Reference< chart2::data::XLabeledDataSequence > > & aData ) { - Reference< chart2::data::XDataSink > xSink; - Reference< uno::XComponentContext > xContext( lcl_getComponentContext()); - if( xContext.is() ) - xSink.set( - xContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.chart2.data.DataSource" ), - xContext ), uno::UNO_QUERY_THROW ); - if( xSink.is()) - xSink->setData( aData ); + Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< chart2::data::XDataSink > xSink( + xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.chart2.data.DataSource", xContext ), + uno::UNO_QUERY_THROW ); + xSink->setData( aData ); return Reference< chart2::data::XDataSource >( xSink, uno::UNO_QUERY ); } diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index ab0ae4dd5493..729203bdc83b 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -70,21 +70,6 @@ using ::com::sun::star::uno::Sequence; namespace { -Reference< uno::XComponentContext > lcl_getComponentContext() -{ - Reference< uno::XComponentContext > xContext; - try - { - Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if( xFactProp.is()) - xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext; - } - catch( uno::Exception& ) - {} - - return xContext; -} - class lcl_MatchesChartType : public ::std::unary_function< Reference< chart2::XChartType >, bool > { public: @@ -489,7 +474,8 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries( xDoc->getFirstDiagram(), uno::UNO_QUERY_THROW ); Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems()); - Reference< uno::XComponentContext > xContext( lcl_getComponentContext()); + Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( nCoordinateSystemIndex < aCooSysSeq.getLength()) { diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 524058f42756..948475a21ccf 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -72,20 +72,6 @@ using ::com::sun::star::uno::Sequence; namespace { -Reference< uno::XComponentContext > lcl_getComponentContext() -{ - Reference< uno::XComponentContext > xContext; - try - { - Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if( xFactProp.is()) - xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext; - } - catch( uno::Exception& ) - {} - - return xContext; -} rtl::OUString lcl_getGeneratorFromModel( const uno::Reference< frame::XModel >& xChartModel ) { @@ -375,13 +361,12 @@ XMLTokenEnum getTokenByChartType( Reference< chart2::data::XLabeledDataSequence > GetNewLabeledDataSequence() { - Reference< chart2::data::XLabeledDataSequence > xResult; - Reference< uno::XComponentContext > xContext( lcl_getComponentContext()); - if( xContext.is() ) - xResult.set( - xContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.chart2.data.LabeledDataSequence" ), - xContext ), uno::UNO_QUERY_THROW ); + Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< chart2::data::XLabeledDataSequence > xResult( + xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.chart2.data.LabeledDataSequence", xContext ), + uno::UNO_QUERY_THROW ); return xResult; } -- cgit From 757d9710f78dd821b09f83f9c45efb084ab1b302 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 29 Sep 2012 18:16:26 +0200 Subject: gb_PYTHON_PRECOMMAND is only defined after gb_PYTHON ...now that fa140733eeaf59030caa3115be4de11fb210b5b7 "fix dep on internal ucpp" moved things around, so use "=" instead of ":=" here. (And I'm not sure the other places need ":=" either.) Change-Id: Id71570c4a55ab08ca339801dec78ef06cfd80ef0 --- solenv/gbuild/gbuild.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 4afc09530edf..a8f76bffd204 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -220,7 +220,7 @@ else ifeq ($(DISABLE_PYTHON),TRUE) gb_PYTHON := python else gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) -gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) +gb_PYTHON = $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) endif ifneq (,$(SYSTEM_UCPP)) -- cgit From a645c4cb0660cd3519bd6833e2ec2d91a96948e7 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sat, 29 Sep 2012 19:46:34 +0200 Subject: soltools: fix windows build Change-Id: Iac8321655a18826f9adcf8aed8075cce1aa24652 --- soltools/Executable_makedepend.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk index e6e7ac6d5ff6..e301a0937cc4 100644 --- a/soltools/Executable_makedepend.mk +++ b/soltools/Executable_makedepend.mk @@ -25,10 +25,6 @@ $(eval $(call gb_Executable_add_defs,makedepend,\ -wd4131 \ -wd4706 \ )) - -$(eval $(call gb_Executable_use_libraries,makedepend,\ - msvcprt \ -)) endif $(eval $(call gb_Executable_add_cobjects,makedepend,\ -- cgit From 8f73ed78cb7e0653d3c4fa90e8be00026b0d67cf Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Fri, 28 Sep 2012 22:18:07 +0200 Subject: gbuild: gb_Library_TARGETS should really not be needed now Change-Id: I1a5f2fda44da782b43076eee67e292affe1bad1a --- solenv/gbuild/Helper.mk | 6 ------ solenv/gbuild/Library.mk | 1 - solenv/gbuild/StaticLibrary.mk | 1 - solenv/gbuild/TargetLocations.mk | 4 ++-- solenv/gbuild/gbuild.mk | 11 ++++------- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index c210cd716a61..9817ef2923eb 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -108,12 +108,6 @@ $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(eval gb_Jar_$$(group) :=)) endef -define gb_Helper_collect_libtargets -gb_Library_TARGETS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) -gb_StaticLibrary_TARGETS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) - -endef - define gb_Helper_collect_knownlibs gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 518211152cda..d07fe24292e0 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -37,7 +37,6 @@ # gb_Library_DLLFILENAMES # gb_Library_FILENAMES # gb_Library_Library_platform -# gb_Library_TARGETS # doesn't do anything, just used for hooking up component target .PHONY: $(call gb_Library__get_final_target,%) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 124b009213b4..a09f720db995 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -33,7 +33,6 @@ # gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib # defined by platform # gb_StaticLibrary_FILENAMES -# gb_StaticLibrary_TARGETS # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 55300ad1a6d6..90ff07926ce2 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -67,11 +67,11 @@ gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1) define gb_Library_get_target -$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES))) +$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_Library_FILENAMES))) endef define gb_StaticLibrary_get_target -$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES))) +$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index a8f76bffd204..9d521c79c092 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -165,17 +165,20 @@ endif include $(GBUILDDIR)/Helper.mk include $(GBUILDDIR)/TargetLocations.mk +include $(GBUILDDIR)/Tempfile.mk $(eval $(call gb_Helper_init_registries)) include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk -$(eval $(call gb_Helper_collect_libtargets)) +$(eval $(call gb_Helper_collect_knownlibs)) gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk +include $(SRCDIR)/RepositoryFixes.mk + ifeq ($(CROSS_COMPILING),YES) # We can safely Assume all cross-compilation is from Unix systems. gb_Executable_EXT_for_build := @@ -229,12 +232,6 @@ else gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) endif -include $(GBUILDDIR)/Tempfile.mk - -include $(SRCDIR)/RepositoryFixes.mk - -$(eval $(call gb_Helper_collect_knownlibs)) - # add user-supplied flags ifneq ($(strip gb__ENV_CFLAGS),) gb_LinkTarget_CFLAGS += $(gb__ENV_CFLAGS) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 600fa43b57c7..f6cae6ad5f4f 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -417,7 +417,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ gb_Library_FILENAMES :=\ - $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ + $(foreach lib,$(gb_Library_KNOWNLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ gb_Library_DLLEXT := .dll gb_Library_MAJORVER := 3 -- cgit From 1a8428a17ec9f5735014c8ab32a45b1c853e94cd Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sat, 29 Sep 2012 18:47:40 +0200 Subject: move gb_Executable_EXT_for_build to platform/ Change-Id: Ica30efee4fcd030dcc063321ba678a00bec726cd --- solenv/gbuild/AllLangResTarget.mk | 2 +- solenv/gbuild/gbuild.mk | 7 ------- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 + solenv/gbuild/platform/com_GCC_defs.mk | 4 ++++ solenv/gbuild/platform/solaris.mk | 2 -- solenv/gbuild/platform/unxgcc.mk | 2 -- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 1ee345689f22..afa8027abdc0 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -77,7 +77,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) # defined by platform # gb_SrsPartTarget__command_dep -gb_ResTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc$(gb_Executable_EXT_for_build) +gb_ResTarget_RSCTARGET := $(call gb_Executable_get_target_for_build,rsc) gb_ResTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_ResTarget_RSCTARGET) define gb_SrsPartTarget__command diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9d521c79c092..395c9669f808 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -179,13 +179,6 @@ include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk include $(SRCDIR)/RepositoryFixes.mk -ifeq ($(CROSS_COMPILING),YES) -# We can safely Assume all cross-compilation is from Unix systems. -gb_Executable_EXT_for_build := -else -gb_Executable_EXT_for_build := $(gb_Executable_EXT) -endif - # Set up build tools that can be either internal or system. It is # necessary to do it before we start including gbuild class makefiles, # so the classes can add dependencies on them. diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index f6cae6ad5f4f..a232b661eb93 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -521,6 +521,7 @@ endef # Executable class gb_Executable_EXT := .exe +gb_Executable_EXT_for_build := .exe gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS) gb_Executable_get_rpath := diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index e03aa88a926e..0cc86e3c73d2 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -149,6 +149,10 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) +# Executable class + +gb_Executable_EXT_for_build := + # Helper class ifeq ($(OS_FOR_BUILD),MACOSX) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 4b26f028fca9..47c12d2c1292 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -26,8 +26,6 @@ # #************************************************************************* -gb_Executable_EXT:= - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_MKTEMP := mktemp -t gbuild.XXXXXX diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0957e4a3d71b..d996bd46107d 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -26,8 +26,6 @@ # #************************************************************************* -gb_Executable_EXT:= - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }') -- cgit From d1a8bdba34d0f18867a9d1700101239a29fa0080 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sat, 29 Sep 2012 19:21:05 +0200 Subject: vertical space savings Change-Id: I8f73a804e2005108f4a47d9fe4f9cd4425787cb1 --- solenv/gbuild/Helper.mk | 4 +++ solenv/gbuild/gbuild.mk | 83 ++++++++++++++----------------------------------- 2 files changed, 28 insertions(+), 59 deletions(-) diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 9817ef2923eb..e1e5119b07ce 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -176,6 +176,10 @@ gb_Jar_$(1) += $(2) endef +define gb_Helper_define_if_set +$(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def))) +endef + define gb_Helper_execute $(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 395c9669f808..b50faa02f5f7 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -245,12 +245,10 @@ gb_GLOBALDEFS := \ ifeq ($(gb_PRODUCT),$(false)) -gb_GLOBALDEFS += \ - -DDBG_UTIL \ +gb_GLOBALDEFS += -DDBG_UTIL \ ifneq ($(COM),MSC) -gb_GLOBALDEFS += \ - -D_DEBUG \ +gb_GLOBALDEFS += -D_DEBUG \ endif endif @@ -260,80 +258,47 @@ gb_GLOBALDEFS += -DSOLAR_JAVA endif ifeq ($(gb_TIMELOG),1) -gb_GLOBALDEFS += \ - -DTIMELOG \ +gb_GLOBALDEFS += -DTIMELOG \ endif ifeq ($(gb_DEBUGLEVEL),0) -gb_GLOBALDEFS += \ - -DOPTIMIZE \ +gb_GLOBALDEFS += -DOPTIMIZE \ ifeq ($(strip $(ASSERT_ALWAYS_ABORT)),FALSE) -gb_GLOBALDEFS += \ - -DNDEBUG \ +gb_GLOBALDEFS += -DNDEBUG \ endif else -gb_GLOBALDEFS += \ - -DSAL_LOG_INFO \ - -DSAL_LOG_WARN \ +gb_GLOBALDEFS += -DSAL_LOG_INFO \ + -DSAL_LOG_WARN \ ifneq ($(gb_DEBUGLEVEL),1) # 2 or more -gb_GLOBALDEFS += \ - -DDEBUG \ - -endif -endif - -ifneq ($(strip $(ENABLE_GTK)),) -gb_GLOBALDEFS += -DENABLE_GTK -endif - -ifneq ($(strip $(ENABLE_TDE)),) -gb_GLOBALDEFS += -DENABLE_TDE -endif +gb_GLOBALDEFS += -DDEBUG \ -ifneq ($(strip $(ENABLE_KDE)),) -gb_GLOBALDEFS += -DENABLE_KDE endif - -ifneq ($(strip $(ENABLE_KDE4)),) -gb_GLOBALDEFS += -DENABLE_KDE4 -endif - -ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE) -gb_GLOBALDEFS += -DENABLE_GRAPHITE -endif - -ifeq ($(strip $(ENABLE_HEADLESS)),TRUE) -gb_GLOBALDEFS += -DLIBO_HEADLESS -endif - -ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE) -gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY endif -ifeq ($(strip $(DISABLE_EXTENSIONS)),TRUE) -gb_GLOBALDEFS += -DDISABLE_EXTENSIONS -endif - -ifeq ($(strip $(DISABLE_SCRIPTING)),TRUE) -gb_GLOBALDEFS += -DDISABLE_SCRIPTING -endif +ifeq ($(ENABLE_HEADLESS),TRUE) +gb_GLOBALDEFS += -DLIBO_HEADLESS \ -ifeq ($(strip $(DISABLE_DYNLOADING)),TRUE) -gb_GLOBALDEFS += -DDISABLE_DYNLOADING endif -ifeq ($(HAVE_THREADSAFE_STATICS),TRUE) -gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS -endif - -ifeq ($(ENABLE_TELEPATHY),TRUE) -gb_GLOBALDEFS += -DENABLE_TELEPATHY -endif +gb_GLOBALDEFS += \ + $(call gb_Helper_define_if_set,\ + DISABLE_DBCONNECTIVITY \ + DISABLE_DYNLOADING \ + DISABLE_EXTENSIONS \ + DISABLE_SCRIPTING \ + ENABLE_GRAPHITE \ + ENABLE_GTK \ + ENABLE_KDE \ + ENABLE_KDE4 \ + ENABLE_TDE \ + ENABLE_TELEPATHY \ + HAVE_THREADSAFE_STATICS \ + ) gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) -- cgit From 3b5f672bee129c3e5feb61189dae033cd7d4b881 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sat, 29 Sep 2012 19:54:00 +0200 Subject: Revert "gb_PYTHON_PRECOMMAND is only defined after gb_PYTHON" This reverts commit 34061bf6d4fe8b80f46a97b8fbeddc18247e8bf7. gb_PYTHON was moved again in dec68c6684298cbcb793651f1221f842efd794e3. --- solenv/gbuild/gbuild.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b50faa02f5f7..a83bd305b2db 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -216,7 +216,7 @@ else ifeq ($(DISABLE_PYTHON),TRUE) gb_PYTHON := python else gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) -gb_PYTHON = $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) +gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) endif ifneq (,$(SYSTEM_UCPP)) -- cgit From 5f975a59e2e7105e9b7b2629212887c53d914a3c Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Sat, 29 Sep 2012 20:09:42 +0200 Subject: fdo #50343: Fixed crash on xlsx import of file with array formula Follow-up of 7fff98724bc7e3. Buffer only cell formula values via setCellFormulaValue. Otherwise we get crash in FormulaBuffer::applyCellFormulaValues() as array/shared/datatable formulas are treated differently Change-Id: Ie344b273ec662e8af1bf9fa54e79614393634974 --- sc/source/filter/oox/sheetdatacontext.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index 7ca86d7adc93..c7db69c0e506 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -184,7 +184,13 @@ void SheetDataContext::onEndElement() case XML_normal: setCellFormula( maCellData.maCellAddr, maFormulaStr ); mrSheetData.setCellFormat( maCellData ); + + // If a number cell has some preloaded value, stick it into the buffer + // but do this only for real cell formulas (not array, shared etc.) + if( !( maCellValue.isEmpty() ) && ( maCellData.mnCellType == XML_n ) ) + setCellFormulaValue( maCellData.maCellAddr, maCellValue.toDouble() ); break; + case XML_shared: if( maFmlaData.mnSharedId >= 0 ) { @@ -249,13 +255,6 @@ void SheetDataContext::onEndElement() mrSheetData.setBlankCell( maCellData ); } } - else if( !maCellValue.isEmpty() ) switch( maCellData.mnCellType ) - { - case XML_n: - /* Set the pre-loaded value */ - setCellFormulaValue( maCellData.maCellAddr, maCellValue.toDouble() ); - break; - } } } -- cgit From f4952afb494fc27133f9e79c2d3bc7115043a190 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 29 Sep 2012 22:09:39 +0200 Subject: introduce some new top level targets Change-Id: I3ac81132e21710a2c1d974944a5bcd612d796ec6 --- Makefile.top | 6 ++++++ solenv/gbuild/Module.mk | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.top b/Makefile.top index 2fb2a7c5d1c4..8fd5620aa9d9 100644 --- a/Makefile.top +++ b/Makefile.top @@ -421,6 +421,9 @@ ifeq ($(OS),ANDROID) cd android && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) endif +build-nocheck : export SKIP_TESTS := YES +build-nocheck : build + cross-toolset: bootstrap fetch cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) @@ -460,6 +463,9 @@ endif endif @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install +dev-install-nocheck : export SKIP_TESTS := YES +dev-install-nocheck : dev-install + install-tb: @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index ae75d1de8a90..17fc857e81dc 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -175,7 +175,7 @@ clean : check : unitcheck slowcheck $(call gb_Output_announce_title,all tests checked.) $(call gb_Output_announce_bell) - + debugrun : $(call gb_Module_DEBUGRUNCOMMAND) @@ -236,7 +236,7 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -ifeq ($(strip $(NOCPPUNIT)),) +ifeq ($(strip $(SKIP_TESTS)),) define gb_Module_add_check_target $(call gb_Module__read_targetfile,$(1),$(2),check target) @@ -244,7 +244,6 @@ $(call gb_Module_get_check_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -endif # NOCPPUNIT define gb_Module_add_slowcheck_target $(call gb_Module__read_targetfile,$(1),$(2),slowcheck target) @@ -253,6 +252,7 @@ $(call gb_Module_get_slowcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef +endif # SKIP_TESTS define gb_Module_add_subsequentcheck_target $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target) -- cgit From 4b87379e5fa503462ea863df993121b05b1abcde Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 29 Sep 2012 22:16:41 +0200 Subject: remove superfluous linkoo output Change-Id: I09a14fd50cf69cec8693b7058d105ee5f2998e02 --- solenv/bin/linkoo | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index ae9794409005..c6e6a2b040b8 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -446,8 +446,6 @@ if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") { evilness ('do'); -print "\nlinkoo finished"; -print ", please don't forget to source ooenv before ./soffice." if (!$windows); -print "\n"; +print "\nlinkoo finished\n"; # vim:set shiftwidth=4 softtabstop=4 expandtab: -- cgit From 28f669c72fe0e5ff3c2609f5019391c3e097ba69 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Sun, 30 Sep 2012 08:35:03 +0200 Subject: fdo#31405 CommandType is a LONG, so use a sal_Int32 to retrieve it Else, operator>>= flat out refuses to extract it, even though the particular value in this particular call would fit. Also OSL_VERIFY the result of >>= (instead of ignoring it) to facilitate future detection of similar problem Change-Id: I859c38c3589dc9e9ef5bdd882663aa3386a43237 --- sw/source/ui/dbui/dbmgr.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 563f888a7e8d..f8824aea4db8 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2381,13 +2381,13 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, rtl::OUString sDataSource, sDataTableOrQuery; Sequence aSelection; - sal_Int16 nCmdType = CommandType::TABLE; + sal_Int32 nCmdType = CommandType::TABLE; uno::Reference< XConnection> xConnection; ODataAccessDescriptor aDescriptor(rProperties); sDataSource = aDescriptor.getDataSource(); - aDescriptor[daCommand] >>= sDataTableOrQuery; - aDescriptor[daCommandType] >>= nCmdType; + OSL_VERIFY(aDescriptor[daCommand] >>= sDataTableOrQuery); + OSL_VERIFY(aDescriptor[daCommandType] >>= nCmdType); if ( aDescriptor.has(daSelection) ) aDescriptor[daSelection] >>= aSelection; -- cgit From b8274cbc36a28ba7e0e3750c3c2c7c63d2bd2de3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 13:21:35 +0200 Subject: gettext depends on sal... Change-Id: Iec26cfb2f6715b12bed290d72e3a013d6a980544 --- Module_cross_tail_build.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index e15848ba47ad..429891b89b46 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -73,7 +73,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ remotebridges \ ridljar \ rsc \ - sal \ salhelper \ sax \ shell \ @@ -93,9 +92,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ unotest \ unotools \ ure \ - $(if $(filter NATIVE,$(BUILD_TYPE)),\ - xml2cmp \ - ) \ xmlhelp \ xmlreader \ )) -- cgit From 6976fc91256bdf6224ddfab46c535f319ac8475c Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sun, 30 Sep 2012 14:10:17 +0200 Subject: soltools: build again ldump4 for Windows Change-Id: I8f1f5756ac777cefed52ae72af65931bfa14d580 --- Repository.mk | 1 + soltools/Executable_ldump4.mk | 17 +++++++++++++++++ soltools/Module_soltools.mk | 1 + 3 files changed, 19 insertions(+) create mode 100644 soltools/Executable_ldump4.mk diff --git a/Repository.mk b/Repository.mk index 933662fa76e0..c273b459d494 100644 --- a/Repository.mk +++ b/Repository.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ helpex \ idxdict \ javadepend \ + ldump4 \ lngconvex \ localize \ makedepend \ diff --git a/soltools/Executable_ldump4.mk b/soltools/Executable_ldump4.mk new file mode 100644 index 000000000000..d104d6f76487 --- /dev/null +++ b/soltools/Executable_ldump4.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,ldump4)) + +$(eval $(call gb_Executable_add_exception_objects,ldump4,\ + soltools/ldump/hashtbl \ + soltools/ldump/ldump \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index 047e4c07e7f8..93f2aac81cc5 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -32,6 +32,7 @@ endif # CROSS_COMPILING ifeq ($(GUI)$(COM),WNTMSC) $(eval $(call gb_Module_add_targets,soltools,\ + Executable_ldump4 \ Package_inc \ )) endif # WNTMSC -- cgit From 6c4bcd8aa1aaa7b6ecc684c2f302ca1706fb5102 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sun, 30 Sep 2012 14:58:08 +0200 Subject: soltools: remove unused files Change-Id: I534aab7da0b05dadc3415856e57362ead57380c0 --- soltools/giparser/gen_info.cxx | 79 ---- soltools/giparser/gi_list.cxx | 223 ----------- soltools/giparser/gi_parse.cxx | 387 ------------------- soltools/inc/gen_info.hxx | 82 ---- soltools/inc/gi_list.hxx | 208 ----------- soltools/inc/gi_parse.hxx | 158 -------- soltools/inc/gilacces.hxx | 97 ----- soltools/inc/simstr.hxx | 216 ----------- soltools/inc/st_list.hxx | 323 ---------------- soltools/javadep/makefile.mk | 48 --- soltools/support/simstr.cxx | 822 ----------------------------------------- soltools/testhxx/create.pl | 116 ------ soltools/testhxx/testhxx.cxx | 22 -- 13 files changed, 2781 deletions(-) delete mode 100644 soltools/giparser/gen_info.cxx delete mode 100644 soltools/giparser/gi_list.cxx delete mode 100644 soltools/giparser/gi_parse.cxx delete mode 100644 soltools/inc/gen_info.hxx delete mode 100644 soltools/inc/gi_list.hxx delete mode 100644 soltools/inc/gi_parse.hxx delete mode 100644 soltools/inc/gilacces.hxx delete mode 100644 soltools/inc/simstr.hxx delete mode 100644 soltools/inc/st_list.hxx delete mode 100644 soltools/javadep/makefile.mk delete mode 100644 soltools/support/simstr.cxx delete mode 100644 soltools/testhxx/create.pl delete mode 100644 soltools/testhxx/testhxx.cxx diff --git a/soltools/giparser/gen_info.cxx b/soltools/giparser/gen_info.cxx deleted file mode 100644 index 9cdd7e4f524c..000000000000 --- a/soltools/giparser/gen_info.cxx +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include - - -GenericInfo::GenericInfo( const Simstr & i_sKey, - const Simstr & i_sValue, - const Simstr & i_sComment ) - : sKey(i_sKey), - sValue(i_sValue), - sComment(i_sComment), - dpSubList(0) -{ -} - -GenericInfo::GenericInfo( const GenericInfo & i_rInfo ) - : sKey(i_rInfo.sKey), - sValue(i_rInfo.sValue), - sComment(i_rInfo.sComment), - dpSubList(0) -{ - if ( i_rInfo.HasSubList() ) - { - dpSubList = new List_GenericInfo(i_rInfo.SubList()); - } -} - -GenericInfo::~GenericInfo() -{ - if ( dpSubList != 0 ) - delete dpSubList; -} - -GenericInfo & -GenericInfo::operator=( const GenericInfo & i_rInfo ) -{ - sKey = i_rInfo.sKey; - sValue = i_rInfo.sValue; - sComment = i_rInfo.sComment; - - if ( dpSubList != 0 ) - delete dpSubList; - if ( i_rInfo.HasSubList() ) - { - dpSubList = new List_GenericInfo(i_rInfo.SubList()); - } - else - dpSubList = 0; - - return *this; -} - -List_GenericInfo & -GenericInfo::CreateMyList() const -{ - return * ( const_cast(*this).dpSubList = new List_GenericInfo); - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/gi_list.cxx b/soltools/giparser/gi_list.cxx deleted file mode 100644 index 903558e01f61..000000000000 --- a/soltools/giparser/gi_list.cxx +++ /dev/null @@ -1,223 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - - -#include - - - -const char C_cKeySeparator = '/'; - - -List_GenericInfo::List_GenericInfo() -{ -} - -List_GenericInfo::List_GenericInfo( const List_GenericInfo & i_rList ) - : aChildren(i_rList.aChildren) -{ -} - -List_GenericInfo::~List_GenericInfo() -{ -} - -List_GenericInfo & -List_GenericInfo::operator=( const List_GenericInfo & i_rList ) -{ - aChildren = i_rList.aChildren; - return *this; -} - -const GenericInfo * -List_GenericInfo::operator[]( KeyPath i_sKeyPath ) const -{ - return const_cast< List_GenericInfo& >(*this)[i_sKeyPath]; -} - -GenericInfo * -List_GenericInfo::operator[]( KeyPath i_sKeyPath ) -{ - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath); - - if ( bExists ) - { - if ( sNextPathSegment == 0 ) - return (*it); - else - return (*it)->SubList()[sNextPathSegment]; - } - else - { - return 0; - } -} - -bool -List_GenericInfo::InsertInfo( GenericInfo * let_dpInfo, - bool i_bOverwrite ) -{ - if ( let_dpInfo == 0 ) - return false; - - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, let_dpInfo->Key() ); - - if ( ! bExists ) - { - aChildren.insert( it, let_dpInfo ); - } - else if ( i_bOverwrite ) - { - delete (*it); - (*it) = let_dpInfo; - } - else - { - delete let_dpInfo; - return false; - } - - return true; -} - -bool -List_GenericInfo::InsertInfoByPath( GenericInfo * let_dpInfo, - KeyPath i_sKeyPath, - bool i_bCreatePath, - bool i_bOverwrite ) -{ - if ( let_dpInfo == 0 ) - return false; - - if ( i_sKeyPath == 0 ? true : *i_sKeyPath == 0 ) - return InsertInfo(let_dpInfo, i_bOverwrite); - - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath); - - if ( bExists ) - { - return (*it)->SubList().InsertInfoByPath( - let_dpInfo, - sNextPathSegment, - i_bCreatePath, - i_bOverwrite ); - } - else if ( i_bCreatePath ) - { - Simstr aKey( i_sKeyPath, - 0, - (int)(sNextPathSegment - - ( *sNextPathSegment == 0 ? 0 : 1) - - i_sKeyPath )); - - GenericInfo * pNew = new GenericInfo(aKey); - InsertInfo(pNew,false); - - return pNew->SubList().InsertInfoByPath( - let_dpInfo, - sNextPathSegment, - i_bCreatePath, - i_bOverwrite ); - } - else - { - delete let_dpInfo; - return false; - } -} - -GenericInfo * -List_GenericInfo::ReleaseInfo( KeyPath i_sKeyPath ) -{ - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath ); - - if ( bExists ) - { - if ( *sNextPathSegment == 0 ) - return (*it); - else - return (*it)->SubList().ReleaseInfo(sNextPathSegment); - } - else - { - return 0; - } -} - -void -List_GenericInfo::DeleteInfo( KeyPath i_sKeyPath ) -{ - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath ); - - if ( bExists ) - { - if ( *sNextPathSegment == 0 ) - { - aChildren.remove(it); - } - else - { - (*it)->SubList().DeleteInfo(sNextPathSegment); - } - } -} - -List_GenericInfo::sub_iterator -List_GenericInfo::lower_bound( bool & o_bExists, - const char * & o_sNextPathSegment, - KeyPath i_sKeyPath ) -{ - o_sNextPathSegment = strchr(i_sKeyPath, '/'); - Simstr sKey( i_sKeyPath, (int)(o_sNextPathSegment == 0 ? strlen(i_sKeyPath) : o_sNextPathSegment++ - i_sKeyPath) ); - GenericInfo aSearch(sKey); - - unsigned low = 0; - unsigned high = aChildren.size(); - - for ( unsigned cur = high / 2; high > low; cur = (low + high) / 2 ) - { - if ( *aChildren[cur] < aSearch ) - { - low = cur+1; - } - else - { - high = cur; - } - } // end for - - o_bExists = low < aChildren.size() - ? !(aSearch < *aChildren[low] ) - : false; - return &aChildren[low]; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx deleted file mode 100644 index e1c7cb8d2c09..000000000000 --- a/soltools/giparser/gi_parse.cxx +++ /dev/null @@ -1,387 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include - -#include -#include -#include -#include - - -using namespace std; - - -const char * C_sLineEnd = "\r\n"; - - - -inline void -WriteStr( ostream & o_rOut, const Simstr & i_rStr ) -{ - o_rOut.write( i_rStr.str(), i_rStr.l() ); -} - -inline void -WriteStr( ostream & o_rOut, const char * i_rStr ) -{ - o_rOut.write( i_rStr, strlen(i_rStr) ); -} - -inline void -GenericInfo_Parser::SetError( E_Error i_eError ) -{ - eErrorCode = i_eError; - nErrorLine = nCurLine; -} - - -GenericInfo_Parser::GenericInfo_Parser() - : sCurParsePosition(""), - nCurLine(0), - nLevel(0), - bGoon(false), - eErrorCode(ok), - nErrorLine(0), - pResult(0), - pResource(0) -{ -} - -GenericInfo_Parser::~GenericInfo_Parser() -{ -} - -bool -GenericInfo_Parser::LoadList( GenericInfoList_Builder & o_rResult, - const Simstr & i_sSourceFileName ) -{ - ifstream aFile( i_sSourceFileName.str() ); - if ( aFile.fail() ) - { - SetError(cannot_open); - return false; - } - - aFile.seekg(0, ios::end); - UINT32 nTextSize = aFile.tellg(); - if ( nTextSize == 0 || nTextSize == UINT32(-1) ) - return true; - dpBuffer = new char[nTextSize+2]; - - aFile.seekg(0); - aFile.read( dpBuffer, nTextSize ); - aFile.close(); - - sFilePtr = dpBuffer; - char * sLastChar = dpBuffer + nTextSize - 1; - - while ( sFilePtr != sLastChar && *sFilePtr <= 32 ) - ++sCurParsePosition; - if ( sFilePtr == sLastChar ) - { - if ( *sFilePtr <= 32 ) - return true; - } - else while ( *sLastChar <= 32 ) - { - --sLastChar; - } - - *(sLastChar+1) = '\n'; - *(sLastChar+2) = '\0'; - - ResetState(o_rResult); - - for ( ReadLine(); bGoon; ReadLine() ) - { - bool bOk = InterpretLine(); - if ( !bOk) - { - SetError(syntax_error); - break; - } - } - - if ( nLevel > 0 && eErrorCode == ok) - { - SetError(unexpected_eof); - } - else if ( nLevel < 0 ) - { - SetError(unexpected_list_end); - } - - delete [] dpBuffer; - dpBuffer = 0; - sFilePtr = 0; - - return eErrorCode == ok; -} - -bool -GenericInfo_Parser::SaveList( const Simstr & i_rOutputFile, - GenericInfoList_Browser & io_rListBrowser ) -{ - ofstream aFile( i_rOutputFile.str() ); - if ( aFile.fail() ) - { - SetError(cannot_open); - return false; - } - - ResetState(io_rListBrowser); - - WriteList(aFile); - - aFile.close(); - return eErrorCode == ok; -} - -void -GenericInfo_Parser::ResetState( GenericInfoList_Builder & io_rResult ) -{ - sCurParsePosition = ""; - nCurLine = 0; - nLevel = 0; - bGoon = true; - sCurComment = ""; - eErrorCode = ok; - nErrorLine = 0; - pResult = &io_rResult; - pResource = 0; -} - -void -GenericInfo_Parser::ResetState( GenericInfoList_Browser & io_rSrc ) -{ - sCurParsePosition = ""; - nCurLine = 0; - nLevel = 0; - bGoon = false; - sCurComment = ""; - eErrorCode = ok; - nErrorLine = 0; - pResult = 0; - pResource = &io_rSrc; -} - - -void -GenericInfo_Parser::ReadLine() -{ - if ( *sFilePtr == '\0' ) // See initialising of dpBuffer and sLastChar in LoadList(). - { - bGoon = false; - return; - } - - sCurParsePosition = sFilePtr; - while ( *sFilePtr != '\n' ) - ++sFilePtr; - nCurLine++; - - // Remove leading and trailing whitespace from line: - while ( sCurParsePosition != sFilePtr && *sCurParsePosition <= 32 ) - ++sCurParsePosition; - - char * sEndOfLine = sFilePtr; - while ( sEndOfLine != sCurParsePosition && *sEndOfLine <= 32 ) - --sEndOfLine; - if ( sCurParsePosition != sEndOfLine || *sCurParsePosition > 32 ) - ++sEndOfLine; - *sEndOfLine = '\0'; - - ++sFilePtr; // Go beyond line end to first character of next line. -} - -bool -GenericInfo_Parser::InterpretLine() -{ - switch ( ClassifyLine() ) - { - case lt_key: ReadKey(); - break; - case lt_open_list: PushLevel_Read(); - break; - case lt_close_list: PopLevel_Read(); - break; - case lt_comment: AddCurLine2CurComment(); - break; - case lt_empty: AddCurLine2CurComment(); - break; - default: - return false; - } - return true; -} - -GenericInfo_Parser::E_LineType -GenericInfo_Parser::ClassifyLine() -{ - switch ( *sCurParsePosition ) - { - case '{': return lt_open_list; - case '}': return lt_close_list; - case '#': return lt_comment; - case '\0': return lt_empty; - } - - return lt_key; -} - -void -GenericInfo_Parser::ReadKey() -{ - const char * pSearch = sCurParsePosition; - - for ( ; *pSearch > 32; ++pSearch ) ; - UINT32 nKeyLength = pSearch - sCurParsePosition; - - for ( ; *pSearch <= 32 && *pSearch > '\0'; ++pSearch ) ; - - pResult->AddKey( sCurParsePosition, nKeyLength, - pSearch, strlen(pSearch), - sCurComment.str(), sCurComment.l() - ); - sCurComment = ""; -} - -void -GenericInfo_Parser::PushLevel_Read() -{ - nLevel++; - pResult->OpenList(); -} - -void -GenericInfo_Parser::PopLevel_Read() -{ - nLevel--; - pResult->CloseList(); -} - -void -GenericInfo_Parser::AddCurLine2CurComment() -{ - sCurComment += sCurParsePosition; - sCurComment += C_sLineEnd; -} - -void -GenericInfo_Parser::WriteList( ostream & o_rFile ) -{ - static char sBuffer[32000]; - - for ( bGoon = pResource->Start_CurList(); - bGoon; - bGoon = pResource->NextOf_CurList() ) - { - pResource->Get_CurComment(&sBuffer[0]); - WriteComment(o_rFile,sBuffer); - - pResource->Get_CurKey(&sBuffer[0]); - WriteKey(o_rFile,sBuffer); - - pResource->Get_CurValue(&sBuffer[0]); - WriteValue(o_rFile,sBuffer); - - if ( pResource->HasSubList_CurKey() ) - { - PushLevel_Write(); - - WriteList(o_rFile); - - PopLevel_Write(); - } - } // end for -} - -void -GenericInfo_Parser::PushLevel_Write() -{ - nLevel++; - pResource->Push_CurList(); -} - -void -GenericInfo_Parser::PopLevel_Write() -{ - nLevel--; - pResource->Pop_CurList(); -} - -void -GenericInfo_Parser::WriteComment( ostream & o_rFile, - const char * i_sStr ) -{ - WriteStr( o_rFile, i_sStr ); - if ( i_sStr[ strlen(i_sStr)-1 ] != '\n' ) - WriteStr( o_rFile, C_sLineEnd ); -} - -void -GenericInfo_Parser::WriteKey( ostream & o_rFile, - const char * i_sStr ) -{ - WriteIndentation(o_rFile); - WriteStr( o_rFile, i_sStr ); -} - -void -GenericInfo_Parser::WriteValue( ostream & o_rFile, - const char * i_sStr ) -{ - if ( i_sStr != 0 ? strlen(i_sStr) > 0 : false ) - { - WriteStr(o_rFile," "); - WriteStr(o_rFile,i_sStr); - } - - WriteStr(o_rFile,C_sLineEnd); -} - -void -GenericInfo_Parser::WriteIndentation( ostream & o_rFile ) -{ - const int nIndentBound = 60; - - static const char sIndentation[nIndentBound+1] = - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; - - if ( nLevel == 0 ) - return; - - if ( nLevel <= nIndentBound ) - o_rFile.write( sIndentation, nLevel ); - else - { - INT16 iLevel = nLevel; - for ( ; iLevel > nIndentBound; iLevel-=nIndentBound ) - o_rFile.write( sIndentation, nIndentBound ); - o_rFile.write( sIndentation, iLevel ); - } -} - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gen_info.hxx b/soltools/inc/gen_info.hxx deleted file mode 100644 index 63ec62e63cb0..000000000000 --- a/soltools/inc/gen_info.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef GEN_INFO_HXX -#define GEN_INFO_HXX - - -#include "simstr.hxx" -#include - - - -class List_GenericInfo; - - -/** Holds generic informations in a simple hierarchical format. -*/ -class GenericInfo -{ - public: - // LIFECFYCLE - GenericInfo( - const Simstr & i_sKey, - const Simstr & i_sValue = Simstr::null_(), - const Simstr & i_sComment = Simstr::null_() ); - GenericInfo( - const GenericInfo & i_rInfo ); - ~GenericInfo(); - - // OPERATORS - GenericInfo & operator=( - const GenericInfo & i_rInfo ); - bool operator<( - const GenericInfo & i_rInfo ) const -#ifdef UNX - { return strcasecmp(sKey.str(),i_rInfo.sKey.str()) < 0; } -#else - { return stricmp(sKey.str(),i_rInfo.sKey.str()) < 0; } -#endif - // INFO - const Simstr & Key() const { return sKey; } - const Simstr & Value() const { return sValue; } - const Simstr & Comment() const { return sComment; } - bool HasSubList() const { return dpSubList != 0; } - - const List_GenericInfo & - SubList() const { return HasSubList() ? *dpSubList : CreateMyList(); } - // ACCESS - List_GenericInfo & - SubList() { return HasSubList() ? *dpSubList : CreateMyList(); } - - private: - /// @precond dpSubList == 0 . - List_GenericInfo & CreateMyList() const; - - // DATA - Simstr sKey; - Simstr sValue; - Simstr sComment; - List_GenericInfo * dpSubList; /// Owned by this object. -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gi_list.hxx b/soltools/inc/gi_list.hxx deleted file mode 100644 index ec831a5f8018..000000000000 --- a/soltools/inc/gi_list.hxx +++ /dev/null @@ -1,208 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SOLTOOLS_GI_LIST_HXX -#define SOLTOOLS_GI_LIST_HXX - - -#include "st_list.hxx" - - -class GenericInfo; - -/** Holds set of generic informations in a sorted list. - - At different places, methods of this class have a parameter, - whose name includes "path". Those are paths like this: - - src370/drives/o: - - which are used to access GenericInfo keys in deep search through - the lists and their sublists. -*/ -class List_GenericInfo -{ - public: - // TYPES - class const_iterator - { - public: - const GenericInfo & operator*() const; - const_iterator & operator++(); - bool operator==( const const_iterator & ) const; - bool operator!=( const const_iterator & ) const; - - const_iterator(); - const_iterator( const DynamicList< GenericInfo >::const_iterator & ); - private: DynamicList< GenericInfo >::const_iterator it; - }; - class iterator - { public: - GenericInfo & operator*() const; - iterator & operator++(); - bool operator==( const iterator & ) const; - bool operator!=( const iterator & ) const; - - iterator(); - iterator( const DynamicList< GenericInfo >::iterator & ); - private: DynamicList< GenericInfo >::iterator it; - }; - - typedef const char * KeyPath; - - // LIFECYCLE - List_GenericInfo(); - List_GenericInfo( - const List_GenericInfo & - i_rList ); - ~List_GenericInfo(); - - // OPERATORS - List_GenericInfo & operator=( - const List_GenericInfo & - i_rList ); - const GenericInfo * operator[]( - KeyPath i_sKeyPath ) const; - GenericInfo * operator[]( - KeyPath i_sKeyPath ); - - // OPERATIONS - bool InsertInfo( - GenericInfo * let_dpInfo, /// Will be owned by this object. - bool i_bOverwrite = true ); - bool InsertInfoByPath( - GenericInfo * let_dpInfo, /// Will be owned by this object. - KeyPath i_sKeyPath, - bool i_bCreatePath, - bool i_bOverwrite = true ); - - GenericInfo * ReleaseInfo( /// Removes the GenericInfo from its parent. - KeyPath i_sKeyPath ); - - void DeleteInfo( - KeyPath i_sKeyPath ); - - // INFO - unsigned Size() const; - - const_iterator Begin() const; - const_iterator End() const; - - // ACCESS - iterator Begin(); - iterator End(); - - private: - typedef DynamicList< GenericInfo >::iterator sub_iterator; - - sub_iterator lower_bound( - bool & o_bExists, - const char * & o_sNextPathSegment, - KeyPath i_sKeyPath ); - - DynamicList< GenericInfo > - aChildren; -}; - - -// IMPLEMENTATION - - -inline const GenericInfo & -List_GenericInfo:: -const_iterator::operator*() const - { return *(*it); } - -inline List_GenericInfo::const_iterator & -List_GenericInfo:: -const_iterator::operator++() - { ++it; return *this; } - -inline bool -List_GenericInfo:: -const_iterator::operator==( const const_iterator & i_rIter ) const - { return it == i_rIter.it; } - -inline bool -List_GenericInfo:: -const_iterator::operator!=( const const_iterator & i_rIter ) const - { return it != i_rIter.it; } - -inline List_GenericInfo:: -const_iterator::const_iterator() - : it(0) { } - -inline List_GenericInfo:: -const_iterator::const_iterator( const DynamicList< GenericInfo >::const_iterator & i_rDynListIter ) - : it(i_rDynListIter) { } - - -inline GenericInfo & -List_GenericInfo:: -iterator::operator*() const - { return *(*it); } - -inline List_GenericInfo::iterator & -List_GenericInfo:: -iterator::operator++() - { ++it; return *this; } - -inline bool -List_GenericInfo:: -iterator::operator==( const iterator & i_rIter ) const - { return it == i_rIter.it; } - -inline bool -List_GenericInfo:: -iterator::operator!=( const iterator & i_rIter ) const - { return it != i_rIter.it; } - -inline List_GenericInfo:: -iterator::iterator() - : it(0) { } - -inline List_GenericInfo:: -iterator::iterator( const DynamicList< GenericInfo >::iterator & i_rDynListIter ) - : it(i_rDynListIter) { } - -inline unsigned -List_GenericInfo::Size() const - { return aChildren.size(); } - -inline List_GenericInfo::const_iterator -List_GenericInfo::Begin() const - { return aChildren.begin(); } - -inline List_GenericInfo::const_iterator -List_GenericInfo::End() const - { return aChildren.end(); } - -inline List_GenericInfo::iterator -List_GenericInfo::Begin() - { return aChildren.begin(); } - -inline List_GenericInfo::iterator -List_GenericInfo::End() - { return aChildren.end(); } - - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gi_parse.hxx b/soltools/inc/gi_parse.hxx deleted file mode 100644 index 7d93769643ef..000000000000 --- a/soltools/inc/gi_parse.hxx +++ /dev/null @@ -1,158 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef SOLTOOLS_GI_PARSE_HXX -#define SOLTOOLS_GI_PARSE_HXX - -#include "simstr.hxx" -#include "gilacces.hxx" -#include - -class GenericInfoList_Builder; -class GenericInfoList_Browser; - -/** Reads generic information files into a simple structure in memory. - -Information files used by this parser have the following format: - -key [value] -{ - key [value] - key [value] - { - key [value] - ... - ... - } -} -key [value] -... -... - -*/ - - -class GenericInfo_Parser : public GenericInfoParseTypes -{ - public: - typedef unsigned long UINT32; - typedef short INT16; - - GenericInfo_Parser(); - ~GenericInfo_Parser(); - - /** reads a information file and stores the data in a - List_GenericInfo - */ - bool LoadList( - GenericInfoList_Builder & - o_rResult, - const Simstr & i_sSourceFileName ); - - /** save the InformationList to rSourceFile - returns false on error - */ - bool SaveList( - const Simstr & i_rOutputFile, - GenericInfoList_Browser & - io_rListBrowser ); - - E_Error GetLastError( - UINT32 * o_pErrorLine = 0 ) const; - - private: - enum E_LineType - { - lt_empty = 0, - lt_key, - lt_open_list, - lt_close_list, - lt_comment - }; - - void SetError( - E_Error i_eError ); - void ResetState( - GenericInfoList_Builder & - io_rResult ); - void ResetState( - GenericInfoList_Browser & - io_rSrc ); - - void ReadLine(); - bool InterpretLine(); - E_LineType ClassifyLine(); - - void ReadKey(); - void PushLevel_Read(); /// When list is opened by '{': - void PopLevel_Read(); /// When list is closed by '}': - void AddCurLine2CurComment(); - - void WriteList( - std::ostream & o_rFile ); - - void PushLevel_Write(); /// When SubList is pushed in pResource - void PopLevel_Write(); /// When SubList is popped in pResource - - void WriteComment( - std::ostream & o_rFile, - const char * i_sStr ); - void WriteKey( - std::ostream & o_rFile, - const char * i_sStr ); - void WriteValue( - std::ostream & o_rFile, - const char * i_sStr ); - void WriteIndentation( - std::ostream & o_rFile ); - - // DATA - const char * sCurParsePosition; - - UINT32 nCurLine; - INT16 nLevel; - bool bGoon; - - Simstr sCurComment; - - E_Error eErrorCode; - UINT32 nErrorLine; - - GenericInfoList_Builder * - pResult; - GenericInfoList_Browser * - pResource; - - char * dpBuffer; - char * sFilePtr; -}; - - -inline GenericInfo_Parser::E_Error -GenericInfo_Parser::GetLastError( UINT32 * o_pErrorLine ) const -{ - if ( o_pErrorLine != 0 ) - *o_pErrorLine = nErrorLine; - return eErrorCode; -} - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gilacces.hxx b/soltools/inc/gilacces.hxx deleted file mode 100644 index c892591399d1..000000000000 --- a/soltools/inc/gilacces.hxx +++ /dev/null @@ -1,97 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SOLTOOLS_GILACCES_HXX -#define SOLTOOLS_GILACCES_HXX - - - -class GenericInfoParseTypes -{ - public: - enum E_Error - { - ok = 0, - cannot_open, - unexpected_eof, - syntax_error, - unexpected_list_end - }; -}; - - - -/** This class is an abstract interface for a service, which - builds a memory structure out of a generic information - structure, read from a file or other stream. - - There may be different implementations, which build different kinds - of memory structures. -*/ -class GenericInfoList_Builder -{ - public: - typedef unsigned long UINT32; - - virtual ~GenericInfoList_Builder() {} - - virtual void AddKey( - const char * i_sKey, - UINT32 i_nKeyLength, - const char * i_sValue, - UINT32 i_nValueLength, - const char * i_sComment, - UINT32 i_nCommentLength ) = 0; - - virtual void OpenList() = 0; - virtual void CloseList() = 0; -}; - - -/** This class is an abstract interface for a service, which - returns the values of a generic information tree out of - a memory structure. - - There may be different implementations, which browse different - kinds of memory structures. -*/ -class GenericInfoList_Browser -{ - public: - virtual ~GenericInfoList_Browser() {} - - virtual bool Start_CurList() = 0; - virtual bool NextOf_CurList() = 0; - - virtual void Get_CurKey( - char * o_rKey ) const = 0; - virtual void Get_CurValue( - char * o_rValue ) const = 0; - virtual void Get_CurComment( - char * o_rComment ) const = 0; - virtual bool HasSubList_CurKey() const = 0; - - virtual void Push_CurList() = 0; - virtual void Pop_CurList() = 0; -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/simstr.hxx b/soltools/inc/simstr.hxx deleted file mode 100644 index 2b5c7e87fcce..000000000000 --- a/soltools/inc/simstr.hxx +++ /dev/null @@ -1,216 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SOLTOOLS_SIMSTR_HXX -#define SOLTOOLS_SIMSTR_HXX - - -class Simstr /// Simple string class. -{ -// INTERFACE - public: - // LIFECYCLE - Simstr( - const char * str = 0); - Simstr( /** Creates Simstr out of a copy of the first - 'nrOfBytes' bytes of 'anyBytes'. - Adds a '\0' at the end. */ - const char * anybytes, - int nrOfBytes); - Simstr( /** Creates Simstr out of a copy of the described bytes within 'anyBytes'. - Adds a '\0' at the end. */ - const char * anybytes, - int firstBytesPos, - int nrOfBytes ); - Simstr( /// Creates Simstr of 'anzahl' times 'c'. - char c, - int anzahl); - Simstr( - const Simstr & S); - ~Simstr(); - - - // OPERATORS - operator const char*() const; - - Simstr & operator=( - const Simstr & S ); - - Simstr operator+( - const Simstr & S ) const; - Simstr & operator+=( - const Simstr & S ); - Simstr & operator+=( - const char * s ); - - bool operator==( - const Simstr & S ) const; - bool operator!=( - const Simstr & S ) const; - bool operator<( - const Simstr & S ) const; - bool operator>( - const Simstr & S ) const; - bool operator<=( - const Simstr & S ) const; - bool operator>=( - const Simstr & S ) const; - // INFO - static const Simstr & - null_(); - - const char * str() const; - int l() const; // Length of string without '\0' at end. - char * s(); // ATTENTION !!! // Only to be used, when a function needs a 'char*' but - // nevertheless THAT WILL BE NOT CHANGED! - // Typecasts to 'const char*' are performed automatically. - char get( - int n) const; - char get_front() const; - char get_back() const; - Simstr get( - int startPos, - int anzahl ) const; - Simstr get_front( - int anzahl ) const; - Simstr get_back( - int anzahl ) const; - - int pos_first( - char c ) const; - int pos_first_after( - char c, - int startSearchPos ) const; - int pos_last( - char c ) const; - int pos_first( - const Simstr & S ) const; - int pos_last( - const Simstr & S ) const; - int count( - char c ) const; - bool is_empty() const; // Only true if object == "". - bool is_no_text() const; // String may contain spaces or tabs. - - Simstr get_first_token( - char c ) const; - Simstr get_last_token( - char c ) const; - - // ACCESS - char & ch( /** Reference to sz[n]. Allows change of this char. - !!! No safety, if n is out of the allowed range! */ - int n ); - - // OPERATIONS - void insert( - int pos, - char c ); - void push_front( - char c ); - void push_back( - char c ); - void insert( - int pos, - const Simstr & S ); - void push_front( - const Simstr & S ); - void push_back( - const Simstr & S ); - - void remove( - int pos, - int anzahl = 1 ); - void remove_trailing_blanks(); - void pop_front( - int anzahl = 1 ); - void pop_back( - int anzahl = 1 ); - void rem_back_from( - int removeStartPos ); - void remove_all( - char c ); - void remove_all( // Starts search left. - const Simstr & S ); - void strip( - char c ); // Removes all characters == c from front and back. - // c == ' ' removes also TABs !!! - void empty(); // Changes object to the value "". - - void replace( - int pos, - char c ); - void replace( - int startPos, - int anzahl, - const Simstr & S ); - void replace_all( - char oldCh, - char newCh ); - void replace_all( - const Simstr & oldS, - const Simstr & newS ); - void to_lower(); - - Simstr take_first_token( /// Token is removed from the Simstr. - char c ); - Simstr take_last_token( /// Token is removed from the Simstr. - char c ); - private: - // DATA - char * sz; - int len; -}; - -// Simstr - char* / char - concatenations -Simstr operator+(const char * str, const Simstr & S); -Simstr operator+(const Simstr & S, const char * str); -Simstr operator+(char c, const Simstr & S); -Simstr operator+(const Simstr & S, char c); - -// Simstr - char* - comparison operators -bool operator==(const Simstr & S, const char * str); -bool operator!=(const Simstr & S, const char * str); -bool operator<(const Simstr & S, const char * str); -bool operator>(const Simstr & S, const char * str); -bool operator<=(const Simstr & S, const char * str); -bool operator>=(const Simstr & S, const char * str); -bool operator==(const char * str, const Simstr & S); -bool operator!=(const char * str, const Simstr & S); -bool operator<(const char * str, const Simstr & S); -bool operator>(const char * str, const Simstr & S); -bool operator<=(const char * str, const Simstr & S); -bool operator>=(const char * str, const Simstr & S); - - -inline const char * -Simstr::str() const { return sz; } -inline char * -Simstr::s() { return sz; } -inline int -Simstr::l() const { return len; } -inline -Simstr::operator const char*() const { return sz; } -inline bool -Simstr::is_empty() const { return len == 0; } - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx deleted file mode 100644 index 88618dd5f418..000000000000 --- a/soltools/inc/st_list.hxx +++ /dev/null @@ -1,323 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SOLTOOLS_ST_LIST_HXX -#define SOLTOOLS_ST_LIST_HXX - -#include -#include -#include - -template -class ST_List /// Soltools-List. -{ - public : - typedef XX * iterator; - typedef const XX * const_iterator; - - // LIFECYCLE - ST_List(); - ST_List( - const ST_List & i_rList ); - virtual ~ST_List() { delete[] inhalt; } - - // OPERATORS - ST_List & operator=( - const ST_List & i_rList ); - - const XX & operator[]( - unsigned n) const - { return elem(n); } - XX & operator[]( - unsigned n) - { return elem(n); } - // OPERATIONS - void reserve( - unsigned i_nSize ) - { alloc(i_nSize,true); } - void insert( - iterator i_aPos, - const XX & elem_ ) - { Insert((unsigned)(i_aPos-begin()), elem_); } - virtual void Insert( - unsigned pos, - const XX & elem ); - void push_back( - const XX & elem_) - { Insert(size(),elem_); } - void remove( - iterator i_aPos ) - { Remove((int)(i_aPos-begin())); } - virtual void Remove( - unsigned pos ); - void pop_back() { Remove(size()-1); } - void erase_all() { while (size()) Remove(size()-1); } - - // INQUIRY - const_iterator begin() const { return &inhalt[0]; } - const_iterator end() const { return &inhalt[len]; } - - const XX & front() const { return elem(0); } - const XX & back() const { return elem(len-1); } - - unsigned size() const { return len; } - unsigned space() const { return allocated; } - bool is_valid_index( - unsigned n) const - { return n < len; } - // ACCESS - iterator begin() { return &inhalt[0]; } - iterator end() { return &inhalt[len]; } - - XX & front() { return elem(0); } - XX & back() { return elem(len-1); } - - protected: - void checkSize( - unsigned newLength); - void alloc( - unsigned newSpace, - bool re = false ); - - const XX & elem( - unsigned n ) const - { return inhalt[n]; } - XX & elem( - unsigned n ) - { return inhalt[n]; } - // DATA - XX * inhalt; - unsigned len; - unsigned allocated; -}; - - - -template -class DynamicList : public ST_List< XY* > -{ - public: - DynamicList(); - DynamicList( - const DynamicList & - i_rList ); - virtual ~DynamicList(); /// Deletes all member pointers - - DynamicList & operator=( - const DynamicList & - i_rList ); - - virtual void Insert( - unsigned pos, - XY * const & elem ); - virtual void Remove( - unsigned pos ); -}; - - - -template -ST_List::ST_List() - : inhalt(0), - len(0), - allocated(0) -{ - alloc(1); -} - -template -ST_List::ST_List( const ST_List & i_rList ) - : inhalt(0), - len(0), - allocated(0) -{ - alloc(i_rList.size()); - - for ( const_iterator it = i_rList.begin(); - it != i_rList.end(); - ++it ) - { - push_back(*it); - } -} - -template -ST_List & -ST_List::operator=( const ST_List & i_rList ) -{ - for ( const_iterator it = i_rList.begin(); - it != i_rList.end(); - ++it ) - { - push_back(*it); - } - return *this; -} - -template -void -ST_List::Insert(unsigned pos, const XX & elem_) -{ - if ( pos > len ) - return; - - checkSize(len+2); - for ( unsigned p = len; p > pos; --p) - { - inhalt[p] = inhalt[p-1]; - } - inhalt[pos] = elem_; - len++; -} - - -template -void -ST_List::Remove(unsigned pos) -{ - if ( pos >= len ) - return; - len--; - for ( unsigned p = pos; p < len; ++p) - { - inhalt[p] = inhalt[p+1]; - } -} - - -// Protected: -template -void -ST_List::checkSize(unsigned newLength) -{ - // neuen Platzbedarf pruefen: - unsigned newSpace = space(); - if (newLength >= newSpace) - { - if (!newSpace) - newSpace = 1; - const unsigned nBorder = 2000000000; - while(newLength >= newSpace) - { - if (newSpace < nBorder) - newSpace <<= 1; - else - { - std::cerr << "List becomes too big" << std::endl; - exit(1); - } - } - } - - // Veraenderung ?: - if (newSpace != space()) - alloc(newSpace,true); -} - -template -void -ST_List::alloc( unsigned newSpace, - bool re ) -{ - XX * pNew = new XX[newSpace]; - - if (inhalt != 0) - { - if (re) - { - for (unsigned i = 0; i < len; ++i) - { - pNew[i] = inhalt[i]; - } // end for - } - delete [] inhalt; - } - - inhalt = pNew; - allocated = newSpace; -} - - -template -DynamicList::DynamicList() -{ -} - -template -DynamicList::DynamicList( const DynamicList & i_rList ) - : ST_List< XY* >(i_rList) -{ - for ( typename DynamicList::iterator it = this->begin(); - it != DynamicList::end(); - ++it ) - { - // Copying the contents the pointers point at: - (*it) = new XY( *(*it) ); - } -} - -template -DynamicList::~DynamicList() -{ - this->erase_all(); -} - -template -DynamicList & -DynamicList::operator=( const DynamicList & i_rList ) -{ - for ( typename DynamicList::const_iterator it = i_rList.begin(); - it != i_rList.end(); - ++it ) - { - this->push_back( new XY(*(*it)) ); - } - return *this; -} - - -template -void -DynamicList::Insert(unsigned pos, XY * const & elem_) -{ - if ( pos > this->len ) - return; - - this->checkSize(DynamicList::len+2); - memmove( DynamicList::inhalt+pos+1, DynamicList::inhalt+pos, (DynamicList::len-pos) * sizeof(XY*) ); - this->inhalt[pos] = elem_; - this->len++; -} - -template -void -DynamicList::Remove( unsigned pos ) -{ - if (!this->is_valid_index(pos) ) - return; - this->len--; - delete DynamicList::inhalt[pos]; - memmove(DynamicList::inhalt+pos, DynamicList::inhalt+pos+1, (DynamicList::len-pos) * sizeof(XY*) ); -} - - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk deleted file mode 100644 index aefde1f0cccc..000000000000 --- a/soltools/javadep/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=javadep -TARGETTYPE=CUI -NO_DEFAULT_STL=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -UWINAPILIB=$(0) -LIBSALCPPRT=$(0) - -# --- Files -------------------------------------------------------- - -APP1TARGET = javadep -APP1OBJS = $(OBJ)$/javadep.obj -DEPOBJFILES = $(APP1OBJS) -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/soltools/support/simstr.cxx b/soltools/support/simstr.cxx deleted file mode 100644 index 54bbbe8a30e5..000000000000 --- a/soltools/support/simstr.cxx +++ /dev/null @@ -1,822 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -#include // strlen(), memcpy(), memset() -#include // tolower() -#include // INT_MAX - -const char NULCH = '\0'; -const int NO_POS = -1; - - -Simstr::Simstr(const char * s_) -{ - if (s_ == 0) - { - len = 0; - sz = new char[1]; - *sz = 0; - } - else - { - len = (int)strlen(s_); - sz = new char[len+1]; - memcpy(sz,s_,len+1); - } -} - -Simstr::Simstr(const char * anybytes, int nrOfBytes) -{ - if (anybytes == 0) - { - len = 0; - sz = new char[1]; - *sz = 0; - return; - } - - int slen = static_cast( strlen(anybytes) ); - - len = slen < nrOfBytes - ? slen - : nrOfBytes; - sz = new char[len+1]; - memcpy( sz, anybytes, len ); - *( sz + len ) = 0; -} - -Simstr::Simstr(char c, int anzahl) -{ - if (anzahl < 1) - { - len = 0; - sz = new char[1]; - *sz = 0; - } - else - { - len = anzahl; - sz = new char[len+1]; - memset(sz,c,anzahl); - sz[len] = 0; - } -} - -Simstr::Simstr( const char * anybytes, - int firstBytesPos, - int nrOfBytes) -{ - unsigned slen = (unsigned)strlen(anybytes); - if (anybytes == 0 || slen <= unsigned(firstBytesPos)) - { - len = 0; - sz = new char[1]; - *sz = 0; - } - else - { - int maxLen = slen - unsigned(firstBytesPos); - len = maxLen < nrOfBytes - ? maxLen - : nrOfBytes; - sz = new char[len+1]; - memcpy(sz,anybytes+firstBytesPos,len); - *(sz+len) = 0; - } -} - - -Simstr::Simstr(const Simstr & S) -{ - len = S.len; - sz = new char[len+1]; - memcpy(sz,S.sz,len+1); -} - -Simstr & Simstr::operator=(const Simstr & S) -{ - if (sz == S.sz) - return *this; - - delete [] sz; - - len = S.len; - sz = new char[len+1]; - memcpy(sz,S.sz,len+1); - - return *this; -} - -Simstr::~Simstr() -{ - delete [] sz; -} - -char & -Simstr::ch(int n) -{ - static char nullCh = NULCH; - nullCh = NULCH; - if (n >= long(len) || n < 0) - return nullCh; - else - return sz[unsigned(n)]; -} - -const Simstr & -Simstr::null_() -{ - static Simstr aNull_; - return aNull_; -} - - -Simstr -Simstr::operator+(const Simstr & S) const -{ - Simstr ret = sz; - ret.push_back(S); - return ret; -} - -Simstr & -Simstr::operator+=(const Simstr & S) -{ - push_back(S); - return *this; -} - -Simstr & -Simstr::operator+=(const char * s_) -{ - Simstr a(s_); - push_back(a); - return *this; -} - - -// REL - -bool -Simstr::operator==(const Simstr & S) const -{ return !strcmp(sz,S.sz) ? true : false; } - -bool -Simstr::operator!=(const Simstr & S) const -{ return strcmp(sz,S.sz) ? true : false; } - -bool -Simstr::operator<(const Simstr & S) const -{ return (strcmp(sz,S.sz) < 0) ? true : false; } - -bool -Simstr::operator>(const Simstr & S) const -{ return (strcmp(sz,S.sz) > 0) ? true : false; } - -bool -Simstr::operator<=(const Simstr & S) const -{ return (strcmp(sz,S.sz) <= 0) ? true : false; } - -bool -Simstr::operator>=(const Simstr & S) const -{ return (strcmp(sz,S.sz) >= 0) ? true : false; } - - - - -// ************** LIST - Funktionen ***************** - - -// Einzelzugriff - -char -Simstr::get(int n) const { return (n >= len || n < 0) ? 0 : sz[n]; } - -char -Simstr::get_front() const { return sz[0]; } - -char -Simstr::get_back() const { return len ? sz[len-1] : 0; } - -Simstr -Simstr::get(int startPos, int anzahl) const -{ - if (startPos >= len || startPos < 0 || anzahl < 1) - return ""; - - int anz = len - startPos < anzahl ? len - startPos : anzahl; - - Simstr ret(' ',anz); - memcpy(ret.sz, sz+startPos, anz); - return ret; -} - -Simstr -Simstr::get_front(int anzahl) const -{ - int anz = len < anzahl ? len : anzahl; - if (anz < 1) - return ""; - - Simstr ret(' ',anz); - memcpy(ret.sz, sz, anz); - return ret; -} - -Simstr -Simstr::get_back(int anzahl) const -{ - int anz = len < anzahl ? len : anzahl; - if (anz < 1) - return ""; - int start = len-anz; - - Simstr ret(' ',anz); - memcpy(ret.sz, sz+start, anz); - return ret; -} - -Simstr -Simstr::get_first_token(char c) const -{ - int posc = pos_first(c); - if (posc != NO_POS) - return get_front(posc); - else - return sz; -} - -Simstr -Simstr::get_last_token(char c) const -{ - int posc = pos_last(c); - if (posc != NO_POS) - return get_back(len-posc-1); - else - return sz; -} - - - -// Insert - -void -Simstr::insert(int pos, char c) -{ - if (pos < 0 || pos > len) - return; - - char * result = new char[len+2]; - - memcpy(result,sz,pos); - result[pos] = c; - memcpy(result+pos+1,sz+pos,len-pos+1); - - delete [] sz; - sz = result; - len++; -} - -void -Simstr::push_front(char c) -{ - char * result = new char[len+2]; - - result[0] = c; - memcpy(result+1,sz,len+1); - - delete [] sz; - sz = result; - len++; -} - -void -Simstr::push_back(char c) -{ - char * result = new char[len+2]; - - memcpy(result,sz,len); - result[len] = c; - result[len+1] = 0; - - delete [] sz; - sz = result; - len++; -} - -void -Simstr::insert(int pos, const Simstr & S) -{ - if (pos < 0 || pos > len) - return; - - char * result = new char[len+1+S.len]; - - memcpy(result,sz,pos); - memcpy(result+pos,S.sz,S.len); - memcpy(result+pos+S.len,sz+pos,len-pos+1); - - delete [] sz; - sz = result; - len += S.len; -} - -void -Simstr::push_front(const Simstr & S) -{ - char * result = new char[len+1+S.len]; - - memcpy(result,S.sz,S.len); - memcpy(result+S.len,sz,len+1); - - delete [] sz; - sz = result; - len += S.len; -} - -void -Simstr::push_back(const Simstr & S) -{ - char * result = new char[len+1+S.len]; - - memcpy(result,sz,len); - memcpy(result+len,S.sz,S.len+1); - - delete [] sz; - sz = result; - len += S.len; -} - - -// Remove - -void -Simstr::remove(int pos, int anzahl) -{ - if (pos >= len || pos < 0 || anzahl < 1) - return; - - int anz = len - pos < anzahl ? len - pos : anzahl; - - char * result = new char[len-anz+1]; - - memcpy(result,sz,pos); - memcpy(result+pos,sz+pos+anz,len-pos-anz+1); - - delete [] sz; - sz = result; - len -= anz; -} - -void -Simstr::remove_trailing_blanks() -{ - int newlen = len-1; - for ( ; newlen > 1 && sz[newlen] <= 32; --newlen ) {} - - if (newlen < len-1) - remove ( newlen+1, len-newlen); -} - -void -Simstr::pop_front(int anzahl) -{ - if (anzahl < 1) - return; - int anz = len < anzahl ? len : anzahl; - - char * result = new char[len-anz+1]; - - memcpy(result,sz+anz,len-anz+1); - - delete [] sz; - sz = result; - len -= anz; -} - -void -Simstr::pop_back(int anzahl) -{ - if (anzahl < 1) - return; - - int anz = len < anzahl ? len : anzahl; - - char * result = new char[len-anz+1]; - - memcpy(result,sz,len-anz); - result[len-anz] = 0; - - delete [] sz; - sz = result; - len -= anz; -} - -void -Simstr::rem_back_from(int removeStartPos) -{ - if (removeStartPos != NO_POS) - pop_back(len-removeStartPos); -} - -void -Simstr::remove_all(char c) -{ - if (!len) - return; - char * result = new char[len]; - int i,j=0; - for (i = 0; i < len; i++) - if (sz[i] != c) - result[j++] = sz[i]; - - delete [] sz; - sz = new char[j+1]; - memcpy(sz,result,j); - sz[j] = 0; - len = j; - delete [] result; -} - -void -Simstr::remove_all(const Simstr & S) -{ - int pos; - while ( (pos=pos_first(S)) != NO_POS ) - remove(pos,S.len); -} - -void -Simstr::strip(char c) -{ - int start = 0; - if (c == ' ') - { // Sonderbehandlung: SPC entfernt auch TABs: - while ( start < len - ? sz[start] == ' ' - || sz[start] == '\t' - : false ) - start++; - } - else - { - while (start < len && sz[start] == c) - start++; - } - - int ende = len-1; - if (c == ' ') - { // Sonderbehandlung: SPC entfernt auch TABs: - while ( ende >= start - ? sz[ende] == ' ' - || sz[ende] == '\t' - : false ) - ende--; - } - else - { - while (ende >= start && sz[ende] == c) - ende--; - } - *this = get(start,ende-start+1); -} - -void -Simstr::empty() -{ - if (len > 0) - { - delete [] sz; - sz = new char[1]; - *sz = 0; - len = 0; - } -} - -Simstr -Simstr::take_first_token(char c) -{ - Simstr ret; - int pos = pos_first(c); - if (pos != NO_POS) - { - ret = get_front(pos); - pop_front(pos+1); - } - else - { - ret = sz; - delete [] sz; - sz = new char[1]; - *sz = NULCH; - len = 0; - } - - return ret; -} - -Simstr -Simstr::take_last_token(char c) -{ - Simstr ret; - int pos = pos_last(c); - if (pos != NO_POS) - { - ret = get_back(len-pos-1); - pop_back(len-pos); - } - else - { - ret = sz; - delete [] sz; - sz = new char[1]; - *sz = NULCH; - len = 0; - } - - return ret; -} - - - -// Find - -int -Simstr::pos_first(char c) const -{ - int i = 0; - for (i = 0; i < len ? sz[i] != c : false; i++) ; - if (i >= len) - return NO_POS; - else - return i; -} - -int -Simstr::pos_first_after( char c, - int startSearchPos) const -{ - int i = 0; - if (startSearchPos >= i) - i = startSearchPos+1; - for (; i < len ? sz[i] != c : false; i++) ; - if (i >= len) - return NO_POS; - else - return i; -} - - -int -Simstr::pos_last(char c) const -{ - int i = 0; - for (i = len-1; i >= 0 ? sz[i] != c : false; i--) ; - if (i < 0) - return NO_POS; - else - return i; -} - -int -Simstr::pos_first(const Simstr & S) const -{ - char * ptr = strstr(sz,S.sz); - if (ptr) - return int(ptr-sz); - else - return NO_POS; -} - -int -Simstr::pos_last(const Simstr & S) const -{ - Simstr vgl; - int i; - for (i = len-S.len; i >= 0 ; i--) - { - vgl = get(i,S.len); - if (vgl == S) - break; - } - if (i >= 0) - return i; - else - return NO_POS; -} - -int -Simstr::count(char c) const -{ - int ret = 0; - for (int i =0; i < len; i++) - if (sz[i] == c) - ret++; - return ret; -} - -bool -Simstr::is_no_text() const -{ - if (!len) - return true; - - int i; - for (i = 0; i < len && sz[i] <= 32 ; i++) ; - if (i < len) - return false; - return true; -} - -// Change - -void -Simstr::replace(int pos, char c) -{ - if (pos < 0 || pos >= len) - return; - else - sz[unsigned(pos)] = c; -} - -void -Simstr::replace(int startPos, int anzahl, const Simstr & S) -{ - if (startPos >= len || startPos < 0 || anzahl < 1) - return; - - int anz = len - startPos < anzahl ? len - startPos : anzahl; - - char * result = new char[len-anz+S.len+1]; - - memcpy(result,sz,startPos); - memcpy(result+startPos, S.sz, S.len); - memcpy(result+startPos+S.len, sz+startPos+anz, len-startPos-anz+1); - - delete [] sz; - sz = result; - len = len-anz+S.len; -} - -void -Simstr::replace_all(char oldCh, char newCh) -{ - for (int i=0; i < len; i++) - if (sz[i] == oldCh) - sz[i] = newCh; -} - -void -Simstr::replace_all(const Simstr & oldS, const Simstr & newS) -{ - Simstr vgl; - int i = 0; - while (i <= len-oldS.len) - { - vgl = get(i,oldS.len); - if (strcmp(vgl.sz,oldS.sz) == 0) - { - replace(i,oldS.len,newS); - i += newS.len; - } - else - i++; - } -} - -void -Simstr::to_lower() -{ - for (int i = 0; i < len; i++) - sz[i] = (char) tolower(sz[i]); -} - - - -// Simstr addition -Simstr -operator+(const char * str, const Simstr & S) -{ - Simstr ret = S; - ret.push_front(str); - return ret; -} - -Simstr -operator+(const Simstr & S, const char * str) -{ - Simstr ret = S; - ret.push_back(str); - return ret; -} - -Simstr -operator+(char c, const Simstr & S) -{ - Simstr ret = S; - ret.push_front(c); - return ret; -} - -Simstr -operator+(const Simstr & S, char c) -{ - Simstr ret = S; - ret.push_back(c); - return ret; -} - - -// Simstr-Vergleiche mit char * -bool -operator==(const Simstr & S, const char * str) -{ - return strcmp(S,str) == 0; -} - -bool -operator!=(const Simstr & S, const char * str) -{ - return strcmp(S,str) != 0; -} - -bool -operator<(const Simstr & S, const char * str) -{ - return strcmp(S,str) < 0; -} - -bool -operator>(const Simstr & S, const char * str) -{ - return strcmp(S,str) > 0; -} - -bool -operator<=(const Simstr & S, const char * str) -{ - return strcmp(S,str) <= 0; -} - -bool -operator>=(const Simstr & S, const char * str) -{ - return strcmp(S,str) >= 0; -} - -bool -operator==(const char * str, const Simstr & S) -{ - return strcmp(str,S) == 0; -} - -bool -operator!=(const char * str, const Simstr & S) -{ - return strcmp(str,S) != 0; -} - -bool -operator<(const char * str, const Simstr & S) -{ - return strcmp(str,S) < 0; -} - -bool -operator>(const char * str, const Simstr & S) -{ - return strcmp(str,S) > 0; -} - -bool -operator<=(const char * str, const Simstr & S) -{ - return strcmp(str,S) <= 0; -} - -bool -operator>=(const char * str, const Simstr & S) -{ - return strcmp(str,S) >= 0; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl deleted file mode 100644 index 4902bef51462..000000000000 --- a/soltools/testhxx/create.pl +++ /dev/null @@ -1,116 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -$solarversion = $ENV{SOLARVERSION}; -$solarversion =~ s![^0-9A-Za-z]!\\$&!g; -$in = <> || die 'no input'; -chomp $in; -if ($ENV{OS} eq 'LINUX') { - 1 while $in =~ s!\s+-I\s*[^/]\S*\s*! !g; # discard relative includes - $in =~ s!(\s+-I\s*)$solarversion(\S*)!$1\${SOLARVERSION}$2!og; - # macrofy includes to solver - $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o'; - $in =~ s!\S+/testhxx.cxx!-x c++ /proc/self/fd/0! - || die 'bad input: no source file'; - print STDOUT '#!/bin/sh', "\n"; - print STDOUT $in, - ' <<<"#include \\"`echo $(if [ ${1%/*} != $1 ];then cd ${1%/*};fi;', - '/bin/pwd)/${1##*/}`\\""', "\n"; -} elsif ($ENV{OS} eq 'SOLARIS') { - 1 while $in =~ s!\s+-I\s*[^/]\S*\s*! !g; # discard relative includes - $in =~ s!(\s+-I\s*)$solarversion(\S*)!$1\${SOLARVERSION}$2!og; - # macrofy includes to solver - $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o'; - $in =~ s!\S+/testhxx.cxx!\${my_tmp}! - || die 'bad input: no source file'; - print STDOUT '#!/bin/sh', "\n"; - print STDOUT - 'my_tmp=${TMPDIR:-/tmp}/`/usr/xpg4/bin/id -u`_$$_include.cc', "\n"; - print STDOUT 'my_pat=`dirname $1`', "\n"; - print STDOUT 'my_fil=`basename $1`', "\n"; - print STDOUT 'my_org=${PWD}', "\n"; - print STDOUT 'cd $my_pat || exit 1', "\n"; - print STDOUT 'my_pat=`pwd`', "\n"; - print STDOUT 'cd $my_org || exit 1', "\n"; - print STDOUT - 'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n"; - print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n"; - print STDOUT 'my_ret=$?', "\n"; - print STDOUT - 'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;', - ' fi', "\n"; - print STDOUT 'unlink ${my_tmp} || exit 1', "\n"; - print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n"; - print STDOUT 'exit ${my_ret}', "\n"; -} elsif ($ENV{OS} eq 'WNT') { - if ($ENV{COM} eq 'GCC') { - 1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes - $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og; - # macrofy includes to solver - $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o'; - $in =~ s!\S+/testhxx.cxx!\${my_tmp}! - || die 'bad input: no source file'; - print STDOUT '#!/bin/sh', "\n"; - print STDOUT - 'my_tmp=${TMPDIR:-/tmp}/`id -u`_$$_include.cc', "\n"; - print STDOUT 'my_pat=`dirname $1`', "\n"; - print STDOUT 'my_fil=`basename $1`', "\n"; - print STDOUT 'my_org=${PWD}', "\n"; - print STDOUT 'cd $my_pat || exit 1', "\n"; - print STDOUT 'my_pat=`cygpath -m \`pwd\``', "\n"; - print STDOUT 'cd $my_org || exit 1', "\n"; - print STDOUT - 'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n"; - print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n"; - print STDOUT 'my_ret=$?', "\n"; - print STDOUT - 'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;', - ' fi', "\n"; - print STDOUT 'unlink ${my_tmp} || exit 1', "\n"; - print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n"; - print STDOUT 'exit ${my_ret}', "\n"; - } else { - 1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes - $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og; - # macrofy includes to solver - $in =~ s!\s+-Fo\s*\S+! -Fo$[my_tmp}obj! || die 'bad input: no -Fo'; - $in =~ s!\s+-Zi\s! !; - $in =~ s!\s+-Fd\s*\S+!!; - print STDOUT '#!/bin/sh', "\n"; - print STDOUT - 'my_tmp=${TMPDIR:-/tmp}/`id -u`_$$_include.cc', "\n"; - print STDOUT 'my_pat=`dirname $1`', "\n"; - print STDOUT 'my_fil=`basename $1`', "\n"; - print STDOUT 'my_org=${PWD}', "\n"; - print STDOUT 'cd $my_pat || exit 1', "\n"; - print STDOUT 'my_pat=`pwd`', "\n"; - print STDOUT 'cd $my_org || exit 1', "\n"; - print STDOUT - 'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n"; - print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n"; - print STDOUT 'my_ret=$?', "\n"; - print STDOUT - 'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;', - ' fi', "\n"; - print STDOUT 'unlink ${my_tmp} || exit 1', "\n"; - print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n"; - print STDOUT 'exit ${my_ret}', "\n"; - } -} else { - print STDOUT 'echo \'no testhxx on this platform\'', "\n"; -} diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx deleted file mode 100644 index efdba2d82431..000000000000 --- a/soltools/testhxx/testhxx.cxx +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -// This is just a dummy file; see the makefile.mk for the real work. - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 1d17b811d28e6fdf0a64851d5553263de2b250f8 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 15:04:29 +0200 Subject: sw: cleanup in rtfimport test Change-Id: Idef3ee3fa246b314c4b6b8a59b2b366dadfb679a --- sw/qa/extras/rtfimport/rtfimport.cxx | 70 +++++++----------------------------- 1 file changed, 13 insertions(+), 57 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 96503a788933..525852250907 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -319,14 +319,8 @@ void Test::testN750757() uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - sal_Bool bValue; - xPropertySet->getPropertyValue("ParaContextMargin") >>= bValue; - CPPUNIT_ASSERT_EQUAL(sal_Bool(false), bValue); - - xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPropertySet->getPropertyValue("ParaContextMargin") >>= bValue; - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), bValue); + CPPUNIT_ASSERT_EQUAL(sal_Bool(false), getProperty(xParaEnum->nextElement(), "ParaContextMargin")); + CPPUNIT_ASSERT_EQUAL(sal_Bool(true), getProperty(xParaEnum->nextElement(), "ParaContextMargin")); } void Test::testFdo45563() @@ -355,17 +349,11 @@ void Test::testFdo43965() uno::Reference xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); uno::Reference xRangeEnum = xRangeEnumAccess->createEnumeration(); uno::Reference xPropertySet(xRangeEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue; - xPropertySet->getPropertyValue("CharEscapement") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(36), nValue); - xPropertySet->getPropertyValue("CharEscapementHeight") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(100), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(36), getProperty(xPropertySet, "CharEscapement")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty(xPropertySet, "CharEscapementHeight")); // Second paragraph: Word vs Writer border default problem - xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY); - table::BorderLine2 aBorder; - xPropertySet->getPropertyValue("TopBorder") >>= aBorder; - CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), aBorder.LineWidth); + CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), getProperty(xParaEnum->nextElement(), "TopBorder").LineWidth); // Finally, make sure that we have two pages CPPUNIT_ASSERT_EQUAL(2, getPages()); @@ -378,10 +366,7 @@ void Test::testN751020() uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); CPPUNIT_ASSERT(xParaEnum->hasMoreElements()); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue = 0; - xPropertySet->getPropertyValue("ParaBottomMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(200)), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(200)), getProperty(xParaEnum->nextElement(), "ParaBottomMargin")); } void Test::testFdo47326() @@ -400,10 +385,7 @@ void Test::testFdo47036() int nAtCharacter = 0; for (int i = 0; i < xDraws->getCount(); ++i) { - uno::Reference xPropertySet(xDraws->getByIndex(i), uno::UNO_QUERY); - text::TextContentAnchorType eValue; - xPropertySet->getPropertyValue("AnchorType") >>= eValue; - if (eValue == text::TextContentAnchorType_AT_CHARACTER) + if (getProperty(xDraws->getByIndex(i), "AnchorType") == text::TextContentAnchorType_AT_CHARACTER) nAtCharacter++; } // The image at the document start was ignored. @@ -427,12 +409,7 @@ void Test::testFdo46955() uno::Reference xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); uno::Reference xRangeEnum = xRangeEnumAccess->createEnumeration(); while (xRangeEnum->hasMoreElements()) - { - uno::Reference xPropertySet(xRangeEnum->nextElement(), uno::UNO_QUERY); - sal_Int16 nValue; - xPropertySet->getPropertyValue("CharCaseMap") >>= nValue; - CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE, nValue); - } + CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE, getProperty(xRangeEnum->nextElement(), "CharCaseMap")); } } @@ -440,8 +417,7 @@ void Test::testFdo45394() { load("fdo45394.rtf"); - uno::Reference xPropertySet(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY); - uno::Reference xHeaderText(xPropertySet->getPropertyValue("HeaderText"), uno::UNO_QUERY); + uno::Reference xHeaderText = getProperty< uno::Reference >(getStyles("PageStyles")->getByName("Default"), "HeaderText"); OUString aActual = xHeaderText->getString(); // Encoding in the header was wrong. OUString aExpected("ПК РИК", 11, RTL_TEXTENCODING_UTF8); @@ -502,13 +478,8 @@ void Test::testFdo39053() uno::Reference xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); int nAsCharacter = 0; for (int i = 0; i < xDraws->getCount(); ++i) - { - uno::Reference xPropertySet(xDraws->getByIndex(i), uno::UNO_QUERY); - text::TextContentAnchorType eValue; - xPropertySet->getPropertyValue("AnchorType") >>= eValue; - if (eValue == text::TextContentAnchorType_AS_CHARACTER) + if (getProperty(xDraws->getByIndex(i), "AnchorType") == text::TextContentAnchorType_AS_CHARACTER) nAsCharacter++; - } // The image in binary format was ignored. CPPUNIT_ASSERT_EQUAL(1, nAsCharacter); } @@ -541,13 +512,7 @@ void Test::testFdo48023() Application::SetSettings(aSettings); load("fdo48023.rtf"); Application::SetSettings(aSavedSettings); - - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); - uno::Reference xRangeEnum = xRangeEnumAccess->createEnumeration(); - uno::Reference xTextRange(xRangeEnum->nextElement(), uno::UNO_QUERY); + uno::Reference xTextRange = getRun(getParagraph(1), 1); // Implicit encoding detection based on locale was missing OUString aExpected("Программист", 22, RTL_TEXTENCODING_UTF8); @@ -561,10 +526,7 @@ void Test::testFdo48876() uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); CPPUNIT_ASSERT(xParaEnum->hasMoreElements()); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - style::LineSpacing aSpacing; - xPropertySet->getPropertyValue("ParaLineSpacing") >>= aSpacing; - CPPUNIT_ASSERT_EQUAL(style::LineSpacingMode::MINIMUM, aSpacing.Mode); + CPPUNIT_ASSERT_EQUAL(style::LineSpacingMode::MINIMUM, getProperty(xParaEnum->nextElement(), "ParaLineSpacing").Mode); } void Test::testFdo48193() @@ -583,13 +545,7 @@ void Test::testFdo44211() Application::SetSettings(aSettings); load("fdo44211.rtf"); Application::SetSettings(aSavedSettings); - - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); - uno::Reference xRangeEnum = xRangeEnumAccess->createEnumeration(); - uno::Reference xTextRange(xRangeEnum->nextElement(), uno::UNO_QUERY); + uno::Reference xTextRange = getRun(getParagraph(1), 1); OUString aExpected("ąčę", 6, RTL_TEXTENCODING_UTF8); CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString()); -- cgit From 9cfbed4d03067ec0fddb5bb047621100b55c934e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 15:11:05 +0200 Subject: sw: more testcase cleanup Change-Id: I39681fbf57c828e5d6e80ae7c3155f2f60410a1a --- sw/qa/extras/rtfimport/rtfimport.cxx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 525852250907..35a3e581ce7e 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -575,14 +575,8 @@ void Test::testFdo47764() { load("fdo47764.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue = 0; // \cbpat with zero argument should mean the auto (-1) color, not a default color (black) - xPropertySet->getPropertyValue("ParaBackColor") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty(getParagraph(1), "ParaBackColor")); } void Test::testFdo38786() -- cgit From 68875dc3feed0189b09ca3625996d51f93500d24 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 15:28:47 +0200 Subject: sw: clean up one more test Change-Id: Icfcdbedaf6b123fc726e2298ac47698940b36091 --- sw/qa/extras/rtfimport/rtfimport.cxx | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 35a3e581ce7e..30e03ce6a4f2 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -605,19 +605,12 @@ void Test::testFdo49501() uno::Reference xStyle(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY); - sal_Bool bIsLandscape = sal_False; - xStyle->getPropertyValue("IsLandscape") >>= bIsLandscape; - CPPUNIT_ASSERT_EQUAL(sal_True, bIsLandscape); + CPPUNIT_ASSERT_EQUAL(sal_True, getProperty(xStyle, "IsLandscape")); sal_Int32 nExpected(TWIP_TO_MM100(567)); - sal_Int32 nValue = 0; - xStyle->getPropertyValue("LeftMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(nExpected, nValue); - xStyle->getPropertyValue("RightMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(nExpected, nValue); - xStyle->getPropertyValue("TopMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(nExpected, nValue); - xStyle->getPropertyValue("BottomMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(nExpected, nValue); + CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, "LeftMargin")); + CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, "RightMargin")); + CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, "TopMargin")); + CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, "BottomMargin")); } void Test::testFdo49271() -- cgit From efff52047159229350d2fa803f6463ded9b561a0 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 15:50:53 +0200 Subject: sw: finish cleanup of rtfimport test Change-Id: I10433c3c40a0c648bd651ed786ecd5523bf58f61 --- sw/qa/extras/rtfimport/rtfimport.cxx | 65 ++++++------------------------------ 1 file changed, 10 insertions(+), 55 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 30e03ce6a4f2..61813f1c5555 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -617,15 +617,7 @@ void Test::testFdo49271() { load("fdo49271.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - xParaEnum->nextElement(); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - float fValue = 0; - xPropertySet->getPropertyValue("CharHeight") >>= fValue; - - CPPUNIT_ASSERT_EQUAL(25.f, fValue); + CPPUNIT_ASSERT_EQUAL(25.f, getProperty(getParagraph(2), "CharHeight")); } void Test::testFdo49692() @@ -642,12 +634,7 @@ void Test::testFdo49692() const beans::PropertyValue& rProp = aProps[i]; if (rProp.Name == "Suffix") - { - OUString sValue; - rProp.Value >>= sValue; - - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sValue.getLength()); - } + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rProp.Value.get().getLength()); } } @@ -655,54 +642,28 @@ void Test::testFdo45190() { load("fdo45190.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - // inherited \fi should be reset - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue = 0; - xPropertySet->getPropertyValue("ParaFirstLineIndent") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(getParagraph(1), "ParaFirstLineIndent")); // but direct one not - xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPropertySet->getPropertyValue("ParaFirstLineIndent") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(-100)), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(-100)), getProperty(getParagraph(2), "ParaFirstLineIndent")); } void Test::testFdo50539() { load("fdo50539.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xRunEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); - uno::Reference xRunEnum = xRunEnumAccess->createEnumeration(); - uno::Reference xPropertySet(xRunEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue = 0; // \chcbpat with zero argument should mean the auto (-1) color, not a default color (black) - xPropertySet->getPropertyValue("CharBackColor") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty(getRun(getParagraph(1), 1), "CharBackColor")); } void Test::testFdo50665() { load("fdo50665.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum(xParaEnumAccess->createEnumeration()); - uno::Reference xRunEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); - uno::Reference xRunEnum(xRunEnumAccess->createEnumeration()); - // Access the second run, which is a textfield - xRunEnum->nextElement(); - uno::Reference xRun(xRunEnum->nextElement(), uno::UNO_QUERY); - OUString aValue; - xRun->getPropertyValue("CharFontName") >>= aValue; + uno::Reference xRun(getRun(getParagraph(1), 2), uno::UNO_QUERY); // This used to be the default, as character properties were ignored. - CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), aValue); + CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), getProperty(xRun, "CharFontName")); } void Test::testFdo49659() @@ -717,12 +678,8 @@ void Test::testFdo49659() // The graphic was also empty uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); uno::Reference xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); - uno::Reference xPropertySet(xDraws->getByIndex(0), uno::UNO_QUERY); - uno::Reference xGraphic; - xPropertySet->getPropertyValue("Graphic") >>= xGraphic; - sal_Int8 nValue = 0; - xGraphic->getPropertyValue("GraphicType") >>= nValue; - CPPUNIT_ASSERT_EQUAL(graphic::GraphicType::PIXEL, nValue); + uno::Reference xGraphic(getProperty< uno::Reference >(xDraws->getByIndex(0), "Graphic"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(graphic::GraphicType::PIXEL, getProperty(xGraphic, "GraphicType")); } void Test::testFdo46966() @@ -735,9 +692,7 @@ void Test::testFdo46966() load("fdo46966.rtf"); uno::Reference xPropertySet(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY); - sal_Int32 nValue = 0; - xPropertySet->getPropertyValue("TopMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(720)), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(720)), getProperty(xPropertySet, "TopMargin")); } void Test::testFdo52066() -- cgit From 2892109f0369f2d840299baddbc6899ab52fcbb5 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 16:01:54 +0200 Subject: writerfilter: unused includes in DomainMapper Change-Id: Ia84271c5fe7064bfa2d71b84da9fa4d9df945d51 --- writerfilter/source/dmapper/DomainMapper.cxx | 3 --- 1 file changed, 3 deletions(-) diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index cfd8dad70163..8b5103495228 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -54,12 +54,9 @@ #include #include #include -#include #include #include -#include -#include #include #include #include -- cgit From c7188e3f7b924a14d446f6b443af52a554d4262a Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Sat, 29 Sep 2012 16:21:02 -0300 Subject: Update in Brazilian autocorrection Change-Id: Ifcd7410f659a76ac34f18bb561b2eaffa6ecbd3d Reviewed-on: https://gerrit.libreoffice.org/724 Reviewed-by: Andras Timar Tested-by: Andras Timar --- .../autotext/lang/pt-BR/acor/DocumentList.xml | 1 + .../autotext/lang/pt-BR/acor/WordExceptList.xml | 34 +++++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml b/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml index 13d65e32c7dc..22c51989830b 100644 --- a/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml +++ b/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml @@ -1012,6 +1012,7 @@ + diff --git a/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml b/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml index 45c24157e038..969d472d165a 100644 --- a/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml +++ b/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + -- cgit From 015cf38a490a2a09584a1804037f6d39b577d867 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 16:59:02 +0200 Subject: add sal and xml2cmp back to build.pl deps Change-Id: Ia5607c977958317f3aca9061553cbfedb35944fa --- cross_tail_build/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst index ec26db2f61bf..995bae7aae8b 100644 --- a/cross_tail_build/prj/build.lst +++ b/cross_tail_build/prj/build.lst @@ -1,2 +1,2 @@ -ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools ZLIB:zlib NULL +ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt sal solenv soltools NATIVE:xml2cmp ZLIB:zlib NULL ctb tail_build\prj nmake - all ctb_prj NULL -- cgit From 844920c626562ab8a47f068facc9685a6f6bd323 Mon Sep 17 00:00:00 2001 From: Tim Retout Date: Sun, 30 Sep 2012 13:15:23 +0100 Subject: installer: Create new read_ziplist function. Change-Id: Ie91376bf9c52238febdc15720bb7f4cd62ee2e08 --- solenv/bin/modules/installer.pm | 72 +------------------------------- solenv/bin/modules/installer/ziplist.pm | 73 +++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 70 deletions(-) diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 54b64b098bb4..4c50d3b9e426 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -82,7 +82,7 @@ use installer::windows::strip; use installer::windows::update; use installer::windows::upgrade; use installer::worker; -use installer::ziplist; +use installer::ziplist qw(read_ziplist); our @EXPORT_OK = qw(main); @@ -163,75 +163,7 @@ sub run { # Analyzing the settings and variables in zip.lst ################################################### - installer::logger::globallog("zip list file: $installer::globals::ziplistname"); - - my $ziplistref = installer::files::read_file($installer::globals::ziplistname); - - installer::logger::print_message( "... analyzing $installer::globals::ziplistname ... \n" ); - - my ($productblockref, $parent) = installer::ziplist::getproductblock($ziplistref, $installer::globals::product, 1); # product block from zip.lst - - my ($settingsblockref, undef) = installer::ziplist::getproductblock($productblockref, "Settings", 0); # settings block from zip.lst - - $settingsblockref = installer::ziplist::analyze_settings_block($settingsblockref); # select data from settings block in zip.lst - - my $allsettingsarrayref = installer::ziplist::get_settings_from_ziplist($settingsblockref); - - my $allvariablesarrayref = installer::ziplist::get_variables_from_ziplist($settingsblockref); - - my ($globalproductblockref, undef) = installer::ziplist::getproductblock($ziplistref, $installer::globals::globalblock, 0); # global product block from zip.lst - - while (defined $parent) - { - my $parentproductblockref; - ($parentproductblockref, $parent) = installer::ziplist::getproductblock( - $ziplistref, $parent, 1); - my ($parentsettingsblockref, undef) = installer::ziplist::getproductblock( - $parentproductblockref, "Settings", 0); - $parentsettingsblockref = installer::ziplist::analyze_settings_block( - $parentsettingsblockref); - my $allparentsettingsarrayref = - installer::ziplist::get_settings_from_ziplist($parentsettingsblockref); - my $allparentvariablesarrayref = - installer::ziplist::get_variables_from_ziplist($parentsettingsblockref); - $allsettingsarrayref = - installer::converter::combine_arrays_from_references_first_win( - $allsettingsarrayref, $allparentsettingsarrayref) - if $#{$allparentsettingsarrayref} > -1; - $allvariablesarrayref = - installer::converter::combine_arrays_from_references_first_win( - $allvariablesarrayref, $allparentvariablesarrayref) - if $#{$allparentvariablesarrayref} > -1; - } - - if ( $#{$globalproductblockref} > -1 ) - { - my ($globalsettingsblockref, undef) = installer::ziplist::getproductblock($globalproductblockref, "Settings", 0); # settings block from zip.lst - - $globalsettingsblockref = installer::ziplist::analyze_settings_block($globalsettingsblockref); # select data from settings block in zip.lst - - my $allglobalsettingsarrayref = installer::ziplist::get_settings_from_ziplist($globalsettingsblockref); - - my $allglobalvariablesarrayref = installer::ziplist::get_variables_from_ziplist($globalsettingsblockref); - - if ( $#{$allglobalsettingsarrayref} > -1 ) { $allsettingsarrayref = installer::converter::combine_arrays_from_references_first_win($allsettingsarrayref, $allglobalsettingsarrayref); } - if ( $#{$allglobalvariablesarrayref} > -1 ) { $allvariablesarrayref = installer::converter::combine_arrays_from_references_first_win($allvariablesarrayref, $allglobalvariablesarrayref); } - } - - $allsettingsarrayref = installer::ziplist::remove_multiples_from_ziplist($allsettingsarrayref); # the settings from the zip.lst - - $allvariablesarrayref = installer::ziplist::remove_multiples_from_ziplist($allvariablesarrayref); - - installer::ziplist::replace_variables_in_ziplist_variables($allvariablesarrayref); - - my $allvariableshashref = installer::converter::convert_array_to_hash($allvariablesarrayref); # the variables from the zip.lst - - installer::ziplist::set_default_productversion_if_required($allvariableshashref); - - installer::ziplist::add_variables_to_allvariableshashref($allvariableshashref); - - installer::ziplist::overwrite_branding( $allvariableshashref ); - + my ($allsettingsarrayref, $allvariableshashref) = read_ziplist($installer::globals::ziplistname); ######################################################## # Check if this is simple packaging mechanism diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 95b56389fd47..4a3e4767a0bd 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -27,14 +27,87 @@ package installer::ziplist; +use base 'Exporter'; + use File::Spec::Functions qw(rel2abs); +use installer::converter; use installer::exiter; +use installer::files; use installer::globals; use installer::logger; use installer::remover; use installer::systemactions; +our @EXPORT_OK = qw(read_ziplist); + +sub read_ziplist { + my $ziplistname = shift; + + installer::logger::globallog("zip list file: $ziplistname"); + + my $ziplistref = installer::files::read_file($ziplistname); + + installer::logger::print_message( "... analyzing $ziplistname ... \n" ); + + my ($productblockref, $parent) = getproductblock($ziplistref, $installer::globals::product, 1); # product block from zip.lst + + my ($settingsblockref, undef) = getproductblock($productblockref, "Settings", 0); # settings block from zip.lst + $settingsblockref = analyze_settings_block($settingsblockref); # select data from settings block in zip.lst + + my $allsettingsarrayref = get_settings_from_ziplist($settingsblockref); + my $allvariablesarrayref = get_variables_from_ziplist($settingsblockref); + + my ($globalproductblockref, undef) = getproductblock($ziplistref, $installer::globals::globalblock, 0); # global product block from zip.lst + + while (defined $parent) { + my $parentproductblockref; + ($parentproductblockref, $parent) = getproductblock($ziplistref, $parent, 1); + my ($parentsettingsblockref, undef) = getproductblock($parentproductblockref, "Settings", 0); + $parentsettingsblockref = analyze_settings_block($parentsettingsblockref); + my $allparentsettingsarrayref = get_settings_from_ziplist($parentsettingsblockref); + my $allparentvariablesarrayref = get_variables_from_ziplist($parentsettingsblockref); + $allsettingsarrayref = + installer::converter::combine_arrays_from_references_first_win( + $allsettingsarrayref, $allparentsettingsarrayref) + if $#{$allparentsettingsarrayref} > -1; + $allvariablesarrayref = + installer::converter::combine_arrays_from_references_first_win( + $allvariablesarrayref, $allparentvariablesarrayref) + if $#{$allparentvariablesarrayref} > -1; + } + + if ( @{$globalproductblockref} ) { + my ($globalsettingsblockref, undef) = getproductblock($globalproductblockref, "Settings", 0); # settings block from zip.lst + + $globalsettingsblockref = analyze_settings_block($globalsettingsblockref); # select data from settings block in zip.lst + + my $allglobalsettingsarrayref = get_settings_from_ziplist($globalsettingsblockref); + + my $allglobalvariablesarrayref = get_variables_from_ziplist($globalsettingsblockref); + + if ( @{$allglobalsettingsarrayref} ) { + $allsettingsarrayref = installer::converter::combine_arrays_from_references_first_win($allsettingsarrayref, $allglobalsettingsarrayref); + } + if ( @{$allglobalvariablesarrayref} ) { + $allvariablesarrayref = installer::converter::combine_arrays_from_references_first_win($allvariablesarrayref, $allglobalvariablesarrayref); + } + } + + $allsettingsarrayref = remove_multiples_from_ziplist($allsettingsarrayref); + $allvariablesarrayref = remove_multiples_from_ziplist($allvariablesarrayref); + + replace_variables_in_ziplist_variables($allvariablesarrayref); + + my $allvariableshashref = installer::converter::convert_array_to_hash($allvariablesarrayref); + + set_default_productversion_if_required($allvariableshashref); + add_variables_to_allvariableshashref($allvariableshashref); + overwrite_branding( $allvariableshashref ); + + return $allsettingsarrayref, $allvariableshashref; +} + ################################################# # Getting data from path file and zip list file ################################################# -- cgit From 9aa4f29e6e3fdd0e2410320d524ed9d820e7be4e Mon Sep 17 00:00:00 2001 From: Tim Retout Date: Sun, 30 Sep 2012 13:23:43 +0100 Subject: installer::profiles: Test and rewrite sorting_profile Change-Id: Ie3c9bddcb4760d2fe2195c1ca0de7520e57d705f --- solenv/bin/modules/installer/profiles.pm | 45 ++++++++++------------- solenv/bin/modules/t/installer-profiles.t | 60 +++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 26 deletions(-) create mode 100644 solenv/bin/modules/t/installer-profiles.t diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm index 7b621f70a78d..3b99973a92a4 100644 --- a/solenv/bin/modules/installer/profiles.pm +++ b/solenv/bin/modules/installer/profiles.pm @@ -42,40 +42,33 @@ use installer::systemactions; # Sorting the content of a profile ####################################################### -sub sorting_profile -{ +sub sorting_profile { my ($profilesref) = @_; - my @profile = (); - my @definedsections = (); + my @sections; + my %section_content; - for ( my $i = 0; $i <= $#{$profilesref}; $i++ ) - { + for ( my $i = 0; $i < @{$profilesref}; $i++ ) { my $line = ${$profilesref}[$i]; - if ( $line =~ /^\s*(\[.*\])\s*$/ ) # this is a section (every second line) - { - my $section = $1; + # Skip unless this is a section (every second line) + next unless ( $line =~ /^\s*(\[.*\])\s*$/ ); - if (! grep {$_ eq $section} @definedsections) - { - my $sectionline = $section . "\n"; - push(@definedsections, $section); - push(@profile, $sectionline); + my $section = $1; + my $next_line = ${$profilesref}[$i+1]; - for ( my $j = 0; $j <= $#{$profilesref}; $j++ ) - { - my $oneline = ${$profilesref}[$j]; - installer::remover::remove_leading_and_ending_whitespaces(\$oneline); - - if ( $oneline eq $section ) - { - my $nextline = ${$profilesref}[$j+1]; - push(@profile, $nextline); - } - } - } + if ( ! exists $section_content{$section} ) { + push @sections, $section; } + + push @{ $section_content{$section} }, $next_line; + } + + my @profile; + + for my $section (@sections) { + push @profile, "$section\n"; + push @profile, @{ $section_content{$section} }; } return \@profile; diff --git a/solenv/bin/modules/t/installer-profiles.t b/solenv/bin/modules/t/installer-profiles.t new file mode 100644 index 000000000000..841af1458e85 --- /dev/null +++ b/solenv/bin/modules/t/installer-profiles.t @@ -0,0 +1,60 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# [ Copyright (C) 2012 Tim Retout (initial developer) ] +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +use strict; +use warnings; + +use Test::More; + +use lib '.'; + +use installer::profiles; + +my @input = map { "$_\n" } split "\n", <<'END'; + [foo] +1 +NOT SEEN + [bar] +3 + [foo] +2 +[bar] +4 +END + +my @expected = map { "$_\n" } split "\n", <<'END'; +[foo] +1 +2 +[bar] +3 +4 +END + +my $result = installer::profiles::sorting_profile(\@input); + +is_deeply($result, \@expected); + +done_testing(); -- cgit From 378d2f795f426b03fdde1a00953f5bdf4563042e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sun, 30 Sep 2012 19:59:02 +0200 Subject: Make Reference::iset_throw work with multiple-inheritance interfaces Change-Id: Ia8a644c613de17279abdab533a6314ba6c0e0aec --- cppu/inc/com/sun/star/uno/Reference.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx index 100a430f7045..aa39810159d3 100644 --- a/cppu/inc/com/sun/star/uno/Reference.hxx +++ b/cppu/inc/com/sun/star/uno/Reference.hxx @@ -91,7 +91,7 @@ inline interface_type * Reference< interface_type >::iset_throw( { if (pInterface) { - pInterface->acquire(); + castToXInterface(pInterface)->acquire(); return pInterface; } throw RuntimeException( @@ -184,13 +184,13 @@ inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_Qu template< class interface_type > inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { - _pInterface = iset_throw( rRef.get() ); + _pInterface = castToXInterface( iset_throw( rRef.get() ) ); } //__________________________________________________________________________________________________ template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { - _pInterface = iset_throw( pInterface ); + _pInterface = castToXInterface( iset_throw( pInterface ) ); } #endif -- cgit From d9947fcc93c0d5803b2855cde0bb93dc7a2d4346 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sun, 30 Sep 2012 20:45:36 +0200 Subject: create guids that excel accepts Change-Id: I69868ad65b6eb6405d5723cb4d65d5e30c72e3ae --- sc/source/filter/excel/xecontent.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 6bef29b1f5ce..abca86f96d68 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1082,13 +1082,21 @@ void XclExpColorScale::SaveXml( XclExpXmlStream& rStrm ) namespace { +rtl::OString createHexStringFromDigit(sal_uInt8 nDigit) +{ + rtl::OString aString = rtl::OString::valueOf( static_cast(nDigit), 16 ); + if(aString.getLength() == 1) + aString = aString + rtl::OString::valueOf(static_cast(0)); + return aString; +} + rtl::OString createGuidStringFromInt(sal_uInt8 nGuid[16]) { rtl::OStringBuffer aBuffer; aBuffer.append('{'); for(size_t i = 0; i < 16; ++i) { - aBuffer.append(static_cast(nGuid[i]), 16); + aBuffer.append(createHexStringFromDigit(nGuid[i])); if(i == 3|| i == 5 || i == 7 || i == 9 ) aBuffer.append('-'); } -- cgit From da059ff6377c3f4b779daedfe6365dcfc47b53de Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 30 Sep 2012 23:59:29 +0200 Subject: gbuildification of saxon Change-Id: Ic54337f4279daf78b099aab368eade5a6143f586 --- Makefile.top | 2 +- config_host.mk.in | 1 + configure.in | 2 + saxon/ExternalProject_saxon.mk | 38 ++ saxon/Makefile | 7 + saxon/Module_saxon.mk | 22 + saxon/Package_saxon.mk | 16 + saxon/UnpackedTarball_saxon.mk | 16 + saxon/build.xml | 1026 +++++++++++++++++++++++++++++++++++++++ saxon/makefile.mk | 69 --- saxon/prj/build.lst | 2 +- saxon/prj/d.lst | 1 - saxon/prj/dmake | 0 saxon/saxon-9.0.0.7-bj.patch | 1031 ---------------------------------------- 14 files changed, 1130 insertions(+), 1103 deletions(-) create mode 100644 saxon/ExternalProject_saxon.mk create mode 100644 saxon/Makefile create mode 100644 saxon/Module_saxon.mk create mode 100644 saxon/Package_saxon.mk create mode 100644 saxon/UnpackedTarball_saxon.mk create mode 100644 saxon/build.xml delete mode 100644 saxon/makefile.mk delete mode 100644 saxon/prj/dmake delete mode 100644 saxon/saxon-9.0.0.7-bj.patch diff --git a/Makefile.top b/Makefile.top index 8fd5620aa9d9..e188cdcbcc26 100644 --- a/Makefile.top +++ b/Makefile.top @@ -133,6 +133,7 @@ sal\ salhelper\ sane\ sax\ +saxon\ sc\ scaddins\ sccomp\ @@ -245,7 +246,6 @@ postprocess\ python\ redland\ rhino\ -saxon\ setup_native\ stax\ stlport\ diff --git a/config_host.mk.in b/config_host.mk.in index 9814f16d775c..473ab5dd69fa 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -483,6 +483,7 @@ export RTL_ARCH=@RTL_ARCH@ export SAC_JAR=@SAC_JAR@ export SAL_ENABLE_FILE_LOCKING=1 export SAXON_JAR=@SAXON_JAR@ +export SAXON_TARBALL=@SAXON_TARBALL@ export SCPDEFS=@SCPDEFS@ export SERVLETAPI_JAR=@SERVLETAPI_JAR@ export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@ diff --git a/configure.in b/configure.in index ac9266cb8d3f..7c7ce66297b6 100644 --- a/configure.in +++ b/configure.in @@ -7697,9 +7697,11 @@ else AC_MSG_RESULT([internal]) SYSTEM_SAXON=NO NEED_SAXON=TRUE + SAXON_TARBALL=ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip fi fi AC_SUBST(SYSTEM_SAXON) +AC_SUBST(SAXON_TARBALL) AC_SUBST(SAXON_JAR) if test -n "$NEED_SAXON"; then diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk new file mode 100644 index 000000000000..03f0b94436fa --- /dev/null +++ b/saxon/ExternalProject_saxon.mk @@ -0,0 +1,38 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,saxon)) + +$(eval $(call gb_ExternalProject_use_unpacked,saxon,saxon)) + +$(eval $(call gb_ExternalProject_register_targets,saxon,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,saxon,build) : + cd "$(call gb_UnpackedTarball_get_dir,saxon)" && \ + ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-libreoffice" \ + $(if $(filter YES,$(SYSTEM_TOMCAT))\ + ,-Dservletapi.jar=$(SERVLETAPI_JAR) \ + ,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \ + )\ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + -Dsolarbindir=$(SOLARBINDIR) jar-bj && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/saxon/Makefile b/saxon/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/saxon/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/saxon/Module_saxon.mk b/saxon/Module_saxon.mk new file mode 100644 index 000000000000..0ac17febdc0c --- /dev/null +++ b/saxon/Module_saxon.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,saxon)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter SAXON,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,saxon,\ + ExternalProject_saxon \ + Package_saxon \ + UnpackedTarball_saxon \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/saxon/Package_saxon.mk b/saxon/Package_saxon.mk new file mode 100644 index 000000000000..ba19d97a8324 --- /dev/null +++ b/saxon/Package_saxon.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,saxon_inc,$(call gb_UnpackedTarball_get_dir,saxon))) + +$(eval $(call gb_Package_use_external_project,saxon_inc,saxon)) + +$(eval $(call gb_Package_add_file,saxon_inc,bin/saxon9.jar,saxon-build/9.0.0.7/bj/saxon9.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/saxon/UnpackedTarball_saxon.mk b/saxon/UnpackedTarball_saxon.mk new file mode 100644 index 000000000000..206257b851f1 --- /dev/null +++ b/saxon/UnpackedTarball_saxon.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,saxon)) + +$(eval $(call gb_UnpackedTarball_set_tarball,saxon,$(SAXON_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_file,saxon,build.xml,saxon/build.xml)) + +# vim: set noet sw=4 ts=4: diff --git a/saxon/build.xml b/saxon/build.xml new file mode 100644 index 000000000000..c9026f7778ea --- /dev/null +++ b/saxon/build.xml @@ -0,0 +1,1026 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + net.sf.saxon.xpath.XPathFactoryImpl +http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl +http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl +http\://www.xom.nu/jaxp/xpath/xom: net.sf.saxon.xpath.XPathFactoryImpl +http\://jdom.org/jaxp/xpath/jdom: net.sf.saxon.xpath.XPathFactoryImpl +http\://www.dom4j.org/jaxp/xpath/dom4j: net.sf.saxon.xpath.XPathFactoryImpl + + + + + com.saxonica.jaxp.SchemaFactoryImpl +http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin" + %NET%\gacutil /if IKVM.Runtime.dll + %NET%\gacutil /if IKVM.GNU.Classpath.dll + %NET%\gacutil /if saxon9.dll + %NET%\gacutil /if saxon9api.dll + + + + + + + + + + + + + + + + + + + set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin" + %NET%\gacutil /if IKVM.Runtime.dll + %NET%\gacutil /if IKVM.GNU.Classpath.dll + %NET%\gacutil /if saxon9.dll + %NET%\gacutil /if saxon9sa.dll + %NET%\gacutil /if saxon9api.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/saxon/makefile.mk b/saxon/makefile.mk deleted file mode 100644 index 40a74043b233..000000000000 --- a/saxon/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=saxon -TARGET=saxon - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk - -.IF "$(SOLAR_JAVA)" != "" -.IF "$(SYSTEM_SAXON)" == "YES" -all: - @echo "An already available installation of saxon should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." -.ENDIF - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=source-9.0.0.7-bj -TARFILE_MD5=ada24d37d8d638b3d8a9985e80bc2978 -ADDITIONAL_FILES=build.xml -TARFILE_ROOTDIR=src - -PATCH_FILES=saxon-9.0.0.7-bj.patch - -BUILD_ACTION="$(ANT)" $(ANT_FLAGS) -Dsolarbindir=$(SOLARBINDIR) jar-bj - -OUT2CLASS= saxon-build$/9.0.0.7$/bj$/saxon9.jar - -.ELSE # $(SOLAR_JAVA)!= "" -nojava: - @echo "Not building $(PRJNAME) because Java is disabled" -.ENDIF # $(SOLAR_JAVA)!= "" -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk -.ENDIF - diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst index 813097c66d90..a69eba0832e7 100644 --- a/saxon/prj/build.lst +++ b/saxon/prj/build.lst @@ -1,2 +1,2 @@ xx saxon : solenv stax NULL -xx saxon nmake - all xx_saxon NULL +xx saxon\prj nmake - all xx_saxon NULL diff --git a/saxon/prj/d.lst b/saxon/prj/d.lst index 0793dadfcfb1..e69de29bb2d1 100644 --- a/saxon/prj/d.lst +++ b/saxon/prj/d.lst @@ -1 +0,0 @@ -..\%__SRC%\class\saxon9.jar %_DEST%\bin\saxon9.jar diff --git a/saxon/prj/dmake b/saxon/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/saxon/saxon-9.0.0.7-bj.patch b/saxon/saxon-9.0.0.7-bj.patch deleted file mode 100644 index 11d30914e985..000000000000 --- a/saxon/saxon-9.0.0.7-bj.patch +++ /dev/null @@ -1,1031 +0,0 @@ ---- misc/src/build.xml 2008-07-11 12:11:50.079281000 +0200 -+++ misc/build/src/build.xml 2008-07-11 12:17:29.848740000 +0200 -@@ -1 +1,1027 @@ --dummy -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ net.sf.saxon.xpath.XPathFactoryImpl -+http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl -+http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl -+http\://www.xom.nu/jaxp/xpath/xom: net.sf.saxon.xpath.XPathFactoryImpl -+http\://jdom.org/jaxp/xpath/jdom: net.sf.saxon.xpath.XPathFactoryImpl -+http\://www.dom4j.org/jaxp/xpath/dom4j: net.sf.saxon.xpath.XPathFactoryImpl -+ -+ -+ -+ -+ com.saxonica.jaxp.SchemaFactoryImpl -+http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin" -+ %NET%\gacutil /if IKVM.Runtime.dll -+ %NET%\gacutil /if IKVM.GNU.Classpath.dll -+ %NET%\gacutil /if saxon9.dll -+ %NET%\gacutil /if saxon9api.dll -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin" -+ %NET%\gacutil /if IKVM.Runtime.dll -+ %NET%\gacutil /if IKVM.GNU.Classpath.dll -+ %NET%\gacutil /if saxon9.dll -+ %NET%\gacutil /if saxon9sa.dll -+ %NET%\gacutil /if saxon9api.dll -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -- cgit From dab0d5153605d26e3aa59c142d8845303169e3f5 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 06:56:04 +0200 Subject: add missing deps for tools/color.hxx Change-Id: I164afe17c3bff2f7d7f2b9daec0d5a5ca8fdf97a --- extensions/Executable_nsplugin.mk | 6 ++++++ extensions/source/nsplugin/source/so_instance.cxx | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 0f6af603c9ee..866257e1fde2 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -30,6 +30,12 @@ $(eval $(call gb_Executable_Executable,nsplugin)) +$(eval $(call gb_Executable_use_packages,nsplugin,\ + basegfx_inc \ + comphelper_inc \ + tools_inc \ +)) + $(eval $(call gb_Executable_use_sdk_api,nsplugin)) $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index c9b6ee9212df..4aeb45a645f7 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include -- cgit From 504a5eb0c02f8b53c40d7fb9e680c4df67aebfe7 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 07:35:08 +0200 Subject: add missing dep for tools/errcode.hxx Change-Id: I6e63a545332a1b865a26b355db49869c214f97c7 --- sdext/StaticLibrary_pdfimport_s.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index 699e3e7df185..20065a9100bb 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -29,6 +29,10 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) +$(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ + tools_inc \ +)) + $(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\ offapi \ udkapi \ -- cgit From 398f915a5bfa70263aef49a876736c61f9e7f0fd Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 08:13:57 +0200 Subject: drop unused include Change-Id: I21360e2d65b64bc27f02d677eda05f9d9d765367 --- sdext/source/presenter/PresenterWindowManager.hxx | 1 - 1 file changed, 1 deletion(-) diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index d2a5ae240f66..88a748e1de74 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include -- cgit From 9b618d894af9ba4b60c631ed9e48910149434f4a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 14:17:16 +0200 Subject: do not rely on target-spec. var. inheritance The whole idea of having two paths to look for schemas (one local, for module, and one global, in $(OUTDIR)) is bad anyway, because there is no way to do it in XSLT without warning if the checked schema does not exist in the first path. I see two ways out of that: 1. rewrite schema_val.xsl in a decent language 2. split the node reference check in schema_val.xsl into two phases: the first phase returns a list of subpaths to check, a helper script processes that, finds the real paths and feeds it to the second phase XSL, which does the internal check. Change-Id: Icfe3f9ec0960cfd3423c1223ad8f495d7634b25a --- solenv/gbuild/Configuration.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index b9d2e7f3b1c3..a5d202b33b3a 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -54,6 +54,8 @@ # gb_Configuration__get_source = $(SRCDIR)/$(2) +# The main LibreOffice registry +gb_Configuration_PRIMARY_REGISTRY_NAME := registry # XcsTarget class @@ -77,7 +79,7 @@ $(call gb_Helper_abbreviate_dirs,\ --noout \ --stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \ --stringparam root $(subst $(XCSFILE),,$(3)) \ - $(if $(SCHEMA_ROOT),--stringparam schemaRoot $(SCHEMA_ROOT)) \ + $(if $(PRIMARY_REGISTRY),,--stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,)) \ $(gb_XcsTarget_XSLT_SchemaVal) \ $(3) && \ $(gb_XSLTPROC) --nonet \ @@ -359,8 +361,6 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_Zip_get_clean_target,$(1)_$(lang)))) -$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := - $$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1)))) endef @@ -374,6 +374,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_XcsTarget_get_target,$(2)/$(3)) : \ $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \ $(call gb_Configuration_get_preparation_target,$(1)) +$(call gb_XcsTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME)) $(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_Configuration_get_target,$(1)) : \ @@ -514,7 +515,6 @@ endef # $(eval $(call gb_Configuration_use_configuration,foo,registry)) define gb_Configuration_use_configuration $(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2)) -$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema endef -- cgit From 57ec0707acb3e2cc2c2de35295b964ed046cf493 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 18:51:11 +0200 Subject: add missing deps on headers to static libs Change-Id: I7a28dfa13bf0f98a654eca98eb1cdfd99177f37a --- codemaker/StaticLibrary_codemaker.mk | 1 + codemaker/StaticLibrary_codemaker_cpp.mk | 1 + codemaker/StaticLibrary_codemaker_java.mk | 1 + lingucomponent/StaticLibrary_ulingu.mk | 10 ++++++++++ sax/StaticLibrary_sax_shared.mk | 4 ++++ sdext/StaticLibrary_pdfimport_s.mk | 5 +++++ testtools/StaticLibrary_bridgetest.mk | 5 +++++ vcl/StaticLibrary_headless.mk | 13 +++++++++++++ vcl/StaticLibrary_vclmain.mk | 3 +++ writerperfect/StaticLibrary_writerperfect.mk | 10 ++++++++++ 10 files changed, 53 insertions(+) diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index bbea555a5d18..04b53db236af 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker)) $(eval $(call gb_StaticLibrary_use_packages,codemaker,\ codemaker_inc \ + registry_inc \ sal_generated \ )) diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index b8cabf468a88..92678fa01a44 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ codemaker_inc \ + registry_inc \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\ diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index 6538e380496a..f33d38e14009 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ codemaker_inc \ + registry_inc \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\ diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk index 3bc66a25a5c3..9767efa4e67a 100644 --- a/lingucomponent/StaticLibrary_ulingu.mk +++ b/lingucomponent/StaticLibrary_ulingu.mk @@ -27,6 +27,16 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu)) +$(eval $(call gb_StaticLibrary_use_packages,ulingu,\ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + i18npool_inc \ + linguistic_inc \ + tools_inc \ + unotools_inc \ +)) + $(eval $(call gb_StaticLibrary_use_api,ulingu,\ udkapi \ offapi \ diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk index cdbc3c88843f..bf6887c00ada 100644 --- a/sax/StaticLibrary_sax_shared.mk +++ b/sax/StaticLibrary_sax_shared.mk @@ -9,6 +9,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared)) +$(eval $(call gb_StaticLibrary_use_packages,sax_shared,\ + cppu_inc \ +)) + $(eval $(call gb_StaticLibrary_set_include,sax_shared,\ -I$(SRCDIR)/sax/inc \ $$(INCLUDE) \ diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index 20065a9100bb..bf49da31070b 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -30,6 +30,11 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ + basegfx_inc \ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + o3tl_inc \ tools_inc \ )) diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk index ed96f3489f42..23254e7f13a8 100644 --- a/testtools/StaticLibrary_bridgetest.mk +++ b/testtools/StaticLibrary_bridgetest.mk @@ -27,6 +27,11 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s)) +$(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\ + cppu_inc \ + cppuhelper_inc \ +)) + $(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\ bridgetest \ )) diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index a07497ceb7a3..a3dc220a83cd 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -28,6 +28,19 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,headless)) +$(eval $(call gb_StaticLibrary_use_packages,headless,\ + basebmp_inc \ + basegfx_inc \ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + i18npool_inc \ + i18nutil_inc \ + o3tl_inc \ + tools_inc \ + unotools_inc \ +)) + $(eval $(call gb_StaticLibrary_use_api,headless,\ offapi \ udkapi \ diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index 05a6f3e9fe97..98998bb52e93 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -29,6 +29,9 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) $(eval $(call gb_StaticLibrary_use_packages,vclmain,\ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ tools_inc \ )) diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk index 6aec3aeaf98b..995b1bab2f35 100644 --- a/writerperfect/StaticLibrary_writerperfect.mk +++ b/writerperfect/StaticLibrary_writerperfect.mk @@ -19,6 +19,16 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect)) +$(eval $(call gb_StaticLibrary_use_packages,writerperfect,\ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + sot_inc \ + tools_inc \ + unotools_inc \ + xmloff_inc \ +)) + $(eval $(call gb_StaticLibrary_set_include,writerperfect,\ $$(INCLUDE) \ -I$(SRCDIR)/writerperfect/source \ -- cgit From 34af69ddf3ae8edb5e449350ffe6ca4546178ae9 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 1 Oct 2012 06:17:06 +0200 Subject: fix InternalUnoApi IDL deps Change-Id: I02bd49c6f6b252c6797292b8e4a9bc319fe0947e --- solenv/gbuild/InternalUnoApi.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index 3dd32ee77fb6..8949323b9c12 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -52,7 +52,10 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$( $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)_out) $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) -$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY) +$(call gb_UnoApiTarget_get_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY) +$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(1)_out) +$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY) +$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) $(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(1)) @@ -72,8 +75,8 @@ endef define gb_InternalUnoApi__use_api $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2)) -$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) -$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2)) +$(call gb_InternalUnoApi_get_target,$(1)_out) : $(call gb_UnoApiTarget_get_target,$(2)) +$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(call gb_UnoApiTarget_get_headers_target,$(2)) endef -- cgit From 61b2f6f9929d636f1d0534bebd7aca78c39c5c4f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 1 Oct 2012 07:24:16 +0200 Subject: add saxon to tail_build Change-Id: I01e2b99a2618c3b4e5e80dc9e38652e75ef5217d --- Module_tail_build.mk | 1 + tail_build/prj/build.lst | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Module_tail_build.mk b/Module_tail_build.mk index db82ee13c720..a0c958bd493d 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -124,6 +124,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ salhelper \ sane \ sax \ + $(call gb_Helper_optional,SAXON,saxon) \ sc \ scaddins \ sccomp \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 5e84fda48129..4129e2084473 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL +tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL -- cgit From 36158d016420a4a7a1eff405560d7637affa5372 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 1 Oct 2012 09:42:40 +0100 Subject: menus are way too wide, wrong checkbox/radiobutton width Change-Id: Ib8f1a21f19812092e2561621909f74fd98af2857 --- vcl/source/window/menu.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index c8f2e9718d51..2920878724bc 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2254,7 +2254,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, lon ) { rCheckHeight = aNativeBounds.GetHeight(); - nCheckWidth = aNativeBounds.GetWidth(); + nCheckWidth = aNativeContent.GetWidth(); } } if( pWin->IsNativeControlSupported( CTRL_MENU_POPUP, PART_MENU_ITEM_RADIO_MARK ) ) @@ -2270,7 +2270,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, lon ) { rRadioHeight = aNativeBounds.GetHeight(); - nRadioWidth = aNativeBounds.GetWidth(); + nRadioWidth = aNativeContent.GetWidth(); } } } -- cgit From a428b694a63fbc785cc7c0748e6fd0ce2d23b4b8 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 28 Sep 2012 17:45:21 +0200 Subject: fdo#52475 fix import of RTF_CHCBPAT with value 0 0 means auto, and for fdo#50539, this value was ignored. However a next sample shows that we should send something to the dmapper: COL_AUTO. Change-Id: I8d7d35125c9027dfb45288bbfbfa81ba4799e78d --- sw/qa/extras/rtfimport/data/fdo52475.rtf | 5 +++++ sw/qa/extras/rtfimport/rtfimport.cxx | 9 +++++++++ writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 +-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 sw/qa/extras/rtfimport/data/fdo52475.rtf diff --git a/sw/qa/extras/rtfimport/data/fdo52475.rtf b/sw/qa/extras/rtfimport/data/fdo52475.rtf new file mode 100644 index 000000000000..fe4a557d77ca --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo52475.rtf @@ -0,0 +1,5 @@ +{\rtf1 +{\colortbl;\red228\green228\blue228;} +before \chcbpat1 highlighted\chcbpat0 after +\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 61813f1c5555..997e33db4c0e 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -108,6 +108,7 @@ public: void testInk(); void testFdo52389(); void testFdo49655(); + void testFdo52475(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -159,6 +160,7 @@ public: CPPUNIT_TEST(testInk); CPPUNIT_TEST(testFdo52389); CPPUNIT_TEST(testFdo49655); + CPPUNIT_TEST(testFdo52475); #endif CPPUNIT_TEST_SUITE_END(); @@ -843,6 +845,13 @@ void Test::testFdo49655() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); } +void Test::testFdo52475() +{ + // The problem was that \chcbpat0 resulted in no color, instead of COL_AUTO. + load("fdo52475.rtf"); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty(getRun(getParagraph(1), 3), "CharBackColor")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 5e3365431b5b..d56307fbe803 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2566,9 +2566,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) m_aDefaultState.aCharacterSprms.set(NS_sprm::LN_CLidBi, pIntValue); break; case RTF_CHCBPAT: - if (nParam) { - RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam))); + RTFValue::Pointer_t pValue(new RTFValue(nParam ? getColorTable(nParam) : COL_AUTO)); lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue); } break; -- cgit From 1cccf3b255ac624e6cdaf2b7bf941edf34035816 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 11:43:05 +0200 Subject: Revert "take out @PLATFORM@ from extension ID" This reverts commit 21a82f4f91eb9940e5dd01c75e2f68721a431f09. --- sdext/CustomTarget_presenter.mk | 41 ++++++++++++++++++++++ sdext/Extension_presenter.mk | 4 +-- sdext/Module_sdext.mk | 1 + sdext/source/minimizer/description.xml | 2 +- sdext/source/pdfimport/description.xml | 2 +- sdext/source/presenter/description.xml | 2 +- .../en-US/com.sun.PresenterScreen/presenter.xhp | 2 +- 7 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 sdext/CustomTarget_presenter.mk diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk new file mode 100644 index 000000000000..afecd49f763a --- /dev/null +++ b/sdext/CustomTarget_presenter.mk @@ -0,0 +1,41 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)) + +$(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \ + $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp + +include $(SRCDIR)/sdext/platform.mk + +$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \ + $(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \ + | $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) + sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@ + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk index 771f8d6f178c..66f93a8f2a81 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -141,9 +141,9 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \ )) -$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) +$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) -$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen)) +$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(sdext_PLATFORM))) diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index 0ab6444d1a3a..7bba9d936232 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -56,6 +56,7 @@ endif ifeq ($(ENABLE_PRESENTER_SCREEN),YES) $(eval $(call gb_Module_add_targets,sdext,\ Configuration_presenter \ + CustomTarget_presenter \ Extension_presenter \ Library_presenter \ Rdb_presenter \ diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index 2ef926854bbe..f071a0622ecf 100644 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -5,7 +5,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dep="http://openoffice.org/extensions/description/2006"> - + diff --git a/sdext/source/pdfimport/description.xml b/sdext/source/pdfimport/description.xml index 893f62a8cd06..08160046f0fd 100644 --- a/sdext/source/pdfimport/description.xml +++ b/sdext/source/pdfimport/description.xml @@ -4,7 +4,7 @@ xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dep="http://openoffice.org/extensions/description/2006"> - + diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 8be0767c95e7..be71e449113f 100644 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -5,7 +5,7 @@ xmlns:dep="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp index c57997175a92..1c07357eac78 100644 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp +++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp @@ -34,7 +34,7 @@ Presenter Console Keyboard Shortcuts - /com.sun.PresenterScreen/presenter.xhp + /com.sun.PresenterScreen-PLATFORMID/presenter.xhp -- cgit From 074236253344cd51892c1feecdbe07c8365fcb95 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 1 Oct 2012 11:46:24 +0200 Subject: Fail early if getPackageLocation fails; plus clean-up Change-Id: Ifa7d589e7854fed9cd9ca2a3f3c987179b60199f --- sdext/source/pdfimport/wrapper/wrapper.cxx | 33 ++++++++++++++---------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 2d76fff27419..77ce15bf531e 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -44,7 +44,7 @@ #include "com/sun/star/io/XInputStream.hpp" #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/awt/FontDescriptor.hpp" -#include "com/sun/star/deployment/XPackageInformationProvider.hpp" +#include "com/sun/star/deployment/PackageInformationProvider.hpp" #include "com/sun/star/beans/XMaterialHolder.hpp" #include "com/sun/star/rendering/PathCapType.hpp" #include "com/sun/star/rendering/PathJoinType.hpp" @@ -999,24 +999,21 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR if( checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) == false ) return false; - rtl::OUStringBuffer converterURL = rtl::OUString("xpdfimport"); - - // retrieve package location url (xpdfimport executable is located there) - // --------------------------------------------------- - uno::Reference xProvider( - xContext->getValueByName( - rtl::OUString("/singletons/com.sun.star.deployment.PackageInformationProvider")), - uno::UNO_QUERY); - if( xProvider.is() ) - { - converterURL.insert( - 0, - rtl::OUString("/")); - converterURL.insert( - 0, - xProvider->getPackageLocation( - rtl::OUString::createFromAscii(PDFI_IMPL_IDENTIFIER))); + // Retrieve package location URL, xpdfimport executable is located there: + OUString location( + deployment::PackageInformationProvider::get(xContext)-> + getPackageLocation(PDFI_IMPL_IDENTIFIER)); + if (location.isEmpty()) { + SAL_WARN( + "sdext.pdfimport", + "getPackageLocation(" PDFI_IMPL_IDENTIFIER ") failed"); + return false; + } + rtl::OUStringBuffer converterURL(location); + if (!location.endsWith("/")) { + converterURL.append('/'); } + converterURL.append("xpdfimport"); // spawn separate process to keep LGPL/GPL code apart. // --------------------------------------------------- -- cgit From dc27f1891ec29328a250b4f8cb87ac90473a8825 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 29 Sep 2012 08:33:27 +0900 Subject: use "LibreOffice" as the default value of ProductKey for crashrep Change-Id: I12bab12ad32f4965b55d94dfd2d6fe8894129763 Reviewed-on: https://gerrit.libreoffice.org/721 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- crashrep/source/win32/soreport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp index daedb6290212..0721950393c4 100644 --- a/crashrep/source/win32/soreport.cpp +++ b/crashrep/source/win32/soreport.cpp @@ -2226,7 +2226,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams ) GetPrivateProfileString( TEXT("Bootstrap"), TEXT("ProductKey"), - TEXT("OpenOffice.org"), + TEXT("LibreOffice"), szBuffer, SAL_N_ELEMENTS(szBuffer), szModuleName ) -- cgit From 1a597d6a5919e7d26958f380da7294eb0eebca6a Mon Sep 17 00:00:00 2001 From: Korrawit Pruegsanusak Date: Sat, 29 Sep 2012 11:29:56 +0700 Subject: configure.in: edit message checking for new GStreamer 1.0 to not duplicate the message checking for old one and be consistent with the help message in AS_HELP_STRING Change-Id: I91e0a5ed0e2278de013d7872eadc6f93b970c231 Reviewed-on: https://gerrit.libreoffice.org/722 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 7c7ce66297b6..906c530da25a 100644 --- a/configure.in +++ b/configure.in @@ -9519,7 +9519,7 @@ ENABLE_GSTREAMER="" if test "$build_gstreamer" = "yes"; then - AC_MSG_CHECKING([whether to enable the GStreamer avmedia backend]) + AC_MSG_CHECKING([whether to enable the new GStreamer 1.0 avmedia backend]) if test "x$enable_gstreamer" != "xno"; then ENABLE_GSTREAMER="TRUE" AC_MSG_RESULT([yes]) -- cgit From 1297ded2de9c8eaf0dd460fa4353a3e06765c400 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:06:53 +0300 Subject: Deduplication of TemplatePopup_Impl for disable-dynlinking Change-Id: I3e49ab8bd3411be8fcfa7ab43b50cbb2d82b6de0 --- sd/source/ui/app/tmplctrl.cxx | 12 ++++++------ sw/source/ui/utlui/tmplctrl.cxx | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 3978631d5425..63abbc568437 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -31,12 +31,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SdTemplateControl, SfxStringItem ); -// class TemplatePopup_Impl -------------------------------------------------- +// class SdTemplatePopup_Impl -------------------------------------------------- -class TemplatePopup_Impl : public PopupMenu +class SdTemplatePopup_Impl : public PopupMenu { public: - TemplatePopup_Impl(); + SdTemplatePopup_Impl(); sal_uInt16 GetCurId() const { return nCurId; } @@ -48,7 +48,7 @@ private: // ----------------------------------------------------------------------- -TemplatePopup_Impl::TemplatePopup_Impl() : +SdTemplatePopup_Impl::SdTemplatePopup_Impl() : PopupMenu(), nCurId(USHRT_MAX) { @@ -56,7 +56,7 @@ TemplatePopup_Impl::TemplatePopup_Impl() : // ----------------------------------------------------------------------- -void TemplatePopup_Impl::Select() +void SdTemplatePopup_Impl::Select() { nCurId = GetCurItemId(); } @@ -114,7 +114,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) return; CaptureMouse(); - TemplatePopup_Impl aPop; + SdTemplatePopup_Impl aPop; { const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD); diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index b43d9c682f80..fba6dd705351 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -36,12 +36,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SwTemplateControl, SfxStringItem ); -// class TemplatePopup_Impl -------------------------------------------------- +// class SwTemplatePopup_Impl -------------------------------------------------- -class TemplatePopup_Impl : public PopupMenu +class SwTemplatePopup_Impl : public PopupMenu { public: - TemplatePopup_Impl(); + SwTemplatePopup_Impl(); sal_uInt16 GetCurId() const { return nCurId; } @@ -51,13 +51,13 @@ private: virtual void Select(); }; -TemplatePopup_Impl::TemplatePopup_Impl() : +SwTemplatePopup_Impl::SwTemplatePopup_Impl() : PopupMenu(), nCurId(USHRT_MAX) { } -void TemplatePopup_Impl::Select() +void SwTemplatePopup_Impl::Select() { nCurId = GetCurItemId(); } @@ -98,7 +98,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt ) GetStatusBar().GetItemText( GetId() ).Len() ) { CaptureMouse(); - TemplatePopup_Impl aPop; + SwTemplatePopup_Impl aPop; { SwView* pView = ::GetActiveView(); SwWrtShell* pWrtShell; -- cgit From 645181f46472d459026d87c39b3475e834390761 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:22:51 +0300 Subject: Prefixify lotuswordpro Change-Id: I9b30477d94995adef51a76bdf298d1815f511e9e --- lotuswordpro/source/filter/genericfilter.cxx | 2 +- lotuswordpro/util/lwpfilter.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx index 1a374720c460..8708ae2cd958 100644 --- a/lotuswordpro/source/filter/genericfilter.cxx +++ b/lotuswordpro/source/filter/genericfilter.cxx @@ -16,7 +16,7 @@ using namespace ::com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL lotuswordpro_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/lotuswordpro/util/lwpfilter.component b/lotuswordpro/util/lwpfilter.component index 030c75992ff6..4989843c49c6 100644 --- a/lotuswordpro/util/lwpfilter.component +++ b/lotuswordpro/util/lwpfilter.component @@ -1,5 +1,5 @@ - -- cgit From 4a1e37a66c2093cd1de96f68ae244f856822a7bd Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:24:22 +0300 Subject: Prefixify svgfilter Change-Id: Ifd34a186cd25bafbfd49dad8a1d5bd30756d83d3 --- filter/source/svg/svgfilter.component | 2 +- filter/source/svg/svgfilter.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filter/source/svg/svgfilter.component b/filter/source/svg/svgfilter.component index c4d5bffa0f37..f99b514e2919 100644 --- a/filter/source/svg/svgfilter.component +++ b/filter/source/svg/svgfilter.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 0187a902b7fc..ea25cdddf954 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -302,7 +302,7 @@ namespace sdecl = comphelper::service_decl; "com.sun.star.document.ExtendedTypeDetection" ); // The C shared lib entry points -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL svgfilter_component_getFactory( sal_Char const* pImplName, ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, ::com::sun::star::registry::XRegistryKey* pRegistryKey ) -- cgit From a22c7d8fa3663794e07910b832e8e4ed4809b488 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:24:37 +0300 Subject: Prefixify t602filter Change-Id: I652ffdf009f6078c723a0f0932256adb183e7513 --- filter/source/t602/filterenv.cxx | 4 ++++ filter/source/t602/t602filter.component | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx index a8046326b978..1963ddba8635 100644 --- a/filter/source/t602/filterenv.cxx +++ b/filter/source/t602/filterenv.cxx @@ -44,6 +44,10 @@ using namespace T602ImportFilter; extern "C" { +#ifdef DISABLE_DYNLOADING +#define component_getFactory t602filter_component_getFactory +#endif + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { diff --git a/filter/source/t602/t602filter.component b/filter/source/t602/t602filter.component index fe512bf483ca..cb36327882da 100644 --- a/filter/source/t602/t602filter.component +++ b/filter/source/t602/t602filter.component @@ -26,7 +26,7 @@ * **********************************************************************--> - -- cgit From 618dd74950d9c899a044089fa1f9117b97095f85 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:26:25 +0300 Subject: Deduplication of lcl_HasOnlyControls for disable-dynlinking Change-Id: I56a9da0493fdbee7bff4d342d5e29a83ce289530 --- sc/source/ui/app/drwtrans.cxx | 2 +- sd/source/ui/app/sdxfer.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index a5137b913a1e..a78afe7bd998 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -281,7 +281,7 @@ ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( Window* ) return pObj; } -sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) +static sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) { sal_Bool bOnlyControls = false; // default if there are no objects diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 353709c35d54..8653fc6f546d 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -356,7 +356,7 @@ void SdTransferable::CreateData() // ----------------------------------------------------------------------------- -sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) +static sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) { sal_Bool bOnlyControls = sal_False; // default if there are no objects -- cgit From 26af0cf3faefbab52fa86955bbe871c96e3b22ca Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:29:42 +0300 Subject: Deduplication of NavigationOrderAccess for disable-dynlinking Change-Id: I70238711222a12cb6bd843ebbc742a21a325810d --- sd/source/ui/unoidl/unopage.cxx | 18 +++++++++--------- xmloff/source/draw/ximppage.cxx | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index fcdae15a7cda..614cb88c4593 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -2602,10 +2602,10 @@ void SdGenericDrawPage::setNavigationOrder( const Any& rValue ) throw IllegalArgumentException(); } -class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > +class SdNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > { public: - NavigationOrderAccess( SdrPage* pPage ); + SdNavigationOrderAccess( SdrPage* pPage ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException); @@ -2619,7 +2619,7 @@ private: std::vector< Reference< XShape > > maShapes; }; -NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage ) +SdNavigationOrderAccess::SdNavigationOrderAccess( SdrPage* pPage ) : maShapes( static_cast< sal_uInt32 >( pPage ? pPage->GetObjCount() : 0 ) ) { if( pPage ) @@ -2630,19 +2630,19 @@ NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage ) { SdrObject* pObj = pPage->GetObj( nIndex ); sal_uInt32 nNavPos = pObj->GetNavigationPosition(); - DBG_ASSERT( !maShapes[nNavPos].is(), "sd::NavigationOrderAccess::NavigationOrderAccess(), duplicate navigation positions from core!" ); + DBG_ASSERT( !maShapes[nNavPos].is(), "sd::SdNavigationOrderAccess::SdNavigationOrderAccess(), duplicate navigation positions from core!" ); maShapes[nNavPos] = Reference< XShape >( pObj->getUnoShape(), UNO_QUERY ); } } } // XIndexAccess -sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount( ) throw (RuntimeException) { return static_cast< sal_Int32 >( maShapes.size() ); } -Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) +Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { if( (Index < 0) || (Index > getCount()) ) throw IndexOutOfBoundsException(); @@ -2651,12 +2651,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu } // XElementAccess -Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException) +Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeException) { return XShape::static_type(); } -sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException) +sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException) { return maShapes.empty() ? sal_False : sal_True; } @@ -2665,7 +2665,7 @@ Any SdGenericDrawPage::getNavigationOrder() { if( GetPage()->HasObjectNavigationOrder() ) { - return Any( Reference< XIndexAccess >( new NavigationOrderAccess( GetPage() ) ) ); + return Any( Reference< XIndexAccess >( new SdNavigationOrderAccess( GetPage() ) ) ); } else { diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 9346e6aefb3e..7e57d11df8a8 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -563,10 +563,10 @@ void SdXMLGenericPageContext::SetPageMaster( OUString& rsPageMasterName ) } } -class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > +class XoNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > { public: - NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ); + XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException); @@ -580,18 +580,18 @@ private: std::vector< Reference< XShape > > maShapes; }; -NavigationOrderAccess::NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ) +XoNavigationOrderAccess::XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ) { maShapes.swap( rShapes ); } // XIndexAccess -sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL XoNavigationOrderAccess::getCount( ) throw (RuntimeException) { return static_cast< sal_Int32 >( maShapes.size() ); } -Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) +Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { if( (Index < 0) || (Index > getCount()) ) throw IndexOutOfBoundsException(); @@ -600,12 +600,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu } // XElementAccess -Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException) +Type SAL_CALL XoNavigationOrderAccess::getElementType( ) throw (RuntimeException) { return XShape::static_type(); } -sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException) +sal_Bool SAL_CALL XoNavigationOrderAccess::hasElements( ) throw (RuntimeException) { return maShapes.empty() ? sal_False : sal_True; } @@ -640,7 +640,7 @@ void SdXMLGenericPageContext::SetNavigationOrder() } Reference< XPropertySet > xSet( mxShapes, UNO_QUERY_THROW ); - xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new NavigationOrderAccess( aShapes ) ) ) ); + xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new XoNavigationOrderAccess( aShapes ) ) ) ); } catch(const uno::Exception&) { -- cgit From f414326d862c249388f86e636008a60fc4cb31b0 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:30:15 +0300 Subject: Deduplication of ImplGetSupportedMacroItems for disable-dynlinking Change-Id: If6fb0a2152041f65d2e4b38dfbf87491b323f28f --- svx/source/unodraw/unomod.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 47c96c889917..b07ee322bad9 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -106,7 +106,7 @@ public: }; //-//////////////////////////////////////////////////////////////////// -const SvEventDescription* ImplGetSupportedMacroItems() +static const SvEventDescription* ImplGetSupportedMacroItems() { static const SvEventDescription aMacroDescriptionsImpl[] = { -- cgit From c2346026dda82abb94f88dc106066e49c4047047 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:30:38 +0300 Subject: Deduplication of aEmptyStr for disable-dynlinking Change-Id: I9525be3b0f238abb106b1c57549436272e1eb165 --- sd/source/ui/view/viewshe2.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index c1ce1e5e27f3..4c4a06a86656 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -85,7 +85,9 @@ using namespace com::sun::star; +#ifndef DISABLE_DYNLOADING // otherwise use the one in sw... const String aEmptyStr; +#endif namespace sd { -- cgit From facb07ac2bb9eee692734f4d34e551ca48ceafba Mon Sep 17 00:00:00 2001 From: László Németh Date: Sat, 29 Sep 2012 00:05:34 +0200 Subject: Add back compatible Hungarian date format acceptance Change-Id: I6b6d62cda241250db89cdcabaa04952d36e1acfd Reviewed-on: https://gerrit.libreoffice.org/720 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- i18npool/source/localedata/data/hu_HU.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/i18npool/source/localedata/data/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml index 2345e313377b..2b5d5ba3c12e 100644 --- a/i18npool/source/localedata/data/hu_HU.xml +++ b/i18npool/source/localedata/data/hu_HU.xml @@ -52,6 +52,8 @@ metric + M-D + M.D Standard -- cgit From 3c31c3c4b3ca08b171e593d2dd5cfa575a9721cc Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 13:29:38 +0300 Subject: Prefixify textfd Change-Id: I42c9166dcf6d256d071a3edb20ab64184fef1f89 --- filter/source/textfilterdetect/fdcomp.cxx | 2 +- filter/source/textfilterdetect/textfd.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filter/source/textfilterdetect/fdcomp.cxx b/filter/source/textfilterdetect/fdcomp.cxx index 6be78b323702..85b9f3b8362a 100644 --- a/filter/source/textfilterdetect/fdcomp.cxx +++ b/filter/source/textfilterdetect/fdcomp.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL textfd_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { void* pRet = NULL; diff --git a/filter/source/textfilterdetect/textfd.component b/filter/source/textfilterdetect/textfd.component index e1708e772e72..d2d333abebbe 100644 --- a/filter/source/textfilterdetect/textfd.component +++ b/filter/source/textfilterdetect/textfd.component @@ -28,7 +28,7 @@ * instead of those above. **************************************************************************--> - -- cgit From 39bac3f6c0a29d4d6ef7d6a636b8204cf12b4866 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 15:19:10 +0200 Subject: translations is a source-only module Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4 --- accessibility/prj/build.lst | 2 +- avmedia/prj/build.lst | 2 +- basctl/prj/build.lst | 2 +- basic/prj/build.lst | 2 +- chart2/prj/build.lst | 2 +- connectivity/prj/build.lst | 2 +- crashrep/prj/build.lst | 2 +- dbaccess/prj/build.lst | 2 +- desktop/prj/build.lst | 2 +- extensions/prj/build.lst | 2 +- filter/prj/build.lst | 2 +- forms/prj/build.lst | 2 +- fpicker/prj/build.lst | 2 +- framework/prj/build.lst | 2 +- nlpsolver/prj/build.lst | 2 +- officecfg/prj/build.lst | 2 +- readlicense_oo/prj/build.lst | 2 +- reportdesign/prj/build.lst | 2 +- sc/prj/build.lst | 2 +- scaddins/prj/build.lst | 2 +- sccomp/prj/build.lst | 2 +- scp2/prj/build.lst | 2 +- sd/prj/build.lst | 2 +- sfx2/prj/build.lst | 2 +- shell/prj/build.lst | 2 +- starmath/prj/build.lst | 2 +- svtools/prj/build.lst | 2 +- svx/prj/build.lst | 2 +- sw/prj/build.lst | 2 +- swext/prj/build.lst | 2 +- uui/prj/build.lst | 2 +- wizards/prj/build.lst | 2 +- xmlsecurity/prj/build.lst | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst index 681c3d12cbfc..79b8f02336d2 100644 --- a/accessibility/prj/build.lst +++ b/accessibility/prj/build.lst @@ -1,3 +1,3 @@ -ac accessibility : TRANSLATIONS:translations tools jurt offapi unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL +ac accessibility : tools jurt offapi unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL ac accessibility usr1 - all ac_mkout NULL ac accessibility\prj nmake - all ac_prj NULL diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst index 4cc76ade9f4f..1f84c10eac47 100644 --- a/avmedia/prj/build.lst +++ b/avmedia/prj/build.lst @@ -1,2 +1,2 @@ -av avmedia : TRANSLATIONS:translations tools sfx2 LIBXSLT:libxslt NULL +av avmedia : tools sfx2 LIBXSLT:libxslt NULL av avmedia\prj nmake - all av_prj NULL diff --git a/basctl/prj/build.lst b/basctl/prj/build.lst index a92b34691792..f9157aaafed4 100644 --- a/basctl/prj/build.lst +++ b/basctl/prj/build.lst @@ -1,3 +1,3 @@ -bc basctl : LIBXSLT:libxslt TRANSLATIONS:translations svx NULL +bc basctl : LIBXSLT:libxslt svx NULL bc basctl usr1 - all bc_mkout NULL bc basctl\prj nmake - all bc_prj NULL diff --git a/basic/prj/build.lst b/basic/prj/build.lst index e6128bc8886f..64e14d386e99 100644 --- a/basic/prj/build.lst +++ b/basic/prj/build.lst @@ -1,3 +1,3 @@ -sb basic : TRANSLATIONS:translations offapi oovbaapi svtools xmlscript framework salhelper LIBXSLT:libxslt unotest NULL +sb basic : offapi oovbaapi svtools xmlscript framework salhelper LIBXSLT:libxslt unotest NULL sb basic usr1 - all sb_mkout NULL sb basic\prj nmake - all sb_prj NULL diff --git a/chart2/prj/build.lst b/chart2/prj/build.lst index c21ce8f2b313..89ae90af17ff 100644 --- a/chart2/prj/build.lst +++ b/chart2/prj/build.lst @@ -1,3 +1,3 @@ -ch chart2 : offapi TRANSLATIONS:translations comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL +ch chart2 : offapi comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL ch chart2 usr1 - all ch_mkout NULL ch chart2\prj nmake - all ch_prj NULL diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 859142e6092c..8dc24e57c014 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,2 +1,2 @@ -cn connectivity : shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL +cn connectivity : shell comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL diff --git a/crashrep/prj/build.lst b/crashrep/prj/build.lst index caf9515f85d1..5d22c2d35083 100644 --- a/crashrep/prj/build.lst +++ b/crashrep/prj/build.lst @@ -1,4 +1,4 @@ -cr crashrep : TRANSLATIONS:translations sal sysui shell NULL +cr crashrep : sal sysui shell NULL cr crashrep usr1 - all cr_mkout NULL cr crashrep\source\all nmake - all cr_sresource NULL cr crashrep\source\unx nmake - u cr_sunx NULL diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst index ce429ec516f6..51fbd9800486 100644 --- a/dbaccess/prj/build.lst +++ b/dbaccess/prj/build.lst @@ -1,3 +1,3 @@ -ba dbaccess : TRANSLATIONS:translations BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript LIBXSLT:libxslt test NULL +ba dbaccess : BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript LIBXSLT:libxslt test NULL ba dbaccess usr1 - all ba_mkout NULL ba dbaccess\prj nmake - all ba_prj NULL diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst index c9644a09a253..be8baca84930 100644 --- a/desktop/prj/build.lst +++ b/desktop/prj/build.lst @@ -1,3 +1,3 @@ -dt desktop : TRANSLATIONS:translations sfx2 stoc BERKELEYDB:berkeleydb BOOST:boost svx DESKTOP:xmlhelp sal salhelper unoil officecfg offapi filter LIBXSLT:libxslt DESKTOP:helpcompiler NULL +dt desktop : sfx2 stoc BERKELEYDB:berkeleydb BOOST:boost svx DESKTOP:xmlhelp sal salhelper unoil officecfg offapi filter LIBXSLT:libxslt DESKTOP:helpcompiler NULL dt desktop usr1 - all dt_mkout NULL dt desktop\prj nmake - all dt_prj NULL diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index c7fd3ed4f30a..0f2cae7aa1cb 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -1,4 +1,4 @@ -ex extensions : officecfg salhelper OPENLDAP:openldap TRANSLATIONS:translations DESKTOP:rdbmaker svx SANE:sane TWAIN:twain np_sdk offapi stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt CPPUNIT:cppunit NULL +ex extensions : officecfg salhelper OPENLDAP:openldap DESKTOP:rdbmaker svx SANE:sane TWAIN:twain np_sdk offapi stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt CPPUNIT:cppunit NULL ex extensions\prj nmake - all ex_prj NULL # Fails at the moment diff --git a/filter/prj/build.lst b/filter/prj/build.lst index 9083dc77766a..9af8fbc62ede 100644 --- a/filter/prj/build.lst +++ b/filter/prj/build.lst @@ -1,2 +1,2 @@ -fl filter : TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal salhelper svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package PYTHON:python NULL +fl filter : svtools unotools xmloff cppu tools cppuhelper sal salhelper svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package PYTHON:python NULL fl filter\prj nmake - all fl_prj NULL diff --git a/forms/prj/build.lst b/forms/prj/build.lst index 599b6c7de5e7..b48cd5d58935 100644 --- a/forms/prj/build.lst +++ b/forms/prj/build.lst @@ -1,4 +1,4 @@ -fm forms : TRANSLATIONS:translations oovbaapi salhelper svx sfx2 QADEVOOO:qadevOOo LIBXSLT:libxslt NULL +fm forms : oovbaapi salhelper svx sfx2 QADEVOOO:qadevOOo LIBXSLT:libxslt NULL fm forms usr1 - all fm_mkofrm NULL fm forms\prj nmake - all fm_prj NULL diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst index 6c6a8928a413..423d94800fb9 100644 --- a/fpicker/prj/build.lst +++ b/fpicker/prj/build.lst @@ -1,2 +1,2 @@ -fp fpicker : LIBXSLT:libxslt TRANSLATIONS:translations DESKTOP:rdbmaker svtools ucb NULL +fp fpicker : LIBXSLT:libxslt DESKTOP:rdbmaker svtools ucb NULL fp fpicker\prj nmake - all fp_prj NULL diff --git a/framework/prj/build.lst b/framework/prj/build.lst index a97c7e29161f..ab80a41682fd 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -1,2 +1,2 @@ -fr framework : LIBXSLT:libxslt TRANSLATIONS:translations svtools ucb NULL +fr framework : LIBXSLT:libxslt svtools ucb NULL fr framework\prj nmake - all fr_all NULL diff --git a/nlpsolver/prj/build.lst b/nlpsolver/prj/build.lst index 02d079abffbf..70eec6228769 100644 --- a/nlpsolver/prj/build.lst +++ b/nlpsolver/prj/build.lst @@ -1,2 +1,2 @@ -nlpsolver nlpsolver : javaunohelper unoil jurt TRANSLATIONS:translations DESKTOP:helpcompiler NULL +nlpsolver nlpsolver : javaunohelper unoil jurt DESKTOP:helpcompiler NULL nlpsolver nlpsolver\prj nmake - all nlp_prj NULL diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst index f4a9142c850e..8f0653ad8eaf 100644 --- a/officecfg/prj/build.lst +++ b/officecfg/prj/build.lst @@ -1,2 +1,2 @@ -oc officecfg : TRANSLATIONS:translations soltools solenv LIBXSLT:libxslt NULL +oc officecfg : soltools solenv LIBXSLT:libxslt NULL oc officecfg\prj nmake - all oc_prj NULL diff --git a/readlicense_oo/prj/build.lst b/readlicense_oo/prj/build.lst index 7cfbc48b0a32..3f972d5be920 100644 --- a/readlicense_oo/prj/build.lst +++ b/readlicense_oo/prj/build.lst @@ -1,4 +1,4 @@ -ro readlicense_oo : TRANSLATIONS:translations DESKTOP:l10ntools solenv LIBXSLT:libxslt NULL +ro readlicense_oo : DESKTOP:l10ntools solenv LIBXSLT:libxslt NULL ro readlicense_oo usr1 - all ro_root NULL ro readlicense_oo\prj nmake - all ro_prj NULL diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst index cf0e16c24999..98d5b2400456 100644 --- a/reportdesign/prj/build.lst +++ b/reportdesign/prj/build.lst @@ -1,2 +1,2 @@ -rd reportdesign : TRANSLATIONS:translations BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL +rd reportdesign : BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL rd reportdesign\prj nmake - all rd_prj NULL diff --git a/sc/prj/build.lst b/sc/prj/build.lst index 1acd868dcb4a..93311e725d78 100644 --- a/sc/prj/build.lst +++ b/sc/prj/build.lst @@ -1,2 +1,2 @@ -sc sc : basic filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting chart2 eventattacher forms scaddins xmlsecurity tubes liborcus NULL +sc sc : basic filter vbahelper oovbaapi svx uui stoc BOOST:boost formula mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting chart2 eventattacher forms scaddins xmlsecurity tubes liborcus NULL sc sc\prj nmake - all sc_prj NULL diff --git a/scaddins/prj/build.lst b/scaddins/prj/build.lst index e94a5a367481..38f01cfa1f23 100644 --- a/scaddins/prj/build.lst +++ b/scaddins/prj/build.lst @@ -1,3 +1,3 @@ -ca scaddins : LIBXSLT:libxslt TRANSLATIONS:translations vcl NULL +ca scaddins : LIBXSLT:libxslt vcl NULL ca scaddins usr1 - all sc_mkout NULL ca scaddins\prj nmake - all sc_prj NULL diff --git a/sccomp/prj/build.lst b/sccomp/prj/build.lst index 6f3bd231f857..e1a452695407 100644 --- a/sccomp/prj/build.lst +++ b/sccomp/prj/build.lst @@ -1,3 +1,3 @@ -scc sccomp : TRANSLATIONS:translations offapi comphelper LPSOLVE:lpsolve tools DESKTOP:rsc LIBXSLT:libxslt NULL +scc sccomp : offapi comphelper LPSOLVE:lpsolve tools DESKTOP:rsc LIBXSLT:libxslt NULL scc sccomp usr1 - all scc_mkout NULL scc sccomp\prj nmake - all scc_prj NULL diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index 35249814f435..19b2e9664a79 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -1,3 +1,3 @@ -cp scp2 : TRANSLATIONS:translations i18npool DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL +cp scp2 : i18npool DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL cp scp2 usr1 - all cp_mkout NULL cp scp2\prj nmake - all cp_prj NULL diff --git a/sd/prj/build.lst b/sd/prj/build.lst index b340431f8e2f..644fc6e10cda 100644 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,3 +1,3 @@ -sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess BLUEZ:bluez_bluetooth NULL +sd sd : filter animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess BLUEZ:bluez_bluetooth NULL sd sd usr1 - all sd_mkout NULL sd sd\prj nmake - all sd_prj NULL diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index e56d8946fece..7a97de18b158 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,2 +1,2 @@ -sf sfx2 : TRANSLATIONS:translations NATIVE:idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL +sf sfx2 : NATIVE:idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL sf sfx2\prj nmake - all sf_prj NULL diff --git a/shell/prj/build.lst b/shell/prj/build.lst index 7ce3d91f6edc..771af1cb0a64 100644 --- a/shell/prj/build.lst +++ b/shell/prj/build.lst @@ -1,2 +1,2 @@ -sl shell : TRANSLATIONS:translations offapi DESKTOP:rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL +sl shell : offapi DESKTOP:rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL sl shell\prj nmake - all sl_prj NULL diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst index 924ca7fd9e81..4546255abf04 100644 --- a/starmath/prj/build.lst +++ b/starmath/prj/build.lst @@ -1,2 +1,2 @@ -sm starmath : LIBXSLT:libxslt TRANSLATIONS:translations svx configmgr dtrans ure test NULL +sm starmath : LIBXSLT:libxslt svx configmgr dtrans ure test NULL sm starmath\prj nmake - all sm_prj NULL diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst index 6ca87fcb9fc7..e4352563e760 100644 --- a/svtools/prj/build.lst +++ b/svtools/prj/build.lst @@ -1,2 +1,2 @@ -st svtools : TRANSLATIONS:translations svl offapi toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper configmgr sal salhelper sot jvmfwk LIBXSLT:libxslt ure test NULL +st svtools : svl offapi toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper configmgr sal salhelper sot jvmfwk LIBXSLT:libxslt ure test NULL st svtools\prj nmake - all st_prj NULL diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 915bcc58decf..12e2531a9d39 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,2 +1,2 @@ -sx svx : sfx2 TRANSLATIONS:translations oovbaapi DBCONNECTIVITY:connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL +sx svx : sfx2 oovbaapi DBCONNECTIVITY:connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL sx svx\prj nmake - all sx_prj NULL diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 0ff450fc126e..a46128c9ee0c 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,2 +1,2 @@ -sw sw : filter TRANSLATIONS:translations configmgr DBCONNECTIVITY:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DBCONNECTIVITY:dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL +sw sw : filter configmgr DBCONNECTIVITY:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DBCONNECTIVITY:dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL sw sw\prj nmake - all sw_prj NULL diff --git a/swext/prj/build.lst b/swext/prj/build.lst index e9de7ae55748..e284da6a2912 100644 --- a/swext/prj/build.lst +++ b/swext/prj/build.lst @@ -1,3 +1,3 @@ -swext swext : officecfg TRANSLATIONS:translations DESKTOP:l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml DESKTOP:xmlhelp DESKTOP:helpcompiler NULL +swext swext : officecfg DESKTOP:l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml DESKTOP:xmlhelp DESKTOP:helpcompiler NULL swext swext\prj nmake - all swext_prj NULL diff --git a/uui/prj/build.lst b/uui/prj/build.lst index b2c6640b2c47..44dc696b8bd8 100644 --- a/uui/prj/build.lst +++ b/uui/prj/build.lst @@ -1,2 +1,2 @@ -uu uui : TRANSLATIONS:translations vcl svtools LIBXSLT:libxslt NULL +uu uui : vcl svtools LIBXSLT:libxslt NULL uu uui\prj nmake - all uu_prj NULL diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst index 97a8b05f3901..62db4257cf35 100644 --- a/wizards/prj/build.lst +++ b/wizards/prj/build.lst @@ -1,2 +1,2 @@ -wz wizards : TRANSLATIONS:translations DESKTOP:rsc javaunohelper unoil LIBXSLT:libxslt NULL +wz wizards : DESKTOP:rsc javaunohelper unoil LIBXSLT:libxslt NULL wz wizards\prj nmake - all wz_prj NULL diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst index 9dfe04cc5c81..1f9b0a9786cf 100644 --- a/xmlsecurity/prj/build.lst +++ b/xmlsecurity/prj/build.lst @@ -1,2 +1,2 @@ -xs xmlsecurity : TRANSLATIONS:translations xmloff unotools offapi unoil svx libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL +xs xmlsecurity : xmloff unotools offapi unoil svx libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL xs xmlsecurity\prj nmake - all xs_prj NULL -- cgit From 6ad53b64742fe0ccbef988ce995921274bf99da9 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 16:50:35 +0200 Subject: fdo#50163 move definition of PLATFORMID into configure.in Change-Id: Iea8385aa9213ccde7e6650cb934361597d508250 --- config_host.mk.in | 1 + configure.in | 45 ++++++++++++++++++++++++++++++++++ sdext/CustomTarget_presenter.mk | 4 +--- sdext/Extension_minimizer.mk | 4 ---- sdext/Extension_pdfimport.mk | 4 ---- sdext/Extension_presenter.mk | 8 ++----- sdext/Library_presenter.mk | 2 +- sdext/StaticLibrary_pdfimport_s.mk | 4 +--- sdext/platform.mk | 49 -------------------------------------- solenv/gbuild/Extension.mk | 8 ------- solenv/gbuild/ExtensionTarget.mk | 10 +------- 11 files changed, 52 insertions(+), 87 deletions(-) delete mode 100644 sdext/platform.mk diff --git a/config_host.mk.in b/config_host.mk.in index 473ab5dd69fa..51990d995e03 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -451,6 +451,7 @@ export PERL=@PERL@ export PKGFORMAT=@PKGFORMAT@ export PKGMK=@PKGMK@ export PKG_CONFIG=@PKG_CONFIG@ +export PLATFORMID=@PLATFORMID@ export PNG_TARBALL=@PNG_TARBALL@ export POPPLER_CFLAGS=@POPPLER_CFLAGS@ export POPPLER_LIBS=@POPPLER_LIBS@ diff --git a/configure.in b/configure.in index 906c530da25a..4c44b7d65969 100644 --- a/configure.in +++ b/configure.in @@ -3286,6 +3286,7 @@ aix*) OS=AIX RTL_OS=AIX RTL_ARCH=PowerPC + PLATFORMID=aix_powerpc OUTPATH=unxaigppc P_SEP=: SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib" @@ -3308,11 +3309,13 @@ cygwin*) CPUNAME=X86_64 RTL_ARCH=X86_64 LIB64="lib/x64" + PLATFORMID=windows_x86_64 OUTPATH=wntmscx$COMEX else CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=windows_x86 OUTPATH=wntmsci$COMEX fi ;; @@ -3340,6 +3343,7 @@ darwin*) CPUNAME=ARM RTL_ARCH=ARM_EABI GUIBASE=cocoatouch + PLATFORMID=macosx_arm_eabi OUTPATH=unxiosr OS=IOS ;; @@ -3347,6 +3351,7 @@ darwin*) CPU=P CPUNAME=POWERPC RTL_ARCH=PowerPC + PLATFORMID=macosx_powerpc OUTPATH=unxmacxp ;; i*86) @@ -3356,6 +3361,7 @@ darwin*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=macosx_x86 OUTPATH=unxmacxi ;; x86_64) @@ -3363,11 +3369,13 @@ darwin*) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=macosx_x86_64 OUTPATH=unxmacxx else CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=macosx_x86 OUTPATH=unxmacxi fi ;; @@ -3392,11 +3400,13 @@ dragonfly*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=dragonfly_x86 ;; x86_64) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=dragonfly_x86_64 ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) @@ -3421,12 +3431,14 @@ freebsd*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=freebsd_x86 OUTPATH=unxfbsdi ;; x86_64) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=freebsd_x86_64 ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) @@ -3451,6 +3463,7 @@ kfreebsd*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=kfreebsd_x86 OUTPATH=unxkfgi6 ;; x86_64) @@ -3458,6 +3471,7 @@ kfreebsd*) CPUNAME=X86_64 RTL_ARCH=X86_64 LIB64="lib64" + PLATFORMID=kfreebsd_x86_64 OUTPATH=unxkfgx6 ;; *) @@ -3483,6 +3497,7 @@ linux-gnu*) CPU=L CPUNAME=AXP RTL_ARCH=ALPHA + PLATFORMID=linux_alpha OUTPATH=unxlngaxp ;; arm*) @@ -3491,9 +3506,11 @@ linux-gnu*) EPM_FLAGS="-a arm" OUTPATH=unxlngr RTL_ARCH=ARM_EABI + PLATFORMID=linux_arm_eabi case "$host_cpu" in arm*-linux) RTL_ARCH=ARM_OABI + PLATFORMID=linux_arm_oabi ;; esac ;; @@ -3502,18 +3519,21 @@ linux-gnu*) CPUNAME=HPPA RTL_ARCH=HPPA EPM_FLAGS="-a hppa" + PLATFORMID=linux_hppa OUTPATH=unxlnghppa ;; i*86) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=linux_x86 OUTPATH=unxlngi6 ;; ia64) CPU=A CPUNAME=IA64 RTL_ARCH=IA64 + PLATFORMID=linux_ia64 OUTPATH=unxlnga ;; mips) @@ -3521,6 +3541,7 @@ linux-gnu*) CPUNAME=GODSON RTL_ARCH=MIPS_EB EPM_FLAGS="-a mips" + PLATFORMID=linux_mips_eb OUTPATH=unxlngmips ;; mips64) @@ -3528,6 +3549,7 @@ linux-gnu*) CPUNAME=GODSON RTL_ARCH=MIPS_EB EPM_FLAGS="-a mips64" + PLATFORMID=linux_mips_eb OUTPATH=unxlngmips ;; mips64el) @@ -3535,6 +3557,7 @@ linux-gnu*) CPUNAME=GODSON RTL_ARCH=MIPS_EL EPM_FLAGS="-a mips64el" + PLATFORMID=linux_mips_el OUTPATH=unxlngmips ;; mipsel) @@ -3542,18 +3565,21 @@ linux-gnu*) CPUNAME=GODSON RTL_ARCH=MIPS_EL EPM_FLAGS="-a mipsel" + PLATFORMID=linux_mips_el OUTPATH=unxlngmips ;; m68k) CPU=6 CPUNAME=M68K RTL_ARCH=M68K + PLATFORMID=linux_m68k OUTPATH=unxlngm68k ;; powerpc) CPU=P CPUNAME=POWERPC RTL_ARCH=PowerPC + PLATFORMID=linux_powerpc OUTPATH=unxlngppc ;; powerpc64) @@ -3561,18 +3587,21 @@ linux-gnu*) CPUNAME=POWERPC64 RTL_ARCH=PowerPC_64 LIB64="lib64" + PLATFORMID=linux_powerpc_64 OUTPATH=unxlngppc64 ;; sparc) CPU=S CPUNAME=SPARC RTL_ARCH=SPARC + PLATFORMID=linux_sparc OUTPATH=unxlngs ;; s390) CPU=3 CPUNAME=S390 RTL_ARCH=S390 + PLATFORMID=linux_s390 OUTPATH=unxlngs390 ;; s390x) @@ -3580,6 +3609,7 @@ linux-gnu*) CPUNAME=S390X RTL_ARCH=S390x LIB64="lib64" + PLATFORMID=linux_s390x OUTPATH=unxlngs390x ;; x86_64) @@ -3587,6 +3617,7 @@ linux-gnu*) CPUNAME=X86_64 RTL_ARCH=X86_64 LIB64="lib64" + PLATFORMID=linux_x86_64 OUTPATH=unxlngx6 ;; *) @@ -3612,18 +3643,21 @@ linux-android*) CPU=R CPUNAME=ARM RTL_ARCH=ARM_EABI + PLATFORMID=android_arm_eabi OUTPATH=unxandr ;; mips|mipsel) CPU=M CPUNAME=GODSON # Weird, but maybe that's the LO convention? RTL_ARCH=MIPS_EL + PLATFORMID=android_mips_el OUTPATH=unxandm ;; i*86) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=android_x86 OUTPATH=unxandi ;; *) @@ -3648,11 +3682,13 @@ mingw*) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_84 + PLATFORMID=windows_x86_64 OUTPATH=wntgccx$COMEX else CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=windows_x86 OUTPATH=wntgcci$COMEX fi ;; @@ -3680,21 +3716,25 @@ mingw*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=netbsd_x86 ;; powerpc) CPU=P CPUNAME=POWERPC RTL_ARCH=PowerPC + PLATFORMID=netbsd_powerpc ;; sparc) CPU=S CPUNAME=SPARC RTL_ARCH=SPARC + PLATFORMID=netbsd_sparc ;; x86_64) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=netbsd_x86_64 ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) @@ -3719,11 +3759,13 @@ openbsd*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=openbsd_x86 ;; x86_64) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=openbsd_x86_64 ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) @@ -3751,12 +3793,14 @@ solaris*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=solaris_x86 OUTPATH=unxsogi ;; sparc) CPU=S CPUNAME=SPARC RTL_ARCH=SPARC + PLATFORMID=solaris_sparc OUTPATH=unxsogs ;; *) @@ -3809,6 +3853,7 @@ AC_SUBST(OUTPATH) AC_SUBST(P_SEP) AC_SUBST(SOLARVER) AC_SUBST(WORKDIR) +AC_SUBST(PLATFORMID) dnl =================================================================== dnl Test which package format to use diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk index afecd49f763a..e559bde7167c 100644 --- a/sdext/CustomTarget_presenter.mk +++ b/sdext/CustomTarget_presenter.mk @@ -30,12 +30,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com $(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \ $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp -include $(SRCDIR)/sdext/platform.mk - $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \ $(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \ | $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) - sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@ + sed "s/PLATFORMID/$(PLATFORMID)/" < $< > $@ # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk index 2e4d1ff27b86..17142fccf66b 100644 --- a/sdext/Extension_minimizer.mk +++ b/sdext/Extension_minimizer.mk @@ -25,12 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk - $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimizer)) -$(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM))) - $(eval $(call gb_Extension_add_libraries,presentation-minimizer,\ SunPresentationMinimizer \ )) diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk index c5692dec763c..a97ddff3e13e 100644 --- a/sdext/Extension_pdfimport.mk +++ b/sdext/Extension_pdfimport.mk @@ -25,12 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk - $(eval $(call gb_Extension_Extension,pdfimport,sdext/source/pdfimport)) -$(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM))) - $(eval $(call gb_Extension_add_file,pdfimport,components.rdb,$(call gb_Rdb_get_target,pdfimport))) $(eval $(call gb_Extension_add_libraries,pdfimport,\ diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk index 66f93a8f2a81..bdd584f0cc12 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -25,12 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk - $(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter)) -$(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM))) - $(eval $(call gb_Extension_add_libraries,presenter-screen,\ PresenterScreen \ )) @@ -141,9 +137,9 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \ )) -$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) +$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) -$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(sdext_PLATFORM))) +$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(PLATFORMID))) diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk index ca404ca9f33d..7dcb3fd1551a 100644 --- a/sdext/Library_presenter.mk +++ b/sdext/Library_presenter.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presente $(eval $(call gb_Library_use_sdk_api,PresenterScreen)) $(eval $(call gb_Library_add_defs,PresenterScreen,\ - -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(sdext_PLATFORM)\" \ + -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(PLATFORMID)\" \ )) $(eval $(call gb_Library_use_libraries,PresenterScreen,\ diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index bf49da31070b..7e648abf8abf 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -25,8 +25,6 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk - $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ @@ -56,7 +54,7 @@ $(eval $(call gb_StaticLibrary_set_include,pdfimport_s,\ $(eval $(call gb_StaticLibrary_add_defs,pdfimport_s,\ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ - -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(sdext_PLATFORM)\" \ + -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(PLATFORMID)\" \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,pdfimport_s,\ diff --git a/sdext/platform.mk b/sdext/platform.mk deleted file mode 100644 index 2c818c8e179d..000000000000 --- a/sdext/platform.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -# TODO -# https://bugs.freedesktop.org/show_bug.cgi?id=50163 -# move definition of PLATFORMID into configure.in -# - -sdext__LOWERCASE_TABLE := A-a B-b C-c D-d E-e F-f G-g H-h I-i J-j K-k L-l M-m N-n O-o P-p R-r S-s T-t U-u V-v W-w X-x Y-y Z-z - -define sdext__lcase_impl -$(if $(3),$(call sdext__lcase,$(firstword $(3)),$(3),$(subst $(1),$(2),$(4))),$(subst $(1),$(2),$(4))) -endef - -define sdext__lcase -$(call sdext__lcase_impl,$(firstword $(subst -, ,$(1))),$(lastword $(subst -, ,$(1))),$(wordlist 2,$(words $(2)),$(2)),$(3)) -endef - -define sdext__lowercase -$(call sdext__lcase,$(firstword $(sdext__LOWERCASE_TABLE)),$(sdext__LOWERCASE_TABLE),$(1)) -endef - -sdext_PLATFORM := $(call sdext__lowercase,$(RTL_OS)_$(RTL_ARCH)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index c728e0d83d15..281bac89420a 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -41,14 +41,6 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Extension_get_target,$(1)),$ endef -# Set platform. -# -# Only use this if the extension is platform-dependent. -define gb_Extension_set_platform -$(call gb_ExtensionTarget_set_platform,$(1),$(2)) - -endef - define gb_Extension_add_file $(call gb_ExtensionTarget_add_file,$(1),$(2),$(3)) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 4e53be562167..efa5a54dfac2 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -131,7 +131,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : DESCRIPTION := $(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml $(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) -$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := +$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID) $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml ifneq ($(strip $(gb_WITH_LANG)),) @@ -145,14 +145,6 @@ $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ $(call gb_ExtensionTarget__compile_help_onelang,$(1),$(lang))) endef -# Set platform. -# -# Only use this if the extension is platform-dependent. -define gb_ExtensionTarget_set_platform -$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(2) - -endef - # Use the default license file define gb_ExtensionTarget_use_default_license $(call gb_ExtensionTarget_get_target,$(1)) : FILES += registration -- cgit From 8b22407ef36d1a8934f3d917354d95f37d4aab65 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 1 Oct 2012 20:26:05 +0200 Subject: Add some new checking Plus use UpperCamelCase name for some variable. Change-Id: Iaba8b6f47f03b723aa31ef4b45f8b6fd78b7866f --- l10ntools/inc/po.hxx | 2 ++ l10ntools/source/merge.cxx | 24 +++++++++++++++++++----- l10ntools/source/po.cxx | 15 ++++++++++++--- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index 76312a4a59e5..9163e6a10230 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -113,6 +113,8 @@ public: friend class PoOfstream; friend class PoIfstream; + enum Exception { NOLANG }; + PoHeader(); PoHeader( const OString& rExtSrc ); PoHeader( std::ifstream& rOldPo ); diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index a58807594681..5738565dde1e 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -165,7 +165,7 @@ MergeDataFile::MergeDataFile( bool bFirstLang = true; while( !aInputStream.eof() ) { - const OString sHACK("HACK"); + const OString sHack("HACK"); const OString sFileName( lcl_NormalizeFilename(rFile) ); PoIfstream aPoInput; aPoInput.open( OString(sPoFileName.data(), sPoFileName.length()) ); @@ -189,8 +189,22 @@ MergeDataFile::MergeDataFile( return; } } - const OString nLANG = aPoHeader.getLanguage(); - aLanguageSet.insert( nLANG ); + OString sLang; + try + { + sLang = aPoHeader.getLanguage(); + } + catch( PoHeader::Exception& aException ) + { + if( aException = PoHeader::NOLANG ) + { + printf( + "Warning : %s' header not has language specification\n", + sPoFileName.c_str() ); + return; + } + } + aLanguageSet.insert( sLang ); PoEntry aNextPo; do { @@ -247,7 +261,7 @@ MergeDataFile::MergeDataFile( InsertEntry( aActPo.getResourceType(), aActPo.getGroupId(), - aActPo.getLocalId(), sHACK, nLANG, sText, + aActPo.getLocalId(), sHack, sLang, sText, sQHText, sTitle, sFileName, bCaseSensitive ); if( bFirstLang ) @@ -255,7 +269,7 @@ MergeDataFile::MergeDataFile( aLanguageSet.insert("qtz"); InsertEntry( aActPo.getResourceType(), aActPo.getGroupId(), - aActPo.getLocalId(), sHACK, "qtz", + aActPo.getLocalId(), sHack, "qtz", sQTZText + "||" + sExText, sQTZQHText + "||" + sExQHText, sQTZTitle + "||" + sExTitle, sFileName, bCaseSensitive ); } diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index a922575e41fd..465e18e3ab6d 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -537,6 +537,7 @@ void PoEntry::setFuzzy(const bool bFuzzy) //Check whether po-s belong to the same localization component bool PoEntry::IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2) { + assert( rPo1.m_bIsInitialized && rPo2.m_bIsInitialized ); return ( rPo1.getSourceFile() == rPo2.getSourceFile() && rPo1.getGroupId() == rPo2.getGroupId() && rPo1.getLocalId() == rPo2.getLocalId() && @@ -632,7 +633,11 @@ OString PoHeader::getLanguage() const const OString sTransStr = m_aGenPo.getTransStr(); const sal_Int32 nFirstIndex = sTransStr.indexOf(sLang)+sLang.getLength(); const sal_Int32 nCount = sTransStr.indexOf('\n',nFirstIndex)-nFirstIndex; - return sTransStr.copy(nFirstIndex,nCount); + if( nFirstIndex == sLang.getLength()-1 || nCount == -nFirstIndex-1 ) + { + throw NOLANG; + } + return sTransStr.copy( nFirstIndex, nCount ); } //Class PoOfstream @@ -741,12 +746,16 @@ void PoIfstream::readEntry( PoEntry& rPoEntry ) else { const OString sContext = aGenPo.getContext(); + const sal_Int32 nFirstEndLine = sContext.indexOf('\n'); + const sal_Int32 nLastEndLine = sContext.lastIndexOf('\n'); const sal_Int32 nLastDot = sContext.lastIndexOf('.'); const OString sType = sContext.copy( nLastDot + 1 ); if( !aGenPo.getReference().isEmpty() && - sContext.indexOf('\n') > 0 && + nFirstEndLine > 0 && + (nLastEndLine == nFirstEndLine || + nLastEndLine == sContext.indexOf('\n',nFirstEndLine+1)) && + nLastDot - nLastEndLine > 1 && (sType == "text" || sType == "quickhelptext" || sType == "title") && - nLastDot - sContext.lastIndexOf('\n') > 0 && !aGenPo.getUnTransStr().isEmpty() ) { rPoEntry.m_aGenPo = aGenPo; -- cgit From e3bf6418a86cb0d9771f3a7b715e894bc02ae313 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 3 Oct 2012 10:25:46 +0200 Subject: Correct ulfex to ignore comments Change-Id: I50e41a3946ff885783006018f7b6ff2945cc7dfc --- l10ntools/source/lngmerge.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 264b50c74f56..fcab6966aef1 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -232,7 +232,7 @@ sal_Bool LngParser::Merge( { sal_Int32 n = 0; rtl::OString sLang(sLine.getToken(0, '=', n)); - if (n == -1) + if (n == -1 || static_cast(sLine.match("/*"))) { ++nPos; } -- cgit From afcfb2fb26282e6e490922cca27d089b0980d071 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 3 Oct 2012 10:31:34 +0200 Subject: One little correction Change-Id: I675bd8a966b2c1654cd6547fc380a51925578835 --- l10ntools/source/merge.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 5738565dde1e..23609e0d268e 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -196,7 +196,7 @@ MergeDataFile::MergeDataFile( } catch( PoHeader::Exception& aException ) { - if( aException = PoHeader::NOLANG ) + if( aException == PoHeader::NOLANG ) { printf( "Warning : %s' header not has language specification\n", -- cgit From 85c93d57c46d02c66b6e604feb867d3ae1abac4e Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 3 Oct 2012 12:37:19 +0200 Subject: Ulfex ignores comments during extraction too During string extraction this does not cause real problem but causes unnecessary operations. Plus make isNextGroup not to change sLine_in parameter. Change-Id: I3db6a94ef320c096a7519f7f83dd4080d0588459 --- l10ntools/source/lngmerge.cxx | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index fcab6966aef1..b0282f5fb4d7 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -146,12 +146,12 @@ void LngParser::WriteSDF(std::ofstream &aSDFStream, } } -bool LngParser::isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in) +bool LngParser::isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in) { - sLine_in = sLine_in.trim(); - if ((sLine_in[0] == '[') && (sLine_in[sLine_in.getLength() - 1] == ']')) + const OString sLineTrim = sLine_in.trim(); + if ((sLineTrim[0] == '[') && (sLineTrim[sLineTrim.getLength() - 1] == ']')) { - sGroup_out = getBracketedContent(sLine_in).trim(); + sGroup_out = getBracketedContent(sLineTrim).trim(); return true; } return false; @@ -160,10 +160,13 @@ bool LngParser::isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in) void LngParser::ReadLine(const rtl::OString &rLine_in, OStringHashMap &rText_inout) { - rtl::OString sLang(rLine_in.getToken(0, '=').trim()); - if (!sLang.isEmpty()) { - rtl::OString sText(rLine_in.getToken(1, '"')); - rText_inout[sLang] = sText; + if (!rLine_in.match(" *") && !rLine_in.match("/*")) + { + rtl::OString sLang(rLine_in.getToken(0, '=').trim()); + if (!sLang.isEmpty()) { + rtl::OString sText(rLine_in.getToken(1, '"')); + rText_inout[sLang] = sText; + } } } -- cgit From adfa2653be936a36131b5130d166193bd990a4cf Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 3 Oct 2012 12:50:21 +0200 Subject: Delete german text from registryitem_math.ulf Change-Id: Ic6a6706062bc82d5e4096d0a6aa7b52a8988f1bc --- scp2/source/math/registryitem_math.ulf | 1 - 1 file changed, 1 deletion(-) diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf index ce4e2fbb3469..0b987cb4b80c 100644 --- a/scp2/source/math/registryitem_math.ulf +++ b/scp2/source/math/registryitem_math.ulf @@ -24,4 +24,3 @@ en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula" [STR_REG_VAL_OO_FORMULA] en-US = "OpenDocument Formula" -de = "OpenDocument Formel" -- cgit From d378badd6149c88d70f60ef0b87339ffc009cb2d Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 3 Oct 2012 13:49:27 +0200 Subject: Cleanup in module_ogltrans.ulf Change-Id: I73eda85dc958b1744ba7cd4de3dbb0691f91a940 --- scp2/source/impress/module_ogltrans.ulf | 1 - 1 file changed, 1 deletion(-) diff --git a/scp2/source/impress/module_ogltrans.ulf b/scp2/source/impress/module_ogltrans.ulf index 4415d47e76af..98ef95ff81b0 100644 --- a/scp2/source/impress/module_ogltrans.ulf +++ b/scp2/source/impress/module_ogltrans.ulf @@ -16,7 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -MODULE_OPTIONAL_OGLTRANS [STR_NAME_MODULE_OPTIONAL_OGLTRANS] en-US = "OpenGL slide transitions for %PRODUCTNAME Impress" -- cgit From 39bcbb571158af926a1db8d49f1d87156a9b62ae Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 3 Oct 2012 14:20:18 +0200 Subject: Add new signature of isNextGroup in header to be consistant with implementation Change-Id: I2b2e68c4805ab575a8ee2d1ca835d79f8fe9cc45 --- l10ntools/inc/lngmerge.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx index 6391d1c25b3f..3995bd73c8c0 100644 --- a/l10ntools/inc/lngmerge.hxx +++ b/l10ntools/inc/lngmerge.hxx @@ -44,7 +44,7 @@ private: sal_Bool bULF; std::vector aLanguages; - bool isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in); + bool isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in); void ReadLine(const rtl::OString &rLine_in, OStringHashMap &rText_inout); void WriteSDF(std::ofstream &aSDFStream, OStringHashMap &rText_inout, -- cgit From 8b86cb65933c4a522ea4f8cc77016cfb8ebc31f6 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 3 Oct 2012 23:24:05 +0200 Subject: Ui merge from po files Change-Id: Id699cf94c17016c9af87fad389339cf323329741 --- solenv/gbuild/UI.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk index 509a0877a56c..9540c159b4fa 100644 --- a/solenv/gbuild/UI.mk +++ b/solenv/gbuild/UI.mk @@ -16,13 +16,16 @@ gb_UILocalizeTarget_COMMAND := $(gb_Helper_set_ldpath) $(gb_UILocalizeTarget_TAR define gb_UILocalizeTarget__command $(call gb_Output_announce,$(2),$(true),UIX,1) +MERGEINPUT=`$(gb_MKTEMP)` && \ +echo $(POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ $(gb_UILocalizeTarget_COMMAND) \ -i $(UI_FILE) \ -o $(1) \ -l $(UI_LANG) \ - -m $(SDF) \ -) + -m $${MERGEINPUT} ) && \ +rm -rf $${MERGEINPUT} + endef $(dir $(call gb_UILocalizeTarget_get_target,%))%/.dir : @@ -42,11 +45,11 @@ $(call gb_UILocalizeTarget_get_clean_target,%) : # # gb_UILocalizeTarget_UILocalizeTarget target source lang define gb_UILocalizeTarget_UILocalizeTarget -$(call gb_UILocalizeTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(dir $(2))localize.sdf +$(call gb_UILocalizeTarget_get_target,$(1)) : POFILES := $(foreach lang,$(gb_UITarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po) $(call gb_UILocalizeTarget_get_target,$(1)) : UI_FILE := $(SRCDIR)/$(2).ui $(call gb_UILocalizeTarget_get_target,$(1)) : UI_LANG := $(3) -$(call gb_UILocalizeTarget_get_target,$(1)) : $$(SDF) +$(call gb_UILocalizeTarget_get_target,$(1)) : $(foreach lang,$(gb_UITarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po) $(call gb_UILocalizeTarget_get_target,$(1)) : $$(UI_FILE) $(call gb_UILocalizeTarget_get_target,$(1)) :| $(dir $(call gb_UILocalizeTarget_get_target,$(1))).dir -- cgit From a418748140f993e481e2ff1cb37464936f0b2243 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 4 Oct 2012 18:57:28 +0200 Subject: Extract argument-handling to one source file Plus cleanup -Delete unneeded global variables -Delete -e input flag in general -Delete helpex's -x, -y and -lf input flags These are all unused Change-Id: I83db62543a728ed75fa6893c45566f11d1237c69 --- l10ntools/inc/export.hxx | 24 +++++ l10ntools/source/cfgmerge.cxx | 89 +++--------------- l10ntools/source/export.cxx | 86 +++--------------- l10ntools/source/export2.cxx | 105 +++++++++++++++++++++ l10ntools/source/helpex.cxx | 207 +++--------------------------------------- l10ntools/source/lngex.cxx | 137 ++-------------------------- l10ntools/source/localize.cxx | 2 +- l10ntools/source/uimerge.cxx | 113 ++--------------------- l10ntools/source/xrmlex.l | 14 +-- l10ntools/source/xrmmerge.cxx | 101 ++++----------------- 10 files changed, 210 insertions(+), 668 deletions(-) diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 9a4ce788ec77..28807f6c95a8 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -248,6 +248,27 @@ typedef ::std::vector< ResData* > ResStack; class WordTransformer; class ParserQueue; +//result type of handleArguments() +struct HandledArgs +{ + OString m_sPrj; + OString m_sPrjRoot; + OString m_sInputFile; + OString m_sOutputFile; + OString m_sMergeSrc; + OString m_sLanguages; + bool m_bMergeMode; + HandledArgs() + : m_sPrj( OString() ) + , m_sPrjRoot( OString() ) + , m_sInputFile( OString() ) + , m_sOutputFile( OString() ) + , m_sMergeSrc( OString() ) + , m_sLanguages( OString() ) + , m_bMergeMode( false ) + {} +}; + class Export { private: @@ -285,6 +306,9 @@ public: static rtl::OString sLanguages; // public ? static rtl::OString sForcedLanguages; // public ? + static bool handleArguments(int argc, char * argv[], HandledArgs& o_aHandledArgs); + static void writeUsage(const OString& rName, const OString& rFileType); + static void InitLanguages( bool bMergeMode = false ); static void InitForcedLanguages( bool bMergeMode = false ); static std::vector GetLanguages(); diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index 41db0973fb47..3eb442f3a2cd 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -38,86 +38,24 @@ namespace { namespace global { -bool mergeMode = false; -char const * prj = 0; -char const * prjRoot = 0; char const * inputPathname = 0; -char const * outputPathname = 0; -char const * mergeSrc; boost::scoped_ptr< CfgParser > parser; } - -void handleArguments(int argc, char ** argv) { - for (int i = 1; i != argc; ++i) { - if (std::strcmp(argv[i], "-e") == 0) { - // ignored, used to be "Disable writing errorlog" - } else if (std::strcmp(argv[i], "-i") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::inputPathname = argv[i]; - } else if (std::strcmp(argv[i], "-l") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - Export::sLanguages = argv[i]; - } else if (std::strcmp(argv[i], "-m") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::mergeSrc = argv[i]; - global::mergeMode = true; - } else if (std::strcmp(argv[i], "-o") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::outputPathname = argv[i]; - } else if (std::strcmp(argv[i], "-p") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::prj = argv[i]; - } else if (std::strcmp(argv[i], "-r") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::prjRoot = argv[i]; - } else { - global::inputPathname = 0; // no valid command line - break; - } - } - if (global::inputPathname == 0 || global::outputPathname == 0) { - std::fprintf( - stderr, - ("Syntax: cfgex [-p Prj] [-r PrjRoot] -i FileIn -o FileOut" - " [-m DataBase] [-e] [-l l1,l2,...]\n" - " Prj: Project\n" - " PrjRoot: Path to project root (../.. etc.)\n" - " FileIn: Source files (*.src)\n" - " FileOut: Destination file (*.*)\n" - " DataBase: Mergedata (*.sdf)\n" - " -e: ignored\n" - " -l: Restrict the handled languages; l1, l2, ... are elements of" - " (de, en-US, ...)\n")); - std::exit(EXIT_FAILURE); - } - Export::InitLanguages(); -} - } extern "C" { FILE * init(int argc, char ** argv) { - handleArguments(argc, argv); + + HandledArgs aArgs; + if ( !Export::handleArguments(argc, argv, aArgs) ) + { + Export::writeUsage("cfgex","xcu"); + std::exit(EXIT_FAILURE); + } + Export::InitLanguages(); + global::inputPathname = aArgs.m_sInputFile.getStr(); FILE * pFile = std::fopen(global::inputPathname, "r"); if (pFile == 0) { @@ -127,16 +65,17 @@ FILE * init(int argc, char ** argv) { std::exit(EXIT_FAILURE); } - if (global::mergeMode) { + if (aArgs.m_bMergeMode) { global::parser.reset( new CfgMerge( - global::mergeSrc, global::outputPathname, + aArgs.m_sMergeSrc.getStr(), aArgs.m_sOutputFile.getStr(), global::inputPathname)); } else { global::parser.reset( new CfgExport( - global::outputPathname, global::prj, - common::pathnameToken(global::inputPathname, global::prjRoot))); + aArgs.m_sOutputFile.getStr(), aArgs.m_sPrj.getStr(), + common::pathnameToken(global::inputPathname, + aArgs.m_sPrjRoot.getStr()))); } return pFile; diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 8fe8057188c3..d9dd5ac9878f 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -42,86 +42,28 @@ MergeDataFile * pMergeDataFile = 0; //TODO namespace global { -bool mergeMode = false; char const * prj = 0; char const * prjRoot = 0; char const * inputPathname = 0; -char const * outputPathname = 0; -char const * mergeSrc; boost::scoped_ptr< Export > exporter; } - -void handleArguments(int argc, char ** argv) { - for (int i = 1; i != argc; ++i) { - if (std::strcmp(argv[i], "-e") == 0) { - // ingored, used to be "Disable writing errorlog" - } else if (std::strcmp(argv[i], "-i") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::inputPathname = argv[i]; - } else if (std::strcmp(argv[i], "-l") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - Export::sLanguages = argv[i]; - } else if (std::strcmp(argv[i], "-m") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::mergeSrc = argv[i]; - global::mergeMode = true; - } else if (std::strcmp(argv[i], "-o") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::outputPathname = argv[i]; - } else if (std::strcmp(argv[i], "-p") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::prj = argv[i]; - } else if (std::strcmp(argv[i], "-r") == 0) { - if (++i == argc) { - global::inputPathname = 0; // no valid command line - break; - } - global::prjRoot = argv[i]; - } else { - global::inputPathname = 0; // no valid command line - break; - } - } - if (global::inputPathname == 0 || global::outputPathname == 0) { - std::fprintf( - stderr, - ("Syntax: transex3 [-p Prj] [-r PrjRoot] -i FileIn -o FileOut" - " [-m DataBase] [-e] [-l l1,l2,...]\n" - " Prj: Project\n" - " PrjRoot: Path to project root (../.. etc.)\n" - " FileIn: Source files (*.src)\n" - " FileOut: Destination file (*.*)\n" - " DataBase: Mergedata (*.sdf)\n" - " -e: ignored\n" - " -l: Restrict the handled languages; l1, l2, ... are elements of" - " (de, en-US, ...)\n")); - std::exit(EXIT_FAILURE); - } - Export::InitLanguages(); -} - } extern "C" { FILE * init(int argc, char ** argv) { - handleArguments(argc, argv); + + HandledArgs aArgs; + if ( !Export::handleArguments(argc, argv, aArgs) ) + { + Export::writeUsage("transex3","src/hrc"); + std::exit(EXIT_FAILURE); + } + Export::InitLanguages(); + global::prj = aArgs.m_sPrj.getStr(); + global::prjRoot = aArgs.m_sPrjRoot.getStr(); + global::inputPathname = aArgs.m_sInputFile.getStr(); FILE * pFile = std::fopen(global::inputPathname, "r"); if (pFile == 0) { @@ -131,13 +73,13 @@ FILE * init(int argc, char ** argv) { std::exit(EXIT_FAILURE); } - if (global::mergeMode) { + if (aArgs.m_bMergeMode) { global::exporter.reset( - new Export(global::mergeSrc, global::outputPathname)); + new Export(aArgs.m_sMergeSrc.getStr(), aArgs.m_sOutputFile.getStr())); } else { sActFileName = common::pathnameToken(global::inputPathname, global::prjRoot); - global::exporter.reset(new Export(global::outputPathname)); + global::exporter.reset(new Export(aArgs.m_sOutputFile.getStr())); } global::exporter->Init(); diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index 726f36a59541..e2be3f3e9bed 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -31,6 +31,15 @@ #include #include +//flags for handleArguments() +#define STATE_NON 0x0001 +#define STATE_INPUT 0x0002 +#define STATE_OUTPUT 0x0003 +#define STATE_PRJ 0x0004 +#define STATE_ROOT 0x0005 +#define STATE_MERGESRC 0x0006 +#define STATE_LANGUAGES 0x0007 + // // class ResData(); // @@ -82,6 +91,102 @@ rtl::OString Export::sLanguages; rtl::OString Export::sForcedLanguages; /*****************************************************************************/ +bool Export::handleArguments( + int argc, char * argv[], HandledArgs& o_aHandledArgs) +{ + if ( argc <= 1 ) + { + return false; + } + sLanguages = ""; + sal_uInt16 nState = STATE_NON; + + for( int i = 1; i < argc; i++ ) + { + if ( OString( argv[ i ] ).toAsciiUpperCase() == "-I" ) + { + nState = STATE_INPUT; // next token specifies source file + } + else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-O" ) + { + nState = STATE_OUTPUT; // next token specifies the dest file + } + else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-P" ) + { + nState = STATE_PRJ; // next token specifies the cur. project + } + else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-R" ) + { + nState = STATE_ROOT; // next token specifies path to project root + } + else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-M" ) + { + nState = STATE_MERGESRC; // next token specifies the merge database + } + else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-L" ) + { + nState = STATE_LANGUAGES; + } + else + { + switch ( nState ) + { + case STATE_NON: + { + return false; // no valid command line + } + case STATE_INPUT: + { + o_aHandledArgs.m_sInputFile = OString( argv[i] ); + } + break; + case STATE_OUTPUT: + { + o_aHandledArgs.m_sOutputFile = OString( argv[i] ); + } + break; + case STATE_PRJ: + { + o_aHandledArgs.m_sPrj = OString( argv[i] ); + } + break; + case STATE_ROOT: + { + o_aHandledArgs.m_sPrjRoot = OString( argv[i] ); + } + break; + case STATE_MERGESRC: + { + o_aHandledArgs.m_sMergeSrc = OString( argv[i] ); + o_aHandledArgs.m_bMergeMode = true; + } + break; + case STATE_LANGUAGES: + { + sLanguages = OString( argv[i] ); + } + break; + } + } + } + return true; +} + +void Export::writeUsage(const OString& rName, const OString& rFileType) +{ + std::cout + << "Syntax: " << rName.getStr() + << " [-p Prj] [-r PrjRoot] -i FileIn -o FileOut" + << " [-m DataBase] [-l l1,l2,...]\n" + << " Prj: Project\n" + << " PrjRoot: Path to project root (../.. etc.)\n" + << " FileIn: Source files (*." << rFileType.getStr() << ")\n" + << " FileOut: Destination file (*.*)\n" + << " DataBase: Mergedata (*.po)\n" + << " -l: Restrict the handled languages; l1, l2, ... are elements of" + << " (de, en-US, ...)\n"; +} + /*****************************************************************************/ void Export::SetLanguages( std::vector val ){ /*****************************************************************************/ diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index 470b4f1383bc..574987eb0d03 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -28,213 +28,34 @@ #include "helpmerge.hxx" -// defines to parse command line -#define STATE_NON 0x0001 -#define STATE_INPUT 0x0002 -#define STATE_OUTPUT 0x0003 -#define STATE_PRJ 0x0004 -#define STATE_ROOT 0x0005 -#define STATE_SDFFILE 0x0006 -#define STATE_ERRORLOG 0x0007 -#define STATE_BREAKHELP 0x0008 -#define STATE_UNMERGE 0x0009 -#define STATE_LANGUAGES 0x000A -#define STATE_FORCE_LANGUAGES 0x000B -#define STATE_OUTPUTX 0xfe -#define STATE_OUTPUTY 0xff - -// set of global variables -rtl::OString sInputFile; -sal_Bool bEnableExport; -sal_Bool bMergeMode; -rtl::OString sPrj; -rtl::OString sPrjRoot; -rtl::OString sOutputFile; -rtl::OString sOutputFileX; -rtl::OString sOutputFileY; -rtl::OString sSDFFile; - -/*****************************************************************************/ -sal_Bool ParseCommandLine( int argc, char* argv[]) -/*****************************************************************************/ -{ - bEnableExport = sal_False; - bMergeMode = sal_False; - sPrj = ""; - sPrjRoot = ""; - Export::sLanguages = ""; - Export::sForcedLanguages = ""; - - sal_uInt16 nState = STATE_NON; - sal_Bool bInput = sal_False; - - // parse command line - for( int i = 1; i < argc; i++ ) - { - rtl::OString aArg = rtl::OString(argv[i]).toAsciiUpperCase(); - if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-I"))) - nState = STATE_INPUT; // next tokens specifies source files - else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-O"))) - nState = STATE_OUTPUT; // next token specifies the dest file - else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-X"))) - nState = STATE_OUTPUTX; // next token specifies the dest file - else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-Y" ))) - nState = STATE_OUTPUTY; // next token specifies the dest file - else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-P" ))) - nState = STATE_PRJ; // next token specifies the cur. project - else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-LF"))) - nState = STATE_FORCE_LANGUAGES; - else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-R" ))) - nState = STATE_ROOT; // next token specifies path to project root - else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-M" ))) - nState = STATE_SDFFILE; // next token specifies the merge database - else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-E" ))) - { - nState = STATE_ERRORLOG; - } - else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-L" ))) - nState = STATE_LANGUAGES; - else - { - switch ( nState ) - { - case STATE_NON: { - return sal_False; // no valid command line - } - //break; - case STATE_INPUT: { - sInputFile = argv[ i ]; - bInput = sal_True; // source file found - } - break; - case STATE_OUTPUT: { - sOutputFile = argv[ i ]; // the dest. file - } - break; - case STATE_OUTPUTX: { - sOutputFileX = argv[ i ]; // the dest. file - } - break; - case STATE_OUTPUTY: { - sOutputFileY = argv[ i ]; // the dest. file - } - break; - case STATE_PRJ: { - sPrj = argv[ i ]; - } - break; - case STATE_ROOT: { - sPrjRoot = argv[ i ]; // path to project root - } - break; - case STATE_SDFFILE: { - sSDFFile = argv[ i ]; - bMergeMode = sal_True; // activate merge mode, cause merge database found - } - break; - case STATE_LANGUAGES: { - Export::sLanguages = argv[ i ]; - } - case STATE_FORCE_LANGUAGES:{ - Export::sForcedLanguages = argv[ i ]; - } - break; - } - } - } - - if ( bInput ) { - // command line is valid - bEnableExport = sal_True; - return sal_True; - } - - // command line is not valid - return sal_False; -} - - -/*****************************************************************************/ -void Help() -/*****************************************************************************/ -{ - fprintf( stdout, "Syntax: HELPEX[-p Prj][-r PrjRoot]-i FileIn ( -o FileOut | -x path -y relfile )[-m DataBase][-e][-b][-u][-L l1,l2,...] -LF l1,l2 \n" ); - fprintf( stdout, " Prj: Project\n" ); - fprintf( stdout, " PrjRoot: Path to project root (..\\.. etc.)\n" ); - fprintf( stdout, " FileIn: Source file (*.lng)\n" ); - fprintf( stdout, " FileOut: Destination file (*.*)\n" ); - fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" ); - fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (en-US,fr,de...)\n" ); - fprintf( stdout, " -LF: Force the creation of that languages\n" ); - -} - -/*****************************************************************************/ #ifndef TESTDRIVER SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { - if ( !ParseCommandLine( argc, argv )) { - Help(); + HandledArgs aArgs; + if ( !Export::handleArguments( argc, argv, aArgs) ) { + Export::writeUsage("helpex","xhp"); return 1; } //sal_uInt32 startfull = Export::startMessure(); - - bool hasInputList = sInputFile[0]=='@'; bool hasNoError = true; - if ( sOutputFile.getLength() ){ // Merge single file ? - HelpParser aParser( sInputFile ); + if ( !aArgs.m_sOutputFile.isEmpty() ){ + HelpParser aParser( aArgs.m_sInputFile ); - if ( bMergeMode ) + if ( aArgs.m_bMergeMode ) { //sal_uInt64 startreadloc = Export::startMessure(); - MergeDataFile aMergeDataFile(sSDFFile, sInputFile, false); + MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, aArgs.m_sInputFile, false ); - hasNoError = aParser.Merge( sSDFFile, sOutputFile , Export::sLanguages , aMergeDataFile ); + hasNoError = aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile , Export::sLanguages , aMergeDataFile ); } else - hasNoError = aParser.CreateSDF( sOutputFile, sPrj, sPrjRoot, sInputFile, new XMLFile( rtl::OUString('0') ), "help" ); - }else if ( sOutputFileX.getLength() && sOutputFileY.getLength() && hasInputList ) { // Merge multiple files ? - if ( bMergeMode ){ - - ifstream aFStream( sInputFile.copy( 1 ).getStr() , ios::in ); - - if( !aFStream ){ - std::cerr << "ERROR: - helpex - Can't open the file " << sInputFile.copy( 1 ).getStr() << "\n"; - std::exit(EXIT_FAILURE); - } - - vector filelist; - rtl::OStringBuffer filename; - sal_Char aChar; - while( aFStream.get( aChar ) ) - { - if( aChar == ' ' || aChar == '\n') - filelist.push_back(filename.makeStringAndClear()); - else - filename.append( aChar ); - } - if( filename.getLength() > 0 ) - filelist.push_back(filename.makeStringAndClear()); - - aFStream.close(); - rtl::OString sHelpFile; // dummy - MergeDataFile aMergeDataFile( sSDFFile, sHelpFile, false ); - - std::vector aLanguages; - HelpParser::parse_languages( aLanguages , aMergeDataFile ); - - bool bCreateDir = true; - for( vector::iterator pos = filelist.begin() ; pos != filelist.end() ; ++pos ) - { - sHelpFile = *pos; - - HelpParser aParser( sHelpFile ); - hasNoError = aParser.Merge( sSDFFile , sOutputFileX , sOutputFileY , true , aLanguages , aMergeDataFile , bCreateDir ); - bCreateDir = false; - } - } - } else + hasNoError = + aParser.CreateSDF( + aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot, + aArgs.m_sInputFile, new XMLFile( OUString('0') ), "help" ); + } + else std::cerr << "helpex ERROR: Wrong input parameters!\n"; if( hasNoError ) diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index ab2f0afe0eb5..706ab26309b8 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -25,140 +25,23 @@ #include "lngmerge.hxx" -// defines to parse command line -#define STATE_NON 0x0001 -#define STATE_INPUT 0x0002 -#define STATE_OUTPUT 0x0003 -#define STATE_PRJ 0x0004 -#define STATE_ROOT 0x0005 -#define STATE_MERGESRC 0x0006 -#define STATE_ERRORLOG 0x0007 -#define STATE_BREAKHELP 0x0008 -#define STATE_UNMERGE 0x0009 -#define STATE_ULF 0x000A -#define STATE_LANGUAGES 0x000B - -// set of global variables -rtl::OString sInputFile; -sal_Bool bEnableExport; -sal_Bool bMergeMode; -sal_Bool bUTF8; -sal_Bool bULF; // ULF = Unicode Language File -rtl::OString sPrj; -rtl::OString sPrjRoot; -rtl::OString sOutputFile; -rtl::OString sMergeSrc; - -/*****************************************************************************/ -sal_Bool ParseCommandLine( int argc, char* argv[]) -/*****************************************************************************/ -{ - bEnableExport = sal_False; - bMergeMode = sal_False; - bUTF8 = sal_True; - bULF = sal_False; - sPrj = ""; - sPrjRoot = ""; - Export::sLanguages = ""; - - sal_uInt16 nState = STATE_NON; - sal_Bool bInput = sal_False; - - // parse command line - for( int i = 1; i < argc; i++ ) { - rtl::OString sSwitch = rtl::OString(argv[i]).toAsciiUpperCase(); - if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM("-I"))) - nState = STATE_INPUT; // next tokens specifies source files - else if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM("-O"))) - nState = STATE_OUTPUT; // next token specifies the dest file - else if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM("-P"))) - nState = STATE_PRJ; // next token specifies the cur. project - else if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM("-R"))) - nState = STATE_ROOT; // next token specifies path to project root - else if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM("-M"))) - nState = STATE_MERGESRC; // next token specifies the merge database - else if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM("-E"))) - { - nState = STATE_ERRORLOG; - } - else if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM("-L"))) - nState = STATE_LANGUAGES; - else - { - switch ( nState ) { - case STATE_NON: { - return sal_False; // no valid command line - } - //break; - case STATE_INPUT: { - sInputFile = argv[ i ]; - bInput = sal_True; // source file found - } - break; - case STATE_OUTPUT: { - sOutputFile = argv[ i ]; // the dest. file - } - break; - case STATE_PRJ: { - sPrj = argv[ i ]; - } - break; - case STATE_ROOT: { - sPrjRoot = argv[ i ]; // path to project root - } - break; - case STATE_MERGESRC: { - sMergeSrc = argv[ i ]; - bMergeMode = sal_True; // activate merge mode, cause merge database found - } - break; - case STATE_LANGUAGES: { - Export::sLanguages = argv[ i ]; - } - break; - } - } - } - - if ( bInput ) { - // command line is valid - bULF = sal_True; - bEnableExport = sal_True; - return sal_True; - } - - // command line is not valid - return sal_False; -} - - -/*****************************************************************************/ -void Help() -/*****************************************************************************/ -{ - fprintf( stdout, "Syntax:ULFEX[-p Prj][-r PrjRoot]-i FileIn -o FileOut[-m DataBase][-L l1,l2,...]\n" ); - fprintf( stdout, " Prj: Project\n" ); - fprintf( stdout, " PrjRoot: Path to project root (..\\.. etc.)\n" ); - fprintf( stdout, " FileIn: Source file (*.lng)\n" ); - fprintf( stdout, " FileOut: Destination file (*.*)\n" ); - fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" ); - fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (de,en-US...)\n" ); -} - SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { - if ( !ParseCommandLine( argc, argv )) + + HandledArgs aArgs; + if ( !Export::handleArguments(argc, argv, aArgs) ) { - Help(); + Export::writeUsage("ulfex","ulf"); return 1; } - if (!sOutputFile.isEmpty()) + if (!aArgs.m_sOutputFile.isEmpty()) { - LngParser aParser( sInputFile, bULF ); - if ( bMergeMode ) - aParser.Merge(sMergeSrc, sOutputFile); + LngParser aParser( aArgs.m_sInputFile, true ); + if ( aArgs.m_bMergeMode ) + aParser.Merge(aArgs.m_sMergeSrc, aArgs.m_sOutputFile); else - aParser.CreateSDF( sOutputFile, sPrj, sPrjRoot ); + aParser.CreateSDF( + aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot ); } return 0; diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 941f8d92f941..fd1d8ca4b4d0 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -193,7 +193,7 @@ void handleCommand( RTL_CONSTASCII_USTRINGPARAM("INPATH_FOR_BUILD")))); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("/bin/")); buf.append(executable); - buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" -e -p ")); + buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" -p ")); buf.append(project); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" -r ")); buf.append(projectRoot); diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx index bdf536a238dc..4192ed73d6be 100644 --- a/l10ntools/source/uimerge.cxx +++ b/l10ntools/source/uimerge.cxx @@ -26,100 +26,10 @@ #include #include -#define STATE_NON 0x0001 -#define STATE_INPUT 0x0002 -#define STATE_OUTPUT 0x0003 -#define STATE_PRJ 0x0004 -#define STATE_ROOT 0x0005 -#define STATE_MERGESRC 0x0006 -#define STATE_ERRORLOG 0x0007 -#define STATE_LANGUAGES 0x000C - -sal_Bool bMergeMode; -sal_Bool bErrorLog; -sal_Bool bUTF8; -sal_Bool bDisplayName; -sal_Bool bExtensionDescription; rtl::OString sPrj; rtl::OString sPrjRoot; rtl::OString sInputFileName; rtl::OString sOutputFile; -rtl::OString sMergeSrc; -rtl::OString sLangAttribute; -rtl::OString sResourceType; -XRMResParser *pParser = NULL; - -void GetOutputFile( int argc, char* argv[]) -{ - bMergeMode = sal_False; - bErrorLog = sal_True; - bUTF8 = sal_True; - bDisplayName = sal_False; - bExtensionDescription = sal_False; - sPrj = ""; - sPrjRoot = ""; - sInputFileName = ""; - Export::sLanguages = ""; - sal_uInt16 nState = STATE_NON; - - // parse command line - for( int i = 1; i < argc; i++ ) { - if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-I" ) { - nState = STATE_INPUT; // next token specifies source file - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-O" ) { - nState = STATE_OUTPUT; // next token specifies the dest file - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-P" ) { - nState = STATE_PRJ; // next token specifies the cur. project - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-R" ) { - nState = STATE_ROOT; // next token specifies path to project root - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-M" ) { - nState = STATE_MERGESRC; // next token specifies the merge database - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-E" ) { - nState = STATE_ERRORLOG; - bErrorLog = sal_False; - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-L" ) { - nState = STATE_LANGUAGES; - } - else { - switch ( nState ) { - case STATE_NON: { - return; // no valid command line - } - case STATE_INPUT: { - sInputFileName = argv[ i ]; - } - break; - case STATE_OUTPUT: { - sOutputFile = argv[ i ]; // the dest. file - } - break; - case STATE_PRJ: { - sPrj = rtl::OString( argv[ i ]); - } - break; - case STATE_ROOT: { - sPrjRoot = rtl::OString( argv[ i ]); // path to project root - } - break; - case STATE_MERGESRC: { - sMergeSrc = rtl::OString( argv[ i ]); - bMergeMode = sal_True; // activate merge mode, cause merge database found - } - break; - case STATE_LANGUAGES: { - Export::sLanguages = rtl::OString( argv[ i ]); - } - break; - } - } - } -} int extractTranslations() { @@ -275,22 +185,19 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { int nRetValue = 0; - GetOutputFile( argc, argv ); - - if (sOutputFile.isEmpty()) + HandledArgs aArgs; + if ( !Export::handleArguments(argc, argv, aArgs) ) { - fprintf( stdout, "Syntax: UIEX[-p Prj][-r PrjRoot]-i FileIn [-o FileOut][-m DataBase][-e][-L l1,l2,...]\n" ); - fprintf( stdout, " Prj: Project\n" ); - fprintf( stdout, " PrjRoot: Path to project root (..\\.. etc.)\n" ); - fprintf( stdout, " FileIn: Source files (*.src)\n" ); - fprintf( stdout, " FileOut: Destination file (*.*)\n" ); - fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" ); - fprintf( stdout, " -e: Disable writing errorlog\n" ); - fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (de,en-US,es...)\n" ); + Export::writeUsage("uiex","ui"); return 1; } - if (!bMergeMode) + sPrj = aArgs.m_sPrj; + sPrjRoot = aArgs.m_sPrjRoot; + sInputFileName = aArgs.m_sInputFile; + sOutputFile = aArgs.m_sOutputFile; + + if (!aArgs.m_bMergeMode) { if (Export::sLanguages != "en-US") { @@ -302,7 +209,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } else { - Merge(sMergeSrc, sInputFileName, sOutputFile); + Merge(aArgs.m_sMergeSrc, sInputFileName, sOutputFile); } return nRetValue; diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l index dfe74d7c1a56..8d6094c18d06 100644 --- a/l10ntools/source/xrmlex.l +++ b/l10ntools/source/xrmlex.l @@ -221,18 +221,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { pOutput = GetOutputFile( argc, argv ); - if ( !pOutput ) { - fprintf( stdout, "Syntax: XRMEX[-p Prj][-r PrjRoot]-i FileIn [-o FileOut][-m DataBase][-e][-b][-u][-NOUTF8][-L l1,l2,...]\n" ); - fprintf( stdout, " Prj: Project\n" ); - fprintf( stdout, " PrjRoot: Path to project root (..\\.. etc.)\n" ); - fprintf( stdout, " FileIn: Source files (*.src)\n" ); - fprintf( stdout, " FileOut: Destination file (*.*)\n" ); - fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" ); - fprintf( stdout, " -e: Disable writing errorlog\n" ); - fprintf( stdout, " -b: Break when Token \"HelpText\" found in source\n" ); - fprintf( stdout, " -u: [english] and [german] are allowed, Id is Taken from DataBase \n" ); - fprintf( stdout, " -NOUTF8: disable UTF8 as language independent encoding\n" ); - fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (de,en-US,es...)\n" ); + if ( !pOutput ) + { return 1; } pFile = GetXrmFile(); diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index a22996d8db43..4cf4d9e94253 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -36,20 +36,8 @@ using namespace std; void yyerror( const char * ); void YYWarning( const char * ); -// defines to parse command line -#define STATE_NON 0x0001 -#define STATE_INPUT 0x0002 -#define STATE_OUTPUT 0x0003 -#define STATE_PRJ 0x0004 -#define STATE_ROOT 0x0005 -#define STATE_MERGESRC 0x0006 -#define STATE_ERRORLOG 0x0007 -#define STATE_LANGUAGES 0x000C - // set of global variables -sal_Bool bEnableExport; -sal_Bool bMergeMode; -sal_Bool bUTF8; +bool bMergeMode; sal_Bool bDisplayName; sal_Bool bExtensionDescription; rtl::OString sPrj; @@ -69,87 +57,30 @@ extern "C" { extern char *GetOutputFile( int argc, char* argv[]) /*****************************************************************************/ { - bEnableExport = sal_False; - bMergeMode = sal_False; - bUTF8 = sal_True; bDisplayName = sal_False; bExtensionDescription = sal_False; - sPrj = ""; - sPrjRoot = ""; - sInputFileName = ""; sActFileName = ""; - Export::sLanguages = ""; - sal_uInt16 nState = STATE_NON; - sal_Bool bInput = sal_False; - - // parse command line - for( int i = 1; i < argc; i++ ) { - if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-I" ) { - nState = STATE_INPUT; // next token specifies source file - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-O" ) { - nState = STATE_OUTPUT; // next token specifies the dest file - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-P" ) { - nState = STATE_PRJ; // next token specifies the cur. project - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-R" ) { - nState = STATE_ROOT; // next token specifies path to project root - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-M" ) { - nState = STATE_MERGESRC; // next token specifies the merge database - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-E" ) { - nState = STATE_ERRORLOG; - } - else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-L" ) { - nState = STATE_LANGUAGES; - } - else { - switch ( nState ) { - case STATE_NON: { - return NULL; // no valid command line - } - case STATE_INPUT: { - sInputFileName = argv[ i ]; - bInput = sal_True; // source file found - } - break; - case STATE_OUTPUT: { - sOutputFile = argv[ i ]; // the dest. file - } - break; - case STATE_PRJ: { - sPrj = rtl::OString( argv[ i ]); - } - break; - case STATE_ROOT: { - sPrjRoot = rtl::OString( argv[ i ]); // path to project root - } - break; - case STATE_MERGESRC: { - sMergeSrc = rtl::OString( argv[ i ]); - bMergeMode = sal_True; // activate merge mode, cause merge database found - } - break; - case STATE_LANGUAGES: { - Export::sLanguages = rtl::OString( argv[ i ]); - } - break; - } - } - } - if ( bInput ) { + HandledArgs aArgs; + if ( Export::handleArguments(argc, argv, aArgs) ) + { // command line is valid - bEnableExport = sal_True; + bMergeMode = aArgs.m_bMergeMode; + sPrj = aArgs.m_sPrj; + sPrjRoot = aArgs.m_sPrjRoot; + sInputFileName = aArgs.m_sInputFile; + sOutputFile = aArgs.m_sOutputFile; + sMergeSrc = aArgs.m_sMergeSrc; char *pReturn = new char[ sOutputFile.getLength() + 1 ]; std::strcpy( pReturn, sOutputFile.getStr()); // #100211# - checked return pReturn; } - - // command line is not valid - return NULL; + else + { + // command line is not valid + Export::writeUsage("xrmex","xrm/xml"); + return NULL; + } } /*****************************************************************************/ -- cgit From f9e4d3bfe8eedd49afc2d2161f47a8825a02eec8 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 7 Oct 2012 11:42:37 +0200 Subject: Make Export::handleArguments method safer -Check wheather input and output file are given -Return with "empty" HandledArgs when input is invalid -Delete plus conditions from helpex and lngex Change-Id: I418b1ecaab5f0c78197845448ab062aa5d3ba4de --- l10ntools/source/export2.cxx | 12 +++++++++++- l10ntools/source/helpex.cxx | 28 ++++++++++++---------------- l10ntools/source/lngex.cxx | 15 ++++++--------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index e2be3f3e9bed..64a5b1b07e5c 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -94,6 +94,7 @@ rtl::OString Export::sForcedLanguages; bool Export::handleArguments( int argc, char * argv[], HandledArgs& o_aHandledArgs) { + o_aHandledArgs = HandledArgs(); if ( argc <= 1 ) { return false; @@ -169,7 +170,16 @@ bool Export::handleArguments( } } } - return true; + if( !o_aHandledArgs.m_sInputFile.isEmpty() && + !o_aHandledArgs.m_sOutputFile.isEmpty() ) + { + return true; + } + else + { + o_aHandledArgs = HandledArgs(); + return false; + } } void Export::writeUsage(const OString& rName, const OString& rFileType) diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index 574987eb0d03..8dca205cf36e 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -39,24 +39,20 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { //sal_uInt32 startfull = Export::startMessure(); bool hasNoError = true; - if ( !aArgs.m_sOutputFile.isEmpty() ){ - HelpParser aParser( aArgs.m_sInputFile ); - - if ( aArgs.m_bMergeMode ) - { - //sal_uInt64 startreadloc = Export::startMessure(); - MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, aArgs.m_sInputFile, false ); - - hasNoError = aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile , Export::sLanguages , aMergeDataFile ); - } - else - hasNoError = - aParser.CreateSDF( - aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot, - aArgs.m_sInputFile, new XMLFile( OUString('0') ), "help" ); + HelpParser aParser( aArgs.m_sInputFile ); + if ( aArgs.m_bMergeMode ) + { + //sal_uInt64 startreadloc = Export::startMessure(); + MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, aArgs.m_sInputFile, false ); + hasNoError = aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile , Export::sLanguages , aMergeDataFile ); } else - std::cerr << "helpex ERROR: Wrong input parameters!\n"; + { + hasNoError = + aParser.CreateSDF( + aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot, + aArgs.m_sInputFile, new XMLFile( OUString('0') ), "help" ); + } if( hasNoError ) return 0; diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index 706ab26309b8..eb5cccc578fc 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -34,15 +34,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { return 1; } - if (!aArgs.m_sOutputFile.isEmpty()) - { - LngParser aParser( aArgs.m_sInputFile, true ); - if ( aArgs.m_bMergeMode ) - aParser.Merge(aArgs.m_sMergeSrc, aArgs.m_sOutputFile); - else - aParser.CreateSDF( - aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot ); - } + LngParser aParser( aArgs.m_sInputFile, true ); + if ( aArgs.m_bMergeMode ) + aParser.Merge(aArgs.m_sMergeSrc, aArgs.m_sOutputFile); + else + aParser.CreateSDF( + aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot ); return 0; } -- cgit From f73618e9dea03d27138cd4599e351249a79bf46b Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sat, 6 Oct 2012 22:10:41 +0200 Subject: Move propex/propmerge code to C++ Changes: -Use same methods and commandline params as other localizers -Work with one lang during mergeing -Work well with comments -Correct makefiles according to one lang concept Plus delete propex.bat to avoid conflicts Change-Id: Ia9d2886db263c31f29692c3f6da2b8ec6542b564 --- Repository.mk | 1 + l10ntools/Executable_propex.mk | 32 ++++++ l10ntools/Module_l10ntools.mk | 1 + l10ntools/Package_scripts.mk | 4 - l10ntools/inc/propmerge.hxx | 37 +++++++ l10ntools/scripts/propex.bat | 8 -- l10ntools/source/propex.cxx | 45 ++++++++ l10ntools/source/propmerge.cxx | 222 +++++++++++++++++++++++++++++++++++++++ solenv/gbuild/ExtensionTarget.mk | 32 +++--- 9 files changed, 357 insertions(+), 25 deletions(-) create mode 100644 l10ntools/Executable_propex.mk create mode 100644 l10ntools/inc/propmerge.hxx delete mode 100755 l10ntools/scripts/propex.bat create mode 100644 l10ntools/source/propex.cxx create mode 100644 l10ntools/source/propmerge.cxx diff --git a/Repository.mk b/Repository.mk index c273b459d494..8aa8e6c95c50 100644 --- a/Repository.mk +++ b/Repository.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ osl_process_child \ pdf2xml \ pdfunzip \ + propex \ rdbmaker \ regsingleton \ regsvrex \ diff --git a/l10ntools/Executable_propex.mk b/l10ntools/Executable_propex.mk new file mode 100644 index 000000000000..d8dc16d323c2 --- /dev/null +++ b/l10ntools/Executable_propex.mk @@ -0,0 +1,32 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + + +$(eval $(call gb_Executable_Executable,propex)) + +$(eval $(call gb_Executable_set_include,propex,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,propex,\ + sal \ + i18nregexp \ +)) + +$(eval $(call gb_Executable_use_static_libraries,propex,\ + transex \ +)) + +$(eval $(call gb_Executable_add_exception_objects,propex,\ + l10ntools/source/propmerge \ + l10ntools/source/propex \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index 4b1d64d80e12..e6c0cc3a8047 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_targets,l10ntools,\ Executable_localize \ Executable_transex3 \ Executable_renewpo \ + Executable_propex \ StaticLibrary_transex \ Package_inc \ Package_scripts \ diff --git a/l10ntools/Package_scripts.mk b/l10ntools/Package_scripts.mk index 3739f123b434..e97ec6c7d7a9 100644 --- a/l10ntools/Package_scripts.mk +++ b/l10ntools/Package_scripts.mk @@ -30,11 +30,7 @@ $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/addkeyid2pot.pl,addkeyid $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/fast_merge.pl,fast_merge.pl)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/keyidGen.pl,keyidGen.pl)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/po2lo,po2lo)) -$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propex,propex)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propmerge,propmerge)) -ifeq ($(OS_FOR_BUILD),WNT) -$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propex.bat,propex.bat)) -endif # vim: set noet sw=4 ts=4: diff --git a/l10ntools/inc/propmerge.hxx b/l10ntools/inc/propmerge.hxx new file mode 100644 index 000000000000..3465635c602f --- /dev/null +++ b/l10ntools/inc/propmerge.hxx @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef _PROPMERGE_INCLUDED +#define _PROPMERGE_INCLUDED + +#include +#include + +class PropParser +{ +private: + std::vector m_vLines; + OString m_sSource; + OString m_sLang; + bool m_bIsInitialized; + +public: + PropParser( + const OString& rInputFile, const OString& rLang, + const bool bMergeMode ); + ~PropParser(); + + bool isInitialized() const { return m_bIsInitialized; } + void Extract( + const OString& rSDFFile, const OString& rPrj, const OString& rRoot ); + void Merge( const OString &rSDFFile, const OString &rDestinationFile ); +}; + +#endif //_PROPMERGE_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/scripts/propex.bat b/l10ntools/scripts/propex.bat deleted file mode 100755 index 1174286920da..000000000000 --- a/l10ntools/scripts/propex.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off - -if "x%PERL%x" EQU "xx" ( - echo ERROR: Perl not found. Environment is not set. - exit /b 1 -) - -%PERL% %SOLARVER%\%INPATH%\bin\propex %* \ No newline at end of file diff --git a/l10ntools/source/propex.cxx b/l10ntools/source/propex.cxx new file mode 100644 index 000000000000..2977cb158874 --- /dev/null +++ b/l10ntools/source/propex.cxx @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "sal/main.h" + +#include "export.hxx" +#include "propmerge.hxx" + +SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) +{ + HandledArgs aArgs; + if( !Export::handleArguments(argc, argv, aArgs) ) + { + Export::writeUsage("propex","properties"); + return 1; + } + + if( aArgs.m_sInputFile.indexOf("en_US") != -1 ) + { + PropParser aParser( + aArgs.m_sInputFile, Export::sLanguages, aArgs.m_bMergeMode ); + if( !aParser.isInitialized() ) + { + return 1; + } + if( aArgs.m_bMergeMode ) + { + aParser.Merge(aArgs.m_sMergeSrc, aArgs.m_sOutputFile); + } + else + { + aParser.Extract( + aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot ); + } + } + return 0; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx new file mode 100644 index 000000000000..237444ffcfcd --- /dev/null +++ b/l10ntools/source/propmerge.cxx @@ -0,0 +1,222 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include +#include +#include +#include + +#include "export.hxx" +#include "common.hxx" +#include "propmerge.hxx" + +namespace +{ + //Write out an sdf line + void lcl_WriteSDF( + std::ofstream &aSDFStream, const OString& rText, const OString& rPrj, + const OString& rActFileName, const OString& rID ) + { + OString sOutput( rPrj ); sOutput += "\t"; + sOutput += rActFileName; + sOutput += "\t0\tproperty\t"; + sOutput += rID; sOutput += "\t\t\t\t0\ten-US\t"; + sOutput += rText; sOutput += "\t\t\t\t"; + aSDFStream << sOutput.getStr() << std::endl; + } + + //Find ascii escaped unicode + sal_Int32 lcl_IndexOfUnicode( + const OString& rSource, const sal_Int32 nFrom = 0 ) + { + const OString sHexDigits = "0123456789abcdefABCDEF"; + sal_Int32 nIndex = rSource.indexOf( "\\u", nFrom ); + if( nIndex == -1 ) + { + return -1; + } + bool bIsUnicode = true; + for( short nDist = 2; nDist <= 5; ++nDist ) + { + if( sHexDigits.indexOf( rSource[nIndex + nDist] ) == -1 ) + { + bIsUnicode = false; + } + } + return bIsUnicode ? nIndex : -1; + } + + //Convert ascii escaped unicode to utf-8 + OString lcl_ConvertToUTF8( const OString& rText ) + { + OString sResult = rText; + sal_Int32 nIndex = lcl_IndexOfUnicode( sResult ); + while( nIndex != -1 && nIndex < rText.getLength() ) + { + const OString sHex = sResult.copy( nIndex + 2, 4 ); + const sal_Unicode cDec = + static_cast( strtol( sHex.getStr(), NULL, 16 ) ); + const OString sNewChar = + OString( &cDec, 1, RTL_TEXTENCODING_UTF8 ); + sResult = sResult.replaceAll( "\\u" + sHex, sNewChar ); + nIndex = lcl_IndexOfUnicode( sResult, nIndex ); + } + return sResult; + } + + //Escape unicode charachters + void lcl_PrintJavaStyle( const OString& rText, std::ofstream &rOfstream ) + { + const OUString sTemp = + OStringToOUString( rText, RTL_TEXTENCODING_UTF8 ); + for ( sal_Int32 nIndex = 0; nIndex < sTemp.getLength(); ++nIndex ) + { + sal_Unicode cUniCode = sTemp[nIndex]; + if( cUniCode < 128 ) + { + rOfstream << static_cast( cUniCode ); + } + else + { + rOfstream + << "\\u" + << std::setfill('0') << std::setw(2) << std::uppercase + << std::hex << (cUniCode >> 8) << (cUniCode & 0xFF); + } + } + } +} + +//Open sourcefile and store it's lines +PropParser::PropParser( + const OString& rInputFile, const OString& rLang, + const bool bMergeMode ) + : m_vLines( std::vector() ) + , m_sSource( rInputFile ) + , m_sLang( rLang ) + , m_bIsInitialized( false ) +{ + std::ifstream aIfstream( m_sSource.getStr() ); + if( aIfstream.is_open() ) + { + std::string s; + std::getline( aIfstream, s ); + while( !aIfstream.eof() ) + { + OString sLine( s.data(), s.length() ); + if( bMergeMode || + ( !sLine.startsWith(" *") && !sLine.startsWith("/*") ) ) + { + m_vLines.push_back( sLine ); + } + std::getline( aIfstream, s ); + } + } + else + { + std::cerr + << "Propex error: Cannot open sourcefile: " + << m_sSource.getStr() << std::endl; + return; + } + m_bIsInitialized = true; +} + +PropParser::~PropParser() +{ +} + +//Extract strings form source file +void PropParser::Extract( + const OString& rSDFFile, const OString& rPrj, const OString& rRoot ) +{ + assert( m_bIsInitialized ); + std::ofstream aSDFStream( + rSDFFile.getStr(), std::ios_base::out | std::ios_base::trunc ); + if( !aSDFStream.is_open() ) + { + std::cerr + << "Propex error: Cannot open sdffile for extract: " + << rSDFFile.getStr() << std::endl; + return; + } + + for( unsigned nIndex = 0; nIndex < m_vLines.size(); ++nIndex ) + { + const OString sLine = m_vLines[nIndex]; + const sal_Int32 nEqualSign = sLine.indexOf('='); + if( nEqualSign != -1 ) + { + lcl_WriteSDF( + aSDFStream, + lcl_ConvertToUTF8( sLine.copy( nEqualSign + 1 ).trim() ),//Text + rPrj, + common::pathnameToken( + m_sSource.getStr(), rRoot.getStr()), //FileName + sLine.copy( 0, nEqualSign ).trim() ); //ID + } + } + + aSDFStream.close(); +} + +//Merge strings to source file +void PropParser::Merge( const OString &rSDFFile, const OString &rDestinationFile ) +{ + assert( m_bIsInitialized ); + std::ofstream aDestination( + rDestinationFile.getStr(), std::ios_base::out | std::ios_base::trunc ); + if( !aDestination.is_open() ) { + std::cerr + << "Propex error: Cannot open sourcefile for merge: " + << rDestinationFile.getStr() << std::endl; + return; + } + + MergeDataFile aMergeDataFile( rSDFFile, m_sSource, false ); + + if( aMergeDataFile.GetLanguages()[0] != m_sLang ) + { + std::cerr + << "Propex error: given language conflicts with " + << "language of Mergedata file: " + << m_sLang.getStr() << " - " << rSDFFile.getStr() << std::endl; + return; + } + + for( unsigned nIndex = 0; nIndex < m_vLines.size(); ++nIndex ) + { + const OString sLine = m_vLines[nIndex]; + const sal_Int32 nEqualSign = sLine.indexOf('='); + if( !sLine.startsWith(" *") && !sLine.startsWith("/*") && + nEqualSign != -1 ) + { + const OString sID( sLine.copy( 0, sLine.indexOf("=") ).trim() ); + ResData aResData( "", sID , m_sSource ); + aResData.sResTyp = "property"; + PFormEntrys* pEntrys = aMergeDataFile.GetPFormEntrys( &aResData ); + if( pEntrys ) + { + OString sNewText; + pEntrys->GetText( sNewText, STRING_TYP_TEXT, m_sLang ); + aDestination << (sID + OString("=")).getStr(); + lcl_PrintJavaStyle( sNewText, aDestination ); + aDestination << std::endl; + } + } + else + { + aDestination << sLine.getStr() << std::endl; + } + } + aDestination.close(); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index efa5a54dfac2..752eba1ff2b1 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -34,10 +34,10 @@ gb_ExtensionTarget_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q) gb_ExtensionTarget_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex) gb_ExtensionTarget_XRMEXCOMMAND := \ $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_XRMEXTARGET) -# propmerge is a perl script -gb_ExtensionTarget_PROPMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/propmerge + +gb_ExtensionTarget_PROPMERGETARGET := $(call gb_Executable_get_target_for_build,propex) gb_ExtensionTarget_PROPMERGECOMMAND := \ - $(PERL) $(gb_ExtensionTarget_PROPMERGETARGET) + $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_PROPMERGETARGET) gb_ExtensionTarget_UPDATETREETARGET := $(SRCDIR)/l10ntools/scripts/update_tree.pl gb_ExtensionTarget_UPDATETREECOMMAND := \ @@ -213,24 +213,30 @@ endef # localize .properties file # source file is copied to $(WORKDIR) define gb_ExtensionTarget_localize_properties +$(foreach lang,$(gb_ExtensionTarget_ALL_LANGS),\ + $(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst en_US,$(subst -,_,$(lang)),$(2)),$(3),$(lang))) +endef + +define gb_ExtensionTarget_localize_properties_onelang $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2) -ifneq ($(strip $(gb_WITH_LANG)),) -$(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_ExtensionTarget_TRANS_LANGS)),$(subst en_US,$(lang),$(2))) +ifneq ($(filter-out en-US,$(4)),) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ - POFILES := $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) + POFILE := $(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ - $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) + $(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po endif $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \ $(gb_ExtensionTarget_PROPMERGETARGET) $$(call gb_Output_announce,$(2),$(true),PRP,3) - MERGEINPUT=`$(gb_MKTEMP)` && \ - echo $$(POFILES) > $$$${MERGEINPUT} && \ - mkdir -p $$(dir $$@) && \ - cp -f $$< $$@ \ - $(if $(strip $(gb_WITH_LANG)),&& $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$@ -m $$$${MERGEINPUT}) && \ - rm -rf $$$${MERGEINPUT} + $$(call gb_Helper_abbreviate_dirs, \ + $(if $(filter-out en-US,$(4)), \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $$(POFILE) > $$$${MERGEINPUT} && \ + mkdir -p $$(dir $$@) && \ + $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$< -o $$@ -m $$$${MERGEINPUT} -l $(4) && \ + rm -rf $$$${MERGEINPUT}, \ + cp $$< $$@)) endef -- cgit From 73ed390a7ff6b701b89faf91385aaa63e865e441 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 8 Oct 2012 18:23:31 +0200 Subject: Correct wrong memory addressing Some global variables in export.cxx and cfgmerge.cxx pointed to OString databuffer and after these strings are destroyed the pointers refered to invalid address. Use OString instead of const char* Change-Id: I4ea43f4b3772ef3370d79336559d39a67400fe2b --- l10ntools/source/cfgmerge.cxx | 10 +++++----- l10ntools/source/export.cxx | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index 3eb442f3a2cd..1d0a819b3d4c 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -38,7 +38,7 @@ namespace { namespace global { -char const * inputPathname = 0; +OString inputPathname; boost::scoped_ptr< CfgParser > parser; } @@ -55,13 +55,13 @@ FILE * init(int argc, char ** argv) { std::exit(EXIT_FAILURE); } Export::InitLanguages(); - global::inputPathname = aArgs.m_sInputFile.getStr(); + global::inputPathname = aArgs.m_sInputFile; - FILE * pFile = std::fopen(global::inputPathname, "r"); + FILE * pFile = std::fopen(global::inputPathname.getStr(), "r"); if (pFile == 0) { std::fprintf( stderr, "Error: Cannot open file \"%s\"\n", - global::inputPathname); + global::inputPathname.getStr() ); std::exit(EXIT_FAILURE); } @@ -74,7 +74,7 @@ FILE * init(int argc, char ** argv) { global::parser.reset( new CfgExport( aArgs.m_sOutputFile.getStr(), aArgs.m_sPrj.getStr(), - common::pathnameToken(global::inputPathname, + common::pathnameToken(global::inputPathname.getStr(), aArgs.m_sPrjRoot.getStr()))); } diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index d9dd5ac9878f..13870da558a2 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -42,9 +42,9 @@ MergeDataFile * pMergeDataFile = 0; //TODO namespace global { -char const * prj = 0; -char const * prjRoot = 0; -char const * inputPathname = 0; +OString prj; +OString prjRoot; +OString inputPathname; boost::scoped_ptr< Export > exporter; } @@ -61,15 +61,15 @@ FILE * init(int argc, char ** argv) { std::exit(EXIT_FAILURE); } Export::InitLanguages(); - global::prj = aArgs.m_sPrj.getStr(); - global::prjRoot = aArgs.m_sPrjRoot.getStr(); - global::inputPathname = aArgs.m_sInputFile.getStr(); + global::prj = aArgs.m_sPrj; + global::prjRoot = aArgs.m_sPrjRoot; + global::inputPathname = aArgs.m_sInputFile; - FILE * pFile = std::fopen(global::inputPathname, "r"); + FILE * pFile = std::fopen(global::inputPathname.getStr(), "r"); if (pFile == 0) { std::fprintf( stderr, "Error: Cannot open file \"%s\"\n", - global::inputPathname); + global::inputPathname.getStr()); std::exit(EXIT_FAILURE); } @@ -78,7 +78,8 @@ FILE * init(int argc, char ** argv) { new Export(aArgs.m_sMergeSrc.getStr(), aArgs.m_sOutputFile.getStr())); } else { sActFileName = - common::pathnameToken(global::inputPathname, global::prjRoot); + common::pathnameToken( + global::inputPathname.getStr(), global::prjRoot.getStr()); global::exporter.reset(new Export(aArgs.m_sOutputFile.getStr())); } -- cgit From 6134c08251ab0da568fc644e030e5af2d6a26a87 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 8 Oct 2012 19:36:55 +0200 Subject: typos Change-Id: Idb23b390af270bdd694ecce9ab14f47d25af8f57 --- l10ntools/source/propmerge.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx index 237444ffcfcd..08261684671b 100644 --- a/l10ntools/source/propmerge.cxx +++ b/l10ntools/source/propmerge.cxx @@ -71,7 +71,7 @@ namespace return sResult; } - //Escape unicode charachters + //Escape unicode characters void lcl_PrintJavaStyle( const OString& rText, std::ofstream &rOfstream ) { const OUString sTemp = @@ -94,7 +94,7 @@ namespace } } -//Open sourcefile and store it's lines +//Open source file and store its lines PropParser::PropParser( const OString& rInputFile, const OString& rLang, const bool bMergeMode ) @@ -122,7 +122,7 @@ PropParser::PropParser( else { std::cerr - << "Propex error: Cannot open sourcefile: " + << "Propex error: Cannot open source file: " << m_sSource.getStr() << std::endl; return; } @@ -175,7 +175,7 @@ void PropParser::Merge( const OString &rSDFFile, const OString &rDestinationFile rDestinationFile.getStr(), std::ios_base::out | std::ios_base::trunc ); if( !aDestination.is_open() ) { std::cerr - << "Propex error: Cannot open sourcefile for merge: " + << "Propex error: Cannot open source file for merge: " << rDestinationFile.getStr() << std::endl; return; } -- cgit From 297531a3b3aa531ebb6d32761680b308d8fa3f9e Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 8 Oct 2012 19:37:57 +0200 Subject: remove propex/propmerge Perl scrips Change-Id: Iab39da2643ba38c4745c29277c10bc39a024ffa3 --- l10ntools/Package_scripts.mk | 2 - l10ntools/scripts/propex | 68 ---------------------------------- l10ntools/scripts/propmerge | 88 -------------------------------------------- 3 files changed, 158 deletions(-) delete mode 100755 l10ntools/scripts/propex delete mode 100755 l10ntools/scripts/propmerge diff --git a/l10ntools/Package_scripts.mk b/l10ntools/Package_scripts.mk index e97ec6c7d7a9..d00d283a8cc6 100644 --- a/l10ntools/Package_scripts.mk +++ b/l10ntools/Package_scripts.mk @@ -30,7 +30,5 @@ $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/addkeyid2pot.pl,addkeyid $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/fast_merge.pl,fast_merge.pl)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/keyidGen.pl,keyidGen.pl)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/po2lo,po2lo)) -$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propmerge,propmerge)) - # vim: set noet sw=4 ts=4: diff --git a/l10ntools/scripts/propex b/l10ntools/scripts/propex deleted file mode 100755 index 35dcb258e381..000000000000 --- a/l10ntools/scripts/propex +++ /dev/null @@ -1,68 +0,0 @@ -: -eval 'exec perl -S $0 ${1+"$@"}' - if 0; -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Andras Timar -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -# -# extracts strings from Java properties files -# - -use strict; -use File::Basename; -use Getopt::Std; -use Cwd; - -my %options=(); -getopts("ep:r:i:o:l:", \%options); - -unless ( $options{i} =~ m/en_US/ ) {exit 0;} - -$options{i} =~ s|\\|/|g; # fix path on Windows, Perl expects / separator -my ($unused1, $dir, $unused2) = File::Basename::fileparse($options{i}); -my $file = substr ( Cwd::abs_path($options{i}), length(Cwd::abs_path($dir . $options{r})) + 1 ); -$file =~ s|/|\\|g; - -open (INFILE, "<$options{i}") || die "propex: cannot open input file: $options{i}"; -open (OUTFILE, ">$options{o}") || die "propex: cannot open output file: $options{o}"; - -while () { - chomp; - if (/=/) { - my ($id, $value) = split /=/; - $id =~ s/^\s+//; #remove leading spaces - $id =~ s/\s+$//; #remove trailing spaces - $value =~ s/^\s+//; #remove leading spaces - $value =~ s/\s+$//; #remove trailing spaces - $value =~ s/(\\u([0-9a-fA-F]{4}))/pack("C0U1",hex($2))/ge; #convert ascii escaped unicode to utf-8 - print OUTFILE "$options{p}\t$file\t0\tproperty\t$id\t\t\t\t0\ten-US\t$value\t\t\t\t20020202 02:02:02\n"; - } -} - -close (INFILE); -close (OUTFILE); - -exit 0; diff --git a/l10ntools/scripts/propmerge b/l10ntools/scripts/propmerge deleted file mode 100755 index 5ba420d5c858..000000000000 --- a/l10ntools/scripts/propmerge +++ /dev/null @@ -1,88 +0,0 @@ -: -eval 'exec perl -S $0 ${1+"$@"}' - if 0; -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Andras Timar -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -# -# merges strings from SDF file to properties files -# - -use strict; -use Getopt::Std; - -my %options=(); -getopts("i:m:", \%options); - -my %translations = (); -my %languages = (); - # ( leftpart ) ( rightpart ) - # prj file dummy type gid lid helpid pform width lang text helptext qhelptext title -my $sdf_regex = "((([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t])*\t([^\t]*)\t([^\t]*))\t([^\t]*)\t(([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)))"; - -open (SDFFILE, "<$options{m}") || die "propmerge: cannot open sdf file: $options{m}"; - -while () { - chomp; - if( /$sdf_regex/ ) { - my $gid = defined $7 ? $7 : ''; - my $lang = defined $12 ? $12 : ''; - my $text = defined $14 ? $14 : ''; - my $key = $lang . $gid; - $languages{$lang} = 1; - utf8::decode($text); - $text =~ s/([^\x{20}-\x{7E}])/sprintf("\\u%04X",ord($1))/ge; - $translations{$key} = $text; - } -} - -close (SDFFILE); - -foreach my $lang (keys %languages) { - my $locfilename = $options{i}; - $lang =~ s/-/_/; - $locfilename =~ s/en_US\.properties/$lang.properties/; - $lang =~ s/_/-/; - open (INFILE, "<$options{i}") || die "propmerge: cannot open source file: $options{i}"; - open (OUTFILE, ">$locfilename") || die "propmerge: cannot open output file: $locfilename"; - while () { - if (/=/) { - chomp; - my ($id, $value) = split /=/; - $id =~ s/^\s+//; #remove leading spaces - $id =~ s/\s+$//; #remove trailing spaces - my $key = $lang . $id; - print OUTFILE "$id=$translations{$key}\n"; - } - else { - print OUTFILE "$_"; - } - } - close (INFILE); - close (OUTFILE); -} - -exit 0; -- cgit From 247bac3266ee933716ecf85e0204b0d6b8c6da74 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 8 Oct 2012 22:43:26 +0200 Subject: Make an end of xrmex id duplication Use GroupId instead of LocalId because that is the primary id. Thus usage of LocalId becomes unneeded. Change-Id: I2770141fab47c07294ab15322848e8aef0de2cec --- l10ntools/source/xrmmerge.cxx | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 4cf4d9e94253..a3eb0e5418ee 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -192,9 +192,9 @@ int XRMResParser::Execute( int nToken, char * pToken ) switch ( nToken ) { case XRM_TEXT_START:{ - rtl::OString sNewLID = GetAttribute( rToken, "id" ); - if ( sNewLID != sLID ) { - sLID = sNewLID; + rtl::OString sNewGID = GetAttribute( rToken, "id" ); + if ( sNewGID != sGID ) { + sGID = sNewGID; } bText = sal_True; sCurrentText = ""; @@ -228,7 +228,7 @@ int XRMResParser::Execute( int nToken, char * pToken ) case DESC_TEXT_START:{ if (bDisplayName) { - sLID = rtl::OString("dispname"); + sGID = rtl::OString("dispname"); bText = sal_True; sCurrentText = ""; sCurrentOpenTag = rToken; @@ -264,7 +264,7 @@ int XRMResParser::Execute( int nToken, char * pToken ) case DESC_EXTENSION_DESCRIPTION_SRC: { if (bExtensionDescription) { - sLID = rtl::OString("extdesc"); + sGID = rtl::OString("extdesc"); sResourceType = rtl::OString ( "description" ); sLangAttribute = rtl::OString ( "lang" ); sCurrentOpenTag = rToken; @@ -429,7 +429,6 @@ void XRMResExport::WorkOnText( { rtl::OString sPlatform( "" ); pResData = new ResData( sPlatform, GetGID() ); - pResData->sId = GetLID(); } rtl::OString sText(rText); @@ -459,12 +458,8 @@ void XRMResExport::EndOfText( sOutput += "\t0\t"; sOutput += sResourceType; sOutput += "\t"; - sOutput += pResData->sId; - // USE LID AS GID OR MERGE DON'T WORK - //sOutput += pResData->sGId; - sOutput += "\t"; - sOutput += pResData->sId; - sOutput += "\t\t\t0\t"; + sOutput += pResData->sGId; + sOutput += "\t\t\t\t0\t"; sOutput += sCur; sOutput += "\t"; @@ -601,8 +596,7 @@ void XRMResMerge::WorkOnText( if ( pMergeDataFile ) { if ( !pResData ) { rtl::OString sPlatform( "" ); - pResData = new ResData( sPlatform, GetLID() , sFilename ); - pResData->sId = GetLID(); + pResData = new ResData( sPlatform, GetGID() , sFilename ); pResData->sResTyp = sResourceType; } -- cgit From 961728d58cb80e7eff11baf8d44c0d37dd1074c9 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 8 Oct 2012 23:03:00 +0200 Subject: Make renewpo to ignore double id in xml/xrm Change-Id: I01329beded3e81040726f525cdb5886b5f3a8c63 --- l10ntools/source/renewpo.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index 83b3051134a9..4a11c368a0e7 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -147,14 +147,17 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, if (!sActUnTrans.getToken(vTypes[nIndex],'\t').isEmpty()) { /**Because of xrmex there are duplicated id's, - only use this if xrmex have already fixed + only use this if xrmex have already fixed*/ + const OString sSource = + sActUnTrans.getToken(PoEntry::SOURCEFILE,'\t'); + const OString sEnding = + sSource.copy(sSource.getLength()-4, 4); if (sActUnTrans.getToken(PoEntry::GROUPID,'\t')== sActUnTrans.getToken(PoEntry::LOCALID,'\t') && - sActUnTrans.getToken(PoEntry::SOURCEFILE,'\t'). - endsWith(".xrm")) + ( sEnding == ".xrm" || sEnding == ".xml" )) { sActUnTrans = DelLocalId(sActUnTrans); - }*/ + } PoEntry aPE(sActUnTrans, vTypes[nIndex]); const OString sActStr = sActTrans.getToken(vTypes[nIndex],'\t'); -- cgit From 63af8783bcb418e72e59f5faf3a070701b828845 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Tue, 9 Oct 2012 22:05:24 +0200 Subject: Use static, lcl_ and anonymus namespace for local functions Change-Id: I0393c9552ca353e80ac61d258a280cbcd53e1cba --- l10ntools/source/po.cxx | 427 ++++++++++++++++++++++------------------- l10ntools/source/propmerge.cxx | 8 +- 2 files changed, 229 insertions(+), 206 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 465e18e3ab6d..eaf83a933769 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -29,85 +29,91 @@ //Class GenPoEntry -//Generate KeyId -OString ImplGenKeyId(const OString& rGenerator) -{ - boost::crc_32_type aCRC32; - aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength()); - sal_uInt32 nCRC = aCRC32.checksum(); - //Use all readable ASCII charachter exclude xml special tags: ",',&,<,> - const OString sSymbols = "!#$%()*+,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"; - char sKeyId[5]; - for( short nKeyInd = 0; nKeyInd < 4; ++nKeyInd ) +namespace +{ + //Generate KeyId + static OString lcl_GenKeyId(const OString& rGenerator) { - sKeyId[nKeyInd] = sSymbols[(nCRC & 255) % 89]; - nCRC >>= 8; + boost::crc_32_type aCRC32; + aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength()); + sal_uInt32 nCRC = aCRC32.checksum(); + //Use all readable ASCII charachter exclude xml special tags: ",',&,<,> + const OString sSymbols = "!#$%()*+,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"; + char sKeyId[5]; + for( short nKeyInd = 0; nKeyInd < 4; ++nKeyInd ) + { + sKeyId[nKeyInd] = sSymbols[(nCRC & 255) % 89]; + nCRC >>= 8; + } + sKeyId[4] = '\0'; + return OString(sKeyId); } - sKeyId[4] = '\0'; - return OString(sKeyId); -} -//Escape text -OString ImplEscapeText(const OString& rText, - const OString& rUnEscaped= POUNESCAPED, - const OString& rEscaped = POESCAPED) -{ - assert( rEscaped.getLength() == 2*rUnEscaped.getLength() ); - OString sResult = rText; - int nCount = 0; - for(sal_Int32 nIndex=0; nIndex& o_vParts) +namespace { - o_vParts.resize( 0 ); - sal_Int32 nActIndex = 0; - sal_Int32 nLastSplit = 0; - while( nActIndex < rSource.getLength() ) + //Split string at the delimiter char + static void lcl_SplitAt(const OString& rSource, const sal_Char nDelimiter, + std::vector& o_vParts) { - if ( rSource[nActIndex] == nDelimiter ) + o_vParts.resize( 0 ); + sal_Int32 nActIndex = 0; + sal_Int32 nLastSplit = 0; + while( nActIndex < rSource.getLength() ) { - o_vParts.push_back(rSource.copy(nLastSplit,nActIndex-nLastSplit)); - nLastSplit = nActIndex+1; + if ( rSource[nActIndex] == nDelimiter ) + { + o_vParts.push_back( + rSource.copy(nLastSplit,nActIndex-nLastSplit)); + nLastSplit = nActIndex+1; + } + ++nActIndex; } - ++nActIndex; + o_vParts.push_back(rSource.copy(nLastSplit)); } - o_vParts.push_back(rSource.copy(nLastSplit)); -} -//Unescape sdf string -OString ImplUnEscapeSDFText(const OString& rText,const bool bHelpText = false) -{ - if ( bHelpText ) - return ImplUnEscapeText(rText,"\\<\\>\\\"\\\\","<>\"\\"); - else - return ImplUnEscapeText(rText,"\\n\\t\\r","\n\t\r"); -} + //Unescape sdf string + static OString lcl_UnEscapeSDFText( + const OString& rText,const bool bHelpText = false ) + { + if ( bHelpText ) + return lcl_UnEscapeText(rText,"\\<\\>\\\"\\\\","<>\"\\"); + else + return lcl_UnEscapeText(rText,"\\n\\t\\r","\n\t\r"); + } -//Miminize the length of the regular expression result -void ImplMinimize(const OUString& rText, Regexpr& io_rRegExp, re_registers& io_rRegs) -{ - re_registers aPrevRegs; - const sal_Int32 nStart = io_rRegs.start[0]; - do + //Miminize the length of the regular expression result + static void lcl_Minimize( + const OUString& rText, Regexpr& io_rRegExp, re_registers& io_rRegs ) { - const OUString sTemp = rText.copy(0,io_rRegs.end[0]-1); - memcpy(static_cast(&aPrevRegs), static_cast(&io_rRegs), + re_registers aPrevRegs; + const sal_Int32 nStart = io_rRegs.start[0]; + do + { + const OUString sTemp = rText.copy(0,io_rRegs.end[0]-1); + memcpy( + static_cast(&aPrevRegs), + static_cast(&io_rRegs), + sizeof(re_registers)); + memset(static_cast(&io_rRegs), 0, sizeof(re_registers)); + io_rRegExp.set_line(sTemp.getStr(),sTemp.getLength()); + io_rRegExp.re_search(&io_rRegs,nStart); + } while(io_rRegs.num_of_match); + + memcpy(static_cast(&io_rRegs),static_cast(&aPrevRegs), sizeof(re_registers)); - memset(static_cast(&io_rRegs), 0, sizeof(re_registers)); - io_rRegExp.set_line(sTemp.getStr(),sTemp.getLength()); - io_rRegExp.re_search(&io_rRegs,nStart); - } while(io_rRegs.num_of_match); - - memcpy(static_cast(&io_rRegs),static_cast(&aPrevRegs), - sizeof(re_registers)); - io_rRegExp.set_line(rText.getStr(),rText.getLength()); -} - -//Find all special tag in a string using a regular expression -void ImplFindAllTag(const OString& rText,std::vector& o_vFoundTags) -{ - ::com::sun::star::util::SearchOptions aOptions; - aOptions.algorithmType = ::com::sun::star::util::SearchAlgorithms_REGEXP; - aOptions.searchFlag = ::com::sun::star::util::SearchFlags::NORM_WORD_ONLY; - aOptions.searchString = "<[/]?[a-z_\\-]+(| +[a-z]+=\".*\") *[/]?>"; - ::com::sun::star::uno::Reference< - ::com::sun::star::i18n::XExtendedTransliteration > xTrans; - - Regexpr aRegExp(aOptions,xTrans); - const OUString sTemp(OStringToOUString(rText,RTL_TEXTENCODING_UTF8)); - aRegExp.set_line(sTemp.getStr(),sTemp.getLength()); - - re_registers aRegs; - memset(static_cast(&aRegs), 0, sizeof(re_registers)); - sal_Int32 nStart = 0; - o_vFoundTags.resize(0); - aRegExp.re_search(&aRegs,nStart); - while(aRegs.num_of_match) + io_rRegExp.set_line(rText.getStr(),rText.getLength()); + } + + //Find all special tag in a string using a regular expression + static void lcl_FindAllTag( + const OString& rText,std::vector& o_vFoundTags ) { - ImplMinimize(sTemp,aRegExp,aRegs); - o_vFoundTags.push_back( - OUStringToOString( - sTemp.copy(aRegs.start[0],aRegs.end[0]-aRegs.start[0]), - RTL_TEXTENCODING_UTF8)); - nStart = aRegs.end[0]; + ::com::sun::star::util::SearchOptions aOptions; + aOptions.algorithmType = + ::com::sun::star::util::SearchAlgorithms_REGEXP; + aOptions.searchFlag = + ::com::sun::star::util::SearchFlags::NORM_WORD_ONLY; + aOptions.searchString = "<[/]?[a-z_\\-]+(| +[a-z]+=\".*\") *[/]?>"; + ::com::sun::star::uno::Reference< + ::com::sun::star::i18n::XExtendedTransliteration > xTrans; + + Regexpr aRegExp(aOptions,xTrans); + const OUString sTemp(OStringToOUString(rText,RTL_TEXTENCODING_UTF8)); + aRegExp.set_line(sTemp.getStr(),sTemp.getLength()); + + re_registers aRegs; memset(static_cast(&aRegs), 0, sizeof(re_registers)); + sal_Int32 nStart = 0; + o_vFoundTags.resize(0); aRegExp.re_search(&aRegs,nStart); + while(aRegs.num_of_match) + { + lcl_Minimize(sTemp,aRegExp,aRegs); + o_vFoundTags.push_back( + OUStringToOString( + sTemp.copy(aRegs.start[0],aRegs.end[0]-aRegs.start[0]), + RTL_TEXTENCODING_UTF8)); + nStart = aRegs.end[0]; + memset(static_cast(&aRegs), 0, sizeof(re_registers)); + aRegExp.re_search(&aRegs,nStart); + } } -} -//Escape special tags -OString ImplEscapeTags(const OString& rText) -{ - typedef std::vector StrVec; - const OString vInitializer[] = { - "ahelp", "link", "item", "emph", "defaultinline", - "switchinline", "caseinline", "variable", - "bookmark_value", "image", "embedvar", "alt" }; - const StrVec vTagsForEscape( vInitializer, - vInitializer + sizeof(vInitializer) / sizeof(vInitializer[0]) ); - StrVec vFoundTags; - ImplFindAllTag(rText,vFoundTags); - OString sResult = rText; - for(StrVec::const_iterator pFound = vFoundTags.begin(); - pFound != vFoundTags.end(); ++pFound) + //Escape special tags + static OString lcl_EscapeTags( const OString& rText ) { - bool bEscapeThis = false; - for(StrVec::const_iterator pEscape = vTagsForEscape.begin(); - pEscape != vTagsForEscape.end(); ++pEscape) + typedef std::vector StrVec; + const OString vInitializer[] = { + "ahelp", "link", "item", "emph", "defaultinline", + "switchinline", "caseinline", "variable", + "bookmark_value", "image", "embedvar", "alt" }; + const StrVec vTagsForEscape( vInitializer, + vInitializer + sizeof(vInitializer) / sizeof(vInitializer[0]) ); + StrVec vFoundTags; + lcl_FindAllTag(rText,vFoundTags); + OString sResult = rText; + for(StrVec::const_iterator pFound = vFoundTags.begin(); + pFound != vFoundTags.end(); ++pFound) { - if (pFound->startsWith("<" + *pEscape) || - *pFound == "") + bool bEscapeThis = false; + for(StrVec::const_iterator pEscape = vTagsForEscape.begin(); + pEscape != vTagsForEscape.end(); ++pEscape) { - bEscapeThis = true; - break; + if (pFound->startsWith("<" + *pEscape) || + *pFound == "") + { + bEscapeThis = true; + break; + } + } + if( bEscapeThis || *pFound=="
" || + *pFound =="") + { + OString sToReplace = "\\<" + + pFound->copy(1,pFound->getLength()-2). + replaceAll("\"","\\\"") + "\\>"; + sResult = sResult.replaceAll(*pFound, sToReplace); } } - if (bEscapeThis || *pFound=="
" || *pFound =="") - { - OString sToReplace = "\\<" + pFound->copy(1,pFound->getLength()-2). - replaceAll("\"","\\\"") + "\\>"; - sResult = sResult.replaceAll(*pFound, sToReplace); - } + return sResult; } - return sResult; -} -//Escape to get sdf/merge string -OString ImplEscapeSDFText(const OString& rText,const bool bHelpText = false) -{ - if ( bHelpText ) - return ImplEscapeTags(rText.replaceAll("\\","\\\\")); - else - return ImplEscapeText(rText,"\n\t\r","\\n\\t\\r"); + //Escape to get sdf/merge string + static OString lcl_EscapeSDFText( + const OString& rText,const bool bHelpText = false ) + { + if ( bHelpText ) + return lcl_EscapeTags(rText.replaceAll("\\","\\\\")); + else + return lcl_EscapeText(rText,"\n\t\r","\\n\\t\\r"); + } } - //Default constructor PoEntry::PoEntry() : m_aGenPo( GenPoEntry() ) @@ -393,7 +412,7 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) , m_bIsInitialized( false ) { std::vector vParts; - ImplSplitAt(rSDFLine,'\t',vParts); + lcl_SplitAt(rSDFLine,'\t',vParts); if( vParts.size()!=15 || vParts[SOURCEFILE].isEmpty() || vParts[GROUPID].isEmpty() || @@ -424,7 +443,7 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) } m_aGenPo.setContext(sContext); m_aGenPo.setUnTransStr( - ImplUnEscapeSDFText( + lcl_UnEscapeSDFText( vParts[eType],vParts[SOURCEFILE].endsWith(".xhp"))); m_aGenPo.genKeyId(); m_bIsInitialized = true; @@ -506,7 +525,7 @@ OString PoEntry::getUnTransStr() const { assert( m_bIsInitialized ); return - ImplEscapeSDFText( + lcl_EscapeSDFText( m_aGenPo.getUnTransStr(), getSourceFile().endsWith(".xhp") ); } @@ -515,7 +534,7 @@ OString PoEntry::getTransStr() const { assert( m_bIsInitialized ); return - ImplEscapeSDFText( + lcl_EscapeSDFText( m_aGenPo.getTransStr(), getSourceFile().endsWith(".xhp") ); } @@ -524,7 +543,7 @@ OString PoEntry::getTransStr() const void PoEntry::setTransStr(const OString& rTransStr) { m_aGenPo.setTransStr( - ImplUnEscapeSDFText( + lcl_UnEscapeSDFText( rTransStr,getSourceFile().endsWith(".xhp"))); } @@ -546,23 +565,27 @@ bool PoEntry::IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2) //Class PoHeader -//Get actual time in "YEAR-MO-DA HO:MI+ZONE" form -OString ImplGetTime() +namespace { - time_t aNow = time(NULL); - struct tm* pNow = localtime(&aNow); - char pBuff[50]; - strftime( pBuff, sizeof pBuff, "%Y-%m-%d %H:%M%z", pNow ); - return pBuff; -} + //Get actual time in "YEAR-MO-DA HO:MI+ZONE" form + static OString lcl_GetTime() + { + time_t aNow = time(NULL); + struct tm* pNow = localtime(&aNow); + char pBuff[50]; + strftime( pBuff, sizeof pBuff, "%Y-%m-%d %H:%M%z", pNow ); + return pBuff; + } -OString ImplReplaceAttribute( - const OString& rSource, const OString& rOld, const OString& rNew ) -{ - const sal_Int32 nFirstIndex = rSource.indexOf( rOld ) + rOld.getLength()+2; - const sal_Int32 nCount = - rSource.indexOf( "\n", nFirstIndex ) - nFirstIndex; - return rSource.replaceFirst( rSource.copy(nFirstIndex, nCount), rNew ); + static OString lcl_ReplaceAttribute( + const OString& rSource, const OString& rOld, const OString& rNew ) + { + const sal_Int32 nFirstIndex = + rSource.indexOf( rOld ) + rOld.getLength()+2; + const sal_Int32 nCount = + rSource.indexOf( "\n", nFirstIndex ) - nFirstIndex; + return rSource.replaceFirst( rSource.copy(nFirstIndex, nCount), rNew ); + } } //Default Constructor @@ -582,7 +605,7 @@ PoHeader::PoHeader( const OString& rExtSrc ) OString("Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?" "product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" - "POT-Creation-Date: ") + ImplGetTime() + + "POT-Creation-Date: ") + lcl_GetTime() + OString("\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -610,13 +633,13 @@ PoHeader::PoHeader( std::ifstream& rOldPo ) OString sTransStr = m_aGenPo.getTransStr(); sTransStr = - ImplReplaceAttribute( sTransStr, "Report-Msgid-Bugs-To", + lcl_ReplaceAttribute( sTransStr, "Report-Msgid-Bugs-To", "https://bugs.freedesktop.org/enter_bug.cgi?product=" "LibreOffice&bug_status=UNCONFIRMED&component=UI" ); sTransStr = - ImplReplaceAttribute( sTransStr, "X-Generator", "LibreOffice" ); + lcl_ReplaceAttribute( sTransStr, "X-Generator", "LibreOffice" ); sTransStr = - ImplReplaceAttribute( sTransStr, "X-Accelerator-Marker", "~" ); + lcl_ReplaceAttribute( sTransStr, "X-Accelerator-Marker", "~" ); m_aGenPo.setTransStr( sTransStr ); m_bIsInitialized = true; } diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx index 08261684671b..0f1b20b6f1fe 100644 --- a/l10ntools/source/propmerge.cxx +++ b/l10ntools/source/propmerge.cxx @@ -20,7 +20,7 @@ namespace { //Write out an sdf line - void lcl_WriteSDF( + static void lcl_WriteSDF( std::ofstream &aSDFStream, const OString& rText, const OString& rPrj, const OString& rActFileName, const OString& rID ) { @@ -33,7 +33,7 @@ namespace } //Find ascii escaped unicode - sal_Int32 lcl_IndexOfUnicode( + static sal_Int32 lcl_IndexOfUnicode( const OString& rSource, const sal_Int32 nFrom = 0 ) { const OString sHexDigits = "0123456789abcdefABCDEF"; @@ -54,7 +54,7 @@ namespace } //Convert ascii escaped unicode to utf-8 - OString lcl_ConvertToUTF8( const OString& rText ) + static OString lcl_ConvertToUTF8( const OString& rText ) { OString sResult = rText; sal_Int32 nIndex = lcl_IndexOfUnicode( sResult ); @@ -72,7 +72,7 @@ namespace } //Escape unicode characters - void lcl_PrintJavaStyle( const OString& rText, std::ofstream &rOfstream ) + static void lcl_PrintJavaStyle( const OString& rText, std::ofstream &rOfstream ) { const OUString sTemp = OStringToOUString( rText, RTL_TEXTENCODING_UTF8 ); -- cgit From 1ef83f535f638ddfa7f2ad0533f88c37e7bcbeef Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Tue, 9 Oct 2012 22:31:23 +0200 Subject: Use _t suffix for typedef Change-Id: I8501739e9fb1b184facebc406ed6e20de1f7ab0a --- l10ntools/source/po.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index eaf83a933769..0a5ae28037ff 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -352,21 +352,21 @@ namespace //Escape special tags static OString lcl_EscapeTags( const OString& rText ) { - typedef std::vector StrVec; + typedef std::vector StrVec_t; const OString vInitializer[] = { "ahelp", "link", "item", "emph", "defaultinline", "switchinline", "caseinline", "variable", "bookmark_value", "image", "embedvar", "alt" }; - const StrVec vTagsForEscape( vInitializer, + const StrVec_t vTagsForEscape( vInitializer, vInitializer + sizeof(vInitializer) / sizeof(vInitializer[0]) ); - StrVec vFoundTags; + StrVec_t vFoundTags; lcl_FindAllTag(rText,vFoundTags); OString sResult = rText; - for(StrVec::const_iterator pFound = vFoundTags.begin(); + for(StrVec_t::const_iterator pFound = vFoundTags.begin(); pFound != vFoundTags.end(); ++pFound) { bool bEscapeThis = false; - for(StrVec::const_iterator pEscape = vTagsForEscape.begin(); + for(StrVec_t::const_iterator pEscape = vTagsForEscape.begin(); pEscape != vTagsForEscape.end(); ++pEscape) { if (pFound->startsWith("<" + *pEscape) || -- cgit From 9ebb37f39bb85b1b900916c54ffd4e82f79186a0 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 10 Oct 2012 14:21:58 +0200 Subject: Relocate KeyId to PoEntry KeyId is PoEntry specific attribute rather than part of GenPoEntry. In GenPoEntry it is just part of extracted comment. Four character long helptext/x-comment can lead to incorrect behaviour during file reading. With checking it in sdf-po constructor we can prevent this kind of po comming into existence. Change-Id: I48cc8f34d2c1ca8b86baea25384f5b697f16dd66 --- l10ntools/inc/po.hxx | 3 -- l10ntools/source/po.cxx | 92 ++++++++++++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index 9163e6a10230..d1112e1730d8 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -29,7 +29,6 @@ private: OString m_sTransStr; bool m_bFuzzy; bool m_bNull; - OString m_sKeyId; public: @@ -45,7 +44,6 @@ public: virtual OString getTransStr() const { return m_sTransStr; } virtual bool getFuzzy() const { return m_bFuzzy; } virtual bool isNull() const { return m_bNull; } - virtual OString getKeyId() const { return m_sKeyId; } virtual void setWhiteSpace(const OString& rWhiteSpace); virtual void setExtractCom(const OString& rExtractCom); @@ -54,7 +52,6 @@ public: virtual void setUnTransStr(const OString& rUnTransStr); virtual void setTransStr(const OString& rTransStr); virtual void setFuzzy(const bool bFuzzy); - virtual void genKeyId(); virtual void writeToFile(std::ofstream& rOFStream) const; virtual void readFromFile(std::ifstream& rIFStream); diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 0a5ae28037ff..0416ad0aa185 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -31,24 +31,6 @@ namespace { - //Generate KeyId - static OString lcl_GenKeyId(const OString& rGenerator) - { - boost::crc_32_type aCRC32; - aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength()); - sal_uInt32 nCRC = aCRC32.checksum(); - //Use all readable ASCII charachter exclude xml special tags: ",',&,<,> - const OString sSymbols = "!#$%()*+,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"; - char sKeyId[5]; - for( short nKeyInd = 0; nKeyInd < 4; ++nKeyInd ) - { - sKeyId[nKeyInd] = sSymbols[(nCRC & 255) % 89]; - nCRC >>= 8; - } - sKeyId[4] = '\0'; - return OString(sKeyId); - } - //Escape text static OString lcl_EscapeText(const OString& rText, const OString& rUnEscaped= POUNESCAPED, @@ -126,7 +108,6 @@ GenPoEntry::GenPoEntry() , m_sTransStr( OString() ) , m_bFuzzy( false ) , m_bNull( false ) - , m_sKeyId( OString() ) { } @@ -171,21 +152,15 @@ void GenPoEntry::setFuzzy(const bool bFuzzy) m_bFuzzy = bFuzzy; } -//Set keyid -void GenPoEntry::genKeyId() -{ - m_sKeyId = lcl_GenKeyId( m_sReference + m_sContext + m_sUnTransStr ); -} - //Write to file void GenPoEntry::writeToFile(std::ofstream& rOFStream) const { if ( !m_sWhiteSpace.isEmpty() ) rOFStream << m_sWhiteSpace.getStr(); if ( !m_sExtractCom.isEmpty() ) - rOFStream << "#. " << m_sExtractCom.getStr() << std::endl; - if ( !m_sKeyId.isEmpty() ) - rOFStream << "#. " << m_sKeyId.getStr() << std::endl; + rOFStream + << "#. " + << m_sExtractCom.replaceAll("\n","\n#. ").getStr() << std::endl; if ( !m_sReference.isEmpty() ) rOFStream << "#: " << m_sReference.getStr() << std::endl; if ( m_bFuzzy ) @@ -217,10 +192,11 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) OString sLine = OString(sTemp.data(),sTemp.length()); if (sLine.startsWith("#. ")) { - if (sLine.getLength()==7) - m_sKeyId = sLine.copy(3); - else - m_sExtractCom = sLine.copy(3); + if( !m_sExtractCom.isEmpty() ) + { + m_sExtractCom += "\n"; + } + m_sExtractCom += sLine.copy(3); } else if (sLine.startsWith("#: ")) { @@ -253,14 +229,30 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) break; getline(rIFStream,sTemp); } - if( m_sKeyId.isEmpty() && !m_sUnTransStr.isEmpty() ) - genKeyId(); } //Class PoEntry namespace { + //Generate KeyId + static OString lcl_GenKeyId(const OString& rGenerator) + { + boost::crc_32_type aCRC32; + aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength()); + sal_uInt32 nCRC = aCRC32.checksum(); + //Use all readable ASCII charachter exclude xml special tags: ",',&,<,> + const OString sSymbols = "!#$%()*+,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"; + char sKeyId[5]; + for( short nKeyInd = 0; nKeyInd < 4; ++nKeyInd ) + { + sKeyId[nKeyInd] = sSymbols[(nCRC & 255) % 89]; + nCRC >>= 8; + } + sKeyId[4] = '\0'; + return OString(sKeyId); + } + //Split string at the delimiter char static void lcl_SplitAt(const OString& rSource, const sal_Char nDelimiter, std::vector& o_vParts) @@ -417,7 +409,8 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) vParts[SOURCEFILE].isEmpty() || vParts[GROUPID].isEmpty() || vParts[RESOURCETYPE].isEmpty() || - vParts[eType].isEmpty() ) + vParts[eType].isEmpty() || + vParts[HELPTEXT].getLength() == 4 ) { throw INVALIDSDFLINE; } @@ -426,7 +419,6 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) m_aGenPo.setReference(vParts[SOURCEFILE]. copy(vParts[SOURCEFILE].lastIndexOf("\\")+1)); - m_aGenPo.setExtractCom(vParts[HELPTEXT]); OString sContext = vParts[GROUPID] + "\n" + (vParts[LOCALID].isEmpty() ? "" : vParts[LOCALID] + "\n") + @@ -441,11 +433,14 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) /*Default case is unneeded because the type of eType has only three element*/ } + m_aGenPo.setExtractCom( + ( !vParts[HELPTEXT].isEmpty() ? vParts[HELPTEXT] + "\n" : "" ) + + lcl_GenKeyId( + vParts[SOURCEFILE] + sContext + vParts[eType] ) ); m_aGenPo.setContext(sContext); m_aGenPo.setUnTransStr( lcl_UnEscapeSDFText( vParts[eType],vParts[SOURCEFILE].endsWith(".xhp"))); - m_aGenPo.genKeyId(); m_bIsInitialized = true; } @@ -516,7 +511,15 @@ bool PoEntry::getFuzzy() const OString PoEntry::getKeyId() const { assert( m_bIsInitialized ); - return m_aGenPo.getKeyId(); + const OString sExtractCom = m_aGenPo.getExtractCom(); + if( sExtractCom.indexOf("\n") == -1 ) + { + return sExtractCom; + } + else + { + return sExtractCom.getToken(1,'\n'); + } } @@ -778,10 +781,21 @@ void PoIfstream::readEntry( PoEntry& rPoEntry ) (nLastEndLine == nFirstEndLine || nLastEndLine == sContext.indexOf('\n',nFirstEndLine+1)) && nLastDot - nLastEndLine > 1 && - (sType == "text" || sType == "quickhelptext" || sType == "title") && + (sType == "text" || sType == "quickhelptext" || sType == "title")&& !aGenPo.getUnTransStr().isEmpty() ) { rPoEntry.m_aGenPo = aGenPo; + const OString sExtractCom = aGenPo.getExtractCom(); + if( sExtractCom.isEmpty() || + ( sExtractCom.getLength() != 4 && + sExtractCom.indexOf("\n") == -1 ) ) + { + aGenPo.setExtractCom( + ( !sExtractCom.isEmpty() ? sExtractCom + "\n" : "" ) + + lcl_GenKeyId( + aGenPo.getReference() + sContext + + aGenPo.getUnTransStr() ) ); + } rPoEntry.m_bIsInitialized = true; } else -- cgit From a76c979c1771566e806db67e44f387bb68b862cc Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 10 Oct 2012 15:08:46 +0200 Subject: Delete WhiteSpace member of GenPoEntry This member allows us to use more kind of whitespace between po entries but we use one end line everywhere so this variable is unneeded. Change-Id: I4e3c9040ca73580fd01484bb91325a9df04cb4e4 --- l10ntools/inc/po.hxx | 3 --- l10ntools/source/po.cxx | 15 +++------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index d1112e1730d8..fa43b517b437 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -21,7 +21,6 @@ class GenPoEntry { private: - OString m_sWhiteSpace; OString m_sExtractCom; OString m_sReference; OString m_sContext; @@ -36,7 +35,6 @@ public: virtual ~GenPoEntry(); //Default copy constructor and copy operator work well - virtual OString getWhiteSpace() const { return m_sWhiteSpace; } virtual OString getExtractCom() const { return m_sExtractCom; } virtual OString getReference() const { return m_sReference; } virtual OString getContext() const { return m_sContext; } @@ -45,7 +43,6 @@ public: virtual bool getFuzzy() const { return m_bFuzzy; } virtual bool isNull() const { return m_bNull; } - virtual void setWhiteSpace(const OString& rWhiteSpace); virtual void setExtractCom(const OString& rExtractCom); virtual void setReference(const OString& rReference); virtual void setContext(const OString& rContext); diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 0416ad0aa185..e1c978de6f6f 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -100,8 +100,7 @@ namespace //Default constructor GenPoEntry::GenPoEntry() - : m_sWhiteSpace( OString() ) - , m_sExtractCom( OString() ) + : m_sExtractCom( OString() ) , m_sReference( OString() ) , m_sContext( OString() ) , m_sUnTransStr( OString() ) @@ -117,11 +116,6 @@ GenPoEntry::~GenPoEntry() } //Set class members -void GenPoEntry::setWhiteSpace(const OString& rWhiteSpace) -{ - m_sWhiteSpace = rWhiteSpace; -} - void GenPoEntry::setExtractCom(const OString& rExtractCom) { m_sExtractCom = rExtractCom; @@ -155,8 +149,8 @@ void GenPoEntry::setFuzzy(const bool bFuzzy) //Write to file void GenPoEntry::writeToFile(std::ofstream& rOFStream) const { - if ( !m_sWhiteSpace.isEmpty() ) - rOFStream << m_sWhiteSpace.getStr(); + if ( rOFStream.tellp() != 0 ) + rOFStream << std::endl; if ( !m_sExtractCom.isEmpty() ) rOFStream << "#. " @@ -183,7 +177,6 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) m_bNull = true; return; } - m_sWhiteSpace = "\n"; OString* pLastMsg = 0; std::string sTemp; getline(rIFStream,sTemp); @@ -414,7 +407,6 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) { throw INVALIDSDFLINE; } - m_aGenPo.setWhiteSpace("\n"); m_aGenPo.setReference(vParts[SOURCEFILE]. copy(vParts[SOURCEFILE].lastIndexOf("\\")+1)); @@ -629,7 +621,6 @@ PoHeader::PoHeader( std::ifstream& rOldPo ) assert( rOldPo.is_open() ); m_aGenPo.readFromFile( rOldPo ); - m_aGenPo.setWhiteSpace( OString() ); const OString sExtractCom = m_aGenPo.getExtractCom(); m_aGenPo.setExtractCom( sExtractCom.copy( 0, sExtractCom.getLength() - 3 ) ); -- cgit From 06175e8b19625cb5a43b1ae5ae63e419cee7e053 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 10 Oct 2012 15:30:40 +0200 Subject: Correct lngmerge not to work with eof Change-Id: Ibf80a31ea2c03ff2882e71a45acb71d9c9a16482 --- l10ntools/source/lngmerge.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index b0282f5fb4d7..efc6c81f6994 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -50,10 +50,10 @@ LngParser::LngParser(const rtl::OString &rLngFile, if (aStream.is_open()) { bool bFirstLine = true; + std::string s; + std::getline(aStream, s); while (!aStream.eof()) { - std::string s; - std::getline(aStream, s); rtl::OString sLine(s.data(), s.length()); if( bFirstLine ) @@ -64,6 +64,7 @@ LngParser::LngParser(const rtl::OString &rLngFile, } pLines->push_back( new rtl::OString(sLine) ); + std::getline(aStream, s); } } else -- cgit From 8a3ee4e765d4cf849ba0dae811789d633823573e Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 10 Oct 2012 18:37:17 +0200 Subject: Move GenPoEntry out of header GenPoEntry is part of implementation rather than an autonom class thus its place is in cxx file. Because of pointer members we have to override copy constructor and copy operator. In PoHeader class these methods are unneeded so make it non-copyable. The m_bIsinitialized member's meaning widen with that m_aGenPo points an object. So check it not just in getter but in setter methods too. Change-Id: I26ebb885c81d14820076e0d46625c60cc1cf7984 --- l10ntools/inc/po.hxx | 49 +++------------ l10ntools/source/po.cxx | 157 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 131 insertions(+), 75 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index fa43b517b437..2e371b476a62 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -16,49 +16,13 @@ class PoOfstream; class PoIfstream; - -class GenPoEntry -{ -private: - - OString m_sExtractCom; - OString m_sReference; - OString m_sContext; - OString m_sUnTransStr; - OString m_sTransStr; - bool m_bFuzzy; - bool m_bNull; - -public: - - GenPoEntry(); - virtual ~GenPoEntry(); - //Default copy constructor and copy operator work well - - virtual OString getExtractCom() const { return m_sExtractCom; } - virtual OString getReference() const { return m_sReference; } - virtual OString getContext() const { return m_sContext; } - virtual OString getUnTransStr() const { return m_sUnTransStr; } - virtual OString getTransStr() const { return m_sTransStr; } - virtual bool getFuzzy() const { return m_bFuzzy; } - virtual bool isNull() const { return m_bNull; } - - virtual void setExtractCom(const OString& rExtractCom); - virtual void setReference(const OString& rReference); - virtual void setContext(const OString& rContext); - virtual void setUnTransStr(const OString& rUnTransStr); - virtual void setTransStr(const OString& rTransStr); - virtual void setFuzzy(const bool bFuzzy); - - virtual void writeToFile(std::ofstream& rOFStream) const; - virtual void readFromFile(std::ifstream& rIFStream); -}; +class GenPoEntry; class PoEntry { private: - GenPoEntry m_aGenPo; + GenPoEntry* m_pGenPo; bool m_bIsInitialized; public: @@ -76,7 +40,9 @@ public: PoEntry(const OString& rSDFLine, const TYPE eType = TTEXT); ~PoEntry(); - //Default copy constructor and copy operator work well + + PoEntry( const PoEntry& rPo ); + PoEntry& operator=( const PoEntry& rPo ); OString getSourceFile() const; OString getGroupId() const; @@ -95,11 +61,11 @@ public: }; -class PoHeader +class PoHeader: private boost::noncopyable { private: - GenPoEntry m_aGenPo; + GenPoEntry* m_pGenPo; bool m_bIsInitialized; public: @@ -113,7 +79,6 @@ public: PoHeader( const OString& rExtSrc ); PoHeader( std::ifstream& rOldPo ); ~PoHeader(); - //Default copy constructor and copy operator work well OString getLanguage() const; }; diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index e1c978de6f6f..59e206b33bda 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -29,6 +29,43 @@ //Class GenPoEntry +class GenPoEntry +{ +private: + + OString m_sExtractCom; + OString m_sReference; + OString m_sContext; + OString m_sUnTransStr; + OString m_sTransStr; + bool m_bFuzzy; + bool m_bNull; + +public: + + GenPoEntry(); + virtual ~GenPoEntry(); + //Default copy constructor and copy operator work well + + virtual OString getExtractCom() const { return m_sExtractCom; } + virtual OString getReference() const { return m_sReference; } + virtual OString getContext() const { return m_sContext; } + virtual OString getUnTransStr() const { return m_sUnTransStr; } + virtual OString getTransStr() const { return m_sTransStr; } + virtual bool getFuzzy() const { return m_bFuzzy; } + virtual bool isNull() const { return m_bNull; } + + virtual void setExtractCom(const OString& rExtractCom); + virtual void setReference(const OString& rReference); + virtual void setContext(const OString& rContext); + virtual void setUnTransStr(const OString& rUnTransStr); + virtual void setTransStr(const OString& rTransStr); + virtual void setFuzzy(const bool bFuzzy); + + virtual void writeToFile(std::ofstream& rOFStream) const; + virtual void readFromFile(std::ifstream& rIFStream); +}; + namespace { //Escape text @@ -386,14 +423,14 @@ namespace //Default constructor PoEntry::PoEntry() - : m_aGenPo( GenPoEntry() ) + : m_pGenPo( 0 ) , m_bIsInitialized( false ) { } //Construct PoEntry from sdfline PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) - : m_aGenPo( GenPoEntry() ) + : m_pGenPo( 0 ) , m_bIsInitialized( false ) { std::vector vParts; @@ -408,7 +445,8 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) throw INVALIDSDFLINE; } - m_aGenPo.setReference(vParts[SOURCEFILE]. + m_pGenPo = new GenPoEntry(); + m_pGenPo->setReference(vParts[SOURCEFILE]. copy(vParts[SOURCEFILE].lastIndexOf("\\")+1)); OString sContext = @@ -425,12 +463,12 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) /*Default case is unneeded because the type of eType has only three element*/ } - m_aGenPo.setExtractCom( + m_pGenPo->setExtractCom( ( !vParts[HELPTEXT].isEmpty() ? vParts[HELPTEXT] + "\n" : "" ) + lcl_GenKeyId( vParts[SOURCEFILE] + sContext + vParts[eType] ) ); - m_aGenPo.setContext(sContext); - m_aGenPo.setUnTransStr( + m_pGenPo->setContext(sContext); + m_pGenPo->setUnTransStr( lcl_UnEscapeSDFText( vParts[eType],vParts[SOURCEFILE].endsWith(".xhp"))); m_bIsInitialized = true; @@ -438,28 +476,63 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) //Destructor PoEntry::~PoEntry() +{ + delete m_pGenPo; +} + +//Copy constructor +PoEntry::PoEntry( const PoEntry& rPo ) + : m_pGenPo( rPo.m_pGenPo ? new GenPoEntry( *(rPo.m_pGenPo) ) : 0 ) + , m_bIsInitialized( rPo.m_bIsInitialized ) { } +//Copy operator +PoEntry& PoEntry::operator=(const PoEntry& rPo) +{ + if( this == &rPo ) + { + return *this; + } + if( rPo.m_pGenPo ) + { + if( m_pGenPo ) + { + *m_pGenPo = *(rPo.m_pGenPo); + } + else + { + m_pGenPo = new GenPoEntry( *(rPo.m_pGenPo) ); + } + } + else + { + delete m_pGenPo; + m_pGenPo = 0; + } + m_bIsInitialized = rPo.m_bIsInitialized; + return *this; +} + //Get name of file from which entry is extracted OString PoEntry::getSourceFile() const { assert( m_bIsInitialized ); - return m_aGenPo.getReference(); + return m_pGenPo->getReference(); } //Get groupid OString PoEntry::getGroupId() const { assert( m_bIsInitialized ); - return m_aGenPo.getContext().getToken(0,'\n'); + return m_pGenPo->getContext().getToken(0,'\n'); } //Get localid OString PoEntry::getLocalId() const { assert( m_bIsInitialized ); - const OString sContext = m_aGenPo.getContext(); + const OString sContext = m_pGenPo->getContext(); if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) return OString(); else @@ -470,7 +543,7 @@ OString PoEntry::getLocalId() const OString PoEntry::getResourceType() const { assert( m_bIsInitialized ); - const OString sContext = m_aGenPo.getContext(); + const OString sContext = m_pGenPo->getContext(); if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) return sContext.getToken(1,'\n').getToken(0,'.'); else @@ -480,9 +553,10 @@ OString PoEntry::getResourceType() const //Get the type of entry PoEntry::TYPE PoEntry::getType() const { - const OString sContext = m_aGenPo.getContext(); + assert( m_bIsInitialized ); + const OString sContext = m_pGenPo->getContext(); const OString sType = sContext.copy( sContext.lastIndexOf('.') + 1 ); - assert( m_bIsInitialized && + assert( (sType == "text" || sType == "quickhelptext" || sType == "title") ); if ( sType == "text" ) return TTEXT; @@ -496,14 +570,14 @@ PoEntry::TYPE PoEntry::getType() const bool PoEntry::getFuzzy() const { assert( m_bIsInitialized ); - return m_aGenPo.getFuzzy(); + return m_pGenPo->getFuzzy(); } //Get keyid OString PoEntry::getKeyId() const { assert( m_bIsInitialized ); - const OString sExtractCom = m_aGenPo.getExtractCom(); + const OString sExtractCom = m_pGenPo->getExtractCom(); if( sExtractCom.indexOf("\n") == -1 ) { return sExtractCom; @@ -521,7 +595,7 @@ OString PoEntry::getUnTransStr() const assert( m_bIsInitialized ); return lcl_EscapeSDFText( - m_aGenPo.getUnTransStr(), getSourceFile().endsWith(".xhp") ); + m_pGenPo->getUnTransStr(), getSourceFile().endsWith(".xhp") ); } //Get translated string in sdf/merge format @@ -530,14 +604,15 @@ OString PoEntry::getTransStr() const assert( m_bIsInitialized ); return lcl_EscapeSDFText( - m_aGenPo.getTransStr(), getSourceFile().endsWith(".xhp") ); + m_pGenPo->getTransStr(), getSourceFile().endsWith(".xhp") ); } //Set translated string when input is in sdf format void PoEntry::setTransStr(const OString& rTransStr) { - m_aGenPo.setTransStr( + assert( m_bIsInitialized ); + m_pGenPo->setTransStr( lcl_UnEscapeSDFText( rTransStr,getSourceFile().endsWith(".xhp"))); } @@ -545,7 +620,8 @@ void PoEntry::setTransStr(const OString& rTransStr) //Set fuzzy flag void PoEntry::setFuzzy(const bool bFuzzy) { - m_aGenPo.setFuzzy(bFuzzy); + assert( m_bIsInitialized ); + m_pGenPo->setFuzzy(bFuzzy); } //Check whether po-s belong to the same localization component @@ -585,18 +661,18 @@ namespace //Default Constructor PoHeader::PoHeader() - : m_aGenPo( GenPoEntry() ) + : m_pGenPo( 0 ) , m_bIsInitialized( false ) { } //Template Constructor PoHeader::PoHeader( const OString& rExtSrc ) - : m_aGenPo( GenPoEntry() ) + : m_pGenPo( new GenPoEntry() ) , m_bIsInitialized( false ) { - m_aGenPo.setExtractCom("extracted from " + rExtSrc); - m_aGenPo.setTransStr( + m_pGenPo->setExtractCom("extracted from " + rExtSrc); + m_pGenPo->setTransStr( OString("Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?" "product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" @@ -615,17 +691,17 @@ PoHeader::PoHeader( const OString& rExtSrc ) //Constructor for old headers to renew po files PoHeader::PoHeader( std::ifstream& rOldPo ) - : m_aGenPo( GenPoEntry() ) + : m_pGenPo( new GenPoEntry() ) , m_bIsInitialized( false ) { assert( rOldPo.is_open() ); - m_aGenPo.readFromFile( rOldPo ); + m_pGenPo->readFromFile( rOldPo ); - const OString sExtractCom = m_aGenPo.getExtractCom(); - m_aGenPo.setExtractCom( + const OString sExtractCom = m_pGenPo->getExtractCom(); + m_pGenPo->setExtractCom( sExtractCom.copy( 0, sExtractCom.getLength() - 3 ) ); - OString sTransStr = m_aGenPo.getTransStr(); + OString sTransStr = m_pGenPo->getTransStr(); sTransStr = lcl_ReplaceAttribute( sTransStr, "Report-Msgid-Bugs-To", "https://bugs.freedesktop.org/enter_bug.cgi?product=" @@ -634,12 +710,13 @@ PoHeader::PoHeader( std::ifstream& rOldPo ) lcl_ReplaceAttribute( sTransStr, "X-Generator", "LibreOffice" ); sTransStr = lcl_ReplaceAttribute( sTransStr, "X-Accelerator-Marker", "~" ); - m_aGenPo.setTransStr( sTransStr ); + m_pGenPo->setTransStr( sTransStr ); m_bIsInitialized = true; } PoHeader::~PoHeader() { + delete m_pGenPo; } //Get the language of header @@ -647,7 +724,7 @@ OString PoHeader::getLanguage() const { assert( m_bIsInitialized ); const OString sLang = "Language: "; - const OString sTransStr = m_aGenPo.getTransStr(); + const OString sTransStr = m_pGenPo->getTransStr(); const sal_Int32 nFirstIndex = sTransStr.indexOf(sLang)+sLang.getLength(); const sal_Int32 nCount = sTransStr.indexOf('\n',nFirstIndex)-nFirstIndex; if( nFirstIndex == sLang.getLength()-1 || nCount == -nFirstIndex-1 ) @@ -690,14 +767,14 @@ void PoOfstream::close() void PoOfstream::writeHeader(const PoHeader& rPoHeader) { assert( isOpen() && !m_bIsAfterHeader && rPoHeader.m_bIsInitialized ); - rPoHeader.m_aGenPo.writeToFile( m_aOutPut ); + rPoHeader.m_pGenPo->writeToFile( m_aOutPut ); m_bIsAfterHeader = true; } void PoOfstream::writeEntry( const PoEntry& rPoEntry ) { assert( isOpen() && m_bIsAfterHeader && rPoEntry.m_bIsInitialized ); - rPoEntry.m_aGenPo.writeToFile( m_aOutPut ); + rPoEntry.m_pGenPo->writeToFile( m_aOutPut ); } //Class PoIfstream @@ -740,7 +817,14 @@ void PoIfstream::readHeader( PoHeader& rPoHeader ) aGenPo.getUnTransStr().isEmpty() && !aGenPo.getTransStr().isEmpty() ) { - rPoHeader.m_aGenPo = aGenPo; + if( rPoHeader.m_pGenPo ) + { + *(rPoHeader.m_pGenPo) = aGenPo; + } + else + { + rPoHeader.m_pGenPo = new GenPoEntry( aGenPo ); + } rPoHeader.m_bIsInitialized = true; m_bIsAfterHeader = true; } @@ -775,7 +859,14 @@ void PoIfstream::readEntry( PoEntry& rPoEntry ) (sType == "text" || sType == "quickhelptext" || sType == "title")&& !aGenPo.getUnTransStr().isEmpty() ) { - rPoEntry.m_aGenPo = aGenPo; + if( rPoEntry.m_pGenPo ) + { + *(rPoEntry.m_pGenPo) = aGenPo; + } + else + { + rPoEntry.m_pGenPo = new GenPoEntry( aGenPo ); + } const OString sExtractCom = aGenPo.getExtractCom(); if( sExtractCom.isEmpty() || ( sExtractCom.getLength() != 4 && -- cgit From 471f2fc3196be0e52ac4ac1ea49f760accd9d4d7 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 11 Oct 2012 20:26:36 +0200 Subject: Use MsgCtxt, MsgId and MsgCtxt which are fit better to concept of po. Change-Id: I772e691465351b1492bdb756fc67e3a9de265c25 --- l10ntools/inc/po.hxx | 8 +-- l10ntools/source/merge.cxx | 10 +-- l10ntools/source/po.cxx | 152 +++++++++++++++++++++---------------------- l10ntools/source/renewpo.cxx | 2 +- 4 files changed, 86 insertions(+), 86 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index 2e371b476a62..060bb1799a4f 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -49,12 +49,12 @@ public: OString getLocalId() const; OString getResourceType() const; TYPE getType() const; - OString getUnTransStr() const; - OString getTransStr() const; + OString getMsgId() const; + OString getMsgStr() const; bool getFuzzy() const; OString getKeyId() const; - void setUnTransStr(const OString& rUnTransStr); - void setTransStr(const OString& rTransStr); + void setMsgId(const OString& rUnTransStr); + void setMsgStr(const OString& rTransStr); void setFuzzy(const bool bFuzzy); static bool IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2); diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 23609e0d268e..b47d556ea9ef 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -231,24 +231,24 @@ MergeDataFile::MergeDataFile( { if( bInSameComp ) aActPo = aNextPo; - OString sTemp = aActPo.getTransStr(); + OString sTemp = aActPo.getMsgStr(); if( aActPo.getFuzzy() || sTemp.isEmpty() ) - sTemp = aActPo.getUnTransStr(); + sTemp = aActPo.getMsgId(); switch( aActPo.getType() ) { case PoEntry::TTEXT: sText = sTemp; - sExText = aActPo.getUnTransStr(); + sExText = aActPo.getMsgId(); sQTZText = aActPo.getKeyId(); break; case PoEntry::TQUICKHELPTEXT: sQHText = sTemp; - sExQHText = aActPo.getUnTransStr(); + sExQHText = aActPo.getMsgId(); sQTZQHText = aActPo.getKeyId(); break; case PoEntry::TTITLE: sTitle = sTemp; - sExTitle = aActPo.getUnTransStr(); + sExTitle = aActPo.getMsgId(); sQTZTitle = aActPo.getKeyId(); break; } diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 59e206b33bda..bddf19805e41 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -35,9 +35,9 @@ private: OString m_sExtractCom; OString m_sReference; - OString m_sContext; - OString m_sUnTransStr; - OString m_sTransStr; + OString m_sMsgCtxt; + OString m_sMsgId; + OString m_sMsgStr; bool m_bFuzzy; bool m_bNull; @@ -49,17 +49,17 @@ public: virtual OString getExtractCom() const { return m_sExtractCom; } virtual OString getReference() const { return m_sReference; } - virtual OString getContext() const { return m_sContext; } - virtual OString getUnTransStr() const { return m_sUnTransStr; } - virtual OString getTransStr() const { return m_sTransStr; } + virtual OString getMsgCtxt() const { return m_sMsgCtxt; } + virtual OString getMsgId() const { return m_sMsgId; } + virtual OString getMsgStr() const { return m_sMsgStr; } virtual bool getFuzzy() const { return m_bFuzzy; } virtual bool isNull() const { return m_bNull; } virtual void setExtractCom(const OString& rExtractCom); virtual void setReference(const OString& rReference); - virtual void setContext(const OString& rContext); - virtual void setUnTransStr(const OString& rUnTransStr); - virtual void setTransStr(const OString& rTransStr); + virtual void setMsgCtxt(const OString& rMsgCtxt); + virtual void setMsgId(const OString& rMsgId); + virtual void setMsgStr(const OString& rMsgStr); virtual void setFuzzy(const bool bFuzzy); virtual void writeToFile(std::ofstream& rOFStream) const; @@ -139,9 +139,9 @@ namespace GenPoEntry::GenPoEntry() : m_sExtractCom( OString() ) , m_sReference( OString() ) - , m_sContext( OString() ) - , m_sUnTransStr( OString() ) - , m_sTransStr( OString() ) + , m_sMsgCtxt( OString() ) + , m_sMsgId( OString() ) + , m_sMsgStr( OString() ) , m_bFuzzy( false ) , m_bNull( false ) { @@ -163,19 +163,19 @@ void GenPoEntry::setReference(const OString& rReference) m_sReference = rReference; } -void GenPoEntry::setContext(const OString& rContext) +void GenPoEntry::setMsgCtxt(const OString& rMsgCtxt) { - m_sContext = rContext; + m_sMsgCtxt = rMsgCtxt; } -void GenPoEntry::setUnTransStr(const OString& rUnTransStr) +void GenPoEntry::setMsgId(const OString& rMsgId) { - m_sUnTransStr = rUnTransStr; + m_sMsgId = rMsgId; } -void GenPoEntry::setTransStr(const OString& rTransStr) +void GenPoEntry::setMsgStr(const OString& rMsgStr) { - m_sTransStr = rTransStr; + m_sMsgStr = rMsgStr; } void GenPoEntry::setFuzzy(const bool bFuzzy) @@ -196,13 +196,13 @@ void GenPoEntry::writeToFile(std::ofstream& rOFStream) const rOFStream << "#: " << m_sReference.getStr() << std::endl; if ( m_bFuzzy ) rOFStream << "#, fuzzy" << std::endl; - if ( !m_sContext.isEmpty() ) + if ( !m_sMsgCtxt.isEmpty() ) rOFStream << "msgctxt " - << lcl_GenMsgString(m_sContext).getStr() << std::endl; + << lcl_GenMsgString(m_sMsgCtxt).getStr() << std::endl; rOFStream << "msgid " - << lcl_GenMsgString(m_sUnTransStr).getStr() << std::endl; + << lcl_GenMsgString(m_sMsgId).getStr() << std::endl; rOFStream << "msgstr " - << lcl_GenMsgString(m_sTransStr).getStr() << std::endl; + << lcl_GenMsgString(m_sMsgStr).getStr() << std::endl; } //Read from file @@ -238,18 +238,18 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) } else if (sLine.startsWith("msgctxt ")) { - m_sContext = lcl_GenNormString(sLine.copy(8)); - pLastMsg = &m_sContext; + m_sMsgCtxt = lcl_GenNormString(sLine.copy(8)); + pLastMsg = &m_sMsgCtxt; } else if (sLine.startsWith("msgid ")) { - m_sUnTransStr = lcl_GenNormString(sLine.copy(6)); - pLastMsg = &m_sUnTransStr; + m_sMsgId = lcl_GenNormString(sLine.copy(6)); + pLastMsg = &m_sMsgId; } else if (sLine.startsWith("msgstr ")) { - m_sTransStr = lcl_GenNormString(sLine.copy(7)); - pLastMsg = &m_sTransStr; + m_sMsgStr = lcl_GenNormString(sLine.copy(7)); + pLastMsg = &m_sMsgStr; } else if (sLine.startsWith("\"") && pLastMsg) { @@ -449,26 +449,26 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) m_pGenPo->setReference(vParts[SOURCEFILE]. copy(vParts[SOURCEFILE].lastIndexOf("\\")+1)); - OString sContext = + OString sMsgCtxt = vParts[GROUPID] + "\n" + (vParts[LOCALID].isEmpty() ? "" : vParts[LOCALID] + "\n") + vParts[RESOURCETYPE]; switch(eType){ case TTEXT: - sContext += ".text"; break; + sMsgCtxt += ".text"; break; case TQUICKHELPTEXT: - sContext += ".quickhelptext"; break; + sMsgCtxt += ".quickhelptext"; break; case TTITLE: - sContext += ".title"; break; + sMsgCtxt += ".title"; break; /*Default case is unneeded because the type of eType has only three element*/ } m_pGenPo->setExtractCom( ( !vParts[HELPTEXT].isEmpty() ? vParts[HELPTEXT] + "\n" : "" ) + lcl_GenKeyId( - vParts[SOURCEFILE] + sContext + vParts[eType] ) ); - m_pGenPo->setContext(sContext); - m_pGenPo->setUnTransStr( + vParts[SOURCEFILE] + sMsgCtxt + vParts[eType] ) ); + m_pGenPo->setMsgCtxt(sMsgCtxt); + m_pGenPo->setMsgId( lcl_UnEscapeSDFText( vParts[eType],vParts[SOURCEFILE].endsWith(".xhp"))); m_bIsInitialized = true; @@ -525,37 +525,37 @@ OString PoEntry::getSourceFile() const OString PoEntry::getGroupId() const { assert( m_bIsInitialized ); - return m_pGenPo->getContext().getToken(0,'\n'); + return m_pGenPo->getMsgCtxt().getToken(0,'\n'); } //Get localid OString PoEntry::getLocalId() const { assert( m_bIsInitialized ); - const OString sContext = m_pGenPo->getContext(); - if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) + const OString sMsgCtxt = m_pGenPo->getMsgCtxt(); + if (sMsgCtxt.indexOf('\n')==sMsgCtxt.lastIndexOf('\n')) return OString(); else - return sContext.getToken(1,'\n'); + return sMsgCtxt.getToken(1,'\n'); } //Get the type of component from which entry is extracted OString PoEntry::getResourceType() const { assert( m_bIsInitialized ); - const OString sContext = m_pGenPo->getContext(); - if (sContext.indexOf('\n')==sContext.lastIndexOf('\n')) - return sContext.getToken(1,'\n').getToken(0,'.'); + const OString sMsgCtxt = m_pGenPo->getMsgCtxt(); + if (sMsgCtxt.indexOf('\n')==sMsgCtxt.lastIndexOf('\n')) + return sMsgCtxt.getToken(1,'\n').getToken(0,'.'); else - return sContext.getToken(2,'\n').getToken(0,'.'); + return sMsgCtxt.getToken(2,'\n').getToken(0,'.'); } //Get the type of entry PoEntry::TYPE PoEntry::getType() const { assert( m_bIsInitialized ); - const OString sContext = m_pGenPo->getContext(); - const OString sType = sContext.copy( sContext.lastIndexOf('.') + 1 ); + const OString sMsgCtxt = m_pGenPo->getMsgCtxt(); + const OString sType = sMsgCtxt.copy( sMsgCtxt.lastIndexOf('.') + 1 ); assert( (sType == "text" || sType == "quickhelptext" || sType == "title") ); if ( sType == "text" ) @@ -590,31 +590,31 @@ OString PoEntry::getKeyId() const //Get translation string in sdf/merge format -OString PoEntry::getUnTransStr() const +OString PoEntry::getMsgId() const { assert( m_bIsInitialized ); return lcl_EscapeSDFText( - m_pGenPo->getUnTransStr(), getSourceFile().endsWith(".xhp") ); + m_pGenPo->getMsgId(), getSourceFile().endsWith(".xhp") ); } //Get translated string in sdf/merge format -OString PoEntry::getTransStr() const +OString PoEntry::getMsgStr() const { assert( m_bIsInitialized ); return lcl_EscapeSDFText( - m_pGenPo->getTransStr(), getSourceFile().endsWith(".xhp") ); + m_pGenPo->getMsgStr(), getSourceFile().endsWith(".xhp") ); } //Set translated string when input is in sdf format -void PoEntry::setTransStr(const OString& rTransStr) +void PoEntry::setMsgStr(const OString& rMsgStr) { assert( m_bIsInitialized ); - m_pGenPo->setTransStr( + m_pGenPo->setMsgStr( lcl_UnEscapeSDFText( - rTransStr,getSourceFile().endsWith(".xhp"))); + rMsgStr,getSourceFile().endsWith(".xhp"))); } //Set fuzzy flag @@ -672,7 +672,7 @@ PoHeader::PoHeader( const OString& rExtSrc ) , m_bIsInitialized( false ) { m_pGenPo->setExtractCom("extracted from " + rExtSrc); - m_pGenPo->setTransStr( + m_pGenPo->setMsgStr( OString("Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?" "product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" @@ -701,16 +701,16 @@ PoHeader::PoHeader( std::ifstream& rOldPo ) m_pGenPo->setExtractCom( sExtractCom.copy( 0, sExtractCom.getLength() - 3 ) ); - OString sTransStr = m_pGenPo->getTransStr(); - sTransStr = - lcl_ReplaceAttribute( sTransStr, "Report-Msgid-Bugs-To", + OString sMsgStr = m_pGenPo->getMsgStr(); + sMsgStr = + lcl_ReplaceAttribute( sMsgStr, "Report-Msgid-Bugs-To", "https://bugs.freedesktop.org/enter_bug.cgi?product=" "LibreOffice&bug_status=UNCONFIRMED&component=UI" ); - sTransStr = - lcl_ReplaceAttribute( sTransStr, "X-Generator", "LibreOffice" ); - sTransStr = - lcl_ReplaceAttribute( sTransStr, "X-Accelerator-Marker", "~" ); - m_pGenPo->setTransStr( sTransStr ); + sMsgStr = + lcl_ReplaceAttribute( sMsgStr, "X-Generator", "LibreOffice" ); + sMsgStr = + lcl_ReplaceAttribute( sMsgStr, "X-Accelerator-Marker", "~" ); + m_pGenPo->setMsgStr( sMsgStr ); m_bIsInitialized = true; } @@ -724,14 +724,14 @@ OString PoHeader::getLanguage() const { assert( m_bIsInitialized ); const OString sLang = "Language: "; - const OString sTransStr = m_pGenPo->getTransStr(); - const sal_Int32 nFirstIndex = sTransStr.indexOf(sLang)+sLang.getLength(); - const sal_Int32 nCount = sTransStr.indexOf('\n',nFirstIndex)-nFirstIndex; + const OString sMsgStr = m_pGenPo->getMsgStr(); + const sal_Int32 nFirstIndex = sMsgStr.indexOf(sLang)+sLang.getLength(); + const sal_Int32 nCount = sMsgStr.indexOf('\n',nFirstIndex)-nFirstIndex; if( nFirstIndex == sLang.getLength()-1 || nCount == -nFirstIndex-1 ) { throw NOLANG; } - return sTransStr.copy( nFirstIndex, nCount ); + return sMsgStr.copy( nFirstIndex, nCount ); } //Class PoOfstream @@ -814,8 +814,8 @@ void PoIfstream::readHeader( PoHeader& rPoHeader ) GenPoEntry aGenPo; aGenPo.readFromFile( m_aInPut ); if( !aGenPo.getExtractCom().isEmpty() && - aGenPo.getUnTransStr().isEmpty() && - !aGenPo.getTransStr().isEmpty() ) + aGenPo.getMsgId().isEmpty() && + !aGenPo.getMsgStr().isEmpty() ) { if( rPoHeader.m_pGenPo ) { @@ -846,18 +846,18 @@ void PoIfstream::readEntry( PoEntry& rPoEntry ) } else { - const OString sContext = aGenPo.getContext(); - const sal_Int32 nFirstEndLine = sContext.indexOf('\n'); - const sal_Int32 nLastEndLine = sContext.lastIndexOf('\n'); - const sal_Int32 nLastDot = sContext.lastIndexOf('.'); - const OString sType = sContext.copy( nLastDot + 1 ); + const OString sMsgCtxt = aGenPo.getMsgCtxt(); + const sal_Int32 nFirstEndLine = sMsgCtxt.indexOf('\n'); + const sal_Int32 nLastEndLine = sMsgCtxt.lastIndexOf('\n'); + const sal_Int32 nLastDot = sMsgCtxt.lastIndexOf('.'); + const OString sType = sMsgCtxt.copy( nLastDot + 1 ); if( !aGenPo.getReference().isEmpty() && nFirstEndLine > 0 && (nLastEndLine == nFirstEndLine || - nLastEndLine == sContext.indexOf('\n',nFirstEndLine+1)) && + nLastEndLine == sMsgCtxt.indexOf('\n',nFirstEndLine+1)) && nLastDot - nLastEndLine > 1 && (sType == "text" || sType == "quickhelptext" || sType == "title")&& - !aGenPo.getUnTransStr().isEmpty() ) + !aGenPo.getMsgId().isEmpty() ) { if( rPoEntry.m_pGenPo ) { @@ -875,8 +875,8 @@ void PoIfstream::readEntry( PoEntry& rPoEntry ) aGenPo.setExtractCom( ( !sExtractCom.isEmpty() ? sExtractCom + "\n" : "" ) + lcl_GenKeyId( - aGenPo.getReference() + sContext + - aGenPo.getUnTransStr() ) ); + aGenPo.getReference() + sMsgCtxt + + aGenPo.getMsgId() ) ); } rPoEntry.m_bIsInitialized = true; } diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index 4a11c368a0e7..241db58b72cf 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -161,7 +161,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, PoEntry aPE(sActUnTrans, vTypes[nIndex]); const OString sActStr = sActTrans.getToken(vTypes[nIndex],'\t'); - aPE.setTransStr(sActStr); + aPE.setMsgStr(sActStr); aPE.setFuzzy( sActStr.isEmpty() ? false : static_cast(sActTrans.getToken(PoEntry::DUMMY,'\t'). copy(nDummyBit++,1).toBoolean())); -- cgit From c6b26144c93aa5222e4260c5b0ef45ce5bdc18d2 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 11 Oct 2012 20:50:19 +0200 Subject: Use isFuzzy() instead of getFuzzy() to make more obvious its aim Change-Id: Idc98ae8ce2218c9d387c4f2cb6e4d5603b56aab3 --- l10ntools/inc/po.hxx | 2 +- l10ntools/source/merge.cxx | 2 +- l10ntools/source/po.cxx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index 060bb1799a4f..856c7bb04ff1 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -51,7 +51,7 @@ public: TYPE getType() const; OString getMsgId() const; OString getMsgStr() const; - bool getFuzzy() const; + bool isFuzzy() const; OString getKeyId() const; void setMsgId(const OString& rUnTransStr); void setMsgStr(const OString& rTransStr); diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index b47d556ea9ef..80188f53fb87 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -232,7 +232,7 @@ MergeDataFile::MergeDataFile( if( bInSameComp ) aActPo = aNextPo; OString sTemp = aActPo.getMsgStr(); - if( aActPo.getFuzzy() || sTemp.isEmpty() ) + if( aActPo.isFuzzy() || sTemp.isEmpty() ) sTemp = aActPo.getMsgId(); switch( aActPo.getType() ) { diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index bddf19805e41..9dd6d6adab56 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -52,7 +52,7 @@ public: virtual OString getMsgCtxt() const { return m_sMsgCtxt; } virtual OString getMsgId() const { return m_sMsgId; } virtual OString getMsgStr() const { return m_sMsgStr; } - virtual bool getFuzzy() const { return m_bFuzzy; } + virtual bool isFuzzy() const { return m_bFuzzy; } virtual bool isNull() const { return m_bNull; } virtual void setExtractCom(const OString& rExtractCom); @@ -567,10 +567,10 @@ PoEntry::TYPE PoEntry::getType() const } //Check wheather entry is fuzzy -bool PoEntry::getFuzzy() const +bool PoEntry::isFuzzy() const { assert( m_bIsInitialized ); - return m_pGenPo->getFuzzy(); + return m_pGenPo->isFuzzy(); } //Get keyid -- cgit From 5d2f601e391a9acda692f6a3f7f22c676c1379f8 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 14 Oct 2012 05:34:33 +0200 Subject: Correct helpfile localization in sdext gb_Extension_add_helpfile second parameter is the path prefix of en-US source file so it must be in sourcedir and not in CustomTarget. Change-Id: Icfb4caab7f9e250b377ef3049a8030ab66454f9d --- sdext/Extension_presenter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk index bdd584f0cc12..24a6add71a65 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -137,7 +137,7 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \ )) -$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) +$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) $(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(PLATFORMID))) -- cgit From dbc5c63bb3d3855747eeb9ade3e8206aa9f74e95 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 14 Oct 2012 17:18:25 +0200 Subject: Correct checksize.pl not to work with sdf Change-Id: I644874f123079a88d0901e77b367b7a35bb44b9e --- sysui/util/checksize.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysui/util/checksize.pl b/sysui/util/checksize.pl index 33f66c027245..da4104b29a95 100644 --- a/sysui/util/checksize.pl +++ b/sysui/util/checksize.pl @@ -70,7 +70,7 @@ sub check #04.02.2005 13:40 my $file = shift; print "$path$file\n" if ((-e "$path$file") && $is_debug); # don't check dpc,flag,rpmflag,sdf [obj for UNX] files, or etc subdirectory - return if ( ($file =~ /.+\.(dpc|\w*?flag)/) || ($file =~ /.+\.obj/ && $ENV{GUI} eq 'UNX') || ($path =~ /.+etc/) || ($path =~ /.+logs/) || ($path =~ /.+sdf/) ); + return if ( ($file =~ /.+\.(dpc|\w*?flag)/) || ($file =~ /.+\.obj/ && $ENV{GUI} eq 'UNX') || ($path =~ /.+etc/) || ($path =~ /.+logs/) || ($file =~ /.+sdf/) ); if ( -z "$path$file" ) { print "Error: $path$file 0 Bytes!\n"; $err++; -- cgit From 72e2db3aba300aa70e47a2bc3b6cad9bcd05c0a8 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 14 Oct 2012 17:22:24 +0200 Subject: Correct helptree localization in swext Change-Id: I6d30e96cb9fb0a0800e0b3b0eaa58b98de4d9010 --- swext/Extension_wiki-publisher.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 6f4e4a3d2eb4..7f518f6c6eb2 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -68,6 +68,6 @@ $(eval $(call gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki $(eval $(call gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,com.sun.wiki-publisher/wiki.xhp,wiki.xhp)) $(eval $(call gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,com.sun.wiki-publisher/wikisettings.xhp,wikisettings.xhp)) -$(eval $(call gb_Extension_add_helptreefile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,/help.tree,/help.tree,com.sun.wiki-publisher)) +$(eval $(call gb_Extension_add_helptreefile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,help.tree,help.tree,com.sun.wiki-publisher)) # vim: set noet sw=4 ts=4: -- cgit From 5a898179a1533b2a625be73fa2b662f2aa742b75 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 14 Oct 2012 17:34:17 +0200 Subject: Correct POFILE definition in ExtensionTarget.mk For help and help tree files. Result of $(or $(4),$(3)) can be only a single filename without relative path and this case $(dir...) retrun with './'. Otherwise $(dir...) return with the directory of the file with '/' ending. Change-Id: Ia636b314779b907796a3395a877e7bc7b1a47292 --- solenv/gbuild/ExtensionTarget.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 752eba1ff2b1..7c94e15d4e3d 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -298,9 +298,9 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ ifneq ($(strip $(gb_WITH_LANG)),) ifneq ($(filter-out en-US,$(5)),) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ - POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) + POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ - $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) + $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) endif endif $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ @@ -338,9 +338,9 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ ifneq ($(strip $(gb_WITH_LANG)),) ifneq ($(filter-out en-US,$(5)),) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - POFILE := $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(4))),.po,$(4)) + POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(4))),.po,$(4)) + $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) endif endif $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ -- cgit From 4147b2646a75add70de4c1659f66fad067c017f8 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 14 Oct 2012 17:43:32 +0200 Subject: Cleanup in InstallModulTarget.mk Use global variable directly Change-Id: Ic8031bd748d4b9407679f83eb728a7d33551c0cf --- solenv/gbuild/InstallModuleTarget.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 66e5ad526428..4ea77c9fae5b 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -121,7 +121,7 @@ $(call gb_Output_announce,$(2),$(true),SUM,1) MERGEINPUT=`$(gb_MKTEMP)` && \ echo $(SCP_POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $${MERGEINPUT} -l all ) && \ + $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(SCP_SOURCE) -o $(1) -m $${MERGEINPUT} -l all ) && \ rm -rf $${MERGEINPUT} endef @@ -130,7 +130,7 @@ $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET) - $(call gb_ScpMergeTarget__command,$@,$*,$(SCP_SOURCE)) + $(call gb_ScpMergeTarget__command,$@,$*) .PHONY : $(call gb_ScpMergeTarget_get_clean_target,%) $(call gb_ScpMergeTarget_get_clean_target,%) : -- cgit From 8f57a9d2a186a2cd5d71ed8bbed106ab927322d4 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 29 Oct 2012 11:52:54 +0100 Subject: Correct some naming in propex Change-Id: Id5b17be8155f13529439dd9a46b42f6ffeed79b1 --- l10ntools/inc/propmerge.hxx | 2 +- l10ntools/source/propmerge.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/l10ntools/inc/propmerge.hxx b/l10ntools/inc/propmerge.hxx index 3465635c602f..4f0e3275a434 100644 --- a/l10ntools/inc/propmerge.hxx +++ b/l10ntools/inc/propmerge.hxx @@ -30,7 +30,7 @@ public: bool isInitialized() const { return m_bIsInitialized; } void Extract( const OString& rSDFFile, const OString& rPrj, const OString& rRoot ); - void Merge( const OString &rSDFFile, const OString &rDestinationFile ); + void Merge( const OString &rMergeSrc, const OString &rDestinationFile ); }; #endif //_PROPMERGE_INCLUDED diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx index 0f1b20b6f1fe..61400147691f 100644 --- a/l10ntools/source/propmerge.cxx +++ b/l10ntools/source/propmerge.cxx @@ -168,7 +168,7 @@ void PropParser::Extract( } //Merge strings to source file -void PropParser::Merge( const OString &rSDFFile, const OString &rDestinationFile ) +void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFile ) { assert( m_bIsInitialized ); std::ofstream aDestination( @@ -180,14 +180,14 @@ void PropParser::Merge( const OString &rSDFFile, const OString &rDestinationFile return; } - MergeDataFile aMergeDataFile( rSDFFile, m_sSource, false ); + MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false ); if( aMergeDataFile.GetLanguages()[0] != m_sLang ) { std::cerr << "Propex error: given language conflicts with " << "language of Mergedata file: " - << m_sLang.getStr() << " - " << rSDFFile.getStr() << std::endl; + << m_sLang.getStr() << " - " << rMergeSrc.getStr() << std::endl; return; } -- cgit From 0c7f8e6d0c2a414150c5f77d3419479bb8eeddb0 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 29 Oct 2012 12:53:18 +0100 Subject: Delete some unneeded checking from export2.cxx Change-Id: Ib41c81629fbc5a8bd709391091c2777d49f9d9c4 --- l10ntools/source/export2.cxx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index 64a5b1b07e5c..5ef2231f6d6e 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -95,10 +95,6 @@ bool Export::handleArguments( int argc, char * argv[], HandledArgs& o_aHandledArgs) { o_aHandledArgs = HandledArgs(); - if ( argc <= 1 ) - { - return false; - } sLanguages = ""; sal_uInt16 nState = STATE_NON; -- cgit From ef941c6e78cbab5d9d25b1fe57e483deead03a32 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 1 Nov 2012 13:31:59 +0100 Subject: Delete useless slashes Change-Id: Ib8cb85314b286948884ef9a72024c9fece3de93e --- nlpsolver/Extension_nlpsolver.mk | 2 +- sdext/Extension_presenter.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk index 75c8f7f4a3f5..c71c7110aa33 100644 --- a/nlpsolver/Extension_nlpsolver.mk +++ b/nlpsolver/Extension_nlpsolver.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Extension_add_helpfiles,nlpsolver,$(SRCDIR)/nlpsolver/help/en, com.sun.star.comp.Calc.NLPSolver/Usage.xhp \ )) -$(eval $(call gb_Extension_add_helptreefile,nlpsolver,$(SRCDIR)/nlpsolver/help/en,/help.tree,com.sun.star.comp.Calc.NLPSolver/help.tree,com.sun.star.comp.Calc.NLPSolver)) +$(eval $(call gb_Extension_add_helptreefile,nlpsolver,$(SRCDIR)/nlpsolver/help/en,help.tree,com.sun.star.comp.Calc.NLPSolver/help.tree,com.sun.star.comp.Calc.NLPSolver)) # vim: set noet sw=4 ts=4: diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk index 24a6add71a65..29a2aa9dc059 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -139,7 +139,7 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi $(eval $(call gb_Extension_add_helpfile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) -$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(PLATFORMID))) +$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(PLATFORMID))) -- cgit From 0fd7f81ec6765133bc2a964afd832631cd1bbf31 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 1 Nov 2012 13:39:43 +0100 Subject: Implement new treex executable Which localize and update help tree files instead of update_tree.pl. Use it to update extensions' help. Next step: use it with general help. Change-Id: Ife9696bdd8b973ef3cf30626533e38720408179b --- Repository.mk | 1 + l10ntools/Executable_treex.mk | 36 +++++ l10ntools/Module_l10ntools.mk | 1 + l10ntools/inc/treemerge.hxx | 38 +++++ l10ntools/source/localize.cxx | 3 +- l10ntools/source/treemerge.cxx | 304 +++++++++++++++++++++++++++++++++++++++ l10ntools/source/treex.cxx | 60 ++++++++ solenv/gbuild/ExtensionTarget.mk | 37 ++--- 8 files changed, 462 insertions(+), 18 deletions(-) create mode 100644 l10ntools/Executable_treex.mk create mode 100644 l10ntools/inc/treemerge.hxx create mode 100644 l10ntools/source/treemerge.cxx create mode 100644 l10ntools/source/treex.cxx diff --git a/Repository.mk b/Repository.mk index 217d74a19278..5b24259e59c1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -69,6 +69,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ svg2odf \ svidl \ transex3 \ + treex \ typesconfig \ $(if $(filter UCPP,$(BUILD_TYPE)),\ ucpp \ diff --git a/l10ntools/Executable_treex.mk b/l10ntools/Executable_treex.mk new file mode 100644 index 000000000000..41af0a8bfbc9 --- /dev/null +++ b/l10ntools/Executable_treex.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + + +$(eval $(call gb_Executable_Executable,treex)) + +$(eval $(call gb_Executable_set_include,treex,\ + -I$(SRCDIR)/l10ntools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,treex,\ + sal \ + i18nregexp \ +)) + +$(eval $(call gb_Executable_use_static_libraries,treex,\ + transex \ +)) + +$(eval $(call gb_Executable_add_exception_objects,treex,\ + l10ntools/source/treemerge \ + l10ntools/source/treex \ +)) + +$(eval $(call gb_Executable_use_externals,treex,\ + libxml2 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index e6c0cc3a8047..6efcd7f45596 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_targets,l10ntools,\ Executable_transex3 \ Executable_renewpo \ Executable_propex \ + Executable_treex \ StaticLibrary_transex \ Package_inc \ Package_scripts \ diff --git a/l10ntools/inc/treemerge.hxx b/l10ntools/inc/treemerge.hxx new file mode 100644 index 000000000000..3b681126bfab --- /dev/null +++ b/l10ntools/inc/treemerge.hxx @@ -0,0 +1,38 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef _TREEMERGE_INCLUDED +#define _TREEMERGE_INCLUDED + +#include +#include +#include + +class TreeParser +{ +private: + xmlDocPtr m_pSource; + OString m_sLang; + bool m_bIsInitialized; + +public: + TreeParser( + const OString& rInputFile, const OString& rLang ); + ~TreeParser(); + + bool isInitialized() const { return m_bIsInitialized; } + void Extract( + const OString& rSDFFile, const OString& rPrj, const OString& rRoot ); + void Merge( + const OString &rMergeSrc, const OString &rDestinationFile, + const OString &rXhpRoot ); +}; + +#endif //_TREEMERGE_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index fd1d8ca4b4d0..f808af59d6cd 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -324,7 +324,8 @@ void handleFile( { RTL_CONSTASCII_STRINGPARAM(".xml"), "xrmex", true }, { RTL_CONSTASCII_STRINGPARAM(".xhp"), "helpex", false }, { RTL_CONSTASCII_STRINGPARAM(".properties"), "propex", false }, - { RTL_CONSTASCII_STRINGPARAM(".ui"), "uiex", false } }; + { RTL_CONSTASCII_STRINGPARAM(".ui"), "uiex", false }, + { RTL_CONSTASCII_STRINGPARAM(".tree"), "treex", false } }; for (std::size_t i = 0; i != SAL_N_ELEMENTS(commands); ++i) { if (url.endsWithAsciiL( commands[i].extension, commands[i].extensionLength)) diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx new file mode 100644 index 000000000000..12e931c6d221 --- /dev/null +++ b/l10ntools/source/treemerge.cxx @@ -0,0 +1,304 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "export.hxx" +#include "common.hxx" +#include "treemerge.hxx" + + +namespace +{ + //Write out an sdf line + static void lcl_WriteSDF( + std::ofstream &aSDFStream, const OString& rText, const OString& rPrj, + const OString& rActFileName, const OString& rID, const OString& rType ) + { + OString sOutput( rPrj ); sOutput += "\t"; + sOutput += rActFileName; + sOutput += "\t0\t"; + sOutput += rType; sOutput += "\t"; + sOutput += rID; sOutput += "\t\t\t\t0\ten-US\t"; + sOutput += rText; sOutput += "\t\t\t\t"; + aSDFStream << sOutput.getStr() << std::endl; + } + + //Convert xmlChar* to OString + static OString lcl_xmlStrToOString( const xmlChar* pString ) + { + xmlChar* pTemp = xmlStrdup( pString ); + OString sResult = + static_cast(reinterpret_cast( pTemp )); + xmlFree( pTemp ); + return sResult; + } + + //Extract strings from nodes on all level recursively + static void lcl_ExtractLevel( + const xmlDocPtr pSource, const xmlNodePtr pRoot, + const xmlChar* pNodeName, std::ofstream& rSDFStream, + const OString& rPrj, const OString& rRoot ) + { + if( !pRoot->children ) + { + return; + } + for( xmlNodePtr pCurrent = pRoot->children->next; + pCurrent; pCurrent = pCurrent->next) + { + if (!xmlStrcmp(pCurrent->name, pNodeName)) + { + xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)("id")); + xmlChar* pText = + xmlGetProp(pCurrent, (const xmlChar*)("title")); + lcl_WriteSDF( + rSDFStream, + lcl_xmlStrToOString( pText ), + rPrj, + common::pathnameToken( + pSource->name, rRoot.getStr()), + lcl_xmlStrToOString( pID ), + lcl_xmlStrToOString( pNodeName )); + + xmlFree( pID ); + xmlFree( pText ); + + lcl_ExtractLevel( + pSource, pCurrent, (const xmlChar *)("node"), + rSDFStream, rPrj, rRoot ); + } + } + } + + //Update id and content of the topic + static xmlNodePtr lcl_UpdateTopic( + const xmlNodePtr pCurrent, const OString& rXhpRoot ) + { + xmlNodePtr pReturn = pCurrent; + xmlChar* pID = xmlGetProp(pReturn, (const xmlChar*)("id")); + const OString sID = + lcl_xmlStrToOString( pID ); + xmlFree( pID ); + + const sal_Int32 nFirstSlash = sID.indexOf("/"); + //Update id attribute of topic + { + OString sNewID = + sID.copy( 0, nFirstSlash + 1 ) + + rXhpRoot.copy( rXhpRoot.lastIndexOf("/") + 1 ) + + sID.copy( sID.indexOf( "/", nFirstSlash + 1 ) ); + xmlSetProp( + pReturn, (const xmlChar*)("id"), + reinterpret_cast(sNewID.getStr())); + } + + const OString sXhpPath = + rXhpRoot + + sID.copy(sID.indexOf("/", nFirstSlash + 1)); + xmlDocPtr pXhpFile = xmlParseFile( sXhpPath.getStr() ); + //if xhpfile is missing than we put this topic into comment + if ( !pXhpFile ) + { + xmlNodePtr pTemp = pReturn; + xmlChar* sNewID = + xmlGetProp(pReturn, (const xmlChar*)("id")); + xmlChar* sComment = + xmlStrcat( xmlCharStrdup("removed "), sNewID ); + pReturn = xmlNewComment( sComment ); + xmlReplaceNode( pTemp, pReturn ); + xmlFree( pTemp ); + xmlFree( sNewID ); + xmlFree( sComment ); + } + //update topic's content on the basis of xhpfile's title + else + { + xmlNodePtr pXhpNode = xmlDocGetRootElement( pXhpFile ); + for( pXhpNode = pXhpNode->children; + pXhpNode; pXhpNode = pXhpNode->children ) + { + while( pXhpNode->type != XML_ELEMENT_NODE ) + { + pXhpNode = pXhpNode->next; + } + if(!xmlStrcmp(pXhpNode->name, (const xmlChar *)("title"))) + { + xmlChar* sTitle = + xmlNodeListGetString(pXhpFile, pXhpNode->children, 1); + OString sNewTitle = + lcl_xmlStrToOString( sTitle ). + replaceAll("$[officename]","%PRODUCTNAME"). + replaceAll("$[officeversion]","%PRODUCTVERSION"); + xmlNodeSetContent( + pReturn, + reinterpret_cast( sNewTitle.getStr() )); + xmlFree( sTitle ); + break; + } + } + if( !pXhpNode ) + { + std::cerr + << "Treex error: Cannot find title in " + << sXhpPath.getStr() << std::endl; + return 0; + } + xmlFree( pXhpFile ); + xmlCleanupParser(); + } + return pReturn; + } + //Localize title attribute of help_section and node tags + static void lcl_MergeLevel( + xmlDocPtr io_pSource, const xmlNodePtr pRoot, + const xmlChar * pNodeName, MergeDataFile* pMergeDataFile, + const OString& rLang, const OString& rXhpRoot ) + { + if( !pRoot->children ) + { + return; + } + for( xmlNodePtr pCurrent = pRoot->children; + pCurrent; pCurrent = pCurrent->next) + { + if( !xmlStrcmp(pCurrent->name, pNodeName) ) + { + if( pMergeDataFile ) + { + xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)("id")); + ResData aResData( + "", lcl_xmlStrToOString( pID ), + static_cast(io_pSource->name) ); + xmlFree( pID ); + aResData.sResTyp = lcl_xmlStrToOString( pNodeName ); + PFormEntrys* pEntrys = + pMergeDataFile->GetPFormEntrys( &aResData ); + if( pEntrys ) + { + OString sNewText; + pEntrys->GetText( sNewText, STRING_TYP_TEXT, rLang ); + xmlSetProp( + pCurrent, (const xmlChar*)("title"), + (const xmlChar*)(sNewText.getStr())); + } + } + lcl_MergeLevel( + io_pSource, pCurrent, (const xmlChar *)("node"), + pMergeDataFile, rLang, rXhpRoot ); + } + else if( !xmlStrcmp(pCurrent->name, (const xmlChar *)("topic")) ) + { + pCurrent = lcl_UpdateTopic( pCurrent, rXhpRoot ); + } + } + } +} + +//Parse tree file +TreeParser::TreeParser( + const OString& rInputFile, const OString& rLang ) + : m_pSource( 0 ) + , m_sLang( rLang ) + , m_bIsInitialized( false ) +{ + m_pSource = xmlParseFile( rInputFile.getStr() ); + if ( !m_pSource ) { + std::cerr + << "Treex error: Cannot open source file: " + << rInputFile.getStr() << std::endl; + return; + } + if( !m_pSource->name ) + { + m_pSource->name = new char[strlen(rInputFile.getStr())+1]; + strcpy( m_pSource->name, rInputFile.getStr() ); + } + m_bIsInitialized = true; +} + +TreeParser::~TreeParser() +{ +} + +//Extract strings form source file +void TreeParser::Extract( + const OString& rSDFFile, const OString& rPrj, const OString& rRoot ) +{ + assert( m_bIsInitialized ); + std::ofstream aSDFStream( + rSDFFile.getStr(), std::ios_base::out | std::ios_base::trunc ); + if( !aSDFStream.is_open() ) + { + std::cerr + << "Treex error: Cannot open sdffile for extract: " + << rSDFFile.getStr() << std::endl; + return; + } + + xmlNodePtr pRootNode = xmlDocGetRootElement( m_pSource ); + lcl_ExtractLevel( + m_pSource, pRootNode, (const xmlChar *)("help_section"), + aSDFStream, rPrj, rRoot ); + + xmlFreeDoc( m_pSource ); + xmlCleanupParser(); + aSDFStream.close(); + m_bIsInitialized = false; +} + +//Merge strings to tree file and update reference to help files(xhp) +void TreeParser::Merge( + const OString &rMergeSrc, const OString &rDestinationFile, + const OString &rXhpRoot ) +{ + assert( m_bIsInitialized ); + + const xmlNodePtr pRootNode = xmlDocGetRootElement( m_pSource ); + if( m_sLang == "en-US" ) + { + lcl_MergeLevel( + m_pSource, pRootNode, (const xmlChar *)("help_section"), + 0, m_sLang, rXhpRoot ); + } + else + { + MergeDataFile aMergeDataFile( + rMergeSrc, static_cast( m_pSource->name ), false ); + + if( aMergeDataFile.GetLanguages()[0] != m_sLang ) + { + std::cerr + << "Treex error: given language conflicts with " + << "language of Mergedata file: " + << m_sLang.getStr() << " - " << rMergeSrc.getStr() << std::endl; + return; + } + + lcl_MergeLevel( + m_pSource, pRootNode, (const xmlChar *)("help_section"), + &aMergeDataFile, m_sLang, rXhpRoot ); + } + + xmlSaveFile( rDestinationFile.getStr(), m_pSource ); + xmlFreeDoc( m_pSource ); + xmlCleanupParser(); + m_bIsInitialized = false; +} + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/treex.cxx b/l10ntools/source/treex.cxx new file mode 100644 index 000000000000..65807b1a5c0b --- /dev/null +++ b/l10ntools/source/treex.cxx @@ -0,0 +1,60 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include "sal/main.h" + +#include "export.hxx" +#include "treemerge.hxx" + +void WriteUsage() +{ + std::cout + << "Syntax: Treex [-p Prj] [-r Root] -i FileIn -o FileOut" + << " [-m DataBase] [-l l1,l2,...]\n" + << " Prj: Project\n" + << " Root: Path to project root (../.. etc.)\n" + << " or path to root of localized xhp files\n" + << " FileIn: Source files (*.tree)\n" + << " FileOut: Destination file (*.*)\n" + << " DataBase: Mergedata (*.po)\n" + << " -l: Restrict the handled languages; l1, l2, ... are elements of" + << " (de, en-US, ...)\n"; +} + + +SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) +{ + HandledArgs aArgs; + if( !Export::handleArguments(argc, argv, aArgs) ) + { + WriteUsage(); + return 1; + } + + TreeParser aParser(aArgs.m_sInputFile, Export::sLanguages); + if( !aParser.isInitialized() ) + { + return 1; + } + + if( aArgs.m_bMergeMode || aArgs.m_sPrj.isEmpty() ) + { + aParser.Merge( + aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sPrjRoot ); + } + else + { + aParser.Extract( + aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot ); + } + return 0; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 7c94e15d4e3d..bc00c11a8c2f 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -39,11 +39,9 @@ gb_ExtensionTarget_PROPMERGETARGET := $(call gb_Executable_get_target_for_build, gb_ExtensionTarget_PROPMERGECOMMAND := \ $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_PROPMERGETARGET) -gb_ExtensionTarget_UPDATETREETARGET := $(SRCDIR)/l10ntools/scripts/update_tree.pl -gb_ExtensionTarget_UPDATETREECOMMAND := \ - $(gb_Helper_set_ld_path) $(PERL) $(gb_ExtensionTarget_UPDATETREETARGET) - # update_tree.pl calls xmllint, which needs $(gb_Helper_set_ld_path) if it - # is the internal one +gb_ExtensionTarget_TREEXTARGET := $(call gb_Executable_get_target_for_build,treex) +gb_ExtensionTarget_TREEXCOMMAND := \ + $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_TREEXTARGET) gb_ExtensionTarget_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex) gb_ExtensionTarget_HELPEXCOMMAND := \ @@ -261,9 +259,8 @@ endef # suffix # $(3): relative path of (target) help.tree file (e.g., # com.sun.wiki-publisher/help.tree) -# $(4): optional relative path of source help.tree file, when it differs from $(3) -# (i.e., if $(4) is empty the en-US source file is $(2)/$(3), otherwise it -# is $(2)/$(4)) +# $(4): relative path of source help.tree file +# $(5): relative path of localized xhp files (PlatformID included) define gb_ExtensionTarget_add_helptreefile $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ $(call gb_ExtensionTarget__localize_helptreefile_onelang,$(1),$(2),$(3),$(4),$(lang),$(5)) \ @@ -322,38 +319,44 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ endef # localize one help.tree for one language; the result is stored as -# help/$(4)/$(3) in the extension's workdir; as a special case, if $(4) is -# "en-US", the source file is just copied, not passed through update_tree.pl +# help/$(4)/$(3) in the extension's workdir; # $(1): extension identifier # $(2): absolute path prefix of en-US source file without $(3) (resp. $(4)) # suffix # $(3): relative path of (target) help.tree file (see # gb_ExtensionTarget_add_helptreefile) -# $(4): optional relative path of source help.tree file (see +# $(4): relative path of source help.tree file (see # gb_ExtensionTarget_add_helptreefile) # $(5): language +# $(6): relative path of localized xhp files (PlatformID included) define gb_ExtensionTarget__localize_helptreefile_onelang $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) ifneq ($(strip $(gb_WITH_LANG)),) ifneq ($(filter-out en-US,$(5)),) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) + POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(4)))) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) + $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(4)))) endif endif $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_UPDATETREETARGET)) | \ + $(gb_ExtensionTarget_TREEXTARGET) | \ $(2)/$(4) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ $(2)/$(or $(4),$(3)) $$(call gb_Output_announce,$(1) $(3) $(5),$(true),TRE,3) $$(call gb_Helper_abbreviate_dirs, \ - mkdir -p $$(dir $$@) && \ + mkdir -p $$(dir $$@) && \ $(if $(filter-out en-US,$(5)), \ - cp $$< $$@,\ - cp $$< $$@)) + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $$(POFILE) > $$$${MERGEINPUT} && \ + $(gb_ExtensionTarget_TREEXCOMMAND) -i $$< -o $$@ -l $(5) \ + -m $$$${MERGEINPUT} \ + -r $$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(6) && \ + rm -rf $$$${MERGEINPUT}, \ + $(gb_ExtensionTarget_TREEXCOMMAND) -i $$< -o $$@ -l $(5) \ + -r $$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(6) )) endef -- cgit From 0853451b46f7227ea41a049e8de580ac9a4d5bf1 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 4 Nov 2012 23:20:51 +0100 Subject: Correct propmerge If there is no po entry for a string than use the original en-US string Change-Id: I4296ae9c189a3c65cf93a806edbf1317651d1486 --- l10ntools/source/propmerge.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx index 61400147691f..a858f44d8210 100644 --- a/l10ntools/source/propmerge.cxx +++ b/l10ntools/source/propmerge.cxx @@ -210,6 +210,10 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil lcl_PrintJavaStyle( sNewText, aDestination ); aDestination << std::endl; } + else + { + aDestination << sLine.getStr() << std::endl; + } } else { -- cgit From 428d9e15f98630df9a652be2b2f5064ac1bc7a89 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 7 Nov 2012 22:50:56 +0100 Subject: Delete unused files Belong to extensions which become unneeded because of treex Change-Id: I86ca7494a9022c1e72d64b2ec5cbd41d6e292a00 --- l10ntools/scripts/update_tree.pl | 394 --------------------- .../tree_strings.xhp | 29 -- .../en-US/com.sun.PresenterScreen/tree_strings.xhp | 29 -- swext/mediawiki/help/tree_strings.xhp | 29 -- 4 files changed, 481 deletions(-) delete mode 100644 l10ntools/scripts/update_tree.pl delete mode 100644 nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/tree_strings.xhp delete mode 100644 sdext/source/presenter/help/en-US/com.sun.PresenterScreen/tree_strings.xhp delete mode 100644 swext/mediawiki/help/tree_strings.xhp diff --git a/l10ntools/scripts/update_tree.pl b/l10ntools/scripts/update_tree.pl deleted file mode 100644 index 02faf6a37c72..000000000000 --- a/l10ntools/scripts/update_tree.pl +++ /dev/null @@ -1,394 +0,0 @@ -: -eval 'exec perl -wS $0 ${1+"$@"}' - if 0; -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -use Cwd 'abs_path'; -use File::Find; -use File::Copy qw/cp mv/; -use File::Basename; - -# update the tree files in /misc/* - -$| = 1; - -my $prj = $ENV{PWD}; - -my $inpath = $ENV{WORKDIR}; -terminate() if ( ! defined $inpath ); - -my $destpath = $inpath; -my $with_lang = $ARGV[1]; -my $xmllint = $ENV{XMLLINT} || "$ENV{OUTDIR_FOR_BUILD}/bin/xmllint"; - -$tree_target_prefix = $ARGV[4]; - -# Always use / directory separators -$prj =~ s/\\/\//g if defined($prj); -$inpath =~ s/\\/\//g; -$destpath =~ s/\\/\//g; - -if ( ! defined $prj ) { -# do someting that works for manual call - ($scriptname = `pwd`) =~ s/\n/\/$0/; - ($tree_src = $scriptname) =~ s/\/update_tree.pl/\/..\/source\/auxiliary/; - ($tree_dest = $scriptname) =~ s/\/update_tree.pl/\/..\/$destpath\/misc/; - ($source_dir = $scriptname) =~ s/\/update_tree.pl/\/..\/source/; - ($source_dir_xhp = $scriptname) =~ s/\/update_tree.pl/\/..\/source/; - - if ( defined $ENV{TRYSDF} || defined $ENV{LOCALIZESDF} ) - { - if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" ) - { - $source_dir = $ENV{TRYSDF}; - } - elsif( defined $ENV{LOCALIZESDF} && $ENV{LOCALIZESDF} ne "" ) - { - $source_dir = $ENV{LOCALIZESDF}; - } - $source_dir =~ s/\/auxiliary\/localize.sdf$// ; - } - $treestrings = "$ARGV[0]"; - $treestrings=~ s/\/*.tree//g; -} else { - $source_dir_xhp = "$prj/source/presenter/help"; - $tree_src = "$ARGV[0]"; - $tree_src =~ s/\/help.tree//g; - $tree_dest = "$ARGV[3]"; - $tree_dest =~ s/\/help.tree//g; - $source_dir = "$ARGV[2]"; - $source_dir =~ s/\/localize.sdf//g; - $treestrings = "$ARGV[0]"; - $treestrings=~ s/\/help.tree/\/tree_strings.xhp/g; - - if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" ) - { - $source_dir = $ENV{TRYSDF}; - } - elsif ( defined $ENV{LOCALIZESDF} && $ENV{LOCALIZESDF} ne "" ) - { - $source_dir = $ENV{LOCALIZESDF}; - } - $source_dir =~ s/\/auxiliary\/localize.sdf$// ; -} - -# Get the English tree files as master -#------------------------------- -# Update English from xhp -#------------------------------- -&do_english; -#------------------------------- -# Update localizations from sdf -#------------------------------- - -if( defined $with_lang && $with_lang ne "" ) -{ - @langs = split /\s+/, $with_lang; - &read_loc; - for $l(@langs) - { - #if ($l ne "en-US") { - &do_lang($l); - #} - } -} -else -{ - print "\nNo WITH_LANG set, skipping l10n\n"; -} -#------------------------------- -# - -#################### -# SUBS -#################### -sub terminate { - $err = shift; - print "$err\n\n"; - $msg = <<"MSG"; - -update_tree.pl - all languages in WITH_LANG are processed. WITH_LANG=ALL is - not supported in manual calls. - - Updates the *.tree files. - At first, the English file is updated based on the English - help topic titles as read from the help files. Then, the - localized tree files are written based on the English tree - file and the localized help topic titles. - - Requires a valid LibreOffice build environment. -MSG - print "$msg\n"; - exit( -1 ); - # die "$msg\n"; -} - -#--------------------------------------------------- - -sub do_english { - undef %helpsection; undef %node; - &readtreestrings; - &gettreefiles; -} - -#--------------------------------------------------- -sub do_lang { - $lng = shift; - print "Processing $lng\n"; - &processtreefiles($lng); -} - -#--------------------------------------------------- -sub readtreestrings { - if (open TREE, $treestrings) { - print "Processing readtreestrings\n"; - while () { - chomp; - s/<\/*help:productname>//gis; - if (/help_section/) { - s/^\s*<.*help_section//; - s/<\/.*$//; - ($id = $_) =~ s/^.*id="(\d+)".*$/$1/; - ($title = $_) =~ s/^.*title="(.*)".*$/$1/; - $helpsection{$id} = $title; - } - - if (/node id=/) { - s/^\s*<.*node //; - s/<\/.*$//; - ($id = $_) =~ s/^.*id="(\d+)".*$/$1/; - ($title = $_) =~ s/^.*title="(.*)".*$/$1/; - $node{$id} = $title; - } - } - close TREE; - } else { - &terminate("Error opening $treestrings"); - } -} - -#------------------------------------ -sub gettreefiles { - # Read the tree files from the directory - # this list is also used for all foreign languages - if (opendir ENUS, "$tree_src") { - @treeviews = grep /\.tree/, readdir ENUS; - closedir ENUS; - } else { - &terminate("Cannot open directory $tree_src"); - } -} - -#------------------------------------ -sub processtreefiles { - $lng = shift; - use File::Temp qw/ tempfile /; - use File::Spec; - - for $tv(@treeviews) { - @lines = &readtv("$tree_src/$tv"); - for $l(@lines) { - if ($l =~ /topic/) { - ($id = $l) =~ s/^.*id="([^"]*)".*$/$1/gis; - ($module = $id) =~ s/^([^\/]*).*$/$1/; - $id =~ s/^.*?\///; - $file = "$source_dir_xhp/$lng/$id"; - - if ($lng eq 'en-US') { # english comes from the file - $temp = $l; - $temp =~ s/^.*]+id=".*"[^>]*>([^<]*)<\/topic>.*$/$1/gis; - $temp =~ s/'/\'/gis; $temp=~ s/&/+/gis; - $temp =~ s/"/\'/gis; $temp =~ s/&/+/gis; - - $id =~s/^.*\/(.*.xhp)/$1/; - $l = "$temp\n"; - } else { # localized comes from the localize sdf - if (defined($loc_title{$lng}->{$id})) { - $xhpname = $id; - $xhpname =~s/^.*\/(.*.xhp)/$1/; - $l = "$loc_title{$lng}->{$id}\n"; - } else { - } - } - } - - if ($l =~/{$id})) { - $l =~ s/title="(.*)"/title="$node{$lng}->{$id}"/; - } - } - } - - if ($l =~/{$id})) { - $l =~ s/title="(.*)"/title="$helpsection{$lng}->{$id}"/; - } - } - } - } - - - my $treeoutdir = "$tree_dest"; - my $tmpname_template=$tv."_XXXXX"; - my ( $treetmpfilehandle, $treetmpfile ) = tempfile($tmpname_template , DIR => File::Spec->tmpdir() ); - close $treetmpfilehandle ; - - if (open TV, ">$treetmpfile") { - for $line(@lines) { - $line =~ s/\$\[officename\]/%PRODUCTNAME/g; - $line =~ s/\$\[officeversion\]/%PRODUCTVERSION/g; - print TV $line; - } - close TV; - chmod 0664, $treetmpfile or &terminate("Cannot change rights on $treetmpfile"); - if( $^O eq 'MSWin32' ) - { - $tree_dest =~ s/\//\\/g ; - unlink "$tree_dest\\$tv" ; - mv $treetmpfile , "$tree_dest\\$tv" or &terminate("Cannot mv $treetmpfile to $tree_dest\\$tv" ); - } - else - { - unlink "$tree_dest/$tv" ; - my $ret=mv $treetmpfile , "$tree_dest/$tv" or &terminate("Cannot write to $tree_dest/$tv - Error $!"); - my $ret=mv "$tree_dest/$tv" , "$tree_dest/$tv" or &terminate("Cannot write to $tree_dest/$tv - Error $!"); - #xmllint is crashing on windows, fixme - if( $^O ne 'cygwin' ) - { - system("$xmllint --noout --noent $tree_dest/$tv") == 0 or &terminate("$tree_dest/$tv is illformed xml ($xmllint on $^O)" ); - } - } - } else { - &terminate("Cannot write to $tvout"); - } - } -} - -#------------------------------------ -sub readtv { - my $f = shift; - if (open TV, $f) { - $/ = "\n"; - my @l = ; - close TV; - return @l; - } else { - &terminate("Error opening $f"); - } -} - -#------------------------------------- -# read entries from localize.sdf files -#------------------------------------- -sub read_loc { - $/ = "\n"; - my $path = "$source_dir"; - @files = `find $source_dir -name localize.sdf`; - for my $fname (@files) { - $FS = '\t'; - open(LOCALIZE_SDF, $fname) || die 'Cannot open "localize.sdf".'."$fname"; - while () { - my $sdf_line = $_; - my ($Fld1,$file,$Fld3,$Fld4,$id,$Fld6,$Fld7,$Fld8,$Fld9,$lang,$text) = split($FS, $sdf_line , 12); - next if ( $Fld1 =~ /^#/); - if ($id eq 'tit') { - #strip filename - $file =~ s/.*text\\/text\\/g; - #convert \ to / in filename - $file =~ s/\\/\//g; - $file =~ s/^.*\/(.*)\/(.*)$/$1\/$2/; - #fpe: i46823 - need to encode &s, added encoding - $text =~ s/&(?!amp;)/&/g; - #help xml tags are not allowed in .tree files - $text =~ s/\\<.*?\\>//g; - # add entry to the hash - - $loc_title{$lang}->{$file} = $text; - } - if ($file =~ /tree_strings.xhp/) { - #strip filename - $file =~ s/.*text/text/g; - #convert \ to / in filename - $file =~ s/\\/\//g; - if ($text =~ /^ - my ($fld1,$app,$fld3,$id,$fld5,$sec_title) = split('"', $text, 7); - #fpe: i46823 - need to encode &s, added encoding - if( defined $sec_title ) - { - $sec_title =~ s/&(?!amp;)/&/g; - #help xml tags are not allowed in .tree files - $sec_title =~ s/\\<.*?\\>//g; - #unquot \ - terminate( "\n\nERROR: Bad string in file '$fname' will cause invalid xml tree file \n---\n'$sdf_line'\n---\nPlease remove or replace < = '<' and > = '>' within the title attribute '$sec_title'\n") , if( $sec_title =~ /[\<\>]/ ); - $helpsection{$lang}->{$id} = $sec_title; - } - } elsif ($text =~/ - # BEWARE: title may contain escaped '"' so only match " not preceded by \ - # using a zero‐width negative look‐behind assertion. - my ($fld1,$id,$fld3,$node_title,$Fld5) = split(/(?//g; - terminate( "\n\nERROR: Bad string in '$fname' will cause invalid xml tree file \n---\n'$sdf_line'\n---\nPlease remove or replace < = '<' and > = '>' within the title attribute '$node_title'\n") , if( $node_title =~ /[\<\>]/ ); - } - $node{$lang}->{$id} = $node_title; - } - } - } - close LOCALIZE_SDF; - } - # statistics - $total_elements=0; - foreach $lang (keys %loc_title) { - $no_elements = scalar(keys(%{$loc_title{$lang}})); - push(@langstat, "$lang:\t ".$no_elements." matches\n"); - $total_elements += $no_elements; - } -} diff --git a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/tree_strings.xhp b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/tree_strings.xhp deleted file mode 100644 index f6403c45c42b..000000000000 --- a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/tree_strings.xhp +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - Note to translators: - /help/en/com.sun.star.comp.Calc.NLPSolver/tree_strings.xhp - - - - - This file contains extra strings for the contents (*.tree) files. No indexing! - - File: help.tree - <help_section application="scalc" id="08" title="Solver for Nonlinear Problems"> - <node id="0816" title="Solver for Nonlinear Problems"> - - - - diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/tree_strings.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/tree_strings.xhp deleted file mode 100644 index 322cd6967fd6..000000000000 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/tree_strings.xhp +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - Note to translators: - /source/presenter/help/en-US/com.sun.PresenterScreen/tree_strings.xhp - - - - - This file contains extra strings for the contents (*.tree) files. No indexing! - - File: help.tree - <help_section application="simpress" id="04" title="Presenter Console Keyboard Shortcuts"> - <node id="0411" title="Presenter Console Keyboard Shortcuts"> - - - - diff --git a/swext/mediawiki/help/tree_strings.xhp b/swext/mediawiki/help/tree_strings.xhp deleted file mode 100644 index 2ccabc71c7b9..000000000000 --- a/swext/mediawiki/help/tree_strings.xhp +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - Note to translators: - /mediawiki/help/treestrings.xhp - - - - - This file contains extra strings for the contents (*.tree) files. No indexing! - - File: help.tree - <help_section application="swriter" id="02" title="MediaWiki"> - <node id="0224" title="MediaWiki"> - - - - -- cgit From 9e682e30e7cd2d90ad37921934fbf0f5f1897eb3 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 8 Nov 2012 11:13:59 +0100 Subject: Localize.cxx add correct header to po Belong to dictionaries modul Change-Id: Ifd8303fd294de2369383cc2ce7ebdd1487c90463 --- l10ntools/source/localize.cxx | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index f808af59d6cd..c4af640834af 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -262,17 +262,23 @@ void handleCommand( << outFilePath.getStr() << "\n"; throw false; //TODO } - rtl::OString relativPath; - if (!inPath.copy(inPath.indexOf(project), - inPath.lastIndexOf('/')-inPath.indexOf(project)). - convertToString(&relativPath, osl_getThreadTextEncoding(), - (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR - | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) + + //Add header to actual po file { - std::cerr << "Error: Cannot convert pathname from UTF-16\n"; - throw false; //TODO + const sal_Int32 nProjectInd = inPath.indexOf(project); + const OString relativPath = + project == OUString("dictionaries") ? + OUStringToOString( + inPath.copy( nProjectInd + 13, + inPath.lastIndexOf('/')- nProjectInd - 13), + RTL_TEXTENCODING_UTF8 ) : + OUStringToOString( + inPath.copy( nProjectInd, + inPath.lastIndexOf('/')- nProjectInd), + RTL_TEXTENCODING_UTF8 ); + + rPoOutPut.writeHeader(PoHeader(relativPath)); } - rPoOutPut.writeHeader(PoHeader(relativPath)); } while (!in.eof()) { -- cgit From ed879cdf2957fcfb013a894dd1ed8bf512f10301 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 8 Nov 2012 12:05:55 +0100 Subject: Correct typo in po header Change-Id: Ic98467f5c32a0a84af62f68fbe84c68c3e37f1c1 --- l10ntools/source/po.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 9dd6d6adab56..18c0ef1042d4 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -683,8 +683,8 @@ PoHeader::PoHeader( const OString& rExtSrc ) "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" - "X-Genarator: LibreOffice\n" - "X-Accelerator_Marker: ~\n")); + "X-Generator: LibreOffice\n" + "X-Accelerator-Marker: ~\n")); m_bIsInitialized = true; } -- cgit From 643ffdf621a056a266c1c6121388e4d0b06adb0d Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 8 Nov 2012 17:16:06 +0100 Subject: Add an extra empty line to lngmerge It worked with eof before so an extra line is needed. See also this commit: 06175e8b19625cb5a43b1ae5ae63e419cee7e053 Change-Id: Ic3f43a52801429258df620229269b8426f1e2995 --- l10ntools/source/lngmerge.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index efc6c81f6994..42b6384394ea 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -66,6 +66,7 @@ LngParser::LngParser(const rtl::OString &rLngFile, pLines->push_back( new rtl::OString(sLine) ); std::getline(aStream, s); } + pLines->push_back( new rtl::OString() ); } else nError = LNG_COULD_NOT_OPEN; -- cgit From 8e0d67bed54633d555a4601a5d79e2d5ba7ab2bb Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sat, 10 Nov 2012 11:58:48 +0100 Subject: Add some check to renewpo Change-Id: I7b90785516f172f7b552a9e5ae30d02f7c52d7cf --- l10ntools/source/renewpo.cxx | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index 241db58b72cf..32d19d594c09 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -158,14 +158,23 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, { sActUnTrans = DelLocalId(sActUnTrans); } - PoEntry aPE(sActUnTrans, vTypes[nIndex]); - const OString sActStr = - sActTrans.getToken(vTypes[nIndex],'\t'); - aPE.setMsgStr(sActStr); - aPE.setFuzzy( sActStr.isEmpty() ? false : - static_cast(sActTrans.getToken(PoEntry::DUMMY,'\t'). - copy(nDummyBit++,1).toBoolean())); - aNewPo.writeEntry(aPE); + try + { + PoEntry aPE(sActUnTrans, vTypes[nIndex]); + const OString sActStr = + sActTrans.getToken(vTypes[nIndex],'\t'); + aPE.setMsgStr(sActStr); + aPE.setFuzzy( sActStr.isEmpty() ? false : + static_cast(sActTrans.getToken(PoEntry::DUMMY,'\t'). + copy(nDummyBit++,1).toBoolean())); + aNewPo.writeEntry(aPE); + } + catch( PoEntry::Exception& ) + { + cerr + << "Invalid sdf line " + << sActUnTrans.replaceAll("\t","\\t").getStr() << '\n'; + } } } //Check wheather next entry is in the same po file -- cgit From deaceba0c27040ad9982b16e2be8745f6bd1605a Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 13 Nov 2012 11:40:10 +0100 Subject: XML tag check in help and readme translations Change-Id: Iec88ae875e00777f499cd0044f256275d854dca8 --- l10ntools/Executable_helpex.mk | 4 ++++ l10ntools/Executable_xrmex.mk | 4 ++++ l10ntools/source/helper.hxx | 20 ++++++++++++++++++++ l10ntools/source/helpmerge.cxx | 15 +++++++++++---- l10ntools/source/xrmmerge.cxx | 4 +++- 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk index 22f2ae9288a4..b7e63100b351 100644 --- a/l10ntools/Executable_helpex.mk +++ b/l10ntools/Executable_helpex.mk @@ -49,4 +49,8 @@ $(eval $(call gb_Executable_add_exception_objects,helpex,\ l10ntools/source/helpmerge \ )) +$(eval $(call gb_Executable_use_externals,helpex,\ + libxml2 \ +)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk index 02e776a2277b..73c56abe420a 100644 --- a/l10ntools/Executable_xrmex.mk +++ b/l10ntools/Executable_xrmex.mk @@ -50,4 +50,8 @@ $(eval $(call gb_Executable_add_exception_objects,xrmex,\ l10ntools/source/xrmmerge \ )) +$(eval $(call gb_Executable_use_externals,xrmex,\ + libxml2 \ +)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/source/helper.hxx b/l10ntools/source/helper.hxx index cc33b71ff8ac..1e28aa6c4d50 100644 --- a/l10ntools/source/helper.hxx +++ b/l10ntools/source/helper.hxx @@ -35,6 +35,8 @@ #include #include +#include + #include "rtl/string.hxx" #include "rtl/ustring.hxx" #include "sal/types.h" @@ -100,6 +102,24 @@ inline sal_Int32 indexOfAnyAsciiL( return -1; } +inline bool isWellFormedXML( OString const & text ) +{ + xmlDocPtr doc; + OString content; + bool result = true; + + content = ""; + content += text; + content += ""; + doc = xmlParseMemory(content.getStr(),(int)content.getLength()); + if (doc == NULL) { + result = false; + } + xmlFreeDoc(doc); + xmlCleanupParser(); + return result; +} + template< typename T > inline T abbreviate( T const & text, sal_Int32 start, sal_Int32 length) { diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 05b3800bbc81..aab255f75a05 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -341,7 +341,7 @@ void HelpParser::MakeDir(const rtl::OString& rPath) void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile ){ XMLElement* pXMLElement = NULL; - PFormEntrys *pEntrys = NULL; + PFormEntrys *pEntrys = NULL; XMLData *data = NULL; rtl::OString sLId; @@ -379,9 +379,16 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , while ( (nPreSpaces < nLen) && (*(sSourceText.getStr()+nPreSpaces) == ' ') ) nPreSpaces++; pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur , true ); - rtl::OUString sNewdata( - sSourceText.copy(0,nPreSpaces) + - rtl::OStringToOUString(sNewText, RTL_TEXTENCODING_UTF8)); + OUString sNewdata; + if (helper::isWellFormedXML(sNewText)) + { + sNewdata = sSourceText.copy(0,nPreSpaces) + + rtl::OStringToOUString(sNewText, RTL_TEXTENCODING_UTF8); + } + else + { + sNewdata = sSourceText; + } if (!sNewdata.isEmpty()) { if( pXMLElement != NULL ) diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index a3eb0e5418ee..b4868f5f8623 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -27,6 +27,7 @@ #include "export.hxx" #include "xrmmerge.hxx" #include "tokens.h" +#include "helper.hxx" #include #include #include @@ -606,7 +607,8 @@ void XRMResMerge::WorkOnText( if ( Export::isAllowed( sLang ) && ( pEntrys->GetText( sContent, STRING_TYP_TEXT, sLang )) && - ( sContent != "-" ) && !sContent.isEmpty()) + ( sContent != "-" ) && !sContent.isEmpty() && + helper::isWellFormedXML( sContent )) { rText = sContent; -- cgit From 0a7189a3b2d8fc78e9b3ce1b5fff2622557258a5 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 13 Nov 2012 11:44:29 +0100 Subject: remove obsoleted gsicheck tool Change-Id: Ib25a6feae34533fa3752fe57e857613ca113ee3a --- l10ntools/Executable_gsicheck.mk | 45 -- l10ntools/Module_l10ntools.mk | 1 - l10ntools/inc/tagtest.hxx | 346 --------- l10ntools/source/gsicheck.cxx | 1051 ------------------------- l10ntools/source/tagtest.cxx | 1570 -------------------------------------- 5 files changed, 3013 deletions(-) delete mode 100644 l10ntools/Executable_gsicheck.mk delete mode 100644 l10ntools/inc/tagtest.hxx delete mode 100644 l10ntools/source/gsicheck.cxx delete mode 100644 l10ntools/source/tagtest.cxx diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk deleted file mode 100644 index 829a0296939f..000000000000 --- a/l10ntools/Executable_gsicheck.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 David Ostrovsky (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Executable_Executable,gsicheck)) - -$(eval $(call gb_Executable_set_include,gsicheck,\ - -I$(SRCDIR)/l10ntools/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Executable_use_libraries,gsicheck,\ - sal \ -)) - -$(eval $(call gb_Executable_use_unpacked,gsicheck,boost)) - -$(eval $(call gb_Executable_add_exception_objects,gsicheck,\ - l10ntools/source/gsicheck \ - l10ntools/source/tagtest \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index 6efcd7f45596..4b2b0f6d970d 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,l10ntools,\ Executable_idxdict \ Executable_ulfconv \ Executable_ulfex \ - Executable_gsicheck \ Executable_cfgex \ Executable_uiex \ Executable_xrmex \ diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx deleted file mode 100644 index a6ccec4d73ea..000000000000 --- a/l10ntools/inc/tagtest.hxx +++ /dev/null @@ -1,346 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _TAGTEST_HXX_ -#define _TAGTEST_HXX_ - -#include -#include - -class GSILine; - -typedef sal_Int32 TokenId; - -#define TOK_INVALIDPOS (-1) - -class ParserMessage; -typedef ::std::vector< ParserMessage* > Impl_ParserMessageList; - -class ParserMessageList; - -typedef boost::unordered_map StringHashMap; - -class TokenInfo -{ -private: - void SplitTag( ParserMessageList &rErrorList ); - - rtl::OUString aTagName; - StringHashMap aProperties; - sal_Bool bClosed; // tag is closed - sal_Bool bCloseTag; // tag is close Tag - - - sal_Bool bIsBroken; - sal_Bool bHasBeenFixed; - sal_Bool bDone; - -public: - - rtl::OUString aTokenString; - TokenId nId; - sal_Int32 nPos; // Position in String - - TokenInfo():bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),nId( 0 ){;} -explicit TokenInfo( TokenId pnId, sal_Int32 nP ):bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),nId( pnId ),nPos(nP){;} - explicit TokenInfo( TokenId pnId, sal_Int32 nP, rtl::OUString const & paStr ):bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),aTokenString( paStr ),nId( pnId ),nPos(nP) {;} - explicit TokenInfo( TokenId pnId, sal_Int32 nP, rtl::OUString const & paStr, ParserMessageList &rErrorList ); - - rtl::OUString GetTagName() const; - - rtl::OUString MakeTag() const; - - /** - Is the property to be ignored or does it have the default value anyways - **/ - sal_Bool IsPropertyRelevant( const rtl::OString &rName, const rtl::OUString &rValue ) const; - sal_Bool IsPropertyValueValid( const rtl::OString &rName, const rtl::OUString &rValue ) const; - /** - Does the property contain the same value for all languages - e.g.: the href in a link tag - **/ - sal_Bool IsPropertyInvariant( const rtl::OString &rName, const rtl::OUString &rValue ) const; - /** - a subset of IsPropertyInvariant but containing only those that are fixable - we dont wat to fix e.g.: ahelp :: visibility - **/ - sal_Bool IsPropertyFixable( const rtl::OString &rName ) const; - sal_Bool MatchesTranslation( TokenInfo& rInfo, sal_Bool bGenErrors, ParserMessageList &rErrorList, sal_Bool bFixTags = sal_False ) const; - - sal_Bool IsDone() const { return bDone; } - void SetDone( sal_Bool bNew = sal_True ) { bDone = bNew; } - - sal_Bool HasBeenFixed() const { return bHasBeenFixed; } - void SetHasBeenFixed( sal_Bool bNew = sal_True ) { bHasBeenFixed = bNew; } -}; - - -class ParserMessageList -{ -private: - Impl_ParserMessageList maList; - -public: - ~ParserMessageList() { clear(); } - void AddError( sal_Int32 nErrorNr, const rtl::OString& rErrorText, const TokenInfo &rTag ); - void AddWarning( sal_Int32 nErrorNr, const rtl::OString& rErrorText, const TokenInfo &rTag ); - - sal_Bool HasErrors(); - bool empty() const { return maList.empty(); } - size_t size() const { return maList.size(); } - ParserMessage* operator [] ( size_t i ) { return ( i < maList.size() ) ? maList[ i ] : NULL; } - void clear(); -}; - - -#define TAG_GROUPMASK 0xF000 -#define TAG_GROUPSHIFT 12 - -#define TAG_GROUP( nTag ) (( nTag & TAG_GROUPMASK ) >> TAG_GROUPSHIFT ) -#define TAG_NOGROUP( nTag ) ( nTag & ~TAG_GROUPMASK ) // ~ = Bitweises NOT - -#define TAG_NOMORETAGS 0x0 - -#define TAG_GROUP_FORMAT 0x1 -#define TAG_ON 0x100 -#define TAG_BOLDON ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | TAG_ON | 0x001 ) -#define TAG_BOLDOFF ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | 0x001 ) -#define TAG_ITALICON ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | TAG_ON | 0x002 ) -#define TAG_ITALICOFF ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | 0x002 ) -#define TAG_UNDERLINEON ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | TAG_ON | 0x004 ) -#define TAG_UNDERLINEOFF ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | 0x004 ) - -#define TAG_GROUP_NOTALLOWED 0x2 -#define TAG_HELPID ( TAG_GROUP_NOTALLOWED << TAG_GROUPSHIFT | 0x001 ) -#define TAG_MODIFY ( TAG_GROUP_NOTALLOWED << TAG_GROUPSHIFT | 0x002 ) -#define TAG_REFNR ( TAG_GROUP_NOTALLOWED << TAG_GROUPSHIFT | 0x004 ) - -#define TAG_GROUP_STRUCTURE 0x3 -#define TAG_NAME ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x001 ) -#define TAG_HREF ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x002 ) -#define TAG_AVIS ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x004 ) -#define TAG_AHID ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x008 ) - -#define TAG_TITEL ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x020 ) -#define TAG_KEY ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x040 ) -#define TAG_INDEX ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x080 ) - -#define TAG_REFSTART ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x100 ) - -#define TAG_GRAPHIC ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x200 ) -#define TAG_NEXTVERSION ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x400 ) - -#define TAG_GROUP_SYSSWITCH 0x4 -#define TAG_WIN ( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x001 ) -#define TAG_UNIX ( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x002 ) -#define TAG_MAC ( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x004 ) -#define TAG_OS2 ( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x008 ) - -#define TAG_GROUP_PROGSWITCH 0x5 -#define TAG_WRITER ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x001 ) -#define TAG_CALC ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x002 ) -#define TAG_DRAW ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x004 ) -#define TAG_IMPRESS ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x008 ) -#define TAG_SCHEDULE ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x010 ) -#define TAG_IMAGE ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x020 ) -#define TAG_MATH ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x040 ) -#define TAG_CHART ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x080 ) -#define TAG_OFFICE ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x100 ) - - -#define TAG_GROUP_META 0x6 -#define TAG_OFFICEFULLNAME ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x001 ) -#define TAG_OFFICENAME ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x002 ) -#define TAG_OFFICEPATH ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x004 ) -#define TAG_OFFICEVERSION ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x008 ) -#define TAG_PORTALNAME ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x010 ) -#define TAG_PORTALFULLNAME ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x020 ) -#define TAG_PORTALPATH ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x040 ) -#define TAG_PORTALVERSION ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x080 ) -#define TAG_PORTALSHORTNAME ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x100 ) - - -#define TAG_GROUP_SINGLE 0x7 -#define TAG_REFINSERT ( TAG_GROUP_SINGLE << TAG_GROUPSHIFT | 0x001 ) - - -#define TAG_GROUP_MULTI 0x8 -#define TAG_END ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x010 ) -#define TAG_ELSE ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x020 ) -#define TAG_AEND ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x040 ) -#define TAG_VERSIONEND ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x080 ) -#define TAG_ENDGRAPHIC ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x100 ) - -#define TAG_GROUP_MISC 0x9 -#define TAG_COMMONSTART ( TAG_GROUP_MISC << TAG_GROUPSHIFT | 0x001 ) -#define TAG_COMMONEND ( TAG_GROUP_MISC << TAG_GROUPSHIFT | 0x002 ) - -#define TAG_UNKNOWN_TAG ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x800 ) - -typedef ::std::vector< TokenInfo* > TokenListImpl; - -class TokenList -{ -private: - TokenListImpl maList; - TokenList& operator =( const TokenList& rList ); - -public: - TokenList() {} - ~TokenList(){ clear(); } - - size_t size() const { return maList.size(); } - void clear() - { - for ( size_t i = 0 ; i < maList.size() ; i++ ) - delete maList[ i ]; - maList.clear(); - } - - void insert( TokenInfo p, size_t nIndex = size_t(-1) ) - { - if ( nIndex < maList.size() ) { - TokenListImpl::iterator it = maList.begin(); - ::std::advance( it, nIndex ); - maList.insert( it, new TokenInfo(p) ); - } else { - maList.push_back( new TokenInfo(p) ); - } - } - TokenInfo& operator [] ( size_t nIndex ) const - { - return *maList[ nIndex ]; - } - - TokenList( const TokenList& rList ); -}; - -class ParserMessage -{ - sal_Int32 nErrorNr; - rtl::OString aErrorText; - sal_Int32 nTagBegin,nTagLength; - -protected: - ParserMessage( sal_Int32 PnErrorNr, const rtl::OString &rPaErrorText, const TokenInfo &rTag ); -public: - - sal_Int32 GetErrorNr() { return nErrorNr; } - rtl::OString GetErrorText() { return aErrorText; } - - sal_Int32 GetTagBegin() { return nTagBegin; } - sal_Int32 GetTagLength() { return nTagLength; } - - virtual ~ParserMessage() {} - virtual sal_Bool IsError() =0; - virtual rtl::OString Prefix() =0; -}; - -class ParserError : public ParserMessage -{ -public: - ParserError( sal_Int32 PnErrorNr, const rtl::OString &rPaErrorText, const TokenInfo &rTag ); - - virtual sal_Bool IsError() {return sal_True;} - virtual rtl::OString Prefix() {return rtl::OString(RTL_CONSTASCII_STRINGPARAM("Error:")); } -}; - -class ParserWarning : public ParserMessage -{ -public: - ParserWarning( sal_Int32 PnErrorNr, const rtl::OString &rPaErrorText, const TokenInfo &rTag ); - - virtual sal_Bool IsError() {return sal_False;} - virtual rtl::OString Prefix() {return rtl::OString(RTL_CONSTASCII_STRINGPARAM("Warning:")); } -}; - -class SimpleParser -{ -private: - sal_Int32 nPos; - rtl::OUString aSource; - rtl::OUString aLastToken; - TokenList aTokenList; - - TokenInfo aNextTag; // to store closetag in case of combined tags like
- - rtl::OUString GetNextTokenString( ParserMessageList &rErrorList, sal_Int32 &rTokeStartPos ); - -public: - SimpleParser(); - void Parse( rtl::OUString const & PaSource ); - TokenInfo GetNextToken( ParserMessageList &rErrorList ); - static rtl::OUString GetLexem( TokenInfo const &aToken ); - TokenList& GetTokenList(){ return aTokenList; } -}; - -class TokenParser -{ - sal_Bool match( const TokenInfo &aCurrentToken, const TokenId &aExpectedToken ); - sal_Bool match( const TokenInfo &aCurrentToken, const TokenInfo &aExpectedToken ); - void ParseError( sal_Int32 nErrNr, const rtl::OString &rErrMsg, const TokenInfo &rTag ); - void Paragraph(); - void PfCase(); - void PfCaseBegin(); - void AppCase(); - void AppCaseBegin(); - void CaseEnd(); - void SimpleTag(); - void TagPair(); - void TagRef(); - - SimpleParser aParser; - TokenInfo aTag; - - TokenId nPfCaseOptions; - TokenId nAppCaseOptions; - sal_Bool bPfCaseActive ,bAppCaseActive; - - TokenId nActiveRefTypes; - - ParserMessageList *pErrorList; - -public: - TokenParser(); - void Parse( const rtl::OUString &aCode, ParserMessageList* pList ); - TokenList& GetTokenList(){ return aParser.GetTokenList(); } -}; - -class LingTest -{ -private: - TokenParser aReferenceParser; - TokenParser aTesteeParser; - ParserMessageList aCompareWarningList; - void CheckTags( TokenList &aReference, TokenList &aTestee, sal_Bool bFixTags ); - sal_Bool IsTagMandatory( TokenInfo const &aToken, TokenId &aMetaTokens ); - rtl::OUString aFixedTestee; -public: - void CheckReference( GSILine *aReference ); - void CheckTestee( GSILine *aTestee, sal_Bool bHasSourceLine, sal_Bool bFixTags ); - - ParserMessageList& GetCompareWarnings(){ return aCompareWarningList; } - sal_Bool HasCompareWarnings(){ return ( !aCompareWarningList.empty() ); } - - rtl::OUString GetFixedTestee(){ return aFixedTestee; } -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx deleted file mode 100644 index 1abc00d17ac9..000000000000 --- a/l10ntools/source/gsicheck.cxx +++ /dev/null @@ -1,1051 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "sal/config.h" - -#include -#include -#include -#include -#include - -#include - -#include -#include "sal/main.h" -#include "helper.hxx" -#include "tagtest.hxx" -#include "gsicheck.hxx" - -sal_Int32 const MAX_GID_LID_LEN = 250; - -namespace { - -rtl::OString copyUpTo( - rtl::OString const & text, sal_Int32 start, sal_Int32 maximumLength) -{ - assert(start >= 0 && start <= text.getLength()); - return text.copy(start, std::min(text.getLength() - start, maximumLength)); -} - -rtl::OString addSuffix( - rtl::OString const & pathname, rtl::OString const & suffix) -{ - sal_Int32 n = pathname.lastIndexOf('.'); - if (n == -1) { - fprintf( - stderr, - ("Error: pathname \"%s\" does not contain dot to add suffix in" - " front of\n"), - pathname.getStr()); - exit(EXIT_FAILURE); - } - return pathname.replaceAt(n, 0, suffix); -} - -} - -/*****************************************************************************/ -void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg, rtl::OString const & aPrefix, - rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString aUniqueId = rtl::OString() ) -/*****************************************************************************/ -{ - fprintf( stdout, "%s %s, Line %u", aType.getStr(), aPrefix.getStr(), static_cast( nLine ) ); - if ( !aUniqueId.isEmpty() ) - fprintf( stdout, ", UniqueID %s", aUniqueId.getStr() ); - fprintf( stdout, ": %s", aMsg.getStr() ); - - if ( bPrintContext ) - fprintf( stdout, " \"%s\"", aContext.getStr() ); - fprintf( stdout, "\n" ); -} - -/*****************************************************************************/ -void PrintError( rtl::OString const & aMsg, rtl::OString const & aPrefix, - rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString const & aUniqueId = rtl::OString() ) -/*****************************************************************************/ -{ - PrintMessage( "Error:", aMsg, aPrefix, aContext, bPrintContext, nLine, aUniqueId ); -} - -bool LanguageOK( rtl::OString const & aLang ) -{ - sal_Int32 n = 0; - rtl::OString t0(aLang.getToken(0, '-', n)); - if (n == -1) { - return !t0.isEmpty() - && (helper::isAllAsciiDigits(t0) - || helper::isAllAsciiLowerCase(t0)); - } - rtl::OString t1(aLang.getToken(0, '-', n)); - return n == -1 - && !t0.isEmpty() && helper::isAllAsciiLowerCase(t0) - && !t1.isEmpty() && helper::isAllAsciiUpperCase(t1) - && !t0.equalsIgnoreAsciiCase(t1); -} - -class LazyStream: public std::ofstream -{ - -private: - rtl::OString aFileName; - bool bOpened; - -public: - LazyStream() - : aFileName() - , bOpened(false) - {}; - - void SetFileName( const rtl::OString& rFileName ) - { - aFileName = rFileName; - }; - - void LazyOpen(); -}; - -void LazyStream::LazyOpen() -{ - if ( !bOpened ) - { - open(aFileName.getStr(), std::ios_base::out | std::ios_base::trunc); - if (!is_open()) - { - fprintf( stderr, "\nERROR: Could not open Output-File %s!\n\n", - aFileName.getStr() ); - exit ( 4 ); - } - bOpened = true; - } -} - - -// -// class GSILine -// - -/*****************************************************************************/ -GSILine::GSILine( const rtl::OString &rLine, std::size_t nLine ) -/*****************************************************************************/ - : nLineNumber( nLine ) - , bOK( sal_True ) - , bFixed ( sal_False ) - , data_( rLine ) -{ - if (rLine.isEmpty()) { - NotOK(); - return; - } - - aFormat = FORMAT_SDF; - sal_Int32 n = 0; - aUniqId = rLine.getToken(0, '\t', n); // token 0 - aUniqId += "/"; - aUniqId += rLine.getToken(0, '\t', n); // token 1 - aUniqId += "/"; - aUniqId += rLine.getToken(1, '\t', n); // token 3 - aUniqId += "/"; - rtl::OString gid(rLine.getToken(0, '\t', n)); // token 4 - aUniqId += gid; - aUniqId += "/"; - rtl::OString lid(rLine.getToken(0, '\t', n)); // token 5 - aUniqId += lid; - aUniqId += "/"; - aUniqId += rLine.getToken(0, '\t', n); // token 6 - aUniqId += "/"; - aUniqId += rLine.getToken(0, '\t', n); // token 7 - rtl::OString length(rLine.getToken(0, '\t', n)); // token 8 - aLineType = rtl::OString(); - aLangId = rLine.getToken(0, '\t', n); // token 9 - aText = rLine.getToken(0, '\t', n); // token 10 - aQuickHelpText = rLine.getToken(1, '\t', n); // token 12 - aTitle = rLine.getToken(0, '\t', n); // token 13 - if (n == -1) { - NotOK(); - return; - } - rLine.getToken(0, '\t', n); // token 14 - if (n != -1) { - NotOK(); - return; - } - - // do some more format checks here - if (!helper::isAllAsciiDigits(length)) { - PrintError( - "The length field does not contain a number!", "Line format", - length, true, GetLineNumber(), GetUniqId()); - NotOK(); - } - if (!LanguageOK(aLangId)) { - PrintError( - "The Language is invalid!", "Line format", aLangId, true, - GetLineNumber(), GetUniqId()); - NotOK(); - } - // Limit GID and LID to MAX_GID_LID_LEN chars each for database conformity, - // see #137575#: - if (gid.getLength() > MAX_GID_LID_LEN || lid.getLength() > MAX_GID_LID_LEN) - { - PrintError( - (rtl::OString( - RTL_CONSTASCII_STRINGPARAM("GID and LID may only be ")) - + rtl::OString::valueOf(MAX_GID_LID_LEN) - + rtl::OString(RTL_CONSTASCII_STRINGPARAM(" chars long each"))), - "Line format", aLangId, true, GetLineNumber(), GetUniqId()); - NotOK(); - } -} - -/*****************************************************************************/ -void GSILine::NotOK() -/*****************************************************************************/ -{ - bOK = sal_False; -} - -/*****************************************************************************/ -void GSILine::ReassembleLine() -/*****************************************************************************/ -{ - if (GetLineFormat() != FORMAT_SDF) { - PrintError( - "Cannot reassemble line of unknown type (internal Error).", - "Line format", rtl::OString(), false, GetLineNumber(), - GetUniqId()); - return; - } - rtl::OStringBuffer b; - sal_Int32 n = 0; - for (sal_Int32 i = 0; i != 10; ++i) { - b.append(data_.getToken(0, '\t', n)); // token 0--9 - b.append('\t'); - } - b.append(aText); - b.append('\t'); - b.append(data_.getToken(1, '\t', n)); - // token 11; should be empty but there are some places in sc not - // reflected to sources - b.append('\t'); - b.append(aQuickHelpText); - b.append('\t'); - b.append(aTitle); - b.append('\t'); - b.append(data_.getToken(2, '\t', n)); // token 14 - data_ = b.makeStringAndClear(); -} - -// -// class GSIBlock -// -/*****************************************************************************/ -GSIBlock::GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool bTrans, sal_Bool bRef, sal_Bool bAllowSusp ) -/*****************************************************************************/ - : pSourceLine( NULL ) - , pReferenceLine( NULL ) - , bPrintContext( PbPrintContext ) - , bCheckSourceLang( bSource ) - , bCheckTranslationLang( bTrans ) - , bReference( bRef ) - , bAllowSuspicious( bAllowSusp ) - , bHasBlockError( sal_False ) -{ -} - -/*****************************************************************************/ -GSIBlock::~GSIBlock() -/*****************************************************************************/ -{ - delete pSourceLine; - delete pReferenceLine; - - for ( size_t i = 0, n = maList.size(); i < n; ++i ) - delete maList[ i ]; - maList.clear(); -} - -void GSIBlock::InsertLine( GSILine* pLine, const rtl::OString &rSourceLang) -{ - if ( pLine->GetLanguageId() == rSourceLang ) - { - if ( pSourceLine ) - { - PrintError( "Source Language entry double. Treating as Translation.", "File format", "", pLine->GetLineNumber(), pLine->GetUniqId() ); - bHasBlockError = sal_True; - pSourceLine->NotOK(); - pLine->NotOK(); - } - else - { - pSourceLine = pLine; - return; - } - } - - if (!rSourceLang.isEmpty()) // only check blockstructure if source lang is given - { - for ( size_t nPos = 0, n = maList.size(); nPos < n; ++nPos ) - { - if ( maList[ nPos ]->GetLanguageId() == pLine->GetLanguageId() ) - { - PrintError( "Translation Language entry double. Checking both.", "File format", "", pLine->GetLineNumber(), pLine->GetUniqId() ); - bHasBlockError = sal_True; - maList[ nPos ]->NotOK(); - pLine->NotOK(); - } - nPos++; - } - } - maList.push_back( pLine ); -} - -/*****************************************************************************/ -void GSIBlock::SetReferenceLine( GSILine* pLine ) -/*****************************************************************************/ -{ - pReferenceLine = pLine; -} - -/*****************************************************************************/ -void GSIBlock::PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg, rtl::OString const & aPrefix, - rtl::OString const & aContext, std::size_t nLine, rtl::OString const & aUniqueId ) -/*****************************************************************************/ -{ - ::PrintMessage( aType, aMsg, aPrefix, aContext, bPrintContext, nLine, aUniqueId ); -} - -/*****************************************************************************/ -void GSIBlock::PrintError( rtl::OString const & aMsg, rtl::OString const & aPrefix, - rtl::OString const & aContext, std::size_t nLine, rtl::OString const & aUniqueId ) -/*****************************************************************************/ -{ - PrintMessage( "Error:", aMsg, aPrefix, aContext, nLine, aUniqueId ); -} - -/*****************************************************************************/ -void GSIBlock::PrintList( ParserMessageList *pList, rtl::OString const & aPrefix, - GSILine *pLine ) -/*****************************************************************************/ -{ - for ( size_t i = 0 ; i < pList->size() ; i++ ) - { - ParserMessage *pMsg = (*pList)[ i ]; - rtl::OString aContext; - if ( bPrintContext ) - { - if ( pMsg->GetTagBegin() == -1 ) - aContext = pLine->GetText().copy( 0, 300 ); - else - aContext = helper::abbreviate( pLine->data_, pMsg->GetTagBegin()-150, 300 ); - aContext = aContext.trim(); - } - - PrintMessage( pMsg->Prefix(), pMsg->GetErrorText(), aPrefix, aContext, pLine->GetLineNumber(), pLine->GetUniqId() ); - } -} - -/*****************************************************************************/ -sal_Bool GSIBlock::IsUTF8( const rtl::OString &aTestee, sal_Bool bFixTags, sal_Int32 &nErrorPos, rtl::OString &aErrorMsg, sal_Bool &bHasBeenFixed, rtl::OString &aFixed ) const -/*****************************************************************************/ -{ - rtl::OUString aUTF8Tester( - rtl::OStringToOUString(aTestee, RTL_TEXTENCODING_UTF8)); - rtl::OString aTestee2( - rtl::OUStringToOString(aUTF8Tester, RTL_TEXTENCODING_UTF8)); - sal_Int32 i = 0; - while (i != std::min(aTestee.getLength(), aTestee2.getLength()) - && aTestee[i] == aTestee2[i]) - { - ++i; - } - if (i != aTestee.getLength() || i != aTestee2.getLength()) - { - aUTF8Tester = rtl::OUString(aTestee.getStr(), i, RTL_TEXTENCODING_UTF8); - nErrorPos = aUTF8Tester.getLength(); - aErrorMsg = "UTF8 Encoding seems to be broken"; - return sal_False; - } - - nErrorPos = helper::indexOfAnyAsciiL( - aUTF8Tester, - RTL_CONSTASCII_STRINGPARAM( - "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0b\x0c\x0e\x0f\x10\x11\x12" - "\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f")); - if (nErrorPos != -1) - { - aErrorMsg = "String contains illegal character"; - return sal_False; - } - - if ( bFixTags ) - { - bHasBeenFixed = sal_False; - aFixed = rtl::OString(); - } - - return sal_True; -} - -/*****************************************************************************/ -sal_Bool GSIBlock::TestUTF8( GSILine* pTestee, sal_Bool bFixTags ) -/*****************************************************************************/ -{ - sal_Int32 nErrorPos = 0; - rtl::OString aErrorMsg; - sal_Bool bError = sal_False; - rtl::OString aFixed; - sal_Bool bHasBeenFixed = sal_False; - if ( !IsUTF8( pTestee->GetText(), bFixTags, nErrorPos, aErrorMsg, bHasBeenFixed, aFixed ) ) - { - rtl::OString aContext(copyUpTo(pTestee->GetText(), nErrorPos, 20)); - PrintError(rtl::OStringBuffer(aErrorMsg).append(RTL_CONSTASCII_STRINGPARAM(" in Text at Position ")) - .append(nErrorPos).getStr(), - "Text format", aContext, pTestee->GetLineNumber(), pTestee->GetUniqId()); - bError = sal_True; - if ( bHasBeenFixed ) - { - pTestee->SetText( aFixed ); - pTestee->SetFixed(); - } - } - if ( !IsUTF8( pTestee->GetQuickHelpText(), bFixTags, nErrorPos, aErrorMsg, bHasBeenFixed, aFixed ) ) - { - rtl::OString aContext( - copyUpTo(pTestee->GetQuickHelpText(), nErrorPos, 20)); - PrintError(rtl::OStringBuffer(aErrorMsg).append(RTL_CONSTASCII_STRINGPARAM(" in QuickHelpText at Position ")) - .append(nErrorPos).getStr(), - "Text format", aContext, pTestee->GetLineNumber(), pTestee->GetUniqId()); - bError = sal_True; - if ( bHasBeenFixed ) - { - pTestee->SetQuickHelpText( aFixed ); - pTestee->SetFixed(); - } - } - if ( !IsUTF8( pTestee->GetTitle(), bFixTags, nErrorPos, aErrorMsg, bHasBeenFixed, aFixed ) ) - { - rtl::OString aContext( pTestee->GetTitle().copy( nErrorPos, 20 ) ); - PrintError(rtl::OStringBuffer(aErrorMsg).append(RTL_CONSTASCII_STRINGPARAM(" in Title at Position ")) - .append(nErrorPos).getStr(), - "Text format", aContext, pTestee->GetLineNumber(), pTestee->GetUniqId()); - bError = sal_True; - if ( bHasBeenFixed ) - { - pTestee->SetTitle( aFixed ); - pTestee->SetFixed(); - } - } - if ( bError ) - pTestee->NotOK(); - return !bError; -} - - -/*****************************************************************************/ -sal_Bool GSIBlock::HasSuspiciousChars( GSILine* pTestee, GSILine* pSource ) -/*****************************************************************************/ -{ - sal_Int32 nPos = 0; - if ( !bAllowSuspicious && ( nPos = pTestee->GetText().indexOf("??")) != -1 ) - if ( pSource->GetText().indexOf("??") == -1 ) - { - rtl::OUString aUTF8Tester( - rtl::OStringToOUString( - pTestee->GetText().copy(0, nPos), RTL_TEXTENCODING_UTF8)); - sal_Int32 nErrorPos = aUTF8Tester.getLength(); - rtl::OString aContext( helper::abbreviate( pTestee->GetText(), nPos, 20 ) ); - PrintError(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Found double questionmark in translation only. Looks like an encoding problem at Position ")) - .append(nErrorPos).getStr(), - "Text format", aContext, pTestee->GetLineNumber(), pTestee->GetUniqId()); - pTestee->NotOK(); - return sal_True; - } - - return sal_False; -} - - -/*****************************************************************************/ -sal_Bool GSIBlock::CheckSyntax( std::size_t nLine, sal_Bool bRequireSourceLine, sal_Bool bFixTags ) -/*****************************************************************************/ -{ - static LingTest aTester; - sal_Bool bHasError = sal_False; - - if ( !pSourceLine ) - { - if ( bRequireSourceLine ) - { - PrintError( "No source language entry defined!", "File format", "", nLine ); - bHasBlockError = sal_True; - } - } - else - { - aTester.CheckReference( pSourceLine ); - if ( pSourceLine->HasMessages() ) - { - PrintList( pSourceLine->GetMessageList(), "ReferenceString", pSourceLine ); - pSourceLine->NotOK(); - bHasError = sal_True; - } - } - if ( bReference ) - { - if ( !pReferenceLine ) - { - GSILine *pSource; - if ( pSourceLine ) - pSource = pSourceLine; - else - pSource = maList.empty() ? NULL : maList[ 0 ]; // get some other line - if ( pSource ) - PrintError( "No reference line found. Entry is new in source file", "File format", "", pSource->GetLineNumber(), pSource->GetUniqId() ); - else - PrintError( "No reference line found. Entry is new in source file", "File format", "", nLine ); - bHasBlockError = sal_True; - } - else - { - if ( pSourceLine && pSourceLine->data_ != pReferenceLine->data_ ) - { - sal_Int32 nPos = pSourceLine->data_.indexOf( pReferenceLine->data_ ); - rtl::OStringBuffer aContext( pReferenceLine->data_.copy( nPos - 5, 15) ); - aContext.append( "\" --> \"" ).append( pSourceLine->data_.copy( nPos - 5, 15) ); - PrintError( "Source Language Entry has changed.", "File format", aContext.makeStringAndClear(), pSourceLine->GetLineNumber(), pSourceLine->GetUniqId() ); - pSourceLine->NotOK(); - bHasError = sal_True; - } - } - } - - if ( pSourceLine ) - bHasError |= !TestUTF8( pSourceLine, bFixTags ); - - for ( size_t i = 0, n = maList.size(); i < n; ++i ) - { - GSILine* pItem = maList[ i ]; - aTester.CheckTestee( pItem, pSourceLine != NULL, bFixTags ); - if ( pItem->HasMessages() || aTester.HasCompareWarnings() ) - { - if ( pItem->HasMessages() || aTester.GetCompareWarnings().HasErrors() ) - pItem->NotOK(); - bHasError = sal_True; - PrintList( pItem->GetMessageList(), "Translation", pItem ); - PrintList( &(aTester.GetCompareWarnings()), "Translation Tag Mismatch", pItem ); - } - bHasError |= !TestUTF8( pItem, bFixTags ); - if ( pSourceLine ) - bHasError |= HasSuspiciousChars( pItem, pSourceLine ); - } - - return bHasError || bHasBlockError; -} - -void GSIBlock::WriteError( LazyStream &aErrOut, sal_Bool bRequireSourceLine ) -{ - if ( pSourceLine && pSourceLine->IsOK() && bCheckSourceLang && !bHasBlockError ) - return; - - sal_Bool bHasError = sal_False; - sal_Bool bCopyAll = ( !pSourceLine && bRequireSourceLine ) || ( pSourceLine && !pSourceLine->IsOK() && !bCheckTranslationLang ) || bHasBlockError; - for ( size_t i = 0, n = maList.size(); i < n; ++i ) - { - GSILine* pItem = maList[ i ]; - if ( !pItem->IsOK() || bCopyAll ) - { - bHasError = sal_True; - aErrOut.LazyOpen(); - aErrOut << pItem->data_.getStr() << '\n'; - } - } - - if ( pSourceLine && ( bHasError || !pSourceLine->IsOK() ) && !( !bHasError && bCheckTranslationLang ) ) - { - aErrOut.LazyOpen(); - aErrOut << pSourceLine->data_.getStr() << '\n'; - } -} - -void GSIBlock::WriteCorrect( LazyStream &aOkOut, sal_Bool bRequireSourceLine ) -{ - if ( ( !pSourceLine && bRequireSourceLine ) || ( pSourceLine && !pSourceLine->IsOK() && !bCheckTranslationLang ) ) - return; - - sal_Bool bHasOK = sal_False; - for ( size_t i = 0, n = maList.size(); i < n; ++i ) - { - GSILine* pItem = maList[ i ]; - if ( ( pItem->IsOK() || bCheckSourceLang ) && !bHasBlockError ) - { - bHasOK = sal_True; - aOkOut.LazyOpen(); - aOkOut << pItem->data_.getStr() << '\n'; - } - } - - if ( ( pSourceLine && pSourceLine->IsOK() && ( !maList.empty() || !bCheckTranslationLang ) ) || ( bHasOK && bCheckTranslationLang ) ) - { - aOkOut.LazyOpen(); - aOkOut << pSourceLine->data_.getStr() << '\n'; - } -} - -void GSIBlock::WriteFixed( LazyStream &aFixOut ) -{ - if ( pSourceLine && !pSourceLine->IsFixed() && bCheckSourceLang ) - return; - - sal_Bool bHasFixes = sal_False; - for ( size_t i = 0, n = maList.size(); i < n; ++i ) - { - GSILine* pItem = maList[ i ]; - if ( pItem->IsFixed() ) - { - bHasFixes = sal_True; - aFixOut.LazyOpen(); - aFixOut << pItem->data_.getStr() << '\n'; - } - } - - if ( pSourceLine && ( bHasFixes || pSourceLine->IsFixed() ) ) - { - aFixOut.LazyOpen(); - aFixOut << pSourceLine->data_.getStr() << '\n'; - } -} - - -/*****************************************************************************/ -/*****************************************************************************/ -/*****************************************************************************/ -/*****************************************************************************/ -/*****************************************************************************/ -/*****************************************************************************/ -/*****************************************************************************/ - -/*****************************************************************************/ -void Help() -/*****************************************************************************/ -{ - fprintf( stdout, "\n" ); - fprintf( stdout, "gsicheck checks the syntax of tags in SDF-Files\n" ); - fprintf( stdout, " checks for inconsistencies and malicious UTF8 encoding\n" ); - fprintf( stdout, " checks tags in Online Help\n" ); - fprintf( stdout, " relax GID/LID length to %s\n", - rtl::OString::valueOf(static_cast(MAX_GID_LID_LEN)).getStr() ); - fprintf( stdout, "\n" ); - fprintf( stdout, "Syntax: gsicheck [ -c ] [-f] [ -we ] [ -wef ErrorFilename ] [ -wc ]\n" ); - fprintf( stdout, " [ -wcf CorrectFilename ] [ -s | -t ] [ -l LanguageID ]\n" ); - fprintf( stdout, " [ -r ReferenceFile ] filename\n" ); - fprintf( stdout, "\n" ); - fprintf( stdout, "-c Add context to error message (Print the line containing the error)\n" ); - fprintf( stdout, "-f try to fix errors. See also -wf -wff \n" ); - fprintf( stdout, "-wf Write File containing all fixed parts\n" ); - fprintf( stdout, "-wff Same as above but give own filename\n" ); - fprintf( stdout, "-we Write File containing all errors\n" ); - fprintf( stdout, "-wef Same as above but give own filename\n" ); - fprintf( stdout, "-wc Write File containing all correct parts\n" ); - fprintf( stdout, "-wcf Same as above but give own filename\n" ); - fprintf( stdout, "-s Check only source language. Should be used before handing out to vendor.\n" ); - fprintf( stdout, "-t Check only Translation language(s). Should be used before merging.\n" ); - fprintf( stdout, "-e disable encoding checks. E.g.: double questionmark \'??\' which may be the\n" ); - fprintf( stdout, " result of false conversions\n" ); - fprintf( stdout, "-l ISO language code of the source language.\n" ); - fprintf( stdout, " Default is en-US. Use \"\" (empty string) or 'none'\n" ); - fprintf( stdout, " to disable source language dependent checks\n" ); - fprintf( stdout, "-r Reference filename to check that source language entries\n" ); - fprintf( stdout, " have not been changed\n" ); - fprintf( stdout, "\n" ); -} - -SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { - sal_Bool bError = sal_False; - sal_Bool bPrintContext = sal_False; - sal_Bool bCheckSourceLang = sal_False; - sal_Bool bCheckTranslationLang = sal_False; - sal_Bool bWriteError = sal_False; - sal_Bool bWriteCorrect = sal_False; - sal_Bool bWriteFixed = sal_False; - sal_Bool bFixTags = sal_False; - sal_Bool bAllowSuspicious = sal_False; - rtl::OString aErrorFilename; - rtl::OString aCorrectFilename; - rtl::OString aFixedFilename; - sal_Bool bFileHasError = sal_False; - rtl::OString aSourceLang( "en-US" ); // English is default - rtl::OString aFilename; - rtl::OString aReferenceFilename; - sal_Bool bReferenceFile = sal_False; - for ( int i = 1 ; i < argc ; i++ ) - { - if ( *argv[ i ] == '-' ) - { - switch (*(argv[ i ]+1)) - { - case 'c':bPrintContext = sal_True; - break; - case 'w': - { - if ( (*(argv[ i ]+2)) == 'e' ) - { - if ( (*(argv[ i ]+3)) == 'f' ) - if ( (i+1) < argc ) - { - aErrorFilename = argv[i + 1]; - bWriteError = sal_True; - i++; - } - else - { - fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] ); - bError = sal_True; - } - else - bWriteError = sal_True; - } - else if ( (*(argv[ i ]+2)) == 'c' ) - if ( (*(argv[ i ]+3)) == 'f' ) - if ( (i+1) < argc ) - { - aCorrectFilename = argv[i + 1]; - bWriteCorrect = sal_True; - i++; - } - else - { - fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] ); - bError = sal_True; - } - else - bWriteCorrect = sal_True; - else if ( (*(argv[ i ]+2)) == 'f' ) - if ( (*(argv[ i ]+3)) == 'f' ) - if ( (i+1) < argc ) - { - aFixedFilename = argv[i + 1]; - bWriteFixed = sal_True; - bFixTags = sal_True; - i++; - } - else - { - fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] ); - bError = sal_True; - } - else - { - bWriteFixed = sal_True; - bFixTags = sal_True; - } - else - { - fprintf( stderr, "\nERROR: Unknown Switch %s!\n\n", argv[ i ] ); - bError = sal_True; - } - } - break; - case 's':bCheckSourceLang = sal_True; - break; - case 't':bCheckTranslationLang = sal_True; - break; - case 'l': - { - if ( (i+1) < argc ) - { - aSourceLang = argv[ i+1 ]; - if ( aSourceLang.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("none")) ) - aSourceLang = rtl::OString(); - i++; - } - else - { - fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] ); - bError = sal_True; - } - } - break; - case 'r': - { - if ( (i+1) < argc ) - { - aReferenceFilename = argv[ i+1 ]; - bReferenceFile = sal_True; - i++; - } - else - { - fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] ); - bError = sal_True; - } - } - break; - case 'f': - { - bFixTags = sal_True; - } - break; - case 'e': - { - bAllowSuspicious = sal_True; - } - break; - default: - fprintf( stderr, "\nERROR: Unknown Switch %s!\n\n", argv[ i ] ); - bError = sal_True; - } - } - else - { - if (aFilename.isEmpty()) - aFilename = argv[i]; - else - { - fprintf( stderr, "\nERROR: Only one filename may be specified!\n\n"); - bError = sal_True; - } - } - } - - - if (aFilename.isEmpty() || bError) - { - Help(); - exit ( 0 ); - } - - if ( !aSourceLang.isEmpty() && !LanguageOK( aSourceLang ) ) - { - fprintf( stderr, "\nERROR: The Language '%s' is invalid!\n\n", aSourceLang.getStr() ); - Help(); - exit ( 1 ); - } - - if ( bCheckSourceLang && bCheckTranslationLang ) - { - fprintf( stderr, "\nERROR: The Options -s and -t are mutually exclusive.\nUse only one of them.\n\n" ); - Help(); - exit ( 1 ); - } - - - - std::ifstream aGSI(aFilename.getStr()); - if (!aGSI.is_open()) { - fprintf( stderr, "\nERROR: Could not open GSI-File %s!\n\n", aFilename.getStr() ); - exit ( 3 ); - } - - std::ifstream aReferenceGSI; - if ( bReferenceFile ) - { - aReferenceGSI.open(aReferenceFilename.getStr()); - if (!aReferenceGSI.is_open()) { - fprintf( stderr, "\nERROR: Could not open Input-File %s!\n\n", aFilename.getStr() ); - exit ( 3 ); - } - } - - LazyStream aOkOut; - if ( bWriteCorrect ) - { - if (aCorrectFilename.isEmpty()) - { - aCorrectFilename = addSuffix( - aFilename, rtl::OString(RTL_CONSTASCII_STRINGPARAM("_ok"))); - } - aOkOut.SetFileName(aCorrectFilename); - } - - LazyStream aErrOut; - if ( bWriteError ) - { - if (aErrorFilename.isEmpty()) - { - aErrorFilename = addSuffix( - aFilename, rtl::OString(RTL_CONSTASCII_STRINGPARAM("_err"))); - } - aErrOut.SetFileName(aErrorFilename); - } - - LazyStream aFixOut; - if ( bWriteFixed ) - { - if (aFixedFilename.isEmpty()) - { - aFixedFilename = addSuffix( - aFilename, rtl::OString(RTL_CONSTASCII_STRINGPARAM("_fix"))); - } - aFixOut.SetFileName(aFixedFilename); - } - - - GSILine* pReferenceLine = NULL; - std::size_t nReferenceLine = 0; - - GSILine* pGSILine = NULL; - rtl::OString aOldId("No Valid ID"); // just set to something which can never be an ID - GSIBlock *pBlock = NULL; - std::size_t nLine = 0; - - while (!aGSI.eof()) - { - std::string s; - std::getline(aGSI, s); - nLine++; - pGSILine = new GSILine(rtl::OString(s.data(), s.length()), nLine ); - sal_Bool bDelete = sal_True; - - - if ( !pGSILine->data_.isEmpty() ) - { - if ( FORMAT_UNKNOWN == pGSILine->GetLineFormat() ) - { - PrintError( "Format of line is unknown. Ignoring!", "Line format", pGSILine->data_.copy( 0,40 ), bPrintContext, pGSILine->GetLineNumber() ); - pGSILine->NotOK(); - if ( bWriteError ) - { - bFileHasError = sal_True; - aErrOut.LazyOpen(); - aErrOut << pGSILine->data_.getStr(); - } - } - else if ( pGSILine->GetLineType().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("res-comment")) ) - { // ignore comment lines, but write them to Correct Items File - if ( bWriteCorrect ) - { - aOkOut.LazyOpen(); - aOkOut << pGSILine->data_.getStr() << '\n'; - } - } - else - { - rtl::OString aId = pGSILine->GetUniqId(); - if ( aId != aOldId ) - { - if ( pBlock ) - { - bFileHasError |= pBlock->CheckSyntax( nLine, !aSourceLang.isEmpty(), bFixTags ); - - if ( bWriteError ) - pBlock->WriteError( aErrOut, !aSourceLang.isEmpty() ); - if ( bWriteCorrect ) - pBlock->WriteCorrect( aOkOut, !aSourceLang.isEmpty() ); - if ( bWriteFixed ) - pBlock->WriteFixed( aFixOut ); - - delete pBlock; - } - pBlock = new GSIBlock( bPrintContext, bCheckSourceLang, bCheckTranslationLang, bReferenceFile, bAllowSuspicious ); - - aOldId = aId; - - - // find corresponding line in reference file - if ( bReferenceFile ) - { - sal_Bool bContinueSearching = sal_True; - while ( ( !aReferenceGSI.eof() || pReferenceLine ) && bContinueSearching ) - { - if ( !pReferenceLine ) - { - std::string s2; - std::getline(aReferenceGSI, s2); - nReferenceLine++; - pReferenceLine = new GSILine( - rtl::OString(s2.data(), s2.length()), - nReferenceLine); - } - if ( pReferenceLine->GetLineFormat() != FORMAT_UNKNOWN ) - { - if ( pReferenceLine->GetUniqId() == aId && pReferenceLine->GetLanguageId() == aSourceLang ) - { - pBlock->SetReferenceLine( pReferenceLine ); - pReferenceLine = NULL; - } - else if ( pReferenceLine->GetUniqId() > aId ) - { - bContinueSearching = sal_False; - } - else - { - if ( pReferenceLine->GetUniqId() < aId && pReferenceLine->GetLanguageId() == aSourceLang ) - PrintError( "No Entry in source file found. Entry has been removed from source file", "File format", "", bPrintContext, pGSILine->GetLineNumber(), pReferenceLine->GetUniqId() ); - delete pReferenceLine; - pReferenceLine = NULL; - } - } - else - { - delete pReferenceLine; - pReferenceLine = NULL; - } - - } - } - - } - - pBlock->InsertLine( pGSILine, aSourceLang ); - bDelete = sal_False; - } - } - if ( bDelete ) - delete pGSILine; - - } - if ( pBlock ) - { - bFileHasError |= pBlock->CheckSyntax( nLine, !aSourceLang.isEmpty(), bFixTags ); - - if ( bWriteError ) - pBlock->WriteError( aErrOut, !aSourceLang.isEmpty() ); - if ( bWriteCorrect ) - pBlock->WriteCorrect( aOkOut, !aSourceLang.isEmpty() ); - if ( bWriteFixed ) - pBlock->WriteFixed( aFixOut ); - - delete pBlock; - } - aGSI.close(); - - if ( bWriteError ) - aErrOut.close(); - if ( bWriteCorrect ) - aOkOut.close(); - if ( bWriteFixed ) - aFixOut.close(); - - if ( bFileHasError ) - return 55; - else - return 0; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx deleted file mode 100644 index ada1a36582f1..000000000000 --- a/l10ntools/source/tagtest.cxx +++ /dev/null @@ -1,1570 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "sal/config.h" - -#include "rtl/strbuf.hxx" -#include "rtl/string.hxx" -#include "rtl/ustrbuf.hxx" -#include "rtl/ustring.hxx" - -#include "tagtest.hxx" - -#if OSL_DEBUG_LEVEL > 1 -#include -#endif - -#include "gsicheck.hxx" -#include "helper.hxx" - -#define HAS_FLAG( nFlags, nFlag ) ( ( nFlags & nFlag ) != 0 ) -#define SET_FLAG( nFlags, nFlag ) ( nFlags |= nFlag ) -#define RESET_FLAG( nFlags, nFlag ) ( nFlags &= ~nFlag ) // ~ = Bitweises NOT - - - -TokenInfo::TokenInfo( TokenId pnId, sal_Int32 nP, rtl::OUString const & paStr, ParserMessageList &rErrorList ) -: bClosed(sal_False) -, bCloseTag(sal_False) -, bIsBroken(sal_False) -, bHasBeenFixed(sal_False) -, bDone(sal_False) -, aTokenString( paStr ) -, nId( pnId ) -, nPos(nP) -{ - if ( nId == TAG_COMMONSTART || nId == TAG_COMMONEND ) - SplitTag( rErrorList ); -} - -enum tagcheck { TC_START, TC_HAS_TAG_NAME, TC_HAS_PROP_NAME_EQ, TC_HAS_PROP_NAME_EQ_SP, TC_HAS_PROP_NAME_SP, TC_INSIDE_STRING, TC_PROP_FINISHED, TC_CLOSED, TC_CLOSED_SPACE, TC_CLOSETAG, TC_CLOSETAG_HAS_TAG_NAME, TC_FINISHED, TC_ERROR }; - -/* - \< link href = \"text\" name = \"C\" \> -START ' ' -> HAS_TAG_NAME -START '/' -> CLOSED -START '/' -> CLOSETAG - no Portion (starting with /) -START '>' -> FINISHED -HAS_TAG_NAME '=' -> HAS_PROP_NAME_EQ -HAS_TAG_NAME ' ' -> HAS_PROP_NAME_SP -HAS_TAG_NAME '/' -> CLOSED -HAS_TAG_NAME '>' -> FINISHED -HAS_PROP_NAME_SP '=' -> HAS_PROP_NAME_EQ -HAS_PROP_NAME_EQ ' ' -> HAS_PROP_NAME_EQ_SP -HAS_PROP_NAME_EQ '"' -> INSIDE_STRING -HAS_PROP_NAME_EQ_SP '"' -> INSIDE_STRING -INSIDE_STRING ' ' -> INSIDE_STRING -INSIDE_STRING '=' -> INSIDE_STRING -INSIDE_STRING '>' -> INSIDE_STRING -INSIDE_STRING '"' -> PROP_FINISHED -PROP_FINISHED ' ' -> HAS_TAG_NAME -PROP_FINISHED '/' -> CLOSED -PROP_FINISHED '>' -> FINISHED -CLOSED ' ' -> CLOSED_SPACE -CLOSED '>' -> FINISHED -CLOSED_SPACE '>' -> FINISHED - -CLOSETAG ' ' -> CLOSETAG_HAS_TAG_NAME -CLOSETAG '>' -> FINISHED -CLOSETAG_HAS_TAG_NAME '>' -> FINISHED - -*/ -void TokenInfo::SplitTag( ParserMessageList &rErrorList ) -{ - sal_Int32 nLastPos = 2; // skip initial \< - sal_Int32 nCheckPos = nLastPos; - static char const aDelims[] = " \\=>/"; - rtl::OUString aPortion; - rtl::OUString aValue; // store the value of a property - rtl::OString aName; // store the name of a property/tag - sal_Bool bCheckName = sal_False; - sal_Bool bCheckEmpty = sal_False; - sal_Unicode cDelim; - tagcheck aState = TC_START; - - // skip blanks - while ( nLastPos < aTokenString.getLength() && aTokenString[nLastPos] == ' ') - nLastPos++; - - nCheckPos = helper::indexOfAnyAsciiL( - aTokenString, RTL_CONSTASCII_STRINGPARAM(aDelims), nLastPos); - while ( nCheckPos != -1 && !( aState == TC_FINISHED || aState == TC_ERROR ) ) - { - aPortion = aTokenString.copy( nLastPos, nCheckPos-nLastPos ); - - if ( aTokenString[nCheckPos] == '\\' ) - nCheckPos++; - - cDelim = aTokenString[nCheckPos]; - nCheckPos++; - - switch ( aState ) - { -// START ' ' -> HAS_TAG_NAME -// START '/' -> CLOSED -// START '>' -> FINISHED - case TC_START: - aTagName = aPortion; - switch ( cDelim ) - { - case ' ': aState = TC_HAS_TAG_NAME; - bCheckName = sal_True; - break; - case '/': - { - if (aPortion.isEmpty()) - { - aState = TC_CLOSETAG; - } - else - { - aState = TC_CLOSED; - bCheckName = sal_True; - } - } - break; - case '>': aState = TC_FINISHED; - bCheckName = sal_True; - break; - default: aState = TC_ERROR; - } - break; - -// HAS_TAG_NAME '=' -> HAS_PROP_NAME_EQ -// HAS_TAG_NAME ' ' -> HAS_PROP_NAME_SP -// HAS_TAG_NAME '/' -> CLOSED -// HAS_TAG_NAME '>' -> FINISHED - case TC_HAS_TAG_NAME: - switch ( cDelim ) - { - case '=': aState = TC_HAS_PROP_NAME_EQ; - bCheckName = sal_True; - break; - case ' ': aState = TC_HAS_PROP_NAME_SP; - bCheckName = sal_True; - break; - case '/': aState = TC_CLOSED; - bCheckEmpty = sal_True; - break; - case '>': aState = TC_FINISHED; - bCheckEmpty = sal_True; - break; - default: aState = TC_ERROR; - } - break; - -// HAS_PROP_NAME_SP '=' -> HAS_PROP_NAME_EQ - case TC_HAS_PROP_NAME_SP: - switch ( cDelim ) - { - case '=': aState = TC_HAS_PROP_NAME_EQ; - bCheckEmpty = sal_True; - break; - default: aState = TC_ERROR; - } - break; - -// HAS_PROP_NAME_EQ ' ' -> HAS_PROP_NAME_EQ_SP -// HAS_PROP_NAME_EQ '"' -> INSIDE_STRING - case TC_HAS_PROP_NAME_EQ: - switch ( cDelim ) - { - case ' ': aState = TC_HAS_PROP_NAME_EQ_SP; - bCheckEmpty = sal_True; - break; - case '\"': aState = TC_INSIDE_STRING; - bCheckEmpty = sal_True; - aValue = rtl::OUString(); - break; - default: aState = TC_ERROR; - } - break; - -// HAS_PROP_NAME_EQ_SP '"' -> INSIDE_STRING - case TC_HAS_PROP_NAME_EQ_SP: - switch ( cDelim ) - { - case '\"': aState = TC_INSIDE_STRING; - bCheckEmpty = sal_True; - aValue = rtl::OUString(); - break; - default: aState = TC_ERROR; - } - break; - -// INSIDE_STRING * -> INSIDE_STRING -// INSIDE_STRING '"' -> PROP_FINISHED - case TC_INSIDE_STRING: - switch ( cDelim ) - { - case '\"': - { - aState = TC_PROP_FINISHED; - aValue += aPortion; - if ( aProperties.find( aName ) == aProperties.end() ) - { - if ( !IsPropertyValueValid( aName, aValue ) ) - { - rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(aName).append(RTL_CONSTASCII_STRINGPARAM("' has invalid value '")).append(rtl::OUStringToOString(aValue, RTL_TEXTENCODING_UTF8)).append("' ").makeStringAndClear(), *this ); - bIsBroken = sal_True; - } - aProperties[ aName ] = aValue; - } - else - { - rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(aName).append(RTL_CONSTASCII_STRINGPARAM("' defined twice ")).makeStringAndClear(), *this ); - bIsBroken = sal_True; - } - } - break; - default: - { - aState = TC_INSIDE_STRING; - aValue += aPortion; - aValue += rtl::OUString(cDelim); - } - } - break; - -// PROP_FINISHED ' ' -> HAS_TAG_NAME -// PROP_FINISHED '/' -> CLOSED -// PROP_FINISHED '>' -> FINISHED - case TC_PROP_FINISHED: - switch ( cDelim ) - { - case ' ': aState = TC_HAS_TAG_NAME; - bCheckEmpty = sal_True; - break; - case '/': aState = TC_CLOSED; - bCheckEmpty = sal_True; - break; - case '>': aState = TC_FINISHED; - bCheckEmpty = sal_True; - break; - default: aState = TC_ERROR; - } - break; - -// CLOSED ' ' -> CLOSED_SPACE -// CLOSED '>' -> FINISHED - case TC_CLOSED: - switch ( cDelim ) - { - case ' ': aState = TC_CLOSED_SPACE; - bCheckEmpty = sal_True; - bClosed = sal_True; - break; - case '>': aState = TC_FINISHED; - bCheckEmpty = sal_True; - break; - default: aState = TC_ERROR; - } - break; - -// CLOSED_SPACE '>' -> FINISHED - case TC_CLOSED_SPACE: - switch ( cDelim ) - { - case '>': aState = TC_FINISHED; - bCheckEmpty = sal_True; - break; - default: aState = TC_ERROR; - } - break; - -// CLOSETAG ' ' -> CLOSETAG_HAS_TAG_NAME -// CLOSETAG '>' -> FINISHED - case TC_CLOSETAG: - bCloseTag = sal_True; - switch ( cDelim ) - { - case ' ': aState = TC_CLOSETAG_HAS_TAG_NAME; - aTagName = aPortion; - bCheckName = sal_True; - break; - case '>': aState = TC_FINISHED; - aTagName = aPortion; - bCheckName = sal_True; - break; - default: aState = TC_ERROR; - } - break; - -// CLOSETAG_HAS_TAG_NAME '>' -> FINISHED - case TC_CLOSETAG_HAS_TAG_NAME: - switch ( cDelim ) - { - case '>': aState = TC_FINISHED; - bCheckEmpty = sal_True; - break; - default: aState = TC_ERROR; - } - break; - - - default: rErrorList.AddError( 99, "Internal error Parsing Tag ", *this ); - bIsBroken = sal_True; - - } - - if ( bCheckName ) - { - if (aPortion.isEmpty()) - { - rErrorList.AddError( 25, "Tag/Property name missing ", *this ); - bIsBroken = sal_True; - } - else - { - aName = rtl::OUStringToOString(aPortion, RTL_TEXTENCODING_UTF8); - // "a-zA-Z_-.0-9" - sal_Bool bBroken = sal_False; - const sal_Char* aBuf = aName.getStr(); - for (sal_Int32 nCount = 0 ; !bBroken && nCount < aName.getLength() ; ++nCount) - { - bBroken = ! ( ( aBuf[nCount] >= 'a' && aBuf[nCount] <= 'z' ) - ||( aBuf[nCount] >= 'A' && aBuf[nCount] <= 'Z' ) - ||( aBuf[nCount] >= '0' && aBuf[nCount] <= '9' ) - ||( aBuf[nCount] == '_' ) - ||( aBuf[nCount] == '-' ) - ||( aBuf[nCount] == '.' ) - ); - } - - if ( bBroken ) - { - rErrorList.AddError( 25, "Found illegal character in Tag/Property name ", *this ); - bIsBroken = sal_True; - } - } - - bCheckName = sal_False; - } - - if ( bCheckEmpty ) - { - if (!aPortion.isEmpty()) - { - rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Found displaced characters '")).append(rtl::OUStringToOString(aPortion, RTL_TEXTENCODING_UTF8)).append(RTL_CONSTASCII_STRINGPARAM("' in Tag ")).makeStringAndClear(), *this ); - bIsBroken = sal_True; - } - bCheckEmpty = sal_False; - } - - - nLastPos = nCheckPos; - - // skip further blanks - if ( cDelim == ' ' && aState != TC_INSIDE_STRING ) - while ( nLastPos < aTokenString.getLength() && aTokenString[nLastPos] == ' ') - nLastPos++; - - nCheckPos = helper::indexOfAnyAsciiL( - aTokenString, RTL_CONSTASCII_STRINGPARAM(aDelims), nLastPos); - } - if ( aState != TC_FINISHED ) - { - rErrorList.AddError( 25, "Parsing error in Tag ", *this ); - bIsBroken = sal_True; - } -} - -sal_Bool TokenInfo::IsPropertyRelevant( const rtl::OString &rName, const rtl::OUString &rValue ) const -{ - if ( aTagName == "alt" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("xml-lang")) ) - return sal_False; - if ( aTagName == "ahelp" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("visibility")) && rValue == "visible" ) - return sal_False; - if ( aTagName == "image" && (rName.equalsL(RTL_CONSTASCII_STRINGPARAM("width")) || rName.equalsL(RTL_CONSTASCII_STRINGPARAM("height"))) ) - return sal_False; - - return sal_True; -} - -sal_Bool TokenInfo::IsPropertyValueValid( const rtl::OString &rName, const rtl::OUString &rValue ) const -{ -/* removed due to i56740 - if ( aTagName.EqualsAscii( "switchinline" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("select")) ) - { - return rValue.EqualsAscii("sys") || - rValue.EqualsAscii("appl") || - rValue.EqualsAscii("distrib"); - } */ - if ( aTagName == "caseinline" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("select")) ) - { - return !rValue.isEmpty(); - } - - // we don't know any better so we assume it to be OK - return sal_True; -} - -sal_Bool TokenInfo::IsPropertyInvariant( const rtl::OString &rName, const rtl::OUString &rValue ) const -{ - if ( aTagName == "link" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("name")) ) - return sal_False; - if ( aTagName == "link" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("href")) ) - { // check for external reference - return - !(rValue.matchIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("http:")) - || rValue.matchIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("https:")) - || rValue.matchIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("ftp:"))); - } - return sal_True; -} - -sal_Bool TokenInfo::IsPropertyFixable( const rtl::OString &rName ) const -{ - // name everything that is allowed to be fixed automatically here - if ( (aTagName == "ahelp" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("hid"))) - || (aTagName == "link" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("href"))) - || (aTagName == "alt" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id"))) - || (aTagName == "variable" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id"))) - || (aTagName == "image" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("src"))) - || (aTagName == "image" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id")) )) - return sal_True; - return sal_False; -} - -sal_Bool TokenInfo::MatchesTranslation( TokenInfo& rInfo, sal_Bool bGenErrors, ParserMessageList &rErrorList, sal_Bool bFixTags ) const -{ - // check if tags are equal - // check if all existing properties are in the translation as well and - // whether they have a matching content (the same in most cases) - - if ( nId != rInfo.nId ) - return sal_False; - - if ( aTagName != rInfo.aTagName ) - return sal_False; - - // If one of the tags has formating errors already it does make no sense to check here, so return right away - if ( bGenErrors && ( bIsBroken || rInfo.bIsBroken ) ) - return sal_True; - - StringHashMap::const_iterator iProp; - for( iProp = aProperties.begin() ; iProp != aProperties.end(); ++iProp ) - { - if ( rInfo.aProperties.find( iProp->first ) != rInfo.aProperties.end() ) - { - if ( IsPropertyRelevant( iProp->first, iProp->second ) || IsPropertyRelevant( iProp->first, rInfo.aProperties.find( iProp->first )->second ) ) - { - if ( IsPropertyInvariant( iProp->first, iProp->second ) ) - { - if ( rInfo.aProperties.find( iProp->first )->second != iProp->second ) - { - if ( bGenErrors ) - { - if ( bFixTags && IsPropertyFixable( iProp->first ) ) - { - rInfo.aProperties.find( iProp->first )->second = iProp->second; - rInfo.SetHasBeenFixed(); - rErrorList.AddWarning( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(iProp->first).append(RTL_CONSTASCII_STRINGPARAM("': FIXED different value in Translation ")).makeStringAndClear(), *this ); - } - else - rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(iProp->first).append(RTL_CONSTASCII_STRINGPARAM("': value different in Translation ")).makeStringAndClear(), *this ); - } - else return sal_False; - } - } - } - } - else - { - if ( IsPropertyRelevant( iProp->first, iProp->second ) ) - { - if ( bGenErrors ) - rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(iProp->first).append(RTL_CONSTASCII_STRINGPARAM("' missing in Translation ")).makeStringAndClear(), *this ); - else return sal_False; - } - } - } - for( iProp = rInfo.aProperties.begin() ; iProp != rInfo.aProperties.end(); ++iProp ) - { - if ( aProperties.find( iProp->first ) == aProperties.end() ) - { - if ( IsPropertyRelevant( iProp->first, iProp->second ) ) - { - if ( bGenErrors ) - rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Extra Property '")).append(iProp->first).append(RTL_CONSTASCII_STRINGPARAM("' in Translation ")).makeStringAndClear(), rInfo ); - else return sal_False; - } - } - } - - // if we reach here eather - // the tags match completely or - // the tags match but not the properties and we generated errors for that - return sal_True; -} - -rtl::OUString TokenInfo::GetTagName() const -{ - return aTagName; -} - -rtl::OUString TokenInfo::MakeTag() const -{ - rtl::OUStringBuffer aRet; - aRet.appendAscii("\\<"); - if ( bCloseTag ) - aRet.appendAscii("/"); - aRet.append( GetTagName() ); - StringHashMap::const_iterator iProp; - - for( iProp = aProperties.begin() ; iProp != aProperties.end(); ++iProp ) - { - aRet.appendAscii(" "); - aRet.append( rtl::OStringToOUString( iProp->first, RTL_TEXTENCODING_UTF8 ) ); - aRet.appendAscii("=\\\""); - aRet.append( iProp->second ); - aRet.appendAscii("\\\""); - } - if ( bClosed ) - aRet.appendAscii("/"); - aRet.appendAscii("\\>"); - return aRet.makeStringAndClear(); -} - - -void ParserMessageList::AddError( sal_Int32 nErrorNr, const rtl::OString& rErrorText, const TokenInfo &rTag ) -{ - maList.push_back( new ParserError( nErrorNr, rErrorText, rTag ) ); -} - -void ParserMessageList::AddWarning( sal_Int32 nErrorNr, const rtl::OString& rErrorText, const TokenInfo &rTag ) -{ - maList.push_back( new ParserWarning( nErrorNr, rErrorText, rTag ) ); -} - -sal_Bool ParserMessageList::HasErrors() -{ - for ( size_t i = 0, n = maList.size(); i < n; ++i ) - if ( maList[ i ]->IsError() ) - return sal_True; - return sal_False; -} - -void ParserMessageList::clear() -{ - for ( size_t i = 0, n = maList.size(); i < n; ++i ) - delete maList[ i ]; - maList.clear(); -} - -struct Tag -{ - rtl::OUString GetName() const { return rtl::OUString::createFromAscii( pName ); }; - const char* pName; - TokenId nTag; -}; - - -static const Tag aKnownTags[] = -{ -/* commenting oldstyle tags -// { "<#GROUP_FORMAT>", TAG_GROUP_FORMAT }, - { "<#BOLD>", TAG_BOLDON }, - { "<#/BOLD>", TAG_BOLDOFF }, - { "<#ITALIC>", TAG_ITALICON }, - { "<#/ITALIC>", TAG_ITALICOFF }, - { "<#UNDER>", TAG_UNDERLINEON }, - { "<#/UNDER>", TAG_UNDERLINEOFF }, - -// { "<#GROUP_NOTALLOWED>", TAG_GROUP_NOTALLOWED }, - { "<#HELPID>", TAG_HELPID }, - { "<#MODIFY>", TAG_MODIFY }, - { "<#REFNR>", TAG_REFNR }, - -// { "<#GROUP_STRUCTURE>", TAG_GROUP_STRUCTURE }, - { "<#NAME>", TAG_NAME }, - { "<#HREF>", TAG_HREF }, - { "<#AVIS>", TAG_AVIS }, - { "<#AHID>", TAG_AHID }, - { "<#AEND>", TAG_AEND }, - - { "<#TITEL>", TAG_TITEL }, - { "<#KEY>", TAG_KEY }, - { "<#INDEX>", TAG_INDEX }, - - { "<#REFSTART>", TAG_REFSTART }, - - { "<#GRAPHIC>", TAG_GRAPHIC }, - { "<#NEXTVERSION>", TAG_NEXTVERSION }, - - // { "<#GROUP_SYSSWITCH>", TAG_GROUP_SYSSWITCH }, - { "<#WIN>", TAG_WIN }, - { "<#UNIX>", TAG_UNIX }, - { "<#MAC>", TAG_MAC }, - { "<#OS2>", TAG_OS2 }, - -// { "<#GROUP_PROGSWITCH>", TAG_GROUP_PROGSWITCH }, - { "<#WRITER>", TAG_WRITER }, - { "<#CALC>", TAG_CALC }, - { "<#DRAW>", TAG_DRAW }, - { "<#IMPRESS>", TAG_IMPRESS }, - { "<#SCHEDULE>", TAG_SCHEDULE }, - { "<#IMAGE>", TAG_IMAGE }, - { "<#MATH>", TAG_MATH }, - { "<#CHART>", TAG_CHART }, - { "<#OFFICE>", TAG_OFFICE }, - */ -// { "<#TAG_GROUP_META>", TAG_GROUP_META }, - { "$[officefullname]", TAG_OFFICEFULLNAME }, - { "$[officename]", TAG_OFFICENAME }, - { "$[officepath]", TAG_OFFICEPATH }, - { "$[officeversion]", TAG_OFFICEVERSION }, - { "$[portalname]", TAG_PORTALNAME }, - { "$[portalfullname]", TAG_PORTALFULLNAME }, - { "$[portalpath]", TAG_PORTALPATH }, - { "$[portalversion]", TAG_PORTALVERSION }, - { "$[portalshortname]", TAG_PORTALSHORTNAME }, -/* commenting oldstyle tags -// { "<#TAG_GROUP_SINGLE>", TAG_GROUP_SINGLE }, - { "<#REFINSERT>", TAG_REFINSERT }, - -// { "<#GROUP_MULTI>", TAG_GROUP_MULTI }, - { "<#END>", TAG_END }, - { "<#ELSE>", TAG_ELSE }, - { "<#VERSIONEND>", TAG_VERSIONEND }, - { "<#ENDGRAPHIC>", TAG_ENDGRAPHIC },*/ - { "", TAG_COMMONSTART }, - { "", TAG_COMMONEND }, - - { "", TAG_NOMORETAGS }, - { "", TAG_UNKNOWN_TAG }, -}; - - -SimpleParser::SimpleParser() -: nPos( 0 ) -, aNextTag( TAG_NOMORETAGS, TOK_INVALIDPOS ) -{ -} - -void SimpleParser::Parse( rtl::OUString const & PaSource ) -{ - aSource = PaSource; - nPos = 0; - aLastToken = rtl::OUString(); - aNextTag = TokenInfo( TAG_NOMORETAGS, TOK_INVALIDPOS ); - aTokenList.clear(); -}; - -TokenInfo SimpleParser::GetNextToken( ParserMessageList &rErrorList ) -{ - TokenInfo aResult; - sal_Int32 nTokenStartPos = 0; - if ( aNextTag.nId != TAG_NOMORETAGS ) - { - aResult = aNextTag; - aNextTag = TokenInfo( TAG_NOMORETAGS, TOK_INVALIDPOS ); - } - else - { - aLastToken = GetNextTokenString( rErrorList, nTokenStartPos ); - if ( aLastToken.isEmpty() ) - return TokenInfo( TAG_NOMORETAGS, TOK_INVALIDPOS ); - - // do we have a \< ... \> style tag? - if (aLastToken.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("\\<"))) - { - // check for paired \" \" - bool bEven = true; - sal_Int32 nQuotePos = 0; - sal_Int32 nQuotedQuotesPos = - aLastToken.indexOfAsciiL(RTL_CONSTASCII_STRINGPARAM("\\\"")); - sal_Int32 nQuotedBackPos = aLastToken.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("\\\\")); - // this is only to kick out quoted backslashes - while (nQuotedQuotesPos != -1) - { - if ( nQuotedBackPos != -1 && nQuotedBackPos <= nQuotedQuotesPos ) - nQuotePos = nQuotedBackPos+2; - else - { - nQuotePos = nQuotedQuotesPos+2; - bEven = !bEven; - } - nQuotedQuotesPos = aLastToken.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("\\\""), nQuotePos); - nQuotedBackPos = aLastToken.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("\\\\"), nQuotePos); - // this is only to kick out quoted backslashes - } - if ( !bEven ) - { - rErrorList.AddError( 24, "Missing quotes ( \\\" ) in Tag", TokenInfo( TAG_UNKNOWN_TAG, nTokenStartPos, aLastToken ) ); - } - - // check if we have an end-tag or a start-tag - sal_Int32 nNonBlankStartPos = 2; - while (aLastToken[nNonBlankStartPos] == ' ') - nNonBlankStartPos++; - if (aLastToken[nNonBlankStartPos] == '/') - aResult = TokenInfo( TAG_COMMONEND, nTokenStartPos, aLastToken, rErrorList ); - else - { - aResult = TokenInfo( TAG_COMMONSTART, nTokenStartPos, aLastToken, rErrorList ); - sal_Int32 nNonBlankEndPos = aLastToken.getLength() - 3; - while (aLastToken[nNonBlankEndPos] == ' ') - nNonBlankEndPos--; - if (aLastToken[nNonBlankEndPos] == '/') - aNextTag = TokenInfo( TAG_COMMONEND, nTokenStartPos, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\")), rErrorList ); - } - } - else - { - sal_Int32 i = 0; - while ( aKnownTags[i].nTag != TAG_UNKNOWN_TAG && - aLastToken != aKnownTags[i].GetName() ) - i++; - aResult = TokenInfo( aKnownTags[i].nTag, nTokenStartPos ); - } - } - - if ( aResult.nId == TAG_UNKNOWN_TAG ) - aResult = TokenInfo( TAG_UNKNOWN_TAG, nTokenStartPos, aLastToken ); - aTokenList.insert( aResult ); - return aResult; -} - -rtl::OUString SimpleParser::GetNextTokenString( ParserMessageList &rErrorList, sal_Int32 &rTagStartPos ) -{ - sal_Int32 nStyle2StartPos = aSource.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("$["), nPos ); - sal_Int32 nStyle3StartPos = aSource.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("\\<"), nPos); - sal_Int32 nStyle4StartPos = aSource.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("\\\\"), nPos); - // this is only to kick out quoted backslashes - - rTagStartPos = 0; - - if (nStyle2StartPos == -1 && nStyle3StartPos == -1) - return rtl::OUString(); // no more tokens - - if ( nStyle4StartPos != -1 - && (nStyle2StartPos == -1 || nStyle4StartPos < nStyle2StartPos) - && (nStyle3StartPos == -1 || nStyle4StartPos < nStyle3StartPos ) ) - // to make sure \\ is always handled first - { // Skip quoted Backslash - nPos = nStyle4StartPos +2; - return GetNextTokenString( rErrorList, rTagStartPos ); - } - - if ( nStyle2StartPos != -1 && ( nStyle3StartPos == -1 || nStyle2StartPos < nStyle3StartPos ) ) - { // test for $[ ... ] style tokens - sal_Int32 nEndPos = aSource.indexOf(']', nStyle2StartPos); - if (nEndPos == -1) - { // Token is incomplete. Skip start and search for better ones - nPos = nStyle2StartPos +2; - return GetNextTokenString( rErrorList, rTagStartPos ); - } - nPos = nEndPos; - rTagStartPos = nStyle2StartPos; - return aSource.copy(nStyle2StartPos, nEndPos - nStyle2StartPos + 1); - } - else - { // test for \< ... \> style tokens - sal_Int32 nEndPos = aSource.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("\\>"), nStyle3StartPos); - sal_Int32 nQuotedBackPos = aSource.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("\\\\"), nStyle3StartPos); - // this is only to kick out quoted backslashes - while (nQuotedBackPos <= nEndPos && nQuotedBackPos != -1) - { - nEndPos = aSource.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("\\>"), nQuotedBackPos + 2); - nQuotedBackPos = aSource.indexOfAsciiL( - RTL_CONSTASCII_STRINGPARAM("\\\\"), nQuotedBackPos + 2); - // this is only to kick out quoted backslashes - } - if (nEndPos == -1) - { // Token is incomplete. Skip start and search for better ones - nPos = nStyle3StartPos +2; - rErrorList.AddError( 24, "Tag Start '\\<' without Tag End '\\>'", TokenInfo( TAG_UNKNOWN_TAG, nStyle3StartPos, helper::abbreviate(aSource, nStyle3StartPos - 10, 20) ) ); - return GetNextTokenString( rErrorList, rTagStartPos ); - } - // check for paired quoted " --> \"sometext\" - - nPos = nEndPos; - rTagStartPos = nStyle3StartPos; - return aSource.copy(nStyle3StartPos, nEndPos-nStyle3StartPos + 2); - } -} - -rtl::OUString SimpleParser::GetLexem( TokenInfo const &aToken ) -{ - if ( !aToken.aTokenString.isEmpty() ) - return aToken.aTokenString; - else - { - sal_Int32 i = 0; - while ( aKnownTags[i].nTag != TAG_UNKNOWN_TAG && - aKnownTags[i].nTag != aToken.nId ) - i++; - - return aKnownTags[i].GetName(); - } -} - -TokenParser::TokenParser() -: pErrorList( NULL ) -{} - -void TokenParser::Parse( const rtl::OUString &aCode, ParserMessageList* pList ) -{ - pErrorList = pList; - - //Scanner initialisieren - aParser.Parse( aCode ); - - //erstes Symbol holen - aTag = aParser.GetNextToken( *pErrorList ); - - nPfCaseOptions = 0; - nAppCaseOptions = 0; - bPfCaseActive = sal_False; - bAppCaseActive = sal_False; - - nActiveRefTypes = 0; - - //Ausfuehren der Start-Produktion - Paragraph(); - - //Es wurde nicht die ganze Kette abgearbeitet, bisher ist aber - //kein Fehler aufgetreten - //=> es wurde ein einleitendes Tag vergessen - if ( aTag.nId != TAG_NOMORETAGS ) - { - switch ( aTag.nId ) - { - case TAG_END: - { - ParseError( 3, "Extra Tag <#END>. Switch or <#HREF> expected.", aTag ); - } - break; - case TAG_BOLDOFF: - { - ParseError( 4, "<#BOLD> expected before <#/BOLD>.", aTag ); - } - break; - case TAG_ITALICOFF: - { - ParseError( 5, "<#ITALIC> expected before <#/ITALIC>.", aTag ); - } - break; - case TAG_UNDERLINEOFF: - { - ParseError( 17, "<#UNDER> expected before <#/UNDER>.", aTag ); - } - break; - case TAG_AEND: - { - ParseError( 5, "Extra Tag <#AEND>. <#AVIS> or <#AHID> expected.", aTag ); - } - break; - case TAG_ELSE: - { - ParseError( 16, "Application-tag or platform-tag expected before <#ELSE>.", aTag ); - } - break; - case TAG_UNKNOWN_TAG: - { - ParseError( 6, "unknown Tag", aTag ); - } - break; - default: - { - ParseError( 6, "unexpected Tag", aTag ); - } - } - } - pErrorList = NULL; -} - -void TokenParser::Paragraph() -{ - switch ( aTag.nId ) - { - case TAG_GRAPHIC: - case TAG_NEXTVERSION: - { - TagRef(); - Paragraph(); - } - break; - case TAG_AVIS: - case TAG_AHID: - { - TagRef(); - Paragraph(); - } - break; - case TAG_HELPID: - { - SimpleTag(); - Paragraph(); - } - break; - case TAG_OFFICEFULLNAME: - case TAG_OFFICENAME: - case TAG_OFFICEPATH: - case TAG_OFFICEVERSION: - case TAG_PORTALNAME: - case TAG_PORTALFULLNAME: - case TAG_PORTALPATH: - case TAG_PORTALVERSION: - case TAG_PORTALSHORTNAME: - { - SimpleTag(); - Paragraph(); - } - break; - case TAG_REFINSERT: - { - SimpleTag(); - Paragraph(); - } - break; - case TAG_BOLDON: - case TAG_ITALICON: - case TAG_UNDERLINEON: - case TAG_COMMONSTART: - { - TagPair(); - Paragraph(); - } - break; - case TAG_HREF: - case TAG_NAME: - case TAG_KEY: - case TAG_INDEX: - case TAG_TITEL: - case TAG_REFSTART: - { - TagRef(); - Paragraph(); - } - break; - case TAG_WIN: - case TAG_UNIX: - case TAG_MAC: //... - { - if ( ! bPfCaseActive ) - { - //PfCases duerfen nicht verschachtelt sein: - bPfCaseActive = sal_True; - PfCase(); - - //So jetzt kann wieder ein PfCase kommen: - bPfCaseActive = sal_False; - Paragraph(); - } - } - break; - case TAG_WRITER: - case TAG_CALC: - case TAG_DRAW: - case TAG_IMPRESS: - case TAG_SCHEDULE: - case TAG_IMAGE: - case TAG_MATH: - case TAG_CHART: - case TAG_OFFICE: - { - if ( !bAppCaseActive ) - { - //AppCases duerfen nicht verschachtelt sein: - bAppCaseActive = sal_True; - AppCase(); - - //jetzt koennen wieder AppCases kommen: - bAppCaseActive = sal_False; - Paragraph(); - } - } - break; - - //Case TAG_BOLDOFF, TAG_ITALICOFF, TAG_BUNDERLINE, TAG_END - //nichts tun wg. epsilon-Prod. - } -} - -void TokenParser::PfCase() -{ - - //Produktion: - //PfCase -> PfCaseBegin Paragraph (PfCase | PfCaseEnd) - - PfCaseBegin(); - - //Jetzt ist eine PfCase-Produktion aktiv: - Paragraph(); - switch ( aTag.nId ) - { - case TAG_ELSE: - case TAG_END: - { - CaseEnd(); - } - break; - case TAG_WIN: - case TAG_UNIX: - case TAG_MAC: //First (PfBegin) - { - PfCase(); - } - break; - default: - ParseError( 8, "<#ELSE> or <#END> or platform-tag expected.", aTag ); - } - //Die gemerkten Tags wieder loeschen fuer naechstes PfCase: - nPfCaseOptions = 0; -} - -void TokenParser::PfCaseBegin() -{ - switch ( aTag.nId ) - { - case TAG_WIN: - case TAG_UNIX: - case TAG_MAC: - { - //Token darf noch nicht vorgekommen sein im - //aktuellen Plattform-Case: - if ( !HAS_FLAG( nPfCaseOptions, TAG_NOGROUP( aTag.nId ) ) ) - { - SET_FLAG( nPfCaseOptions, TAG_NOGROUP( aTag.nId ) ); - match( aTag, aTag ); - } - else { - ParseError( 9, "Tag defined twice in the same platform-case", aTag ); - } - } - } -} - -void TokenParser::AppCase() -{ - - //Produktion: - //AppCase -> AppCaseBegin Paragraph (AppCase | AppCaseEnd) - - - AppCaseBegin(); - - Paragraph(); - - switch ( aTag.nId ) - { - case TAG_ELSE: - case TAG_END: - { - CaseEnd(); - } - break; - case TAG_WRITER: - case TAG_DRAW: - case TAG_CALC: - case TAG_IMAGE: - case TAG_MATH: - case TAG_CHART: - case TAG_OFFICE: - case TAG_IMPRESS: - case TAG_SCHEDULE: //First (AppBegin) - { - AppCase(); - } - break; - default: - ParseError( 1, "<#ELSE> or <#END> or application-case-tag expected.", aTag ); - } - - //Die gemerkten Tags wieder loeschen fuer naechstes AppCase: - nAppCaseOptions = 0; -} - -void TokenParser::AppCaseBegin() -{ - switch ( aTag.nId ) - { - case TAG_WRITER: - case TAG_DRAW: - case TAG_CALC: - case TAG_IMAGE: - case TAG_MATH: - case TAG_CHART: - case TAG_OFFICE: - case TAG_IMPRESS: - case TAG_SCHEDULE: - { - //Token darf noch nicht vorgekommen sein im - //aktuellen Plattform-Case: - if ( !HAS_FLAG( nAppCaseOptions, TAG_NOGROUP( aTag.nId ) ) ) - { - SET_FLAG( nAppCaseOptions, TAG_NOGROUP( aTag.nId ) ); - match( aTag, aTag ); - } - else { - ParseError( 13, "Tag defined twice in the same application-case.", aTag ); - } - } - } -} - -void TokenParser::CaseEnd() -{ - //Produktion: - //CaseEnd -> <#ELSE> Paragraph <#END> | <#END> - - switch ( aTag.nId ) - { - case TAG_ELSE: - { - match( aTag, TAG_ELSE ); - Paragraph(); - match( aTag, TAG_END ); - } - break; - case TAG_END: - { - match( aTag, TAG_END ); - } - break; - default: - ParseError( 2, "<#ELSE> or <#END> expected.", aTag ); - } -} - -void TokenParser::SimpleTag() -{ - - switch ( aTag.nId ) - { - case TAG_HELPID: - { - match( aTag, TAG_HELPID ); - } - break; - case TAG_OFFICEFULLNAME: - case TAG_OFFICENAME: - case TAG_OFFICEPATH: - case TAG_OFFICEVERSION: - case TAG_PORTALNAME: - case TAG_PORTALFULLNAME: - case TAG_PORTALPATH: - case TAG_PORTALVERSION: - case TAG_PORTALSHORTNAME: - - case TAG_REFINSERT: - { - match( aTag, aTag ); - } - break; - default: - ParseError( 15, "[<#SimpleTag>] expected.", aTag ); - } -} - -void TokenParser::TagPair() -{ - switch ( aTag.nId ) - { - case TAG_BOLDON: - { - match( aTag, TAG_BOLDON ); - Paragraph(); - match( aTag, TAG_BOLDOFF ); - } - break; - case TAG_ITALICON: - { - match( aTag, TAG_ITALICON ); - Paragraph(); - match( aTag, TAG_ITALICOFF ); - } - break; - case TAG_UNDERLINEON: - { - match( aTag, TAG_UNDERLINEON ); - Paragraph(); - match( aTag, TAG_UNDERLINEOFF ); - } - break; - case TAG_COMMONSTART: - { - //remember tag so we can give the original tag in case of an error - TokenInfo aEndTag( aTag ); - aEndTag.nId = TAG_COMMONEND; - match( aTag, TAG_COMMONSTART ); - Paragraph(); - match( aTag, aEndTag ); - } - break; - default: - ParseError( 10, "<#BOLD>, <#ITALIC>, <#UNDER> expected.", aTag ); - } -} - - -void TokenParser::TagRef() -{ - switch ( aTag.nId ) - { - case TAG_GRAPHIC: - case TAG_NEXTVERSION: - { - if ( !HAS_FLAG( nActiveRefTypes, TAG_NOGROUP( aTag.nId ) ) ) - { - TokenId aThisToken = aTag.nId; - SET_FLAG( nActiveRefTypes, TAG_NOGROUP( aThisToken ) ); - match( aTag, aTag ); - Paragraph(); - if ( aThisToken == TAG_GRAPHIC ) - match( aTag, TAG_ENDGRAPHIC ); - else - match( aTag, TAG_VERSIONEND ); - // don't reset since alowed only once per paragraph - // RESET_FLAG( nActiveRefTypes, TAG_NOGROUP( aThisToken ) ); - } - else - { - ParseError( 11, "Tags <#GRAPHIC>,<#NEXTVERSION> allowed only once per paragraph at", aTag ); - } - } - break; - case TAG_AVIS: - case TAG_AHID: - { - if ( !HAS_FLAG( nActiveRefTypes, TAG_NOGROUP( aTag.nId ) ) ) - { - TokenId aThisToken = aTag.nId; - SET_FLAG( nActiveRefTypes, TAG_NOGROUP( aThisToken ) ); - match( aTag, aTag ); - Paragraph(); - match( aTag, TAG_AEND ); - RESET_FLAG( nActiveRefTypes, TAG_NOGROUP( aThisToken ) ); - } - else - { - ParseError( 11, "Nested <#AHID>,<#AVIS> not allowed.", aTag ); - } - } - break; - case TAG_HREF: - case TAG_NAME: - { - - } - // NOBREAK - case TAG_KEY: - case TAG_INDEX: - case TAG_TITEL: - case TAG_REFSTART: - { - if ( !HAS_FLAG( nActiveRefTypes, TAG_NOGROUP( aTag.nId ) ) ) - { - TokenId aThisToken = aTag.nId; - match( aTag, aTag ); - if ( aThisToken != TAG_NAME ) - { // TAG_NAME has no TAG_END - SET_FLAG( nActiveRefTypes, TAG_NOGROUP( aThisToken ) ); - Paragraph(); - match( aTag, TAG_END ); - RESET_FLAG( nActiveRefTypes, TAG_NOGROUP( aThisToken ) ); - } - } - else - { - ParseError( 11, "Nested <#HREF>,<#NAME> or <#KEY> not allowed.", aTag ); - } - } - break; - default: - ParseError( 12, "<#HREF>,<#NAME> or <#KEY> expected.", aTag ); - } -} - -sal_Bool TokenParser::match( const TokenInfo &aCurrentToken, const TokenId &aExpectedToken ) -{ - return match( aCurrentToken, TokenInfo( aExpectedToken, TOK_INVALIDPOS ) ); -} - -sal_Bool TokenParser::match( const TokenInfo &aCurrentToken, const TokenInfo &rExpectedToken ) -{ - TokenInfo aExpectedToken( rExpectedToken ); - if ( aCurrentToken.nId == aExpectedToken.nId ) - { - if ( ( aCurrentToken.nId == TAG_COMMONEND - && aCurrentToken.GetTagName() == aExpectedToken.GetTagName() ) - || aCurrentToken.nId != TAG_COMMONEND ) - { - aTag = aParser.GetNextToken( *pErrorList ); - return sal_True; - } - } - - if ( aExpectedToken.nId == TAG_COMMONEND ) - { - aExpectedToken.aTokenString = - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Close tag for ")) - + aExpectedToken.aTokenString; - } - - rtl::OString sTmp(RTL_CONSTASCII_STRINGPARAM("Expected Symbol")); - if ( aCurrentToken.nId == TAG_NOMORETAGS ) - { - ParseError( 7, sTmp, aExpectedToken ); - } - else - { - rtl::OStringBuffer aBuf(sTmp); - aBuf.append(": "). - append(rtl::OUStringToOString(aParser.GetLexem( aExpectedToken ), RTL_TEXTENCODING_UTF8)). - append(RTL_CONSTASCII_STRINGPARAM(" near ")); - ParseError( 7, aBuf.makeStringAndClear(), aCurrentToken ); - } - return sal_False; -} - -void TokenParser::ParseError( sal_Int32 nErrNr, const rtl::OString &rErrMsg, const TokenInfo &rTag ) -{ - pErrorList->AddError( nErrNr, rErrMsg, rTag); - - // Das Fehlerhafte Tag ueberspringen - aTag = aParser.GetNextToken( *pErrorList ); -} - - -ParserMessage::ParserMessage( sal_Int32 PnErrorNr, const rtl::OString &rPaErrorText, const TokenInfo &rTag ) - : nErrorNr( PnErrorNr ) - , nTagBegin( 0 ) - , nTagLength( 0 ) -{ - rtl::OUString aLexem( SimpleParser::GetLexem( rTag ) ); - rtl::OStringBuffer aErrorBuffer(rPaErrorText); - aErrorBuffer.append(RTL_CONSTASCII_STRINGPARAM(": ")); - aErrorBuffer.append(rtl::OUStringToOString(aLexem, RTL_TEXTENCODING_UTF8)); - if ( rTag.nId == TAG_NOMORETAGS ) - aErrorBuffer.append(RTL_CONSTASCII_STRINGPARAM(" at end of line ")); - else if ( rTag.nPos != TOK_INVALIDPOS ) - { - aErrorBuffer.append(RTL_CONSTASCII_STRINGPARAM(" at Position ")); - aErrorBuffer.append(static_cast(rTag.nPos)); - } - aErrorText = aErrorBuffer.makeStringAndClear(); - nTagBegin = rTag.nPos; - nTagLength = aLexem.getLength(); -} - -ParserError::ParserError( sal_Int32 ErrorNr, const rtl::OString &rErrorText, const TokenInfo &rTag ) -: ParserMessage( ErrorNr, rErrorText, rTag ) -{} - -ParserWarning::ParserWarning( sal_Int32 ErrorNr, const rtl::OString &rErrorText, const TokenInfo &rTag ) -: ParserMessage( ErrorNr, rErrorText, rTag ) -{} - -sal_Bool LingTest::IsTagMandatory( TokenInfo const &aToken, TokenId &aMetaTokens ) -{ - TokenId aTokenId = aToken.nId; - TokenId aTokenGroup = TAG_GROUP( aTokenId ); - if ( TAG_GROUP_PROGSWITCH == aTokenGroup - || TAG_REFINSERT == aTokenId - || TAG_REFSTART == aTokenId - || TAG_NAME == aTokenId - || TAG_HREF == aTokenId - || TAG_AVIS == aTokenId - || TAG_AHID == aTokenId - || TAG_GRAPHIC == aTokenId - || TAG_NEXTVERSION == aTokenId - || ( TAG_GROUP_META == aTokenGroup && (aMetaTokens & aTokenId) == aTokenId ) ) - { - if ( TAG_GROUP_META == aTokenGroup ) - aMetaTokens |= aTokenId; - return sal_True; - } - else if ( TAG_COMMONSTART == aTokenId - || TAG_COMMONEND == aTokenId ) - { - rtl::OUString aTagName = aToken.GetTagName(); - return !(aTagName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("comment")) - || aTagName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("bookmark_value")) - || aTagName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("emph")) - || aTagName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("item")) - || aTagName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("br")) ); - } - return sal_False; -} - -void LingTest::CheckTags( TokenList &aReference, TokenList &aTestee, sal_Bool bFixTags ) -{ - size_t i=0,j=0; - // Clean old Warnings - aCompareWarningList.clear(); - - /* in xml tags, do not require the following tags - comment - bookmark_value - emph - item - br - */ - - // filter uninteresting Tags - TokenId aMetaTokens = 0; - for ( i=0 ; i < aReference.size() ; i++ ) - { - if ( !IsTagMandatory( aReference[ i ], aMetaTokens ) ) - aReference[ i ].SetDone(); - } - - aMetaTokens = 0; - for ( i=0 ; i < aTestee.size() ; i++ ) - { - if ( !IsTagMandatory( aTestee[ i ], aMetaTokens ) ) - aTestee[ i ].SetDone(); - } - - // remove all matching tags - for ( i=0 ; i < aReference.size() ; i++ ) - { - if ( aReference[ i ].IsDone() ) - continue; - - sal_Bool bTagFound = sal_False; - for ( j=0 ; j < aTestee.size() && !bTagFound ; j++ ) - { - if ( aTestee[ j ].IsDone() ) - continue; - - if ( aReference[ i ].MatchesTranslation( aTestee[ j ], sal_False, aCompareWarningList ) ) - { - aReference[ i ].SetDone(); - aTestee[ j ].SetDone(); - bTagFound = sal_True; - } - } - } - - sal_Bool bCanFix = sal_True; - - if ( bFixTags ) - { - // we fix only if its a really simple case - sal_Int32 nTagCount = 0; - for ( i=0 ; i < aReference.size() ; i++ ) - if ( !aReference[ i ].IsDone() ) - nTagCount++; - if ( nTagCount > 1 ) - bCanFix = sal_False; - - nTagCount = 0; - for ( i=0 ; i < aTestee.size() ; i++ ) - if ( !aTestee[ i ].IsDone() ) - nTagCount++; - if ( nTagCount > 1 ) - bCanFix = sal_False; - } - - // generate errors for tags that have differing attributes - for ( i=0 ; i < aReference.size() ; i++ ) - { - if ( aReference[ i ].IsDone() ) - continue; - - sal_Bool bTagFound = sal_False; - for ( j=0 ; j < aTestee.size() && !bTagFound ; j++ ) - { - if ( aTestee[ j ].IsDone() ) - continue; - - if ( aReference[ i ].MatchesTranslation( aTestee[ j ], sal_True, aCompareWarningList, bCanFix && bFixTags ) ) - { - aReference[ i ].SetDone(); - aTestee[ j ].SetDone(); - bTagFound = sal_True; - } - } - } - - // list remaining tags as errors - for ( i=0 ; i < aReference.size() ; i++ ) - { - if ( aReference[ i ].IsDone() ) - continue; - - aCompareWarningList.AddError( 20, "Missing Tag in Translation", aReference[ i ] ); - } - for ( i=0 ; i < aTestee.size() ; i++ ) - { - if ( aTestee[ i ].IsDone() ) - continue; - - aCompareWarningList.AddError( 21, "Extra Tag in Translation", aTestee[ i ] ); - } - - for ( i=0 ; i < aReference.size() ; i++ ) - aReference[ i ].SetDone( sal_False ); - - for ( i=0 ; i < aTestee.size() ; i++ ) - aTestee[ i ].SetDone( sal_False ); -} - -void LingTest::CheckReference( GSILine *aReference ) -{ - aReferenceParser.Parse( aReference->GetUText(), aReference->GetMessageList() ); -} - -void LingTest::CheckTestee( GSILine *aTestee, sal_Bool bHasSourceLine, sal_Bool bFixTags ) -{ - aFixedTestee = aTestee->GetUText(); - aTesteeParser.Parse( aFixedTestee, aTestee->GetMessageList() ); - - if ( bHasSourceLine ) - CheckTags( aReferenceParser.GetTokenList(), aTesteeParser.GetTokenList(), bFixTags ); - - if ( bFixTags ) - { - TokenList& aTesteeTokens = aTesteeParser.GetTokenList(); - sal_Bool bFixesDone = sal_False; - // count backwards to allow replacing from right to left - int i; - for ( i = aTesteeTokens.size() ; i > 0 ; ) - { - if ( aTesteeTokens[ --i ].HasBeenFixed() ) - { - bFixesDone = sal_True; - aFixedTestee = aFixedTestee.replaceAt( aTesteeTokens[ i ].nPos, aTesteeTokens[ i ].aTokenString.getLength(), aTesteeTokens[ i ].MakeTag() ); - } - } - if ( bFixesDone ) - { - aTestee->SetUText( aFixedTestee ); - aTestee->SetFixed(); - } - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 6cfa7552eebf69daab1ed3acc2a9954d52f00aad Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 13 Nov 2012 21:55:18 +0100 Subject: fix XML tag check in help and readme translations Change-Id: I88a3ad382df41da96fcab38c3c06d5871228e082 --- l10ntools/source/helper.hxx | 46 ++++++++++++++++++++++++++++++++++++++++++ l10ntools/source/helpmerge.cxx | 2 +- l10ntools/source/xrmmerge.cxx | 4 ++-- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/l10ntools/source/helper.hxx b/l10ntools/source/helper.hxx index 1e28aa6c4d50..1d268dd1c0f7 100644 --- a/l10ntools/source/helper.hxx +++ b/l10ntools/source/helper.hxx @@ -39,6 +39,7 @@ #include "rtl/string.hxx" #include "rtl/ustring.hxx" +#include "rtl/strbuf.hxx" #include "sal/types.h" namespace helper { @@ -102,6 +103,50 @@ inline sal_Int32 indexOfAnyAsciiL( return -1; } +rtl::OString QuotHTML(const rtl::OString &rString) +{ + rtl::OStringBuffer sReturn; + for (sal_Int32 i = 0; i < rString.getLength(); ++i) { + switch (rString[i]) { + case '\\': + if (i < rString.getLength()) { + switch (rString[i + 1]) { + case '"': + case '<': + case '>': + case '\\': + ++i; + break; + } + } + // fall through + default: + sReturn.append(rString[i]); + break; + + case '<': + sReturn.append("<"); + break; + + case '>': + sReturn.append(">"); + break; + + case '"': + sReturn.append("""); + break; + + case '&': + if (rString.matchL(RTL_CONSTASCII_STRINGPARAM("&"), i)) + sReturn.append('&'); + else + sReturn.append(RTL_CONSTASCII_STRINGPARAM("&")); + break; + } + } + return sReturn.makeStringAndClear(); +} + inline bool isWellFormedXML( OString const & text ) { xmlDocPtr doc; @@ -120,6 +165,7 @@ inline bool isWellFormedXML( OString const & text ) return result; } + template< typename T > inline T abbreviate( T const & text, sal_Int32 start, sal_Int32 length) { diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index aab255f75a05..8764935ced2c 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -380,7 +380,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , nPreSpaces++; pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur , true ); OUString sNewdata; - if (helper::isWellFormedXML(sNewText)) + if (helper::isWellFormedXML(helper::QuotHTML(sNewText))) { sNewdata = sSourceText.copy(0,nPreSpaces) + rtl::OStringToOUString(sNewText, RTL_TEXTENCODING_UTF8); diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index b4868f5f8623..5b562ea7f627 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -609,7 +609,6 @@ void XRMResMerge::WorkOnText( sContent, STRING_TYP_TEXT, sLang )) && ( sContent != "-" ) && !sContent.isEmpty() && helper::isWellFormedXML( sContent )) - { rText = sContent; ConvertStringToXMLFormat( rText ); @@ -645,7 +644,8 @@ void XRMResMerge::EndOfText( if (!sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")) && ( pEntrys->GetText( sContent, STRING_TYP_TEXT, sCur, sal_True )) && - ( sContent != "-" ) && !sContent.isEmpty()) + ( sContent != "-" ) && !sContent.isEmpty() && + helper::isWellFormedXML( sContent )) { rtl::OString sText( sContent ); rtl::OString sAdditionalLine( "\n " ); -- cgit From 50d6578f2cf1747d0471e1b6f9585c216ebfa7fe Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 14 Nov 2012 13:02:29 +0000 Subject: Resolves: fdo#57107 processing translatable child nodes twice I'm rubbish with xslt. Change-Id: Idc92a602aca7dc2a96cf185b1904e1373435a8a9 --- solenv/bin/uilangfilter.xslt | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/solenv/bin/uilangfilter.xslt b/solenv/bin/uilangfilter.xslt index 42d066faee63..90abf11415ba 100644 --- a/solenv/bin/uilangfilter.xslt +++ b/solenv/bin/uilangfilter.xslt @@ -13,19 +13,33 @@ - + + + - + + - + + -- cgit From 3777191e95400d76bd7dcd71ed1249a6a001317a Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Fri, 16 Nov 2012 18:36:54 +0100 Subject: Delete empty x-comment from shells.src Change-Id: I7899b18d30f8093598761204e7fae6bae93f6e5f Reviewed-on: https://gerrit.libreoffice.org/1090 Reviewed-by: Andras Timar Tested-by: Andras Timar --- sw/source/ui/shells/shells.src | 1 - 1 file changed, 1 deletion(-) diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index da6af126a2f4..cab3649049d5 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -119,7 +119,6 @@ QueryBox DLG_IMPORT_DBNAME BUTTONS = WB_YES_NO ; DEFBUTTON = WB_DEF_NO ; Message [ en-US ] = "Use database name as default database for the document?" ; - Message [ x-comment ] = " "; }; String STR_PAGE { -- cgit From f6147cbe1c6097314a91299cb8a352bb40eeb4d6 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Fri, 16 Nov 2012 18:19:13 +0100 Subject: Handle dictionaries in the same way in localize By now, not needed to handle dictionaries in other way, because its root moves up directly to core. Change-Id: I90d6a67c90b00eea290f17e277fb13c0a6b0b5cd --- l10ntools/source/localize.cxx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 107d516cd354..8b3e94fbd0ef 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -267,15 +267,10 @@ void handleCommand( { const sal_Int32 nProjectInd = inPath.indexOf(project); const OString relativPath = - project == OUString("dictionaries") ? - OUStringToOString( - inPath.copy( nProjectInd + 13, - inPath.lastIndexOf('/')- nProjectInd - 13), - RTL_TEXTENCODING_UTF8 ) : - OUStringToOString( - inPath.copy( nProjectInd, - inPath.lastIndexOf('/')- nProjectInd), - RTL_TEXTENCODING_UTF8 ); + OUStringToOString( + inPath.copy( nProjectInd, + inPath.lastIndexOf('/')- nProjectInd), + RTL_TEXTENCODING_UTF8 ); rPoOutPut.writeHeader(PoHeader(relativPath)); } -- cgit From fea5e609ba800118cdb5d84c8bd78d00e86e003e Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Fri, 16 Nov 2012 16:33:19 +0100 Subject: Last changes in renewpo for migration Order PoEntries by their locations in original po files by adding serialnumber in po2lo and work up them in this order in renewpo. So the order will be the same in new po files. Change-Id: Idb0547a2e1262008b374fe450ec3e01af0cff839 --- l10ntools/scripts/po2lo | 33 ++++++---- l10ntools/source/renewpo.cxx | 139 +++++++++++++++++++++++-------------------- 2 files changed, 93 insertions(+), 79 deletions(-) diff --git a/l10ntools/scripts/po2lo b/l10ntools/scripts/po2lo index 579699102710..6303c63a6fa7 100755 --- a/l10ntools/scripts/po2lo +++ b/l10ntools/scripts/po2lo @@ -41,7 +41,7 @@ class Entry: """Represents a single line in an SDF file.""" def __init__(self, items): - self.has_translation = None; + self.has_po = None self.items = items # list of 15 fields path = self.items[1].split('\\') self.po = "%s/%s/%s.po" % (options.input.replace('\\', '/'), self.items[0], "/".join(path[:-1])) @@ -67,15 +67,17 @@ class Entry: self.items[9] = options.language self.items[2] = "" - self.has_translation = False + self.has_po = False for idx, key in self.keys: try: - if translations.data[(self.po, key)][1]: + self.items[8] = str(translations.snumber[(self.po, key)]) + self.has_po = True + (text, fuzzy) = translations.data[(self.po, key)] + if fuzzy: self.items[2] += "1" else: self.items[2] += "0" - self.items[idx] = translations.data[(self.po, key)][0] - self.has_translation = True + self.items[idx] = text self.items[14] = "2002-02-02 02:02:02" except KeyError: @@ -103,9 +105,10 @@ class Template: sock = xopen(options.output, "w", encoding='utf-8') for line in self.lines: - sock.write("\t".join(line.items)) + temp = "\t".join(line.items) line.translate(translations) - if line.has_translation: + if line.has_po: + sock.write(temp) sock.write("\t".join(line.items)+"\r\n") sock.close() @@ -114,6 +117,8 @@ class Translations: def __init__(self): self.data = {} + self.snumber = {} + counter = 0 for root, dirs, files in os.walk(options.input): for file in files: path = "%s/%s" % (root, file) @@ -125,16 +130,17 @@ class Translations: for line in sock: if line.startswith("#: "): key = line.strip()[3:] + fuzzy = False elif line.startswith("#, fuzzy"): fuzzy = True + elif line.startswith("msgid "): + counter = counter + 1 + self.setserialnumber(path, key, counter) elif line.startswith("msgstr "): trans = line.strip()[8:-1] if len(trans): self.setdata(path, key, trans, fuzzy) - if fuzzy: - fuzzy = False - else: - multiline = False + multiline = False else: buf = [] buf.append(trans) @@ -143,8 +149,6 @@ class Translations: buf.append(line.strip()[1:-1]) elif multiline and not len(line.strip()) and len("".join(buf)): self.setdata(path, key, "".join(buf),fuzzy) - if fuzzy: - fuzzy = False buf = [] multiline = False if multiline and len("".join(buf)): @@ -162,6 +166,9 @@ class Translations: s = s.replace('\\\\', '\\') self.data[(path.replace('\\', '/'), key)] = ( s , fuzzy ) + def setserialnumber(self, path, key, number): + self.snumber[(path.replace('\\', '/'), key)] = ( number ) + def escape_help_text(self, text): """Escapes the help text as it would be in an SDF file.""" diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx index 32d19d594c09..a9f3321d2c4b 100644 --- a/l10ntools/source/renewpo.cxx +++ b/l10ntools/source/renewpo.cxx @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -20,18 +21,18 @@ using namespace std; -//Check wheather the two entry are the same but in different languages -bool IsSameEntry(const OString& rFirstEntry,const OString& rSecEntry) +bool isInSameFile( const OString& rFirstLine, const OString& rSecondLine) { - for(int i = PoEntry::PROJECT; i<=PoEntry::LOCALID;++i) - { - if ( rFirstEntry.getToken(i,'\t') != rSecEntry.getToken(i,'\t') && - i != PoEntry::DUMMY) - return false; - } - return true; + const OString rFirstSource = + rFirstLine.getToken(PoEntry::SOURCEFILE,'\t'); + const OString rSecondSource = + rSecondLine.getToken(PoEntry::SOURCEFILE,'\t'); + return + rFirstSource.copy(0,rFirstSource.lastIndexOf("\\")) == + rSecondSource.copy(0,rSecondSource.lastIndexOf("\\")); } + //Get path of po file OString GetPath(const OString& rPath, const OString& rLine) { @@ -57,8 +58,9 @@ OString DelLocalId(const OString& rLine) } //Renew po files of the actual language -void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, - const OString& rpo2loPath, const OString& rSDFPath) +void HandleLanguage(struct dirent* pLangEntry, const OString& rOldPath, + const OString& rNewPath, const OString& rpo2loPath, + const OString& rSDFPath) { const OString LangEntryName = pLangEntry->d_name; @@ -83,35 +85,69 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, const OString SDFFileName = OUStringToOString(aTempPath, RTL_TEXTENCODING_UTF8); system( (rpo2loPath + - " -i " + rPath + "/" + LangEntryName + + " -i " + rOldPath + "/" + LangEntryName + " -o " + SDFFileName + " -l " + LangEntryName + " -t " + rSDFPath).getStr()); cout << "Language sdf is ready!" << endl; - PoOfstream aNewPo; + //Store info for po entries ifstream aSDFInput(SDFFileName.getStr()); + map > aPoInfos; string s; getline(aSDFInput,s); - OString sLine = OString(s.data(),s.length()); while(!aSDFInput.eof()) { - OString sActUnTrans = sLine; - const OString sPath = rPath + "/"+ LangEntryName; - const OString sActSourcePath = GetPath(sPath,sActUnTrans); + //Get strings belong to one po entry and store + const OString sActUnTrans = OString(s.data(),s.length()); + if( sActUnTrans.getToken(PoEntry::LANGUAGEID,'\t')=="ast" ) throw; + getline(aSDFInput,s); + const OString sActTrans = OString(s.data(),s.length()); + + if(!(aPoInfos.insert( pair >( + sActTrans.getToken(PoEntry::WIDTH,'\t').toInt32(), + pair(sActUnTrans,sActTrans))).second)) + { + cerr << "Error: faild to insert into map!" << '\n'; + throw; + } + getline(aSDFInput,s); + } + + //Close and remove sdf file + aSDFInput.close(); + if (osl::File::remove(aTempUrl) != osl::FileBase::E_None) + { + cerr << "Warning: failure removing temporary " << aTempUrl << '\n'; + } + + //Construct and write out po entries + PoOfstream aNewPo; + for( map >::iterator + pActInfo=aPoInfos.begin(); pActInfo!=aPoInfos.end(); ++pActInfo ) + { //Make new po file and add header - if (!aNewPo.isOpen()) + if ( pActInfo==aPoInfos.begin() || + !isInSameFile(((--pActInfo)++)->second.first,pActInfo->second.first) ) { - const OString sNewPoFileName = sActSourcePath + ".po_tmp"; + if( pActInfo!=aPoInfos.begin() ) + aNewPo.close(); + + const OString sNewPoFileName = + GetPath(rNewPath + "/" +LangEntryName,pActInfo->second.first) + + ".po"; + system(("mkdir -p " + sNewPoFileName.copy(0,sNewPoFileName.lastIndexOf("/"))).getStr()); aNewPo.open(sNewPoFileName); if (!aNewPo.isOpen()) { cerr - << "Cannot open temp file for new po: " + << "Cannot open new po file: " << sNewPoFileName.getStr() << endl; return; } - const OString sOldPoFileName = sActSourcePath + ".po"; + const OString sOldPoFileName = + GetPath(rOldPath + "/" +LangEntryName,pActInfo->second.first) + + ".po"; ifstream aOldPo(sOldPoFileName.getStr()); if (!aOldPo.is_open()) { @@ -124,19 +160,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, aOldPo.close(); } - //Set PoEntry and write out - getline(aSDFInput,s); - OString sActTrans; - if (!aSDFInput.eof() && - IsSameEntry(sActUnTrans,sLine = OString(s.data(),s.length()))) - { - sActTrans = sLine; - getline(aSDFInput,s); - } - else - { - sActTrans =""; - } + //Write out po entries const PoEntry::TYPE vInitializer[] = { PoEntry::TTEXT, PoEntry::TQUICKHELPTEXT, PoEntry::TTITLE }; const vector vTypes( vInitializer, @@ -144,28 +168,28 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, unsigned short nDummyBit = 0; for( unsigned short nIndex=0; nIndexsecond.first.getToken(vTypes[nIndex],'\t').isEmpty()) { /**Because of xrmex there are duplicated id's, - only use this if xrmex have already fixed*/ + only use this if xrmex have already fixed*/ const OString sSource = - sActUnTrans.getToken(PoEntry::SOURCEFILE,'\t'); + pActInfo->second.first.getToken(PoEntry::SOURCEFILE,'\t'); const OString sEnding = sSource.copy(sSource.getLength()-4, 4); - if (sActUnTrans.getToken(PoEntry::GROUPID,'\t')== - sActUnTrans.getToken(PoEntry::LOCALID,'\t') && + if (pActInfo->second.first.getToken(PoEntry::GROUPID,'\t')== + pActInfo->second.first.getToken(PoEntry::LOCALID,'\t') && ( sEnding == ".xrm" || sEnding == ".xml" )) { - sActUnTrans = DelLocalId(sActUnTrans); + pActInfo->second.first = DelLocalId(pActInfo->second.first); } try { - PoEntry aPE(sActUnTrans, vTypes[nIndex]); + PoEntry aPE(pActInfo->second.first, vTypes[nIndex]); const OString sActStr = - sActTrans.getToken(vTypes[nIndex],'\t'); + pActInfo->second.second.getToken(vTypes[nIndex],'\t'); aPE.setMsgStr(sActStr); aPE.setFuzzy( sActStr.isEmpty() ? false : - static_cast(sActTrans.getToken(PoEntry::DUMMY,'\t'). + static_cast(pActInfo->second.second.getToken(PoEntry::DUMMY,'\t'). copy(nDummyBit++,1).toBoolean())); aNewPo.writeEntry(aPE); } @@ -173,28 +197,13 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath, { cerr << "Invalid sdf line " - << sActUnTrans.replaceAll("\t","\\t").getStr() << '\n'; + << pActInfo->second.first.replaceAll("\t","\\t").getStr() << '\n'; } } } - //Check wheather next entry is in the same po file - OString sNextSourcePath = aSDFInput.eof() ? "" : - GetPath(sPath,sLine = OString(s.data(),s.length())); - if (sNextSourcePath!=sActSourcePath) - { - aNewPo.close(); - system(("rm " + sActSourcePath +".po").getStr()); - system(("mv "+ sActSourcePath +".po_tmp " + - sActSourcePath +".po").getStr()); - } - } - - //Close and remove sdf file - aSDFInput.close(); - if (osl::File::remove(aTempUrl) != osl::FileBase::E_None) - { - cerr << "Warning: failure removing temporary " << aTempUrl << '\n'; } + aNewPo.close(); + aPoInfos.clear(); } @@ -203,10 +212,7 @@ int main(int argc, char* argv[]) //Usage if (argc < 4) { - cout << "Use: renewpot translationsdir po2lo en-US.sdf" << endl; - cout << "translationsdir: this directory contains the po" << endl; - cout << "files of all languages. Every language has a" << endl; - cout << "directory named with language id." << endl; + cout << "Use: renewpot oldpots newpots po2lo en-US.sdf" << endl; return 1; } @@ -216,7 +222,8 @@ int main(int argc, char* argv[]) { if ( OString(pActEntry->d_name).indexOf('.')==-1 ) HandleLanguage(pActEntry,OString(argv[1]), - OString(argv[2]),OString(argv[3])); + OString(argv[2]),OString(argv[3]), + OString(argv[4])); } closedir(pTranslations); } -- cgit From 302a099e5264742204b625f1cce949892d8a84f9 Mon Sep 17 00:00:00 2001 From: Ztamas Date: Sun, 18 Nov 2012 12:07:58 +0100 Subject: Write source file into po entries' msgctxt So (msgctxt, msgid) pair is unique in one po file Change-Id: I64635dd7a6352300ed5fb6949a1b78c2a070c660 --- l10ntools/source/po.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 18c0ef1042d4..df9efe31bc64 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -198,7 +198,8 @@ void GenPoEntry::writeToFile(std::ofstream& rOFStream) const rOFStream << "#, fuzzy" << std::endl; if ( !m_sMsgCtxt.isEmpty() ) rOFStream << "msgctxt " - << lcl_GenMsgString(m_sMsgCtxt).getStr() << std::endl; + << lcl_GenMsgString(m_sReference+"\n"+m_sMsgCtxt).getStr() + << std::endl; rOFStream << "msgid " << lcl_GenMsgString(m_sMsgId).getStr() << std::endl; rOFStream << "msgstr " @@ -251,7 +252,8 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) m_sMsgStr = lcl_GenNormString(sLine.copy(7)); pLastMsg = &m_sMsgStr; } - else if (sLine.startsWith("\"") && pLastMsg) + else if (sLine.startsWith("\"") && pLastMsg && + (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") ) { *pLastMsg += lcl_GenNormString(sLine); } -- cgit From 889574a50c8f5bdffed9f3eb70426cedae0a589c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 18 Nov 2012 12:47:54 +0100 Subject: put filename into msgctxt, because po entries must be unique Change-Id: I700b668863c2b20cdf60fa672a994b8ae4dc613a --- l10ntools/source/po.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index df9efe31bc64..2ccaed61bb17 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -452,7 +452,8 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) copy(vParts[SOURCEFILE].lastIndexOf("\\")+1)); OString sMsgCtxt = - vParts[GROUPID] + "\n" + + vParts[SOURCEFILE].copy(vParts[SOURCEFILE].lastIndexOf("\\")+1) + + "\n" + vParts[GROUPID] + "\n" + (vParts[LOCALID].isEmpty() ? "" : vParts[LOCALID] + "\n") + vParts[RESOURCETYPE]; switch(eType){ @@ -527,7 +528,7 @@ OString PoEntry::getSourceFile() const OString PoEntry::getGroupId() const { assert( m_bIsInitialized ); - return m_pGenPo->getMsgCtxt().getToken(0,'\n'); + return m_pGenPo->getMsgCtxt().getToken(1,'\n'); } //Get localid @@ -538,7 +539,7 @@ OString PoEntry::getLocalId() const if (sMsgCtxt.indexOf('\n')==sMsgCtxt.lastIndexOf('\n')) return OString(); else - return sMsgCtxt.getToken(1,'\n'); + return sMsgCtxt.getToken(2,'\n'); } //Get the type of component from which entry is extracted @@ -547,9 +548,9 @@ OString PoEntry::getResourceType() const assert( m_bIsInitialized ); const OString sMsgCtxt = m_pGenPo->getMsgCtxt(); if (sMsgCtxt.indexOf('\n')==sMsgCtxt.lastIndexOf('\n')) - return sMsgCtxt.getToken(1,'\n').getToken(0,'.'); - else return sMsgCtxt.getToken(2,'\n').getToken(0,'.'); + else + return sMsgCtxt.getToken(3,'\n').getToken(0,'.'); } //Get the type of entry -- cgit From 124dc60e5519ee4d1c2454050b6f54a7b020905d Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 18 Nov 2012 13:04:33 +0100 Subject: Revert "put filename into msgctxt, because po entries must be unique" This reverts commit 889574a50c8f5bdffed9f3eb70426cedae0a589c. --- l10ntools/source/po.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 2ccaed61bb17..df9efe31bc64 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -452,8 +452,7 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) copy(vParts[SOURCEFILE].lastIndexOf("\\")+1)); OString sMsgCtxt = - vParts[SOURCEFILE].copy(vParts[SOURCEFILE].lastIndexOf("\\")+1) + - "\n" + vParts[GROUPID] + "\n" + + vParts[GROUPID] + "\n" + (vParts[LOCALID].isEmpty() ? "" : vParts[LOCALID] + "\n") + vParts[RESOURCETYPE]; switch(eType){ @@ -528,7 +527,7 @@ OString PoEntry::getSourceFile() const OString PoEntry::getGroupId() const { assert( m_bIsInitialized ); - return m_pGenPo->getMsgCtxt().getToken(1,'\n'); + return m_pGenPo->getMsgCtxt().getToken(0,'\n'); } //Get localid @@ -539,7 +538,7 @@ OString PoEntry::getLocalId() const if (sMsgCtxt.indexOf('\n')==sMsgCtxt.lastIndexOf('\n')) return OString(); else - return sMsgCtxt.getToken(2,'\n'); + return sMsgCtxt.getToken(1,'\n'); } //Get the type of component from which entry is extracted @@ -548,9 +547,9 @@ OString PoEntry::getResourceType() const assert( m_bIsInitialized ); const OString sMsgCtxt = m_pGenPo->getMsgCtxt(); if (sMsgCtxt.indexOf('\n')==sMsgCtxt.lastIndexOf('\n')) - return sMsgCtxt.getToken(2,'\n').getToken(0,'.'); + return sMsgCtxt.getToken(1,'\n').getToken(0,'.'); else - return sMsgCtxt.getToken(3,'\n').getToken(0,'.'); + return sMsgCtxt.getToken(2,'\n').getToken(0,'.'); } //Get the type of entry -- cgit From b0f07bbbc4f179d442ff96471669f02e82686657 Mon Sep 17 00:00:00 2001 From: Ztamas Date: Sun, 18 Nov 2012 12:07:58 +0100 Subject: Write source file into po entries' msgctxt So (msgctxt, msgid) pair is unique in one po file Change-Id: I64635dd7a6352300ed5fb6949a1b78c2a070c660 --- l10ntools/source/po.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index df9efe31bc64..ce71207ec3e5 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -255,7 +255,10 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) else if (sLine.startsWith("\"") && pLastMsg && (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") ) { - *pLastMsg += lcl_GenNormString(sLine); + if ( pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\\n\"" ) + { + *pLastMsg += lcl_GenNormString(sLine); + } } else break; -- cgit From 7f81bbb1c7f090d9e962e5c2cb7b694298bfe1c8 Mon Sep 17 00:00:00 2001 From: Ztamas Date: Sun, 18 Nov 2012 12:07:58 +0100 Subject: Correct skiping source file line of msgctxt Change-Id: I64635dd7a6352300ed5fb6949a1b78c2a070c660 --- l10ntools/source/po.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index ce71207ec3e5..e59db110dcc7 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -252,8 +252,7 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) m_sMsgStr = lcl_GenNormString(sLine.copy(7)); pLastMsg = &m_sMsgStr; } - else if (sLine.startsWith("\"") && pLastMsg && - (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") ) + else if (sLine.startsWith("\"") && pLastMsg) { if ( pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\\n\"" ) { -- cgit From ce48aa1488652ba8b24ada4d62b75aacf3ef6717 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 18 Nov 2012 14:38:47 +0100 Subject: Revert "Correct skiping source file line of msgctxt" This reverts commit 7f81bbb1c7f090d9e962e5c2cb7b694298bfe1c8. --- l10ntools/source/po.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index e59db110dcc7..ce71207ec3e5 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -252,7 +252,8 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) m_sMsgStr = lcl_GenNormString(sLine.copy(7)); pLastMsg = &m_sMsgStr; } - else if (sLine.startsWith("\"") && pLastMsg) + else if (sLine.startsWith("\"") && pLastMsg && + (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") ) { if ( pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\\n\"" ) { -- cgit From d15706ec0ac0e1eaec1b95fe0271d17393915e32 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 18 Nov 2012 14:39:17 +0100 Subject: Revert "Write source file into po entries' msgctxt" This reverts commit b0f07bbbc4f179d442ff96471669f02e82686657. --- l10ntools/source/po.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index ce71207ec3e5..df9efe31bc64 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -255,10 +255,7 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) else if (sLine.startsWith("\"") && pLastMsg && (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") ) { - if ( pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\\n\"" ) - { - *pLastMsg += lcl_GenNormString(sLine); - } + *pLastMsg += lcl_GenNormString(sLine); } else break; -- cgit From c48c4ace3630451c771afa20080f9bfb7ba05c03 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 18 Nov 2012 14:42:04 +0100 Subject: Correct skipping source file line of msgctxt Change-Id: I7aed7a75c6e9b36efca9837c0137075065bcd1e6 --- l10ntools/source/po.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index df9efe31bc64..648634c2f569 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -252,10 +252,12 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream) m_sMsgStr = lcl_GenNormString(sLine.copy(7)); pLastMsg = &m_sMsgStr; } - else if (sLine.startsWith("\"") && pLastMsg && - (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") ) + else if (sLine.startsWith("\"") && pLastMsg) { - *pLastMsg += lcl_GenNormString(sLine); + if (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\\n\"") + { + *pLastMsg += lcl_GenNormString(sLine); + } } else break; -- cgit From fedd4a578e8e22f8a40990a3272056f5b7572110 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 18 Nov 2012 18:32:47 +0100 Subject: fix makefile Change-Id: I148f01cb77548b600a799f5eda5970ab236d9663 --- librelogo/Extension_librelogo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librelogo/Extension_librelogo.mk b/librelogo/Extension_librelogo.mk index 1c80e9dcba80..8f525c3d449b 100644 --- a/librelogo/Extension_librelogo.mk +++ b/librelogo/Extension_librelogo.mk @@ -41,6 +41,6 @@ $(eval $(call gb_Extension_localize_properties,librelogo,pythonpath/LibreLogo_en $(eval $(call gb_Extension_add_helpfile,librelogo,$(SRCDIR)/librelogo/source/help/en-US,org.openoffice.comp.pyuno.LibreLogo/LibreLogo.xhp,LibreLogo.xhp)) -$(eval $(call gb_Extension_add_helptreefile,librelogo,$(SRCDIR)/librelogo/source/help/en-US,/help.tree,/help.tree,org.openoffice.comp.pyuno.LibreLogo)) +$(eval $(call gb_Extension_add_helptreefile,librelogo,$(SRCDIR)/librelogo/source/help/en-US,help.tree,help.tree,org.openoffice.comp.pyuno.LibreLogo)) # vim:set shiftwidth=4 softtabstop=4 expandtab: -- cgit From 5d84ae59e70b8b1017959a68934ac1f455ce2b13 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 18 Nov 2012 15:24:44 +0100 Subject: Localize xhp files in help Make helpex to be able to work with more xhp files at one time - Add new input flag "-mi" which means multiinput - Input is a file include pathes to xhp files (these are in the same directory so their strings are in the same po file) - Output is a file include pathes to dest xhp files - Merge reads all po entry from the specified po file if MergeDataFile ctor's second parameter is empty Rewrite makefiles to work with new syntax Plus Delete some unused code Change-Id: I5eb12d7a6f5e9cda378788410d3c50052eb752b8 --- l10ntools/inc/helpmerge.hxx | 2 -- l10ntools/source/helpex.cxx | 80 ++++++++++++++++++++++++++++++++++++++---- l10ntools/source/helpmerge.cxx | 45 ------------------------ l10ntools/source/merge.cxx | 13 +++---- solenv/inc/tg_help.mk | 5 ++- 5 files changed, 84 insertions(+), 61 deletions(-) diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx index 34dfdc7eb472..401f8392a424 100644 --- a/l10ntools/inc/helpmerge.hxx +++ b/l10ntools/inc/helpmerge.hxx @@ -55,8 +55,6 @@ public: /// point to existing files. bool Merge( const rtl::OString &rSDFFile_in, const rtl::OString &rDestinationFile_in , const rtl::OString& sLanguage , MergeDataFile& aMergeDataFile ); - bool Merge( const rtl::OString &rSDFFile, const rtl::OString &rPathX , const rtl::OString &rPathY , bool bISO - , const std::vector& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir ); private: rtl::OString GetOutpath( const rtl::OString& rPathX , const rtl::OString& sCur , const rtl::OString& rPathY ); diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index 8dca205cf36e..7ab581a2a1d6 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -20,6 +20,9 @@ #include "sal/config.h" #include +#include +#include +#include #include #include @@ -30,24 +33,87 @@ #ifndef TESTDRIVER +void WriteUsage() +{ + std::cout + << "Syntax: Helpex [-p Prj] [-r Root] -[m]i FileIn -o FileOut" + << " [-m DataBase] [-l l1,l2,...]\n" + << " Prj: Project\n" + << " Root: Path to project root (../.. etc.)\n" + << " FileIn + i: Source file (*.xhp)\n" + << " FileIn + -mi: File including pathes of source files" + << " (only for merge)" + << " FileOut: Destination file (*.*) or files (in case of -mi)\n" + << " DataBase: Mergedata (*.po)\n" + << " -l: Restrict the handled languages; l1, l2, ... are elements of" + << " (de, en-US, ...)\n"; +} + SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { + + bool bMultiMerge = false; + for (int nIndex = 1; nIndex != argc; ++nIndex) + { + if (std::strcmp(argv[nIndex], "-mi") == 0) + { + argv[nIndex][1] = 'i'; + argv[nIndex][2] = '\0'; + bMultiMerge = true; + break; + } + } + HandledArgs aArgs; - if ( !Export::handleArguments( argc, argv, aArgs) ) { - Export::writeUsage("helpex","xhp"); + if ( !Export::handleArguments( argc, argv, aArgs) ) + { + WriteUsage(); return 1; } - //sal_uInt32 startfull = Export::startMessure(); bool hasNoError = true; - HelpParser aParser( aArgs.m_sInputFile ); if ( aArgs.m_bMergeMode ) { - //sal_uInt64 startreadloc = Export::startMessure(); - MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, aArgs.m_sInputFile, false ); - hasNoError = aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile , Export::sLanguages , aMergeDataFile ); + if( bMultiMerge ) + { + std::ifstream aInput( aArgs.m_sInputFile.getStr() ); + if( !aInput.is_open() ) + { + std::cerr << "Helpex error: cannot open input file\n"; + return 1; + } + MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, OString(), false); + std::string sTemp; + aInput >> sTemp; + while( !aInput.eof() ) + { + const OString sXhpFile( sTemp.data(), sTemp.length() ); + HelpParser aParser( sXhpFile ); + const OString sOutput( + aArgs.m_sOutputFile + + sXhpFile.copy( sXhpFile.lastIndexOf("/") )); + if( !aParser.Merge( aArgs.m_sMergeSrc, sOutput, + Export::sLanguages, aMergeDataFile )) + { + hasNoError = false; + } + aInput >> sTemp; + } + aInput.close(); + } + else + { + HelpParser aParser( aArgs.m_sInputFile ); + MergeDataFile aMergeDataFile( + aArgs.m_sMergeSrc, aArgs.m_sInputFile, false ); + hasNoError = + aParser.Merge( + aArgs.m_sMergeSrc, aArgs.m_sOutputFile, + Export::sLanguages , aMergeDataFile ); + } } else { + HelpParser aParser( aArgs.m_sInputFile ); hasNoError = aParser.CreateSDF( aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot, diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 8764935ced2c..68f745397378 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -227,51 +227,6 @@ void HelpParser::parse_languages( std::vector& aLanguages , MergeD } -bool HelpParser::Merge( - const rtl::OString &rSDFFile, const rtl::OString &rPathX , const rtl::OString &rPathY , bool bISO , - const std::vector& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir ) -{ - - - (void) rSDFFile ; - bool hasNoError = true; - SimpleXMLParser aParser; - rtl::OUString sXmlFile( - rtl::OStringToOUString(sHelpFile, RTL_TEXTENCODING_ASCII_US)); - //TODO: explicit BOM handling? - - XMLFile* xmlfile = aParser.Execute( sXmlFile, new XMLFile( rtl::OUString('0') ) ); - - if( xmlfile == NULL) - { - printf("%s\n", rtl::OUStringToOString(aParser.GetError().sMessage, RTL_TEXTENCODING_UTF8).getStr()); - exit(-1); - } - - xmlfile->Extract(); - - rtl::OString sCur; - for( unsigned int n = 0; n < aLanguages.size(); n++ ){ - sCur = aLanguages[ n ]; - - rtl::OString sFilepath; - if( bISO ) sFilepath = GetOutpath( rPathX , sCur , rPathY ); - else sFilepath = rPathX; - if( bCreateDir ) - MakeDir(sFilepath); - - XMLFile* file = new XMLFile( *xmlfile ); - sFilepath += sHelpFile; - hasNoError = MergeSingleFile( file , aMergeDataFile , sCur , sFilepath ); - delete file; - - if( !hasNoError ) return false; // Stop on error - } - - delete xmlfile; - return hasNoError; -} - bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const rtl::OString& sLanguage , rtl::OString const & sPath ) { diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 80188f53fb87..73bd8dd7d866 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -150,8 +150,7 @@ sal_Bool MergeData::operator==( ResData *pData ) // MergeDataFile::MergeDataFile( - const rtl::OString &rFileName, - const rtl::OString &rFile, + const rtl::OString &rFileName, const rtl::OString &rFile, bool bCaseSensitive) { std::ifstream aInputStream( rFileName.getStr() ); @@ -167,6 +166,7 @@ MergeDataFile::MergeDataFile( { const OString sHack("HACK"); const OString sFileName( lcl_NormalizeFilename(rFile) ); + const bool bReadAll = sFileName.isEmpty(); PoIfstream aPoInput; aPoInput.open( OString(sPoFileName.data(), sPoFileName.length()) ); if ( !aPoInput.isOpen() ) @@ -212,8 +212,8 @@ MergeDataFile::MergeDataFile( { return; } - } while( !aPoInput.eof() && aNextPo.getSourceFile() != sFileName ); - while( !aPoInput.eof() && aNextPo.getSourceFile() == sFileName ) + } while( !aPoInput.eof() && aNextPo.getSourceFile() != sFileName && !bReadAll ); + while( !aPoInput.eof() && (aNextPo.getSourceFile() == sFileName || bReadAll )) { PoEntry aActPo( aNextPo ); @@ -262,7 +262,7 @@ MergeDataFile::MergeDataFile( InsertEntry( aActPo.getResourceType(), aActPo.getGroupId(), aActPo.getLocalId(), sHack, sLang, sText, - sQHText, sTitle, sFileName, bCaseSensitive ); + sQHText, sTitle, aActPo.getSourceFile(), bCaseSensitive ); if( bFirstLang ) { @@ -271,7 +271,8 @@ MergeDataFile::MergeDataFile( aActPo.getResourceType(), aActPo.getGroupId(), aActPo.getLocalId(), sHack, "qtz", sQTZText + "||" + sExText, sQTZQHText + "||" + sExQHText, - sQTZTitle + "||" + sExTitle, sFileName, bCaseSensitive ); + sQTZTitle + "||" + sExTitle, aActPo.getSourceFile(), + bCaseSensitive ); } } aPoInput.close(); diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk index c67e04ae1a1e..f87953ae5dfb 100644 --- a/solenv/inc/tg_help.mk +++ b/solenv/inc/tg_help.mk @@ -54,7 +54,10 @@ $(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp $(HELP_OUT)$/$(TARGET).done : $(HLANGXHPFILES) .IF "$(WITH_LANG)"!="" @echo Localizing help files... - $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ + @$(foreach,xhpfile,$(XHPFILES) cp $(SRC_ROOT)/$(PRJNAME)/source/$(SHELL_PACKAGE)/$(xhpfile) $(subst,$(PRJ),$(SRC_ROOT)/$(PRJNAME) $(XHPDEST))/en-US/$(SHELL_PACKAGE)/$(xhpfile) && ) \ + $(foreach,lang,$(subst,en-US, $(aux_alllangiso)) \ + $(AUGMENT_LIBRARY_PATH) $(HELPEX) -mi $(mktmp $(foreach,xhpfile,$(XHPFILES) $(SRC_ROOT)/$(PRJNAME)/source/$(SHELL_PACKAGE)/$(xhpfile))) -o $(subst,$(PRJ),$(SRC_ROOT)/$(PRJNAME) $(XHPDEST))/$(lang)/$(SHELL_PACKAGE) -m $(mktmp $(SRC_ROOT)/translations/source/$(lang)/$(PRJNAME)/source/$(SHELL_PACKAGE).po) -l $(lang) && )\ + $(TOUCH) $@ .ELSE # "$(WITH_LANG)"!="" @echo Copying help files... $(COMMAND_ECHO)cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ -- cgit From 06d5579c9291b6061ee89eed8f505f436375e15d Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 18 Nov 2012 18:20:38 +0100 Subject: Localize tree files in help -Treex works well when po is not exist, send a warning but make en-US tree-s. Change-Id: Ib2b790742c022211a8d250b66891cef045941398 --- helpcontent2 | 2 +- l10ntools/source/treemerge.cxx | 5 ++--- solenv/inc/unitools.mk | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helpcontent2 b/helpcontent2 index 23d751575753..7bb6ef60f648 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 23d7515757534fca7d50e1201745586adde4b8f6 +Subproject commit 7bb6ef60f6486e143fda08cc1527f5eb71c86b09 diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx index 12e931c6d221..8555c8f013a1 100644 --- a/l10ntools/source/treemerge.cxx +++ b/l10ntools/source/treemerge.cxx @@ -279,8 +279,8 @@ void TreeParser::Merge( { MergeDataFile aMergeDataFile( rMergeSrc, static_cast( m_pSource->name ), false ); - - if( aMergeDataFile.GetLanguages()[0] != m_sLang ) + const std::vector vLanguages = aMergeDataFile.GetLanguages(); + if( !vLanguages.empty() && vLanguages[0] != m_sLang ) { std::cerr << "Treex error: given language conflicts with " @@ -288,7 +288,6 @@ void TreeParser::Merge( << m_sLang.getStr() << " - " << rMergeSrc.getStr() << std::endl; return; } - lcl_MergeLevel( m_pSource, pRootNode, (const xmlChar *)("help_section"), &aMergeDataFile, m_sLang, rXhpRoot ); diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 863c4ad23db6..bbd51bf325a1 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -33,6 +33,7 @@ CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cfgex AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc LOCALIZE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck +TREEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/treex .IF "$(XSLTPROC)"=="" .IF "$(SYSTEM_LIBXSLT)"!="YES" -- cgit From 8d1775f2e581119812b2e0a04d5f1441cc47b969 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 18 Nov 2012 19:44:00 +0100 Subject: fix makefile Change-Id: I72de89aed6ac8901ee2b633c0236191ef3cfb7c1 --- solenv/gbuild/Configuration.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 1d9ceacbd9ed..95f20e3e5959 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -257,7 +257,7 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XcuMergeTarget_CFGEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ - -i $(call gb_Helper_symlinked_native,$(3)) \ + -i $(3) \ -o $(1) \ -m $${MERGEINPUT} \ -l all) && \ -- cgit From 4a91105b826dea43a43ec03a64a8c28f1aa72155 Mon Sep 17 00:00:00 2001 From: Ztamas Date: Sun, 18 Nov 2012 16:21:51 +0100 Subject: Updated core Project: help c96494d43ebda1848c55a31ef187646783dead00 Localize tree files in help --- helpcontent2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpcontent2 b/helpcontent2 index 7bb6ef60f648..c96494d43ebd 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7bb6ef60f6486e143fda08cc1527f5eb71c86b09 +Subproject commit c96494d43ebda1848c55a31ef187646783dead00 -- cgit From b4cbfaa0d84513415d39965dc300b454e6fedd08 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 18 Nov 2012 22:29:58 +0100 Subject: Updated core Project: help 55742016f74d1ec3a8f6f146457b34db675dac15 remove obsoleted part from makefile --- helpcontent2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpcontent2 b/helpcontent2 index c96494d43ebd..55742016f74d 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c96494d43ebda1848c55a31ef187646783dead00 +Subproject commit 55742016f74d1ec3a8f6f146457b34db675dac15 -- cgit From 3f469dd69c2eb9d8f193da7f88d05719762b600c Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 18 Nov 2012 22:49:36 +0100 Subject: Fix some encoding problem in treemerge Change-Id: I275ccba8f07ccaba1ead0ad83a382d3ad19c722a --- l10ntools/source/treemerge.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx index 8555c8f013a1..622564c5d58c 100644 --- a/l10ntools/source/treemerge.cxx +++ b/l10ntools/source/treemerge.cxx @@ -146,7 +146,9 @@ namespace replaceAll("$[officeversion]","%PRODUCTVERSION"); xmlNodeSetContent( pReturn, - reinterpret_cast( sNewTitle.getStr() )); + xmlEncodeSpecialChars( NULL, + reinterpret_cast( + sNewTitle.getStr() ))); xmlFree( sTitle ); break; } -- cgit From c82935d52db04230c77b4a6df7dda07507b34805 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 19 Nov 2012 15:29:59 +0100 Subject: Extend localization to mysqlc Change-Id: If67b4991dec8c20d02d41032923bbd5945a5704a --- mysqlc/source/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index c36e8368baf1..232bc1f629ae 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -236,7 +236,7 @@ $(COMPONENT_DESCRIPTIONS_PACKDEP) : $(DESCRIPTION) $(DESCRIPTION_SRC): description.xml +-$(RM) $@ .IF "$(WITH_LANG)" != "" - $(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all + $(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG)) $(SRCDIR)$/newtrans.1.0/source/$(lang)/$(PRJNAME)$/$(PATH_IN_MODULE).po)) -l all $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $@ > $@.new mv $@.new $@ @$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR) -- cgit From 7429ab2e2caa49466a455ad3e2e04057524225d0 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Mon, 19 Nov 2012 18:19:52 +0100 Subject: Use icu regex in l10ntools instead of i18nregexp Change-Id: I9062aafa2fefa26b7b1edf0440f4675b2f469e5d --- l10ntools/Executable_cfgex.mk | 6 +++- l10ntools/Executable_helpex.mk | 3 +- l10ntools/Executable_localize.mk | 6 +++- l10ntools/Executable_propex.mk | 6 +++- l10ntools/Executable_renewpo.mk | 6 +++- l10ntools/Executable_transex3.mk | 6 +++- l10ntools/Executable_treex.mk | 3 +- l10ntools/Executable_uiex.mk | 3 +- l10ntools/Executable_ulfex.mk | 6 +++- l10ntools/Executable_xrmex.mk | 3 +- l10ntools/prj/build.lst | 2 +- l10ntools/source/po.cxx | 77 ++++++++++++++-------------------------- 12 files changed, 65 insertions(+), 62 deletions(-) diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk index 7804470c05a7..60b31669c25c 100644 --- a/l10ntools/Executable_cfgex.mk +++ b/l10ntools/Executable_cfgex.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,cfgex,\ $(eval $(call gb_Executable_use_libraries,cfgex,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_use_unpacked,cfgex,boost)) @@ -50,4 +49,9 @@ $(eval $(call gb_Executable_add_exception_objects,cfgex,\ l10ntools/source/cfgmerge \ )) +$(eval $(call gb_Executable_use_externals,cfgex,\ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk index b7e63100b351..cd2469dc971b 100644 --- a/l10ntools/Executable_helpex.mk +++ b/l10ntools/Executable_helpex.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,helpex,\ $(eval $(call gb_Executable_use_libraries,helpex,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_use_external,helpex,expat_utf8)) @@ -51,6 +50,8 @@ $(eval $(call gb_Executable_add_exception_objects,helpex,\ $(eval $(call gb_Executable_use_externals,helpex,\ libxml2 \ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk index e6e7f1fc2c6e..a810b6cd8e22 100644 --- a/l10ntools/Executable_localize.mk +++ b/l10ntools/Executable_localize.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,localize,\ $(eval $(call gb_Executable_use_libraries,localize,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,localize,\ @@ -44,4 +43,9 @@ $(eval $(call gb_Executable_add_exception_objects,localize,\ l10ntools/source/localize \ )) +$(eval $(call gb_Executable_use_externals,localize,\ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_propex.mk b/l10ntools/Executable_propex.mk index d8dc16d323c2..06080c682840 100644 --- a/l10ntools/Executable_propex.mk +++ b/l10ntools/Executable_propex.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Executable_set_include,propex,\ $(eval $(call gb_Executable_use_libraries,propex,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,propex,\ @@ -29,4 +28,9 @@ $(eval $(call gb_Executable_add_exception_objects,propex,\ l10ntools/source/propex \ )) +$(eval $(call gb_Executable_use_externals,propex,\ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk index 5aa036a40100..db84a41ae5d7 100644 --- a/l10ntools/Executable_renewpo.mk +++ b/l10ntools/Executable_renewpo.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Executable_set_include,renewpo,\ $(eval $(call gb_Executable_use_libraries,renewpo,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,renewpo,\ @@ -29,4 +28,9 @@ $(eval $(call gb_Executable_add_exception_objects,renewpo,\ l10ntools/source/renewpo \ )) +$(eval $(call gb_Executable_use_externals,renewpo,\ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk index 2d9590641d83..d2b7952f0372 100644 --- a/l10ntools/Executable_transex3.mk +++ b/l10ntools/Executable_transex3.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,transex3,\ $(eval $(call gb_Executable_use_libraries,transex3,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_add_scanners,transex3,\ @@ -50,4 +49,9 @@ $(eval $(call gb_Executable_add_exception_objects,transex3,\ l10ntools/source/export \ )) +$(eval $(call gb_Executable_use_externals,transex3,\ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_treex.mk b/l10ntools/Executable_treex.mk index 41af0a8bfbc9..af77c71a1546 100644 --- a/l10ntools/Executable_treex.mk +++ b/l10ntools/Executable_treex.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Executable_set_include,treex,\ $(eval $(call gb_Executable_use_libraries,treex,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,treex,\ @@ -31,6 +30,8 @@ $(eval $(call gb_Executable_add_exception_objects,treex,\ $(eval $(call gb_Executable_use_externals,treex,\ libxml2 \ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ )) # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk index 520b010265f0..de8d0c83a4d6 100644 --- a/l10ntools/Executable_uiex.mk +++ b/l10ntools/Executable_uiex.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Executable_set_include,uiex,\ $(eval $(call gb_Executable_use_libraries,uiex,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_use_unpacked,uiex,boost)) @@ -33,6 +32,8 @@ $(eval $(call gb_Executable_use_externals,uiex,\ libexslt \ libxml2 \ libxslt \ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ )) # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk index b975f5c47e11..9a7040a6ff9e 100644 --- a/l10ntools/Executable_ulfex.mk +++ b/l10ntools/Executable_ulfex.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,ulfex,\ $(eval $(call gb_Executable_use_libraries,ulfex,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_use_unpacked,ulfex,boost)) @@ -47,4 +46,9 @@ $(eval $(call gb_Executable_add_exception_objects,ulfex,\ l10ntools/source/lngex \ )) +$(eval $(call gb_Executable_use_externals,ulfex,\ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk index 73c56abe420a..ea0810fc3a53 100644 --- a/l10ntools/Executable_xrmex.mk +++ b/l10ntools/Executable_xrmex.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,xrmex,\ $(eval $(call gb_Executable_use_libraries,xrmex,\ sal \ - i18nregexp \ )) $(eval $(call gb_Executable_use_unpacked,xrmex,boost)) @@ -52,6 +51,8 @@ $(eval $(call gb_Executable_add_exception_objects,xrmex,\ $(eval $(call gb_Executable_use_externals,xrmex,\ libxml2 \ + icuuc \ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst index 888b2343a4b5..af0fdfeff475 100644 --- a/l10ntools/prj/build.lst +++ b/l10ntools/prj/build.lst @@ -1,3 +1,3 @@ -tr l10ntools : EXPAT:expat LIBXSLT:libxslt sal regexp NULL +tr l10ntools : EXPAT:expat LIBXSLT:libxslt ICU:icu sal NULL tr l10ntools usr1 - all tr_mkout NULL tr l10ntools\prj nmake - all tr_prj NULL diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 648634c2f569..1be60ecaf312 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -7,10 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include -#include -#include -#include #include #include @@ -21,12 +17,15 @@ #include #include +#include #include "po.hxx" #define POESCAPED OString("\\n\\t\\r\\\\\\\"") #define POUNESCAPED OString("\n\t\r\\\"") +using namespace U_ICU_NAMESPACE; + //Class GenPoEntry class GenPoEntry @@ -317,61 +316,37 @@ namespace return lcl_UnEscapeText(rText,"\\n\\t\\r","\n\t\r"); } - //Miminize the length of the regular expression result - static void lcl_Minimize( - const OUString& rText, Regexpr& io_rRegExp, re_registers& io_rRegs ) - { - re_registers aPrevRegs; - const sal_Int32 nStart = io_rRegs.start[0]; - do - { - const OUString sTemp = rText.copy(0,io_rRegs.end[0]-1); - memcpy( - static_cast(&aPrevRegs), - static_cast(&io_rRegs), - sizeof(re_registers)); - memset(static_cast(&io_rRegs), 0, sizeof(re_registers)); - io_rRegExp.set_line(sTemp.getStr(),sTemp.getLength()); - io_rRegExp.re_search(&io_rRegs,nStart); - } while(io_rRegs.num_of_match); - - memcpy(static_cast(&io_rRegs),static_cast(&aPrevRegs), - sizeof(re_registers)); - io_rRegExp.set_line(rText.getStr(),rText.getLength()); - } - //Find all special tag in a string using a regular expression static void lcl_FindAllTag( const OString& rText,std::vector& o_vFoundTags ) { - ::com::sun::star::util::SearchOptions aOptions; - aOptions.algorithmType = - ::com::sun::star::util::SearchAlgorithms_REGEXP; - aOptions.searchFlag = - ::com::sun::star::util::SearchFlags::NORM_WORD_ONLY; - aOptions.searchString = "<[/]?[a-z_\\-]+(| +[a-z]+=\".*\") *[/]?>"; - ::com::sun::star::uno::Reference< - ::com::sun::star::i18n::XExtendedTransliteration > xTrans; - - Regexpr aRegExp(aOptions,xTrans); - const OUString sTemp(OStringToOUString(rText,RTL_TEXTENCODING_UTF8)); - aRegExp.set_line(sTemp.getStr(),sTemp.getLength()); - - re_registers aRegs; - memset(static_cast(&aRegs), 0, sizeof(re_registers)); - sal_Int32 nStart = 0; - o_vFoundTags.resize(0); - aRegExp.re_search(&aRegs,nStart); - while(aRegs.num_of_match) + + UErrorCode nIcuErr = U_ZERO_ERROR; + sal_uInt32 nSearchFlags = UREGEX_DOTALL | UREGEX_CASE_INSENSITIVE; + OUString sLocaleText( OStringToOUString(rText,RTL_TEXTENCODING_UTF8) ); + OUString sPattern( "<[/]??[a-z_-]+?(?:| +[a-z]+?=\".*?\") *[/]??>" ); + UnicodeString sSearchPat( + reinterpret_cast( + sPattern.getStr()), sPattern.getLength() ); + UnicodeString sSource( + reinterpret_cast( + sLocaleText.getStr()), sLocaleText.getLength() ); + + RegexMatcher aRegexMatcher( sSearchPat, nSearchFlags, nIcuErr ); + aRegexMatcher.reset( sSource ); + int64_t nStartPos = 0; + while( aRegexMatcher.find(nStartPos, nIcuErr) && + nIcuErr == U_ZERO_ERROR ) { - lcl_Minimize(sTemp,aRegExp,aRegs); + UnicodeString sMatch = + aRegexMatcher.group(nIcuErr); o_vFoundTags.push_back( OUStringToOString( - sTemp.copy(aRegs.start[0],aRegs.end[0]-aRegs.start[0]), + OUString( + reinterpret_cast( + sMatch.getBuffer()),sMatch.length()), RTL_TEXTENCODING_UTF8)); - nStart = aRegs.end[0]; - memset(static_cast(&aRegs), 0, sizeof(re_registers)); - aRegExp.re_search(&aRegs,nStart); + nStartPos = aRegexMatcher.start(nIcuErr)+1; } } -- cgit From 23ffae787b9b052748f7f3a6f67c4e2f8f2c9cbb Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Tue, 20 Nov 2012 00:21:57 +0100 Subject: Reardme.xrm move up one directory just as the po file belong to it Change-Id: Ia5deea8816cbb5fc29669d6aa8c3c81472b0ed3f --- readlicense_oo/CustomTarget_readme.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk index 2871631d06a8..248e495e63da 100644 --- a/readlicense_oo/CustomTarget_readme.mk +++ b/readlicense_oo/CustomTarget_readme.mk @@ -41,7 +41,7 @@ $(readlicense_oo_DIR)/readme.xrm : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1) $(call gb_Helper_abbreviate_dirs, \ MERGEINPUT=`$(gb_MKTEMP)` && \ - echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) > $${MERGEINPUT} && \ + echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) > $${MERGEINPUT} && \ $(readlicense_XRMEXCOMMAND) \ -p readlicense_oo \ -i $< \ -- cgit From 073ff5518f2e341dde7d7ce732cfecb029c85ce6 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Tue, 20 Nov 2012 00:24:20 +0100 Subject: Generate qtz properties Qtz has no own po files so use one of configured langauge's po files (en-US excludex) Plus copy all properties files independently of localization Change-Id: Ica7ccb7d3111f2fc2b3bbde4b839cb564967130a --- l10ntools/source/propmerge.cxx | 3 ++- solenv/gbuild/ExtensionTarget.mk | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx index a858f44d8210..689e931c4b72 100644 --- a/l10ntools/source/propmerge.cxx +++ b/l10ntools/source/propmerge.cxx @@ -182,7 +182,8 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false ); - if( aMergeDataFile.GetLanguages()[0] != m_sLang ) + const std::vector aLanguages = aMergeDataFile.GetLanguages(); + if( m_sLang != "qtz" && !aLanguages.empty() && aLanguages[0] != m_sLang ) { std::cerr << "Propex error: given language conflicts with " diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 63dbc4d244f7..472b50d2c83f 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -234,6 +234,9 @@ endef # localize .properties file # source file is copied to $(WORKDIR) define gb_ExtensionTarget_localize_properties +ifneq ($(filter-out en-US,$(gb_ExtensionTarget_ALL_LANGS)),) +$(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst en_US,qtz,$(2)),$(3),qtz,$(firstword $(filter-out en-US,$(gb_ExtensionTarget_ALL_LANGS)))) +endif $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS),\ $(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst en_US,$(subst -,_,$(lang)),$(2)),$(3),$(lang))) endef @@ -242,9 +245,9 @@ define gb_ExtensionTarget_localize_properties_onelang $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2) ifneq ($(filter-out en-US,$(4)),) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ - POFILE := $(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po + POFILE := $(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ - $(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po + $(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po endif $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) \ @@ -253,13 +256,13 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \ $(gb_ExtensionTarget_PROPMERGETARGET) $$(call gb_Output_announce,$(2),$(true),PRP,3) $$(call gb_Helper_abbreviate_dirs, \ - $(if $(filter-out en-US,$(4)), \ - MERGEINPUT=`$(gb_MKTEMP)` && \ - echo $$(POFILE) > $$$${MERGEINPUT} && \ - mkdir -p $$(dir $$@) && \ - $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$< -o $$@ -m $$$${MERGEINPUT} -l $(4) && \ - rm -rf $$$${MERGEINPUT}, \ - cp $$< $$@)) + mkdir -p $$(dir $$@) && \ + cp -f $$< $$@ ) + $(if $(filter-out en-US,$(4)), \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $$(POFILE) > $$$${MERGEINPUT} && \ + $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$< -o $$@ -m $$$${MERGEINPUT} -l $(4) && \ + rm -rf $$$${MERGEINPUT}) endef -- cgit From a7261b424716463a7bb157f0d79084c868e10015 Mon Sep 17 00:00:00 2001 From: Zolnai Date: Tue, 20 Nov 2012 00:38:47 +0100 Subject: Updated core Project: help a6e68151d44f357d5828d3a75193d67863226b12 Fix dependacies in help --- helpcontent2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpcontent2 b/helpcontent2 index 55742016f74d..a6e68151d44f 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 55742016f74d1ec3a8f6f146457b34db675dac15 +Subproject commit a6e68151d44f357d5828d3a75193d67863226b12 -- cgit