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/03/15 10:24:56 UTC
svn commit: r1456826 [6/6] - in /openoffice/branches/l10n/main: ./
autodoc/source/display/html/ automation/packimages/ automation/prj/
automation/source/communi/ automation/source/miniapp/
automation/source/testtool/ automation/util/ bridges/source/cpp...
Modified: openoffice/branches/l10n/main/svx/source/dialog/hdft.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/svx/source/dialog/hdft.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/svx/source/dialog/hdft.cxx (original)
+++ openoffice/branches/l10n/main/svx/source/dialog/hdft.cxx Fri Mar 15 09:24:52 2013
@@ -406,7 +406,7 @@ void SvxHFPage::Reset( const SfxItemSet&
0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
{
nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue();
- if(nHtmlMode && HTMLMODE_ON)
+ if(nHtmlMode & HTMLMODE_ON)
{
aCntSharedBox.Hide();
aBackgroundBtn.Hide();
Modified: openoffice/branches/l10n/main/svx/source/dialog/sendreportw32.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/svx/source/dialog/sendreportw32.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/svx/source/dialog/sendreportw32.cxx (original)
+++ openoffice/branches/l10n/main/svx/source/dialog/sendreportw32.cxx Fri Mar 15 09:24:52 2013
@@ -93,7 +93,7 @@ namespace svx{
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPProxyServer"),
szBuffer,
sizeof(szBuffer) ) )
@@ -102,7 +102,7 @@ namespace svx{
DWORD dwProxyPort;
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPProxyPort"),
&dwProxyPort,
sizeof(dwProxyPort) ) )
@@ -113,7 +113,7 @@ namespace svx{
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("ReturnAddress"),
szBuffer,
sizeof(szBuffer) ) )
@@ -122,7 +122,7 @@ namespace svx{
DWORD fAllowContact = sal_False;
RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("AllowContact"),
&fAllowContact,
sizeof(fAllowContact) );
@@ -131,7 +131,7 @@ namespace svx{
DWORD uInternetConnection = 0;
RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPConnection"),
&uInternetConnection,
sizeof(uInternetConnection) );
@@ -145,7 +145,7 @@ namespace svx{
const _TCHAR *lpHTTPProxyServer = reinterpret_cast<LPCTSTR>(maParams.maHTTPProxyServer.GetBuffer());
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPProxyServer"), REG_SZ,
lpHTTPProxyServer,
sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) );
@@ -155,7 +155,7 @@ namespace svx{
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPProxyPort"), REG_DWORD,
&dwProxyPort,
sizeof(DWORD) );
@@ -163,7 +163,7 @@ namespace svx{
DWORD fAllowContact = IsContactAllowed();
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("AllowContact"), REG_DWORD,
&fAllowContact,
sizeof(DWORD) );
@@ -173,7 +173,7 @@ namespace svx{
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPConnection"), REG_DWORD,
&uInternetConnection,
sizeof(DWORD) );
@@ -181,7 +181,7 @@ namespace svx{
const _TCHAR *lpEmail = reinterpret_cast<LPCTSTR>(GetEMailAddress().GetBuffer());
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("ReturnAddress"), REG_SZ,
lpEmail,
sizeof(TCHAR) * (_tcslen(lpEmail) + 1) );
Modified: openoffice/branches/l10n/main/svx/source/svdraw/svdmrkv.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/svx/source/svdraw/svdmrkv.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/svx/source/svdraw/svdmrkv.cxx (original)
+++ openoffice/branches/l10n/main/svx/source/svdraw/svdmrkv.cxx Fri Mar 15 09:24:52 2013
@@ -870,12 +870,12 @@ void SdrMarkView::SetMarkHandles()
// Drehpunkt/Spiegelachse
AddDragModeHdl(eDragMode);
- // add custom handles (used by other apps, e.g. AnchorPos)
- AddCustomHdl();
-
// sort handles
aHdl.Sort();
+ // add custom handles (used by other apps, e.g. AnchorPos)
+ AddCustomHdl();
+
// #105722# try to restore focus handle index from remembered values
if(bSaveOldFocus)
{
Modified: openoffice/branches/l10n/main/sw/source/core/doc/tblrwcl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sw/source/core/doc/tblrwcl.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sw/source/core/doc/tblrwcl.cxx (original)
+++ openoffice/branches/l10n/main/sw/source/core/doc/tblrwcl.cxx Fri Mar 15 09:24:52 2013
@@ -137,7 +137,7 @@ struct CR_SetBoxWidth
nDiff( rCpy.nDiff ), nSide( rCpy.nSide ),
nMaxSize( rCpy.nMaxSize ), nLowerDiff( 0 ),
nMode( rCpy.nMode ), nTblWidth( rCpy.nTblWidth ),
- nRemainWidth( rCpy.nRemainWidth ), nBoxWidth( nBoxWidth ),
+ nRemainWidth( rCpy.nRemainWidth ), nBoxWidth( rCpy.nBoxWidth ),
bBigger( rCpy.bBigger ), bLeft( rCpy.bLeft ),
bSplittBox( rCpy.bSplittBox ), bAnyBoxFnd( rCpy.bAnyBoxFnd )
{
Modified: openoffice/branches/l10n/main/sw/source/core/edit/edlingu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sw/source/core/edit/edlingu.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sw/source/core/edit/edlingu.cxx (original)
+++ openoffice/branches/l10n/main/sw/source/core/edit/edlingu.cxx Fri Mar 15 09:24:52 2013
@@ -1180,8 +1180,8 @@ bool SwEditShell::GetGrammarCorrection(
{
// return suggestions for first error that includes the given error position
const linguistic2::SingleProofreadingError &rError = rResult.aErrors[i];
- if (rError.nErrorStart <= rErrorPosInText &&
- rErrorPosInText < rError.nErrorStart + rError.nErrorLength)
+ if( (rError.nErrorStart <= rErrorPosInText) &&
+ (rErrorPosInText + nLen < rError.nErrorStart + rError.nErrorLength))
{
rSuggestions = rError.aSuggestions;
rErrorIndexInResult = i;
Modified: openoffice/branches/l10n/main/sw/source/core/text/portxt.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sw/source/core/text/portxt.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sw/source/core/text/portxt.hxx (original)
+++ openoffice/branches/l10n/main/sw/source/core/text/portxt.hxx Fri Mar 15 09:24:52 2013
@@ -22,11 +22,7 @@
#ifndef _PORTXT_HXX
#define _PORTXT_HXX
-#ifdef GCC
-#include <sys/types.h>
-#else
-#include <new.h> //fuer size_t, FIXEDMEM aus tools
-#endif
+
#include <tools/mempool.hxx>
#include "porlin.hxx"
Modified: openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par3.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par3.cxx (original)
+++ openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par3.cxx Fri Mar 15 09:24:52 2013
@@ -2586,7 +2586,7 @@ static void lcl_AddToPropertyContainer
uno::Any aAny(C2U(""));
xPropContainer->addProperty
(rPropertyName,
- static_cast<sal_Int16>(beans::PropertyAttribute::BOUND ||
+ static_cast<sal_Int16>(beans::PropertyAttribute::BOUND |
beans::PropertyAttribute::REMOVABLE),
aAny);
}
Modified: openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par6.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par6.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par6.cxx (original)
+++ openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par6.cxx Fri Mar 15 09:24:52 2013
@@ -1641,8 +1641,8 @@ bool SwWW8ImplReader::SetFlyBordersShado
static void FlySecur1(short& rSize, const bool bBorder)
{
- short nMin = MINFLY +
- bBorder ? MAX_BORDER_SIZE : MAX_EMPTY_BORDER;
+ const short nMin = MINFLY +
+ (bBorder ? MAX_BORDER_SIZE : MAX_EMPTY_BORDER);
if ( rSize < nMin )
rSize = nMin;
Modified: openoffice/branches/l10n/main/swext/mediawiki/src/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/swext/mediawiki/src/description.xml?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/swext/mediawiki/src/description.xml (original)
+++ openoffice/branches/l10n/main/swext/mediawiki/src/description.xml Fri Mar 15 09:24:52 2013
@@ -31,8 +31,8 @@
</simple-license>
</registration>
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" d:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" d:name="OpenOffice"/>
</dependencies>
<publisher>
<name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
Modified: openoffice/branches/l10n/main/sysui/desktop/debian/control
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/debian/control?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/debian/control (original)
+++ openoffice/branches/l10n/main/sysui/desktop/debian/control Fri Mar 15 09:24:52 2013
@@ -1,6 +1,6 @@
Description: %productname desktop integration
Maintainer: Apache Software Foundation
Architecture: all
-Provides: apache_openoffice-desktop-integration, openoffice.org-unbundled
-Conflicts: apache_openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: apache_openoffice-desktop-integration, openofficeorg-debian-menus
+Provides: openoffice-desktop-integration, openoffice.org-unbundled
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
+Replaces: openoffice-desktop-integration, openofficeorg-debian-menus
Modified: openoffice/branches/l10n/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/freedesktop/freedesktop-menus.spec (original)
+++ openoffice/branches/l10n/main/sysui/desktop/freedesktop/freedesktop-menus.spec Fri Mar 15 09:24:52 2013
@@ -27,7 +27,7 @@ Name: %pkgprefix-freedesktop-menus
#BuildRequires: perl
Group: Office
License: ALv2
-Provides: apache_openoffice3-desktop-integration
+Provides: openoffice-desktop-integration
Conflicts: %pkgprefix-suse-menus
Conflicts: %pkgprefix-debian-menus
Conflicts: %pkgprefix-redhat-menus
Modified: openoffice/branches/l10n/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ openoffice/branches/l10n/main/sysui/desktop/mandriva/mandriva-menus.spec Fri Mar 15 09:24:52 2013
@@ -33,7 +33,7 @@ BuildArch: noarch
# here and check for the 'mandriva-release' in the future (next year).
#
Requires: mandrake-release
-Provides: apache_openoffice3-desktop-integration
+Provides: openoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
Modified: openoffice/branches/l10n/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/productversion.mk?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/productversion.mk (original)
+++ openoffice/branches/l10n/main/sysui/desktop/productversion.mk Fri Mar 15 09:24:52 2013
@@ -42,7 +42,7 @@ PKGDIR=$(BIN)
# CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded
# but should not be.
# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm
-PRODUCTLIST = apache_openoffice
+PRODUCTLIST = openoffice
# default values to minimize maintainance effort
@@ -66,11 +66,11 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/./
UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
-PRODUCTNAME.apache_openoffice = Apache OpenOffice
+PRODUCTNAME.openoffice = OpenOffice
-PRODUCTVERSION.apache_openoffice = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.apache_openoffice = $(PRODUCTVERSIONSHORT)
-PKGVERSION.apache_openoffice = $(PKGVERSION)
-UNIXFILENAME.apache_openoffice = $(PRODUCTNAME.apache_openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.apache_openoffice)
-ICONPREFIX.apache_openoffice = $(UNIXFILENAME.apache_openoffice:s/.//g)
+PRODUCTVERSION.openoffice = $(PRODUCTVERSION)
+PRODUCTVERSIONSHORT.openoffice = $(PRODUCTVERSIONSHORT)
+PKGVERSION.openoffice = $(PKGVERSION)
+UNIXFILENAME.openoffice = $(PRODUCTNAME.openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.openoffice)
+ICONPREFIX.openoffice = $(UNIXFILENAME.openoffice:s/.//g)
Modified: openoffice/branches/l10n/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/redhat/redhat-menus.spec?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ openoffice/branches/l10n/main/sysui/desktop/redhat/redhat-menus.spec Fri Mar 15 09:24:52 2013
@@ -29,7 +29,7 @@ Vendor: Apache Software Foundation
AutoReqProv: no
BuildArch: noarch
Requires: redhat-release
-Provides: apache_openoffice3-desktop-integration
+Provides: openoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
Modified: openoffice/branches/l10n/main/sysui/desktop/share/brand.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/share/brand.pl?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/share/brand.pl (original)
+++ openoffice/branches/l10n/main/sysui/desktop/share/brand.pl Fri Mar 15 09:24:52 2013
@@ -34,7 +34,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
$destdir = pop @ARGV;
mkdir $destdir,0777;
-$productname = "Apache OpenOffice";
+$productname = "OpenOffice";
$productfilename = "apacheopenoffice";
$prefix = "";
$iconprefix = "";
Modified: openoffice/branches/l10n/main/sysui/desktop/share/create_mime_xml.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/share/create_mime_xml.pl?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/share/create_mime_xml.pl (original)
+++ openoffice/branches/l10n/main/sysui/desktop/share/create_mime_xml.pl Fri Mar 15 09:24:52 2013
@@ -21,7 +21,7 @@
# *************************************************************
use File::Basename;
$basedir = dirname($0);
-$productname = 'Apache OpenOffice';
+$productname = 'OpenOffice';
$mimedir = $basedir.'/../mimetypes';
$FS= ' '; # field seperator (space) - for documents.ulf
Modified: openoffice/branches/l10n/main/sysui/desktop/share/translate.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/share/translate.pl?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/share/translate.pl (original)
+++ openoffice/branches/l10n/main/sysui/desktop/share/translate.pl Fri Mar 15 09:24:52 2013
@@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
my ($prefix, $ext, $key);
-$productname = "Apache OpenOffice";
+$productname = "OpenOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
Modified: openoffice/branches/l10n/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/suse/suse-menus.spec?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/suse/suse-menus.spec (original)
+++ openoffice/branches/l10n/main/sysui/desktop/suse/suse-menus.spec Fri Mar 15 09:24:52 2013
@@ -32,7 +32,7 @@ BuildArch: noarch
Requires: /etc/SuSE-release
# .. but not for Sun JDS
Conflicts: SunDesktopVersion
-Provides: apacheopenoffice3-desktop-integration
+Provides: openoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
Modified: openoffice/branches/l10n/main/tools/inc/tools/diagnose_ex.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/tools/inc/tools/diagnose_ex.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/tools/inc/tools/diagnose_ex.h (original)
+++ openoffice/branches/l10n/main/tools/inc/tools/diagnose_ex.h Fri Mar 15 09:24:52 2013
@@ -86,14 +86,14 @@
OSL_ENSURE(c, m); \
throw ::com::sun::star::lang::IllegalArgumentException( \
::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
- ::rtl::OUString::createFromAscii(",\n"m), \
+ ::rtl::OUString::createFromAscii( ",\n" m), \
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \
0 ); }
#define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \
OSL_ENSURE(c, m); \
throw ::com::sun::star::lang::IllegalArgumentException( \
::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
- ::rtl::OUString::createFromAscii(",\n"m), \
+ ::rtl::OUString::createFromAscii( ",\n" m), \
ifc, \
arg ); }
@@ -104,13 +104,13 @@
OSL_ENSURE(c, m); \
throw ::com::sun::star::uno::RuntimeException( \
::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
- ::rtl::OUString::createFromAscii(",\n"m), \
+ ::rtl::OUString::createFromAscii( ",\n" m), \
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); }
#define ENSURE_OR_THROW2(c, m, ifc) if( !(c) ) { \
OSL_ENSURE(c, m); \
throw ::com::sun::star::uno::RuntimeException( \
::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
- ::rtl::OUString::createFromAscii(",\n"m), \
+ ::rtl::OUString::createFromAscii( ",\n" m), \
ifc ); }
/** This macro asserts the given condition (in debug mode), and
Modified: openoffice/branches/l10n/main/unotools/inc/unotools/configmgr.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/unotools/inc/unotools/configmgr.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/unotools/inc/unotools/configmgr.hxx (original)
+++ openoffice/branches/l10n/main/unotools/inc/unotools/configmgr.hxx Fri Mar 15 09:24:52 2013
@@ -96,7 +96,8 @@ namespace utl
WRITERCOMPATIBILITYVERSIONOOO11,
OPENSOURCECONTEXT,
ABOUTBOXPRODUCTVERSION,
- OOOVENDOR
+ OOOVENDOR,
+ FULLPRODUCTNAME
};
//direct readonly access to some special configuration elements
static com::sun::star::uno::Any GetDirectConfigProperty(ConfigProperty eProp);
Modified: openoffice/branches/l10n/main/unotools/source/config/bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/unotools/source/config/bootstrap.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/unotools/source/config/bootstrap.cxx (original)
+++ openoffice/branches/l10n/main/unotools/source/config/bootstrap.cxx Fri Mar 15 09:24:52 2013
@@ -149,7 +149,7 @@ namespace utl
rtl::OUString uri;
rtl::Bootstrap::get(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri);
- s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"BOOTSTRAP_DATA_NAME)));
+ s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" BOOTSTRAP_DATA_NAME)));
}
return *s_pData;
}
@@ -693,7 +693,7 @@ OUString Bootstrap::getAllUsersValue(OUS
{
OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS));
- rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/"SETUP_DATA_NAME ) ) );
+ rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/" SETUP_DATA_NAME ) ) );
OUString sResult;
aData.getFrom( csAllUsersItem, sResult, _sDefault );
return sResult;
@@ -910,7 +910,7 @@ sal_Bool Bootstrap::Impl::getVersionValu
rtl::Bootstrap::get(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri);
rtl::Bootstrap aData( uri +
- OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"SAL_CONFIGFILE("version"))) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE("version"))) );
if ( aData.getHandle() == NULL )
// version.ini (versionrc) doesn't exist
return sal_False;
Modified: openoffice/branches/l10n/main/unotools/source/config/configmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/unotools/source/config/configmgr.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/unotools/source/config/configmgr.cxx (original)
+++ openoffice/branches/l10n/main/unotools/source/config/configmgr.cxx Fri Mar 15 09:24:52 2013
@@ -62,6 +62,8 @@ namespace
{
struct BrandName
: public rtl::Static< ::rtl::OUString, BrandName > {};
+ struct FullProductname
+ : public rtl::Static< ::rtl::OUString, FullProductname > {};
struct ProductVersion
: public rtl::Static< ::rtl::OUString, ProductVersion > {};
struct AboutBoxProductVersion
@@ -417,6 +419,13 @@ Any ConfigManager::GetDirectConfigProper
return aRet;
}
+ ::rtl::OUString& rFullProductname = FullProductname::get();
+ if ( eProp == FULLPRODUCTNAME && rFullProductname.getLength() )
+ {
+ aRet <<= rFullProductname;
+ return aRet;
+ }
+
rtl::OUString &rProductVersion = ProductVersion::get();
if ( eProp == PRODUCTVERSION && rProductVersion.getLength() )
{
@@ -494,6 +503,7 @@ Any ConfigManager::GetDirectConfigProper
case LOCALE: sPath += C2U("Setup/L10N"); break;
case PRODUCTNAME:
+ case FULLPRODUCTNAME:
case PRODUCTVERSION:
case PRODUCTEXTENSION:
case PRODUCTXMLFILEFORMATNAME :
@@ -531,6 +541,7 @@ Any ConfigManager::GetDirectConfigProper
{
case LOCALE: sProperty = C2U("ooLocale"); break;
case PRODUCTNAME: sProperty = C2U("ooName"); break;
+ case FULLPRODUCTNAME: sProperty = C2U("ooFullname"); break;
case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break;
case ABOUTBOXPRODUCTVERSION: sProperty = C2U("ooSetupVersionAboutBox"); break;
case OOOVENDOR: sProperty = C2U("ooVendor"); break;
Modified: openoffice/branches/l10n/main/unotools/source/config/moduleoptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/unotools/source/config/moduleoptions.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/unotools/source/config/moduleoptions.cxx (original)
+++ openoffice/branches/l10n/main/unotools/source/config/moduleoptions.cxx Fri Mar 15 09:24:52 2013
@@ -311,9 +311,9 @@ struct FactoryInfo
//---------------------------------------------------------------------------------------------------------
void setIcon( sal_Int32 nNewIcon )
{
- if( nNewIcon != nNewIcon )
+ if( nIcon != nNewIcon )
{
- nNewIcon = nNewIcon;
+ nIcon = nNewIcon;
bChangedIcon = sal_True;
}
};
Modified: openoffice/branches/l10n/main/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm (original)
+++ openoffice/branches/l10n/main/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm Fri Mar 15 09:24:52 2013
@@ -25,6 +25,7 @@
#include "precompiled_vcl.hxx"
#include "aqua/salinst.h"
+#include "aqua/salgdi.h"
#include "aqua11ytextattributeswrapper.h"
@@ -33,8 +34,8 @@
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/awt/FontStrikeout.hpp>
+namespace css_awt = ::com::sun::star::awt;
using namespace ::com::sun::star::accessibility;
-using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
@@ -46,8 +47,8 @@ using namespace ::rtl;
int underlineStyle = NSNoUnderlineStyle;
sal_Int16 value = 0;
property.Value >>= value;
- if ( value != FontUnderline::NONE
- && value != FontUnderline::DONTKNOW) {
+ if ( value != ::css_awt::FontUnderline::NONE
+ && value != ::css_awt::FontUnderline::DONTKNOW) {
underlineStyle = NSSingleUnderlineStyle;
}
return underlineStyle;
@@ -57,10 +58,10 @@ using namespace ::rtl;
int boldStyle = 0;
float value = 0;
property.Value >>= value;
- if ( value == FontWeight::SEMIBOLD
- || value == FontWeight::BOLD
- || value == FontWeight::ULTRABOLD
- || value == FontWeight::BLACK ) {
+ if ( value == ::css_awt::FontWeight::SEMIBOLD
+ || value == ::css_awt::FontWeight::BOLD
+ || value == ::css_awt::FontWeight::ULTRABOLD
+ || value == ::css_awt::FontWeight::BLACK ) {
boldStyle = NSBoldFontMask;
}
return boldStyle;
@@ -68,8 +69,8 @@ using namespace ::rtl;
+(int)convertItalicStyle:(PropertyValue)property {
int italicStyle = 0;
- sal_Int16 value = property.Value.get<FontSlant>();
- if ( value == FontSlant_ITALIC ) {
+ const sal_Int16 value = property.Value.get< ::css_awt::FontSlant>();
+ if ( value == ::css_awt::FontSlant_ITALIC ) {
italicStyle = NSItalicFontMask;
}
return italicStyle;
@@ -79,8 +80,8 @@ using namespace ::rtl;
BOOL strikethrough = NO;
sal_Int16 value = 0;
property.Value >>= value;
- if ( value != FontStrikeout::NONE
- && value != FontStrikeout::DONTKNOW ) {
+ if ( value != ::css_awt::FontStrikeout::NONE
+ && value != ::css_awt::FontStrikeout::DONTKNOW ) {
strikethrough = YES;
}
return strikethrough;
@@ -102,13 +103,13 @@ using namespace ::rtl;
return [ NSNumber numberWithShort: value ];
}
-+(void)addColor:(sal_Int32)salColor forAttribute:(NSString *)attribute andRange:(NSRange)range toString:(NSMutableAttributedString *)string {
- if ( salColor != -1 ) {
- float elements[] = { salColor & 0x00ff0000, salColor & 0x0000ff00, salColor & 0x000000ff };
- CGColorRef color = CGColorCreate ( CGColorSpaceCreateWithName ( kCGColorSpaceGenericRGB ), elements );
- [ string addAttribute: attribute value: (id) color range: range ];
- CGColorRelease ( color );
- }
++(void)addColor:(SalColor)nSalColor forAttribute:(NSString *)attribute andRange:(NSRange)range toString:(NSMutableAttributedString *)string {
+ if( nSalColor == COL_TRANSPARENT )
+ return;
+ const RGBAColor aRGBAColor( nSalColor);
+ CGColorRef aColorRef = CGColorCreate ( CGColorSpaceCreateWithName ( kCGColorSpaceGenericRGB ), aRGBAColor.AsArray() );
+ [ string addAttribute: attribute value: (id) aColorRef range: range ];
+ CGColorRelease( aColorRef );
}
+(void)addFont:(NSFont *)font toString:(NSMutableAttributedString *)string forRange:(NSRange)range {
Modified: openoffice/branches/l10n/main/vcl/aqua/source/gdi/salgdiutils.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/gdi/salgdiutils.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/aqua/source/gdi/salgdiutils.cxx (original)
+++ openoffice/branches/l10n/main/vcl/aqua/source/gdi/salgdiutils.cxx Fri Mar 15 09:24:52 2013
@@ -253,7 +253,7 @@ void AquaSalGraphics::RefreshRect(float
CGPoint* AquaSalGraphics::makeCGptArray(sal_uLong nPoints, const SalPoint* pPtAry)
{
- CGPoint *CGpoints = new (CGPoint[nPoints]);
+ CGPoint *CGpoints = new CGPoint[ nPoints];
if ( CGpoints )
{
for(sal_uLong i=0;i<nPoints;i++)
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/bitmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/bitmap.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/bitmap.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/bitmap.hxx Fri Mar 15 09:24:52 2013
@@ -30,6 +30,17 @@
#include <tools/rc.hxx>
#include <vcl/region.hxx>
+#ifdef WNT
+#define _STLP_HAS_NATIVE_FLOAT_ABS
+#endif
+
+#include <boost/math/special_functions/sinc.hpp>
+
+using namespace boost::math::policies;
+typedef policy<
+ promote_double<false>
+> SincPolicy;
+
// -----------
// - Defines -
// -----------
@@ -243,6 +254,8 @@ public:
class Lanczos3Kernel : public Kernel
{
public:
+ Lanczos3Kernel( void) {}
+
virtual double GetWidth() const
{
return 3.0;
@@ -261,13 +274,15 @@ public:
}
x *= M_PI;
-
- return sin(x) / x;
+ return boost::math::sinc_pi(x, SincPolicy());
}
};
class BicubicKernel : public Kernel
{
+public:
+ BicubicKernel( void) {}
+
virtual double GetWidth() const
{
return 2.0;
@@ -295,6 +310,9 @@ class BicubicKernel : public Kernel
class BilinearKernel : public Kernel
{
+public:
+ BilinearKernel( void) {}
+
virtual double GetWidth() const
{
return 1.0;
@@ -318,6 +336,9 @@ class BilinearKernel : public Kernel
class BoxKernel : public Kernel
{
+public:
+ BoxKernel( void) {}
+
virtual double GetWidth() const
{
return 0.5;
Modified: openoffice/branches/l10n/main/vcl/source/app/settings.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/source/app/settings.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/source/app/settings.cxx (original)
+++ openoffice/branches/l10n/main/vcl/source/app/settings.cxx Fri Mar 15 09:24:52 2013
@@ -1167,7 +1167,7 @@ sal_Bool MiscSettings::GetEnableATToolSu
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\Aapche OpenOffice\\Accessibility\\AtToolSupport",
+ "Software\\OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType;
@@ -1245,7 +1245,7 @@ void MiscSettings::SetEnableATToolSuppor
// If the accessibility key in the Windows registry exists, change it synchronously
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",
+ "Software\\OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType;
Modified: openoffice/branches/l10n/main/vcl/source/gdi/bitmap3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/source/gdi/bitmap3.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/source/gdi/bitmap3.cxx (original)
+++ openoffice/branches/l10n/main/vcl/source/gdi/bitmap3.cxx Fri Mar 15 09:24:52 2013
@@ -1559,7 +1559,6 @@ sal_Bool Bitmap::ImplScaleSuper(
else
nWeightY = nMax;
- nWeightY = nWeightY ;
nSumB += nWeightY * ( nSumRowB / nTotalWeightX );
nSumG += nWeightY * ( nSumRowG / nTotalWeightX );
nSumR += nWeightY * ( nSumRowR / nTotalWeightX );
@@ -1704,7 +1703,6 @@ sal_Bool Bitmap::ImplScaleSuper(
else
nWeightY = nMax;
- nWeightY = nWeightY ;
nSumB += nWeightY * ( nSumRowB / nTotalWeightX );
nSumG += nWeightY * ( nSumRowG / nTotalWeightX );
nSumR += nWeightY * ( nSumRowR / nTotalWeightX );
@@ -1851,7 +1849,6 @@ sal_Bool Bitmap::ImplScaleSuper(
else
nWeightY = nMax;
- nWeightY = nWeightY ;
nSumB += nWeightY * ( nSumRowB / nTotalWeightX );
nSumG += nWeightY * ( nSumRowG / nTotalWeightX );
nSumR += nWeightY * ( nSumRowR / nTotalWeightX );
@@ -1996,7 +1993,6 @@ sal_Bool Bitmap::ImplScaleSuper(
else
nWeightY = nMax;
- nWeightY = nWeightY ;
nSumB += nWeightY * ( nSumRowB / nTotalWeightX );
nSumG += nWeightY * ( nSumRowG / nTotalWeightX );
nSumR += nWeightY * ( nSumRowR / nTotalWeightX );
@@ -2139,7 +2135,6 @@ sal_Bool Bitmap::ImplScaleSuper(
else
nWeightY = nMax;
- nWeightY = nWeightY ;
nSumB += nWeightY * ( nSumRowB / nTotalWeightX );
nSumG += nWeightY * ( nSumRowG / nTotalWeightX );
nSumR += nWeightY * ( nSumRowR / nTotalWeightX );
Modified: openoffice/branches/l10n/main/vcl/source/gdi/pdfwriter_impl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/source/gdi/pdfwriter_impl.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/source/gdi/pdfwriter_impl.cxx (original)
+++ openoffice/branches/l10n/main/vcl/source/gdi/pdfwriter_impl.cxx Fri Mar 15 09:24:52 2013
@@ -6559,7 +6559,7 @@ bool PDFWriterImpl::emitTrailer()
aLine.append( "/Root " );
aLine.append( m_nCatalogObject );
aLine.append( " 0 R\n" );
- if( nSecObject |= 0 )
+ if( nSecObject )
{
aLine.append( "/Encrypt ");
aLine.append( nSecObject );
Modified: openoffice/branches/l10n/main/vcl/source/window/toolbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/source/window/toolbox.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/source/window/toolbox.cxx (original)
+++ openoffice/branches/l10n/main/vcl/source/window/toolbox.cxx Fri Mar 15 09:24:52 2013
@@ -6302,7 +6302,7 @@ void ToolBox::ImplDisableFlatButtons()
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",
+ "Software\\OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType = 0;
Modified: openoffice/branches/l10n/main/vigra/vigra1.6.0.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vigra/vigra1.6.0.patch?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vigra/vigra1.6.0.patch (original)
+++ openoffice/branches/l10n/main/vigra/vigra1.6.0.patch Fri Mar 15 09:24:52 2013
@@ -379,7 +379,7 @@ diff -uprN misc/vigra1.6.0/include/vigra
{
value_type * newdata = 0;
value_type ** newlines = 0;
-@@ -1124,8 +1156,8 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
+@@ -1124,15 +1156,15 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
if (newsize != width_*height_) // different sizes, must reallocate
{
newdata = allocator_.allocate(typename Alloc::size_type(newsize));
@@ -390,6 +390,15 @@ diff -uprN misc/vigra1.6.0/include/vigra
deallocate();
}
else // need only to reshape
+ {
+ newdata = data_;
+- std::copy(data, data + newsize, newdata);
+- newlines = initLineStartArray(newdata, width, height);
++ std::copy(src_data, src_data + newsize, newdata);
++ newlines = initLineStartArray(newdata, w, h);
+ pallocator_.deallocate(lines_, typename Alloc::size_type(height_));
+ }
+ }
@@ -1143,12 +1175,12 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
data_ = newdata;
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml Fri Mar 15 09:24:52 2013
@@ -73,7 +73,7 @@
</target>
<target name="init" depends="solar">
- <property name="build.compiler" value="classic"/>
+ <property name="build.compiler" value="modern"/>
<property file="${solar.properties}"/>
<property file="${build.dir}/class/solar.properties"/>
</target>
Modified: openoffice/branches/l10n/main/xmerge/workben/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/workben/build.xml?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/workben/build.xml (original)
+++ openoffice/branches/l10n/main/xmerge/workben/build.xml Fri Mar 15 09:24:52 2013
@@ -73,7 +73,7 @@
</target>
<target name="init" depends="solar">
- <property name="build.compiler" value="classic"/>
+ <property name="build.compiler" value="modern"/>
<property file="${solar.properties}"/>
<property file="${build.dir}/class/solar.properties"/>
</target>
Modified: openoffice/branches/l10n/main/xml2cmp/source/xcd/filebuff.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xml2cmp/source/xcd/filebuff.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xml2cmp/source/xcd/filebuff.cxx (original)
+++ openoffice/branches/l10n/main/xml2cmp/source/xcd/filebuff.cxx Fri Mar 15 09:24:52 2013
@@ -52,7 +52,7 @@ LoadXmlFile( Buffer & o_rBuffer,
// Read file:
aXmlFile.read(o_rBuffer.Data(), (int) nBufferSize);
- bool ret = aXmlFile.good() != 0;
+ const bool ret = !aXmlFile.fail();
aXmlFile.close();
return ret;
}
Modified: openoffice/branches/l10n/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (original)
+++ openoffice/branches/l10n/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx Fri Mar 15 09:24:52 2013
@@ -296,9 +296,9 @@ bool nsscrypto_initialize( const css::un
deleteRootsModule();
#if defined SYSTEM_MOZILLA
- OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));
+ OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
#else
- OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${OOO_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));
+ OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
#endif
::rtl::Bootstrap::expandMacros(rootModule);
@@ -328,18 +328,18 @@ bool nsscrypto_initialize( const css::un
RootsModule = 0;
if (found)
xmlsec_trace("Added new root certificate module "
- "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());
+ "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
else
{
xmlsec_trace("FAILED to load the new root certificate module "
- "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());
+ "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
return_value = false;
}
}
else
{
xmlsec_trace("FAILED to add new root certifice module: "
- "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());
+ "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
return_value = false;
}
@@ -368,17 +368,17 @@ extern "C" void nsscrypto_finalize()
if (SECSuccess == SECMOD_UnloadUserModule(RootsModule))
{
- xmlsec_trace("Unloaded module \""ROOT_CERTS"\".");
+ xmlsec_trace( "Unloaded module \"" ROOT_CERTS "\".");
}
else
{
- xmlsec_trace("Failed unloadeding module \""ROOT_CERTS"\".");
+ xmlsec_trace( "Failed unloadeding module \"" ROOT_CERTS "\".");
}
SECMOD_DestroyModule(RootsModule);
}
else
{
- xmlsec_trace("Unloading module \""ROOT_CERTS
+ xmlsec_trace( "Unloading module \"" ROOT_CERTS
"\" failed because it was not found.");
}
PK11_LogoutAll();