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/05/31 15:56:04 UTC
svn commit: r1488227 [4/15] - in /openoffice/branches/rejuvenate01: ./
ext_libraries/apr/ ext_libraries/apr/prj/ ext_libraries/coinmp/prj/
ext_libraries/ratscan/prj/ ext_libraries/serf/prj/ main/
main/basctl/source/dlged/ main/basctl/uiconfig/basicide/...
Modified: openoffice/branches/rejuvenate01/main/odk/setsdkenv_unix
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/odk/setsdkenv_unix?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/odk/setsdkenv_unix (original)
+++ openoffice/branches/rejuvenate01/main/odk/setsdkenv_unix Fri May 31 13:55:58 2013
@@ -30,7 +30,7 @@ if [ "$OSTYPE" = "Darwin" ]
then
OO_SDK_NAME=`basename $OO_SDK_HOME`
else
- OO_SDK_NAME=apacheopenoffice${OOVERSION}_sdk
+ OO_SDK_NAME=openoffice${OOVERSION}_sdk
fi
export OO_SDK_HOME
@@ -41,11 +41,7 @@ then
then
rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh
fi
- if [ -r $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh ]
- then
- rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh
- fi
- shift
+ shift
elif [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ -n "$1" ]
then
echo
Modified: openoffice/branches/rejuvenate01/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/odk/setsdkenv_unix.sh.in?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/branches/rejuvenate01/main/odk/setsdkenv_unix.sh.in Fri May 31 13:55:58 2013
@@ -35,12 +35,6 @@ OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
# Example: OFFICE_HOME=/opt/openoffice4
OFFICE_HOME='@OFFICE_HOME@'
-OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
-
-# URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/openoffice/ure
-OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
-export OO_SDK_URE_HOME
# Directory of the make command.
# Example: OO_SDK_MAKE_HOME=/usr/bin
@@ -115,14 +109,6 @@ then
export OFFICE_PROGRAM_PATH
fi
-# Set office program path (only set when using an Office).
-if [ "${OFFICE_BASE_HOME}" ]
-then
- OFFICE_BASE_PROGRAM_PATH=${OFFICE_BASE_HOME}/program
- export OFFICE_BASE_PROGRAM_PATH
-fi
-
-
# Set UNO path, necessary to ensure that the cpp examples using the
# new UNO bootstrap mechanism use the configured office installation (only set
# when using an Office).
@@ -132,16 +118,10 @@ then
export UNO_PATH
fi
-if [ "${OO_SDK_URE_HOME}" ]
-then
- OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin
- OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
- OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
-else
- OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
- OO_SDK_URE_LIB_DIR=${OFFICE_BASE_PROGRAM_PATH}
- OO_SDK_URE_JAVA_DIR=${OFFICE_BASE_PROGRAM_PATH}/classes
-fi
+OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
+OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH}
+OO_SDK_URE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes
+
export OO_SDK_URE_BIN_DIR
export OO_SDK_URE_LIB_DIR
export OO_SDK_URE_JAVA_DIR
@@ -189,7 +169,7 @@ case ${sdk_platform} in
exampleout=MACOSXexample.out
platform=MacOSX
stldebug=_stldebug
- DYLD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH}
+ DYLD_LIBRARY_PATH=/usr/lib:${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH}
export DYLD_LIBRARY_PATH
;;
@@ -257,7 +237,7 @@ esac
PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:.:${PATH}
# Set the classpath
-CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_BASE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}
+CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OO_SDK_URE_JAVA_DIR}/unoil.jar:${CLASSPATH}
export CLASSPATH
@@ -339,7 +319,7 @@ then
fi
# prepare links
- if [ "${OO_SDK_URE_HOME}" ]
+ if [ "${OFFICE_HOME}" ]
then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
@@ -370,8 +350,6 @@ echo " * SDK environment is prepared for
echo " *"
echo " * SDK = $OO_SDK_HOME"
echo " * Office = $OFFICE_HOME"
-echo " * Office Base = $OFFICE_BASE_HOME"
-echo " * URE = $OO_SDK_URE_HOME"
echo " * Make = $OO_SDK_MAKE_HOME"
echo " * Zip = $OO_SDK_ZIP_HOME"
echo " * cat = $OO_SDK_CAT_HOME"
Modified: openoffice/branches/rejuvenate01/main/odk/setsdkenv_windows.template
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/odk/setsdkenv_windows.template?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/odk/setsdkenv_windows.template (original)
+++ openoffice/branches/rejuvenate01/main/odk/setsdkenv_windows.template Fri May 31 13:55:58 2013
@@ -1,199 +1,157 @@
@echo off
-rem *************************************************************
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements. See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership. The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License")rem you may not use this file except in compliance
-rem with the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing,
-rem software distributed under the License is distributed on an
-rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem KIND, either express or implied. See the License for the
-rem specific language governing permissions and limitations
-rem under the License.
-rem
-rem *************************************************************
-REM This script sets all enviroment variables, which
+Rem This script sets all enviroment variables, which
REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
-REM Example: set OO_SDK_NAME=apacheopenoffice4.0_sdk
-set OO_SDK_NAME=apacheopenoffice4.0_sdk
+REM Example: set OO_SDK_NAME=openoffice4.0_sdk
+set OO_SDK_NAME=openoffice4.0_sdk
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice\Basic 4.0\sdk
-set OO_SDK_HOME=
+REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice 4\sdk
+@set OO_SDK_HOME=
REM Office installation directory.
REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice 4
-set OFFICE_HOME=
-
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice\Basis 4.0
-set OFFICE_BASE_HOME=
-
-REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice\URE
-set OO_SDK_URE_HOME=
+@set OFFICE_HOME=
REM Directory of the make command.
-REM Example: set OO_SDK_MAKE_HOME=D:\NextGenerationMake\make
-set OO_SDK_MAKE_HOME=
+REM Example: set OO_SDK_MAKE_HOME=C:\UnixTools\usr\local\wbin
+@set OO_SDK_MAKE_HOME=
REM Directory of the zip tool.
-REM Example: set OO_SDK_ZIP_HOME=D:\infozip\bin
-set OO_SDK_ZIP_HOME=
+REM Example: set OO_SDK_ZIP_HOME=C:\UnixTools\usr\local\wbin
+@set OO_SDK_ZIP_HOME=
REM Directory of the cat tool.
-REM Example: set OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin\
-set OO_SDK_CAT_HOME=
+REM Example: set OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin
+@set OO_SDK_CAT_HOME=
REM Directory of the sed tool.
-REM Example: set OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin\
-set OO_SDK_SED_HOME=
+REM Example: set OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin
+@set OO_SDK_SED_HOME=
REM Directory of the C++ compiler.
REM Example:set OO_SDK_CPP_HOME=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin
-REM Example:set CPP_WINDOWS_SDK=C:\Program Files\\Microsoft SDKs\Windows\v6.0A\
-set OO_SDK_CPP_HOME=
-set CPP_VC8=
-set CPP_WINDOWS_SDK=
+@set OO_SDK_CPP_HOME=
+@set CPP_MANIFEST=
+@set CPP_WINDOWS_SDK=
REM Directory of the C# and VB.NET compilers.
REM Example:set OO_SDK_CLI_HOME=C:\WINXP\Microsoft.NET\Framework\v1.0.3705
-set OO_SDK_CLI_HOME=
+@set OO_SDK_CLI_HOME=
REM Java SDK installation directory.
REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
-set OO_SDK_JAVA_HOME=
+@set OO_SDK_JAVA_HOME=
REM Special output directory
-REM Example: set OO_SDK_OUT=C:\apacheopenoffice4.0_sdk
-set OO_SDK_OUT=
+REM Example: set OO_SDK_OUT=C:\openoffice4.0_sdk
+@set OO_SDK_OUT=
REM Automatic deployment
REM Example: set SDK_AUTO_DEPLOYMENT=YES
-set SDK_AUTO_DEPLOYMENT=YES
+@set SDK_AUTO_DEPLOYMENT=YES
-set STLDEBUG=
+@set STLDEBUG=
REM check stlport lib in 4NT shell
REM if exist "%OO_SDK_HOME%\windows\lib\stlport_vc71_stldebug.lib". (
-REM set STLDEBUG=_stldebug
+REM @set STLDEBUG=_stldebug
REM )
-REM Check installation path for the StarOffice Development Kit.
+REM Check installation path for the Office Development Kit.
if not defined OO_SDK_HOME (
echo Error: the variable OO_SDK_HOME is missing!
- goto :error
+ goto error
)
-REM Check installation path for the office.
-REM if not defined OFFICE_HOME (
-REM if not defined OO_SDK_URE_HOME (
-REM echo Error: either of the variables OFFICE_HOME and
-REM echo OO_SDK_URE_HOME is missing!
-REM goto :error
-REM )
-REM )
-
REM Check installation path for GNU make.
if not defined OO_SDK_MAKE_HOME (
echo Error: the variable OO_SDK_MAKE_HOME is missing!
- goto :error
+ goto error
)
REM Check installation path for the zip tool.
if not defined OO_SDK_ZIP_HOME (
echo Error: the variable OO_SDK_ZIP_HOME is missing!
- goto :error
+ goto error
)
REM Check installation path for the cat tool.
if not defined OO_SDK_CAT_HOME (
echo Error: the variable OO_SDK_CAT_HOME is missing!
- goto :error
+ goto error
)
REM Check installation path for the sed tool.
if not defined OO_SDK_SED_HOME (
echo Error: the variable OO_SDK_SED_HOME is missing!
- goto :error
+ goto error
)
REM Set library path.
-set LIB=%OO_SDK_HOME%\lib;%LIB%
+@set LIB=%OO_SDK_HOME%\lib;%LIB%
if defined CPP_WINDOWS_SDK (
- set LIB=%LIB%;%CPP_WINDOWS_SDK%\lib
+ @set LIB=%LIB%;%CPP_WINDOWS_SDK%\lib
)
REM Set office program path.
if defined OFFICE_HOME (
- set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program
- )
-
-REM Set office program path.
-if defined OFFICE_BASE_HOME (
- set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_HOME%\program
+ @set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program
)
REM Set UNO path, necessary to ensure that the cpp examples using the
REM new UNO bootstrap mechanism use the configured office installation
REM (only set when using an Office).
if defined OFFICE_HOME (
- set UNO_PATH=%OFFICE_PROGRAM_PATH%
- )
+ @set UNO_PATH=%OFFICE_PROGRAM_PATH%
+)
-REM if defined OO_SDK_URE_HOME (
-set OO_SDK_URE_BIN_DIR=%OO_SDK_URE_HOME%\bin
-set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\bin
-set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\java
-REM ) else (
-set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%
-set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%
-set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\classes
-REM )
+REM set OO_SDK_URE_BIN_DIR=%OFFICE_PROGRAM_PATH%
+REM set OO_SDK_URE_LIB_DIR=%OFFICE_PROGRAM_PATH%
+REM set OO_SDK_URE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes
+
+@set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%
+@set OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH%
+@set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes
REM Set classpath
-set CLASSPATH=%OO_SDK_URE_JAVA_DIR%\juh.jar;%OO_SDK_URE_JAVA_DIR%\jurt.jar;%OO_SDK_URE_JAVA_DIR%\ridl.jar;%OO_SDK_URE_JAVA_DIR%\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar
-REM if defined OFFICE_HOME (
-REM set CLASSPATH=%CLASSPATH%;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar
-REM )
+@set CLASSPATH=%OO_SDK_OFFICE_JAVA_DIR%\juh.jar;%OO_SDK_OFFICE_JAVA_DIR%\jurt.jar;%OO_SDK_OFFICE_JAVA_DIR%\ridl.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar
REM Add directory of the SDK tools to the path.
-set PATH=%OO_SDK_HOME%\bin;%OO_SDK_URE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\WINexample.out\bin;%PATH%
+@set PATH=%OO_SDK_HOME%\bin;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\WINexample.out\bin;%OO_SDK_MAKE_HOME%;%OO_SDK_ZIP_HOME%;%OO_SDK_CAT_HOME%;%OO_SDK_SED_HOME%;%PATH%
-REM Set PATH appropriate to the output directory
if defined OO_SDK_OUT (
- set PATH=%OO_SDK_OUT%\WINexample.out\bin;%PATH%
- ) else (
- set PATH=%OO_SDK_HOME%\WINexample.out\bin;%PATH%
- )
+ @set PATH=%OO_SDK_OUT%\WINexample.out\bin;%PATH%
+) else (
+ @set PATH=%OO_SDK_HOME%\WINexample.out\bin;%PATH%
+)
REM Add directory of the command make to the path, if necessary.
-if defined OO_SDK_MAKE_HOME set PATH=%OO_SDK_MAKE_HOME%;%PATH%
+REM if defined OO_SDK_MAKE_HOME @set PATH+=%OO_SDK_MAKE_HOME%
-REM Add directory of the zip tool to the path, if necessary.
-if defined OO_SDK_ZIP_HOME set PATH=%OO_SDK_ZIP_HOME%;%PATH%
+Rem Add directory of the zip tool to the path, if necessary.
+REM if defined OO_SDK_ZIP_HOME @set PATH+=%OO_SDK_ZIP_HOME%
REM Add directory of the cat tool to the path, if necessary.
-if defined OO_SDK_CAT_HOME set PATH=%OO_SDK_CAT_HOME%;%PATH%
+REM if defined OO_SDK_CAT_HOME @set PATH+=%OO_SDK_CAT_HOME
REM Add directory of the sed tool to the path, if necessary.
-if defined OO_SDK_SED_HOME set PATH=%OO_SDK_SED_HOME%;%PATH%
+REM if defined OO_SDK_SED_HOME @set PATH+=%OO_SDK_SED_HOME%
REM Add directory of the C++ compiler to the path, if necessary.
-if defined OO_SDK_CPP_HOME set PATH=%OO_SDK_CPP_HOME%;%PATH%
+REM if defined OO_SDK_CPP_HOME @set PATH+=%OO_SDK_CPP_HOME%
+
+REM Add directory of the Win SDK to the path, if necessary.
+if defined CPP_WINDOWS_SDK (
+ @set PATH=%CPP_WINDOWS_SDK%\bin;%PATH%
+ @set INCLUDE=%CPP_WINDOWS_SDK%\Include;%INCLUDE%
+)
REM Add directory of the C# and VB.NET compilers to the path, if necessary.
-if defined OO_SDK_CLI_HOME set PATH=%OO_SDK_CLI_HOME%;%PATH%
+if defined OO_SDK_CLI_HOME @set PATH=%OO_SDK_CLI_HOME%;%PATH%
REM Add directory of the Java tools to the path, if necessary.
-if defined OO_SDK_JAVA_HOME set PATH=%OO_SDK_JAVA_HOME%\bin;%OO_SDK_JAVA_HOME%\jre\bin;%PATH%
+if defined OO_SDK_JAVA_HOME @set PATH=%OO_SDK_JAVA_HOME%\bin;%OO_SDK_JAVA_HOME%\jre\bin;%PATH%
REM Set environment for C++ compiler tools, if necessary.
if defined OO_SDK_CPP_HOME call "%OO_SDK_CPP_HOME%\VCVARS32.bat"
@@ -209,8 +167,6 @@ echo * SDK environment is prepared for
echo *
echo * SDK = %OO_SDK_HOME%
echo * Office = %OFFICE_HOME%
-echo * Office Base = %OFFICE_BASE_HOME%
-echo * URE = %OO_SDK_URE_HOME%
echo * Make = %OO_SDK_MAKE_HOME%
echo * Zip = %OO_SDK_ZIP_HOME%
echo * cat = %OO_SDK_CAT_HOME%
@@ -223,9 +179,10 @@ echo * Auto deployment = %SDK_AUTO_DEPL
echo *
echo ******************************************************************
echo.
-goto end
+goto:end
- :error
+:error
Error: Please insert the necessary environment variables into the batch file.
- :end
+:end
+
Modified: openoffice/branches/rejuvenate01/main/odk/settings/settings.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/odk/settings/settings.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/odk/settings/settings.mk (original)
+++ openoffice/branches/rejuvenate01/main/odk/settings/settings.mk Fri May 31 13:55:58 2013
@@ -135,9 +135,9 @@ endif
LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)\misc
-endif
+#ifneq "$(OFFICE_PROGRAM_PATH)" ""
+#URE_MISC=$(OFFICE_PROGRAM_PATH)\misc
+#endif
# use this for release version
#EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000
@@ -154,7 +154,7 @@ endif
ifneq (,$(findstring solaris,$(PLATFORM)))
# Settings for Solaris using Sun Workshop compiler
-PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell /usr/ccs/bin/elfdump -e "$(OO_SDK_URE_HOME)/lib/libuno_sal.so.3" | /usr/xpg4/bin/grep -q -w ELFCLASS64 && echo 64)
+PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell /usr/ccs/bin/elfdump -e "$(OFFICE_PROGRAM_PATH)/libuno_sal.so.3" | /usr/xpg4/bin/grep -q -w ELFCLASS64 && echo 64)
ifeq "$(PROCTYPE)" "sparc"
PLATFORM=solsparc
@@ -255,8 +255,8 @@ LIBRARY_LINK_FLAGS+=-m64
EXE_LINK_FLAGS+=-m64
endif
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
endif
endif
@@ -402,8 +402,8 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefin
LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
endif
endif
@@ -490,7 +490,7 @@ SALHELPERDYLIB=-Wl,-dylib_file,@________
REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libreg.dylib'
STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libstore.dylib'
-INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3
+INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3
INSTALL_NAME_URELIBS_BIN=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3
@@ -528,8 +528,8 @@ LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$
LINK_JAVA_LIBS=-framework JavaVM
#LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/Libraries"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
endif
endif
@@ -652,9 +652,9 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefin
LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS)
LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
-endif
+#ifneq "$(OFFICE_PROGRAM_PATH)" ""
+#URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
+#endif
endif
Modified: openoffice/branches/rejuvenate01/main/odk/settings/std.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/odk/settings/std.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/odk/settings/std.mk (original)
+++ openoffice/branches/rejuvenate01/main/odk/settings/std.mk Fri May 31 13:55:58 2013
@@ -40,17 +40,17 @@ OUT_DEPLOY=$(OUT)/deploy
IDL_DIR=$(PRJ)/idl
BIN_DIR=$(PRJ)/bin
CLASSES_DIR=$(PRJ)/classes
-URE_CLASSES_DIR=$(subst \,/,$(OO_SDK_URE_JAVA_DIR))
-OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH))/classes
+URE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
+OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN))
SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
-URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
-URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
+URE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
+URE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
-OFFICE_TYPES="$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH)$(PS)offapi.rdb)"
-OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
+OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
+OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
@@ -64,6 +64,12 @@ endif
endif
endif
+ifeq "$(PLATFORM)" "macosx"
+OFFICE_LAUNCHER=DYLD_LIBRARY_PATH="" && "$(OFFICE_PROGRAM_PATH)$(PS)soffice"
+else
+OFFICE_LAUNCHER="$(OFFICE_PROGRAM_PATH)$(PS)soffice"
+endif
+
DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
@@ -74,8 +80,8 @@ SDK_SED="$(OO_SDK_SED_HOME)/sed"
IDLC="$(OO_SDK_HOME)/bin/idlc"
CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"
JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
-REGMERGE="$(OO_SDK_URE_HOME)/bin/regmerge"
-REGCOMP="$(OO_SDK_URE_HOME)/bin/regcomp"
+REGMERGE="$(OFFICE_PROGRAM_PATH)/regmerge"
+REGCOMP="$(OFFICE_PROGRAM_PATH)/regcomp"
SDK_JAVA_UNO_BOOTSTRAP_FILES=\
-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
Modified: openoffice/branches/rejuvenate01/main/odk/settings/stdtarget.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/odk/settings/stdtarget.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/odk/settings/stdtarget.mk (original)
+++ openoffice/branches/rejuvenate01/main/odk/settings/stdtarget.mk Fri May 31 13:55:58 2013
@@ -32,5 +32,5 @@ install: $(REGISTERFLAG)
$(SDKTYPEFLAG): #$(URE_TYPES) $(OFFICE_TYPES)
-$(MKDIR) $(subst /,$(PS),$(@D))
-$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
- $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
+ $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(OFFICE_TYPES)
echo flagged > $@
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/MessageBoxResults.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/MessageBoxResults.idl?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/MessageBoxResults.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/MessageBoxResults.idl Fri May 31 13:55:58 2013
@@ -19,8 +19,8 @@
*
*************************************************************/
-#ifndef __com_sun_star_awt_MessageBoxCommand_idl__
-#define __com_sun_star_awt_MessageBoxCommand_idl__
+#ifndef __com_sun_star_awt_MessageBoxResults_idl__
+#define __com_sun_star_awt_MessageBoxResults_idl__
module com { module sun { module star { module awt {
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/MessageBoxType.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/MessageBoxType.idl?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/MessageBoxType.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/MessageBoxType.idl Fri May 31 13:55:58 2013
@@ -19,8 +19,8 @@
*
*************************************************************/
-#ifndef __com_sun_star_awt_MessageBoxCommand_idl__
-#define __com_sun_star_awt_MessageBoxCommand_idl__
+#ifndef __com_sun_star_awt_MessageBoxType_idl__
+#define __com_sun_star_awt_MessageBoxType_idl__
module com { module sun { module star { module awt {
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/XPopupMenu.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/XPopupMenu.idl?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/XPopupMenu.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/XPopupMenu.idl Fri May 31 13:55:58 2013
@@ -23,7 +23,7 @@
#define __com_sun_star_awt_XPopupMenu_idl__
#include <com/sun/star/awt/KeyEvent.idl>
-#include <com/sun/star/awt/Point.idl>
+#include <com/sun/star/awt/Rectangle.idl>
#include <com/sun/star/awt/XMenu.idl>
#include <com/sun/star/graphic/XGraphic.idl>
@@ -84,7 +84,8 @@ published interface XPopupMenu: XMenu
the parent window.
@param Position
- the coordinates where the popup menu should be executed.
+ a <type>Rectangle</type> representing the coordinates system
+ where the popup menu should be executed.
@param Direction
the direction in which a popup menu will grow, as specified
@@ -94,7 +95,7 @@ published interface XPopupMenu: XMenu
returns the selected item or <code>0</code>, if cancelled.
*/
short execute( [in] XWindowPeer Parent,
- [in] Point Position,
+ [in] Rectangle Position,
[in] short Direction );
/** queries if the <type>PopupMenu</type> is being.
Modified: openoffice/branches/rejuvenate01/main/offapi/com/sun/star/frame/XStatusbarController.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/com/sun/star/frame/XStatusbarController.idl?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/offapi/com/sun/star/frame/XStatusbarController.idl (original)
+++ openoffice/branches/rejuvenate01/main/offapi/com/sun/star/frame/XStatusbarController.idl Fri May 31 13:55:58 2013
@@ -27,6 +27,7 @@
#include <com/sun/star/awt/Rectangle.idl>
#include <com/sun/star/awt/XGraphics.idl>
#include <com/sun/star/frame/XStatusListener.idl>
+#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/util/XUpdatable.idl>
@@ -50,6 +51,14 @@ module com { module sun { module star
*/
interface XStatusbarController
{
+ /** used to control the life-time of the component
+
+ Used by a status bar implementation to control the life-time of
+ a status bar controller. The status bar is the only instance which
+ is allowed to dispose the component.
+ */
+ interface com::sun::star::lang::XComponent;
+
/** used to initialize a component with required arguments.
<p>A status bar controller is initialized with <b>five</b> additional
Modified: openoffice/branches/rejuvenate01/main/offapi/type_reference/types.rdb
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/offapi/type_reference/types.rdb?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu (original)
+++ openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu Fri May 31 13:55:58 2013
@@ -25,17 +25,17 @@
<node oor:name="Commands">
<node oor:name=".uno:Bib/DeleteRecord" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Delete Record</value>
+ <value xml:lang="en-US">Delete ~Record</value>
</prop>
</node>
<node oor:name=".uno:Bib/InsertRecord" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Record</value>
+ <value xml:lang="en-US">~Record</value>
</prop>
</node>
<node oor:name=".uno:Bib/Mapping" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Column Arrangement...</value>
+ <value xml:lang="en-US">~Column Arrangement...</value>
</prop>
</node>
<node oor:name=".uno:Bib/autoFilter" oor:op="replace">
@@ -55,7 +55,7 @@
</node>
<node oor:name=".uno:Bib/sdbsource" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Choose Data Source...</value>
+ <value xml:lang="en-US">~Choose Data Source...</value>
</prop>
</node>
<node oor:name=".uno:Bib/source" oor:op="replace">
@@ -65,7 +65,7 @@
</node>
<node oor:name=".uno:Bib/standardFilter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Filter...</value>
+ <value xml:lang="en-US">~Filter...</value>
</prop>
</node>
</node>
Modified: openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu (original)
+++ openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu Fri May 31 13:55:58 2013
@@ -25,10 +25,10 @@
<node oor:name="Commands">
<node oor:name=".uno:AcceptChanges" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Accept or Reject Changes...</value>
+ <value xml:lang="en-US">~Accept or Reject Changes...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Accept or Reject...</value>
+ <value xml:lang="en-US">~Accept or Reject...</value>
</prop>
</node>
<node oor:name=".uno:Add" oor:op="replace">
@@ -38,10 +38,10 @@
</node>
<node oor:name=".uno:AddPrintArea" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Add Print Area</value>
+ <value xml:lang="en-US">~Add Print Area</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Add</value>
+ <value xml:lang="en-US">~Add</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -80,12 +80,12 @@
</node>
<node oor:name=".uno:AuditingFillMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fill Mode</value>
+ <value xml:lang="en-US">~Fill Mode</value>
</prop>
</node>
<node oor:name=".uno:AutoComplete" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">AutoInput</value>
+ <value xml:lang="en-US">~AutoInput</value>
</prop>
</node>
<node oor:name=".uno:AutoFill" oor:op="replace">
@@ -95,25 +95,25 @@
</node>
<node oor:name=".uno:AutoOutline" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">AutoOutline</value>
+ <value xml:lang="en-US">~AutoOutline</value>
</prop>
</node>
<node oor:name=".uno:AutoRefreshArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">AutoRefresh Traces</value>
+ <value xml:lang="en-US">A~utoRefresh Traces</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">AutoRefresh</value>
+ <value xml:lang="en-US">A~utoRefresh</value>
</prop>
</node>
<node oor:name=".uno:AutomaticCalculation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">AutoCalculate</value>
+ <value xml:lang="en-US">Auto~Calculate</value>
</prop>
</node>
<node oor:name=".uno:Calculate" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Recalculate</value>
+ <value xml:lang="en-US">~Recalculate</value>
</prop>
</node>
<node oor:name=".uno:CalculateHard" oor:op="replace">
@@ -136,17 +136,17 @@
</node>
<node oor:name=".uno:ClearArrowDependents" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Remove Dependents</value>
+ <value xml:lang="en-US">Remove ~Dependents</value>
</prop>
</node>
<node oor:name=".uno:ClearArrowPrecedents" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Remove Precedents</value>
+ <value xml:lang="en-US">~Remove Precedents</value>
</prop>
</node>
<node oor:name=".uno:ClearArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Remove All Traces</value>
+ <value xml:lang="en-US">Remove ~All Traces</value>
</prop>
</node>
<node oor:name=".uno:ClearContents" oor:op="replace">
@@ -156,46 +156,46 @@
</node>
<node oor:name=".uno:ColumnWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Column Width...</value>
+ <value xml:lang="en-US">Column ~Width...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Width...</value>
+ <value xml:lang="en-US">~Width...</value>
</prop>
</node>
<node oor:name=".uno:CommentChange" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Comments...</value>
+ <value xml:lang="en-US">~Comments...</value>
</prop>
</node>
<node oor:name=".uno:ConditionalFormatDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Conditional Formatting...</value>
+ <value xml:lang="en-US">C~onditional Formatting...</value>
</prop>
</node>
<node oor:name=".uno:CreateNames" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Create Names...</value>
+ <value xml:lang="en-US">~Create Names...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Create...</value>
+ <value xml:lang="en-US">~Create...</value>
</prop>
</node>
<node oor:name=".uno:DataAreaRefresh" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Refresh Range</value>
+ <value xml:lang="en-US">R~efresh Range</value>
</prop>
</node>
<node oor:name=".uno:DataConsolidate" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Consolidate...</value>
+ <value xml:lang="en-US">~Consolidate...</value>
</prop>
</node>
<node oor:name=".uno:DataDataPilotRun" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Create Pivot Table...</value>
+ <value xml:lang="en-US">~Create Pivot Table...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Create...</value>
+ <value xml:lang="en-US">~Create...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -203,7 +203,7 @@
</node>
<node oor:name=".uno:DataFilterAutoFilter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">AutoFilter</value>
+ <value xml:lang="en-US">Auto~Filter</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -211,17 +211,17 @@
</node>
<node oor:name=".uno:DataFilterHideAutoFilter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Hide AutoFilter</value>
+ <value xml:lang="en-US">~Hide AutoFilter</value>
</prop>
</node>
<node oor:name=".uno:DataFilterRemoveFilter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Remove Filter</value>
+ <value xml:lang="en-US">~Remove Filter</value>
</prop>
</node>
<node oor:name=".uno:DataFilterSpecialFilter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Advanced Filter...</value>
+ <value xml:lang="en-US">~Advanced Filter...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -229,7 +229,7 @@
</node>
<node oor:name=".uno:DataFilterStandardFilter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Standard Filter...</value>
+ <value xml:lang="en-US">~Standard Filter...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -260,36 +260,36 @@
</node>
<node oor:name=".uno:DataSort" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sort...</value>
+ <value xml:lang="en-US">~Sort...</value>
</prop>
</node>
<node oor:name=".uno:DataSubTotals" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Subtotals...</value>
+ <value xml:lang="en-US">Sub~totals...</value>
</prop>
</node>
<node oor:name=".uno:DefineDBName" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Define Data Range...</value>
+ <value xml:lang="en-US">~Define Data Range...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Define Range...</value>
+ <value xml:lang="en-US">~Define Range...</value>
</prop>
</node>
<node oor:name=".uno:DefineLabelRange" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Define Labels...</value>
+ <value xml:lang="en-US">Define ~Labels...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Labels...</value>
+ <value xml:lang="en-US">~Labels...</value>
</prop>
</node>
<node oor:name=".uno:DefineName" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Define Name...</value>
+ <value xml:lang="en-US">~Define Name...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Define...</value>
+ <value xml:lang="en-US">~Define...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -297,10 +297,10 @@
</node>
<node oor:name=".uno:DefinePrintArea" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Define Print Area</value>
+ <value xml:lang="en-US">~Define Print Area</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Define</value>
+ <value xml:lang="en-US">~Define</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -313,15 +313,15 @@
</node>
<node oor:name=".uno:DeleteCell" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Delete Cells...</value>
+ <value xml:lang="en-US">Delete C~ells...</value>
</prop>
</node>
<node oor:name=".uno:DeleteColumnbreak" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Remove Column Break</value>
+ <value xml:lang="en-US">Remove ~Column Break</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Column Break</value>
+ <value xml:lang="en-US">~Column Break</value>
</prop>
</node>
<node oor:name=".uno:DeleteNote" oor:op="replace">
@@ -331,18 +331,18 @@
</node>
<node oor:name=".uno:DeletePivotTable" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Delete Pivot Table</value>
+ <value xml:lang="en-US">~Delete Pivot Table</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Delete</value>
+ <value xml:lang="en-US">~Delete</value>
</prop>
</node>
<node oor:name=".uno:DeletePrintArea" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Remove Print Area</value>
+ <value xml:lang="en-US">~Remove Print Area</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Remove</value>
+ <value xml:lang="en-US">~Remove</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -350,10 +350,10 @@
</node>
<node oor:name=".uno:DeleteRowbreak" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Remove Row Break</value>
+ <value xml:lang="en-US">Remove ~Row Break</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Row Break</value>
+ <value xml:lang="en-US">~Row Break</value>
</prop>
</node>
<node oor:name=".uno:Deselect" oor:op="replace">
@@ -371,7 +371,7 @@
</node>
<node oor:name=".uno:EditHeaderAndFooter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Headers & Footers...</value>
+ <value xml:lang="en-US">~Headers & Footers...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -379,18 +379,18 @@
</node>
<node oor:name=".uno:EditLinks" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Edit Links...</value>
+ <value xml:lang="en-US">Edit Lin~ks...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Links...</value>
+ <value xml:lang="en-US">Lin~ks...</value>
</prop>
</node>
<node oor:name=".uno:EditPrintArea" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Edit Print Area...</value>
+ <value xml:lang="en-US">~Edit Print Area...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Edit...</value>
+ <value xml:lang="en-US">~Edit...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -406,50 +406,50 @@
</node>
<node oor:name=".uno:FillDown" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fill Down</value>
+ <value xml:lang="en-US">Fill ~Down</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Down</value>
+ <value xml:lang="en-US">~Down</value>
</prop>
</node>
<node oor:name=".uno:FillLeft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fill Left</value>
+ <value xml:lang="en-US">Fill ~Left</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Left</value>
+ <value xml:lang="en-US">~Left</value>
</prop>
</node>
<node oor:name=".uno:FillRight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fill Right</value>
+ <value xml:lang="en-US">Fill ~Right</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Right</value>
+ <value xml:lang="en-US">~Right</value>
</prop>
</node>
<node oor:name=".uno:FillSeries" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fill Series...</value>
+ <value xml:lang="en-US">Fill S~eries...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Series...</value>
+ <value xml:lang="en-US">S~eries...</value>
</prop>
</node>
<node oor:name=".uno:FillTable" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fill Sheets...</value>
+ <value xml:lang="en-US">Fill ~Sheets...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Sheets...</value>
+ <value xml:lang="en-US">~Sheets...</value>
</prop>
</node>
<node oor:name=".uno:FillUp" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fill Up</value>
+ <value xml:lang="en-US">Fill ~Up</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Up</value>
+ <value xml:lang="en-US">~Up</value>
</prop>
</node>
<node oor:name=".uno:FirstPage" oor:op="replace">
@@ -472,28 +472,28 @@
</node>
<node oor:name=".uno:FormatCellDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Format Cells...</value>
+ <value xml:lang="en-US">Format ~Cells...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Cells...</value>
+ <value xml:lang="en-US">Ce~lls...</value>
</prop>
</node>
<node oor:name=".uno:FreezePanes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Freeze Window</value>
+ <value xml:lang="en-US">~Freeze Window</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Freeze</value>
+ <value xml:lang="en-US">~Freeze</value>
</prop>
</node>
<node oor:name=".uno:FunctionBox" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Function List</value>
+ <value xml:lang="en-US">F~unction List</value>
</prop>
</node>
<node oor:name=".uno:FunctionDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Function...</value>
+ <value xml:lang="en-US">~Function...</value>
</prop>
</node>
<node oor:name=".uno:GoDownToEndOfData" oor:op="replace">
@@ -553,7 +553,7 @@
</node>
<node oor:name=".uno:GoalSeekDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Goal Seek...</value>
+ <value xml:lang="en-US">~Goal Seek...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -561,31 +561,31 @@
</node>
<node oor:name=".uno:Hide" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Hide Sheets</value>
+ <value xml:lang="en-US">~Hide Sheets</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Hide</value>
+ <value xml:lang="en-US">~Hide</value>
</prop>
</node>
<node oor:name=".uno:HideColumn" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Hide Columns</value>
+ <value xml:lang="en-US">~Hide Columns</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Hide</value>
+ <value xml:lang="en-US">~Hide</value>
</prop>
</node>
<node oor:name=".uno:HideRow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Hide Rows</value>
+ <value xml:lang="en-US">H~ide Rows</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Hide</value>
+ <value xml:lang="en-US">H~ide</value>
</prop>
</node>
<node oor:name=".uno:InputLineVisible" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Formula Bar</value>
+ <value xml:lang="en-US">~Formula Bar</value>
</prop>
</node>
<node oor:name=".uno:InsCellsCtrl" oor:op="replace">
@@ -606,18 +606,18 @@
</node>
<node oor:name=".uno:Insert" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Sheet...</value>
+ <value xml:lang="en-US">Insert ~Sheet...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Sheet...</value>
+ <value xml:lang="en-US">~Sheet...</value>
</prop>
</node>
<node oor:name=".uno:InsertCell" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Cells...</value>
+ <value xml:lang="en-US">Insert ~Cells...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Cells...</value>
+ <value xml:lang="en-US">~Cells...</value>
</prop>
</node>
<node oor:name=".uno:InsertCellsDown" oor:op="replace">
@@ -643,15 +643,15 @@
</node>
<node oor:name=".uno:InsertExternalDataSource" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Link to External Data...</value>
+ <value xml:lang="en-US">Link to E~xternal Data...</value>
</prop>
</node>
<node oor:name=".uno:InsertName" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Name...</value>
+ <value xml:lang="en-US">~Insert Name...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Insert...</value>
+ <value xml:lang="en-US">~Insert...</value>
</prop>
</node>
<node oor:name=".uno:InsertObjectStarImage" oor:op="replace">
@@ -661,18 +661,18 @@
</node>
<node oor:name=".uno:InsertRowBreak" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Row Break</value>
+ <value xml:lang="en-US">Insert ~Row Break</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Row Break</value>
+ <value xml:lang="en-US">~Row Break</value>
</prop>
</node>
<node oor:name=".uno:InsertSheetFromFile" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Sheet From File...</value>
+ <value xml:lang="en-US">Insert Shee~t From File...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Sheet From File...</value>
+ <value xml:lang="en-US">Shee~t From File...</value>
</prop>
</node>
<node oor:name=".uno:JumpToNextTable" oor:op="replace">
@@ -720,10 +720,10 @@
</node>
<node oor:name=".uno:Move" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Move/Copy Sheet...</value>
+ <value xml:lang="en-US">~Move/Copy Sheet...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Move/Copy...</value>
+ <value xml:lang="en-US">~Move/Copy...</value>
</prop>
</node>
<node oor:name=".uno:Name" oor:op="replace">
@@ -741,10 +741,10 @@
</node>
<node oor:name=".uno:NormalViewMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Normal View</value>
+ <value xml:lang="en-US">~Normal View</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Normal</value>
+ <value xml:lang="en-US">~Normal</value>
</prop>
</node>
<node oor:name=".uno:NoteVisible" oor:op="replace">
@@ -785,15 +785,15 @@
</node>
<node oor:name=".uno:PageFormatDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Format Page...</value>
+ <value xml:lang="en-US">Format ~Page...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Page...</value>
+ <value xml:lang="en-US">~Page...</value>
</prop>
</node>
<node oor:name=".uno:PagebreakMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Page Break Preview</value>
+ <value xml:lang="en-US">~Page Break Preview</value>
</prop>
</node>
<node oor:name=".uno:PreviousPage" oor:op="replace">
@@ -806,36 +806,36 @@
</node>
<node oor:name=".uno:Protect" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Protect Sheet...</value>
+ <value xml:lang="en-US">Protect ~Sheet...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Sheet...</value>
+ <value xml:lang="en-US">~Sheet...</value>
</prop>
</node>
<node oor:name=".uno:RecalcPivotTable" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Refresh Pivot Table</value>
+ <value xml:lang="en-US">~Refresh Pivot Table</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Refresh</value>
+ <value xml:lang="en-US">~Refresh</value>
</prop>
</node>
<node oor:name=".uno:RefreshArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Refresh Traces</value>
+ <value xml:lang="en-US">Refresh Tra~ces</value>
</prop>
</node>
<node oor:name=".uno:Remove" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Delete...</value>
+ <value xml:lang="en-US">~Delete...</value>
</prop>
</node>
<node oor:name=".uno:RenameTable" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Rename Sheet...</value>
+ <value xml:lang="en-US">~Rename Sheet...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Rename...</value>
+ <value xml:lang="en-US">~Rename...</value>
</prop>
</node>
<node oor:name=".uno:ResetPrintZoom" oor:op="replace">
@@ -845,10 +845,10 @@
</node>
<node oor:name=".uno:RowHeight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Row Height...</value>
+ <value xml:lang="en-US">Row ~Height...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Height...</value>
+ <value xml:lang="en-US">~Height...</value>
</prop>
</node>
<node oor:name=".uno:Scale" oor:op="replace">
@@ -863,7 +863,7 @@
</node>
<node oor:name=".uno:ScenarioManager" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Scenarios...</value>
+ <value xml:lang="en-US">Sc~enarios...</value>
</prop>
</node>
<node oor:name=".uno:SelectArrayFormula" oor:op="replace">
@@ -878,10 +878,10 @@
</node>
<node oor:name=".uno:SelectDB" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Select Data Range...</value>
+ <value xml:lang="en-US">Select Data ~Range...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Select Range...</value>
+ <value xml:lang="en-US">Select ~Range...</value>
</prop>
</node>
<node oor:name=".uno:SelectData" oor:op="replace">
@@ -901,28 +901,28 @@
</node>
<node oor:name=".uno:SelectTables" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Select Sheets...</value>
+ <value xml:lang="en-US">~Select Sheets...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Select...</value>
+ <value xml:lang="en-US">~Select...</value>
</prop>
</node>
<node oor:name=".uno:SendMailDocAsMS" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">E-mail as Microsoft Excel...</value>
+ <value xml:lang="en-US">E-mail as ~Microsoft Excel...</value>
</prop>
</node>
<node oor:name=".uno:SendMailDocAsOOo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">E-mail as OpenDocument Spreadsheet...</value>
+ <value xml:lang="en-US">E-mail as ~OpenDocument Spreadsheet...</value>
</prop>
</node>
<node oor:name=".uno:SetAnchorToCell" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Anchor: To Cell</value>
+ <value xml:lang="en-US">Anchor: To ~Cell</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">To Cell</value>
+ <value xml:lang="en-US">To ~Cell</value>
</prop>
</node>
<node oor:name=".uno:SetInputMode" oor:op="replace">
@@ -932,10 +932,10 @@
</node>
<node oor:name=".uno:SetOptimalColumnWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Optimal Column Width...</value>
+ <value xml:lang="en-US">~Optimal Column Width...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Optimal Width...</value>
+ <value xml:lang="en-US">~Optimal Width...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -951,10 +951,10 @@
</node>
<node oor:name=".uno:SetOptimalRowHeight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Optimal Row Height...</value>
+ <value xml:lang="en-US">~Optimal Row Height...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Optimal Height...</value>
+ <value xml:lang="en-US">~Optimal Height...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -962,75 +962,75 @@
</node>
<node oor:name=".uno:SetTabBgColor" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Tab Color...</value>
+ <value xml:lang="en-US">~Tab Color...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Tab Color...</value>
+ <value xml:lang="en-US">~Tab Color...</value>
</prop>
</node>
<node oor:name=".uno:ShareDocument" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Share Document...</value>
+ <value xml:lang="en-US">S~hare Document...</value>
</prop>
</node>
<node oor:name=".uno:SheetRightToLeft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sheet Right-To-Left</value>
+ <value xml:lang="en-US">Sheet R~ight-To-Left</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Right-To-Left</value>
+ <value xml:lang="en-US">R~ight-To-Left</value>
</prop>
</node>
<node oor:name=".uno:Show" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Show Sheets...</value>
+ <value xml:lang="en-US">~Show Sheets...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Show...</value>
+ <value xml:lang="en-US">~Show...</value>
</prop>
</node>
<node oor:name=".uno:ShowChanges" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Show Changes...</value>
+ <value xml:lang="en-US">Sho~w Changes...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Show...</value>
+ <value xml:lang="en-US">Sho~w...</value>
</prop>
</node>
<node oor:name=".uno:ShowColumn" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Show Columns</value>
+ <value xml:lang="en-US">~Show Columns</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Show</value>
+ <value xml:lang="en-US">~Show</value>
</prop>
</node>
<node oor:name=".uno:ShowDependents" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Trace Dependents</value>
+ <value xml:lang="en-US">~Trace Dependents</value>
</prop>
</node>
<node oor:name=".uno:ShowErrors" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Trace Error</value>
+ <value xml:lang="en-US">Trace ~Error</value>
</prop>
</node>
<node oor:name=".uno:ShowInvalid" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Mark Invalid Data</value>
+ <value xml:lang="en-US">~Mark Invalid Data</value>
</prop>
</node>
<node oor:name=".uno:ShowPrecedents" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Trace Precedents</value>
+ <value xml:lang="en-US">Trace ~Precedents</value>
</prop>
</node>
<node oor:name=".uno:ShowRow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Show Rows</value>
+ <value xml:lang="en-US">~Show Rows</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Show</value>
+ <value xml:lang="en-US">~Show</value>
</prop>
</node>
<node oor:name=".uno:SimpleReferenz" oor:op="replace">
@@ -1040,7 +1040,7 @@
</node>
<node oor:name=".uno:SolverDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Solver...</value>
+ <value xml:lang="en-US">Sol~ver...</value>
</prop>
</node>
<node oor:name=".uno:SortAscending" oor:op="replace">
@@ -1061,10 +1061,10 @@
</node>
<node oor:name=".uno:SplitWindow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Split Window</value>
+ <value xml:lang="en-US">~Split Window</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Split</value>
+ <value xml:lang="en-US">~Split</value>
</prop>
</node>
<node oor:name=".uno:StandardTextAttributes" oor:op="replace">
@@ -1079,7 +1079,7 @@
</node>
<node oor:name=".uno:StarChartDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Chart...</value>
+ <value xml:lang="en-US">Ch~art...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1122,15 +1122,15 @@
</node>
<node oor:name=".uno:TableEvents" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sheet Events...</value>
+ <value xml:lang="en-US">Sheet ~Events...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Events...</value>
+ <value xml:lang="en-US">~Events...</value>
</prop>
</node>
<node oor:name=".uno:TableOperationDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Multiple Operations...</value>
+ <value xml:lang="en-US">~Multiple Operations...</value>
</prop>
</node>
<node oor:name=".uno:TableSelectAll" oor:op="replace">
@@ -1140,7 +1140,7 @@
</node>
<node oor:name=".uno:TextToColumns" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Text to Columns...</value>
+ <value xml:lang="en-US">Te~xt to Columns...</value>
</prop>
</node>
<node oor:name=".uno:ToggleFormula" oor:op="replace">
@@ -1150,7 +1150,7 @@
</node>
<node oor:name=".uno:ToggleMergeCells" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Merge Cells</value>
+ <value xml:lang="en-US">M~erge Cells</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1163,10 +1163,10 @@
</node>
<node oor:name=".uno:ToolProtectionDocument" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Protect Document...</value>
+ <value xml:lang="en-US">Protect ~Document...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Document...</value>
+ <value xml:lang="en-US">~Document...</value>
</prop>
</node>
<node oor:name=".uno:ToolsOptions" oor:op="replace">
@@ -1179,10 +1179,10 @@
</node>
<node oor:name=".uno:TraceChangeMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Record Changes</value>
+ <value xml:lang="en-US">~Record Changes</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Record</value>
+ <value xml:lang="en-US">~Record</value>
</prop>
</node>
<node oor:name=".uno:UnderlineDotted" oor:op="replace">
@@ -1207,7 +1207,7 @@
</node>
<node oor:name=".uno:Validation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Validity...</value>
+ <value xml:lang="en-US">~Validity...</value>
</prop>
</node>
<node oor:name=".uno:ViewGridLines" oor:op="replace">
@@ -1217,12 +1217,12 @@
</node>
<node oor:name=".uno:ViewRowColumnHeaders" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Column & Row Headers</value>
+ <value xml:lang="en-US">C~olumn & Row Headers</value>
</prop>
</node>
<node oor:name=".uno:ViewValueHighlighting" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Value Highlighting</value>
+ <value xml:lang="en-US">Value ~Highlighting</value>
</prop>
</node>
<node oor:name=".uno:WrapText" oor:op="replace">
@@ -1234,17 +1234,17 @@
<node oor:name="Popups">
<node oor:name=".uno:AuditMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Detective</value>
+ <value xml:lang="en-US">~Detective</value>
</prop>
</node>
<node oor:name=".uno:CellContentsMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Cell Contents</value>
+ <value xml:lang="en-US">Cell Co~ntents</value>
</prop>
</node>
<node oor:name=".uno:ColumnMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Column</value>
+ <value xml:lang="en-US">Colu~mn</value>
</prop>
</node>
<node oor:name=".uno:DataMenu" oor:op="replace">
@@ -1254,22 +1254,22 @@
</node>
<node oor:name=".uno:DataPilotMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Pivot Table</value>
+ <value xml:lang="en-US">~Pivot Table</value>
</prop>
</node>
<node oor:name=".uno:DelBreakMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Delete Manual Break</value>
+ <value xml:lang="en-US">Delete Manual ~Break</value>
</prop>
</node>
<node oor:name=".uno:DrawGraphicMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Graphic</value>
+ <value xml:lang="en-US">Graph~ic</value>
</prop>
</node>
<node oor:name=".uno:EditSheetMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sheet</value>
+ <value xml:lang="en-US">~Sheet</value>
</prop>
</node>
<node oor:name=".uno:FillCellsMenu" oor:op="replace">
@@ -1279,7 +1279,7 @@
</node>
<node oor:name=".uno:FilterMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Filter</value>
+ <value xml:lang="en-US">~Filter</value>
</prop>
</node>
<node oor:name=".uno:FormatCellBorders" oor:op="replace">
@@ -1289,47 +1289,47 @@
</node>
<node oor:name=".uno:GroupOutlineMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Group and Outline</value>
+ <value xml:lang="en-US">~Group and Outline</value>
</prop>
</node>
<node oor:name=".uno:InsertBreakMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Manual Break</value>
+ <value xml:lang="en-US">~Manual Break</value>
</prop>
</node>
<node oor:name=".uno:MergeCellsMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Merge Cells</value>
+ <value xml:lang="en-US">M~erge Cells</value>
</prop>
</node>
<node oor:name=".uno:NamesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Names</value>
+ <value xml:lang="en-US">~Names</value>
</prop>
</node>
<node oor:name=".uno:PrintRangesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Print Ranges</value>
+ <value xml:lang="en-US">Pri~nt Ranges</value>
</prop>
</node>
<node oor:name=".uno:ProtectMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Protect Document</value>
+ <value xml:lang="en-US">~Protect Document</value>
</prop>
</node>
<node oor:name=".uno:RowMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Row</value>
+ <value xml:lang="en-US">~Row</value>
</prop>
</node>
<node oor:name=".uno:SendTo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Send</value>
+ <value xml:lang="en-US">Sen~d</value>
</prop>
</node>
<node oor:name=".uno:SheetMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sheet</value>
+ <value xml:lang="en-US">~Sheet</value>
</prop>
</node>
</node>