Rebased ref, commits from common ancestor: commit 08cd4fed2441f6a99250e6f254a0982cfda98661 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Fri Oct 9 15:53:20 2015 -0400
add install_name_patcher.app Change-Id: I47e3e0a950c8070cf44dff36c0586896f159d847 diff --git a/setup_native/install_name_patcher.app/Contents/Info.plist b/setup_native/install_name_patcher.app/Contents/Info.plist new file mode 100644 index 0000000..933dedc --- /dev/null +++ b/setup_native/install_name_patcher.app/Contents/Info.plist @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!-- + * 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 . +--> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>UTExportedTypeDeclarations</key> + + <key>UTImportedTypeDeclarations</key> + + <key>CFBundleExecutable</key> + <string>Patcher.sh</string> + <key>CFBundleIconFile</key> + <string>lo_patcher.icns</string> + <key>CFBundleShortVersionString</key> + <string>9</string> + <key>CFBundleIdentifier</key> + <string>${BUNDLEIDENTIFIER}</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleSignature</key> + <string>OOo3</string> + <key>LSRequiresCarbon</key> + <string>1</string> + <key>NSPrincipalClass</key> + <string>VCL_NSApplication</string> +</dict> +</plist> diff --git a/setup_native/install_name_patcher.app/Contents/Patcher.sh b/setup_native/install_name_patcher.app/Contents/Patcher.sh new file mode 100755 index 0000000..1ee9078 --- /dev/null +++ b/setup_native/install_name_patcher.app/Contents/Patcher.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# 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 . +# + +MYDIR=$(dirname "$0") + +osascript "$MYDIR/patch.applescript" diff --git a/setup_native/install_name_patcher.app/Contents/Resources/lo_patcher.icns b/setup_native/install_name_patcher.app/Contents/Resources/lo_patcher.icns new file mode 100644 index 0000000..45fca0f Binary files /dev/null and b/setup_native/install_name_patcher.app/Contents/Resources/lo_patcher.icns differ diff --git a/setup_native/install_name_patcher.app/Contents/Tools/install-name-tool b/setup_native/install_name_patcher.app/Contents/Tools/install-name-tool new file mode 100755 index 0000000..5ab176e Binary files /dev/null and b/setup_native/install_name_patcher.app/Contents/Tools/install-name-tool differ diff --git a/setup_native/install_name_patcher.app/Contents/Tools/otool b/setup_native/install_name_patcher.app/Contents/Tools/otool new file mode 100755 index 0000000..29b67d1 Binary files /dev/null and b/setup_native/install_name_patcher.app/Contents/Tools/otool differ diff --git a/setup_native/install_name_patcher.app/Contents/package.tar.bz2 b/setup_native/install_name_patcher.app/Contents/package.tar.bz2 new file mode 100644 index 0000000..5bf7b9d Binary files /dev/null and b/setup_native/install_name_patcher.app/Contents/package.tar.bz2 differ diff --git a/setup_native/install_name_patcher.app/Contents/patch.applescript b/setup_native/install_name_patcher.app/Contents/patch.applescript new file mode 100755 index 0000000..ac4ec13 --- /dev/null +++ b/setup_native/install_name_patcher.app/Contents/patch.applescript @@ -0,0 +1,409 @@ +(* + + 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 . +*) + +---set libsSystemBasepaths to {"/usr/lib/", "/opt/"} +set libsSystemBasepaths to {"/usr/lib/"} +set tarballName to "package.tar.bz2" + +global frameworksRelativePath +global macosRelativePath +set frameworksRelativePath to "/Contents/Frameworks" +set macosRelativePath to "/Contents/MacOS" + +set libNameStdcxx to "libstdc++.6.dylib" +set libNameGccS to "libgcc_s.1.dylib" +set listOfLibNames to {libNameStdcxx, libNameGccS} +set newPathForLibs to "@loader_path/" +set newPathForProgs to "@executable_path/../Frameworks/" + +set toolname to "install-name-tool" +set toobindir to "Tools/" +set otoolname to "otool" +set isOtoolHere to false + +set path2me to POSIX path of ((path to me as text) & "::") -- path to this script's parent folder + +set OKLabel to "Ok" +set doItLabel to "Do it" +set PatchLabel to "Patch" +set BreakLabel to "Break" + +set welcomeMsg to "Welcome to Patcher! + +It may be used to fix your versions of LibreOffice" + +set chooseMyOwn to "not listed here (choose location)" +set listPrompt to "Choose LibreOffice bundle which you want to patch" +set chooseManualMsg to "Point to your LibreOffice application" +set listDoneLabel to "This one" +set listCancelLabel to BreakLabel +set appIsNotLibreOfficeMsg to "is not a real LibreOffice + +Run the patcher again and choose another LibreOffice bundle" + +set IdentifyQ to "Can't extract package, most likely your account does not have the necessary privileges + +Do you want to identify as administrator and try again?" +set IdentifyYES to "Yes, identify" +set IdentifyNO to "Nope, cancel" +set identifyFailedMsg to "Identification failed" + +set installCompleteMessage to "Everything done + +Enjoy!" + +set proceedOrNotMessage to "Proceed? Below is the list of files to fix entries for shared libraries " & list2string(listOfLibNames) & " from " & list2string(libsSystemBasepaths) & " using " & quoted form of toolname +set installOrNotMessage to "Install? Contents of package to patch" + +set noToolMsg to "This patcher does not include " & quoted form of (toolname as string) & " utility, so it is useless" + +set noLibsProgsMsg to "Search for libraries and programs failed" + +global appBundleType +set appBundleType to "com.apple.application-bundle" + +--*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-- + +on replace_chars(this_text, search_string, replacement_string) + set AppleScript's text item delimiters to search_string + set item_list to every text item of this_text + set AppleScript's text item delimiters to replacement_string + set this_text to item_list as string + set AppleScript's text item delimiters to "" + return this_text +end replace_chars + +on list2string(theList) + set firstItem to first item of theList as string + set resultString to "{ " + repeat with itemString in theList + if itemString as string is not firstItem then + set resultString to resultString & ", " + end if + set resultString to resultString & itemString as string + end repeat + set resultString to resultString & " }" + return resultString +end list2string + +on choose_bundle_dialog(theMessage) + choose file with prompt theMessage of type appBundleType without showing package contents and invisibles +end choose_bundle_dialog + +on isValidLibreOfficeBundle(pathToBundle) + if pathToBundle is "" then + return false + end if + + set pathToLibs to (pathToBundle as string) & frameworksRelativePath + set pathToProgs to (pathToBundle as string) & macosRelativePath + set pathToLibs to replace_chars(pathToLibs, "//", "/") + set pathToProgs to replace_chars(pathToProgs, "//", "/") + + set stringForGreping to "<string>LibreOffice" + set whereIsPlist to "/Contents/Info.plist" + set grepingScript to "grep " & quoted form of stringForGreping & " " & quoted form of ((pathToBundle as string) & whereIsPlist) + set findSofficeScript to "find " & quoted form of (pathToProgs as string) & " -iname soffice -type f -print" + set findLibappScript to "find " & quoted form of (pathToLibs as string) & " -iname libsofficeapp* -type f -print" + + try + set grepLOresult to (do shell script grepingScript) + ---display dialog grepLOresult + + set foundSoffice to (do shell script findSofficeScript) + if foundSoffice is "" then + return false + end if + ---display dialog foundSoffice + + set foundLibapp to (do shell script findLibappScript) + if foundLibapp is "" then + return false + end if + return true + on error + -- fall thru + end try + return false +end isValidLibreOfficeBundle + +--*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-- + +activate + +display dialog welcomeMsg buttons {BreakLabel, PatchLabel} default button 2 without icon +if (button returned of result) is BreakLabel then + return 2 -- nevermind bye +end if + +-- ************************ +-- check if "install name tool" is here +-- ************************ +set path2tool to POSIX path of ((path2me as string) & toobindir & toolname) +try + do shell script "test -f " & quoted form of (path2tool as string) +on error + display dialog noToolMsg buttons {OKLabel} default button 1 with icon 0 + return 1 +end try + +-- ************************ +-- check if otool is installed +-- ************************ +---set toolname to "otool" +---try +-----set whichresult to (do shell script "which " & toolname) +---on error +-----set noOtoolMsg to "Your system does not have " & quoted form of (toolname as string) & " utility" +-----display dialog noOtoolMsg buttons {OKLabel} default button 1 with icon 1 +-----return 1 +---end try + +-- ************************ +-- see if "otool" is here +-- ************************ +set path2otool to POSIX path of ((path2me as string) & toobindir & otoolname) +try + do shell script "test -f " & quoted form of (path2otool as string) + set isOtoolHere to true +on error + set isOtoolHere to false +end try + +-- ************************ +-- search for LibreOffice app bundles +-- ************************ +set found_LOes_all to "" + +try -- 'mdfind' may return an error when Spotlight is disabled + ---set searchForAppBundlesScript to "mdfind \"kMDItemContentType == " & quoted form of appBundleType & "\"" -- find all bundles + set appBundleName to "LibreOffice*" + set searchForAppBundlesScript to "mdfind \"kMDItemContentType == " & quoted form of appBundleType & " && kMDItemDisplayName == " & quoted form of appBundleName & "\"" + set found_LOes_all to do shell script searchForAppBundlesScript +end try +set found_LOes_all_paragraphs to paragraphs in found_LOes_all + +set found_LOes to {} -- it is AppleScript list +repeat with currentApp in found_LOes_all_paragraphs + if currentApp does not start with "/Volumes" then + if isValidLibreOfficeBundle(currentApp) then + copy currentApp to the end of found_LOes + end if + end if +end repeat + +if (count of found_LOes) is not 0 then + copy chooseMyOwn to the end of found_LOes +end if + +-- ************************ +-- show file dialog if no LibreOffice found or show list of bundles to choose from +-- ************************ +set didManualSelection to false +if (count of found_LOes) is 0 then -- no LibreOffices found + -- yeah, one is supposed to "choose file" + set chosenLObundle to POSIX path of choose_bundle_dialog(chooseManualMsg) + set didManualSelection to true + --- + ---else if (get second item of found_LOes as string) is chooseMyOwn then -- only one LibreOffice found + ---set chosenLObundle to (get first item of found_LOes) +else + set chosenLObundle to (choose from list found_LOes default items (get first item of found_LOes) with prompt listPrompt OK button name listDoneLabel cancel button name listCancelLabel) + if chosenLObundle is false then + return 2 -- cancelled by user + else if (chosenLObundle as string) is chooseMyOwn then + set chosenLObundle to POSIX path of choose_bundle_dialog(chooseManualMsg) + set didManualSelection to true + end if +end if + +-- ************************ +-- check whether chosen path is really a LibreOffice bundle +-- ************************ +if didManualSelection then + ---set loBundleNameWithoutTrailingSlash to replace_chars(chosenLObundle as string, ".app/", ".app") + set loBundleNameWithoutTrailingSlash to text 1 through -2 of chosenLObundle as string + if not isValidLibreOfficeBundle(chosenLObundle) then + display dialog loBundleNameWithoutTrailingSlash & " " & appIsNotLibreOfficeMsg buttons {OKLabel} default button 1 with icon 1 + return 3 -- wrong target-directory + end if +end if + +-- ************************ +-- search for dylibs, jnilibs, programs +-- ************************ +set search_path_libs to (chosenLObundle as string) & frameworksRelativePath +set search_path_progs to (chosenLObundle as string) & macosRelativePath +set search_path_libs to replace_chars(search_path_libs, "//", "/") +set search_path_progs to replace_chars(search_path_progs, "//", "/") + +try + set found_dylibs_all to (do shell script "find " & quoted form of (search_path_libs as string) & " -iname *dylib* -type f -print") + --(do shell script "mdfind -onlyin " & quoted form of (search_path as string) & " \" kMDItemDisplayName == '*dylib*' \" ") + set found_jnilibs_all to (do shell script "find " & quoted form of (search_path_libs as string) & " -iname *jnilib* -type f -print") + set found_programs_all to (do shell script "find " & quoted form of (search_path_progs as string) & " -type f -print | grep -v \".framework\" ") +on error + display dialog noLibsProgsMsg buttons {OKLabel} default button 1 with icon 1 + return 1 +end try + +set found_dylibs_all_paragraphs to paragraphs in found_dylibs_all +set found_jnilibs_all_paragraphs to paragraphs in found_jnilibs_all +set found_programs_all_paragraphs to paragraphs in found_programs_all + +set libraries_list to {} +repeat with currentEntry in found_dylibs_all_paragraphs + -- filter python stuff out + if currentEntry does not end with ".py" and currentEntry does not end with ".pyc" and currentEntry does not end with ".pyo" then + copy currentEntry to the end of libraries_list + end if +end repeat +repeat with currentEntry in found_jnilibs_all_paragraphs + copy currentEntry to the end of libraries_list +end repeat + +set programs_list to {} +repeat with currentEntry in found_programs_all_paragraphs + set file_result to (do shell script "file " & quoted form of (currentEntry as string)) + if file_result contains "executable" and file_result does not contain "script" then + copy currentEntry to the end of programs_list + end if + --if file_result contains "shared library" then + -- last chance for this library + -- copy currentEntry to the end of executables_list + --end if +end repeat + +-- ************************ +-- show the list of files +-- ************************ +set full_list to {} +repeat with currentEntry in programs_list + copy currentEntry to the end of full_list +end repeat +repeat with currentEntry in libraries_list + copy currentEntry to the end of full_list +end repeat + +set the listchoice to (choose from list full_list with prompt proceedOrNotMessage OK button name OKLabel cancel button name BreakLabel with empty selection allowed) +if listchoice is false then + return 2 -- cancelled by user +end if + +-- ************************ +-- fix libraries +-- ************************ +repeat with currentFile in libraries_list + set nametool_call_one to (quoted form of (path2tool as string) & " -change " & quoted form of ((first item of libsSystemBasepath) & libNameStdcxx) & " " & quoted form of (newPathForLibs & libNameStdcxx) & " " & quoted form of (currentFile as string)) + ---set the clipboard to nametool_call_one + set nametool_call_two to (quoted form of (path2tool as string) & " -change " & quoted form of ((first item of libsSystemBasepath) & libNameGccS) & " " & quoted form of (newPathForLibs & libNameGccS) & " " & quoted form of (currentFile as string)) + ---set the clipboard to nametool_call_two + try + set nametool_result to (do shell script nametool_call_one) + set nametool_result to (do shell script nametool_call_two) + on error + -- do nothing + end try +end repeat + +-- ************************ +-- fix programs +-- ************************ +repeat with currentFile in programs_list + set nametool_call_one to (quoted form of (path2tool as string) & " -change " & quoted form of ((first item of libsSystemBasepath) & libNameStdcxx) & " " & quoted form of (newPathForProgs & libNameStdcxx) & " " & quoted form of (currentFile as string)) + set nametool_call_two to (quoted form of (path2tool as string) & " -change " & quoted form of ((first item of libsSystemBasepath) & libNameGccS) & " " & quoted form of (newPathForProgs & libNameGccS) & " " & quoted form of (currentFile as string)) + try + set nametool_result to (do shell script nametool_call_one) + set nametool_result to (do shell script nametool_call_two) + on error + -- nothing + end try +end repeat + +-- ************************ +-- check if everything is fixed +-- (note: otool -L on every file is really a bad idea) +-- ************************ +----set otool_result to (do shell script "find " & quoted form of (chosenLObundle as string) & " -type f -print0 | xargs -0 otool -L | grep -B 1 '" & libsSystemBasepath & "libstdc++'") +----set num_lines to (count paragraphs in otool_result) +----if num_lines > 3 then +---- display dialog "Not everything is fixed + +----" & (num_lines as string) & " lines" & " +----" & otool_result with icon 2 +----end if + +-- ************************ +-- unpack patch's package +-- ************************ + +set tarListCommand to "/usr/bin/tar -tjf " & quoted form of (path2me as string) & "/" & tarballName +set tarExtractCommand to "/usr/bin/tar -C " & quoted form of (chosenLObundle as string) & " -xjf " & quoted form of (path2me as string) & "/" & tarballName + +try + set tarball_list_all to (do shell script tarListCommand) + set tarball_list_all_paras to paragraphs in tarball_list_all + set tarball_list_files to {} + repeat with currentEntry in tarball_list_all_paras + if currentEntry does not end with "/" then + copy currentEntry to the end of tarball_list_files + end if + end repeat + set the tarball_choice to (choose from list tarball_list_files with prompt installOrNotMessage & " " & chosenLObundle OK button name doItLabel cancel button name BreakLabel with empty selection allowed) + if tarball_choice is false then + return 2 -- cancelled by user's choice + end if +on error + -- do nothing +end try + +try + do shell script tarExtractCommand +on error errMSG number errNUM + display dialog IdentifyQ buttons {IdentifyYES, IdentifyNO} with icon 2 + if (button returned of result) is IdentifyYES then + try + do shell script tarExtractCommand with administrator privileges + on error errMSG number errNUM + display dialog (identifyFailedMsg & " ( error " & errNUM as string) & " )" buttons {OKLabel} default button 1 with icon 0 + -- -60005 username/password wrong + -- -128 cancelled by user + -- 2 tarball not found + return errNUM -- 2-DO: de-crypt errNUM as part of dialog's message + end try + else + return 2 -- cancelled by user + end if +end try + +-- ************************ +-- fix libgcc_s.1.dylib entry of libstdc++.6.dylib itself +-- ************************ +set locationOfLibStdCXXInsideBundle to (chosenLObundle as string) & frameworksRelativePath & "/" & libNameStdcxx +set nametoolCall to (quoted form of (path2tool as string) & " -change " & quoted form of (libsSystemBasepath & libNameGccS) & " " & quoted form of (newPathForLibs & libNameGccS) & " " & quoted form of locationOfLibStdCXXInsideBundle) +try + set nametool_result to (do shell script nametoolCall) +on error + -- nothing +end try + +-- ************************ +-- bye! +-- ************************ +display dialog installCompleteMessage buttons {OKLabel} default button 1 without icon commit 05911d582020c7e101a57bd4513175e7aaf2f527 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Tue Oct 6 04:29:37 2015 -0400 modify application's icon preserve original "icns" as main.icns.orig Change-Id: I2ac122f1be180acfc5ea18d99f355527b9273eea diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns index c3e1bf6..5fb6fe1 100644 Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ diff --git a/sysui/desktop/icons/main.icns.orig b/sysui/desktop/icons/main.icns.orig new file mode 100644 index 0000000..c3e1bf6 Binary files /dev/null and b/sysui/desktop/icons/main.icns.orig differ commit 7d0e1933232aa529376cba033ec8abcced4a47a9 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Oct 14 05:04:48 2015 -0400 slightly alter the version of LibreOffice in AC_INIT Change-Id: Id851544f17969f5824b4250c03f8ff4319c5b511 diff --git a/configure.ac b/configure.ac index 2b15e25..e3bc56f 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.1.0.0.alpha1+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.1.0.alpha1+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) commit df038278be61c32de140791838c88a302bca8d53 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Mon Oct 12 10:47:35 2015 -0400 make SvxFmDrawPage::acquire a public symbol in libsvxcorelo -fvisibility-inlines-hidden implicitly marks all inline functions as hidden and sometimes { like `t __ZThn24_N13SvxFmDrawPage7acquireEv' Undefined symbols: "non-virtual thunk to SvxFmDrawPage::acquire()" } this needs to be changed manually expand DECLARE_UNO3_AGG_DEFAULTS macro from comphelper/uno3.hxx Change-Id: I6ceadd697f4840196596b3e7c318cf9a89b485ac diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index 93782db..6f50aeb 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -47,7 +47,17 @@ public: virtual ~SvxFmDrawPage() throw (); // UNO connection - DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage) + virtual void SAL_CALL SAL_DLLPUBLIC_EXPORT acquire( ) /* SAL_DLLPUBLIC_EXPORT to be a public symbol explicitly */ + throw( ) override + { SvxDrawPage::acquire( ); } + + virtual void SAL_CALL release( ) + throw( ) override + { SvxDrawPage::release( ); } + + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rrType ) + throw ( css::uno::RuntimeException, std::exception ) override + { return SvxDrawPage::queryInterface( rrType ); } virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; commit 3030b0ea3faaac2812d73bae0c78e282312becb6 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Oct 14 08:24:36 2015 -0400 make code in implbase.hxx & compbase.hxx be available for external use create stubs implbase1...12.hxx compbase1..12.hxx for compatibility with external code Change-Id: I73ed2421017899d446a9a47b4acbee9ea13e776b diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx index 327ef82..24f802c 100644 --- a/include/cppuhelper/compbase.hxx +++ b/include/cppuhelper/compbase.hxx @@ -40,8 +40,6 @@ namespace com { namespace sun { namespace star { namespace lang { } } } } namespace osl { class Mutex; } -#if defined LIBO_INTERNAL_ONLY - namespace cppu { /** Implementation helper implementing interfaces @@ -195,6 +193,4 @@ public: #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx new file mode 100644 index 0000000..63327d4 --- /dev/null +++ b/include/cppuhelper/compbase1.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE1_HXX +#define INCLUDED_CPPUHELPER_COMPBASE1_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper1 PartialWeakComponentImplHelper +#define WeakComponentImplHelper1 WeakComponentImplHelper +#define WeakAggComponentImplHelper1 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx new file mode 100644 index 0000000..4d8304f --- /dev/null +++ b/include/cppuhelper/compbase10.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE10_HXX +#define INCLUDED_CPPUHELPER_COMPBASE10_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper10 PartialWeakComponentImplHelper +#define WeakComponentImplHelper10 WeakComponentImplHelper +#define WeakAggComponentImplHelper10 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx new file mode 100644 index 0000000..7b76d56 --- /dev/null +++ b/include/cppuhelper/compbase11.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE11_HXX +#define INCLUDED_CPPUHELPER_COMPBASE11_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper11 PartialWeakComponentImplHelper +#define WeakComponentImplHelper11 WeakComponentImplHelper +#define WeakAggComponentImplHelper11 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx new file mode 100644 index 0000000..4e40cc4 --- /dev/null +++ b/include/cppuhelper/compbase12.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE12_HXX +#define INCLUDED_CPPUHELPER_COMPBASE12_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper12 PartialWeakComponentImplHelper +#define WeakComponentImplHelper12 WeakComponentImplHelper +#define WeakAggComponentImplHelper12 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx new file mode 100644 index 0000000..7b00503 --- /dev/null +++ b/include/cppuhelper/compbase2.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE2_HXX +#define INCLUDED_CPPUHELPER_COMPBASE2_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper2 PartialWeakComponentImplHelper +#define WeakComponentImplHelper2 WeakComponentImplHelper +#define WeakAggComponentImplHelper2 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx new file mode 100644 index 0000000..508e360 --- /dev/null +++ b/include/cppuhelper/compbase3.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE3_HXX +#define INCLUDED_CPPUHELPER_COMPBASE3_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper3 PartialWeakComponentImplHelper +#define WeakComponentImplHelper3 WeakComponentImplHelper +#define WeakAggComponentImplHelper3 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx new file mode 100644 index 0000000..68d6eb7 --- /dev/null +++ b/include/cppuhelper/compbase4.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE4_HXX +#define INCLUDED_CPPUHELPER_COMPBASE4_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper4 PartialWeakComponentImplHelper +#define WeakComponentImplHelper4 WeakComponentImplHelper +#define WeakAggComponentImplHelper4 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx new file mode 100644 index 0000000..8b029aa --- /dev/null +++ b/include/cppuhelper/compbase5.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE5_HXX +#define INCLUDED_CPPUHELPER_COMPBASE5_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper5 PartialWeakComponentImplHelper +#define WeakComponentImplHelper5 WeakComponentImplHelper +#define WeakAggComponentImplHelper5 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx new file mode 100644 index 0000000..20559ee --- /dev/null +++ b/include/cppuhelper/compbase6.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE6_HXX +#define INCLUDED_CPPUHELPER_COMPBASE6_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper6 PartialWeakComponentImplHelper +#define WeakComponentImplHelper6 WeakComponentImplHelper +#define WeakAggComponentImplHelper6 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx new file mode 100644 index 0000000..8a06218 --- /dev/null +++ b/include/cppuhelper/compbase7.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE7_HXX +#define INCLUDED_CPPUHELPER_COMPBASE7_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper7 PartialWeakComponentImplHelper +#define WeakComponentImplHelper7 WeakComponentImplHelper +#define WeakAggComponentImplHelper7 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx new file mode 100644 index 0000000..5b39c1e --- /dev/null +++ b/include/cppuhelper/compbase8.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE8_HXX +#define INCLUDED_CPPUHELPER_COMPBASE8_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper8 PartialWeakComponentImplHelper +#define WeakComponentImplHelper8 WeakComponentImplHelper +#define WeakAggComponentImplHelper8 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx new file mode 100644 index 0000000..382196f --- /dev/null +++ b/include/cppuhelper/compbase9.hxx @@ -0,0 +1,33 @@ +/* -*- 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 INCLUDED_CPPUHELPER_COMPBASE9_HXX +#define INCLUDED_CPPUHELPER_COMPBASE9_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/compbase.hxx> + +#define PartialWeakComponentImplHelper9 PartialWeakComponentImplHelper +#define WeakComponentImplHelper9 WeakComponentImplHelper +#define WeakAggComponentImplHelper9 WeakAggComponentImplHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx index 81d1c54..49e1130 100644 --- a/include/cppuhelper/implbase.hxx +++ b/include/cppuhelper/implbase.hxx @@ -36,8 +36,6 @@ #include <rtl/instance.hxx> #include <sal/types.h> -#if defined LIBO_INTERNAL_ONLY - namespace cppu { /// @cond INTERNAL @@ -332,6 +330,4 @@ public: #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx new file mode 100644 index 0000000..5fc9a3b --- /dev/null +++ b/include/cppuhelper/implbase1.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE1_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE1_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData1 ImplClassData +#define ImplHelper1 ImplHelper +#define WeakImplHelper1 WeakImplHelper +#define WeakAggImplHelper1 WeakAggImplHelper +#define ImplInheritanceHelper1 ImplInheritanceHelper +#define AggImplInheritanceHelper1 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx new file mode 100644 index 0000000..347fad7 --- /dev/null +++ b/include/cppuhelper/implbase10.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE10_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE10_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData10 ImplClassData +#define ImplHelper10 ImplHelper +#define WeakImplHelper10 WeakImplHelper +#define WeakAggImplHelper10 WeakAggImplHelper +#define ImplInheritanceHelper10 ImplInheritanceHelper +#define AggImplInheritanceHelper10 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx new file mode 100644 index 0000000..02d7dd7 --- /dev/null +++ b/include/cppuhelper/implbase11.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE11_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE11_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData11 ImplClassData +#define ImplHelper11 ImplHelper +#define WeakImplHelper11 WeakImplHelper +#define WeakAggImplHelper11 WeakAggImplHelper +#define ImplInheritanceHelper11 ImplInheritanceHelper +#define AggImplInheritanceHelper11 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx new file mode 100644 index 0000000..744c23f --- /dev/null +++ b/include/cppuhelper/implbase12.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE12_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE12_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData12 ImplClassData +#define ImplHelper12 ImplHelper +#define WeakImplHelper12 WeakImplHelper +#define WeakAggImplHelper12 WeakAggImplHelper +#define ImplInheritanceHelper12 ImplInheritanceHelper +#define AggImplInheritanceHelper12 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx new file mode 100644 index 0000000..662388a --- /dev/null +++ b/include/cppuhelper/implbase13.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE13_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE13_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData13 ImplClassData +#define ImplHelper13 ImplHelper +#define WeakImplHelper13 WeakImplHelper +#define WeakAggImplHelper13 WeakAggImplHelper +#define ImplInheritanceHelper13 ImplInheritanceHelper +#define AggImplInheritanceHelper13 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx new file mode 100644 index 0000000..83ccb84 --- /dev/null +++ b/include/cppuhelper/implbase2.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE2_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE2_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData2 ImplClassData +#define ImplHelper2 ImplHelper +#define WeakImplHelper2 WeakImplHelper +#define WeakAggImplHelper2 WeakAggImplHelper +#define ImplInheritanceHelper2 ImplInheritanceHelper +#define AggImplInheritanceHelper2 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx new file mode 100644 index 0000000..e20a500 --- /dev/null +++ b/include/cppuhelper/implbase3.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE3_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE3_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData3 ImplClassData +#define ImplHelper3 ImplHelper +#define WeakImplHelper3 WeakImplHelper +#define WeakAggImplHelper3 WeakAggImplHelper +#define ImplInheritanceHelper3 ImplInheritanceHelper +#define AggImplInheritanceHelper3 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx new file mode 100644 index 0000000..8129bd6 --- /dev/null +++ b/include/cppuhelper/implbase4.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE4_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE4_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData4 ImplClassData +#define ImplHelper4 ImplHelper +#define WeakImplHelper4 WeakImplHelper +#define WeakAggImplHelper4 WeakAggImplHelper +#define ImplInheritanceHelper4 ImplInheritanceHelper +#define AggImplInheritanceHelper4 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx new file mode 100644 index 0000000..abc4df1 --- /dev/null +++ b/include/cppuhelper/implbase5.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE5_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE5_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData5 ImplClassData +#define ImplHelper5 ImplHelper +#define WeakImplHelper5 WeakImplHelper +#define WeakAggImplHelper5 WeakAggImplHelper +#define ImplInheritanceHelper5 ImplInheritanceHelper +#define AggImplInheritanceHelper5 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx new file mode 100644 index 0000000..6b0c11d --- /dev/null +++ b/include/cppuhelper/implbase6.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE6_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE6_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData6 ImplClassData +#define ImplHelper6 ImplHelper +#define WeakImplHelper6 WeakImplHelper +#define WeakAggImplHelper6 WeakAggImplHelper +#define ImplInheritanceHelper6 ImplInheritanceHelper +#define AggImplInheritanceHelper6 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx new file mode 100644 index 0000000..fc3b72c --- /dev/null +++ b/include/cppuhelper/implbase7.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE7_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE7_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData7 ImplClassData +#define ImplHelper7 ImplHelper +#define WeakImplHelper7 WeakImplHelper +#define WeakAggImplHelper7 WeakAggImplHelper +#define ImplInheritanceHelper7 ImplInheritanceHelper +#define AggImplInheritanceHelper7 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx new file mode 100644 index 0000000..e9aff85 --- /dev/null +++ b/include/cppuhelper/implbase8.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE8_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE8_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData8 ImplClassData +#define ImplHelper8 ImplHelper +#define WeakImplHelper8 WeakImplHelper +#define WeakAggImplHelper8 WeakAggImplHelper +#define ImplInheritanceHelper8 ImplInheritanceHelper +#define AggImplInheritanceHelper8 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx new file mode 100644 index 0000000..016522c --- /dev/null +++ b/include/cppuhelper/implbase9.hxx @@ -0,0 +1,36 @@ +/* -*- 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 INCLUDED_CPPUHELPER_IMPLBASE9_HXX +#define INCLUDED_CPPUHELPER_IMPLBASE9_HXX + +/* This header is kept for backwards compatibility with external code */ +/* For new code use implbase.hxx */ + +#include <cppuhelper/implbase.hxx> + +#define ImplClassData9 ImplClassData +#define ImplHelper9 ImplHelper +#define WeakImplHelper9 WeakImplHelper +#define WeakAggImplHelper9 WeakAggImplHelper +#define ImplInheritanceHelper9 ImplInheritanceHelper +#define AggImplInheritanceHelper9 AggImplInheritanceHelper + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 19d8997bde78495d819ca3d28a009cdb1a80be9a Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Oct 7 23:35:23 2015 -0400 farewell implbase1...implbase13 & compbase1...compbase12 adios non-variadic implbase# & compbase# Change-Id: I4141cad65579d5a6ce84fe99ad3ed9ffb74d6204 diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx deleted file mode 100644 index b710ecc..0000000 --- a/include/cppuhelper/compbase1.hxx +++ /dev/null @@ -1,148 +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 INCLUDED_CPPUHELPER_COMPBASE1_HXX -#define INCLUDED_CPPUHELPER_COMPBASE1_HXX - -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/compbase_ex.hxx> - -namespace cppu -{ - - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. - - Upon disposing objects of this class, sub-classes receive a disposing() - call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. - - @attention - The life-cycle of the passed mutex reference has to be longer than objects of this class. - - @derive - Inherit from this class giving your interface(s) to be implemented as template argument(s). - Your sub class defines method implementations for these interface(s). - */ - template< class Ifc1 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper1 - : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider - , public Ifc1 - { - struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > > {}; - public: - inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () - : WeakComponentImplHelperBase( rMutex ) - {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ImplHelper_getImplementationId( cd::get() ); } - }; - - /** Same as WeakComponentImplHelper1, except doesn't implement - addEventListener, removeEventListener and dispose. - - This requires derived classes to implement those three methods. - This makes it possible to implement classes which are required to - implement methods from multiple bases which have different - addEventListener/removeEventListener signatures without triggering - the g++ overloaded-virtual warning - */ - template< class Ifc1 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper1 - : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider - , public Ifc1 - { - struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, PartialWeakComponentImplHelper1< Ifc1 > > > {}; - public: - inline PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () - : WeakComponentImplHelperBase( rMutex ) - {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ImplHelper_getImplementationId( cd::get() ); } - }; - - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. - - Upon disposing objects of this class, sub-classes receive a disposing() - call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be - aggregated, i.e. incoming queryInterface() calls are delegated. - - @attention - The life-cycle of the passed mutex reference has to be longer than objects of this class. - - @derive - Inherit from this class giving your interface(s) to be implemented as template argument(s). - Your sub class defines method implementations for these interface(s). - - @deprecated - */ - template< class Ifc1 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper1 - : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider - , public Ifc1 - { - struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {}; - public: - inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw () - : WeakAggComponentImplHelperBase( rMutex ) - {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE - { WeakAggComponentImplHelperBase::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE - { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ImplHelper_getImplementationId( cd::get() ); } - }; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx deleted file mode 100644 index 2e9cb53..0000000 --- a/include/cppuhelper/compbase10.hxx +++ /dev/null @@ -1,148 +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 INCLUDED_CPPUHELPER_COMPBASE10_HXX -#define INCLUDED_CPPUHELPER_COMPBASE10_HXX - -#include <cppuhelper/implbase10.hxx> -#include <cppuhelper/compbase_ex.hxx> - -namespace cppu -{ - - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. - - Upon disposing objects of this class, sub-classes receive a disposing() - call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. - - @attention - The life-cycle of the passed mutex reference has to be longer than objects of this class. - - @derive - Inherit from this class giving your interface(s) to be implemented as template argument(s). - Your sub class defines method implementations for these interface(s). - */ - template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper10 - : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider - , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10 - { - struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; - public: - inline WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () - : WeakComponentImplHelperBase( rMutex ) - {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ImplHelper_getImplementationId( cd::get() ); } - }; - - /** Same as WeakComponentImplHelper10, except doesn't implement - addEventListener, removeEventListener and dispose. - - This requires derived classes to implement those three methods. - This makes it possible to implement classes which are required to - implement methods from multiple bases which have different - addEventListener/removeEventListener signatures without triggering - the g++ overloaded-virtual warning - */ - template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper10 - : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider - , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10 - { - struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, PartialWeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; - public: - inline PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () - : WeakComponentImplHelperBase( rMutex ) - {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ImplHelper_getImplementationId( cd::get() ); } - }; - - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. - - Upon disposing objects of this class, sub-classes receive a disposing() - call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be - aggregated, i.e. incoming queryInterface() calls are delegated. - - @attention - The life-cycle of the passed mutex reference has to be longer than objects of this class. - - @derive - Inherit from this class giving your interface(s) to be implemented as template argument(s). - Your sub class defines method implementations for these interface(s). - - @deprecated - */ - template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper10 - : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider - , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10 - { - struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; - public: - inline WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw () - : WeakAggComponentImplHelperBase( rMutex ) - {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE - { WeakAggComponentImplHelperBase::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE - { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ImplHelper_getImplementationId( cd::get() ); } - }; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx deleted file mode 100644 index 873fb1d..0000000 --- a/include/cppuhelper/compbase11.hxx +++ /dev/null @@ -1,148 +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 INCLUDED_CPPUHELPER_COMPBASE11_HXX -#define INCLUDED_CPPUHELPER_COMPBASE11_HXX - -#include <cppuhelper/implbase11.hxx> -#include <cppuhelper/compbase_ex.hxx> - -namespace cppu -{ - - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. - - Upon disposing objects of this class, sub-classes receive a disposing() - call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. - - @attention - The life-cycle of the passed mutex reference has to be longer than objects of this class. - - @derive - Inherit from this class giving your interface(s) to be implemented as template argument(s). - Your sub class defines method implementations for these interface(s). - */ - template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper11 - : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider - , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11 - { - struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; - public: - inline WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () - : WeakComponentImplHelperBase( rMutex ) - {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ImplHelper_getImplementationId( cd::get() ); } - }; - - /** Same as WeakComponentImplHelper11, except doesn't implement - addEventListener, removeEventListener and dispose. - - This requires derived classes to implement those three methods. - This makes it possible to implement classes which are required to - implement methods from multiple bases which have different - addEventListener/removeEventListener signatures without triggering - the g++ overloaded-virtual warning - */ - template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper11 - : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider - , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11 - { - struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, PartialWeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; - public: - inline PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () - : WeakComponentImplHelperBase( rMutex ) - {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE - { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ImplHelper_getImplementationId( cd::get() ); } - }; - - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. - - Upon disposing objects of this class, sub-classes receive a disposing() - call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be - aggregated, i.e. incoming queryInterface() calls are delegated. - - @attention - The life-cycle of the passed mutex reference has to be longer than objects of this class. - - @derive - Inherit from this class giving your interface(s) to be implemented as template argument(s). - Your sub class defines method implementations for these interface(s). - - @deprecated - */ - template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper11 - : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider - , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11 - { - struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; - public: - inline WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw () - : WeakAggComponentImplHelperBase( rMutex ) - {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE - { WeakAggComponentImplHelperBase::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE - { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ImplHelper_getImplementationId( cd::get() ); } - }; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx deleted file mode 100644 index 25222bf..0000000 --- a/include/cppuhelper/compbase12.hxx +++ /dev/null @@ -1,148 +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 INCLUDED_CPPUHELPER_COMPBASE12_HXX -#define INCLUDED_CPPUHELPER_COMPBASE12_HXX - -#include <cppuhelper/implbase12.hxx> -#include <cppuhelper/compbase_ex.hxx> - -namespace cppu -{ - - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. - - Upon disposing objects of this class, sub-classes receive a disposing() - call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. - - @attention - The life-cycle of the passed mutex reference has to be longer than objects of this class. - - @derive - Inherit from this class giving your interface(s) to be implemented as template argument(s). - Your sub class defines method implementations for these interface(s). - */ ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits