You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/07/19 17:59:11 UTC
svn commit: r1504925 [2/12] - in /openoffice/branches/rejuvenate01:
ext_libraries/apr-util/ ext_libraries/coinmp/ ext_libraries/serf/
ext_libraries/serf/win/ ext_sources/ main/
main/accessibility/bridge/org/openoffice/java/accessibility/
main/basctl/so...
Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/QueryTableView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/QueryTableView.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/QueryTableView.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/QueryTableView.cxx Fri Jul 19 15:59:04 2013
@@ -835,42 +835,65 @@ sal_Bool OQueryTableView::FindTableFromF
}
//------------------------------------------------------------------------------
-void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin)
+bool OQueryTableView::ContainsTabWin(const OTableWindow& rTabWin)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
- DBG_ASSERT(pTabWin != NULL, "OQueryTableView::RemoveTabWin : Fenster sollte ungleich NULL sein !");
-
- // mein Parent brauche ich, da es vom Loeschen erfahren soll
- OQueryDesignView* pParent = static_cast<OQueryDesignView*>(getDesignView());
+ OTableWindowMap* pTabWins = GetTabWinMap();
+ DBG_ASSERT(pTabWins != NULL, "OQueryTableView::HideTabWin : habe keine TabWins !");
- SfxUndoManager& rUndoMgr = m_pView->getController().GetUndoManager();
- rUndoMgr.EnterListAction( String( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), String() );
+ OTableWindowMap::iterator aIter = pTabWins->begin();
+ OTableWindowMap::iterator aEnd = pTabWins->end();
- // Undo-Action anlegen
- OQueryTabWinDelUndoAct* pUndoAction = new OQueryTabWinDelUndoAct(this);
- pUndoAction->SetTabWin(static_cast< OQueryTableWindow*>(pTabWin));
+ for ( ;aIter != aEnd ; ++aIter )
+ {
+ if ( aIter->second == &rTabWin )
+ {
+ return true;
+ }
+ }
- // und Fenster verstecken
- HideTabWin(static_cast< OQueryTableWindow*>(pTabWin), pUndoAction);
-
- // Undo Actions und Loeschen der Felder in SelectionBrowseBox
- pParent->TableDeleted( static_cast< OQueryTableWindowData*>(pTabWin->GetData().get())->GetAliasName() );
-
- m_pView->getController().addUndoActionAndInvalidate( pUndoAction );
- rUndoMgr.LeaveListAction();
+ return false;
+}
- if (m_lnkTabWinsChangeHandler.IsSet())
- {
- TabWinsChangeNotification aHint(TabWinsChangeNotification::AT_REMOVED_WIN, static_cast< OQueryTableWindow*>(pTabWin)->GetAliasName());
- m_lnkTabWinsChangeHandler.Call(&aHint);
- }
+//------------------------------------------------------------------------------
+void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin)
+{
+ DBG_CHKTHIS(OQueryTableView,NULL);
+ DBG_ASSERT(pTabWin != NULL, "OQueryTableView::RemoveTabWin : Fenster sollte ungleich NULL sein !");
- modified();
- if ( m_pAccessible )
- m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD,
- makeAny(pTabWin->GetAccessible()),
- Any()
- );
+ if(pTabWin && ContainsTabWin(*pTabWin)) // #122589# check if registered before deleting
+ {
+ // mein Parent brauche ich, da es vom Loeschen erfahren soll
+ OQueryDesignView* pParent = static_cast<OQueryDesignView*>(getDesignView());
+
+ SfxUndoManager& rUndoMgr = m_pView->getController().GetUndoManager();
+ rUndoMgr.EnterListAction( String( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), String() );
+
+ // Undo-Action anlegen
+ OQueryTabWinDelUndoAct* pUndoAction = new OQueryTabWinDelUndoAct(this);
+ pUndoAction->SetTabWin(static_cast< OQueryTableWindow*>(pTabWin));
+
+ // und Fenster verstecken
+ HideTabWin(static_cast< OQueryTableWindow*>(pTabWin), pUndoAction);
+
+ // Undo Actions und Loeschen der Felder in SelectionBrowseBox
+ pParent->TableDeleted( static_cast< OQueryTableWindowData*>(pTabWin->GetData().get())->GetAliasName() );
+
+ m_pView->getController().addUndoActionAndInvalidate( pUndoAction );
+ rUndoMgr.LeaveListAction();
+
+ if (m_lnkTabWinsChangeHandler.IsSet())
+ {
+ TabWinsChangeNotification aHint(TabWinsChangeNotification::AT_REMOVED_WIN, static_cast< OQueryTableWindow*>(pTabWin)->GetAliasName());
+ m_lnkTabWinsChangeHandler.Call(&aHint);
+ }
+
+ modified();
+ if ( m_pAccessible )
+ m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD,
+ makeAny(pTabWin->GetAccessible()),
+ Any()
+ );
+ }
}
//------------------------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/default_images/framework/res/backing.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/framework/res/backing.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_hc.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_hc.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_right.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_right.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_right_hc.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_right_hc.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_left.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_left.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_left_hc.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_left_hc.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_right.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_right.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_right_hc.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_right_hc.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/framework/res/info_26.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/framework/res/info_26.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/introabout/about.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/introabout/about.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/introabout/intro.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/introabout/logo.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/introabout/logo.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/res/mainapp_16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/res/mainapp_16.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/res/mainapp_16_8.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/res/mainapp_16_8.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/res/mainapp_32.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/res/mainapp_32.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/res/mainapp_32_8.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/res/mainapp_32_8.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/default_images/res/mainapp_48_8.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/default_images/res/mainapp_48_8.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/desktop/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/prj/build.lst?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/prj/build.lst (original)
+++ openoffice/branches/rejuvenate01/main/desktop/prj/build.lst Fri Jul 19 15:59:04 2013
@@ -3,9 +3,9 @@ dt desktop usr1 - all dt_mkout N
dt desktop\inc nmake - all dt_inc NULL
dt desktop\prj get - all dt_prj NULL
dt desktop\res get - all dt_res NULL
-dt desktop\source\app nmake - all dt_app dt_migr dt_inc dt_dp_misc NULL
+dt desktop\source\app nmake - all dt_app dt_migr dt_inc dt_dp_misc dt_dp_gui NULL
dt desktop\source\migration nmake - all dt_migr dt_inc NULL
-dt desktop\source\migration\services nmake - all dt_services dt_inc dt_dp_misc NULL
+dt desktop\source\migration\services nmake - all dt_services dt_inc dt_dp_misc dt_dp_gui NULL
dt desktop\source\so_comp nmake - all dt_so_comp dt_inc NULL
dt desktop\source\offacc nmake - all dt_offac dt_inc NULL
dt desktop\source\splash nmake - all dt_spl dt_migr dt_inc NULL
Modified: openoffice/branches/rejuvenate01/main/desktop/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/prj/d.lst?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/prj/d.lst (original)
+++ openoffice/branches/rejuvenate01/main/desktop/prj/d.lst Fri Jul 19 15:59:04 2013
@@ -74,6 +74,9 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
..\%__SRC%\bin\depl*.dll %_DEST%\bin%_EXT%\depl*.dll
..\%__SRC%\lib\deployment*.uno.so %_DEST%\lib%_EXT%\deployment*.uno.so
..\%__SRC%\lib\deployment*.uno.dylib %_DEST%\lib%_EXT%\deployment*.uno.dylib
+..\%__SRC%\bin\deploymentgui*.dll %_DEST%\bin%_EXT%\deploymentgui*.dll
+..\%__SRC%\lib\libdeploymentgui*.uno.so %_DEST%\lib%_EXT%\libdeploymentgui*.uno.so
+..\%__SRC%\lib\libdeploymentgui*.uno.dylib %_DEST%\lib%_EXT%\libdeploymentgui*.uno.dylib
..\%__SRC%\bin\deploymentmisc*.dll %_DEST%\bin%_EXT%\deploymentmisc*.dll
..\%__SRC%\lib\libdeploymentmisc*.so %_DEST%\lib%_EXT%\libdeploymentmisc*.so
..\%__SRC%\lib\libdeploymentmisc*.dylib %_DEST%\lib%_EXT%\libdeploymentmisc*.dylib
@@ -143,7 +146,6 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\
..\%__SRC%\misc\deployment.component %_DEST%\xml%_EXT%\deployment.component
..\%__SRC%\misc\deploymentgui.component %_DEST%\xml%_EXT%\deploymentgui.component
..\%__SRC%\misc\migrationoo2.component %_DEST%\xml%_EXT%\migrationoo2.component
-..\%__SRC%\misc\migrationoo3.component %_DEST%\xml%_EXT%\migrationoo3.component
..\%__SRC%\misc\offacc.component %_DEST%\xml%_EXT%\offacc.component
..\%__SRC%\misc\socomp.component %_DEST%\xml%_EXT%\socomp.component
..\%__SRC%\misc\spl.component %_DEST%\xml%_EXT%\spl.component
Modified: openoffice/branches/rejuvenate01/main/desktop/scripts/unoinfo.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/scripts/unoinfo.sh?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/scripts/unoinfo.sh (original)
+++ openoffice/branches/rejuvenate01/main/desktop/scripts/unoinfo.sh Fri Jul 19 15:59:04 2013
@@ -34,14 +34,14 @@ sd_prog=`pwd`
case $1 in
c++)
- printf '%s' "$sd_prog/../basis-link/ure-link/lib"
+ printf '%s' "$sd_prog"
;;
java)
printf '0%s\0%s\0%s\0%s\0%s' \
- "$sd_prog/../basis-link/ure-link/share/java/ridl.jar" \
- "$sd_prog/../basis-link/ure-link/share/java/jurt.jar" \
- "$sd_prog/../basis-link/ure-link/share/java/juh.jar" \
- "$sd_prog/../basis-link/program/classes/unoil.jar" "$sd_prog"
+ "$sd_prog/classes/ridl.jar" \
+ "$sd_prog/classes/jurt.jar" \
+ "$sd_prog/classes/java/juh.jar" \
+ "$sd_prog/classes/unoil.jar" "$sd_prog"
;;
*)
exit 1
Modified: openoffice/branches/rejuvenate01/main/desktop/scripts/unopkg.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/scripts/unopkg.sh?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/scripts/unopkg.sh (original)
+++ openoffice/branches/rejuvenate01/main/desktop/scripts/unopkg.sh Fri Jul 19 15:59:04 2013
@@ -58,7 +58,7 @@ fi
# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
+ my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
Modified: openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx Fri Jul 19 15:59:04 2013
@@ -160,9 +160,13 @@
#include "com/sun/star/deployment/ExtensionManager.hpp"
#include "com/sun/star/deployment/XExtensionManager.hpp"
#include "com/sun/star/task/XInteractionApprove.hpp"
+#include "com/sun/star/task/XInteractionAbort.hpp"
#include "cppuhelper/compbase3.hxx"
#include <hash_set>
+#include "com/sun/star/deployment/VersionException.hpp"
+#include <dp_gui_handleversionexception.hxx>
+
#if defined MACOSX
#include <errno.h>
#include <sys/wait.h>
@@ -179,7 +183,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
-//using namespace ::com::sun::star::bridge;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::view;
@@ -793,18 +796,41 @@ void MinimalCommandEnv::handle(
css::uno::Reference< css::task::XInteractionRequest> const& xRequest)
throw ( css::uno::RuntimeException )
{
- const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > conts( xRequest->getContinuations());
- const css::uno::Reference< css::task::XInteractionContinuation>* pConts = conts.getConstArray();
- const sal_Int32 len = conts.getLength();
- for( sal_Int32 pos = 0; pos < len; ++pos )
- {
- css::uno::Reference< css::task::XInteractionApprove> xInteractionApprove( pConts[ pos ], css::uno::UNO_QUERY);
- if( xInteractionApprove.is()) {
- xInteractionApprove->select();
- // don't query again for ongoing continuations:
- break;
- }
- }
+ bool bApprove = true;
+
+ css::deployment::VersionException verExc;
+ if ( xRequest->getRequest() >>= verExc )
+ {
+ // user interaction, if an extension is already been installed.
+ bApprove = handleVersionException( verExc );
+ }
+
+ const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > conts( xRequest->getContinuations());
+ const css::uno::Reference< css::task::XInteractionContinuation>* pConts = conts.getConstArray();
+ const sal_Int32 len = conts.getLength();
+ for( sal_Int32 pos = 0; pos < len; ++pos )
+ {
+ if ( bApprove )
+ {
+ css::uno::Reference< css::task::XInteractionApprove> xInteractionApprove( pConts[ pos ], css::uno::UNO_QUERY);
+ if( xInteractionApprove.is())
+ {
+ xInteractionApprove->select();
+ // don't query again for ongoing continuations:
+ break;
+ }
+ }
+ else
+ {
+ css::uno::Reference< css::task::XInteractionAbort > xInteractionAbort( pConts[ pos ], css::uno::UNO_QUERY );
+ if (xInteractionAbort.is())
+ {
+ xInteractionAbort->select();
+ // don't query again for ongoing continuations:
+ break;
+ }
+ }
+ }
}
@@ -883,9 +909,8 @@ static bool needsInstallBundledExtension
// install bundled but non-pre-registered extension blobs
static void installBundledExtensionBlobs()
{
- rtl::OUString aDirUrl( OUSTR("$OOO_BASE_DIR/share/extensions/install"));
- ::rtl::Bootstrap::expandMacros( aDirUrl);
- ::osl::Directory aDir( aDirUrl);
+ rtl::OUString aDirUrl( OUSTR("$OOO_BASE_DIR/share/extensions/install"));
+ ::rtl::Bootstrap::expandMacros( aDirUrl);
// Find out if we can exit early: only when there is an extension file newer
// than the marker we have to install any extension.
@@ -896,57 +921,40 @@ static void installBundledExtensionBlobs
writeLastModified(sMarkerURL);
// get the ExtensionManager
- ::css::uno::Reference< ::css::uno::XComponentContext> xContext = comphelper::getProcessComponentContext();
- ::css::uno::Reference< ::css::deployment::XExtensionManager> xEM = ::css::deployment::ExtensionManager::get( xContext);
- // provide the minimal set of requirements to call ExtensionManager's methods
- MinimalCommandEnv* pMiniCmdEnv = new MinimalCommandEnv;
- ::css::uno::Reference< css::ucb::XCommandEnvironment> xCmdEnv( static_cast< cppu::OWeakObject*>(pMiniCmdEnv), css::uno::UNO_QUERY);
- const ::css::beans::NamedValue aNamedProps( OUSTR("SUPPRESS_LICENSE"), ::css::uno::makeAny( OUSTR("1")));
- const ::css::uno::Sequence< ::css::beans::NamedValue> xProperties( &aNamedProps, 1);
- ::css::uno::Reference< ::css::task::XAbortChannel> xAbortChannel;
-
- // get the list of deployed extensions
- typedef std::hash_set< rtl::OUString, ::rtl::OUStringHash> StringSet;
- StringSet aExtNameSet;
- css::uno::Sequence< css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > > xListOfLists = xEM->getAllExtensions( xAbortChannel, xCmdEnv);
- const sal_Int32 nLen1 = xListOfLists.getLength();
- for( int i1 = 0; i1 < nLen1; ++i1) {
- css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > xListOfPacks = xListOfLists[i1];
- const sal_Int32 nLen2 = xListOfPacks.getLength();
- for( int i2 = 0; i2 < nLen2; ++i2) {
- css::uno::Reference<css::deployment::XPackage> xPackage = xListOfPacks[i2];
- if( !xPackage.is())
- continue;
- aExtNameSet.insert( xPackage->getName());
- }
- }
-
- // iterate over the bundled extension blobs
- ::osl::File::RC rc = aDir.open();
- while( rc == osl::File::E_None) {
- ::osl::DirectoryItem aDI;
- if( aDir.getNextItem( aDI) != osl::File::E_None)
- break;
- ::osl::FileStatus aFileStat( FileStatusMask_Type | FileStatusMask_FileURL);
- if( aDI.getFileStatus( aFileStat) != ::osl::File::E_None)
- continue;
- if( aFileStat.getFileType() != ::osl::FileStatus::Regular)
- continue;
- try {
- // check if the extension is already installed
- const rtl::OUString& rExtFileUrl = aFileStat.getFileURL();
- const sal_Int32 nBaseIndex = rExtFileUrl.lastIndexOf('/');
- const ::rtl::OUString aBaseName = (nBaseIndex < 0) ? rExtFileUrl : rExtFileUrl.copy( nBaseIndex+1);
- const bool bFound = (aExtNameSet.find( aBaseName) != aExtNameSet.end());
- if( bFound)
- continue;
- // request to install the extension blob
- xEM->addExtension( rExtFileUrl, xProperties, OUSTR("user"), xAbortChannel, xCmdEnv);
- // ExtensionManager problems are not worth to die for here
- } catch( css::uno::RuntimeException&) {
- } catch( css::deployment::DeploymentException&) {
- }
- }
+ ::css::uno::Reference< ::css::uno::XComponentContext> xContext = comphelper::getProcessComponentContext();
+ ::css::uno::Reference< ::css::deployment::XExtensionManager> xEM = ::css::deployment::ExtensionManager::get( xContext);
+ // provide the minimal set of requirements to call ExtensionManager's methods
+ MinimalCommandEnv* pMiniCmdEnv = new MinimalCommandEnv;
+ ::css::uno::Reference< css::ucb::XCommandEnvironment> xCmdEnv( static_cast< cppu::OWeakObject*>(pMiniCmdEnv), css::uno::UNO_QUERY);
+ ::css::uno::Reference< ::css::task::XAbortChannel> xAbortChannel;
+
+ const ::css::beans::NamedValue aNamedProps( OUSTR("SUPPRESS_LICENSE"), ::css::uno::makeAny( OUSTR("1")));
+ const ::css::uno::Sequence< ::css::beans::NamedValue> xProperties( &aNamedProps, 1);
+
+ // iterate over the bundled extension blobs
+ ::osl::Directory aDir( aDirUrl);
+ ::osl::File::RC rc = aDir.open();
+ while( rc == osl::File::E_None)
+ {
+ ::osl::DirectoryItem aDI;
+ if( aDir.getNextItem( aDI) != osl::File::E_None)
+ break;
+ ::osl::FileStatus aFileStat( FileStatusMask_Type | FileStatusMask_FileURL);
+ if( aDI.getFileStatus( aFileStat) != ::osl::File::E_None)
+ continue;
+ if( aFileStat.getFileType() != ::osl::FileStatus::Regular)
+ continue;
+ try
+ {
+ // request to install the extension blob
+ xEM->addExtension( aFileStat.getFileURL(), xProperties, OUSTR("user"), xAbortChannel, xCmdEnv);
+ }
+ // ExtensionManager problems are not worth to die for here
+ catch( css::uno::RuntimeException&)
+ {}
+ catch( css::deployment::DeploymentException&)
+ {}
+ }
}
//=============================================================================
@@ -2010,8 +2018,21 @@ void Desktop::Main()
DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY );
if (xFirstStartJob.is())
{
- // mark first start as done
- FinishFirstStart();
+ sal_Bool bDone = sal_False;
+ Sequence< NamedValue > lArgs(2);
+ lArgs[0].Name = ::rtl::OUString::createFromAscii("LicenseNeedsAcceptance");
+ lArgs[0].Value <<= LicenseNeedsAcceptance();
+ lArgs[1].Name = ::rtl::OUString::createFromAscii("LicensePath");
+ lArgs[1].Value <<= GetLicensePath();
+
+ xFirstStartJob->execute(lArgs) >>= bDone;
+ if ( !bDone )
+ {
+ doShutdown();
+ return;
+ }
+ // mark first start as done
+ FinishFirstStart();
}
}
Modified: openoffice/branches/rejuvenate01/main/desktop/source/app/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/app/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/app/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/app/makefile.mk Fri Jul 19 15:59:04 2013
@@ -32,6 +32,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.INCLUDE : ../deployment/inc/dp_misc.mk
+.INCLUDE : ../deployment/inc/dp_gui.mk
.IF "$(ENABLE_GNOMEVFS)"=="TRUE"
CFLAGS+=-DGNOME_VFS_ENABLED
@@ -41,22 +42,6 @@ CFLAGS+=-DGNOME_VFS_ENABLED
CFLAGS+=-DENABLE_QUICKSTART_APPLET
.ENDIF
-# .IF "$(OS)" == "WNT"
-# .IF "$(COM)" == "GCC"
-# DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
-# .ELSE
-# DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib
-# .ENDIF
-# .ELIF "$(OS)" == "OS2"
-# DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib
-# .ELSE
-# DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
-# .ENDIF
-
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-CFLAGS+=-DENABLE_QUICKSTART_APPLET
-.ENDIF
-
SHL1TARGET = sofficeapp
SHL1OBJS = \
$(SLO)$/app.obj \
@@ -85,6 +70,7 @@ SHL1STDLIBS = \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(DEPLOYMENTMISCLIB) \
+ $(DEPLOYMENTGUILIB) \
$(I18NISOLANGLIB) \
$(SALLIB) \
$(SFXLIB) \
Modified: openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx Fri Jul 19 15:59:04 2013
@@ -26,6 +26,7 @@
+#include <dp_gui_handleversionexception.hxx>
#include "sal/config.h"
@@ -86,6 +87,7 @@
#include "dp_dependencies.hxx"
#include "dp_identifier.hxx"
#include "dp_version.hxx"
+#include <dp_gui_handleversionexception.hxx>
#include <queue>
#include <boost/shared_ptr.hpp>
@@ -104,20 +106,6 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
-namespace {
-
-OUString getVersion( OUString const & sVersion )
-{
- return ( sVersion.getLength() == 0 ) ? OUString( RTL_CONSTASCII_USTRINGPARAM( "0" ) ) : sVersion;
-}
-
-OUString getVersion( const uno::Reference< deployment::XPackage > &rPackage )
-{
- return getVersion( rPackage->getVersion());
-}
-}
-
-
namespace dp_gui {
//==============================================================================
@@ -359,6 +347,7 @@ uno::Reference< ucb::XProgressHandler >
//------------------------------------------------------------------------------
// XInteractionHandler
//------------------------------------------------------------------------------
+
void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & xRequest )
throw ( uno::RuntimeException )
{
@@ -449,54 +438,8 @@ void ProgressCmdEnv::handle( uno::Refere
}
else if (request >>= verExc)
{
- sal_uInt32 id;
- switch (dp_misc::compareVersions(
- verExc.NewVersion, verExc.Deployed->getVersion() ))
- {
- case dp_misc::LESS:
- id = RID_WARNINGBOX_VERSION_LESS;
- break;
- case dp_misc::EQUAL:
- id = RID_WARNINGBOX_VERSION_EQUAL;
- break;
- default: // dp_misc::GREATER
- id = RID_WARNINGBOX_VERSION_GREATER;
- break;
- }
- OSL_ASSERT( verExc.Deployed.is() );
- bool bEqualNames = verExc.NewDisplayName.equals(
- verExc.Deployed->getDisplayName());
- {
- vos::OGuard guard(Application::GetSolarMutex());
- WarningBox box( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, ResId(id, *DeploymentGuiResMgr::get()));
- String s;
- if (bEqualNames)
- {
- s = box.GetMessText();
- }
- else if (id == RID_WARNINGBOX_VERSION_EQUAL)
- {
- //hypothetical: requires two instances of an extension with the same
- //version to have different display names. Probably the developer forgot
- //to change the version.
- s = String(ResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()));
- }
- else if (id == RID_WARNINGBOX_VERSION_LESS)
- {
- s = String(ResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()));
- }
- else if (id == RID_WARNINGBOX_VERSION_GREATER)
- {
- s = String(ResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()));
- }
- s.SearchAndReplaceAllAscii( "$NAME", verExc.NewDisplayName);
- s.SearchAndReplaceAllAscii( "$OLDNAME", verExc.Deployed->getDisplayName());
- s.SearchAndReplaceAllAscii( "$NEW", getVersion(verExc.NewVersion) );
- s.SearchAndReplaceAllAscii( "$DEPLOYED", getVersion(verExc.Deployed) );
- box.SetMessText(s);
- approve = box.Execute() == RET_OK;
- abort = !approve;
- }
+ approve = handleVersionException( verExc, m_pDialogHelper );
+ abort = !approve;
}
else if (request >>= instExc)
{
Modified: openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_service.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_service.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_service.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_service.cxx Fri Jul 19 15:59:04 2013
@@ -27,6 +27,7 @@
#include "dp_gui_shared.hxx"
#include "dp_gui.h"
#include "dp_gui_theextmgr.hxx"
+#include "dp_gui_api.hxx"
#include "cppuhelper/implbase2.hxx"
#include "cppuhelper/implementationentry.hxx"
#include "unotools/configmgr.hxx"
@@ -44,6 +45,7 @@
#include "dp_gui_dialog2.hxx"
#include "dp_gui_extensioncmdqueue.hxx"
+
using namespace ::dp_misc;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -346,12 +348,14 @@ sdecl::ServiceDecl const updateDecl(
extern "C" {
+DESKTOP_DEPLOYMENTGUI_DLLPUBLIC
void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
+DESKTOP_DEPLOYMENTGUI_DLLPUBLIC
void * SAL_CALL component_getFactory(
sal_Char const * pImplName,
lang::XMultiServiceFactory * pServiceManager,
Modified: openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/makefile.mk Fri Jul 19 15:59:04 2013
@@ -26,17 +26,21 @@ PRJ = ..$/..$/..
PRJNAME = desktop
TARGET = deploymentgui
ENABLE_EXCEPTIONS = TRUE
-#USE_DEFFILE = TRUE
-NO_BSYMBOLIC = TRUE
+USE_DEFFILE = TRUE
+#NO_BSYMBOLIC = TRUE
+VISIBILITY_HIDDEN=TRUE
USE_PCH :=
ENABLE_PCH :=
PRJINC:=..$/..
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-DLLPRE =
+#DLLPRE =
-SLOFILES = \
+# Reduction of exported symbols:
+CDEFS += -DDESKTOP_DEPLOYMENTGUI_DLLIMPLEMENTATION
+
+SHL1OBJS = \
$(SLO)$/dp_gui_service.obj \
$(SLO)$/dp_gui_extlistbox.obj \
$(SLO)$/dp_gui_dialog2.obj \
@@ -49,14 +53,17 @@ SLOFILES = \
$(SLO)$/dp_gui_autoscrolledit.obj \
$(SLO)$/dp_gui_system.obj \
$(SLO)$/dp_gui_extensioncmdqueue.obj \
+ $(SLO)$/dp_gui_handleversionexception.obj \
$(SLO)$/descedit.obj
+SLOFILES = $(SHL1OBJS)
+
.IF "$(GUI)"=="OS2"
SHL1TARGET = deplgui$(DLLPOSTFIX)
.ELSE
SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
.ENDIF
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+SHL1VERSIONMAP = $(TARGET).map
SHL1STDLIBS = \
$(SALLIB) \
@@ -79,13 +86,10 @@ SHL1STDLIBS = \
$(OLE32LIB)
SHL1DEPN =
-SHL1IMPLIB = i$(TARGET)
-SHL1LIBS = $(SLB)$/$(TARGET).lib
+SHL1IMPLIB = i$(SHL1TARGET)
SHL1DEF = $(MISC)$/$(SHL1TARGET).def
DEF1NAME = $(SHL1TARGET)
-#DEFLIB1NAME = $(TARGET)
-#DEF1DEPN =
SRS1NAME = $(TARGET)
SRC1FILES = \
Modified: openoffice/branches/rejuvenate01/main/desktop/source/migration/migration.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/migration/migration.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/migration/migration.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/migration/migration.cxx Fri Jul 19 15:59:04 2013
@@ -768,26 +768,35 @@ void MigrationImpl::copyConfig() {
for (Components::const_iterator i(comps.begin()); i != comps.end(); ++i) {
if (!i->second.includedPaths.empty()) {
rtl::OUStringBuffer buf(m_aInfo.userdata);
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("/user/registry/data"));
- sal_Int32 n = 0;
- do {
- rtl::OUString seg(i->first.getToken(0, '.', n));
- rtl::OUString enc(
- rtl::Uri::encode(
- seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict,
- RTL_TEXTENCODING_UTF8));
- if (enc.getLength() == 0 && seg.getLength() != 0) {
- OSL_TRACE(
- ("configuration migration component %s ignored (cannot"
- " be encoded as file path)"),
- rtl::OUStringToOString(
- i->first, RTL_TEXTENCODING_UTF8).getStr());
- goto next;
- }
- buf.append(sal_Unicode('/'));
- buf.append(enc);
- } while (n >= 0);
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(".xcu"));
+ if ( m_aInfo.productname.equals( OUString::createFromAscii("OpenOffice.org 3") ) )
+ {
+ // OpenOffice.org 3 configuration file
+ buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("/user/registrymodifications.xcu"));
+ }
+ else
+ {
+ // OpenOffice.org 2 configuration files
+ buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("/user/registry/data"));
+ sal_Int32 n = 0;
+ do {
+ rtl::OUString seg(i->first.getToken(0, '.', n));
+ rtl::OUString enc(
+ rtl::Uri::encode(
+ seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict,
+ RTL_TEXTENCODING_UTF8));
+ if (enc.getLength() == 0 && seg.getLength() != 0) {
+ OSL_TRACE(
+ ("configuration migration component %s ignored (cannot"
+ " be encoded as file path)"),
+ rtl::OUStringToOString(
+ i->first, RTL_TEXTENCODING_UTF8).getStr());
+ goto next;
+ }
+ buf.append(sal_Unicode('/'));
+ buf.append(enc);
+ } while (n >= 0);
+ buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(".xcu"));
+ }
configuration::Update::get(
comphelper::getProcessComponentContext())->
insertModificationXcuFile(
Modified: openoffice/branches/rejuvenate01/main/desktop/source/migration/services/cexports.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/migration/services/cexports.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/migration/services/cexports.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/migration/services/cexports.cxx Fri Jul 19 15:59:04 2013
@@ -27,7 +27,7 @@
#include "cppuhelper/implementationentry.hxx"
#include "basicmigration.hxx"
#include "wordbookmigration.hxx"
-//#include "extensionmigration.hxx"
+#include "oo3extensionmigration.hxx"
extern "C"
{
@@ -44,11 +44,11 @@ extern "C"
migration::WordbookMigration_getSupportedServiceNames, ::cppu::createSingleComponentFactory,
0, 0
},
-// {
-// migration::ExtensionMigration_create, migration::ExtensionMigration_getImplementationName,
-// migration::ExtensionMigration_getSupportedServiceNames, ::cppu::createSingleComponentFactory,
-// 0, 0
-// },
+ {
+ migration::OO3ExtensionMigration_create, migration::OO3ExtensionMigration_getImplementationName,
+ migration::OO3ExtensionMigration_getSupportedServiceNames, ::cppu::createSingleComponentFactory,
+ 0, 0
+ },
{ 0, 0, 0, 0, 0, 0 }
};
Modified: openoffice/branches/rejuvenate01/main/desktop/source/migration/services/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/migration/services/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/migration/services/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/migration/services/makefile.mk Fri Jul 19 15:59:04 2013
@@ -34,8 +34,10 @@ COMP1TYPELIST = migrationoo2
LIBTARGET=NO
# --- Settings -----------------------------------------------------
-.INCLUDE : ..$/..$/deployment/inc/dp_misc.mk
+PRJINC=..$/..
.INCLUDE : settings.mk
+.INCLUDE : ..$/..$/deployment/inc/dp_misc.mk
+.INCLUDE : ..$/..$/deployment/inc/dp_gui.mk
DLLPRE =
# ------------------------------------------------------------------
@@ -48,21 +50,22 @@ SLOFILES= \
$(SLO)$/basicmigration.obj \
$(SLO)$/wordbookmigration.obj \
$(SLO)$/autocorrmigration.obj \
- $(SLO)$/oo3extensionmigration.obj \
- $(SLO)$/cexportsoo3.obj
+ $(SLO)$/oo3extensionmigration.obj
SHL1OBJS= \
$(SLO)$/jvmfwk.obj \
$(SLO)$/cexports.obj \
$(SLO)$/basicmigration.obj \
$(SLO)$/wordbookmigration.obj \
- $(SLO)$/autocorrmigration.obj
+ $(SLO)$/autocorrmigration.obj \
+ $(SLO)$/oo3extensionmigration.obj
SHL1TARGET=$(TARGET)
SHL1VERSIONMAP = $(SOLARENV)/src/component.map
SHL1STDLIBS= \
$(DEPLOYMENTMISCLIB) \
+ $(DEPLOYMENTGUILIB) \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
@@ -80,49 +83,10 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
-COMP2TYPELIST = migrationoo3
-.IF "$(OS)" == "OS2"
-SHL2TARGET=migroo3
-.ELSE
-SHL2TARGET=migrationoo3.uno
-.ENDIF
-SHL2VERSIONMAP = $(SOLARENV)/src/component.map
-
-SHL2OBJS= \
- $(SLO)$/cexportsoo3.obj \
- $(SLO)$/oo3extensionmigration.obj
-
-SHL2STDLIBS= \
- $(DEPLOYMENTMISCLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(JVMFWKLIB) \
- $(XMLSCRIPTLIB) \
-
-SHL2DEPN=
-SHL2IMPLIB=imigrationoo3
-#SHL2LIBS=$(SLB)$/$(SHL2TARGET).lib
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-
-DEF2NAME=$(SHL2TARGET)
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-ALLTAR : $(MISC)/migrationoo3.component
-
-$(MISC)/migrationoo3.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component
-
ALLTAR : $(MISC)/migrationoo2.component
$(MISC)/migrationoo2.component .ERRREMOVE : \
Modified: openoffice/branches/rejuvenate01/main/desktop/source/migration/services/migrationoo2.component
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/migration/services/migrationoo2.component?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/migration/services/migrationoo2.component (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/migration/services/migrationoo2.component Fri Jul 19 15:59:04 2013
@@ -24,10 +24,13 @@
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.desktop.migration.Basic">
- <service name="com.sun.star.migration.Basic"/>
- </implementation>
- <implementation name="com.sun.star.comp.desktop.migration.Wordbooks">
- <service name="com.sun.star.migration.Wordbooks"/>
- </implementation>
+ <implementation name="com.sun.star.comp.desktop.migration.Basic">
+ <service name="com.sun.star.migration.Basic"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.desktop.migration.Wordbooks">
+ <service name="com.sun.star.migration.Wordbooks"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.desktop.migration.OOo3Extensions">
+ <service name="com.sun.star.migration.Extensions"/>
+ </implementation>
</component>
Modified: openoffice/branches/rejuvenate01/main/desktop/source/migration/services/oo3extensionmigration.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/migration/services/oo3extensionmigration.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/migration/services/oo3extensionmigration.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/migration/services/oo3extensionmigration.cxx Fri Jul 19 15:59:04 2013
@@ -46,6 +46,10 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/deployment/ExtensionManager.hpp>
+#include <com/sun/star/deployment/VersionException.hpp>
+#include <dp_gui_handleversionexception.hxx>
+#include <com/sun/star/deployment/DeploymentException.hpp>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -361,6 +365,12 @@ bool OO3ExtensionMigration::migrateExten
catch ( lang::IllegalArgumentException& )
{
}
+ catch ( deployment::DeploymentException& )
+ {
+ }
+ catch ( uno::RuntimeException & )
+ {
+ }
}
return false;
@@ -517,6 +527,14 @@ void TmpRepositoryCommandEnv::handle(
bool approve = true;
bool abort = false;
+ deployment::VersionException verExc;
+ if ( xRequest->getRequest() >>= verExc )
+ {
+ // user interaction, if an extension is already been installed.
+ approve = handleVersionException( verExc );
+ abort = !approve;
+ }
+
// select:
uno::Sequence< Reference< task::XInteractionContinuation > > conts(
xRequest->getContinuations() );
Modified: openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx Fri Jul 19 15:59:04 2013
@@ -116,9 +116,11 @@ ResMgr *FirstStartWizard::GetResManager(
}
FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAcceptance, const rtl::OUString &rLicensePath )
- :RoadmapWizard( pParent, WizardResId(DLG_FIRSTSTART_WIZARD),
- WZB_NEXT|WZB_PREVIOUS|WZB_FINISH|WZB_CANCEL|WZB_HELP)
+ :RoadmapWizard( pParent,
+ WizardResId(DLG_FIRSTSTART_WIZARD),
+ WZB_NEXT|WZB_PREVIOUS|WZB_FINISH|WZB_CANCEL|WZB_HELP)
,m_bOverride(sal_False)
+ , m_lastState( STATE_WELCOME )
,m_aDefaultPath(0)
,m_aMigrationPath(0)
,m_bDone(sal_False)
@@ -129,9 +131,6 @@ FirstStartWizard::FirstStartWizard( Wind
,m_aLicensePath( rLicensePath )
{
FreeResource();
- // ---
-// enableState(STATE_USER, sal_False);
-// enableState(STATE_REGISTRATION, sal_False);
Size aTPSize(TP_WIDTH, TP_HEIGHT);
SetPageSizePixel(LogicToPixel(aTPSize, MAP_APPFONT));
@@ -141,7 +140,6 @@ FirstStartWizard::FirstStartWizard( Wind
m_pNextPage->SetHelpId(HID_FIRSTSTART_NEXT);
m_pCancel->SetHelpId(HID_FIRSTSTART_CANCEL);
m_pFinish->SetHelpId(HID_FIRSTSTART_FINISH);
- // m_pHelp->SetUniqueId(UID_FIRSTSTART_HELP);
m_pHelp->Hide();
m_pHelp->Disable();
@@ -173,23 +171,25 @@ void FirstStartWizard::DisableButtonsWhi
{
::svt::RoadmapWizardTypes::PathId aDefaultPath = 0;
- sal_Bool bPage_Welcome = sal_True;
sal_Bool bPage_Migration = sal_True;
- sal_Bool bPage_User = sal_True;
sal_Bool bPage_UpdateCheck = sal_True;
bPage_Migration = Migration::checkMigration();
bPage_UpdateCheck = showOnlineUpdatePage();
WizardPath aPath;
- if (bPage_Welcome)
- aPath.push_back(STATE_WELCOME);
+ aPath.push_back(STATE_WELCOME);
if (bPage_Migration)
+ {
aPath.push_back(STATE_MIGRATION);
- if (bPage_User)
- aPath.push_back(STATE_USER);
+ }
+ aPath.push_back(STATE_USER);
+ m_lastState = STATE_USER;
if (bPage_UpdateCheck)
+ {
aPath.push_back(STATE_UPDATE_CHECK);
+ m_lastState = STATE_UPDATE_CHECK;
+ }
declarePath(aDefaultPath, aPath);
@@ -200,12 +200,11 @@ void FirstStartWizard::DisableButtonsWhi
// such direct links can be enabled by default.
sal_Bool bAllowDirectLink = true;
- if (bPage_User)
- enableState(STATE_USER, bAllowDirectLink);
- if (bPage_UpdateCheck)
- enableState(STATE_UPDATE_CHECK, bAllowDirectLink);
+ enableState(STATE_USER, bAllowDirectLink);
if (bPage_Migration)
enableState(STATE_MIGRATION, bAllowDirectLink);
+ if (bPage_UpdateCheck)
+ enableState(STATE_UPDATE_CHECK, bAllowDirectLink);
return aDefaultPath;
}
@@ -252,15 +251,13 @@ void FirstStartWizard::enterState(Wizard
// attach warning dialog to cancel/decline button
m_pCancel->SetClickHdl( LINK(this, FirstStartWizard, DeclineHdl) );
break;
- case STATE_REGISTRATION:
+ }
+ if ( _nState == m_lastState )
+ {
enableButtons(WZB_NEXT, sal_False);
enableButtons(WZB_FINISH, sal_True);
defaultButton(WZB_FINISH);
- break;
}
-
- // focus
-
}
IMPL_LINK( FirstStartWizard, DeclineHdl, PushButton *, EMPTYARG )
Modified: openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.hxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.hxx Fri Jul 19 15:59:04 2013
@@ -62,6 +62,7 @@ public:
private:
sal_Bool m_bOverride;
WizardState _currentState;
+ WizardState m_lastState;
::svt::RoadmapWizardTypes::PathId m_aDefaultPath;
::svt::RoadmapWizardTypes::PathId m_aMigrationPath;
String m_sNext;
Modified: openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.cxx Fri Jul 19 15:59:04 2013
@@ -55,6 +55,7 @@ SplashScreen::SplashScreen(const Referen
: IntroWindow()
, _vdev(*((IntroWindow*)this))
, _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED))
+ , _bShowProgressFrame(true)
, _cProgressBarColor(sal::static_int_cast< ColorData >(NOT_LOADED))
, _bNativeProgress(true)
, _iMax(100)
@@ -303,6 +304,8 @@ void SplashScreen::loadConfig()
OUString( RTL_CONSTASCII_USTRINGPARAM( "FullScreenSplash" ) ) );
OUString sNativeProgress = implReadBootstrapKey(
OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeProgress" ) ) );
+ OUString sShowProgressFrame = implReadBootstrapKey(
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "ShowProgressFrame" ) ) );
// Determine full screen splash mode
@@ -334,6 +337,11 @@ void SplashScreen::loadConfig()
}
}
+ if (sShowProgressFrame.getLength() > 0)
+ {
+ _bShowProgressFrame = sShowProgressFrame.toBoolean();
+ }
+
if ( sProgressBarColor.getLength() )
{
sal_uInt8 nRed = 0;
@@ -658,18 +666,40 @@ void SplashScreen::Paint( const Rectangl
if (_bPaintBitmap)
_vdev.DrawBitmapEx( Point(), _aIntroBmp );
- if (_bPaintProgress) {
+ if (_bPaintProgress)
+ {
// draw progress...
- long length = (_iProgress * _barwidth / _iMax) - (2 * _barspace);
- if (length < 0) length = 0;
-
- // border
- _vdev.SetFillColor();
- _vdev.SetLineColor( _cProgressFrameColor );
- _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight));
- _vdev.SetFillColor( _cProgressBarColor );
- _vdev.SetLineColor();
- _vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, _tlx+_barspace+length, _tly+_barheight-_barspace));
+ long length = (_iProgress * _barwidth / _iMax);
+ if (_bShowProgressFrame)
+ length -= (2 * _barspace);
+ if (length < 0)
+ length = 0;
+
+ if (_bShowProgressFrame)
+ {
+ // border
+ _vdev.SetFillColor();
+ _vdev.SetLineColor( _cProgressFrameColor );
+ _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight));
+ _vdev.SetFillColor( _cProgressBarColor );
+ _vdev.SetLineColor();
+ _vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, _tlx+_barspace+length, _tly+_barheight-_barspace));
+ _vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, _tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER );
+ }
+ else
+ {
+ // Show flat progress bar without frame.
+
+ // border
+ _vdev.SetFillColor( _cProgressFrameColor );
+ _vdev.SetLineColor();
+ _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight));
+
+ _vdev.SetFillColor( _cProgressBarColor );
+ _vdev.SetLineColor();
+ _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+length, _tly+_barheight));
+ }
+
_vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, _tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER );
}
Size aSize = GetOutputSizePixel();
Modified: openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.hxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.hxx Fri Jul 19 15:59:04 2013
@@ -84,6 +84,7 @@ private:
VirtualDevice _vdev;
BitmapEx _aIntroBmp;
Color _cProgressFrameColor;
+ bool _bShowProgressFrame;
Color _cProgressBarColor;
bool _bNativeProgress;
OUString _sAppName;
Modified: openoffice/branches/rejuvenate01/main/desktop/win32/source/unoinfo.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/win32/source/unoinfo.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/win32/source/unoinfo.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/win32/source/unoinfo.cxx Fri Jul 19 15:59:04 2013
@@ -66,10 +66,7 @@ void writePath(
if (end == NULL) {
exit(EXIT_FAILURE);
}
- std::size_t n = (end - path) * sizeof (wchar_t);
- if (fwrite(path, 1, n, stdout) != n) {
- exit(EXIT_FAILURE);
- }
+ fprintf(stdout, "%S", path);
}
}
@@ -83,23 +80,12 @@ int wmain(int argc, wchar_t ** argv, wch
#endif
wchar_t path[MAX_PATH];
wchar_t * pathEnd = getBrandPath(path);
- if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link"))
- == NULL)
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL ||
- (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) ==
- NULL))
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
+
if (pathEnd == NULL) {
exit(EXIT_FAILURE);
}
- writePath(path, pathEnd, MY_STRING(L"\\bin"));
+
+ writePath(path, pathEnd, MY_STRING(L""));
#ifdef __MINGW32__
} else if (argc == 2 && strcmp(argv[1], "java") == 0) {
#else
@@ -111,32 +97,17 @@ int wmain(int argc, wchar_t ** argv, wch
wchar_t path[MAX_PATH];
wchar_t * pathEnd = getBrandPath(path);
writePath(path, pathEnd, MY_STRING(L""));
- if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link"))
- == NULL)
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
if (pathEnd == NULL) {
exit(EXIT_FAILURE);
}
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\program\\classes\\unoil.jar"));
- if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) ==
- NULL)
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL) {
- exit(EXIT_FAILURE);
- }
+ writePath(path, pathEnd, MY_STRING(L"classes\\unoil.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\java\\ridl.jar"));
+ writePath(path, pathEnd, MY_STRING(L"\classes\\ridl.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\java\\jurt.jar"));
+ writePath(path, pathEnd, MY_STRING(L"classes\\jurt.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\java\\juh.jar"));
+ writePath(path, pathEnd, MY_STRING(L"classes\\juh.jar"));
} else {
exit(EXIT_FAILURE);
}
Modified: openoffice/branches/rejuvenate01/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx (original)
+++ openoffice/branches/rejuvenate01/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx Fri Jul 19 15:59:04 2013
@@ -158,6 +158,7 @@ namespace drawinglayer
const basegfx::B2DPoint& rStart,
bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod = Spread_pad);
+ virtual ~SvgGradientHelper();
/// data read access
const basegfx::B2DHomMatrix& getGradientTransform() const { return maGradientTransform; }
@@ -168,7 +169,7 @@ namespace drawinglayer
SpreadMethod getSpreadMethod() const { return maSpreadMethod; }
/// compare operator
- virtual bool operator==(const SvgGradientHelper& rSvgGradientHelper) const;
+ bool operator==(const SvgGradientHelper& rSvgGradientHelper) const;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
Modified: openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/primitivetools2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/primitivetools2d.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/primitivetools2d.cxx (original)
+++ openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/primitivetools2d.cxx Fri Jul 19 15:59:04 2013
@@ -38,8 +38,9 @@ namespace drawinglayer
{
::osl::MutexGuard aGuard( m_aMutex );
- // get the current DiscreteUnit
- const double fDiscreteUnit((rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0)).getLength());
+ // get the current DiscreteUnit, look at X and Y and use the maximum
+ const basegfx::B2DVector aDiscreteVector(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 1.0));
+ const double fDiscreteUnit(std::min(fabs(aDiscreteVector.getX()), fabs(aDiscreteVector.getY())));
if(getBuffered2DDecomposition().hasElements() && !basegfx::fTools::equal(fDiscreteUnit, getDiscreteUnit()))
{
Modified: openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx (original)
+++ openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx Fri Jul 19 15:59:04 2013
@@ -304,6 +304,10 @@ namespace drawinglayer
{
}
+ SvgGradientHelper::~SvgGradientHelper()
+ {
+ }
+
bool SvgGradientHelper::operator==(const SvgGradientHelper& rSvgGradientHelper) const
{
const SvgGradientHelper& rCompare = static_cast< const SvgGradientHelper& >(rSvgGradientHelper);
Modified: openoffice/branches/rejuvenate01/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/drawinglayer/source/processor2d/vclprocessor2d.cxx (original)
+++ openoffice/branches/rejuvenate01/main/drawinglayer/source/processor2d/vclprocessor2d.cxx Fri Jul 19 15:59:04 2013
@@ -425,7 +425,8 @@ namespace drawinglayer
#if defined(MACOSX)
const AlphaMask aMaskBmp( aContent.GetSizePixel());
#else
- const Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+ Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+ aMaskBmp.Erase(Color(COL_BLACK)); // #122758# Initialize to non-transparent
#endif
aBitmapEx = BitmapEx(aContent, aMaskBmp);
}
@@ -1279,7 +1280,10 @@ namespace drawinglayer
{
const basegfx::BColor aColorA(maBColorModifierStack.getModifiedColor(rCandidate.getColorA()));
const basegfx::BColor aColorB(maBColorModifierStack.getModifiedColor(rCandidate.getColorB()));
- const double fDiscreteUnit((getViewInformation2D().getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0)).getLength());
+
+ // calculate discrete unit in WorldCoordinates; use diagonal (1.0, 1.0) and divide by sqrt(2)
+ const basegfx::B2DVector aDiscreteVector(getViewInformation2D().getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 1.0));
+ const double fDiscreteUnit(aDiscreteVector.getLength() * (1.0 / 1.414213562373));
// use color distance and discrete lengths to calculate step count
const sal_uInt32 nSteps(calculateStepsForSvgGradient(aColorA, aColorB, fDelta, fDiscreteUnit));
@@ -1321,7 +1325,10 @@ namespace drawinglayer
{
const basegfx::BColor aColorA(maBColorModifierStack.getModifiedColor(rCandidate.getColorA()));
const basegfx::BColor aColorB(maBColorModifierStack.getModifiedColor(rCandidate.getColorB()));
- const double fDiscreteUnit((getViewInformation2D().getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0)).getLength());
+
+ // calculate discrete unit in WorldCoordinates; use diagonal (1.0, 1.0) and divide by sqrt(2)
+ const basegfx::B2DVector aDiscreteVector(getViewInformation2D().getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 1.0));
+ const double fDiscreteUnit(aDiscreteVector.getLength() * (1.0 / 1.414213562373));
// use color distance and discrete lengths to calculate step count
const sal_uInt32 nSteps(calculateStepsForSvgGradient(aColorA, aColorB, fDeltaScale, fDiscreteUnit));
Modified: openoffice/branches/rejuvenate01/main/dtrans/source/win32/dtobj/FetcList.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dtrans/source/win32/dtobj/FetcList.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dtrans/source/win32/dtobj/FetcList.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dtrans/source/win32/dtobj/FetcList.cxx Fri Jul 19 15:59:04 2013
@@ -143,10 +143,11 @@ sal_uInt32 SAL_CALL CFormatEtcContainer:
sal_uInt32 nFetched = 0;
- if ( m_EnumIterator != m_FormatMap.end( ) )
+ for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++, ++m_EnumIterator )
{
- for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++, ++m_EnumIterator )
- CopyFormatEtc( lpFetc, *m_EnumIterator );
+ if ( m_EnumIterator == m_FormatMap.end() )
+ break;
+ CopyFormatEtc( lpFetc, *m_EnumIterator );
}
return nFetched;
Modified: openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx Fri Jul 19 15:59:04 2013
@@ -2298,6 +2298,16 @@ EditPaM ImpEditEngine::ImpConnectParagra
DBG_ASSERT( aEditDoc.GetPos( pLeft ) != USHRT_MAX, "Einzufuegenden Node nicht gefunden(1)" );
DBG_ASSERT( aEditDoc.GetPos( pRight ) != USHRT_MAX, "Einzufuegenden Node nicht gefunden(2)" );
+ // #120020# it is possible that left and right are *not* in the desired order (left/right)
+ // so correct it. This correction is needed, else an invalid SfxLinkUndoAction will be
+ // created from ConnectParagraphs below. Assert this situation, it should be corrected by the
+ // caller.
+ if(aEditDoc.GetPos( pLeft ) > aEditDoc.GetPos( pRight ))
+ {
+ OSL_ENSURE(false, "ImpConnectParagraphs wit wrong order of pLeft/pRight nodes (!)");
+ std::swap(pLeft, pRight);
+ }
+
sal_uInt16 nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pRight, nParagraphTobeDeleted );
aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
@@ -2423,22 +2433,38 @@ EditPaM ImpEditEngine::DeleteLeftOrRight
}
else if ( nDelMode == DELMODE_RESTOFWORD )
{
- aDelEnd = EndOfWord( aCurPos );
- if (aDelEnd.GetIndex() == aCurPos.GetIndex())
- {
- xub_StrLen nLen = aCurPos.GetNode()->Len();
- // end of para?
- if (aDelEnd.GetIndex() == nLen)
- aDelEnd = WordLeft( aCurPos );
- else // there's still sth to delete on the right
- {
- aDelEnd = EndOfWord( WordRight( aCurPos ) );
- // if there'n no next word...
- if (aDelEnd.GetIndex() == nLen )
- aDelEnd.SetIndex( nLen );
- }
- }
- }
+ aDelEnd = EndOfWord( aCurPos );
+
+ if (aDelEnd.GetIndex() == aCurPos.GetIndex())
+ {
+ const xub_StrLen nLen(aCurPos.GetNode()->Len());
+
+ // #120020# when 0 == nLen, aDelStart needs to be adapted, not
+ // aDelEnd. This would (and did) lead to a wrong order in the
+ // ImpConnectParagraphs call later.
+ if(nLen)
+ {
+ // end of para?
+ if (aDelEnd.GetIndex() == nLen)
+ {
+ aDelEnd = WordLeft( aCurPos );
+ }
+ else // there's still sth to delete on the right
+ {
+ aDelEnd = EndOfWord( WordRight( aCurPos ) );
+ // if there'n no next word...
+ if (aDelEnd.GetIndex() == nLen )
+ {
+ aDelEnd.SetIndex( nLen );
+ }
+ }
+ }
+ else
+ {
+ aDelStart = WordLeft(aCurPos);
+ }
+ }
+ }
else // DELMODE_RESTOFCONTENT
{
aDelEnd.SetIndex( aCurPos.GetNode()->Len() );
Modified: openoffice/branches/rejuvenate01/main/extensions.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions.lst?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/extensions.lst (original)
+++ openoffice/branches/rejuvenate01/main/extensions.lst Fri Jul 19 15:59:04 2013
@@ -39,7 +39,7 @@
# English dictionary
[ language=en.* || language=de || language=it ]
- b7ce02d25eb302e5b23572cdccaea461 http://numbertext.org/tmp/dict-en.oxt
+ b7ce02d25eb302e5b23572cdccaea461 http://sourceforge.net/projects/aoo-extensions/files/17102/0/dict-en.oxt/download "dict-en.oxt"
# English (USA, en_US) dictionary
[ language==nl || language==ru ]
@@ -78,6 +78,10 @@
[ language=ru ]
a63512bc487d7378bbe2e44f59d5ef45 http://sourceforge.net/projects/aoo-extensions/files/3233/2/dict_ru_RU-0.3.6.oxt/download "dict_ru_RU-0.3.6.oxt"
+# Slovak dictionary.
+[ language=sk ]
+ 5a7cec122a215c9f6a906ecb8ad46ee6 http://sourceforge.net/projects/aoo-extensions/files/1143/11/dict-sk.oxt/download "dict-sk.oxt"
+
# Slovenian dictionary.
[ language=sl ]
cfc3e4da22a3bb9f3f5fa7ae443f6407 http://sourceforge.net/projects/aoo-extensions/files/3280/5/pack-sl.oxt "pack-sl.oxt"
Modified: openoffice/branches/rejuvenate01/main/extensions/source/ole/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions/source/ole/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/extensions/source/ole/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/extensions/source/ole/makefile.mk Fri Jul 19 15:59:04 2013
@@ -43,10 +43,6 @@ INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(
.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-.IF "$(USE_STLP_DEBUG)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_STLP_DEBUG)"!=""
-
SLOFILES= \
$(SLO)$/servreg.obj \
$(SLO)$/servprov.obj \
@@ -77,11 +73,7 @@ SHL1STDLIBS=\
.IF "$(COM)"=="MSC"
.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
-.IF "$(USE_STLP_DEBUG)" != ""
- SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.ENDIF # "$(COM)"=="MSC"
@@ -105,11 +97,7 @@ SHL2STDLIBS=\
.IF "$(COM)"=="MSC"
.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
-.IF "$(USE_STLP_DEBUG)" != ""
- SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.ENDIF # "$(COM)"=="MSC"
Modified: openoffice/branches/rejuvenate01/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/external_deps.lst?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/external_deps.lst (original)
+++ openoffice/branches/rejuvenate01/main/external_deps.lst Fri Jul 19 15:59:04 2013
@@ -126,9 +126,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61
- name = serf-1.2.0.tar.bz2
- URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2
+ SHA1 = f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
+ name = serf-1.2.1.tar.bz2
+ URL1 = http://serf.googlecode.com/files/serf-1.2.1.tar.bz2
URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
@@ -217,9 +217,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
- MD5 = 62704ea0f125923208d84ff0568f7d50
- name = Python-2.7.4.tar.bz2
- URL1 = http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tar.bz2
+ MD5 = 6334b666b7ff2038c761d7b27ba699c1
+ name = Python-2.7.5.tar.bz2
+ URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
Modified: openoffice/branches/rejuvenate01/main/filter/source/msfilter/escherex.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/filter/source/msfilter/escherex.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/filter/source/msfilter/escherex.cxx (original)
+++ openoffice/branches/rejuvenate01/main/filter/source/msfilter/escherex.cxx Fri Jul 19 15:59:04 2013
@@ -2707,8 +2707,10 @@ void EscherPropertyContainer::CreateCust
const rtl::OUString sHandles ( RTL_CONSTASCII_USTRINGPARAM( "Handles" ) );
const rtl::OUString sAdjustmentValues ( RTL_CONSTASCII_USTRINGPARAM( "AdjustmentValues" ) );
- const beans::PropertyValue* pAdjustmentValuesProp = NULL;
- const beans::PropertyValue* pPathCoordinatesProp = NULL;
+ bool bHasAdjustmentValuesProp = false;
+ uno::Any aAdjustmentValuesProp;
+ bool bHasPathCoordinatesProp = false;
+ uno::Any aPathCoordinatesProp;
sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
uno::Sequence< beans::PropertyValues > aHandlesPropSeq;
sal_Bool bPredefinedHandlesUsed = sal_True;
@@ -3157,7 +3159,10 @@ void EscherPropertyContainer::CreateCust
else if ( rrProp.Name.equals( sPathCoordinates ) )
{
if ( !bIsDefaultObject )
- pPathCoordinatesProp = &rrProp;
+ {
+ aPathCoordinatesProp = rrProp.Value;
+ bHasPathCoordinatesProp = true;
+ }
}
else if ( rrProp.Name.equals( sPathGluePoints ) )
{
@@ -3785,13 +3790,14 @@ void EscherPropertyContainer::CreateCust
{
// it is required, that the information which handle is polar has already be read,
// so we are able to change the polar value to a fixed float
- pAdjustmentValuesProp = &rProp;
+ aAdjustmentValuesProp = rProp.Value;
+ bHasAdjustmentValuesProp = true;
}
}
- if ( pAdjustmentValuesProp )
+ if ( bHasAdjustmentValuesProp )
{
uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
- if ( pAdjustmentValuesProp->Value >>= aAdjustmentSeq )
+ if ( aAdjustmentValuesProp >>= aAdjustmentSeq )
{
if ( bPredefinedHandlesUsed )
LookForPolarHandles( eShapeType, nAdjustmentsWhichNeedsToBeConverted );
@@ -3802,10 +3808,10 @@ void EscherPropertyContainer::CreateCust
AddOpt( (sal_uInt16)( DFF_Prop_adjustValue + k ), (sal_uInt32)nValue );
}
}
- if( pPathCoordinatesProp )
+ if( bHasPathCoordinatesProp )
{
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates;
- if ( pPathCoordinatesProp->Value >>= aCoordinates )
+ if ( aPathCoordinatesProp >>= aCoordinates )
{
// creating the vertices
if ( (sal_uInt16)aCoordinates.getLength() )
Modified: openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx Fri Jul 19 15:59:04 2013
@@ -767,6 +767,9 @@ void VistaFilePickerImpl::impl_sta_setFi
aLock.clear();
// <- SYNCHRONIZED
+ if (lFilters.empty())
+ return;
+
COMDLG_FILTERSPEC *pFilt = &lFilters[0];
iDialog->SetFileTypes(lFilters.size(), pFilt/*&lFilters[0]*/);
iDialog->SetFileTypeIndex(nCurrentFilter + 1);
Modified: openoffice/branches/rejuvenate01/main/framework/source/uielement/popuptoolbarcontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/framework/source/uielement/popuptoolbarcontroller.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/framework/source/uielement/popuptoolbarcontroller.cxx (original)
+++ openoffice/branches/rejuvenate01/main/framework/source/uielement/popuptoolbarcontroller.cxx Fri Jul 19 15:59:04 2013
@@ -305,8 +305,8 @@ NewToolbarController::execute( sal_Int16
{
// TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu
MenuConfiguration::Attributes* pMenuAttributes( 0 );
- VCLXPopupMenu* pTkPopupMenu = dynamic_cast< VCLXPopupMenu * >(
- VCLXMenu::GetImplementation( m_xPopupMenu ) );
+ VCLXPopupMenu* pTkPopupMenu =
+ ( VCLXPopupMenu * ) VCLXMenu::GetImplementation( m_xPopupMenu );
vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
PopupMenu* pVCLPopupMenu = dynamic_cast< PopupMenu * >( pTkPopupMenu->GetMenu() );
Modified: openoffice/branches/rejuvenate01/main/helpcontent2/source/text/sbasic/shared/03090301.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/helpcontent2/source/text/sbasic/shared/03090301.xhp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/helpcontent2/source/text/sbasic/shared/03090301.xhp (original)
+++ openoffice/branches/rejuvenate01/main/helpcontent2/source/text/sbasic/shared/03090301.xhp Fri Jul 19 15:59:04 2013
@@ -63,8 +63,8 @@
<paragraph role="paragraph" id="par_id3154097" xml-lang="en-US" l10n="U" oldref="22">dim iInputa as Single</paragraph>
<paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="23">dim iInputb as Single</paragraph>
<paragraph role="paragraph" id="par_id3153416" xml-lang="en-US" l10n="U" oldref="24">dim iInputc as Single</paragraph>
-<paragraph role="paragraph" id="par_id3146970" xml-lang="en-US" l10n="U" oldref="25">iInputa = Int(InputBox$ "Enter the first number: ","NumberInput"))</paragraph>
-<paragraph role="paragraph" id="par_id3150329" xml-lang="en-US" l10n="U" oldref="26">iInputb = Int(InputBox$ "Enter the second number: ","NumberInput"))</paragraph>
+<paragraph role="paragraph" id="par_id3146970" xml-lang="en-US" l10n="U" oldref="25">iInputa = Int(InputBox$ ("Enter the first number: ","NumberInput"))</paragraph>
+<paragraph role="paragraph" id="par_id3150329" xml-lang="en-US" l10n="U" oldref="26">iInputb = Int(InputBox$ ("Enter the second number: ","NumberInput"))</paragraph>
<paragraph role="paragraph" id="par_id3156277" xml-lang="en-US" l10n="U" oldref="27">iInputc=iInputa</paragraph>
<paragraph role="paragraph" id="par_id3150321" xml-lang="en-US" l10n="U" oldref="28">GoSub SquareRoot</paragraph>
<paragraph role="paragraph" id="par_id3154756" xml-lang="en-US" l10n="U" oldref="29">Print "The square root of";iInputa;" is";iInputc</paragraph>
Modified: openoffice/branches/rejuvenate01/main/helpcontent2/source/text/scalc/01/03080000.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/helpcontent2/source/text/scalc/01/03080000.xhp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/helpcontent2/source/text/scalc/01/03080000.xhp (original)
+++ openoffice/branches/rejuvenate01/main/helpcontent2/source/text/scalc/01/03080000.xhp Fri Jul 19 15:59:04 2013
@@ -25,7 +25,7 @@
<meta>
<topic id="textscalc0103080000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Value Highlighting</title>
-<filename>file:///cws/so-cwsserv01/hcshared27/DEV300/ooo/helpcontent2/source/text/scalc/01/03080000.xhp</filename>
+<filename>/text/scalc/01/03080000.xhp</filename>
</topic>
</meta>
<body>
Modified: openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/01100200.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/01100200.xhp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/01100200.xhp (original)
+++ openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/01100200.xhp Fri Jul 19 15:59:04 2013
@@ -81,7 +81,7 @@
<paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="34"><ahelp hid="SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA">Saves the user's full name with the file. You can edit the name by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_DOCINFODOC:BTN_DELETE" id="bm_id3148686" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
- oldref="35">Delete</paragraph>
+ oldref="35">Reset</paragraph>
<paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="36"><ahelp hid="SFX2:PUSHBUTTON:TP_DOCINFODOC:BTN_DELETE">Resets the editing time to zero, the creation date to the current date and time, and the version number to 1. The modification and printing dates are also deleted.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3149576" role="heading" level="2" l10n="U" oldref="5">Template:</paragraph>
<paragraph xml-lang="en-US" id="par_id3147530" role="paragraph" l10n="U" oldref="6">Displays the template that was used to create the file.</paragraph>
Modified: openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/extensionupdate.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/extensionupdate.xhp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/extensionupdate.xhp (original)
+++ openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/extensionupdate.xhp Fri Jul 19 15:59:04 2013
@@ -25,7 +25,7 @@
<meta>
<topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Extension Update</title>
-<filename>shared/01/extensionupdate.xhp</filename>
+<filename>/text/shared/01/extensionupdate.xhp</filename>
</topic>
</meta>
<body>
@@ -65,4 +65,4 @@
<paragraph id="par_id7634510" role="paragraph" xml-lang="en-US"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
</section>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
Modified: openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/packagemanager.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/packagemanager.xhp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/packagemanager.xhp (original)
+++ openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/packagemanager.xhp Fri Jul 19 15:59:04 2013
@@ -25,7 +25,7 @@
<meta>
<topic id="textshared01packagemanagerxml" indexer="include">
<title xml-lang="en-US" id="tit">Extension Manager</title>
-<filename>shared/01/packagemanager.xhp</filename>
+<filename>/text/shared/01/packagemanager.xhp</filename>
</topic>
</meta>
<body>
@@ -125,4 +125,4 @@
<paragraph id="par_id1439558" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select an installed extension, then click to open the Options dialog for the extension.</ahelp></paragraph>
<paragraph id="par_id0103201110331832" role="paragraph" xml-lang="en-US">Some additional commands can appear in the context menu of an extension in the Extension Manager window, depending on the selected extension. You can choose to show the license text again. You can choose to exclude the extension from checking for updates or to include an excluded extension.</paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
Modified: openoffice/branches/rejuvenate01/main/hsqldb/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/hsqldb/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/hsqldb/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/hsqldb/makefile.mk Fri Jul 19 15:59:04 2013
@@ -49,10 +49,7 @@ CONVERTFILES=build$/build.xml \
src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \
src$/org$/hsqldb$/Library.java
-PATCH_FILES=patches$/i96823.patch \
- patches$/i97032.patch \
- patches$/i103528.patch \
- patches$/i104901.patch
+PATCH_FILES=patches$/i121754.patch
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
Modified: openoffice/branches/rejuvenate01/main/i18npool/source/localedata/data/pt_PT.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/i18npool/source/localedata/data/pt_PT.xml?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/i18npool/source/localedata/data/pt_PT.xml (original)
+++ openoffice/branches/rejuvenate01/main/i18npool/source/localedata/data/pt_PT.xml Fri Jul 19 15:59:04 2013
@@ -176,7 +176,7 @@
<DefaultName></DefaultName>
</FormatElement>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
-<FormatCode>Estandar</FormatCode>
+<FormatCode>Padrão</FormatCode>
<DefaultName></DefaultName>
</FormatElement>
<FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
Modified: openoffice/branches/rejuvenate01/main/i18npool/source/search/textsearch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/i18npool/source/search/textsearch.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/i18npool/source/search/textsearch.cxx (original)
+++ openoffice/branches/rejuvenate01/main/i18npool/source/search/textsearch.cxx Fri Jul 19 15:59:04 2013
@@ -64,7 +64,8 @@ static sal_Int32 COMPLEX_TRANS_MASK_TMP
TransliterationModules_ignoreKiKuFollowedBySa_ja_JP |
TransliterationModules_ignoreProlongedSoundMark_ja_JP;
static const sal_Int32 COMPLEX_TRANS_MASK = COMPLEX_TRANS_MASK_TMP | TransliterationModules_IGNORE_KANA | TransliterationModules_FULLWIDTH_HALFWIDTH;
-static const sal_Int32 SIMPLE_TRANS_MASK = ~(COMPLEX_TRANS_MASK | TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE | TransliterationModules_LOWERCASE_UPPERCASE);
+static const sal_Int32 SIMPLE_TRANS_MASK = ~COMPLEX_TRANS_MASK;
+static const sal_Int32 REGEX_TRANS_MASK = ~(COMPLEX_TRANS_MASK | TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE | TransliterationModules_LOWERCASE_UPPERCASE);
// Above 2 transliteration is simple but need to take effect in
// complex transliteration
@@ -705,7 +706,7 @@ void TextSearch::RESrchPrepare( const ::
{
// select the transliterated pattern string
const OUString& rPatternStr =
- (rOptions.transliterateFlags & SIMPLE_TRANS_MASK) ? sSrchStr
+ (rOptions.transliterateFlags & REGEX_TRANS_MASK) ? sSrchStr
: ((rOptions.transliterateFlags & COMPLEX_TRANS_MASK) ? sSrchStr2 : rOptions.searchString);
sal_uInt32 nIcuSearchFlags = UREGEX_UWORD; // request UAX#29 unicode capability
Modified: openoffice/branches/rejuvenate01/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.