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 [9/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/sfx2/source/view/viewsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sfx2/source/view/viewsh.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sfx2/source/view/viewsh.cxx (original)
+++ openoffice/branches/alg/clibboard/main/sfx2/source/view/viewsh.cxx Thu Jan 17 11:06:13 2013
@@ -36,7 +36,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/EmbedMisc.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/frame/XStorable.hpp>
@@ -709,9 +709,9 @@ void SfxViewShell::ExecMisc_Impl( SfxReq
return;
}
- ::com::sun::star::uno::Reference< XSystemShellExecute > xSystemShellExecute( xSMGR->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )),
- css::uno::UNO_QUERY );
+ ::com::sun::star::uno::Reference< XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
sal_Bool bRet( sal_True );
if ( xSystemShellExecute.is() )
Modified: openoffice/branches/alg/clibboard/main/shell/inc/internal/config.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/inc/internal/config.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/inc/internal/config.hxx (original)
+++ openoffice/branches/alg/clibboard/main/shell/inc/internal/config.hxx Thu Jan 17 11:06:13 2013
@@ -40,10 +40,10 @@
#define MODULE_NAME_FILTER TEXT("ooofilt.dll")
#endif
-#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Column Handler")
-#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Infotip Handler")
-#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Property Sheet Handler")
-#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("OpenOffice.org Thumbnail Viewer")
+#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Column Handler")
+#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Infotip Handler")
+#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Property Sheet Handler")
+#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("Apache OpenOffice Thumbnail Viewer")
#define META_CONTENT_NAME "meta.xml"
#define DOC_CONTENT_NAME "content.xml"
Modified: openoffice/branches/alg/clibboard/main/shell/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/prj/build.lst?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/prj/build.lst (original)
+++ openoffice/branches/alg/clibboard/main/shell/prj/build.lst Thu Jan 17 11:06:13 2013
@@ -1,7 +1,7 @@
sl shell : L10N:l10n offuh rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL
sl shell\inc nmake - all sl_inc NULL
sl shell\source\win32 nmake - w sl_win32 sl_inc NULL
-sl shell\source\win32\simplemail nmake - w sl_win32_simplemail sl_inc NULL
+sl shell\source\win32\sysmail nmake - w sl_win32_sysmail sl_inc NULL
sl shell\source\unix\exec nmake - u sl_unix sl_inc NULL
sl shell\source\unix\exec nmake - p sl_unix sl_inc NULL
sl shell\source\unix\misc nmake - u sl_unix_misc sl_inc NULL
Modified: openoffice/branches/alg/clibboard/main/shell/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/prj/d.lst?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/prj/d.lst (original)
+++ openoffice/branches/alg/clibboard/main/shell/prj/d.lst Thu Jan 17 11:06:13 2013
@@ -29,6 +29,6 @@
..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h
..\%__SRC%\misc\localebe1.component %_DEST%\xml%_EXT%\localebe1.component
..\%__SRC%\misc\macbe1.component %_DEST%\xml%_EXT%\macbe1.component
-..\%__SRC%\misc\smplmail.component %_DEST%\xml%_EXT%\smplmail.component
+..\%__SRC%\misc\sysmail.component %_DEST%\xml%_EXT%\sysmail.component
..\%__SRC%\misc\syssh.component %_DEST%\xml%_EXT%\syssh.component
..\%__SRC%\misc\wininetbe1.component %_DEST%\xml%_EXT%\wininetbe1.component
Modified: openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.component
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.component?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.component (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.component Thu Jan 17 11:06:13 2013
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,23 +8,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
-
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.system.SimpleCommandMail">
- <service name="com.sun.star.system.SimpleCommandMail"/>
+ <implementation name="com.sun.star.comp.system.unx.SystemMailProvider">
+ <service name="com.sun.star.system.SystemMailProvider"/>
</implementation>
</component>
Modified: openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.xml?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.xml (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.xml Thu Jan 17 11:06:13 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,61 +9,59 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
- <module-name> cmdmail </module-name>
+ <module-name>cmdmail</module-name>
<component-description>
- <author> Oliver Braun </author>
- <name>com.sun.star.comp.system.SimpleCommandMail</name>
- <description>
- A generic implementation of a SimpleCommandMail service.
- </description>
+ <author>Oliver Braun</author>
+ <name>com.sun.star.comp.system.unx.SystemMailProvider</name>
+ <description>A generic implementation of a SystemMailProvider service.</description>
<loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language> c++ </language>
- <status value="beta"/>
- <supported-service> com.sun.star.system.SimpleCommandMail </supported-service>
+ <language>c++</language>
+ <status value="beta"/>
+ <supported-service>com.sun.star.system.SystemMailProvider</supported-service>
<service-dependency>...</service-dependency>
- <type> com.sun.star.system.XSimpleMailClient </type>
- <type> com.sun.star.system.XSimpleMailClientSupplier </type>
- <type> com.sun.star.system.XSimpleMailMessage </type>
- <type> com.sun.star.system.SimpleMailClientFlags </type>
- <type> com.sun.star.lang.XEventListener </type>
- <type> com.sun.star.lang.XMultiServiceFactory </type>
- <type> com.sun.star.lang.XSingleServiceFactory </type>
- <type> com.sun.star.lang.XSingleComponentFactory </type>
- <type> com.sun.star.lang.XServiceInfo </type>
- <type> com.sun.star.lang.XTypeProvider </type>
- <type> com.sun.star.lang.IllegalArgumentException </type>
- <type> com.sun.star.lang.XComponent </type>
- <type> com.sun.star.uno.RuntimeException </type>
- <type> com.sun.star.uno.TypeClass </type>
- <type> com.sun.star.uno.XWeak </type>
- <type> com.sun.star.uno.XAggregation </type>
- <type> com.sun.star.uno.XComponentContext </type>
- <type> com.sun.star.registry.XRegistryKey </type>
- <type> com.sun.star.container.XNameAccess </type>
- <type> com.sun.star.container.XSet </type>
- <type> com.sun.star.beans.PropertyValue </type>
- <type> com.sun.star.beans.XPropertySet </type>
- <type> com.sun.star.uri.ExternalUriReferenceTranslator </type>
- <type> com.sun.star.uri.XExternalUriReferenceTranslator </type>
+ <type>com.sun.star.system.XMailClient</type>
+ <type>com.sun.star.system.SystemMailProvider</type>
+ <type>com.sun.star.system.XMailMessage</type>
+ <type>com.sun.star.system.MailClientFlags</type>
+ <type>com.sun.star.lang.XEventListener</type>
+ <type>com.sun.star.lang.XMultiServiceFactory</type>
+ <type>com.sun.star.lang.XSingleServiceFactory</type>
+ <type>com.sun.star.lang.XSingleComponentFactory</type>
+ <type>com.sun.star.lang.XServiceInfo</type>
+ <type>com.sun.star.lang.XTypeProvider</type>
+ <type>com.sun.star.lang.IllegalArgumentException</type>
+ <type>com.sun.star.lang.XComponent</type>
+ <type>com.sun.star.uno.RuntimeException</type>
+ <type>com.sun.star.uno.TypeClass</type>
+ <type>com.sun.star.uno.XWeak</type>
+ <type>com.sun.star.uno.XAggregation</type>
+ <type>com.sun.star.uno.XComponentContext</type>
+ <type>com.sun.star.registry.XRegistryKey</type>
+ <type>com.sun.star.container.XNameAccess</type>
+ <type>com.sun.star.container.XSet</type>
+ <type>com.sun.star.beans.PropertyValue</type>
+ <type>com.sun.star.beans.XPropertySet</type>
+ <type>com.sun.star.uri.ExternalUriReferenceTranslator</type>
+ <type>com.sun.star.uri.XExternalUriReferenceTranslator</type>
</component-description>
- <project-build-dependency> cppuhelper </project-build-dependency>
- <project-build-dependency> cppu </project-build-dependency>
- <project-build-dependency> sal </project-build-dependency>
- <runtime-module-dependency> cppuhelper$(COM) </runtime-module-dependency>
- <runtime-module-dependency> cppu3 </runtime-module-dependency>
- <runtime-module-dependency> sal3 </runtime-module-dependency>
+ <project-build-dependency>cppuhelper</project-build-dependency>
+ <project-build-dependency>cppu</project-build-dependency>
+ <project-build-dependency>sal</project-build-dependency>
+ <runtime-module-dependency>cppuhelper$(COM)</runtime-module-dependency>
+ <runtime-module-dependency>cppu3</runtime-module-dependency>
+ <runtime-module-dependency>sal3</runtime-module-dependency>
</module-description>
Modified: openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailentry.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailentry.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailentry.cxx (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailentry.cxx Thu Jan 17 11:06:13 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,101 +7,56 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
-//-----------------------------------------------------------------------
-// includes of other projects
-//-----------------------------------------------------------------------
-#include <cppuhelper/factory.hxx>
-#include <com/sun/star/container/XSet.hpp>
-#include <osl/diagnose.h>
-#include "cmdmailsuppl.hxx"
-
-//-----------------------------------------------------------------------
-// namespace directives
-//-----------------------------------------------------------------------
-
-using namespace ::rtl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::container ;
-using namespace ::com::sun::star::lang ;
-using namespace ::com::sun::star::registry ;
-using namespace ::cppu ;
-using com::sun::star::system::XSimpleMailClientSupplier;
-
-//-----------------------------------------------------------------------
-// defines
-//-----------------------------------------------------------------------
-
-#define COMP_SERVICE_NAME "com.sun.star.system.SimpleCommandMail"
-#define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail"
-
-//-----------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------
-
-namespace
-{
- Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext )
- {
- return Reference< XInterface >( static_cast< XSimpleMailClientSupplier* >( new CmdMailSuppl( xContext ) ) );
- }
-}
-
-//-----------------------------------------------------------------------
-// the 3 important functions which will be exported
-//-----------------------------------------------------------------------
-
-extern "C"
-{
+#include "syscmdmail.hxx"
-//----------------------------------------------------------------------
-// component_getImplementationEnvironment
-//----------------------------------------------------------------------
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
-void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+namespace shell
{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+ static ::cppu::ImplementationEntry const unxsysmail_impl_entries[] =
+ {
+ {
+ SystemCommandMail::Create,
+ SystemCommandMail::getImplementationName_static,
+ SystemCommandMail::getSupportedServiceNames_static,
+ ::cppu::createSingleComponentFactory,
+ 0,
+ 0
+ },
+ { 0, 0, 0, 0, 0, 0 }
+ };
}
-//----------------------------------------------------------------------
-// component_getFactory
-//----------------------------------------------------------------------
-
-void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /*pSrvManager*/, uno_Interface* /*pRegistryKey*/ )
+extern "C"
{
- Reference< XSingleComponentFactory > xFactory;
-
- if (0 == ::rtl_str_compare( pImplName, COMP_IMPL_NAME ))
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+ const sal_Char **ppEnvTypeName, uno_Environment ** )
{
- OUString serviceName( RTL_CONSTASCII_USTRINGPARAM(COMP_SERVICE_NAME) );
-
- xFactory = ::cppu::createSingleComponentFactory(
- createInstance,
- OUString( RTL_CONSTASCII_USTRINGPARAM(COMP_IMPL_NAME) ),
- Sequence< OUString >( &serviceName, 1 ) );
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-
- if (xFactory.is())
- xFactory->acquire();
- return xFactory.get();
+ SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+ const sal_Char *pImplName, void *pServiceManager, void *pRegistryKey )
+ {
+ return ::cppu::component_getFactoryHelper( pImplName,
+ pServiceManager,
+ pRegistryKey ,
+ shell::unxsysmail_impl_entries );
+ }
}
-
-} // extern "C"
Modified: openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.cxx (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.cxx Thu Jan 17 11:06:13 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,35 +7,36 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
#include "cmdmailmsg.hxx"
using com::sun::star::lang::IllegalArgumentException;
-using com::sun::star::lang::WrappedTargetException;
-using com::sun::star::container::NoSuchElementException;
-using com::sun::star::container::XNameAccess;
using rtl::OUString;
using osl::MutexGuard;
using namespace cppu;
using namespace com::sun::star::uno;
+namespace shell
+{
+
+CmdMailMsg::CmdMailMsg()
+{
+}
void SAL_CALL CmdMailMsg::setBody( const OUString& aBody )
throw (RuntimeException)
@@ -65,56 +66,56 @@ OUString SAL_CALL CmdMailMsg::getRecipie
return m_aRecipient;
}
-void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient )
+void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
m_CcRecipients = aCcRecipient;
}
-Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient( )
+Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
return m_CcRecipients;
}
-void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient )
+void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
m_BccRecipients = aBccRecipient;
}
-Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient( )
+Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
return m_BccRecipients;
}
-void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator )
+void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
m_aOriginator = aOriginator;
}
-OUString SAL_CALL CmdMailMsg::getOriginator( )
+OUString SAL_CALL CmdMailMsg::getOriginator( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
return m_aOriginator;
}
-void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject )
+void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
m_aSubject = aSubject;
}
-OUString SAL_CALL CmdMailMsg::getSubject( )
+OUString SAL_CALL CmdMailMsg::getSubject( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
@@ -128,114 +129,11 @@ void SAL_CALL CmdMailMsg::setAttachement
m_Attachments = aAttachment;
}
-Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement( )
+Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement( )
throw (RuntimeException)
{
MutexGuard aGuard( m_aMutex );
return m_Attachments;
}
-Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
- throw (NoSuchElementException, WrappedTargetException, RuntimeException)
-{
- MutexGuard aGuard( m_aMutex );
-
- if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "body" )) && m_aBody.getLength() )
- return makeAny( m_aBody );
-
- if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "from" )) && m_aOriginator.getLength() )
- return makeAny( m_aOriginator );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "to" )) && m_aRecipient.getLength() )
- return makeAny( m_aRecipient );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "cc" )) && m_CcRecipients.getLength() )
- return makeAny( m_CcRecipients );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "bcc" )) && m_BccRecipients.getLength() )
- return makeAny( m_BccRecipients );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "subject" )) && m_aSubject.getLength() )
- return makeAny( m_aSubject );
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "attachment" )) && m_Attachments.getLength() )
- return makeAny( m_Attachments );
-
- throw NoSuchElementException( OUString(RTL_CONSTASCII_USTRINGPARAM( "key not found: ")) + aName,
- static_cast < XNameAccess * > (this) );
-}
-
-Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( )
- throw (::com::sun::star::uno::RuntimeException)
-{
- MutexGuard aGuard( m_aMutex );
-
- sal_Int32 nItems = 0;
- Sequence< OUString > aRet( 7 );
-
- if( m_aBody.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "body" ));
-
- if( m_aOriginator.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "from" ));
-
- if( m_aRecipient.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "to" ));
-
- if( m_CcRecipients.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "cc" ));
-
- if( m_BccRecipients.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "bcc" ));
-
- if( m_aSubject.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "subject" ));
-
- if( m_Attachments.getLength() )
- aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM( "attachment" ));
-
- aRet.realloc( nItems );
- return aRet;
-}
-
- sal_Bool SAL_CALL CmdMailMsg::hasByName( const OUString& aName )
- throw (RuntimeException)
-{
- MutexGuard aGuard( m_aMutex );
-
- if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "body" )) && m_aBody.getLength() )
- return sal_True;
-
- if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "from" )) && m_aOriginator.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "to" )) && m_aRecipient.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "cc" )) && m_CcRecipients.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "bcc" )) && m_BccRecipients.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "subject" )) && m_aSubject.getLength() )
- return sal_True;
-
- else if( 0 == aName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "attachment" )) && m_Attachments.getLength() )
- return sal_True;
-
- return sal_False;
-}
-
-Type SAL_CALL CmdMailMsg::getElementType( )
- throw (RuntimeException)
-{
- // returning void for multi type container
- return Type();
-}
-
-sal_Bool SAL_CALL CmdMailMsg::hasElements( )
- throw (RuntimeException)
-{
- return 0 != getElementNames().getLength();
}
Modified: openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.hxx (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.hxx Thu Jan 17 11:06:13 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,125 +7,89 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef _CMDMAILMSG_HXX_
#define _CMDMAILMSG_HXX_
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
-#include <com/sun/star/system/XSimpleMailMessage2.hpp>
-#endif
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/system/XMailMessage.hpp>
-//----------------------------------------------------------
-// class declaration
-//----------------------------------------------------------
-
-class CmdMailMsg :
- public cppu::WeakImplHelper2<
- ::com::sun::star::system::XSimpleMailMessage2,
- ::com::sun::star::container::XNameAccess >
+namespace shell
{
- ::rtl::OUString m_aBody;
- ::rtl::OUString m_aRecipient;
- ::rtl::OUString m_aOriginator;
- ::rtl::OUString m_aSubject;
- ::com::sun::star::uno::Sequence< rtl::OUString > m_CcRecipients;
- ::com::sun::star::uno::Sequence< rtl::OUString > m_BccRecipients;
- ::com::sun::star::uno::Sequence< rtl::OUString > m_Attachments;
-
- ::osl::Mutex m_aMutex;
-
-public:
-
- CmdMailMsg() {};
-
- //------------------------------------------------
- // XSimpleMailMessage
- //------------------------------------------------
+ typedef cppu::WeakImplHelper1<
+ com::sun::star::system::XMailMessage > CmdMailMsg_Base;
- virtual void SAL_CALL setBody( const ::rtl::OUString& aBody )
- throw (::com::sun::star::uno::RuntimeException);
+ class CmdMailMsg : protected cppu::BaseMutex,
+ public CmdMailMsg_Base
+ {
+ private:
+ ::rtl::OUString m_aBody;
+ ::rtl::OUString m_aRecipient;
+ ::rtl::OUString m_aOriginator;
+ ::rtl::OUString m_aSubject;
+ ::com::sun::star::uno::Sequence< rtl::OUString > m_CcRecipients;
+ ::com::sun::star::uno::Sequence< rtl::OUString > m_BccRecipients;
+ ::com::sun::star::uno::Sequence< rtl::OUString > m_Attachments;
- virtual ::rtl::OUString SAL_CALL getBody( )
- throw (::com::sun::star::uno::RuntimeException);
+ public:
+ CmdMailMsg();
- virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setBody( const ::rtl::OUString& aBody )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getRecipient( )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getBody( )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCcRecipient( )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getRecipient( )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getBccRecipient( )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCcRecipient( )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getOriginator( )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getBccRecipient( )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSubject( )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getOriginator( )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAttachement( )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getSubject( )
+ throw (::com::sun::star::uno::RuntimeException);
- //------------------------------------------------
- // XNameAccess
- //------------------------------------------------
+ virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement )
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
- throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAttachement( )
+ throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( )
- throw (::com::sun::star::uno::RuntimeException) ;
+ };
+}
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
- throw (::com::sun::star::uno::RuntimeException);
-
- //------------------------------------------------
- // XElementAccess
- //------------------------------------------------
-
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( )
- throw (::com::sun::star::uno::RuntimeException);
-
- virtual sal_Bool SAL_CALL hasElements( )
- throw (::com::sun::star::uno::RuntimeException);
-
-};
-
-#endif
+#endif
Modified: openoffice/branches/alg/clibboard/main/shell/source/cmdmail/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/cmdmail/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/cmdmail/makefile.mk (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/cmdmail/makefile.mk Thu Jan 17 11:06:13 2013
@@ -37,7 +37,7 @@ COMP1TYPELIST=$(TARGET)
DLLPRE=
SLOFILES= \
- $(SLO)$/cmdmailsuppl.obj \
+ $(SLO)$/syscmdmail.obj \
$(SLO)$/cmdmailmsg.obj \
$(SLO)$/cmdmailentry.obj
SHL1OBJS=$(SLOFILES)
Modified: openoffice/branches/alg/clibboard/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/unix/sysshell/recently_used_file_handler.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/unix/sysshell/recently_used_file_handler.cxx (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/unix/sysshell/recently_used_file_handler.cxx Thu Jan 17 11:06:13 2013
@@ -405,7 +405,7 @@ namespace /* private */ {
};
//------------------------------------------------
- const char* GROUP_OOO = "openoffice.org";
+ const char* GROUP_OOO = "apacheopenoffice";
const char* GROUP_STAR_OFFICE = "staroffice";
const char* GROUP_STAR_SUITE = "starsuite";
Modified: openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx Thu Jan 17 11:06:13 2013
@@ -1197,7 +1197,7 @@ namespace /* private */
std::string ClsidEntry = CLSID_GUID_ENTRY;
SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER, ClsidToString(FilterGuid));
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org Filter"))
+ if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org XML Filter"))
return E_FAIL;
ClsidEntry = CLSID_GUID_INPROC_ENTRY;
@@ -1225,7 +1225,7 @@ namespace /* private */
SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid));
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice.org Persistent Handler"))
+ if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache OpenOffice Persistent Handler"))
return E_FAIL;
// Add missing entry
Modified: openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx Thu Jan 17 11:06:13 2013
@@ -56,11 +56,11 @@ struct PROPERTYMAP
PROPERTYMAP g_rgPROPERTYMAP[] =
{
- { PKEY_Title, L"OpenOffice.org", L"Title" },
- { PKEY_Author, L"OpenOffice.org", L"Author" },
- { PKEY_Subject, L"OpenOffice.org", L"Subject" },
- { PKEY_Keywords, L"OpenOffice.org", L"Keyword" },
- { PKEY_Comment, L"OpenOffice.org", L"Comments" },
+ { PKEY_Title, L"Apache OpenOffice", L"Title" },
+ { PKEY_Author, L"Apache OpenOffice", L"Author" },
+ { PKEY_Subject, L"Apache OpenOffice", L"Subject" },
+ { PKEY_Keywords, L"Apache OpenOffice", L"Keyword" },
+ { PKEY_Comment, L"Apache OpenOffice", L"Comments" },
};
size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);
Modified: openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest Thu Jan 17 11:06:13 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="OpenOffice.shlxthdl" type="win32" />
-<description>OpenOffice Shell Extension</description>
+<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="Apache_OpenOffice.shlxthdl" type="win32" />
+<description>Apache OpenOffice Shell Extension</description>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86"
Modified: openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSmplMail.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSmplMail.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSmplMail.cxx (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSmplMail.cxx Thu Jan 17 11:06:13 2013
@@ -30,7 +30,7 @@
//-----------------------------------------------------------
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
+#include <com/sun/star/system/XSystemMailProvider.hpp>
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <rtl/ustring.hxx>
@@ -103,7 +103,7 @@ int SAL_CALL main(int , char*, char* )
try
{
- Reference< XSimpleMailClientSupplier > xSmplMailClientSuppl(
+ Reference< XSystemMailProvider > xSmplMailClientSuppl(
g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SimpleSystemMail" ) ), UNO_QUERY );
if ( !xSmplMailClientSuppl.is() )
@@ -112,13 +112,13 @@ int SAL_CALL main(int , char*, char* )
return(-1);
}
- Reference< XSimpleMailClient > xSmplMailClient(
- xSmplMailClientSuppl->querySimpleMailClient( ) );
+ Reference< XMailClient > xSmplMailClient(
+ xSmplMailClientSuppl->queryMailClient( ) );
if ( xSmplMailClient.is( ) )
{
- Reference< XSimpleMailMessage > xSmplMailMsg(
- xSmplMailClient->createSimpleMailMessage( ) );
+ Reference< XMailMessage > xSmplMailMsg(
+ xSmplMailClient->createMailMessage( ) );
if ( xSmplMailMsg.is( ) )
{
@@ -152,7 +152,7 @@ int SAL_CALL main(int , char*, char* )
xSmplMailMsg->setAttachement( attachements );
- xSmplMailClient->sendSimpleMailMessage( xSmplMailMsg, 0 );
+ xSmplMailClient->sendMailMessage( xSmplMailMsg, 0 );
}
}
}
Modified: openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSysShExec.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSysShExec.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSysShExec.cxx (original)
+++ openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSysShExec.cxx Thu Jan 17 11:06:13 2013
@@ -30,10 +30,7 @@
//-----------------------------------------------------------
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
-
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSystemShellExecute.hpp>
-#endif
#include <cppuhelper/servicefactory.hxx>
Modified: openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/download.pm?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/download.pm Thu Jan 17 11:06:13 2013
@@ -461,21 +461,44 @@ sub get_downloadname_language
sub get_downloadname_productname
{
- my ($allvariables) = @_;
-
- my $start = "Apache_OpenOffice";
-
- if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start .= ""; }
-
- if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start .= "-Dev"; }
-
- if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-SDK"; }
+ my ($allvariables) = @_;
- if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-Dev-SDK"; }
+ my $start;
- if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start .= "-URE"; }
+ if ( $allvariables->{'AOODOWNLOADNAMEPREFIX'} )
+ {
+ $start = $allvariables->{'AOODOWNLOADNAMEPREFIX'};
+ }
+ else
+ {
+ $start = "Apache_OpenOffice";
+ if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ {
+ if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+ {
+ $start .= "-SDK";
+ }
+ }
+
+ if ( $allvariables->{'PRODUCTNAME'} eq "AOO-Developer-Build" )
+ {
+ if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+ {
+ $start .= "-Dev-SDK";
+ }
+ else
+ {
+ $start .= "-Dev";
+ }
+ }
+
+ if ( $allvariables->{'PRODUCTNAME'} eq "URE" )
+ {
+ $start .= "-URE";
+ }
+ }
- return $start;
+ return $start;
}
#########################################################
@@ -1968,8 +1991,14 @@ sub create_download_sets
# evaluating the name of the download file
- if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $downloadname = set_download_filename($languagestringref, $allvariableshashref); }
- else { $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); }
+ if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
+ {
+ $downloadname = set_download_filename($languagestringref, $allvariableshashref);
+ }
+ else
+ {
+ $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref);
+ }
if ( ! $installer::globals::iswindowsbuild ) # Unix specific part
{
@@ -1978,7 +2007,7 @@ sub create_download_sets
my $getuidlibrary = "";
if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library($includepatharrayref); }
- if ( $allvariableshashref->{'OOODOWNLOADNAME'} )
+ if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
{
my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname);
}
Modified: openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/epmfile.pm?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/epmfile.pm Thu Jan 17 11:06:13 2013
@@ -326,11 +326,11 @@ sub create_epm_header
my $line = "";
my $infoline = "";
- # %product OpenOffice.org Software
+ # %product Apache OpenOffice Software
# %version 2.0
# %description A really great software
# %copyright 1999-2003 by OOo
- # %vendor OpenOffice.org
+ # %vendor Apache OpenOffice project
# %license /test/replace/01/LICENSE01
# %readme /test/replace/01/README01
# %requires foo
@@ -492,7 +492,7 @@ sub create_epm_header
{
# refer to the license in the matching AOO installation
# TODO: sync AOO dest license full path with lpacks/sdks/exts
- my $licpath = "openoffice.org3/program/" . $licensefilename;
+ my $licpath = "apacheopenoffice3/program/" . $licensefilename;
$foundlicensefile = 1;
$line = "%license " . $licpath . "\n";
push(@epmheader, $line);
@@ -550,7 +550,7 @@ sub create_epm_header
}
}
- if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice.org' )
+ if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'apache openoffice' )
{
$line = "%provides" . " openoffice.org-unbundled\n";
push(@epmheader, $line);
Modified: openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/simplepackage.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/simplepackage.pm?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/simplepackage.pm (original)
+++ openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/simplepackage.pm Thu Jan 17 11:06:13 2013
@@ -333,7 +333,10 @@ sub replace_variables_in_scriptfile
replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
- if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; }
+ if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ {
+ $scriptname = "org.openoffice.script";
+ }
replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );
}
@@ -616,7 +619,7 @@ sub create_simple_package
my $locallanguage = $installer::globals::csp_languagestring;
- if ( $allvariables->{'OOODOWNLOADNAME'} )
+ if ( $allvariables->{'AOODOWNLOADNAME'} )
{
$packagename = installer::download::set_download_filename(\$locallanguage, $allvariables);
}
Modified: openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/windows/msp.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/windows/msp.pm?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/windows/msp.pm (original)
+++ openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/windows/msp.pm Thu Jan 17 11:06:13 2013
@@ -884,7 +884,7 @@ sub change_patchmetadata_table
if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
my $manufacturerstring = "ManufacturerName";
- my $manufacturervalue = "OpenOffice.org";
+ my $manufacturervalue = "Apache OpenOffice";
if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
my $displaynamestring = "DisplayName";
Modified: openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/ziplist.pm?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/ziplist.pm Thu Jan 17 11:06:13 2013
@@ -639,7 +639,7 @@ sub set_manufacturer
{
my ($allvariables) = @_;
- my $openofficeproductname = "OpenOffice.org";
+ my $openofficeproductname = "Apache OpenOffice";
my $sunname = "";
Modified: openoffice/branches/alg/clibboard/main/stlport/STLport-4.5.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/stlport/STLport-4.5.patch?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/stlport/STLport-4.5.patch (original)
+++ openoffice/branches/alg/clibboard/main/stlport/STLport-4.5.patch Thu Jan 17 11:06:13 2013
@@ -684,143 +684,16 @@
__Named_exception(const string& __str)
--- misc/STLport-4.5/stlport/stl/_bvector.h 2001-05-30 05:45:41.000000000 +0200
+++ misc/build/STLport-4.5/stlport/stl/_bvector.h 2008-07-18 14:13:49.000000000 +0200
-@@ -34,7 +34,7 @@
+@@ -34,7 +34,9 @@
# include <stl/_vector.h>
# endif
--#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
-+#define ___WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
++#ifndef __WORD_BIT
+ #define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
++#endif
_STLP_BEGIN_NAMESPACE
-@@ -80,7 +80,7 @@
- unsigned int _M_offset;
-
- void _M_bump_up() {
-- if (_M_offset++ == __WORD_BIT - 1) {
-+ if (_M_offset++ == ___WORD_BIT - 1) {
- _M_offset = 0;
- ++_M_p;
- }
-@@ -88,7 +88,7 @@
-
- void _M_bump_down() {
- if (_M_offset-- == 0) {
-- _M_offset = __WORD_BIT - 1;
-+ _M_offset = ___WORD_BIT - 1;
- --_M_p;
- }
- }
-@@ -100,17 +100,17 @@
-
- void _M_advance (difference_type __i) {
- difference_type __n = __i + _M_offset;
-- _M_p += __n / __WORD_BIT;
-- __n = __n % __WORD_BIT;
-+ _M_p += __n / ___WORD_BIT;
-+ __n = __n % ___WORD_BIT;
- if (__n < 0) {
-- _M_offset = (unsigned int) __n + __WORD_BIT;
-+ _M_offset = (unsigned int) __n + ___WORD_BIT;
- --_M_p;
- } else
- _M_offset = (unsigned int) __n;
- }
-
- difference_type _M_subtract(const _Bit_iterator_base& __x) const {
-- return __WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
-+ return ___WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
- }
- };
-
-@@ -242,7 +242,7 @@
- protected:
-
- unsigned int* _M_bit_alloc(size_t __n)
-- { return _M_end_of_storage.allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
-+ { return _M_end_of_storage.allocate((__n + ___WORD_BIT - 1)/___WORD_BIT); }
- void _M_deallocate() {
- if (_M_start._M_p)
- _M_end_of_storage.deallocate(_M_start._M_p,
-@@ -341,7 +341,7 @@
-
- void _M_initialize(size_type __n) {
- unsigned int* __q = this->_M_bit_alloc(__n);
-- this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- this->_M_finish = this->_M_start + difference_type(__n);
- }
-@@ -352,13 +352,13 @@
- ++this->_M_finish;
- }
- else {
-- size_type __len = size() ? 2 * size() : __WORD_BIT;
-+ size_type __len = size() ? 2 * size() : ___WORD_BIT;
- unsigned int* __q = this->_M_bit_alloc(__len);
- iterator __i = copy(begin(), __position, iterator(__q, 0));
- *__i++ = __x;
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -411,7 +411,7 @@
- __i = copy(__first, __last, __i);
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -609,7 +609,7 @@
- this->_M_finish = copy(begin(), end(), __z);
- this->_M_deallocate();
- this->_M_start = iterator(__q, 0);
-- this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
- }
- }
-
-@@ -681,7 +681,7 @@
- __i = copy(__first, __last, __i);
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -702,7 +702,7 @@
- __i = copy(__first, __last, __i);
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -722,7 +722,7 @@
- fill_n(__i, __n, __x);
- this->_M_finish = copy(__position, end(), __i + difference_type(__n));
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -799,7 +799,7 @@
- #undef __BVECTOR_QUALIFIED
- #undef __BVEC_TMPL_HEADER
-
--# undef __WORD_BIT
-+# undef ___WORD_BIT
-
- #endif /* _STLP_INTERNAL_BVECTOR_H */
-
--- misc/STLport-4.5/stlport/stl/_complex.h 2001-07-06 06:16:17.000000000 +0200
+++ misc/build/STLport-4.5/stlport/stl/_complex.h 2008-07-18 14:13:49.000000000 +0200
@@ -18,6 +18,10 @@
Modified: openoffice/branches/alg/clibboard/main/svtools/source/contnr/templwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/svtools/source/contnr/templwin.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/svtools/source/contnr/templwin.cxx (original)
+++ openoffice/branches/alg/clibboard/main/svtools/source/contnr/templwin.cxx Thu Jan 17 11:06:13 2013
@@ -65,7 +65,7 @@
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <unotools/localedatawrapper.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -1985,12 +1985,9 @@ IMPL_LINK ( SvtDocumentTemplateDialog, O
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< com::sun::star::system::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( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
EndDialog( RET_CANCEL );
Modified: openoffice/branches/alg/clibboard/main/svx/inc/svx/svdxcgv.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/svx/inc/svx/svdxcgv.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/svx/inc/svx/svdxcgv.hxx (original)
+++ openoffice/branches/alg/clibboard/main/svx/inc/svx/svdxcgv.hxx Thu Jan 17 11:06:13 2013
@@ -65,6 +65,7 @@ protected:
public:
// Alle markierten Objekte auf dem angegebenen OutputDevice ausgeben.
+ ::std::vector< SdrObject* > GetMarkedObjects() const;
virtual void DrawMarkedObj(OutputDevice& rOut) const;
// Z.B. fuer's Clipboard, Drag&Drop, ...
Modified: openoffice/branches/alg/clibboard/main/svx/source/dialog/sendreportw32.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/svx/source/dialog/sendreportw32.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/svx/source/dialog/sendreportw32.cxx (original)
+++ openoffice/branches/alg/clibboard/main/svx/source/dialog/sendreportw32.cxx Thu Jan 17 11:06:13 2013
@@ -93,7 +93,7 @@ namespace svx{
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPProxyServer"),
szBuffer,
sizeof(szBuffer) ) )
@@ -102,7 +102,7 @@ namespace svx{
DWORD dwProxyPort;
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPProxyPort"),
&dwProxyPort,
sizeof(dwProxyPort) ) )
@@ -113,7 +113,7 @@ namespace svx{
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("ReturnAddress"),
szBuffer,
sizeof(szBuffer) ) )
@@ -122,7 +122,7 @@ namespace svx{
DWORD fAllowContact = sal_False;
RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("AllowContact"),
&fAllowContact,
sizeof(fAllowContact) );
@@ -131,7 +131,7 @@ namespace svx{
DWORD uInternetConnection = 0;
RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPProxyServer"), REG_SZ,
lpHTTPProxyServer,
sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) );
@@ -155,7 +155,7 @@ namespace svx{
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPProxyPort"), REG_DWORD,
&dwProxyPort,
sizeof(DWORD) );
@@ -163,7 +163,7 @@ namespace svx{
DWORD fAllowContact = IsContactAllowed();
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("AllowContact"), REG_DWORD,
&fAllowContact,
sizeof(DWORD) );
@@ -173,7 +173,7 @@ namespace svx{
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("ReturnAddress"), REG_SZ,
lpEmail,
sizeof(TCHAR) * (_tcslen(lpEmail) + 1) );
Modified: openoffice/branches/alg/clibboard/main/svx/source/sdr/contact/viewcontactofsdrpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/svx/source/sdr/contact/viewcontactofsdrpage.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/svx/source/sdr/contact/viewcontactofsdrpage.cxx (original)
+++ openoffice/branches/alg/clibboard/main/svx/source/sdr/contact/viewcontactofsdrpage.cxx Thu Jan 17 11:06:13 2013
@@ -165,18 +165,23 @@ namespace sdr
}
else
{
- static vcl::DeleteOnDeinit<drawinglayer::primitive2d::DiscreteShadow>
- aDiscreteShadow(new drawinglayer::primitive2d::DiscreteShadow(
- BitmapEx(ResId(SIP_SA_PAGESHADOW35X35, *ImpGetResMgr()))));
- if (aDiscreteShadow.get() != NULL)
+ static vcl::DeleteOnDeinit< drawinglayer::primitive2d::DiscreteShadow > aDiscreteShadow(
+ new drawinglayer::primitive2d::DiscreteShadow(
+ BitmapEx(
+ ResId(
+ SIP_SA_PAGESHADOW35X35,
+ *ImpGetResMgr()))));
+
+ if(aDiscreteShadow.get())
{
const drawinglayer::primitive2d::Primitive2DReference xReference(
new drawinglayer::primitive2d::DiscreteShadowPrimitive2D(
aPageMatrix,
- *aDiscreteShadow.get()));
-
+ *aDiscreteShadow.get()));
+
return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
}
+
return drawinglayer::primitive2d::Primitive2DSequence();
}
}
Modified: openoffice/branches/alg/clibboard/main/svx/source/sdr/overlay/overlaytools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/svx/source/sdr/overlay/overlaytools.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/svx/source/sdr/overlay/overlaytools.cxx (original)
+++ openoffice/branches/alg/clibboard/main/svx/source/sdr/overlay/overlaytools.cxx Thu Jan 17 11:06:13 2013
@@ -67,8 +67,8 @@ namespace drawinglayer
// and unrotated, more like a marker
const double fLeft(((0.0 - getCenterX()) * getDiscreteUnit()) + getBasePosition().getX());
const double fTop(((0.0 - getCenterY()) * getDiscreteUnit()) + getBasePosition().getY());
- const double fRight((((aBitmapSize.getWidth() - 1.0) - getCenterX()) * getDiscreteUnit()) + getBasePosition().getX());
- const double fBottom((((aBitmapSize.getHeight() - 1.0) - getCenterY()) * getDiscreteUnit()) + getBasePosition().getY());
+ const double fRight(((aBitmapSize.getWidth() - getCenterX()) * getDiscreteUnit()) + getBasePosition().getX());
+ const double fBottom(((aBitmapSize.getHeight() - getCenterY()) * getDiscreteUnit()) + getBasePosition().getY());
// create a BitmapPrimitive2D using those positions
basegfx::B2DHomMatrix aTransform;
Modified: openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoashp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoashp.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoashp.cxx (original)
+++ openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoashp.cxx Thu Jan 17 11:06:13 2013
@@ -645,6 +645,7 @@ SdrObjCustomShape::SdrObjCustomShape() :
fObjectRotation( 0.0 ),
mpLastShadowGeometry(0L)
{
+ bClosedObj = true; // custom shapes may be filled
bTextFrame = sal_True;
}
Modified: openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoole2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoole2.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoole2.cxx (original)
+++ openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoole2.cxx Thu Jan 17 11:06:13 2013
@@ -782,8 +782,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::Embed
SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
- if( ImplIsMathObj( xObjRef.GetObject() ) )
- SetClosedObj( false );
+ SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
}
// -----------------------------------------------------------------------------
@@ -805,8 +804,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::Embed
SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
- if( ImplIsMathObj( xObjRef.GetObject() ) )
- SetClosedObj( false );
+ SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
}
// -----------------------------------------------------------------------------
@@ -829,8 +827,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::Embed
SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
- if( ImplIsMathObj( xObjRef.GetObject() ) )
- SetClosedObj( false );
+ SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
}
// -----------------------------------------------------------------------------
@@ -1584,8 +1581,7 @@ void SdrOle2Obj::SetObjRef( const com::s
SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
- if( ImplIsMathObj( rNewObjRef ) )
- SetClosedObj( false );
+ SetClosedObj(!ImplIsMathObj( rNewObjRef ));
Connect();
}
@@ -2117,8 +2113,7 @@ void SdrOle2Obj::GetObjRef_Impl()
}
// #108759# For math objects, set closed state to transparent
- if( ImplIsMathObj( xObjRef.GetObject() ) )
- SetClosedObj( false );
+ SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
}
if ( xObjRef.is() )
Modified: openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdxcgv.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdxcgv.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdxcgv.cxx (original)
+++ openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdxcgv.cxx Thu Jan 17 11:06:13 2013
@@ -54,6 +54,12 @@
#include <svl/style.hxx>
#include <fmobj.hxx>
#include <vcl/svgdata.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
+#include <svx/sdr/contact/viewcontact.hxx>
+#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
+#include <svx/sdr/contact/displayinfo.hxx>
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -553,14 +559,42 @@ BitmapEx SdrExchangeView::GetMarkedObjBi
if( !aBmp )
{
- const GDIMetaFile aGDIMetaFile(GetMarkedObjMetaFile(bNoVDevIfOneBmpMarked));
- const Rectangle aBound(GetMarkedObjBoundRect());
-
- aBmp = convertMetafileToBitmapEx(
- aGDIMetaFile,
- basegfx::B2DRange(
- aBound.Left(), aBound.Top(),
- aBound.Right(), aBound.Bottom()));
+ // choose conversion directly using primitives to bitmap to avoid
+ // rendering errors with tiled bitmap fills (these will be tiled in a
+ // in-between metafile, but tend to show 'gaps' since the target is *no*
+ // bitmap rendering)
+ ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects());
+ const sal_uInt32 nCount(aSdrObjects.size());
+
+ if(nCount)
+ {
+ // collect sub-primitives as group objects, thus no expensive append
+ // to existing sequence is needed
+ drawinglayer::primitive2d::Primitive2DSequence xPrimitives(nCount);
+
+ for(sal_uInt32 a(0); a < nCount; a++)
+ {
+ xPrimitives[a] = new drawinglayer::primitive2d::GroupPrimitive2D(
+ aSdrObjects[a]->GetViewContact().getViewIndependentPrimitive2DSequence());
+ }
+
+ // get logic range
+ const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
+ const basegfx::B2DRange aRange(
+ drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(
+ xPrimitives,
+ aViewInformation2D));
+
+ if(!aRange.isEmpty())
+ {
+ // if we have geometry and it has a range, convert to BitmapEx using
+ // common tooling
+ aBmp = convertPrimitive2DSequenceToBitmapEx(
+ xPrimitives,
+ aRange,
+ 500000);
+ }
+ }
}
}
@@ -716,9 +750,10 @@ Graphic SdrExchangeView::GetObjGraphic(
// -----------------------------------------------------------------------------
-void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const
+::std::vector< SdrObject* > SdrExchangeView::GetMarkedObjects() const
{
SortMarkedObjects();
+ ::std::vector< SdrObject* > aRetval;
::std::vector< ::std::vector< SdrMark* > > aObjVectors( 2 );
::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ];
@@ -745,9 +780,27 @@ void SdrExchangeView::DrawMarkedObj(Outp
for( sal_uInt32 i = 0; i < rObjVector.size(); i++ )
{
SdrMark* pMark = rObjVector[ i ];
- pMark->GetMarkedSdrObj()->SingleObjectPainter( rOut ); // #110094#-17
+ aRetval.push_back(pMark->GetMarkedSdrObj());
}
}
+
+ return aRetval;
+}
+
+// -----------------------------------------------------------------------------
+
+void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const
+{
+ ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects());
+
+ if(aSdrObjects.size())
+ {
+ sdr::contact::ObjectContactOfObjListPainter aPainter(rOut, aSdrObjects, aSdrObjects[0]->GetPage());
+ sdr::contact::DisplayInfo aDisplayInfo;
+
+ // do processing
+ aPainter.ProcessDisplay(aDisplayInfo);
+ }
}
// -----------------------------------------------------------------------------
@@ -763,66 +816,45 @@ SdrModel* SdrExchangeView::GetMarkedObjM
if( !mxSelectionController.is() || !mxSelectionController->GetMarkedObjModel( pNeuPag ) )
{
- ::std::vector< ::std::vector< SdrMark* > > aObjVectors( 2 );
- ::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ];
- ::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ];
- const SdrLayerAdmin& rLayerAdmin = pMod->GetLayerAdmin();
- const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
- sal_uInt32 n, nCount, nCloneErrCnt = 0;
-
- for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
- {
- SdrMark* pMark = GetSdrMarkByIndex( n );
-
- // paint objects on control layer on top of all otherobjects
- if( nControlLayerId == pMark->GetMarkedSdrObj()->GetLayer() )
- rObjVector2.push_back( pMark );
- else
- rObjVector1.push_back( pMark );
- }
+ ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects());
// #i13033#
// New mechanism to re-create the connections of cloned connectors
CloneList aCloneList;
+ sal_uInt32 nCloneErrCnt(0);
- for( n = 0, nCount = aObjVectors.size(); n < nCount; n++ )
+ for( sal_uInt32 i(0); i < aSdrObjects.size(); i++ )
{
- ::std::vector< SdrMark* >& rObjVector = aObjVectors[ n ];
+ const SdrObject* pObj = aSdrObjects[i];
+ SdrObject* pNeuObj;
- for( sal_uInt32 i = 0; i < rObjVector.size(); i++ )
+ if( pObj->ISA( SdrPageObj ) )
{
- const SdrMark* pMark = rObjVector[ i ];
- const SdrObject* pObj = pMark->GetMarkedSdrObj();
- SdrObject* pNeuObj;
-
- if( pObj->ISA( SdrPageObj ) )
- {
- // convert SdrPageObj's to a graphic representation, because
- // virtual connection to referenced page gets lost in new model
- pNeuObj = new SdrGrafObj( GetObjGraphic( pMod, pObj ), pObj->GetLogicRect() );
- pNeuObj->SetPage( pNeuPag );
- pNeuObj->SetModel( pNeuMod );
- }
- else
- {
- // #116235#
- // pNeuObj = pObj->Clone( pNeuPag, pNeuMod );
- pNeuObj = pObj->Clone();
- pNeuObj->SetPage( pNeuPag );
- pNeuObj->SetModel( pNeuMod );
- }
+ // convert SdrPageObj's to a graphic representation, because
+ // virtual connection to referenced page gets lost in new model
+ pNeuObj = new SdrGrafObj( GetObjGraphic( pMod, pObj ), pObj->GetLogicRect() );
+ pNeuObj->SetPage( pNeuPag );
+ pNeuObj->SetModel( pNeuMod );
+ }
+ else
+ {
+ // #116235#
+ // pNeuObj = pObj->Clone( pNeuPag, pNeuMod );
+ pNeuObj = pObj->Clone();
+ pNeuObj->SetPage( pNeuPag );
+ pNeuObj->SetModel( pNeuMod );
+ }
- if( pNeuObj )
- {
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
- pNeuPag->InsertObject(pNeuObj,CONTAINER_APPEND,&aReason);
+ if( pNeuObj )
+ {
+ SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ pNeuPag->InsertObject(pNeuObj,CONTAINER_APPEND,&aReason);
- // #i13033#
- aCloneList.AddPair(pObj, pNeuObj);
- }
- else
- nCloneErrCnt++;
+ // #i13033#
+ aCloneList.AddPair(pObj, pNeuObj);
}
+ else
+ nCloneErrCnt++;
}
// #i13033#
Modified: openoffice/branches/alg/clibboard/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java (original)
+++ openoffice/branches/alg/clibboard/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java Thu Jan 17 11:06:13 2013
@@ -702,8 +702,7 @@ public class Helper
{
try
{
- Object oSystemShell = xContext.getServiceManager().createInstanceWithContext( "com.sun.star.system.SystemShellExecute", xContext );
- XSystemShellExecute xSystemShell = (XSystemShellExecute)UnoRuntime.queryInterface( XSystemShellExecute.class, oSystemShell );
+ XSystemShellExecute xSystemShell = com.sun.star.system.SystemShellExecute.create( xContext );
if ( xSystemShell != null )
xSystemShell.execute( sURL, "", SystemShellExecuteFlags.DEFAULTS );
}
Modified: openoffice/branches/alg/clibboard/main/sysui/desktop/debian/control
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/debian/control?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/debian/control (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/debian/control Thu Jan 17 11:06:13 2013
@@ -1,6 +1,6 @@
Description: %productname desktop integration
Maintainer: Apache Software Foundation
Architecture: all
-Provides: openoffice.org-desktop-integration, openoffice.org-unbundled
-Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus
+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
Modified: openoffice/branches/alg/clibboard/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/freedesktop/freedesktop-menus.spec (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/freedesktop/freedesktop-menus.spec Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@ Name: %pkgprefix-freedesktop-menus
#BuildRequires: perl
Group: Office
License: ALv2
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
Conflicts: %pkgprefix-suse-menus
Conflicts: %pkgprefix-debian-menus
Conflicts: %pkgprefix-redhat-menus