You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/03 14:24:38 UTC
svn commit: r1441909 [30/45] - in /openoffice/branches/l10n: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/
ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/
extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Modified: openoffice/branches/l10n/main/setup_native/source/packinfo/packinfo_office_lang.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/packinfo/packinfo_office_lang.txt?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/packinfo/packinfo_office_lang.txt (original)
+++ openoffice/branches/l10n/main/setup_native/source/packinfo/packinfo_office_lang.txt Sun Feb 3 13:23:59 2013
@@ -47,7 +47,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -63,7 +63,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -79,7 +79,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -95,7 +95,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -111,7 +111,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
@@ -127,7 +127,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
@@ -143,7 +143,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
@@ -159,7 +159,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
@@ -175,7 +175,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
@@ -191,7 +191,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
@@ -207,7 +207,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
@@ -223,7 +223,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"
Modified: openoffice/branches/l10n/main/setup_native/source/packinfo/packinfo_sdkoo.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/packinfo/packinfo_sdkoo.txt?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/packinfo/packinfo_sdkoo.txt (original)
+++ openoffice/branches/l10n/main/setup_native/source/packinfo/packinfo_sdkoo.txt Sun Feb 3 13:23:59 2013
@@ -29,7 +29,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Software Development Kit for OpenOffice.org %OOOBASEVERSION"
+description = "Software Development Kit for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
Modified: openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_brand.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_brand.txt?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_brand.txt (original)
+++ openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_brand.txt Sun Feb 3 13:23:59 2013
@@ -29,12 +29,12 @@ END
platform=`uname -s`
case $$platform in
SunOS)
- BASISPACKAGE=openofficeorg-core01
+ BASISPACKAGE=apacheopenoffice-core01
BASISDIR=`pkginfo -r $$BASISPACKAGE`
PRODUCTINSTALLLOCATION="$$BASEDIR"
;;
Linux)
- BASISPACKAGE=openoffice.org-core01
+ BASISPACKAGE=apacheopenoffice-core01
BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE`
PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
;;
@@ -44,11 +44,11 @@ Linux)
esac
# creating link to basis layer
-if [ -d $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION ]
+if [ -d $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION ]
then
- ln -s $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+ ln -s $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
else
- ln -s ../openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+ ln -s ../apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
fi
exit 0
Modified: openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_core01.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_core01.txt?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_core01.txt (original)
+++ openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_core01.txt Sun Feb 3 13:23:59 2013
@@ -44,11 +44,11 @@ Linux)
esac
# creating link to ure
-if [ -d $$UREDIR/openoffice.org/ure ]
+if [ -d $$UREDIR/apacheopenoffice/ure ]
then
- ln -s $$UREDIR/openoffice.org/ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+ ln -s $$UREDIR/apacheopenoffice/ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
else
- ln -s ../ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+ ln -s ../ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
fi
exit 0
@@ -80,11 +80,11 @@ Linux)
;;
esac
-if [ -h $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
+if [ -h $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
then
- rm -f $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
- rmdir $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION 2>/dev/null
- rmdir $$PRODUCTINSTALLLOCATION/openoffice.org 2>/dev/null
+ rm -f $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
+ rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION 2>/dev/null
+ rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice 2>/dev/null
fi
exit 0
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx Sun Feb 3 13:23:59 2013
@@ -124,8 +124,8 @@ UINT GetInstallProperty(MSIHANDLE handle
Try to find the installation path to an already installed product.
The installation path will be written in the Windows registry
during the installation. There may exist different products in
- parallel e.g. StarOffice, StarSuite, OpenOffice.org. It will be
- searched in this order for an installed product. If a product
+ parallel e.g. StarOffice, StarSuite, OpenOffice.org, Apache OpenOffice.
+ It will be searched in this order for an installed product. If a product
will be found the path to the product will be set in the property
"INSTALLLOCATION" else nothing will be done.
*/
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx Sun Feb 3 13:23:59 2013
@@ -113,6 +113,10 @@ static BOOL CheckExtensionInRegistry( LP
bRet = true;
}
else if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) == 0 )
+ { // We will replace registration for our (former) own types, too
+ bRet = true;
+ }
+ else if ( strncmp( szBuffer, "Apache OpenOffice.", 18 ) == 0 )
{ // We will replace registration for our own types, too
bRet = true;
}
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx Sun Feb 3 13:23:59 2013
@@ -77,10 +77,10 @@ namespace /* private */
Registrar::Registrar(const RegistrationContextInformation& RegContext) :
m_ContextInformation(RegContext),
- FORWARD_KEY_PREFIX(L"OpenOffice.org"),//FORWARD_KEY_PREFIX(L"soffice6"),
+ FORWARD_KEY_PREFIX(L"Apache OpenOffice"),
DEFAULT_VALUE_NAME(L""),
BACKUP_VALUE_NAME(L"Backup"),
- PRIVATE_BACKUP_KEY_NAME(L"OpenOffice.org.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
+ PRIVATE_BACKUP_KEY_NAME(L"Apache OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
REGISTRATION_STATE(L"Reg4MsDocState")
{
m_RootKey = WindowsRegistry().GetClassesRootKey();
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx Sun Feb 3 13:23:59 2013
@@ -305,8 +305,7 @@ std::wstring RegistrationContextInformat
std::wstring RegistrationContextInformation::GetOpenOfficeCommandline(SHELL_COMMAND ShellCommand,
OFFICE_APPLICATION OfficeApp) const
{
- // quote the path to OpenOffice, this is important
- // for Windows 9x
+ // quote the path to Apache OpenOffice, this is important for Windows 9x
std::wstring cmd_line = std::wstring(TEXT("\"")) + m_OOExecPath + std::wstring(TEXT("\""));
switch( OfficeApp )
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx Sun Feb 3 13:23:59 2013
@@ -45,7 +45,7 @@
document display name is convertable to an ANSI
string and if not returns an english default.
So we avoid garbage if soemone for instance
- installs an japanese StarOffice/OpenOffice
+ installs an japanese version
under a German Windows 98 for instance.
*/
class RegistrationContextInformation
@@ -150,7 +150,7 @@ public:
*/
std::wstring GetOpenOfficeFriendlyAppName() const;
- /** The path to the StarOffice/OpenOffice executable
+ /** The path to the office executable
*/
std::wstring GetOpenOfficeExecutablePath() const;
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg64/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg64/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg64/makefile.mk (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg64/makefile.mk Sun Feb 3 13:23:59 2013
@@ -97,7 +97,6 @@ DEF1EXPORTFILE=exports.dxp
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
# -------------------------------------------------------------------------
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx Sun Feb 3 13:23:59 2013
@@ -158,7 +158,7 @@ extern "C" UINT __stdcall ShowSurveyAfte
std::wstring prodname;
GetMsiProp( handle, TEXT("ProductName"), prodname );
- std::wstring::size_type nIndex = prodname.find( TEXT( "OpenOffice.org" ) );
+ std::wstring::size_type nIndex = prodname.find( TEXT( "Apache OpenOffice" ) );
if( std::wstring::npos == nIndex )
return ERROR_SUCCESS;
@@ -170,7 +170,8 @@ extern "C" UINT __stdcall ShowSurveyAfte
aExecInf.cbSize = sizeof( aExecInf );
aExecInf.fMask = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI;
aExecInf.lpVerb = TEXT("open");
- aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall");
+ //aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall");
+ aExecInf.lpFile = TEXT("http://www.openoffice.org/support/");
aExecInf.lpDirectory = NULL;
aExecInf.nShow = SW_SHOWNORMAL;
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx Sun Feb 3 13:23:59 2013
@@ -54,10 +54,10 @@
</MSDN>
We add the following entries to the respective registry key
- "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="OpenOffice.org Column Handler"
- "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice.org Infotip Handler"
- "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice.org Property Sheet Handler"
- "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="OpenOffice.org Thumbnail Viewer"
+ "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="Apache OpenOffice Column Handler"
+ "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="Apache OpenOffice Infotip Handler"
+ "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="Apache OpenOffice Property Sheet Handler"
+ "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="Apache OpenOffice Thumbnail Viewer"
These shell extensions are implemented in the 'shell' project. We ignore registration
failures because of insufficient privileges. The reason is: On systems which restrict the
@@ -90,10 +90,10 @@ struct RegistryEntry
TCHAR* Value;
};
-RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("OpenOffice.org Column Handler") };
-RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("OpenOffice.org Infotip Handler") };
-RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("OpenOffice.org Property Sheet Handler") };
-RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("OpenOffice.org Thumbnail Viewer") };
+RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("Apache OpenOffice Column Handler") };
+RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("Apache OpenOffice Infotip Handler") };
+RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("Apache OpenOffice Property Sheet Handler") };
+RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("Apache OpenOffice Thumbnail Viewer") };
BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
{
Modified: openoffice/branches/l10n/main/setup_native/source/win32/stwrapper/stwrapper.manifest
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/stwrapper/stwrapper.manifest?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/stwrapper/stwrapper.manifest (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/stwrapper/stwrapper.manifest Sun Feb 3 13:23:59 2013
@@ -7,7 +7,7 @@
version="1.0.0.0"
processorArchitecture="x86"
/>
- <description>OpenOffice.org Installer</description>
+ <description>Apache OpenOffice Installer</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
Modified: openoffice/branches/l10n/main/sfx2/inc/pch/precompiled_sfx2.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/inc/pch/precompiled_sfx2.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/inc/pch/precompiled_sfx2.hxx (original)
+++ openoffice/branches/l10n/main/sfx2/inc/pch/precompiled_sfx2.hxx Sun Feb 3 13:23:59 2013
@@ -280,10 +280,8 @@
#include "com/sun/star/security/XDocumentDigitalSignatures.hpp"
#include "com/sun/star/style/XStyle.hpp"
#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
-#include "com/sun/star/system/SimpleMailClientFlags.hpp"
#include "com/sun/star/system/SystemShellExecuteException.hpp"
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/XSimpleMailClientSupplier.hpp"
#include "com/sun/star/system/XSystemShellExecute.hpp"
#include "com/sun/star/task/ErrorCodeIOException.hpp"
#include "com/sun/star/task/ErrorCodeRequest.hpp"
Modified: openoffice/branches/l10n/main/sfx2/inc/sfx2/stbitem.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/inc/sfx2/stbitem.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/inc/sfx2/stbitem.hxx (original)
+++ openoffice/branches/l10n/main/sfx2/inc/sfx2/stbitem.hxx Sun Feb 3 13:23:59 2013
@@ -94,10 +94,10 @@ protected:
::sal_Bool bMouseEvent,
const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics,
- const ::com::sun::star::awt::Rectangle& rOutputRectangle,
- ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
+ const ::com::sun::star::awt::Rectangle& rOutputRectangle,
+ ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException);
// Old sfx2 interface
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
Modified: openoffice/branches/l10n/main/sfx2/qa/complex/sfx2/UndoManager.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/qa/complex/sfx2/UndoManager.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/qa/complex/sfx2/UndoManager.java (original)
+++ openoffice/branches/l10n/main/sfx2/qa/complex/sfx2/UndoManager.java Sun Feb 3 13:23:59 2013
@@ -303,8 +303,7 @@ public class UndoManager
// -----------------------------------------------------------------------------------------------------------------
/**
- * returns the undo manager belonging to a given document
- * @return
+ * @return returns the undo manager belonging to a given document
*/
private XUndoManager getUndoManager()
{
Modified: openoffice/branches/l10n/main/sfx2/qa/complex/sfx2/undo/DocumentTest.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/qa/complex/sfx2/undo/DocumentTest.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/qa/complex/sfx2/undo/DocumentTest.java (original)
+++ openoffice/branches/l10n/main/sfx2/qa/complex/sfx2/undo/DocumentTest.java Sun Feb 3 13:23:59 2013
@@ -66,8 +66,8 @@ public interface DocumentTest
/**
* does multiple modifications do the document, which would normally result in multiple Undo actions.
*
- * The test framework will encapsulate the call into an {@link XUndoManager.enterUndoContext()} and
- * {@link XUndoManager.leaveUndoContext()} call.
+ * The test framework will encapsulate the call into an {@link com.sun.star.document.XUndoManager#enterUndoContext} and
+ * {@link com.sun.star.document.XUndoManager#leaveUndoContext} call.
*
* @return
* the number of modifications done to the document. The caller assumes (and asserts) that the number
Modified: openoffice/branches/l10n/main/sfx2/source/appl/appopen.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/appl/appopen.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/appl/appopen.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/appl/appopen.cxx Sun Feb 3 13:23:59 2013
@@ -36,7 +36,7 @@
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include <com/sun/star/util/URL.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/document/XTypeDetection.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
@@ -988,8 +988,9 @@ void SfxApplication::OpenDocExec_Impl( S
if ( !pFilter || !( pFilter->IsOwnFormat() ))
{
// hyperlink does not link to own type => special handling (http, ftp) browser and (other external protocols) OS
- Reference< XSystemShellExecute > xSystemShellExecute( ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), UNO_QUERY );
+ Reference< XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShellExecute.is() )
{
if ( aINetProtocol == INET_PROT_MAILTO )
Modified: openoffice/branches/l10n/main/sfx2/source/appl/appserv.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/appl/appserv.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/appl/appserv.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/appl/appserv.cxx Sun Feb 3 13:23:59 2013
@@ -39,7 +39,7 @@
#include <com/sun/star/document/XEmbeddedScripts.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/system/SystemShellExecuteException.hpp>
@@ -851,12 +851,10 @@ void SfxApplication::OfaExec_Impl( SfxRe
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< css::system::XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ),
- uno::UNO_QUERY_THROW );
-
+ css::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
+
// read repository URL from configuration
::rtl::OUString sTemplRepoURL =
getConfigurationStringValue(
Modified: openoffice/branches/l10n/main/sfx2/source/appl/fileobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/appl/fileobj.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/appl/fileobj.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/appl/fileobj.cxx Sun Feb 3 13:23:59 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
@@ -47,6 +45,7 @@
#include "sfx2/sfxresid.hxx"
#include "fileobj.hxx"
#include "app.hrc"
+#include <vcl/dibtools.hxx>
namespace css = ::com::sun::star;
@@ -187,9 +186,16 @@ sal_Bool SvFileObject::GetData( ::com::s
break;
case FORMAT_BITMAP:
- if( !aGrf.GetBitmap().IsEmpty())
- aMemStm << aGrf.GetBitmap();
- break;
+ {
+ const Bitmap aBitmap(aGrf.GetBitmap());
+
+ if(!aBitmap.IsEmpty())
+ {
+ WriteDIB(aBitmap, aMemStm, false, true);
+ }
+
+ break;
+ }
default:
if( aGrf.GetGDIMetaFile().GetActionCount() )
Modified: openoffice/branches/l10n/main/sfx2/source/appl/linkmgr2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/appl/linkmgr2.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/appl/linkmgr2.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/appl/linkmgr2.cxx Sun Feb 3 13:23:59 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
@@ -42,6 +40,7 @@
#include <unotools/localfilehelper.hxx>
#include <i18npool/mslangid.hxx>
#include <sfx2/request.hxx>
+#include <vcl/dibtools.hxx>
#include "fileobj.hxx"
#include "impldde.hxx"
@@ -479,7 +478,7 @@ sal_Bool LinkManager::GetGraphicFromAny(
case FORMAT_BITMAP:
{
Bitmap aBmp;
- aMemStm >> aBmp;
+ ReadDIB(aBmp, aMemStm, true);
rGrf = aBmp;
bRet = sal_True;
}
Modified: openoffice/branches/l10n/main/sfx2/source/dialog/filedlghelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/dialog/filedlghelper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/dialog/filedlghelper.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/dialog/filedlghelper.cxx Sun Feb 3 13:23:59 2013
@@ -19,10 +19,9 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
+
#include <sfx2/filedlghelper.hxx>
#include <sal/types.h>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -95,6 +94,7 @@
#include "filedlgimpl.hxx"
#include <helpid.hrc>
#include <sfxlocal.hrc>
+#include <vcl/dibtools.hxx>
//-----------------------------------------------------------------------------
@@ -771,7 +771,7 @@ IMPL_LINK( FileDialogHelper_Impl, TimeOu
// and copy it into the Any
SvMemoryStream aData;
- aData << aBmp;
+ WriteDIB(aBmp, aData, false, true);
const Sequence < sal_Int8 > aBuffer(
static_cast< const sal_Int8* >(aData.GetData()),
Modified: openoffice/branches/l10n/main/sfx2/source/dialog/intro.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/dialog/intro.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/dialog/intro.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/dialog/intro.cxx Sun Feb 3 13:23:59 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
@@ -34,8 +32,8 @@
#include <unotools/pathoptions.hxx>
#include <unotools/configmgr.hxx>
#include <com/sun/star/uno/Any.h>
-
#include <sfx2/sfxuno.hxx>
+#include <vcl/dibtools.hxx>
// -----------------------------------------------------------------------
@@ -76,8 +74,11 @@ IntroWindow_Impl::IntroWindow_Impl( cons
INetURLObject aObj( SvtPathOptions().GetModulePath(), INET_PROT_FILE );
aObj.insertName( aBmpFileName );
SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
- if ( !aStrm.GetError() )
- aStrm >> aIntroBmp;
+
+ if ( !aStrm.GetError() )
+ {
+ ReadDIB(aIntroBmp, aStrm, true);
+ }
Init();
}
Modified: openoffice/branches/l10n/main/sfx2/source/dialog/mailmodel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/dialog/mailmodel.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/dialog/mailmodel.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/dialog/mailmodel.cxx Sun Feb 3 13:23:59 2013
@@ -32,8 +32,8 @@
#include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
-#include <com/sun/star/system/SimpleMailClientFlags.hpp>
+#include <com/sun/star/system/SystemMailProvider.hpp>
+#include <com/sun/star/system/MailClientFlags.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
@@ -87,10 +87,17 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::system;
-using namespace ::rtl;
+using ::com::sun::star::system::SystemMailProvider;
+using ::com::sun::star::system::XMailClient;
+using ::com::sun::star::system::XMailMessage;
+using ::com::sun::star::system::XSystemMailProvider;
+using rtl::OUString;
+
+namespace MailClientFlags = ::com::sun::star::system::MailClientFlags;
namespace css = ::com::sun::star;
+
+
// - class PrepareListener_Impl ------------------------------------------
class PrepareListener_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
{
@@ -822,44 +829,32 @@ SfxMailModel::SendMailResult SfxMailMode
SendMailResult eResult = SEND_MAIL_ERROR;
if ( !maAttachedDocuments.empty() )
{
- css::uno::Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
- if ( xMgr.is() )
+ css::uno::Reference < XComponentContext > xContext = ::comphelper::getProcessComponentContext();
+ if ( xContext.is() )
{
- css::uno::Reference< XSimpleMailClientSupplier > xSimpleMailClientSupplier;
-
- // Prefer the SimpleSystemMail service if available
- xSimpleMailClientSupplier = css::uno::Reference< XSimpleMailClientSupplier >(
- xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleSystemMail" ))),
- UNO_QUERY );
-
- if ( ! xSimpleMailClientSupplier.is() )
- {
- xSimpleMailClientSupplier = css::uno::Reference< XSimpleMailClientSupplier >(
- xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleCommandMail" ))),
- UNO_QUERY );
- }
+ css::uno::Reference< XSystemMailProvider > xSystemMailProvider( SystemMailProvider::create( xContext ) );
- if ( xSimpleMailClientSupplier.is() )
+ if ( xSystemMailProvider.is() )
{
- css::uno::Reference< XSimpleMailClient > xSimpleMailClient = xSimpleMailClientSupplier->querySimpleMailClient();
+ css::uno::Reference< XMailClient > xMailClient = xSystemMailProvider->queryMailClient();
- if ( !xSimpleMailClient.is() )
+ if ( !xMailClient.is() )
{
// no mail client support => message box!
return SEND_MAIL_ERROR;
}
// we have a simple mail client
- css::uno::Reference< XSimpleMailMessage > xSimpleMailMessage = xSimpleMailClient->createSimpleMailMessage();
- if ( xSimpleMailMessage.is() )
+ css::uno::Reference< XMailMessage > xMailMessage = xMailClient->createMailMessage();
+ if ( xMailMessage.is() )
{
- sal_Int32 nSendFlags = SimpleMailClientFlags::DEFAULTS;
+ sal_Int32 nSendFlags = MailClientFlags::DEFAULTS;
if ( maFromAddress.Len() == 0 )
{
// from address not set, try figure out users e-mail address
CreateFromAddress_Impl( maFromAddress );
}
- xSimpleMailMessage->setOriginator( maFromAddress );
+ xMailMessage->setOriginator( maFromAddress );
sal_Int32 nToCount = mpToList ? mpToList->Count() : 0;
sal_Int32 nCcCount = mpCcList ? mpCcList->Count() : 0;
@@ -869,13 +864,13 @@ SfxMailModel::SendMailResult SfxMailMode
if ( nToCount > 1 )
{
nCcSeqCount = nToCount - 1 + nCcCount;
- xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
- nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
+ xMailMessage->setRecipient( *mpToList->GetObject( 0 ));
+ nSendFlags = MailClientFlags::NO_USER_INTERFACE;
}
else if ( nToCount == 1 )
{
- xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
- nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
+ xMailMessage->setRecipient( *mpToList->GetObject( 0 ));
+ nSendFlags = MailClientFlags::NO_USER_INTERFACE;
}
// all other recipient must be handled with CC recipients!
@@ -897,7 +892,7 @@ SfxMailModel::SendMailResult SfxMailMode
{
aCcRecipientSeq[nIndex++] = *mpCcList->GetObject(i);
}
- xSimpleMailMessage->setCcRecipient( aCcRecipientSeq );
+ xMailMessage->setCcRecipient( aCcRecipientSeq );
}
sal_Int32 nBccCount = mpBccList ? mpBccList->Count() : 0;
@@ -908,18 +903,18 @@ SfxMailModel::SendMailResult SfxMailMode
{
aBccRecipientSeq[i] = *mpBccList->GetObject(i);
}
- xSimpleMailMessage->setBccRecipient( aBccRecipientSeq );
+ xMailMessage->setBccRecipient( aBccRecipientSeq );
}
Sequence< OUString > aAttachmentSeq(&(maAttachedDocuments[0]),maAttachedDocuments.size());
- xSimpleMailMessage->setSubject( maSubject );
- xSimpleMailMessage->setAttachement( aAttachmentSeq );
+ xMailMessage->setSubject( maSubject );
+ xMailMessage->setAttachement( aAttachmentSeq );
sal_Bool bSend( sal_False );
try
{
- xSimpleMailClient->sendSimpleMailMessage( xSimpleMailMessage, nSendFlags );
+ xMailClient->sendMailMessage( xMailMessage, nSendFlags );
bSend = sal_True;
}
catch ( IllegalArgumentException& )
Modified: openoffice/branches/l10n/main/sfx2/source/dialog/templdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/dialog/templdlg.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/dialog/templdlg.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/dialog/templdlg.cxx Sun Feb 3 13:23:59 2013
@@ -98,6 +98,9 @@ static sal_uInt16 nLastItemId = USHRT_MA
// filter box has maximum 12 entries visible
#define MAX_FILTER_ENTRIES 12
+#define SFX_TEMPLDLG_FILTER_MAX 0xFFFF
+#define SFX_TEMPLDLG_FILTER_HIERARCHICAL 0xFFFE
+
//=========================================================================
TYPEINIT0(SfxCommonTemplateDialog_Impl);
@@ -755,7 +758,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonT
aFmtLb ( this, WB_BORDER | WB_TABSTOP | WB_SORT | WB_QUICK_SEARCH ),
aFilterLb ( pW, WB_BORDER | WB_DROPDOWN | WB_TABSTOP ),
- nActFamily ( 0xffff ),
+ nActFamily ( SFX_TEMPLDLG_FILTER_MAX ),
nActFilter ( 0 ),
nAppFilter ( 0 ),
@@ -800,7 +803,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonT
aFmtLb ( this, SfxResId( BT_VLIST ) ),
aFilterLb ( pW, SfxResId( BT_FLIST ) ),
- nActFamily ( 0xffff ),
+ nActFamily ( SFX_TEMPLDLG_FILTER_MAX ),
nActFilter ( 0 ),
nAppFilter ( 0 ),
@@ -874,8 +877,10 @@ void SfxCommonTemplateDialog_Impl::ReadR
else
pStyleFamilies = new SfxStyleFamilies( aFamId );
- nActFilter = pCurObjShell ? static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) ) : 0xFFFF;
- if ( pCurObjShell && 0xFFFF == nActFilter )
+ nActFilter = pCurObjShell ?
+ static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) ) :
+ SFX_TEMPLDLG_FILTER_MAX;
+ if ( pCurObjShell && SFX_TEMPLDLG_FILTER_MAX == nActFilter )
nActFilter = pCurObjShell->GetAutoStyleFilterIndex();
// Einfuegen in die Toolbox
@@ -1167,7 +1172,7 @@ void SfxCommonTemplateDialog_Impl::Enabl
void SfxCommonTemplateDialog_Impl::FillTreeBox()
{
DBG_ASSERT( pTreeBox, "FillTreeBox() without treebox");
- if(pStyleSheetPool && nActFamily != 0xffff)
+ if(pStyleSheetPool && nActFamily != SFX_TEMPLDLG_FILTER_MAX)
{
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
pStyleSheetPool->SetSearchMask(pItem->GetFamily(), SFXSTYLEBIT_ALL);
@@ -1476,7 +1481,7 @@ void SfxCommonTemplateDialog_Impl::Updat
SfxTemplateItem *pItem = 0;
// aktueller Bereich nicht innerhalb der erlaubten Bereiche
// oder Default
- if(nActFamily == 0xffff || 0 == (pItem = pFamilyState[nActFamily-1] ) )
+ if(nActFamily == SFX_TEMPLDLG_FILTER_MAX || 0 == (pItem = pFamilyState[nActFamily-1] ) )
{
CheckItem(nActFamily, sal_False);
SfxTemplateItem **ppItem = pFamilyState;
@@ -1496,7 +1501,7 @@ void SfxCommonTemplateDialog_Impl::Updat
// andere DocShell -> alles neu
CheckItem( nActFamily, sal_True );
nActFilter = static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pDocShell ) );
- if ( 0xFFFF == nActFilter )
+ if ( SFX_TEMPLDLG_FILTER_MAX == nActFilter )
nActFilter = pDocShell->GetAutoStyleFilterIndex();
nAppFilter = pItem->GetValue();
@@ -1512,10 +1517,6 @@ void SfxCommonTemplateDialog_Impl::Updat
// anderer Filter fuer automatisch
CheckItem( nActFamily, sal_True );
const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl();
-#if OSL_DEBUG_LEVEL > 1
- SfxFilterTupel *pT;
- pT = pStyleItem->GetFilterList().GetObject(nActFilter);
-#endif
if(0 == pStyleItem->GetFilterList().GetObject(nActFilter)->nFlags
&& nAppFilter != pItem->GetValue())
{
@@ -1791,6 +1792,17 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl,
SelectStyle(aSelectEntry);
pTreeBox->SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST));
pTreeBox->Show();
+
+ // Save the filter state
+ SfxViewFrame *pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
+ SfxObjectShell *pDocShell = pViewFrame->GetObjectShell();
+ if (pDocShell)
+ {
+ // only in the configuration
+ // SetAutoStyleFilterIndex would update nActFilter
+ // which should only contain a valid listbox entry
+ SaveFactoryStyleFilter( pDocShell, SFX_TEMPLDLG_FILTER_HIERARCHICAL );
+ }
}
}
@@ -1861,13 +1873,13 @@ void SfxCommonTemplateDialog_Impl::Actio
}
case SID_STYLE_NEW_BY_EXAMPLE:
{
- if(pStyleSheetPool && nActFamily != 0xffff)
+ if(pStyleSheetPool && nActFamily != SFX_TEMPLDLG_FILTER_MAX)
{
const SfxStyleFamily eFam=GetFamilyItem_Impl()->GetFamily();
//pStyleSheetPool->GetSearchFamily();
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
sal_uInt16 nFilter;
- if(pItem&&nActFilter!=0xffff)
+ if(pItem&&nActFilter!=SFX_TEMPLDLG_FILTER_MAX)
{
nFilter = pItem->GetFilterList().GetObject(
nActFilter)->nFlags;
@@ -1958,7 +1970,7 @@ sal_Int32 SfxCommonTemplateDialog_Impl::
void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* i_pObjSh, sal_Int32 i_nFilter )
{
- DBG_ASSERT( i_pObjSh, "SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter(): no ObjectShell" );
+ DBG_ASSERT( i_pObjSh, "SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter(): no ObjectShell" );
Reference< ::com::sun::star::container::XNameReplace > xContainer( xModuleManager, UNO_QUERY );
if ( xContainer.is() )
{
@@ -1987,7 +1999,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl,
void SfxCommonTemplateDialog_Impl::NewHdl(void *)
{
String aEmpty;
- if ( nActFamily != 0xffff )
+ if ( nActFamily != SFX_TEMPLDLG_FILTER_MAX )
{
Window* pTmp;
pTmp = Application::GetDefDialogParent();
@@ -1999,7 +2011,7 @@ void SfxCommonTemplateDialog_Impl::NewHd
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
const SfxStyleFamily eFam=pItem->GetFamily();
sal_uInt16 nMask;
- if(pItem&&nActFilter!=0xffff)
+ if(pItem&&nActFilter!=SFX_TEMPLDLG_FILTER_MAX)
{
nMask = pItem->GetFilterList().GetObject(
nActFilter)->nFlags;
@@ -2267,7 +2279,7 @@ void SfxCommonTemplateDialog_Impl::Execu
SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
{
const SfxStyleFamilyItem *pFamilyItem = GetFamilyItem_Impl();
- if( !pFamilyItem || nActFamily == 0xffff )
+ if( !pFamilyItem || nActFamily == SFX_TEMPLDLG_FILTER_MAX )
return SFX_STYLE_FAMILY_PARA;
else
return pFamilyItem->GetFamily();
@@ -2321,6 +2333,16 @@ SfxTemplateDialog_Impl::SfxTemplateDialo
{
pDlgWindow->FreeResource();
+
+ // Read the filter stored in the configuration
+ // This is already done in ReadResource(), invoked by Initialize()
+ // and stored in nActFilter, but we can't rely on nActFilter's value
+ // because it is changed in UpdateStyles_Impl
+ SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
+ pCurObjShell = pViewFrame->GetObjectShell();
+ const sal_uInt16 nConfigFilter = pCurObjShell ?
+ static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) ) : 0;
+
Initialize();
m_aActionTbL.SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, ToolBoxLSelect));
@@ -2332,6 +2354,13 @@ SfxTemplateDialog_Impl::SfxTemplateDialo
aFont.SetWeight( WEIGHT_NORMAL );
aFilterLb.SetFont( aFont );
m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT );
+
+ if ( nConfigFilter == SFX_TEMPLDLG_FILTER_HIERARCHICAL )
+ {
+ bHierarchical = sal_False;
+ aFilterLb.SelectEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL)));
+ FilterSelectHdl(&aFilterLb);
+ }
}
// ------------------------------------------------------------------------
@@ -2916,10 +2945,10 @@ void SfxCommonTemplateDialog_Impl::SetFa
{
if ( nId != nActFamily )
{
- if ( nActFamily != 0xFFFF )
+ if ( nActFamily != SFX_TEMPLDLG_FILTER_MAX )
CheckItem( nActFamily, sal_False );
nActFamily = nId;
- if ( nId != 0xFFFF )
+ if ( nId != SFX_TEMPLDLG_FILTER_MAX )
bUpdateFamily = sal_True;
}
}
Modified: openoffice/branches/l10n/main/sfx2/source/doc/docinf.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/doc/docinf.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/doc/docinf.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/doc/docinf.cxx Sun Feb 3 13:23:59 2013
@@ -25,19 +25,17 @@
#include "precompiled_sfx2.hxx"
#include <sfx2/docinf.hxx>
-
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/uno/Exception.hpp>
-
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
#include <comphelper/string.hxx>
#include <sot/storage.hxx>
#include <vcl/gdimtf.hxx>
-
+#include <vcl/dibtools.hxx>
#include "oleprops.hxx"
// ============================================================================
@@ -286,7 +284,7 @@ uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC
SvMemoryStream aStream;
// magic value 160 taken from GraphicHelper::getThumbnailFormatFromGDI_Impl()
if( i_pThumb->CreateThumbnail( 160, aBitmap ) ) {
- aBitmap.GetBitmap().Write( aStream, sal_False, sal_False );
+ WriteDIB(aBitmap.GetBitmap(), aStream, false, false);
// uno::Sequence<sal_uInt8> aSeq(aStream.GetSize()); // WRONG
aStream.Seek(STREAM_SEEK_TO_END);
uno::Sequence<sal_uInt8> aSeq(aStream.Tell());
Modified: openoffice/branches/l10n/main/sfx2/source/statbar/stbitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/statbar/stbitem.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/statbar/stbitem.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/statbar/stbitem.cxx Sun Feb 3 13:23:59 2013
@@ -396,7 +396,6 @@ throw (::com::sun::star::uno::RuntimeExc
void SAL_CALL SfxStatusBarControl::paint(
const uno::Reference< awt::XGraphics >& xGraphics,
const awt::Rectangle& rOutputRectangle,
- ::sal_Int32 nItemId,
::sal_Int32 nStyle )
throw ( ::uno::RuntimeException )
{
@@ -406,14 +405,14 @@ throw ( ::uno::RuntimeException )
if ( pOutDev )
{
::Rectangle aRect = VCLRectangle( rOutputRectangle );
- UserDrawEvent aUserDrawEvent( pOutDev, aRect, (sal_uInt16)nItemId, (sal_uInt16)nStyle );
+ UserDrawEvent aUserDrawEvent( pOutDev, aRect, pBar->GetCurItemId(), (sal_uInt16)nStyle );
Paint( aUserDrawEvent );
}
}
//--------------------------------------------------------------------
-void SAL_CALL SfxStatusBarControl::click()
+void SAL_CALL SfxStatusBarControl::click( const awt::Point& )
throw ( uno::RuntimeException )
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -422,7 +421,7 @@ throw ( uno::RuntimeException )
//--------------------------------------------------------------------
-void SAL_CALL SfxStatusBarControl::doubleClick()
+void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& )
throw ( uno::RuntimeException )
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
Modified: openoffice/branches/l10n/main/sfx2/source/view/viewsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/view/viewsh.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/view/viewsh.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/view/viewsh.cxx Sun Feb 3 13:23:59 2013
@@ -36,7 +36,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/EmbedMisc.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/frame/XStorable.hpp>
@@ -709,9 +709,9 @@ void SfxViewShell::ExecMisc_Impl( SfxReq
return;
}
- ::com::sun::star::uno::Reference< XSystemShellExecute > xSystemShellExecute( xSMGR->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )),
- css::uno::UNO_QUERY );
+ ::com::sun::star::uno::Reference< XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
sal_Bool bRet( sal_True );
if ( xSystemShellExecute.is() )
Modified: openoffice/branches/l10n/main/shell/inc/internal/config.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/inc/internal/config.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/inc/internal/config.hxx (original)
+++ openoffice/branches/l10n/main/shell/inc/internal/config.hxx Sun Feb 3 13:23:59 2013
@@ -40,10 +40,10 @@
#define MODULE_NAME_FILTER TEXT("ooofilt.dll")
#endif
-#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Column Handler")
-#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Infotip Handler")
-#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Property Sheet Handler")
-#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("OpenOffice.org Thumbnail Viewer")
+#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Column Handler")
+#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Infotip Handler")
+#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Property Sheet Handler")
+#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("Apache OpenOffice Thumbnail Viewer")
#define META_CONTENT_NAME "meta.xml"
#define DOC_CONTENT_NAME "content.xml"
Modified: openoffice/branches/l10n/main/shell/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/prj/build.lst?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/prj/build.lst (original)
+++ openoffice/branches/l10n/main/shell/prj/build.lst Sun Feb 3 13:23:59 2013
@@ -1,7 +1,7 @@
sl shell : L10N:l10n offuh rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL
sl shell\inc nmake - all sl_inc NULL
sl shell\source\win32 nmake - w sl_win32 sl_inc NULL
-sl shell\source\win32\simplemail nmake - w sl_win32_simplemail sl_inc NULL
+sl shell\source\win32\sysmail nmake - w sl_win32_sysmail sl_inc NULL
sl shell\source\unix\exec nmake - u sl_unix sl_inc NULL
sl shell\source\unix\exec nmake - p sl_unix sl_inc NULL
sl shell\source\unix\misc nmake - u sl_unix_misc sl_inc NULL
Modified: openoffice/branches/l10n/main/shell/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/prj/d.lst?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/prj/d.lst (original)
+++ openoffice/branches/l10n/main/shell/prj/d.lst Sun Feb 3 13:23:59 2013
@@ -29,6 +29,6 @@
..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h
..\%__SRC%\misc\localebe1.component %_DEST%\xml%_EXT%\localebe1.component
..\%__SRC%\misc\macbe1.component %_DEST%\xml%_EXT%\macbe1.component
-..\%__SRC%\misc\smplmail.component %_DEST%\xml%_EXT%\smplmail.component
+..\%__SRC%\misc\sysmail.component %_DEST%\xml%_EXT%\sysmail.component
..\%__SRC%\misc\syssh.component %_DEST%\xml%_EXT%\syssh.component
..\%__SRC%\misc\wininetbe1.component %_DEST%\xml%_EXT%\wininetbe1.component
Modified: openoffice/branches/l10n/main/shell/qa/zip/testimpl/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/qa/zip/testimpl/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/qa/zip/testimpl/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/qa/zip/testimpl/makefile.mk Sun Feb 3 13:23:59 2013
@@ -50,6 +50,5 @@ DEF1NAME=$(SHL1TARGET)
.INCLUDE : target.mk
.IF "$(OS)" == "WNT"
INCLUDE!:=$(subst,/stl, $(INCLUDE))
- .EXPORT : INCLUDE
.ENDIF
Modified: openoffice/branches/l10n/main/shell/source/all/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/all/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/all/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/all/makefile.mk Sun Feb 3 13:23:59 2013
@@ -63,7 +63,6 @@ SLOFILES_X64=$(SLO_X64)$/xml_parser.obj
.INCLUDE : target.mk
.IF "$(OS)" == "WNT"
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
.ENDIF
.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/l10n/main/shell/source/all/ooofilereader/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/all/ooofilereader/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/all/ooofilereader/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/all/ooofilereader/makefile.mk Sun Feb 3 13:23:59 2013
@@ -79,7 +79,7 @@ LIB1FILES_X64=$(SLB_X64)$/zipfile.lib\
.INCLUDE : target.mk
.IF "$(OS)" == "WNT"
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
.ENDIF
.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/l10n/main/shell/source/all/zipfile/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/all/zipfile/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/all/zipfile/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/all/zipfile/makefile.mk Sun Feb 3 13:23:59 2013
@@ -48,7 +48,7 @@ SLOFILES_X64=$(SLO_X64)$/zipfile.obj\
.INCLUDE : target.mk
.IF "$(OS)" == "WNT"
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
.ENDIF
.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/l10n/main/shell/source/cmdmail/cmdmail.component
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/cmdmail/cmdmail.component?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/cmdmail/cmdmail.component (original)
+++ openoffice/branches/l10n/main/shell/source/cmdmail/cmdmail.component Sun Feb 3 13:23:59 2013
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,23 +8,21 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
-
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.system.SimpleCommandMail">
- <service name="com.sun.star.system.SimpleCommandMail"/>
+ <implementation name="com.sun.star.comp.system.unx.SystemMailProvider">
+ <service name="com.sun.star.system.SystemMailProvider"/>
</implementation>
</component>
Modified: openoffice/branches/l10n/main/shell/source/cmdmail/cmdmail.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/cmdmail/cmdmail.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/cmdmail/cmdmail.xml (original)
+++ openoffice/branches/l10n/main/shell/source/cmdmail/cmdmail.xml Sun Feb 3 13:23:59 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
<!--***********************************************************
- *
+ *
* 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
@@ -9,61 +9,59 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
- <module-name> cmdmail </module-name>
+ <module-name>cmdmail</module-name>
<component-description>
- <author> Oliver Braun </author>
- <name>com.sun.star.comp.system.SimpleCommandMail</name>
- <description>
- A generic implementation of a SimpleCommandMail service.
- </description>
+ <author>Oliver Braun</author>
+ <name>com.sun.star.comp.system.unx.SystemMailProvider</name>
+ <description>A generic implementation of a SystemMailProvider service.</description>
<loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language> c++ </language>
- <status value="beta"/>
- <supported-service> com.sun.star.system.SimpleCommandMail </supported-service>
+ <language>c++</language>
+ <status value="beta"/>
+ <supported-service>com.sun.star.system.SystemMailProvider</supported-service>
<service-dependency>...</service-dependency>
- <type> com.sun.star.system.XSimpleMailClient </type>
- <type> com.sun.star.system.XSimpleMailClientSupplier </type>
- <type> com.sun.star.system.XSimpleMailMessage </type>
- <type> com.sun.star.system.SimpleMailClientFlags </type>
- <type> com.sun.star.lang.XEventListener </type>
- <type> com.sun.star.lang.XMultiServiceFactory </type>
- <type> com.sun.star.lang.XSingleServiceFactory </type>
- <type> com.sun.star.lang.XSingleComponentFactory </type>
- <type> com.sun.star.lang.XServiceInfo </type>
- <type> com.sun.star.lang.XTypeProvider </type>
- <type> com.sun.star.lang.IllegalArgumentException </type>
- <type> com.sun.star.lang.XComponent </type>
- <type> com.sun.star.uno.RuntimeException </type>
- <type> com.sun.star.uno.TypeClass </type>
- <type> com.sun.star.uno.XWeak </type>
- <type> com.sun.star.uno.XAggregation </type>
- <type> com.sun.star.uno.XComponentContext </type>
- <type> com.sun.star.registry.XRegistryKey </type>
- <type> com.sun.star.container.XNameAccess </type>
- <type> com.sun.star.container.XSet </type>
- <type> com.sun.star.beans.PropertyValue </type>
- <type> com.sun.star.beans.XPropertySet </type>
- <type> com.sun.star.uri.ExternalUriReferenceTranslator </type>
- <type> com.sun.star.uri.XExternalUriReferenceTranslator </type>
+ <type>com.sun.star.system.XMailClient</type>
+ <type>com.sun.star.system.SystemMailProvider</type>
+ <type>com.sun.star.system.XMailMessage</type>
+ <type>com.sun.star.system.MailClientFlags</type>
+ <type>com.sun.star.lang.XEventListener</type>
+ <type>com.sun.star.lang.XMultiServiceFactory</type>
+ <type>com.sun.star.lang.XSingleServiceFactory</type>
+ <type>com.sun.star.lang.XSingleComponentFactory</type>
+ <type>com.sun.star.lang.XServiceInfo</type>
+ <type>com.sun.star.lang.XTypeProvider</type>
+ <type>com.sun.star.lang.IllegalArgumentException</type>
+ <type>com.sun.star.lang.XComponent</type>
+ <type>com.sun.star.uno.RuntimeException</type>
+ <type>com.sun.star.uno.TypeClass</type>
+ <type>com.sun.star.uno.XWeak</type>
+ <type>com.sun.star.uno.XAggregation</type>
+ <type>com.sun.star.uno.XComponentContext</type>
+ <type>com.sun.star.registry.XRegistryKey</type>
+ <type>com.sun.star.container.XNameAccess</type>
+ <type>com.sun.star.container.XSet</type>
+ <type>com.sun.star.beans.PropertyValue</type>
+ <type>com.sun.star.beans.XPropertySet</type>
+ <type>com.sun.star.uri.ExternalUriReferenceTranslator</type>
+ <type>com.sun.star.uri.XExternalUriReferenceTranslator</type>
</component-description>
- <project-build-dependency> cppuhelper </project-build-dependency>
- <project-build-dependency> cppu </project-build-dependency>
- <project-build-dependency> sal </project-build-dependency>
- <runtime-module-dependency> cppuhelper$(COM) </runtime-module-dependency>
- <runtime-module-dependency> cppu3 </runtime-module-dependency>
- <runtime-module-dependency> sal3 </runtime-module-dependency>
+ <project-build-dependency>cppuhelper</project-build-dependency>
+ <project-build-dependency>cppu</project-build-dependency>
+ <project-build-dependency>sal</project-build-dependency>
+ <runtime-module-dependency>cppuhelper$(COM)</runtime-module-dependency>
+ <runtime-module-dependency>cppu3</runtime-module-dependency>
+ <runtime-module-dependency>sal3</runtime-module-dependency>
</module-description>
Modified: openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailentry.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailentry.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailentry.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailentry.cxx Sun Feb 3 13:23:59 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,101 +7,56 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
-//-----------------------------------------------------------------------
-// includes of other projects
-//-----------------------------------------------------------------------
-#include <cppuhelper/factory.hxx>
-#include <com/sun/star/container/XSet.hpp>
-#include <osl/diagnose.h>
-#include "cmdmailsuppl.hxx"
-
-//-----------------------------------------------------------------------
-// namespace directives
-//-----------------------------------------------------------------------
-
-using namespace ::rtl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::container ;
-using namespace ::com::sun::star::lang ;
-using namespace ::com::sun::star::registry ;
-using namespace ::cppu ;
-using com::sun::star::system::XSimpleMailClientSupplier;
-
-//-----------------------------------------------------------------------
-// defines
-//-----------------------------------------------------------------------
-
-#define COMP_SERVICE_NAME "com.sun.star.system.SimpleCommandMail"
-#define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail"
-
-//-----------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------
-
-namespace
-{
- Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext )
- {
- return Reference< XInterface >( static_cast< XSimpleMailClientSupplier* >( new CmdMailSuppl( xContext ) ) );
- }
-}
-
-//-----------------------------------------------------------------------
-// the 3 important functions which will be exported
-//-----------------------------------------------------------------------
-
-extern "C"
-{
+#include "syscmdmail.hxx"
-//----------------------------------------------------------------------
-// component_getImplementationEnvironment
-//----------------------------------------------------------------------
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
-void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+namespace shell
{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+ static ::cppu::ImplementationEntry const unxsysmail_impl_entries[] =
+ {
+ {
+ SystemCommandMail::Create,
+ SystemCommandMail::getImplementationName_static,
+ SystemCommandMail::getSupportedServiceNames_static,
+ ::cppu::createSingleComponentFactory,
+ 0,
+ 0
+ },
+ { 0, 0, 0, 0, 0, 0 }
+ };
}
-//----------------------------------------------------------------------
-// component_getFactory
-//----------------------------------------------------------------------
-
-void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /*pSrvManager*/, uno_Interface* /*pRegistryKey*/ )
+extern "C"
{
- Reference< XSingleComponentFactory > xFactory;
-
- if (0 == ::rtl_str_compare( pImplName, COMP_IMPL_NAME ))
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+ const sal_Char **ppEnvTypeName, uno_Environment ** )
{
- OUString serviceName( RTL_CONSTASCII_USTRINGPARAM(COMP_SERVICE_NAME) );
-
- xFactory = ::cppu::createSingleComponentFactory(
- createInstance,
- OUString( RTL_CONSTASCII_USTRINGPARAM(COMP_IMPL_NAME) ),
- Sequence< OUString >( &serviceName, 1 ) );
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-
- if (xFactory.is())
- xFactory->acquire();
- return xFactory.get();
+ SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+ const sal_Char *pImplName, void *pServiceManager, void *pRegistryKey )
+ {
+ return ::cppu::component_getFactoryHelper( pImplName,
+ pServiceManager,
+ pRegistryKey ,
+ shell::unxsysmail_impl_entries );
+ }
}
-
-} // extern "C"
Modified: openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailmsg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailmsg.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailmsg.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailmsg.cxx Sun Feb 3 13:23:59 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,35 +7,36 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
#include "cmdmailmsg.hxx"
using com::sun::star::lang::IllegalArgumentException;
-using com::sun::star::lang::WrappedTargetException;
-using com::sun::star::container::NoSuchElementException;
-using com::sun::star::container::XNameAccess;
using rtl::OUString;
using osl::MutexGuard;
using namespace cppu;
using namespace com::sun::star::uno;
+namespace shell
+{
+
+CmdMailMsg::CmdMailMsg()
+{
+}
void SAL_CALL CmdMailMsg::setBody( const OUString& aBody )
throw (RuntimeException)
@@ -65,56 +66,56 @@ OUString SAL_CALL CmdMailMsg::getRecipie
return m_aRecipient;
}
-void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient )
+void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
m_CcRecipients = aCcRecipient;
}
-Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient( )
+Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
return m_CcRecipients;
}
-void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient )
+void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
m_BccRecipients = aBccRecipient;
}
-Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient( )
+Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
return m_BccRecipients;
}
-void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator )
+void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
m_aOriginator = aOriginator;
}
-OUString SAL_CALL CmdMailMsg::getOriginator( )
+OUString SAL_CALL CmdMailMsg::getOriginator( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
return m_aOriginator;
}
-void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject )
+void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
m_aSubject = aSubject;
}
-OUString SAL_CALL CmdMailMsg::getSubject( )
+OUString SAL_CALL CmdMailMsg::getSubject( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
@@ -128,114 +129,11 @@ void SAL_CALL CmdMailMsg::setAttachement
m_Attachments = aAttachment;
}
-Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement( )
+Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
return m_Attachments;
}
-Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
- throw (NoSuchElementException, WrappedTargetException, RuntimeException)
-{
- MutexGuard aGuard( m_aMutex );
-
- if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "body" )) && m_aBody.getLength() )
- return makeAny( m_aBody );
-
- if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "from" )) && m_aOriginator.getLength() )
- return makeAny( m_aOriginator );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "to" )) && m_aRecipient.getLength() )
- return makeAny( m_aRecipient );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "cc" )) && m_CcRecipients.getLength() )
- return makeAny( m_CcRecipients );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "bcc" )) && m_BccRecipients.getLength() )
- return makeAny( m_BccRecipients );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "subject" )) && m_aSubject.getLength() )
- return makeAny( m_aSubject );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "attachment" )) && m_Attachments.getLength() )
- return makeAny( m_Attachments );
-
- throw NoSuchElementException( OUString(RTL_CONSTASCII_USTRINGPARAM( "key not found: ")) + aName,
- static_cast < XNameAccess * > (this) );
-}
-
-Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( )
- throw (::com::sun::star::uno::RuntimeException)
-{
- MutexGuard aGuard( m_aMutex );
-
- sal_Int32 nItems = 0;
- Sequence< OUString > aRet( 7 );
-
- if( m_aBody.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "body" ));
-
- if( m_aOriginator.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "from" ));
-
- if( m_aRecipient.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "to" ));
-
- if( m_CcRecipients.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "cc" ));
-
- if( m_BccRecipients.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "bcc" ));
-
- if( m_aSubject.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "subject" ));
-
- if( m_Attachments.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "attachment" ));
-
- aRet.realloc( nItems );
- return aRet;
-}
-
- sal_Bool SAL_CALL CmdMailMsg::hasByName( const OUString& aName )
- throw (RuntimeException)
-{
- MutexGuard aGuard( m_aMutex );
-
- if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "body" )) && m_aBody.getLength() )
- return sal_True;
-
- if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "from" )) && m_aOriginator.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "to" )) && m_aRecipient.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "cc" )) && m_CcRecipients.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "bcc" )) && m_BccRecipients.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "subject" )) && m_aSubject.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "attachment" )) && m_Attachments.getLength() )
- return sal_True;
-
- return sal_False;
-}
-
-Type SAL_CALL CmdMailMsg::getElementType( )
- throw (RuntimeException)
-{
- // returning void for multi type container
- return Type();
-}
-
-sal_Bool SAL_CALL CmdMailMsg::hasElements( )
- throw (RuntimeException)
-{
- return 0 != getElementNames().getLength();
}