You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/01/17 12:06:20 UTC
svn commit: r1434615 [3/11] - in /openoffice/branches/alg/clibboard: ./
ext_libraries/apr-util/ ext_libraries/apr/ extras/l10n/source/eu/ main/
main/boost/ main/canvas/source/cairo/ main/cli_ure/source/basetypes/
main/cli_ure/source/native/ main/cli_ur...
Modified: openoffice/branches/alg/clibboard/main/boost/boost_freebsd.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/boost/boost_freebsd.patch?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/boost/boost_freebsd.patch (original)
+++ openoffice/branches/alg/clibboard/main/boost/boost_freebsd.patch Thu Jan 17 11:06:13 2013
@@ -248,7 +248,20 @@ Index: boost/archive/shared_ptr_helper.h
typedef int ioctl_arg_type;
typedef uint32_t u_long_type;
typedef uint16_t u_short_type;
---- misc/boost_1_48_0/boost/pool/pool.hpp.orig 2011-12-15 18:21:40.000000000 +0300
+--- misc/boost_1_48_0/boost/lexical_cast.hpp.orig 2013-01-06 17:10:22.000000000 -0500
++++ misc/build/boost_1_48_0/boost/lexical_cast.hpp 2013-01-06 17:11:25.000000000 -0500
+@@ -648,8 +648,8 @@
+ , const CharT opening_brace, const CharT closing_brace)
+ {
+ using namespace std;
+- const wchar_t minus = lcast_char_constants<wchar_t>::minus;
+- const wchar_t plus = lcast_char_constants<wchar_t>::plus;
++ const CharT minus = lcast_char_constants<CharT>::minus;
++ const CharT plus = lcast_char_constants<CharT>::plus;
+ const int inifinity_size = 8;
+
+ bool has_minus = false;
+ --- misc/boost_1_48_0/boost/pool/pool.hpp.orig 2011-12-15 18:21:40.000000000 +0300
+++ misc/build/boost_1_48_0/boost/pool/pool.hpp 2011-12-15 18:22:05.000000000 +0300
@@ -346,7 +346,7 @@
// For alignment reasons, this used to be defined to be lcm(requested_size, sizeof(void *), sizeof(size_type)),
Modified: openoffice/branches/alg/clibboard/main/canvas/source/cairo/cairo_devicehelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/canvas/source/cairo/cairo_devicehelper.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/canvas/source/cairo/cairo_devicehelper.cxx (original)
+++ openoffice/branches/alg/clibboard/main/canvas/source/cairo/cairo_devicehelper.cxx Thu Jan 17 11:06:13 2013
@@ -19,28 +19,21 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_canvas.hxx"
#include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
-
#include <osl/mutex.hxx>
#include <cppuhelper/compbase1.hxx>
-
#include <com/sun/star/lang/NoSupportException.hpp>
-
#include <toolkit/helper/vclunohelper.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/tools/unopolypolygon.hxx>
-
#include <vcl/canvastools.hxx>
-
+#include <vcl/dibtools.hxx>
#include <tools/stream.hxx>
-
#include "cairo_spritecanvas.hxx"
#include "cairo_canvasbitmap.hxx"
#include "cairo_devicehelper.hxx"
@@ -267,8 +260,8 @@ namespace cairocanvas
const ::Point aEmptyPoint;
bool bOldMap( mpRefDevice->IsMapModeEnabled() );
mpRefDevice->EnableMapMode( sal_False );
- aStream << mpRefDevice->GetBitmap(aEmptyPoint,
- mpRefDevice->GetOutputSizePixel());
+ const ::Bitmap aTempBitmap(mpRefDevice->GetBitmap(aEmptyPoint, mpRefDevice->GetOutputSizePixel()));
+ WriteDIB(aTempBitmap, aStream, false, true);
mpRefDevice->EnableMapMode( bOldMap );
++nFilePostfixCount;
Modified: openoffice/branches/alg/clibboard/main/cli_ure/source/basetypes/assembly.cs
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cli_ure/source/basetypes/assembly.cs?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cli_ure/source/basetypes/assembly.cs (original)
+++ openoffice/branches/alg/clibboard/main/cli_ure/source/basetypes/assembly.cs Thu Jan 17 11:06:13 2013
@@ -20,4 +20,4 @@
*************************************************************/
[assembly:System.Reflection.AssemblyDescription( "CLI-UNO: Language Binding specific types" )]
-[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )]
+[assembly: System.Reflection.AssemblyCompany("Apache Software Foundation")]
Modified: openoffice/branches/alg/clibboard/main/cli_ure/source/native/assembly.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cli_ure/source/native/assembly.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cli_ure/source/native/assembly.cxx (original)
+++ openoffice/branches/alg/clibboard/main/cli_ure/source/native/assembly.cxx Thu Jan 17 11:06:13 2013
@@ -29,4 +29,4 @@
[assembly:System::Reflection::AssemblyProduct( "CLI-UNO Language Binding" )];
[assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )];
[assembly:System::Reflection::AssemblyDelaySign(true)];
-[assembly:System::Reflection::AssemblyCompany( "OpenOffice.org" )];
+[assembly:System::Reflection::AssemblyCompany( "Apache Software Foundation" )];
Modified: openoffice/branches/alg/clibboard/main/cli_ure/source/native/native_bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cli_ure/source/native/native_bootstrap.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cli_ure/source/native/native_bootstrap.cxx (original)
+++ openoffice/branches/alg/clibboard/main/cli_ure/source/native/native_bootstrap.cxx Thu Jan 17 11:06:13 2013
@@ -52,7 +52,9 @@ namespace cli_ure {
WCHAR * resolveLink(WCHAR * path);
}
-#define INSTALL_PATH L"Software\\OpenOffice.org\\UNO\\InstallPath"
+// INSTALL_PATH value needs to correspond to the Windows registry subkey
+// in main\scp2\source\ooo\registryitem_ooo.scp
+#define INSTALL_PATH L"Software\\Apache OpenOffice\\UNO\\InstallPath"
#define BASIS_LINK L"\\basis-link"
#define URE_LINK L"\\ure-link"
#define URE_BIN L"\\bin"
@@ -128,7 +130,7 @@ void oneDirUp(LPTSTR io_path)
for example c:/openoffice.org 3/program
This path is either obtained from the environment variable UNO_PATH
or the registry item
- "Software\\OpenOffice.org\\UNO\\InstallPath"
+ "Software\\Apache OpenOffice\\UNO\\InstallPath"
either in HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE
The return value must be freed with delete[]
*/
@@ -330,8 +332,8 @@ namespace util
Bootstrapping requires the existence of many libraries which are contained
in an URE installation. To find and load these libraries the Windows
- registry keys HKEY_CURRENT_USER\Software\OpenOffice.org\Layer\URE\1
- and HKEY_LOCAL_MACHINE\Software\OpenOffice.org\Layer\URE\1 are examined.
+ registry keys HKEY_CURRENT_USER\Software\Apache OpenOffice\Layer\URE\1
+ and HKEY_LOCAL_MACHINE\Software\Apache OpenOffice\Layer\URE\1 are examined.
These contain a named value UREINSTALLLOCATION which holds a path to the URE
installation folder.
*/
Modified: openoffice/branches/alg/clibboard/main/cli_ure/source/ure/assembly.cs
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cli_ure/source/ure/assembly.cs?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cli_ure/source/ure/assembly.cs (original)
+++ openoffice/branches/alg/clibboard/main/cli_ure/source/ure/assembly.cs Thu Jan 17 11:06:13 2013
@@ -20,4 +20,4 @@
*************************************************************/
[assembly:System.Reflection.AssemblyDescription( "CLI-UNO Runtime Library" )]
-[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )]
+[assembly: System.Reflection.AssemblyCompany("Apache Software Foundation")]
Modified: openoffice/branches/alg/clibboard/main/cli_ure/unotypes/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cli_ure/unotypes/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cli_ure/unotypes/makefile.mk (original)
+++ openoffice/branches/alg/clibboard/main/cli_ure/unotypes/makefile.mk Thu Jan 17 11:06:13 2013
@@ -54,8 +54,8 @@ $(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/
--out $@ \
--keyfile $(BIN)$/cliuno.snk \
--assembly-version $(CLI_URETYPES_NEW_VERSION) \
- --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
- --assembly-company "OpenOffice.org" \
+ --assembly-description "This assembly contains metadata for the Apache OpenOffice API." \
+ --assembly-company "Apache Software Foundation" \
$(SOLARBINDIR)$/udkapi.rdb
#do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.
Modified: openoffice/branches/alg/clibboard/main/cppuhelper/source/findsofficepath.c
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cppuhelper/source/findsofficepath.c?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cppuhelper/source/findsofficepath.c (original)
+++ openoffice/branches/alg/clibboard/main/cppuhelper/source/findsofficepath.c Thu Jan 17 11:06:13 2013
@@ -86,7 +86,7 @@ static char* getPathFromRegistryKey( HKE
*/
static char* platformSpecific()
{
- const char* SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath";
+ const char* SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
char* path = NULL;
Modified: openoffice/branches/alg/clibboard/main/cui/source/dialogs/about.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cui/source/dialogs/about.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cui/source/dialogs/about.cxx (original)
+++ openoffice/branches/alg/clibboard/main/cui/source/dialogs/about.cxx Thu Jan 17 11:06:13 2013
@@ -46,7 +46,7 @@
#include <vcl/tabpage.hxx>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/uno/Any.h>
#include "about.hxx"
@@ -532,13 +532,9 @@ IMPL_LINK ( AboutDialog, OpenLinkHdl_Imp
{
try
{
- uno::Reference< uno::XComponentContext > xContext =
- ::comphelper::getProcessComponentContext();
uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShell(
- xContext->getServiceManager()->createInstanceWithContext(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ),
- xContext ),
- uno::UNO_QUERY_THROW );
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShell.is() )
xSystemShell->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
}
Modified: openoffice/branches/alg/clibboard/main/cui/source/options/optimprove.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cui/source/options/optimprove.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cui/source/options/optimprove.cxx (original)
+++ openoffice/branches/alg/clibboard/main/cui/source/options/optimprove.cxx Thu Jan 17 11:06:13 2013
@@ -38,7 +38,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.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/oooimprovement/XCoreController.hpp>
#include <comphelper/configurationhelper.hxx>
@@ -142,12 +142,9 @@ IMPL_LINK( SvxImprovementDialog, HandleH
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShell.is() )
{
xSystemShell->execute(
Modified: openoffice/branches/alg/clibboard/main/cui/source/options/optimprove2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cui/source/options/optimprove2.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cui/source/options/optimprove2.cxx (original)
+++ openoffice/branches/alg/clibboard/main/cui/source/options/optimprove2.cxx Thu Jan 17 11:06:13 2013
@@ -40,7 +40,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/oooimprovement/XCore.hpp>
#include <com/sun/star/oooimprovement/XCoreController.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/util/XStringSubstitution.hpp>
#include <comphelper/configurationhelper.hxx>
@@ -111,12 +111,9 @@ IMPL_LINK( SvxImprovementOptionsPage, Ha
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShell.is() )
{
xSystemShell->execute(
Modified: openoffice/branches/alg/clibboard/main/cui/source/options/optlingu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/cui/source/options/optlingu.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/cui/source/options/optlingu.cxx (original)
+++ openoffice/branches/alg/clibboard/main/cui/source/options/optlingu.cxx Thu Jan 17 11:06:13 2013
@@ -54,7 +54,7 @@
#include <com/sun/star/linguistic2/XDictionaryList.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <unotools/extendedsecurityoptions.hxx>
#include <svtools/svlbox.hxx>
@@ -148,12 +148,9 @@ static void lcl_OpenURL( const ::rtl::OU
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< css::system::XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
+ css::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShell.is() )
xSystemShell->execute( rURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS );
}
Modified: openoffice/branches/alg/clibboard/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/desktop/source/app/app.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/desktop/source/app/app.cxx (original)
+++ openoffice/branches/alg/clibboard/main/desktop/source/app/app.cxx Thu Jan 17 11:06:13 2013
@@ -53,7 +53,6 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/util/XFlushable.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XComponent.hpp>
Modified: openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx (original)
+++ openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx Thu Jan 17 11:06:13 2013
@@ -65,7 +65,7 @@
#include "com/sun/star/i18n/CollatorOptions.hpp"
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/XSystemShellExecute.hpp"
+#include "com/sun/star/system/SystemShellExecute.hpp"
#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
@@ -626,7 +626,7 @@ void DialogHelper::openWebBrowser( const
try
{
uno::Reference< XSystemShellExecute > xSystemShellExecute(
- m_xContext->getServiceManager()->createInstanceWithContext( OUSTR( "com.sun.star.system.SystemShellExecute" ), m_xContext), uno::UNO_QUERY_THROW);
+ com::sun::star::system::SystemShellExecute::create( m_xContext ) );
//throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
xSystemShellExecute->execute( sURL, OUString(), SystemShellExecuteFlags::DEFAULTS );
}
Modified: openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_updatedialog.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_updatedialog.cxx (original)
+++ openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_updatedialog.cxx Thu Jan 17 11:06:13 2013
@@ -61,7 +61,7 @@
#include "com/sun/star/lang/XMultiComponentFactory.hpp"
#include "com/sun/star/lang/XSingleServiceFactory.hpp"
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/XSystemShellExecute.hpp"
+#include "com/sun/star/system/SystemShellExecute.hpp"
#include "com/sun/star/task/XAbortChannel.hpp"
#include "com/sun/star/task/XJob.hpp"
#include "com/sun/star/ucb/CommandAbortedException.hpp"
@@ -1475,10 +1475,7 @@ IMPL_LINK( UpdateDialog, hyperlink_click
try
{
uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
- m_context->getServiceManager()->createInstanceWithContext(
- OUSTR( "com.sun.star.system.SystemShellExecute" ),
- m_context), uno::UNO_QUERY_THROW);
- //throws lang::IllegalArgumentException, system::SystemShellExecuteException
+ com::sun::star::system::SystemShellExecute::create( m_context ) );
xSystemShellExecute->execute(
sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS);
}
Modified: openoffice/branches/alg/clibboard/main/desktop/util/ooverinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/desktop/util/ooverinfo.rc?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/desktop/util/ooverinfo.rc (original)
+++ openoffice/branches/alg/clibboard/main/desktop/util/ooverinfo.rc Thu Jan 17 11:06:13 2013
@@ -59,7 +59,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -71,7 +71,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
Modified: openoffice/branches/alg/clibboard/main/desktop/util/verinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/desktop/util/verinfo.rc?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/desktop/util/verinfo.rc (original)
+++ openoffice/branches/alg/clibboard/main/desktop/util/verinfo.rc Thu Jan 17 11:06:13 2013
@@ -64,7 +64,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName", "Oracle\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -76,7 +76,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "Oracle\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
Modified: openoffice/branches/alg/clibboard/main/desktop/win32/source/applauncher/ooo/verinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/desktop/win32/source/applauncher/ooo/verinfo.rc?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/desktop/win32/source/applauncher/ooo/verinfo.rc (original)
+++ openoffice/branches/alg/clibboard/main/desktop/win32/source/applauncher/ooo/verinfo.rc Thu Jan 17 11:06:13 2013
@@ -59,7 +59,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -71,7 +71,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
Modified: openoffice/branches/alg/clibboard/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx (original)
+++ openoffice/branches/alg/clibboard/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx Thu Jan 17 11:06:13 2013
@@ -64,7 +64,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTopLeft.Crop(
- Rectangle(Point(0,0),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point(0, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maTopLeft;
@@ -77,7 +77,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTop = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTop.Crop(
- Rectangle(Point(nQuarter*2+1,0),Size(1,nQuarter+1)));
+ Rectangle(Point((nQuarter * 2) + 1, 0), Size(1, nQuarter)));
}
return maTop;
@@ -90,7 +90,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTopRight.Crop(
- Rectangle(Point(nQuarter*2+2,0),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point((nQuarter * 2) + 2, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maTopRight;
@@ -103,7 +103,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maRight.Crop(
- Rectangle(Point(nQuarter*3+2,nQuarter*2+1),Size(nQuarter+1,1)));
+ Rectangle(Point((nQuarter * 3) + 3, (nQuarter * 2) + 1), Size(nQuarter, 1)));
}
return maRight;
@@ -116,7 +116,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottomRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottomRight.Crop(
- Rectangle(Point(nQuarter*2+2,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point((nQuarter * 2) + 2, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomRight;
@@ -129,7 +129,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottom = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottom.Crop(
- Rectangle(Point(nQuarter*2+1,nQuarter*3+2),Size(1,nQuarter+1)));
+ Rectangle(Point((nQuarter * 2) + 1, (nQuarter * 3) + 3), Size(1, nQuarter)));
}
return maBottom;
@@ -142,7 +142,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottomLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottomLeft.Crop(
- Rectangle(Point(0,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point(0, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomLeft;
@@ -155,7 +155,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maLeft.Crop(
- Rectangle(Point(0,nQuarter*2+1),Size(nQuarter+1,1)));
+ Rectangle(Point(0, (nQuarter * 2) + 1), Size(nQuarter, 1)));
}
return maLeft;
@@ -192,9 +192,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getTopLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- -fBorderX,
+ -fBorderX,
-fBorderY)));
// Top
@@ -202,9 +202,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getTop(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- 1.0 - (2.0 * fBorderX) - fSingleX,
- fBorderY + fSingleY,
- fBorderX + fSingleX,
+ 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
+ fBorderY,
+ fBorderX + fSingleX,
-fBorderY)));
// TopRight
@@ -212,9 +212,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getTopRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- 1.0 - fBorderX,
+ 1.0 - fBorderX,
-fBorderY)));
// Right
@@ -222,9 +222,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBorderX + fSingleX,
- 1.0 - (2.0 * fBorderY) - fSingleY,
- 1.0,
+ fBorderX,
+ 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
+ 1.0 + fSingleX,
fBorderY + fSingleY)));
// BottomRight
@@ -232,29 +232,29 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getBottomRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- 1.0 - fBorderX,
- 1.0 - fBorderY)));
+ 1.0 - (fBorderX + fSingleX) + fSingleX,
+ 1.0 - (fBorderY + fSingleY) + fSingleY)));
// Bottom
xRetval[5] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getBottom(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- 1.0 - (2.0 * fBorderX) - fSingleX,
- fBorderY + fSingleY,
- fBorderX + fSingleX,
- 1.0)));
+ 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
+ fBorderY,
+ fBorderX + fSingleX,
+ 1.0 + fSingleY)));
// BottomLeft
xRetval[6] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getBottomLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- -fBorderX,
+ -fBorderX,
1.0 - fBorderY)));
// Left
@@ -262,9 +262,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBorderX + fSingleX,
- 1.0 - (2.0 * fBorderY) - fSingleY,
- -fBorderX,
+ fBorderX,
+ 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
+ -fBorderX,
fBorderY + fSingleY)));
// put all in object transformation to get to target positions
Modified: openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx (original)
+++ openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx Thu Jan 17 11:06:13 2013
@@ -25,95 +25,19 @@
#include "precompiled_drawinglayer.hxx"
#include <vclhelperbitmaprender.hxx>
-#include <svtools/grfmgr.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/range/b2drange.hxx>
#include <vcl/outdev.hxx>
#include <vclhelperbitmaptransform.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <vcl/gdimtf.hxx>
//////////////////////////////////////////////////////////////////////////////
// support for different kinds of bitmap rendering using vcl
namespace drawinglayer
{
- void RenderBitmapPrimitive2D_GraphicManager(
- OutputDevice& rOutDev,
- const BitmapEx& rBitmapEx,
- const basegfx::B2DHomMatrix& rTransform)
- {
- // prepare attributes
- GraphicAttr aAttributes;
-
- // decompose matrix to check for shear, rotate and mirroring
- basegfx::B2DVector aScale, aTranslate;
- double fRotate, fShearX;
- rTransform.decompose(aScale, aTranslate, fRotate, fShearX);
-
- // mirror flags
- const bool bMirrorX(basegfx::fTools::less(aScale.getX(), 0.0));
- const bool bMirrorY(basegfx::fTools::less(aScale.getY(), 0.0));
- aAttributes.SetMirrorFlags((bMirrorX ? BMP_MIRROR_HORZ : 0)|(bMirrorY ? BMP_MIRROR_VERT : 0));
-
- // rotation
- if(!basegfx::fTools::equalZero(fRotate))
- {
- double fRotation(fmod(3600.0 - (fRotate * (10.0 / F_PI180)), 3600.0));
- aAttributes.SetRotation((sal_uInt16)(fRotation));
- }
-
- // prepare Bitmap
- basegfx::B2DRange aOutlineRange(0.0, 0.0, 1.0, 1.0);
-
- if(basegfx::fTools::equalZero(fRotate))
- {
- aOutlineRange.transform(rTransform);
- }
- else
- {
- // if rotated, create the unrotated output rectangle for the GraphicManager paint
- // #118824# Caution! When mirrored, adapt transformation accordingly
- // #121387# Also need to adapt position when mirror and rotation is combined
- if(bMirrorX || bMirrorY)
- {
- const basegfx::B2DHomMatrix aRot(basegfx::tools::createRotateB2DHomMatrix(fRotate));
-
- if(bMirrorX)
- {
- aTranslate += aRot * basegfx::B2DVector(aScale.getX(), 0.0);
- }
-
- if(bMirrorY)
- {
- aTranslate += aRot * basegfx::B2DVector(0.0, aScale.getY());
- }
- }
-
- const basegfx::B2DHomMatrix aSimpleObjectMatrix(
- basegfx::tools::createScaleTranslateB2DHomMatrix(
- fabs(aScale.getX()),
- fabs(aScale.getY()),
- aTranslate.getX(),
- aTranslate.getY()));
-
- aOutlineRange.transform(aSimpleObjectMatrix);
- }
-
- // prepare dest coordinates
- const Point aPoint(
- basegfx::fround(aOutlineRange.getMinX()),
- basegfx::fround(aOutlineRange.getMinY()));
- const Size aSize(
- basegfx::fround(aOutlineRange.getWidth()),
- basegfx::fround(aOutlineRange.getHeight()));
-
- // paint it using GraphicManager
- Graphic aGraphic(rBitmapEx);
- GraphicObject aGraphicObject(aGraphic);
- aGraphicObject.Draw(&rOutDev, aPoint, aSize, &aAttributes);
- }
-
void RenderBitmapPrimitive2D_BitmapEx(
OutputDevice& rOutDev,
const BitmapEx& rBitmapEx,
@@ -157,7 +81,14 @@ namespace drawinglayer
}
// draw bitmap
- rOutDev.DrawBitmapEx(aPoint, aSize, aContent);
+ if(aSize == aContent.GetSizePixel())
+ {
+ rOutDev.DrawBitmapEx(aPoint, aContent);
+ }
+ else
+ {
+ rOutDev.DrawBitmapEx(aPoint, aSize, aContent);
+ }
}
void RenderBitmapPrimitive2D_self(
Modified: openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx (original)
+++ openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx Thu Jan 17 11:06:13 2013
@@ -38,11 +38,6 @@ namespace basegfx { class B2DHomMatrix;
namespace drawinglayer
{
- void RenderBitmapPrimitive2D_GraphicManager(
- OutputDevice& rOutDev,
- const BitmapEx& rBitmapEx,
- const basegfx::B2DHomMatrix& rTransform);
-
void RenderBitmapPrimitive2D_BitmapEx(
OutputDevice& rOutDev,
const BitmapEx& rBitmapEx,
Modified: openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclprocessor2d.cxx (original)
+++ openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclprocessor2d.cxx Thu Jan 17 11:06:13 2013
@@ -389,10 +389,24 @@ namespace drawinglayer
// direct draw of transformed BitmapEx primitive
void VclProcessor2D::RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate)
{
- // create local transform
- basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * rBitmapCandidate.getTransform());
- BitmapEx aBitmapEx(rBitmapCandidate.getBitmapEx());
- bool bPainted(false);
+ // check local ViewPort
+ const basegfx::B2DRange& rDiscreteViewPort(getViewInformation2D().getDiscreteViewport());
+ const basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * rBitmapCandidate.getTransform());
+
+ if(!rDiscreteViewPort.isEmpty())
+ {
+ // check if we are visible
+ basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0);
+
+ aUnitRange.transform(aLocalTransform);
+
+ if(!aUnitRange.overlaps(rDiscreteViewPort))
+ {
+ return;
+ }
+ }
+
+ BitmapEx aBitmapEx(rBitmapCandidate.getBitmapEx());
if(maBColorModifierStack.count())
{
@@ -409,14 +423,12 @@ namespace drawinglayer
mpOutputDevice->SetLineColor();
mpOutputDevice->DrawPolygon(aPolygon);
- bPainted = true;
+ return;
}
}
- if(!bPainted)
{
static bool bForceUseOfOwnTransformer(false);
- static bool bUseGraphicManager(true);
// decompose matrix to check for shear, rotate and mirroring
basegfx::B2DVector aScale, aTranslate;
@@ -426,19 +438,12 @@ namespace drawinglayer
// #121387# when mirrored and rotated, avoid the GraphicManager output which has low quality
const bool bRotated(!basegfx::fTools::equalZero(fRotate));
const bool bSheared(!basegfx::fTools::equalZero(fShearX));
- const bool bMirrored(aScale.getX() < 0.0 || aScale.getY() < 0.0);
- const bool bMirroredAndRotated(bRotated && bMirrored);
+ //const bool bMirrored(aScale.getX() < 0.0 || aScale.getY() < 0.0);
+ // const bool bMirroredAndRotated(bRotated && bMirrored);
- if(!bForceUseOfOwnTransformer && !bSheared && !bMirroredAndRotated)
+ if(!bForceUseOfOwnTransformer && !bRotated && !bSheared) // && !bMirrored)
{
- if(!bUseGraphicManager && !bRotated)
- {
- RenderBitmapPrimitive2D_BitmapEx(*mpOutputDevice, aBitmapEx, aLocalTransform);
- }
- else
- {
- RenderBitmapPrimitive2D_GraphicManager(*mpOutputDevice, aBitmapEx, aLocalTransform);
- }
+ RenderBitmapPrimitive2D_BitmapEx(*mpOutputDevice, aBitmapEx, aLocalTransform);
}
else
{
Modified: openoffice/branches/alg/clibboard/main/embeddedobj/source/msole/oleembed.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/embeddedobj/source/msole/oleembed.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/embeddedobj/source/msole/oleembed.cxx (original)
+++ openoffice/branches/alg/clibboard/main/embeddedobj/source/msole/oleembed.cxx Thu Jan 17 11:06:13 2013
@@ -45,14 +45,14 @@
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <rtl/logfile.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <comphelper/mimeconfighelper.hxx>
#include <comphelper/storagehelper.hxx>
-
+#include <comphelper/processfactory.hxx>
#include <targetstatecontrol.hxx>
@@ -878,9 +878,9 @@ void SAL_CALL OleEmbeddedObject::doVerb(
if (m_aTempDumpURL.getLength())
{
- uno::Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute( m_xFactory->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))),
- uno::UNO_QUERY_THROW);
+ uno::Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ ::com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
xSystemShellExecute->execute(m_aTempDumpURL, ::rtl::OUString(), ::com::sun::star::system::SystemShellExecuteFlags::DEFAULTS);
}
else
Modified: openoffice/branches/alg/clibboard/main/extensions.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/extensions.lst?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/extensions.lst (original)
+++ openoffice/branches/alg/clibboard/main/extensions.lst Thu Jan 17 11:06:13 2013
@@ -103,3 +103,20 @@
# Khmer dictionary.
[ language=km ]
a22266cfa40fb23a79be27a239321a3f http://sourceforge.net/projects/aoo-extensions/files/1009/1/km_spellchecker_OOo30_V_1.0.2.oxt/download "km_spellchecker_OOo30_V_1.0.2.oxt"
+
+# Scottish Gaelic.
+[ language=gd ]
+ d645b36c5d4fc52c18ac180453b48b5c http://sourceforge.net/projects/aoo-extensions/files/4587/7/hunspell-gd-2.5.oxt/download "hunspell-gd-2.5.oxt"
+
+# Basque.
+[ language=eu ]
+ f408bb4a333bea2aec86bffaa4ffa229 http://sourceforge.net/projects/aoo-extensions/files/1383/2/xuxen_4_OOo3.oxt/download "xuxen_4_OOo3.oxt"
+
+# Hungarian.
+[ language=hu ]
+ 76345f925e34fef2d29bade4f29108e9 http://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_HU-1.3.oxt"
+ d320e43e815c2dfd599dbfb7cd0e41fb http://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt"
+
+# Asturian.
+[ language=ast ]
+ ed5702f25c8f5e36f97cafc606470c42 http://sourceforge.net/projects/aoo-extensions/files/3932/1/asturianu.oxt/download "asturianu.oxt"
\ No newline at end of file
Modified: openoffice/branches/alg/clibboard/main/extensions/source/update/check/updatecheck.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/extensions/source/update/check/updatecheck.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/extensions/source/update/check/updatecheck.cxx (original)
+++ openoffice/branches/alg/clibboard/main/extensions/source/update/check/updatecheck.cxx Thu Jan 17 11:06:13 2013
@@ -33,7 +33,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/DispatchResultEvent.hpp>
#include <com/sun/star/frame/DispatchResultState.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/task/XJob.hpp>
#include <com/sun/star/task/XJobExecutor.hpp>
@@ -932,8 +932,7 @@ UpdateCheck::install()
osl::MutexGuard aGuard(m_aMutex);
const uno::Reference< c3s::XSystemShellExecute > xShellExecute(
- createService( UNISTRING( "com.sun.star.system.SystemShellExecute" ), m_xContext ),
- uno::UNO_QUERY );
+ c3s::SystemShellExecute::create( m_xContext ) );
try {
// Construct install command ??
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/cache/constant.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/cache/constant.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/cache/constant.hxx (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/cache/constant.hxx Thu Jan 17 11:06:13 2013
@@ -193,7 +193,7 @@ extern rtl::OUString pFilterStrings[];
/** @short some default values.
*/
#define DEFAULT_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("en-US")
-#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("OpenOffice")
+#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("OpenOffice.org XML")
#define DEFAULT_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_("1.0")
/** @short used for the queries of the FilterFactory service.
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.cxx (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.cxx Thu Jan 17 11:06:13 2013
@@ -120,8 +120,9 @@ FilterCache* FilterCache::clone() const
pClone->m_lURLPattern2Types = m_lURLPattern2Types;
pClone->m_sActLocale = m_sActLocale;
- pClone->m_sFormatName = m_sFormatName;
- pClone->m_sFormatVersion = m_sFormatVersion;
+ pClone->m_sProductName = m_sProductName;
+ pClone->m_sOOoXMLFormatName = m_sOOoXMLFormatName;
+ pClone->m_sOOoXMLFormatVersion = m_sOOoXMLFormatVersion;
pClone->m_eFillState = m_eFillState;
@@ -178,8 +179,9 @@ void FilterCache::takeOver(const FilterC
m_lChangedContentHandlers.clear();
m_sActLocale = rClone.m_sActLocale;
- m_sFormatName = rClone.m_sFormatName;
- m_sFormatVersion = rClone.m_sFormatVersion;
+ m_sProductName = rClone.m_sProductName;
+ m_sOOoXMLFormatName = rClone.m_sOOoXMLFormatName;
+ m_sOOoXMLFormatVersion = rClone.m_sOOoXMLFormatVersion;
m_eFillState = rClone.m_eFillState;
@@ -242,21 +244,20 @@ void FilterCache::load(EFillState eRequi
m_sActLocale = DEFAULT_OFFICELOCALE;
}
- impl_getDirectCFGValue(CFGDIRECTKEY_FORMATNAME) >>= m_sFormatName;
- if (!m_sFormatName.getLength())
- impl_getDirectCFGValue(CFGDIRECTKEY_PRODUCTNAME) >>= m_sFormatName;
+ impl_getDirectCFGValue(CFGDIRECTKEY_PRODUCTNAME) >>= m_sProductName;
- if (!m_sFormatName.getLength())
+ impl_getDirectCFGValue(CFGDIRECTKEY_FORMATNAME) >>= m_sOOoXMLFormatName;
+ if (!m_sOOoXMLFormatName.getLength())
{
_FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format name => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATNAME));
- m_sFormatName = DEFAULT_FORMATNAME;
+ m_sOOoXMLFormatName = DEFAULT_FORMATNAME;
}
- impl_getDirectCFGValue(CFGDIRECTKEY_FORMATVERSION) >>= m_sFormatVersion;
- if (!m_sFormatVersion.getLength())
+ impl_getDirectCFGValue(CFGDIRECTKEY_FORMATVERSION) >>= m_sOOoXMLFormatVersion;
+ if (!m_sOOoXMLFormatVersion.getLength())
{
_FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format version => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATVERSION));
- m_sFormatVersion = DEFAULT_FORMATVERSION;
+ m_sOOoXMLFormatVersion = DEFAULT_FORMATVERSION;
}
// Support the old configuration support. Read it only one times during office runtime!
@@ -1663,13 +1664,15 @@ void FilterCache::impl_readPatchUINames(
CacheItem& rItem)
throw(css::uno::Exception)
{
- static ::rtl::OUString FORMATNAME_VAR = ::rtl::OUString::createFromAscii("%productname%" );
- static ::rtl::OUString FORMATVERSION_VAR = ::rtl::OUString::createFromAscii("%formatversion%");
+ static ::rtl::OUString PRODUCTNAME_VAR = ::rtl::OUString::createFromAscii("%productname%");
+ static ::rtl::OUString FORMATNAME_VAR = ::rtl::OUString::createFromAscii("%oooxmlformatname%" );
+ static ::rtl::OUString FORMATVERSION_VAR = ::rtl::OUString::createFromAscii("%oooxmlformatversion%");
// SAFE -> ----------------------------------
::osl::ResettableMutexGuard aLock(m_aLock);
- ::rtl::OUString sFormatName = m_sFormatName ;
- ::rtl::OUString sFormatVersion = m_sFormatVersion;
+ ::rtl::OUString sProductName = m_sProductName;
+ ::rtl::OUString sFormatName = m_sOOoXMLFormatName;
+ ::rtl::OUString sFormatVersion = m_sOOoXMLFormatVersion;
::rtl::OUString sActLocale = m_sActLocale ;
aLock.clear();
// <- SAFE ----------------------------------
@@ -1683,7 +1686,7 @@ void FilterCache::impl_readPatchUINames(
::comphelper::SequenceAsVector< ::rtl::OUString >::const_iterator pLocale ;
::comphelper::SequenceAsHashMap lUINames;
- // patch %PRODUCTNAME and %FORMATNAME
+ // patch %productname%, %oooxmlformatname% and %oooxmlformatversion%
for ( pLocale = lLocales.begin();
pLocale != lLocales.end() ;
++pLocale )
@@ -1694,13 +1697,20 @@ void FilterCache::impl_readPatchUINames(
xUIName->getByName(sLocale) >>= sValue;
// replace %productname%
- sal_Int32 nIndex = sValue.indexOf(FORMATNAME_VAR);
+ sal_Int32 nIndex = sValue.indexOf(PRODUCTNAME_VAR);
+ while(nIndex != -1)
+ {
+ sValue = sValue.replaceAt(nIndex, PRODUCTNAME_VAR.getLength(), sProductName);
+ nIndex = sValue.indexOf(PRODUCTNAME_VAR, nIndex);
+ }
+ // replace %oooxmlformatname%
+ nIndex = sValue.indexOf(FORMATNAME_VAR);
while(nIndex != -1)
{
sValue = sValue.replaceAt(nIndex, FORMATNAME_VAR.getLength(), sFormatName);
nIndex = sValue.indexOf(FORMATNAME_VAR, nIndex);
}
- // replace %formatversion%
+ // replace %oooxmlformatversion%
nIndex = sValue.indexOf(FORMATVERSION_VAR);
while(nIndex != -1)
{
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.hxx (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.hxx Thu Jan 17 11:06:13 2013
@@ -236,13 +236,15 @@ class FilterCache : public BaseLock
used to work with localized configuration values. */
::rtl::OUString m_sActLocale;
+ ::rtl::OUString m_sProductName;
+
//---------------------------------------
/** TODO */
- ::rtl::OUString m_sFormatName;
+ ::rtl::OUString m_sOOoXMLFormatName;
//---------------------------------------
/** TODO */
- ::rtl::OUString m_sFormatVersion;
+ ::rtl::OUString m_sOOoXMLFormatVersion;
//---------------------------------------
/** @short contains status, which cache items/properties
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Calc)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Spreadsheet</value>
- <value xml:lang="x-translate">%productname% %formatversion% Spreadsheet</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Spreadsheet</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Spreadsheet</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Chart)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Chart</value>
- <value xml:lang="x-translate">%productname% %formatversion% Chart</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Chart</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Chart</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Draw)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Drawing</value>
- <value xml:lang="x-translate">%productname% %formatversion% Drawing</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Impress)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Presentation</value>
- <value xml:lang="x-translate">%productname% %formatversion% Presentation</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Presentation</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Presentation</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Math)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Formula</value>
- <value xml:lang="x-translate">%productname% %formatversion% Formula</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Formula</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Formula</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Writer)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document</value>
- <value xml:lang="x-translate">%productname% %formatversion% Text Document</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="calc_StarOffice_XML_Calc_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Spreadsheet Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% Spreadsheet Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Spreadsheet Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Spreadsheet Template</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="draw_StarOffice_XML_Draw_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Drawing Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% Drawing Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing Template</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="impress_StarOffice_XML_Draw">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Drawing (%productname% Impress)</value>
- <value xml:lang="x-translate">%productname% %formatversion% Drawing (%productname% Impress)</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing (%productname% Impress)</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing (%productname% Impress)</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="impress_StarOffice_XML_Impress_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Presentation Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% Presentation Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Presentation Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Presentation Template</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_StarOffice_XML_Writer_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% Text Document Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document Template</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Master Document</value>
- <value xml:lang="x-translate">%productname% %formatversion% Master Document</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Master Document</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Master Document</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_globaldocument_StarOffice_XML_Writer">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document</value>
- <value xml:lang="x-translate">%productname% %formatversion% Text Document</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_web_StarOffice_XML_Writer_Web_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% HTML Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% HTML Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% HTML Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% HTML Template</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu Thu Jan 17 11:06:13 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_web_StarOffice_XML_Writer">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document (%productname% Writer/Web)</value>
- <value xml:lang="x-translate">%productname% %formatversion% Text Document (%productname% Writer/Web)</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document (%productname% Writer/Web)</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document (%productname% Writer/Web)</value>
</prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Draw)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Zeichnung</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Zeichnung</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Draw 6.0</value></prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Impress)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Präsentation</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Präsentation</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Impress 6.0</value></prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Math)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Formel</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Formel</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Math 6.0</value></prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (DOS) (StarWriter)</value></prop>
<prop oor:name="UIName">
- <value>Lotus 1-2-3 1.0 (DOS) (%productname% %formatversion% Writer)</value>
+ <value>Lotus 1-2-3 1.0 (DOS) (%productname% Writer)</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (WIN) (StarWriter)</value></prop>
<prop oor:name="UIName">
- <value>Lotus 1-2-3 1.0 (WIN) (%productname% %formatversion% Writer)</value>
+ <value>Lotus 1-2-3 1.0 (WIN) (%productname% Writer)</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Writer)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Textdokument</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Textdokument</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Writer 6.0</value></prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarWriter 3.0</value></prop>
<prop oor:name="UIName">
- <value>StarWriter 3.0 (%productname% %formatversion% Globaldokument)</value>
+ <value>StarWriter 3.0 (%productname% Globaldokument)</value>
</prop>
<prop oor:name="ClipboardFormat"><value>StarWriter 3.0</value></prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarWriter 4.0</value></prop>
<prop oor:name="UIName">
- <value>StarWriter 4.0 (%productname% %formatversion% Globaldokument)</value>
+ <value>StarWriter 4.0 (%productname% Globaldokument)</value>
</prop>
<prop oor:name="ClipboardFormat"><value>StarWriter 4.0</value></prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu (original)
+++ openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarWriter 5.0</value></prop>
<prop oor:name="UIName">
- <value>StarWriter 5.0 (%productname% %formatversion% Globaldokument)</value>
+ <value>StarWriter 5.0 (%productname% Globaldokument)</value>
</prop>
<prop oor:name="ClipboardFormat"><value>StarWriter 5.0</value></prop>
</node>
Modified: openoffice/branches/alg/clibboard/main/framework/inc/classes/filtercachedata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/framework/inc/classes/filtercachedata.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/framework/inc/classes/filtercachedata.hxx (original)
+++ openoffice/branches/alg/clibboard/main/framework/inc/classes/filtercachedata.hxx Thu Jan 17 11:06:13 2013
@@ -84,12 +84,6 @@ namespace framework{
#define CFG_ENCODING_OPEN DECLARE_ASCII("[\'" ) /// used to start encoding of set names
#define CFG_ENCODING_CLOSE DECLARE_ASCII("\']" ) /// used to finish encoding of set names
-#define PRODUCTNAME_VARIABLE DECLARE_ASCII("%productname%")
-#define PRODUCTNAME_VARLENGTH 13
-#define PRODUCTNAME_FALLBACK DECLARE_ASCII("StarOffice" ) /// fallback, if configuration can't give us current set product name ...
-#define FORMATVERSION_VARIABLE DECLARE_ASCII("%formatversion%" )
-#define FORMATVERSION_VARLENGTH 15
-#define FORMATVERSION_FALLBACK DECLARE_ASCII("6.0/7" )
//*****************************************************************************************************************
// We know some default values ...
Modified: openoffice/branches/alg/clibboard/main/framework/inc/dispatch/mailtodispatcher.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/framework/inc/dispatch/mailtodispatcher.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/framework/inc/dispatch/mailtodispatcher.hxx (original)
+++ openoffice/branches/alg/clibboard/main/framework/inc/dispatch/mailtodispatcher.hxx Thu Jan 17 11:06:13 2013
@@ -93,15 +93,13 @@ class MailToDispatcher : // interfaces
{
/* member */
private:
-
- /// reference to global uno service manager which had created us
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
/* interface */
public:
// ctor/dtor
- MailToDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+ MailToDispatcher( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~MailToDispatcher( );
// XInterface, XTypeProvider, XServiceInfo
Modified: openoffice/branches/alg/clibboard/main/framework/inc/dispatch/systemexec.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/framework/inc/dispatch/systemexec.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/framework/inc/dispatch/systemexec.hxx (original)
+++ openoffice/branches/alg/clibboard/main/framework/inc/dispatch/systemexec.hxx Thu Jan 17 11:06:13 2013
@@ -93,15 +93,13 @@ class SystemExec : // interfaces
{
/* member */
private:
-
- /// reference to global uno service manager which had created us
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
/* interface */
public:
// ctor/dtor
- SystemExec( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+ SystemExec( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~SystemExec( );
// XInterface, XTypeProvider, XServiceInfo
Modified: openoffice/branches/alg/clibboard/main/framework/inc/framework/addonsoptions.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/framework/inc/framework/addonsoptions.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/framework/inc/framework/addonsoptions.hxx (original)
+++ openoffice/branches/alg/clibboard/main/framework/inc/framework/addonsoptions.hxx Thu Jan 17 11:06:13 2013
@@ -279,6 +279,13 @@ class FWE_DLLPUBLIC AddonsOptions
const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
+ /**
+ * @short Gets the UI name of a single addon toolbar
+ * @return The UI name of the toolbar as specified in the Addons.xcu configuration
+ * @onerror Returns an empty string
+ */
+ const ::rtl::OUString GetAddonsToolbarUIName( sal_uInt32 nIndex ) const;
+
/*-****************************************************************************************************//**
@short Retrieves all available merge instructions for the Office menu bar
@descr -
Modified: openoffice/branches/alg/clibboard/main/framework/inc/pch/precompiled_framework.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/framework/inc/pch/precompiled_framework.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/framework/inc/pch/precompiled_framework.hxx (original)
+++ openoffice/branches/alg/clibboard/main/framework/inc/pch/precompiled_framework.hxx Thu Jan 17 11:06:13 2013
@@ -222,7 +222,7 @@
#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
#include "com/sun/star/sync2/BadPartnershipException.hpp"
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/XSystemShellExecute.hpp"
+#include "com/sun/star/system/SystemShellExecute.hpp"
#include "com/sun/star/task/ErrorCodeRequest.hpp"
#include "com/sun/star/task/XAsyncJob.hpp"
#include "com/sun/star/task/XInteractionAbort.hpp"
Modified: openoffice/branches/alg/clibboard/main/framework/inc/services.h
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/framework/inc/services.h?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/framework/inc/services.h (original)
+++ openoffice/branches/alg/clibboard/main/framework/inc/services.h Thu Jan 17 11:06:13 2013
@@ -72,7 +72,6 @@ namespace framework{
#define SERVICENAME_JOB DECLARE_ASCII("com.sun.star.task.Job" )
#define SERVICENAME_DISPATCHRECORDERSUPPLIER DECLARE_ASCII("com.sun.star.frame.DispatchRecorderSupplier" )
#define SERVICENAME_DISPATCHRECORDER DECLARE_ASCII("com.sun.star.frame.DispatchRecorder" )
-#define SERVICENAME_SYSTEMSHELLEXECUTE DECLARE_ASCII("com.sun.star.system.SystemShellExecute" )
#define SERVICENAME_PROTOCOLHANDLER DECLARE_ASCII("com.sun.star.frame.ProtocolHandler" )
#define SERVICENAME_SUBSTITUTEPATHVARIABLES DECLARE_ASCII("com.sun.star.util.PathSubstitution" )
#define SERVICENAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.util.PathSettings" )