[Libreoffice-commits] .: 28 commits - desktop/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Nov 12 06:53:51 PST 2010
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 54 ++++++++------
desktop/source/deployment/registry/package/dp_package.cxx | 18 ++--
2 files changed, 43 insertions(+), 29 deletions(-)
New commits:
commit 34ce99544ff46d52e66f00c5689a7122f13f4eea
Merge: a0ac50b... c2aeb30...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Nov 12 15:51:52 2010 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/libs-core
commit a0ac50b19f4184c11464f882ce7e3686c4bf69cc
Merge: b2321ce... 9724fef...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Nov 12 14:35:03 2010 +0100
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
avmedia/source/gstreamer/gstplayer.cxx
desktop/source/deployment/gui/dp_gui_extlistbox.cxx
sfx2/source/appl/appserv.cxx
diff --cc desktop/source/deployment/registry/package/dp_package.cxx
index 614812f,603f524..f31cf3f
mode 100644,100755..100755
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
commit 9724fefd3e4fbc392e6759e8907c1628b2b9e114
Merge: 9b3fedc... 2773f98...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 11 18:10:12 2010 +0100
Merge commit 'ooo/OOO330_m14' into libreoffice-3-3
diff --cc desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 7612606,f689783..0551113
mode 100644,100755..100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
diff --cc desktop/source/deployment/registry/package/dp_package.cxx
index 91873b4,6928e6b..603f524
mode 100644,100755..100755
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
commit 9b3fedce84fe20704c238e070ba64d60ad87b945
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Nov 11 13:25:03 2010 +0100
Version 3.2.99.3, tag LIBREOFFICE_3_2_99_3 (3.3-beta3)
commit a2f34f3ea54fdf2f7f3b62d627c4ec50648564f9
Author: Noel Power <noel.power at novell.com>
Date: Wed Nov 10 13:02:16 2010 +0000
fix testtool not boostrapping libreoffice instance
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 55b3369..aedfa4e 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -179,7 +179,7 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
BOOL Process::Start()
{ // Start program
BOOL bSuccess=FALSE;
- if ( m_pProcess && !ImplIsRunning() )
+ if ( m_aProcessName.getLength() && !ImplIsRunning() )
{
bWasGPF = FALSE;
#ifdef WNT
commit 46caf63224a8d3fa79383d1209503376b0918da8
Author: Muthu Subramanian K <sumuthu at novell.com>
Date: Wed Nov 10 13:41:59 2010 +0100
i#112411: Fixed Gnome filepicker filter selection
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index fff90f7..a417f81 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -909,6 +909,9 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
{
static const OUString aStarDot = OUString::createFromAscii( "*." );
+ ::rtl::OUString aNewFilter;
+ ::rtl::OUString aOldFilter = getCurrentFilter();
+ sal_Bool bChangeFilter = sal_True;
for ( FilterList::iterator aListIter = m_pFilterList->begin();
aListIter != m_pFilterList->end();
++aListIter
@@ -916,11 +919,17 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
{
if( aListIter->getFilter().indexOf( aStarDot+sExtension ) >= 0 )
{
- setCurrentFilter( aListIter->getTitle() );
+ if( !aNewFilter.getLength() )
+ aNewFilter = aListIter->getTitle();
+
+ if( aOldFilter == aListIter->getTitle() )
+ bChangeFilter = sal_False;
+
bExtensionTypedIn = true;
- break;
}
}
+ if( bChangeFilter && bExtensionTypedIn )
+ setCurrentFilter( aNewFilter );
}
}
commit b405519824364b87584584cd047fd0f631821714
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Mon Nov 8 09:54:24 2010 -0500
Fixed a typo: SIMBOLS -> SYMBOLS.
diff --git a/svx/inc/gallery.hxx b/svx/inc/gallery.hxx
index 3656147..27fd7ee 100644
--- a/svx/inc/gallery.hxx
+++ b/svx/inc/gallery.hxx
@@ -175,7 +175,7 @@
#define GALLERY_THEME_MAPS_MIDDLE_AGES 120
#define GALLERY_THEME_MAPS_MEXICO 121
#define GALLERY_THEME_MAPS_ANCIENT_TIMES 122
-#define GALLERY_THEME_MAPS_SIMBOLS 123
+#define GALLERY_THEME_MAPS_SYMBOLS 123
#define GALLERY_THEME_MAPS_HISTORY_1900 124
#define GALLERY_THEME_MAPS_WORLD 125
#define GALLERY_THEME_CROPS 126
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 820dec0..adf0837 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -156,7 +156,7 @@
#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_AGES (RID_GALLERYSTR_THEME_START + 120)
#define RID_GALLERYSTR_THEME_MAPS_MEXICO (RID_GALLERYSTR_THEME_START + 121)
#define RID_GALLERYSTR_THEME_MAPS_ANCIENT_TIMES (RID_GALLERYSTR_THEME_START + 122)
-#define RID_GALLERYSTR_THEME_MAPS_SIMBOLS (RID_GALLERYSTR_THEME_START + 123)
+#define RID_GALLERYSTR_THEME_MAPS_SYMBOLS (RID_GALLERYSTR_THEME_START + 123)
#define RID_GALLERYSTR_THEME_MAPS_HISTORY_1900 (RID_GALLERYSTR_THEME_START + 124)
#define RID_GALLERYSTR_THEME_MAPS_WORLD (RID_GALLERYSTR_THEME_START + 125)
#define RID_GALLERYSTR_THEME_CROPS (RID_GALLERYSTR_THEME_START + 126)
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 381255b..99de47a 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -890,9 +890,9 @@ Text [ en-US ] = "Maps - Ancient times";
// ---------------------------------------------------------------------------
-String RID_GALLERYSTR_THEME_MAPS_SIMBOLS
+String RID_GALLERYSTR_THEME_MAPS_SYMBOLS
{
-Text [ en-US ] = "Maps - simbols";
+Text [ en-US ] = "Maps - symbols";
};
// ---------------------------------------------------------------------------
commit 6a22ca2888a3e9f2dc82a2203cf6279498f39f24
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Nov 8 16:17:47 2010 +0100
Restart soffice.bin when necessary.
In some cases, like when the migration is in progress, or when new extensions
are registered, soffice.bin dies with a 'restart' me status. This implements
the correct handling of this state in oosplash.bin.
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 00c2b5c..0aee9c6 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -84,11 +84,10 @@ done
if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] && [ "$no_oosplash" != "y" ] ; then
sd_binary="oosplash.bin"
- export QSTART_CHECK_ONLY=1
- if "$sd_prog/$sd_binary" -qsend-and-report $*; then
+ # try to connect to a running instance early
+ if "$sd_prog/$sd_binary" -qsend-and-report "$@" ; then
exit 0
fi
- unset QSTART_CHECK_ONLY
fi
# pagein
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e3ce412..b8d9aa7 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1465,7 +1465,11 @@ USHORT Desktop::Exception(USHORT nError)
OfficeIPCThread::DisableOfficeIPCThread();
if( pSignalHandler )
osl_removeSignalHandler( pSignalHandler );
+
restartOnMac(false);
+ if ( m_rSplashScreen.is() )
+ m_rSplashScreen->reset();
+
_exit( ExitHelper::E_CRASH_WITH_RESTART );
}
else
@@ -1972,6 +1976,9 @@ void Desktop::Main()
if ( bRestartRequested )
{
restartOnMac(true);
+ if ( m_rSplashScreen.is() )
+ m_rSplashScreen->reset();
+
// wouldn't the solution be more clean if SalMain returns the exit code to the system?
_exit( ExitHelper::E_NORMAL_RESTART );
}
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index f51adeb..dc28614 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -60,6 +60,8 @@
#define PIPEDEFAULTPATH "/tmp"
#define PIPEALTERNATEPATH "/var/tmp"
+typedef enum { ProgressContinue, ProgressRestart, ProgressExit } ProgressStatus;
+
/* Easier conversions: rtl_uString to rtl_String */
static rtl_String *
ustr_to_str( rtl_uString *pStr )
@@ -531,7 +533,7 @@ load_splash_defaults( rtl_uString *pAppPath, sal_Bool *pInhibitSplash )
#define BUFFER_LEN 255
/* Read the percent to show in splash. */
-static sal_Bool
+static ProgressStatus
read_percent( int status_fd, int *pPercent )
{
static char pBuffer[BUFFER_LEN + 1];
@@ -570,16 +572,19 @@ read_percent( int status_fd, int *pPercent )
fprintf( stderr, "Got status: %s\n", pBegin );
#endif
if ( !strncasecmp( pBegin, "end", 3 ) )
- return sal_False;
+ return ProgressExit;
+ else if ( !strncasecmp( pBegin, "restart", 7 ) )
+ return ProgressRestart;
else if ( sscanf( pBegin, "%d%%", pPercent ) )
- return sal_True;
+ return ProgressContinue;
- return sal_False;
+ /* unexpected - let's exit the splash to be safe */
+ return ProgressExit;
}
/* Periodically update the splash & the percent acconding to what
status_fd says */
-static void
+static ProgressStatus
show_splash( int status_fd )
{
int nRetval;
@@ -587,6 +592,7 @@ show_splash( int status_fd )
int nPercent = 0;
sal_Bool bFinish = sal_False;
+ ProgressStatus eResult;
/* we want to watch status_fd */
aPfd.fd = status_fd;
@@ -605,10 +611,19 @@ show_splash( int status_fd )
if ( aPfd.revents & ( POLLERR | POLLHUP | POLLNVAL ) )
bFinish = sal_True;
else if ( nRetval > 0 )
- bFinish = !read_percent( status_fd, &nPercent );
+ {
+ eResult = read_percent( status_fd, &nPercent );
+ bFinish = ( eResult != ProgressContinue );
+ }
else if ( nRetval < 0 )
bFinish = sal_True;
} while ( !bFinish );
+
+#if OSL_DEBUG_LEVEL > 0
+ fprintf( stderr, "Finishing, result is %s\n",
+ ( eResult == ProgressContinue )? "continue" : ( ( eResult == ProgressRestart )? "restart" : "exit" ) );
+#endif
+ return eResult;
}
/* Simple system check. */
@@ -779,6 +794,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
sal_Bool bSentArgs = sal_False;
rtl_uString *pAppPath = NULL;
rtl_uString *pPipePath = NULL;
+ ProgressStatus eResult = ProgressExit;
/* turn SIGPIPE into an error */
signal( SIGPIPE, SIG_IGN );
@@ -793,7 +809,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
}
ustr_debug( "App path", pAppPath );
- bSendAndReport = argc > 1 && !strcmp (argv[1], "-qsend-and-report");
+ bSendAndReport = argc > 1 && !strcmp (argv[1], QSEND_AND_REPORT);
pPipePath = get_pipe_path( pAppPath );
@@ -809,26 +825,28 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
ustr_debug( "Failed to connect to pipe", pPipePath );
#endif
- if (bSendAndReport)
- return !bSentArgs;
-
- if ( !bSentArgs )
+ if ( !bSendAndReport && !bSentArgs )
{
- if ( !fork_app( pAppPath, &status_fd ) )
- return 1;
+ /* we have to exec the binary */
+ do {
+ if ( !fork_app( pAppPath, &status_fd ) )
+ return 1;
- if ( !bInhibitSplash )
- {
- load_splash_image( pAppPath );
- load_splash_defaults( pAppPath, &bInhibitSplash );
- }
+ if ( !bInhibitSplash )
+ {
+ load_splash_image( pAppPath );
+ load_splash_defaults( pAppPath, &bInhibitSplash );
+ }
- if ( !bInhibitSplash && splash_create_window( argc, argv ) )
- {
- splash_draw_progress( 0 );
- show_splash( status_fd );
- splash_close_window();
- }
+ if ( !bInhibitSplash && splash_create_window( argc, argv ) )
+ {
+ splash_draw_progress( 0 );
+ eResult = show_splash( status_fd );
+ splash_close_window();
+ }
+
+ close( status_fd );
+ } while ( eResult == ProgressRestart );
}
/* cleanup */
@@ -836,9 +854,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
rtl_uString_release( pPipePath );
close( fd );
- close( status_fd );
- return 0;
+ return bSendAndReport? !bSentArgs : 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index 7db15a8..6c15014 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -84,7 +84,12 @@ void SAL_CALL UnxSplashScreen::end()
void SAL_CALL UnxSplashScreen::reset()
throw ( RuntimeException )
{
- // TODO?
+#if OSL_DEBUG_LEVEL > 1
+ fprintf( stderr, "UnxSplashScreen::reset()\n" );
+#endif
+
+ fprintf( m_pOutFd, "restart\n" );
+ fflush( m_pOutFd );
}
void SAL_CALL UnxSplashScreen::setText( const OUString& /*aText*/ )
commit 800366e804ad6b78fcd6a2fb5d23f16d7f5330f6
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Nov 8 16:11:53 2010 +0100
more space for copyright text in the about dialog
It added the scroll bar on SLED10 and looked ugly.
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index 7e033db..ad9f89e 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -65,7 +65,7 @@ String RID_BUILDVERSION
ModalDialog RID_DEFAULTABOUT
{
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 245 , 260 ) ;
+ Size = MAP_APPFONT ( 245 , 280 ) ;
Moveable = TRUE ;
SVLook = TRUE ;
TEXT_DEFAULTABOUT
@@ -88,7 +88,7 @@ ModalDialog RID_DEFAULTABOUT
{
Border = FALSE ;
Pos = MAP_APPFONT ( 54 , 25 ) ;
- Size = MAP_APPFONT ( 168 , 51 ) ;
+ Size = MAP_APPFONT ( 168 , 71 ) ;
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
AutoVScroll = TRUE ;
@@ -98,7 +98,7 @@ ModalDialog RID_DEFAULTABOUT
NoLabel = TRUE;
TabStop = TRUE;
Text [ en-US ] = "Contributor credits";
- Pos = MAP_APPFONT ( 54 , 80 ) ;
+ Pos = MAP_APPFONT ( 54 , 100 ) ;
Size = MAP_APPFONT ( 168 , 10 ) ;
};
String ABOUT_STR_VERSION
commit 20a850ec9bb51dd708d51b2cdbef90ae49246947
Author: John LeMoyne Castle <jlc at mail2lee.com>
Date: Wed Nov 3 22:08:26 2010 -0600
OO Basic Million-to-One bug (#i76852#) fixed
Adds '=' to edge test in sbxscan.cxx ImpCvtNum so exponent prints and 1 million is 1e+6 instead of just 1 for singles.
Same one char change does similar fix for OO Basic doubles and 1e+14.
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 43d2ddf..aeff9a4 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -405,7 +405,7 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreStrin
*p++ = '-';
}
double dMaxNumWithoutExp = (nPrec == 6) ? 1E6 : 1E14;
- myftoa( nNum, p, nPrec,( nNum &&( nNum < 1E-1 || nNum > dMaxNumWithoutExp ) ) ? 4:0,
+ myftoa( nNum, p, nPrec,( nNum &&( nNum < 1E-1 || nNum >= dMaxNumWithoutExp ) ) ? 4:0,
FALSE, TRUE, cDecimalSep );
// Trailing Zeroes weg:
for( p = cBuf; *p &&( *p != 'E' ); p++ ) {}
commit 12631e574aa2dd56f886317cdc4abe47111db17b
Author: Robert Nagy <robert at openbsd.org>
Date: Sat Nov 6 18:25:37 2010 +0100
add platform definitions for openbsd
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index bee6d9a..0e67097 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -68,6 +68,8 @@
#define PLATFORM_MACOSX_X86 "macosx_x86"
#define PLATFORM_MACOSX_PPC "macosx_powerpc"
#define PLATFORM_OS2_X86 "os2_x86"
+#define PLATFORM_OPENBSD_X86 "openbsd_x86"
+#define PLATFORM_OPENBSD_X86_64 "openbsd_x86_64"
#define PLATFORM_AIX_POWERPC "aix_powerpc"
@@ -187,6 +189,10 @@ namespace
ret = checkOSandCPU(OUSTR("OS2"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_AIX_POWERPC)))
ret = checkOSandCPU(OUSTR("AIX"), OUSTR("PowerPC"));
+ else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86)))
+ ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("x86"));
+ else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86_64)))
+ ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("X86_64"));
else
{
OSL_ENSURE(0, "Extension Manager: The extension supports an unknown platform. "
commit 1d140604fe7d4c80f32b65f2e6dda314f45c5546
Author: Robert Nagy <robert at openbsd.org>
Date: Thu Nov 4 12:24:29 2010 +0100
no -ldl on OpenBSD
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index 67fcc70..c4f3d9c 100644
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -68,7 +68,7 @@ APP1TARGET = gnome-open-url.bin
APP1OBJS = \
$(OBJ)$/gnome-open-url.obj
APP1LIBS =
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD"
APP1STDLIBS=-ldl
.ENDIF
commit 2773f980e6c90d23a9c73b13e8dcba3dc3327559
Merge: b6ca2bf... 8a8ad9d...
Author: Kurt Zenker <kz at openoffice.org>
Date: Sat Nov 6 16:46:04 2010 +0100
CWS-TOOLING: integrate CWS tl88
commit b97e3edc82714529b1259786f8caff7af3c6e1f7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Nov 6 16:26:16 2010 +0200
Fix breakage in dbgutil-enabled build
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index 33114c8..b43aece 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -37,7 +37,7 @@
//------------------------------------------------------------------------------
::osl::Mutex Tracer::s_aMapSafety;
-::std::map< ::oslThreadIdentifier, INT32, ::std::less< ::osl::ThreadIdentifier > >
+::std::map< ::oslThreadIdentifier, INT32, ::std::less< oslThreadIdentifier > >
Tracer::s_aThreadIndents;
//------------------------------------------------------------------------------
commit 2153a4301df9cc6f42942490f62993e901554404
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Nov 6 15:08:35 2010 +0200
Fix typo that breaks a debug build
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 0513f2a..53268cb 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -1028,7 +1028,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
oslProcess aApp;
#if OSL_DEBUG_LEVEL > 0
- oslProcesError eError =
+ oslProcessError eError =
#endif
osl_executeProcess(sCommandFile.pData, NULL, 0,
osl_Process_HIDDEN | osl_Process_WAIT,
@@ -1071,7 +1071,7 @@ void ODriver::PutParam(const ::rtl::OUString& sDBName,
#if OSL_DEBUG_LEVEL > 0
- oslProcesError eError =
+ oslProcessError eError =
#endif
osl_executeProcess(sCommand.pData, pArgs, nArgsCount,
OPROCESS_ADABAS,
@@ -1249,7 +1249,7 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam,
#if OSL_DEBUG_LEVEL > 0
- oslProcesError eError =
+ oslProcessError eError =
#endif
osl_executeProcess(sCommandFile.pData, NULL, 0,
osl_Process_HIDDEN | osl_Process_WAIT,
@@ -1311,7 +1311,7 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName,
#if OSL_DEBUG_LEVEL > 0
- oslProcesError eError =
+ oslProcessError eError =
#endif
osl_executeProcess(sCommandFile.pData, NULL, 0,
osl_Process_HIDDEN | osl_Process_WAIT,
commit 900bbe83a024665f0f2862616c1bf21065d2829f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 5 15:25:06 2010 +0000
rhbz#649824# this key name is wrong
(cherry picked from commit fa42616b7c5e03ff9967afd826a2da5e95e855c9)
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 506c5c2..9ec3dd3 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -765,7 +765,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_REMOVE_PERSONAL_INFO,
"/apps/openoffice/lockdown/remove_personal_info_on_save",
- "Scripting/RemovePersonalInfoOnSaving",
+ "RemovePersonalInfoOnSaving",
sal_False,
SETTINGS_LAST
},
commit b6ca2bf057b394e06620ea4d1b54b2b154b5d2e5
Merge: 49dc64e... 33f4cc0...
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Nov 5 16:40:54 2010 +0100
CWS-TOOLING: integrate CWS jsc331
commit b8ff3cec54df8358e6ee7ff77c8bfc260ca5c938
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Nov 5 16:14:29 2010 +0100
Have Info.plist use LibO instead of OOo2 as creator
This fixed fdo#30569. There were several places where mac-specific
platform files had 'OOo2' hardcoded. Changed this to LibO.
(cherry picked from commit 5e0f68b58ba958dedf2ead621c9632b806155ee1)
diff --git a/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h
index d986c91..30db99b 100644
--- a/fpicker/source/aqua/SalAquaConstants.h
+++ b/fpicker/source/aqua/SalAquaConstants.h
@@ -29,7 +29,7 @@
#ifndef _SALAQUACONSTANTS_H_
#define _SALAQUACONSTANTS_H_
-#define kAppFourCharCode 'OOo2'
+#define kAppFourCharCode 'LibO'
#define kControlPropertyTracking 'Trck'
#define kControlPropertyLastPartCode 'LsPc'
#define kControlPropertySubType 'SuTy'
diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index 6a3b27f..8100df2 100644
--- a/sysui/desktop/macosx/Info.plist
+++ b/sysui/desktop/macosx/Info.plist
@@ -1398,7 +1398,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
- <string>OOo2</string>
+ <string>LibO</string>
<key>LSRequiresCarbon</key>
<string>1</string>
<key>NSPrincipalClass</key>
diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk
index 059b3b8..9d55160 100644
--- a/sysui/desktop/macosx/makefile.mk
+++ b/sysui/desktop/macosx/makefile.mk
@@ -46,13 +46,8 @@ ZIP1TARGET = osxicons
ZIP1DIR = ../icons
ZIP1LIST := $(shell $(PERL) -w list_icons.pl < Info.plist)
-.IF "$(GUIBASE)"!="aqua"
-CREATOR_TYPE=OOo2
-EXECUTABLE=droplet
-.ELSE
-CREATOR_TYPE=OOO2
+CREATOR_TYPE=LIBO
EXECUTABLE=soffice
-.ENDIF
.IF "$(WITH_LANG)"!=""
ULFDIR:=$(COMMONMISC)$/desktopshare
commit 00d6d03478bc8ddb3ebd07ff47f54c9668c242d9
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Nov 5 14:30:55 2010 +0100
Adds extra credits item to help menu
As agreed on yesterday, we want a dedicated credits document
displayed from the help menu. This is the UI/code change for that,
actual credits doc still missing.
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index b7bcbd5..fac0b3c 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -76,6 +76,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Credits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index e154a5e..15dd7d2 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4145,6 +4145,11 @@
<value xml:lang="en-US">License Information...</value>
</prop>
</node>
+ <node oor:name=".uno:Credits" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">%PRODUCTNAME Credits...</value>
+ </prop>
+ </node>
<node oor:name=".uno:StatusBarVisible" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Status ~Bar</value>
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index ae27983..161237b 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -126,6 +126,7 @@
#define SID_HELP_HELPFILEBOX (SID_SFX_START + 419)
#define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420)
#define SID_SHOW_LICENSE (SID_SFX_START + 1683)
+#define SID_SHOW_CREDITS (SID_SFX_START + 1684)
#define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
// default-ids for document
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 6b736da..026f8bb 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -171,6 +171,10 @@ interface Application
[
ExecMethod = MiscExec_Impl ;
]
+ SID_SHOW_CREDITS
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
SID_RECENTFILELIST
[
]
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 2569249..7e9b5cc 100755
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -7391,6 +7391,31 @@ SfxVoidItem ShowLicense SID_SHOW_LICENSE
]
//--------------------------------------------------------------------------
+SfxVoidItem ShowCredits SID_SHOW_CREDITS
+()
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_APPLICATION;
+]
+
+//--------------------------------------------------------------------------
SfxVoidItem HelpTutorials SID_HELP_TUTORIALS
()
[
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 5cca2d5..3f1b44e 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -356,6 +356,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
break;
}
+ case SID_SHOW_CREDITS:
case SID_SHOW_LICENSE:
{
try {
@@ -365,11 +366,29 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
args[0].Value <<= sal_True;
args[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
args[1].Value <<= sal_True;
-
+
rtl::OUString aURL;
- if ( checkURL ( "LICENSE.odt", aURL ) ||
- checkURL ( "LICENSE.html", aURL ) ||
- checkURL ( "LICENSE", aURL ) ) {
+ char const** pNames;
+ if( rReq.GetSlot() == SID_SHOW_LICENSE )
+ {
+ static char const* pLicenseStrings[] =
+ {
+ "LICENSE.odt", "LICENSE.html", "LICENSE"
+ };
+ pNames = pLicenseStrings;
+ }
+ else
+ {
+ static char const* pCreditsStrings[] =
+ {
+ "CREDITS.odt", "CREDITS.html", "CREDITS"
+ };
+ pNames = pCreditsStrings;
+ }
+
+ if ( checkURL ( pNames[0], aURL ) ||
+ checkURL ( pNames[1], aURL ) ||
+ checkURL ( pNames[2], aURL ) ) {
xLoader->loadComponentFromURL( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args );
}
} catch (const ::com::sun::star::uno::Exception &) {
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 12312ed..23d5666 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1055,6 +1055,12 @@
HelpID = SID_SHOW_LICENSE ; \
Text [ en-US ] = "License information..." ; \
+#define ITEM_SHOW_CREDITS \
+ Identifier = SID_SHOW_CREDITS ; \
+ Command = ".uno:ShowCredits" ; \
+ HelpID = SID_SHOW_CREDITS ; \
+ Text [ en-US ] = "%PRODUCTNAME Credits..." ;
+
#define ITEM_HELP_ONLINE_REGISTRATION \
Identifier = SID_ONLINE_REGISTRATION ; \
Command = ".uno:OnlineRegistrationDlg" ; \
@@ -1114,6 +1120,10 @@
};\
MenuItem\
{\
+ ITEM_SHOW_CREDITS\
+ };\
+ MenuItem\
+ {\
ITEM_HELP_ABOUT\
About = TRUE ; \
};\
commit 5a2063c425aabd3090b839bd7fa8c64eec902cfd
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Nov 5 13:11:54 2010 +0100
Use org.libreoffice.script for Mac preferences
This fixes fdo#30568
(cherry picked from commit 3399d6d1d2b9803c4a0300e7a49ea352fe2cacef)
diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index cf04e80..6a3b27f 100644
--- a/sysui/desktop/macosx/Info.plist
+++ b/sysui/desktop/macosx/Info.plist
@@ -1390,7 +1390,7 @@
<key>CFBundleShortVersionString</key>
<string>${ABOUTBOXPRODUCTVERSION}</string>
<key>CFBundleIdentifier</key>
- <string>org.openoffice.script</string>
+ <string>org.libreoffice.script</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
commit 0c51c3e44f291bc50f0f56e0a038cfe53042bf30
Author: Dwayne Bailey <dwayne at translate.org.za>
Date: Wed Nov 3 14:03:16 2010 +0000
#i113803# Add label specification for Tower manufacturer
(cherry picked from commit f38ee905dec951b6ec03706bafb80d7d0cd0f000)
diff --git a/officecfg/registry/data/org/openoffice/Office/Labels.xcu b/officecfg/registry/data/org/openoffice/Office/Labels.xcu
index 3a006d2..1bf84cd 100644
--- a/officecfg/registry/data/org/openoffice/Office/Labels.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Labels.xcu
@@ -31,6 +31,346 @@
<node oor:name="Manufacturer">
+ <node oor:name="Tower" oor:op="replace">
+
+ <node oor:name="L0" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W100 Mailing Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;7000;3700;7000;3700;0;0;3;8</value>
+ </prop>
+ </node>
+ <node oor:name="L1" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W101 Mailing Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;10500;3700;10500;3700;0;0;2;8</value>
+ </prop>
+ </node>
+ <node oor:name="L2" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W102 Freight Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;10500;4720;10100;4600;200;420;2;6</value>
+ </prop>
+ </node>
+ <node oor:name="L3" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W103 Freight Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;10300;7000;10100;7000;300;420;2;4</value>
+ </prop>
+ </node>
+ <node oor:name="L4" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W104 Freight Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;10800;14400;9800;13900;200;420;2;2</value>
+ </prop>
+ </node>
+ <node oor:name="L5" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W105 Freight Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;19960;14500;19960;14500;500;400;1;2</value>
+ </prop>
+ </node>
+ <node oor:name="L6" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W106 Freight Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;21000;29600;21000;29600;0;0;1;1</value>
+ </prop>
+ </node>
+ <node oor:name="L7" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W107 Mailing Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;4060;2120;3810;2120;470;1160;5;13</value>
+ </prop>
+ </node>
+ <node oor:name="L8" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W108 Mailing Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;6600;3810;6350;3810;720;1590;3;7</value>
+ </prop>
+ </node>
+ <node oor:name="L9" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W110 Mailing Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;7000;3500;7000;3500;0;420;3;8</value>
+ </prop>
+ </node>
+ <node oor:name="L10" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W111 Mailing Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;10500;3500;10500;3500;0;420;2;8</value>
+ </prop>
+ </node>
+ <node oor:name="L11" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W115 Mailing Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;4050;2990;3850;2990;500;1450;5;9</value>
+ </prop>
+ </node>
+ <node oor:name="L12" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W116 (32mm dia) Round</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;3340;3520;3200;3200;500;1000;6;8</value>
+ </prop>
+ </node>
+ <node oor:name="L13" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W117 (50mm dia) Round</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;6450;5810;5000;5000;1500;800;3;5</value>
+ </prop>
+ </node>
+ <node oor:name="L14" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W118 (80mm dia) Round</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;9500;9500;8000;8000;1750;1450;2;3</value>
+ </prop>
+ </node>
+ <node oor:name="L15" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W221 Wrap-around Disk Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;10400;7000;7000;7000;1800;420;2;4</value>
+ </prop>
+ </node>
+ <node oor:name="L16" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W222 Video Spine Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;14500;1693;14500;1693;3260;1380;1;16</value>
+ </prop>
+ </node>
+ <node oor:name="L17" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W223 Video Face Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;7870;4660;7620;4660;2750;950;2;6</value>
+ </prop>
+ </node>
+ <node oor:name="L18" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W224 Audio Cassette</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;9150;4200;8900;4200;1470;2320;2;6</value>
+ </prop>
+ </node>
+ <node oor:name="L19" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W225 Slide Mount</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;5080;1270;4600;1110;560;1670;4;21</value>
+ </prop>
+ </node>
+ <node oor:name="L20" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W227 Diskette Face</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;9310;5200;7000;5200;2330;1920;2;5</value>
+ </prop>
+ </node>
+ <node oor:name="L21" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-P229 ID Photos</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;3800;4800;3500;4500;1100;3050;5;5</value>
+ </prop>
+ </node>
+ <node oor:name="L22" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-B440 Business Cards</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;10000;5500;8500;5500;1500;1000;2;5</value>
+ </prop>
+ </node>
+ <node oor:name="L23" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W330 Lever Arch</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;20000;6000;20000;6000;500;2960;1;4</value>
+ </prop>
+ </node>
+ <node oor:name="L24" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-P230 CD Business Card (78 x 59)</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;10275;6956;7800;5900;1465;1500;2;4</value>
+ </prop>
+ </node>
+ <node oor:name="L25" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W228 CD Label for CD Labeller</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;11700;12800;11700;11700;4650;2800;1;2</value>
+ </prop>
+ </node>
+ <node oor:name="L26" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W250 Full Face CD Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;11700;13700;11700;11700;4650;2200;1;2</value>
+ </prop>
+ </node>
+ <node oor:name="L27" oor:op="replace" oor:finalized="true">
+
+ <prop oor:name="Name">
+
+ <value xml:lang="x-no-translate">true</value>
+ <value xml:lang="en-US">CIL-W251 Mini CD Label</value>
+ </prop>
+ <prop oor:name="Measure">
+
+ <value>S;9800;9800;7800;7800;1700;1200;2;3</value>
+ </prop>
+ </node>
+ </node>
+
<node oor:name="Avery A4" oor:op="replace">
<node oor:name="L0" oor:op="replace" oor:finalized="true">
commit 8a8ad9dc540246fa1b8531e929668ef80184798c
Author: Dirk Voelzke <dv at openoffice.org>
Date: Thu Nov 4 11:01:57 2010 +0100
tl88:#i100744# Better exception handling while retrieving information from packages
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index e1e517a..f689783 100755
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -71,29 +71,34 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
m_pPublisher( NULL ),
m_xPackage( xPackage )
{
- m_sTitle = xPackage->getDisplayName();
- m_sVersion = xPackage->getVersion();
- m_sDescription = xPackage->getDescription();
-
- beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
- m_sPublisher = aInfo.First;
- m_sPublisherURL = aInfo.Second;
-
- // get the icons for the package if there are any
- uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );
- if ( xGraphic.is() )
- m_aIcon = Image( xGraphic );
-
- xGraphic = xPackage->getIcon( true );
- if ( xGraphic.is() )
- m_aIconHC = Image( xGraphic );
- else
- m_aIconHC = m_aIcon;
+ try
+ {
+ m_sTitle = xPackage->getDisplayName();
+ m_sVersion = xPackage->getVersion();
+ m_sDescription = xPackage->getDescription();
+
+ beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
+ m_sPublisher = aInfo.First;
+ m_sPublisherURL = aInfo.Second;
+
+ // get the icons for the package if there are any
+ uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );
+ if ( xGraphic.is() )
+ m_aIcon = Image( xGraphic );
+
+ xGraphic = xPackage->getIcon( true );
+ if ( xGraphic.is() )
+ m_aIconHC = Image( xGraphic );
+ else
+ m_aIconHC = m_aIcon;
- if ( eState == AMBIGUOUS )
- m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
- else if ( eState == NOT_REGISTERED )
- checkDependencies();
+ if ( eState == AMBIGUOUS )
+ m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
+ else if ( eState == NOT_REGISTERED )
+ checkDependencies();
+ }
+ catch (deployment::ExtensionRemovedException &) {}
+ catch (uno::RuntimeException &) {}
}
//------------------------------------------------------------------------------
@@ -963,6 +968,11 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &
bool bLocked = m_pManager->isReadOnly( xPackage );
TEntry_Impl pEntry( new Entry_Impl( xPackage, eState, bLocked ) );
+
+ // Don't add empty entries
+ if ( ! pEntry->m_sTitle.Len() )
+ return 0;
+
xPackage->addEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );
::osl::ClearableMutexGuard guard(m_entriesMutex);
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
old mode 100644
new mode 100755
index 6209aad..6928e6b
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -986,16 +986,20 @@ OUString BackendImpl::PackageImpl::getDescription()
if (sRelativeURL.getLength())
{
OUString sURL = m_url_expanded + OUSTR("/") + sRelativeURL;
- sDescription = getTextFromURL(
- css::uno::Reference< css::ucb::XCommandEnvironment >(), sURL);
+ try
+ {
+ sDescription = getTextFromURL( css::uno::Reference< css::ucb::XCommandEnvironment >(), sURL );
+ }
+ catch ( css::deployment::DeploymentException& )
+ {
+ OSL_ENSURE( 0, ::rtl::OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() );
+ }
}
+
if (sDescription.getLength())
- return sDescription;
- else if(m_oldDescription.getLength())
- return m_oldDescription;
- else
- return OUString();
+ return sDescription;
+ return m_oldDescription;
}
//______________________________________________________________________________
commit a5127496cb0f627dec136d63ef97f69800d7e457
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Nov 3 11:44:20 2010 -0400
Replace "DataForm..." to "Form..." in the menu item.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 3c25841..634e026 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1205,12 +1205,11 @@
<value xml:lang="en-US">~Remove Filter</value>
</prop>
</node>
- <node oor:name=".uno:DataForm" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">D~atenForm...</value>
- <value xml:lang="en-US">D~ataForm...</value>
- </prop>
- </node>
+ <node oor:name=".uno:DataForm" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">F~orm...</value>
+ </prop>
+ </node>
<node oor:name=".uno:DataSubTotals" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Sub~totals...</value>
commit c492d5ae91660ebc23ca50fe5c565400f8614147
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Nov 3 11:55:38 2010 +0100
Changing a few more strings to read "LibreOffice"
(cherry picked from commit 6f7dcc750c4d9c075190c412cea7bfaf744129ab)
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 8d2d94d..7a5defd 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -73,7 +73,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
{
// Initialize GStreamer library
int argc = 1;
- char *arguments[] = { "openoffice.org" };
+ char *arguments[] = { "libreoffice.org" };
char** argv = arguments;
GError* pError = NULL;
commit e7d4f805f91f6d91904a72e07eeb53a80179f2ce
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Nov 3 11:48:20 2010 +0100
Changing a few more strings to read "LibreOffice"
(cherry picked from commit f398a7b5ff69169925cdee745f8c023a3ae8d90c)
diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx
index 06ae116..03ffb03 100644
--- a/shell/source/backends/kde4be/kde4access.cxx
+++ b/shell/source/backends/kde4be/kde4access.cxx
@@ -127,7 +127,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org") );
+ aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -154,7 +154,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org") );
+ aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -181,7 +181,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.openoffice.org") );
+ aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -208,7 +208,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.openoffice.org") );
+ aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -235,7 +235,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.openoffice.org") );
+ aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -262,7 +262,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.openoffice.org") );
+ aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.libreoffice.org") );
break;
default: // No proxy is used
break;
commit 00bdddc99cebb65b556ad3c19b15e38c732719df
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Nov 3 10:21:33 2010 +0200
Fix typo
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 7e603c5..0513f2a 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -1180,7 +1180,7 @@ int ODriver::X_STOP(const ::rtl::OUString& sDBName)
::rtl::OUString sArg2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
const sal_uInt32 nArgsCount = 3;
- rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg3.pData };
+ rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg2.pData };
sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stp.exe"));
#else
const sal_uInt32 nArgsCount = 1;
commit 9fe0680782dc0ff92ef6344cab9ab9534a52017b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Nov 3 10:20:10 2010 +0200
Link with SALHELPERLIB
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index 8fdae27..54bebe6 100644
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -86,6 +86,7 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(OLE32LIB) \
$(OLEAUT32LIB) \
$(UUIDLIB) \
commit 33f4cc0f7d0807937a51b0475db5466216d65473
Author: Juergen Schmidt <jsc at openoffice.org>
Date: Mon Nov 1 11:07:18 2010 +0100
jsc331: i115237: add missing not operator
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index 7551a58..8abfbea 100644
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -91,7 +91,7 @@ enum SbxBOOL ImpGetBool( const SbxValues* p )
{
if( p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_TRUE ) ) )
nRes = SbxTRUE;
- else if( p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_FALSE ) ) )
+ else if( !p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_FALSE ) ) )
{
// Jetzt kann es noch in eine Zahl konvertierbar sein
BOOL bError = TRUE;
More information about the Libreoffice-commits
mailing list