diff options
Diffstat (limited to 'scripting')
| -rwxr-xr-x | scripting/examples/java/build.xml | 6 | ||||
| -rwxr-xr-x | scripting/java/build.xml | 5 | ||||
| -rw-r--r-- | scripting/source/basprov/basprov.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 4 | ||||
| -rwxr-xr-x | scripting/source/pyprov/makefile.mk | 12 | ||||
| -rw-r--r-- | scripting/source/pyprov/msgbox.py | 260 | ||||
| -rw-r--r-- | scripting/source/runtimemgr/ScriptRuntimeManager.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 30 | ||||
| -rwxr-xr-x | scripting/workben/bindings/drawmenubar.xml | 12 | ||||
| -rwxr-xr-x | scripting/workben/bindings/impressmenubar.xml | 12 | ||||
| -rwxr-xr-x | scripting/workben/build.xml | 1 |
12 files changed, 303 insertions, 49 deletions
diff --git a/scripting/examples/java/build.xml b/scripting/examples/java/build.xml index 6b19577d8b86..cb399d6daccb 100755 --- a/scripting/examples/java/build.xml +++ b/scripting/examples/java/build.xml @@ -47,7 +47,7 @@ <javac srcdir="HelloWorld" destdir="${outdir}/HelloWorld" includes="**/*.java" classpathref="idlclasspath" - debug="${debug}" optimize="${optimize}" deprecation="on"/> + debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/> <copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/> <copy file="HelloWorld/parcel-descriptor.xml" todir="${outdir}/HelloWorld"/> @@ -69,7 +69,7 @@ <javac srcdir="Highlight" destdir="${outdir}/Highlight" includes="**/*.java" classpathref="idlclasspath" - debug="${debug}" optimize="${optimize}" deprecation="on"/> + debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/> <copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/> <copy file="Highlight/parcel-descriptor.xml" todir="${outdir}/Highlight"/> @@ -91,7 +91,7 @@ <javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage" includes="**/*.java" classpathref="idlclasspath" - debug="${debug}" optimize="${optimize}" deprecation="on"/> + debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/> <copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/> <copy file="MemoryUsage/parcel-descriptor.xml" todir="${outdir}/MemoryUsage"/> diff --git a/scripting/java/build.xml b/scripting/java/build.xml index e068237d4618..2abb784a387e 100755 --- a/scripting/java/build.xml +++ b/scripting/java/build.xml @@ -29,7 +29,6 @@ <!-- =================== Environmental Properties ======================= --> <property name="prj" value=".."/> - <property name="build.compiler" value="classic"/> <property name="optimize" value="off"/> <property name="debug" value="on"/> <property name="jardir" value="${out}/class"/> @@ -98,12 +97,12 @@ <target name="compile" depends="prepare"> <javac srcdir="com" destdir="${jardir}" includes="**/*.java" classpathref="idlclasspath" - debug="${debug}" optimize="${optimize}" deprecation="off"> + debug="${debug}" optimize="${optimize}" deprecation="off" includeantruntime="false"> <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/> </javac> <javac srcdir="Framework/" destdir="${jardir}" includes="**/*.java" classpathref="idlclasspath" debug="${debug}" - optimize="${optimize}" deprecation="off"> + optimize="${optimize}" deprecation="off" includeantruntime="false"> <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/> </javac> </target> diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 40a4cced46d1..1be60dabb72c 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -188,7 +188,7 @@ namespace basprov if ( aFileURL.getLength() ) { osl::DirectoryItem aFileItem; - osl::FileStatus aFileStatus( FileStatusMask_FileURL ); + osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL ); OSL_VERIFY( osl::DirectoryItem::get( aFileURL, aFileItem ) == osl::FileBase::E_None ); OSL_VERIFY( aFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None ); ::rtl::OUString aCanonicalFileURL( aFileStatus.getFileURL() ); diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index fc2f5aab953e..43a35f4af568 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -893,7 +893,7 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { (void)ppEnv; @@ -901,7 +901,7 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 3c2f97a040ba..4450228705b5 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -515,7 +515,7 @@ extern "C" #undef css #define css ::com::sun::star - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName, uno_Environment** ppEnvironment ) { (void)ppEnvironment; @@ -523,7 +523,7 @@ extern "C" *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } - void* SAL_CALL component_getFactory( const sal_Char * pImplementationName , + SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplementationName , void * pServiceManager , void * pRegistryKey ) { diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk index fa43858021bb..a304d972ee52 100755 --- a/scripting/source/pyprov/makefile.mk +++ b/scripting/source/pyprov/makefile.mk @@ -35,10 +35,12 @@ TARGET=pyprov .INCLUDE : settings.mk # --- Targets ------------------------------------------------------ -.IF "$(DISABLE_PYTHON)" != "TRUE" +# mailmerge is put in an extra services.rdb +# simply do not fiddle with that. cws sb123, sb129 ALL : ALLTAR \ $(DLLDEST)$/officehelper.py \ - $(DLLDEST)$/mailmerge.py + $(DLLDEST)$/msgbox.py \ + $(DLLDEST)$/mailmerge.py $(DLLDEST)$/%.py: %.py cp $? $@ @@ -68,9 +70,3 @@ COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py .INCLUDE : target.mk .ENDIF - -.ELSE - -.INCLUDE : target.mk - -.ENDIF diff --git a/scripting/source/pyprov/msgbox.py b/scripting/source/pyprov/msgbox.py new file mode 100644 index 000000000000..c9ee80bac80f --- /dev/null +++ b/scripting/source/pyprov/msgbox.py @@ -0,0 +1,260 @@ +# -*- tab-width: 4; indent-tabs-mode: nil -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Laurent Godard <listes.godard@laposte.net> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# Timo <timo@iera.de> +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +# prepare pythoin environnement - Add the path of this class +from os import path +from sys import modules +from sys import path as syspath + +# pyUNO program itself +import uno, unohelper + +# UNO GUI toolkit +from com.sun.star.awt.WindowClass import TOP, SIMPLE +from com.sun.star.awt.PushButtonType import STANDARD as standard +from com.sun.star.awt.PushButtonType import OK as ok +from com.sun.star.awt.PushButtonType import CANCEL as cancel +from com.sun.star.awt.PushButtonType import HELP as help +from com.sun.star.awt.TextAlign import CENTER as center +from com.sun.star.awt.TextAlign import LEFT as left +from com.sun.star.awt.TextAlign import RIGHT as right + +# used UNO listeners +from com.sun.star.awt import XActionListener + +class MsgBox(unohelper.Base): + """Inspect UNO object, link to sdk and recusrsive calls""" + + def __init__(self, aContext): + """acontext : a Valid UNO context + """ + + self.VERSION = '0.1' + self.ctx = aContext + self.smgr = aContext.ServiceManager + # UI Dialog object + self.dialog=None + # List of openned Listeners + self.lst_listeners={} + #UI parameters + self.ButtonSize = 50 + self.boxSize = 200 + self.lineHeight = 10 + self.fromBroxSize = False + self.numberOfLines = -1 + + self.Buttons = [] + self.Response = '' + + return + + ##################################################### + # GUI definition # + ##################################################### + def _createBox(self): + """Create the Box""" + + # computes parameters of the message dialog + if self.numberOfLines == -1: + #calculate + numberOfLines = len(self.message.split(chr(10))) + else: + numberOfLines = self.numberOfLines + + numberOfButtons = len(self.Buttons) + self.ButtonSpace = self.ButtonSize/2 + if self.fromBroxSize: + # button size is calculated from boxsize + size = (2 * self.boxSize) / (3 * numberOfButtons + 1) + self.ButtonSize = size + self.ButtonSpace = self.ButtonSize/2 + else: + # boxsize i calculated form buttonsize + self.boxSize = numberOfButtons * (self.ButtonSize + + self.ButtonSpace) + self.ButtonSpace + + # create the dialog model and set the properties + dialog_model = self.smgr.createInstanceWithContext( + 'com.sun.star.awt.UnoControlDialogModel', + self.ctx) + dialog_model.PositionX = 50 + dialog_model.Step = 1 + dialog_model.TabIndex = 7 + dialog_model.Width = self.boxSize#numberOfButtons * (self.ButtonSize + + # self.ButtonSpace) + 25 + dialog_model.Height = 10 + self.lineHeight * numberOfLines + 10 + 12 + 10 + dialog_model.PositionY = 63 + dialog_model.Sizeable = True + dialog_model.Closeable = False + + dialog = self.smgr.createInstanceWithContext( + 'com.sun.star.awt.UnoControlDialog', self.ctx) + + # label Label0 + label = dialog_model.createInstance( + 'com.sun.star.awt.UnoControlFixedTextModel') + label.PositionX = 10 + label.TabIndex = 9 + label.Width = dialog_model.Width - label.PositionX + label.Height = self.lineHeight* numberOfLines + label.PositionY = 10 + label.Align = left + label.MultiLine = True + label.Label = self.message + dialog_model.insertByName('Label0', label) + + nb = 0 + for buttonName in self.Buttons: + nb +=1 + button = dialog_model.createInstance( + 'com.sun.star.awt.UnoControlButtonModel') + button.PositionX = nb * self.ButtonSpace + (nb-1)* self.ButtonSize + button.TabIndex = 8 + button.Height = 12 + button.Width = self.ButtonSize + button.PositionY = 10 + label.Height + 10 + button.PushButtonType = standard + if nb == 1: + button.DefaultButton = True + else: + button.DefaultButton = False + button.Label = buttonName + dialog_model.insertByName('Btn' + str(nb), button ) + + if not dialog.getModel(): + dialog.setModel(dialog_model) + + # UNO toolkit definition + toolkit = self.smgr.createInstanceWithContext('com.sun.star.awt.Toolkit', self.ctx) + a_rect = uno.createUnoStruct( 'com.sun.star.awt.Rectangle' ) + a_rect.X = 50 + dialog.setTitle ( self.title ) + a_rect.Width = 270 + a_rect.Height = 261 + a_rect.Y = 63 + win_descriptor = uno.createUnoStruct('com.sun.star.awt.WindowDescriptor') + win_descriptor.Type = TOP + win_descriptor.ParentIndex = -1 + win_descriptor.Bounds = a_rect + peer = toolkit.createWindow( win_descriptor ) + dialog.createPeer( toolkit, peer ) + + return dialog + + def _addListeners(self): + """Add listeners to dialog""" + nb = 0 + for buttonName in self.Buttons: + nb +=1 + a_control = self.dialog.getControl('Btn'+str(nb)) + the_listener = ButtonListener(self) + a_control.addActionListener(the_listener) + self.lst_listeners['Btn'+str(nb)] = the_listener + return + + def _removeListeners(self): + """ remove listeners on exiting""" + nb = 0 + for buttonName in self.Buttons: + nb +=1 + a_control = self.dialog.getControl('Btn'+str(nb)) + a_control.removeActionListener(self.lst_listeners['Btn'+str(nb)]) + return + + def show(self, message, decoration, title): + self.message = message + self.decoration = decoration + self.title = title + # Create GUI + self.dialog = self._createBox() + self._addListeners() + #execute the dialog --> blocking call + self.dialog.execute() + #end --> release listeners and dispose dialog + self._removeListeners() + self.dialog.dispose() + return self.Response + + def addButton(self, caption): + self.Buttons.append(caption) + return + + def renderFromBoxSize(self, size = 150): + self.boxSize = size + self.fromBroxSize = True + return + + def renderFromButtonSize(self, size = 50): + self.ButtonSize = size + self.fromBroxSize = False + return + +class ButtonListener(unohelper.Base, XActionListener): + """Stops the MessageBox, sets the button label as returned value""" + def __init__(self, caller): + self.caller = caller + + def disposing(self, eventObject): + pass + + def actionPerformed(self, actionEvent): + button = actionEvent.Source + self.caller.Response = button.Model.Label + self.caller.dialog.endExecute() + return + +### TEST +if __name__ == '__main__': + # get the uno component context from the PyUNO runtime + localContext = uno.getComponentContext() + + # create the UnoUrlResolver + resolver = localContext.ServiceManager.createInstanceWithContext( + "com.sun.star.bridge.UnoUrlResolver", localContext ) + + # connect to the running office + # OOo has to be launched in listen mode as + # ./soffice "-accept=socket,host=localhost,port=2002;urp;" + ctx = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext" ) + myBox = MsgBox(ctx) + myBox.addButton("Yes") + myBox.addButton("No") + myBox.addButton("May be") + myBox.renderFromBoxSize(150) + myBox.numberOflines = 2 + + print myBox.show("A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message " + chr(10)+chr(10)+"Do you agree ?",0,"Dialog title") + + myBox = MsgBox(ctx) + myBox.addButton("oK") + myBox.renderFromButtonSize() + myBox.numberOflines = 2 + + print myBox.show("A small message",0,"Dialog title") diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx index 6a9ccede733d..ce05625d19dd 100644 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx @@ -460,7 +460,7 @@ static struct cppu::ImplementationEntry s_entries [] = */ extern "C" { - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -475,7 +475,7 @@ extern "C" * data * @return a component factory */ - void * SAL_CALL component_getFactory( const sal_Char * pImplName, + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index cb60dc182975..48f4625a8bc7 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -123,13 +123,13 @@ StringResourceImpl::StringResourceImpl( const Reference< XComponentContext >& rx StringResourceImpl::~StringResourceImpl() { - for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; delete pLocaleItem; } - for( LocaleItemVectorIt it = m_aDeletedLocaleItemVector.begin(); it != m_aDeletedLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aDeletedLocaleItemVector.begin(); it != m_aDeletedLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; delete pLocaleItem; @@ -326,7 +326,7 @@ Sequence< Locale > StringResourceImpl::getLocales( ) Sequence< Locale > aLocalSeq( nSize ); Locale* pLocales = aLocalSeq.getArray(); int iTarget = 0; - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; pLocales[iTarget] = pLocaleItem->m_locale; @@ -566,7 +566,7 @@ void StringResourceImpl::removeLocale( const Locale& locale ) if( m_pCurrentLocaleItem == pRemoveItem || m_pDefaultLocaleItem == pRemoveItem ) { - for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != pRemoveItem ) @@ -586,7 +586,7 @@ void StringResourceImpl::removeLocale( const Locale& locale ) } } } - for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem == pRemoveItem ) @@ -666,7 +666,7 @@ LocaleItem* StringResourceImpl::getItemForLocale LocaleItem* pRetItem = NULL; // Search for locale - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem ) @@ -699,7 +699,7 @@ LocaleItem* StringResourceImpl::getClosestMatchItemForLocale( const Locale& loca // Search for locale for( sal_Int32 iPass = 0 ; iPass <= 2 ; ++iPass ) { - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem ) @@ -1058,7 +1058,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage } } - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL && (bStoreAll || pLocaleItem->m_bModified) && @@ -1097,7 +1097,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage if( bUsedForStore ) { for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin(); - it != m_aChangedDefaultLocaleVector.end(); it++ ) + it != m_aChangedDefaultLocaleVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) @@ -1196,7 +1196,7 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles { // Delete files for changed defaults for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin(); - it != m_aChangedDefaultLocaleVector.end(); it++ ) + it != m_aChangedDefaultLocaleVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) @@ -1228,7 +1228,7 @@ void StringResourcePersistenceImpl::implStoreAtLocation if( bUsedForStore || bKillAll ) implKillRemovedLocaleFiles( Location, aNameBase, xFileAccess ); - for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL && (bStoreAll || bKillAll || pLocaleItem->m_bModified) && @@ -1431,7 +1431,7 @@ Sequence< sal_Int8 > StringResourcePersistenceImpl::exportBinary( ) sal_Int32 iLocale = 0; sal_Int32 iDefault = 0; for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); - it != m_aLocaleItemVector.end(); it++,iLocale++ ) + it != m_aLocaleItemVector.end(); ++it,++iLocale ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) @@ -1740,7 +1740,7 @@ bool checkNamingSceme( const ::rtl::OUString& aName, const ::rtl::OUString& aNam void StringResourcePersistenceImpl::implLoadAllLocales( void ) { - for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ ) + for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) @@ -3071,7 +3071,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { (void)ppEnv; @@ -3079,7 +3079,7 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/workben/bindings/drawmenubar.xml b/scripting/workben/bindings/drawmenubar.xml index 2fbfe5416428..5f115b98bcab 100755 --- a/scripting/workben/bindings/drawmenubar.xml +++ b/scripting/workben/bindings/drawmenubar.xml @@ -120,7 +120,7 @@ <menu:menuseparator/> <menu:menu menu:id="slot:338" menu:label="~Grid"> <menu:menupopup> - <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Visible Grid"/> + <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Display Grid"/> <menu:menuitem menu:id="slot:27154" menu:helpid="27154" menu:label="Snap to Grid"/> <menu:menuitem menu:id="slot:27323" menu:helpid="27323" menu:label="Grid to ~Front"/> </menu:menupopup> @@ -128,9 +128,9 @@ <menu:menuseparator/> <menu:menu menu:id="slot:339" menu:label="~Snap Lines"> <menu:menupopup> - <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Snap Lines Visible"/> - <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="Snap to Snap Lines"/> - <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to Front"/> + <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Display Snap Lines"/> + <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="~Snap to Snap Lines"/> + <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to ~Front"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> @@ -197,8 +197,8 @@ <menu:menuitem menu:id="slot:27338" menu:helpid="27338" menu:label="~Connector..."/> <menu:menuseparator/> <menu:menuitem menu:id="slot:10296" menu:helpid="10296" menu:label="C~haracter..."/> - <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Numbering/Bullets..."/> - <menu:menu menu:id="slot:1" menu:label="Case/Characters"> + <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Bullets and Numbering..."/> + <menu:menu menu:id="slot:1" menu:label="~Change Case"> <menu:menupopup> <menu:menuitem menu:id="slot:10912" menu:helpid="10912" menu:label="~Uppercase"/> <menu:menuitem menu:id="slot:10913" menu:helpid="10913" menu:label="~Lowercase"/> diff --git a/scripting/workben/bindings/impressmenubar.xml b/scripting/workben/bindings/impressmenubar.xml index 627fd168159c..02d6d66d16de 100755 --- a/scripting/workben/bindings/impressmenubar.xml +++ b/scripting/workben/bindings/impressmenubar.xml @@ -138,7 +138,7 @@ <menu:menuseparator/> <menu:menu menu:id="slot:338" menu:label="~Grid"> <menu:menupopup> - <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Visible Grid"/> + <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Display Grid"/> <menu:menuitem menu:id="slot:27154" menu:helpid="27154" menu:label="Snap to Grid"/> <menu:menuitem menu:id="slot:27323" menu:helpid="27323" menu:label="Grid to ~Front"/> </menu:menupopup> @@ -146,9 +146,9 @@ <menu:menuseparator/> <menu:menu menu:id="slot:339" menu:label="~Snap Lines"> <menu:menupopup> - <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Snap Lines Visible"/> - <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="Snap to Snap Lines"/> - <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to Front"/> + <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Display Snap Lines"/> + <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="~Snap to Snap Lines"/> + <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to ~Front"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> @@ -215,8 +215,8 @@ <menu:menuitem menu:id="slot:27338" menu:helpid="27338" menu:label="~Connector..."/> <menu:menuseparator/> <menu:menuitem menu:id="slot:10296" menu:helpid="10296" menu:label="C~haracter..."/> - <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Numbering/Bullets..."/> - <menu:menu menu:id="slot:1" menu:label="Case/Characters"> + <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Bullets and Numbering..."/> + <menu:menu menu:id="slot:1" menu:label="~Change Case"> <menu:menupopup> <menu:menuitem menu:id="slot:10912" menu:helpid="10912" menu:label="~Uppercase"/> <menu:menuitem menu:id="slot:10913" menu:helpid="10913" menu:label="~Lowercase"/> diff --git a/scripting/workben/build.xml b/scripting/workben/build.xml index fa36ad4869c7..1a3e464783f4 100755 --- a/scripting/workben/build.xml +++ b/scripting/workben/build.xml @@ -30,7 +30,6 @@ <property name="prj" value=".."/> <property file="${prj}/java/build.env"/> - <property name="build.compiler" value="classic"/> <property name="optimize" value="on"/> <property name="debug" value="on"/> <property name="installerclasses" value="${out}/class/sframeworkinstall"/> |