You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/03 14:24:38 UTC
svn commit: r1441909 [12/45] - in /openoffice/branches/l10n: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/
ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/
extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Modified: openoffice/branches/l10n/extras/l10n/source/te/localize.sdf
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/extras/l10n/source/te/localize.sdf?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/extras/l10n/source/te/localize.sdf (original)
+++ openoffice/branches/l10n/extras/l10n/source/te/localize.sdf Sun Feb 3 13:23:59 2013
@@ -13740,7 +13740,7 @@ scp2 source\impress\folderitem_impress.u
scp2 source\impress\module_impress.ulf 0 LngText STR_NAME_MODULE_PRG_IMPRESS 0 te %PRODUCTNAME à°à°à°ªà±à°°à±à°¸à± 2002-02-02 02:02:02
scp2 source\impress\module_impress.ulf 0 LngText STR_DESC_MODULE_PRG_IMPRESS 0 te à°ªà±à°à°²à°ªà±à°°à°¦à°°à±à°¶à°¨à°²à±,సమావà±à°¶à°®à±à°²à±,మహాతల à°ªà±à°à°² à°à±à°°à°à± à°ªà±à°°à°¦à°°à±à°¶à°¨à°²à°¨à± %PRODUCTNAME à°®à±à°¦à±à°°à°¨à± వినియà±à°à°¿à°à°à°¿ à°¸à±à°·à±à°à°¿à°à°à± మరియౠసరిà°à±à°¯à°¿ 2002-02-02 02:02:02
scp2 source\impress\module_impress.ulf 0 LngText STR_NAME_MODULE_PRG_IMPRESS_BIN 0 te à°à°¾à°°à±à°¯à°à±à°°à°®à° à°
ధిà°à°¾à°à° 2002-02-02 02:02:02
-scp2 source\impress\module_impress.ulf 0 LngText STR_DESC_MODULE_PRG_IMPRESS_BIN 0 te %%PRODUCTNAME à°®à±à°¦à±à°° à°à°¾à°°à±à°¯à°à±à°·à±à°¤à±à°°à°®à± 2002-02-02 02:02:02
+scp2 source\impress\module_impress.ulf 0 LngText STR_DESC_MODULE_PRG_IMPRESS_BIN 0 te %PRODUCTNAME à°®à±à°¦à±à°° à°à°¾à°°à±à°¯à°à±à°·à±à°¤à±à°°à°®à± 2002-02-02 02:02:02
scp2 source\impress\module_impress.ulf 0 LngText STR_NAME_MODULE_PRG_IMPRESS_HELP 0 te %PRODUCTNAME à°®à±à°¦à±à°° సహాయమౠ2002-02-02 02:02:02
scp2 source\impress\module_impress.ulf 0 LngText STR_DESC_MODULE_PRG_IMPRESS_HELP 0 te %PRODUCTNAME à°®à±à°¦à±à°° à°à±à°°à°¿à°à°à°¿ సహాయమౠ2002-02-02 02:02:02
scp2 source\impress\module_ogltrans.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_OGLTRANS 0 te %PRODUCTNAME à°à°à°ªà±à°°à±à°¸à± à°à±à°°à°à± OpenGL à°¸à±à°²à±à°¡à± à°à±à°°à°¾à°¨à±à°¸à°¿à°·à°¨à± 2002-02-02 02:02:02
Modified: openoffice/branches/l10n/extras/l10n/source/uz/localize.sdf
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/extras/l10n/source/uz/localize.sdf?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/extras/l10n/source/uz/localize.sdf (original)
+++ openoffice/branches/l10n/extras/l10n/source/uz/localize.sdf Sun Feb 3 13:23:59 2013
@@ -54352,7 +54352,7 @@ scp2 source\writer\registryitem_writer.u
scp2 source\writer\registryitem_writer.ulf 0 LngText STR_REG_VAL_MS_WORD_TEMPLATE 0 uz Microsoft Word shabloni 2002-02-02 02:02:02
scp2 source\writer\registryitem_writer.ulf 0 LngText STR_REG_VAL_MS_RTF_DOCUMENT 0 uz RTF hujjat 2002-02-02 02:02:02
scp2 source\writer\module_writer.ulf 0 LngText STR_NAME_MODULE_PRG_WRT 0 uz %PRODUCTNAME Writer 2002-02-02 02:02:02
-scp2 source\writer\module_writer.ulf 0 LngText STR_DESC_MODULE_PRG_WRT 0 uz %PRODUCTNAM Writer yordamida xatlar uchun matnlar, hisobotlar, hujjatlar yoki veb sahifalar yaratish. 2002-02-02 02:02:02
+scp2 source\writer\module_writer.ulf 0 LngText STR_DESC_MODULE_PRG_WRT 0 uz %PRODUCTNAME Writer yordamida xatlar uchun matnlar, hisobotlar, hujjatlar yoki veb sahifalar yaratish. 2002-02-02 02:02:02
scp2 source\writer\module_writer.ulf 0 LngText STR_NAME_MODULE_PRG_WRT_BIN 0 uz Dastur moduli 2002-02-02 02:02:02
scp2 source\writer\module_writer.ulf 0 LngText STR_DESC_MODULE_PRG_WRT_BIN 0 uz %PRODUCTNAME Writer dasturi 2002-02-02 02:02:02
scp2 source\writer\module_writer.ulf 0 LngText STR_NAME_MODULE_PRG_WRT_HELP 0 uz %PRODUCTNAME Writer uchun qoʻllanma 2002-02-02 02:02:02
Modified: openoffice/branches/l10n/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/RepositoryFixes.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/RepositoryFixes.mk (original)
+++ openoffice/branches/l10n/main/RepositoryFixes.mk Sun Feb 3 13:23:59 2013
@@ -173,14 +173,12 @@ gb_Library_FILENAMES := $(patsubst cppuh
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:cppunit%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:iicuc%,cui:icuc%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst i18nutil:i18nutil%,i18nutil:i18nutilgcc3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess3gcc3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:jvmfwk%,jvmfwk:jvmfwk3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:tl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sal:sal%,sal:sal3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:salhelper%,salhelper:salhelp3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst sb:sb%,sb:basic%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svl:isvl%,svl:svl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
Modified: openoffice/branches/l10n/main/UnoControls/inc/basecontrol.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/UnoControls/inc/basecontrol.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/UnoControls/inc/basecontrol.hxx (original)
+++ openoffice/branches/l10n/main/UnoControls/inc/basecontrol.hxx Sun Feb 3 13:23:59 2013
@@ -83,7 +83,6 @@
#include <com/sun/star/awt/XComboBox.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XCheckBox.hpp>
-#include <com/sun/star/awt/MessageBoxCommand.hpp>
#include <com/sun/star/awt/XLayoutConstrains.hpp>
#include <com/sun/star/awt/XProgressBar.hpp>
#include <com/sun/star/awt/XTopWindow.hpp>
Modified: openoffice/branches/l10n/main/UnoControls/source/inc/progressmonitor.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/UnoControls/source/inc/progressmonitor.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/UnoControls/source/inc/progressmonitor.hxx (original)
+++ openoffice/branches/l10n/main/UnoControls/source/inc/progressmonitor.hxx Sun Feb 3 13:23:59 2013
@@ -63,7 +63,6 @@
#include <com/sun/star/awt/XComboBox.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XCheckBox.hpp>
-#include <com/sun/star/awt/MessageBoxCommand.hpp>
#include <com/sun/star/awt/XLayoutConstrains.hpp>
#include <com/sun/star/awt/XProgressBar.hpp>
Modified: openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java (original)
+++ openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java Sun Feb 3 13:23:59 2013
@@ -131,4 +131,4 @@ public class KeyHandler extends Componen
public void disposing(com.sun.star.lang.EventObject event) {
java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher(this);
}
-};
+}
Modified: openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java (original)
+++ openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java Sun Feb 3 13:23:59 2013
@@ -336,7 +336,6 @@ public class AccessibleKeyBinding extend
keycode = java.awt.event.KeyEvent.VK_HELP;
break;
default:
- ;
}
return keycode;
}
Modified: openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/Alert.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/Alert.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/Alert.java (original)
+++ openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/Alert.java Sun Feb 3 13:23:59 2013
@@ -58,5 +58,5 @@ public class Alert extends Dialog {
public AccessibleRole getAccessibleRole() {
return AccessibleRole.ALERT;
}
- };
+ }
}
Modified: openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/Frame.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/Frame.java (original)
+++ openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/Frame.java Sun Feb 3 13:23:59 2013
@@ -472,7 +472,7 @@ public class Frame extends java.awt.Fram
*
* @return an instance of AccessibleState containing the current state
* of the object
- * @see AccessibleState
+ * @see javax.accessibility.AccessibleState
*/
public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
javax.accessibility.AccessibleStateSet states = super.getAccessibleStateSet();
Modified: openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java (original)
+++ openoffice/branches/l10n/main/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java Sun Feb 3 13:23:59 2013
@@ -76,7 +76,7 @@ class MenuItem extends ToggleButton {
*
* @return an instance of <code>AccessibleStateSet</code>
* containing the current state set of the object
- * @see AccessibleState
+ * @see javax.accessibility.AccessibleState
*/
public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
javax.accessibility.AccessibleStateSet stateSet = super.getAccessibleStateSet();
Modified: openoffice/branches/l10n/main/apache-commons/patches/logging.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/apache-commons/patches/logging.patch?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/apache-commons/patches/logging.patch (original)
+++ openoffice/branches/l10n/main/apache-commons/patches/logging.patch Sun Feb 3 13:23:59 2013
@@ -5,7 +5,7 @@
<!-- Version of java class files to generate. -->
- <property name="target.version" value="1.1"/>
-+ <property name="target.version" value="1.3"/>
++ <property name="target.version" value="1.5"/>
<!-- Version of java source to accept -->
- <property name="source.version" value="1.2"/>
Modified: openoffice/branches/l10n/main/automation/inc/automation/commtypes.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/automation/inc/automation/commtypes.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/automation/inc/automation/commtypes.hxx (original)
+++ openoffice/branches/l10n/main/automation/inc/automation/commtypes.hxx Sun Feb 3 13:23:59 2013
@@ -65,7 +65,7 @@ typedef sal_uInt32 comm_UINT32;
typedef sal_uInt16 comm_WORD;
typedef sal_uInt32 comm_DWORD;
-class rtl::OString;
+namespace rtl { class OString; }
class String;
#define comm_String String
Modified: openoffice/branches/l10n/main/automation/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/automation/prj/build.lst?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/automation/prj/build.lst (original)
+++ openoffice/branches/l10n/main/automation/prj/build.lst Sun Feb 3 13:23:59 2013
@@ -5,7 +5,8 @@ au automation\source\simplecm nmake -
au automation\source\communi nmake - all au_comm au_inc NULL
au automation\source\app nmake - all au_app au_inc NULL
au automation\source\server nmake - all au_server au_inc NULL
-au automation\source\testtool nmake - all au_tt au_inc NULL
-au automation\source\miniapp nmake - all au_mini au_inc NULL
-au automation\packimages nmake - all au_pack NULL
-au automation\util nmake - all au_util au_scom au_comm au_app au_mini au_server au_tt NULL
+#au automation\source\testtool nmake - all au_tt au_inc NULL
+#au automation\source\miniapp nmake - all au_mini au_inc NULL
+#au automation\packimages nmake - all au_pack NULL
+au automation\util nmake - all au_util au_scom au_comm au_app au_server NULL
+#au automation\util nmake - all au_util au_scom au_comm au_app au_mini au_server au_tt NULL
Modified: openoffice/branches/l10n/main/automation/source/server/statemnt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/automation/source/server/statemnt.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/automation/source/server/statemnt.cxx (original)
+++ openoffice/branches/l10n/main/automation/source/server/statemnt.cxx Sun Feb 3 13:23:59 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
#include <com/sun/star/frame/XFramesSupplier.hpp>
@@ -31,39 +29,19 @@
#include <comphelper/uieventslogger.hxx>
#include <tools/wintypes.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/menubtn.hxx>
#include <svtools/svtreebx.hxx>
#include <svtools/brwbox.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _DOCKWIN_HXX //autogen
#include <vcl/dockwin.hxx>
-#endif
-#ifndef _FLOATWIN_HXX //autogen
#include <vcl/floatwin.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
-#ifndef _MOREBTN_HXX //autogen
#include <vcl/morebtn.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _TOOLBOX_HXX //autogen
#include <vcl/toolbox.hxx>
-#endif
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/menu.hxx>
@@ -81,7 +59,6 @@
#include <svtools/table/tablecontrolinterface.hxx>
#include <svl/poolitem.hxx>
#include <svtools/extensionlistbox.hxx>
-// Hat keinen Includeschutz
#include <svtools/svtdata.hxx>
#include <tools/time.hxx>
#include <svtools/stringtransfer.hxx>
@@ -89,40 +66,29 @@
#include <tools/fsys.hxx>
#include <svl/stritem.hxx>
#include <svtools/ttprops.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include <basic/dispdefs.hxx>
#include <basic/sbuno.hxx>
#include <vos/socket.hxx>
#include <svl/pickerhistory.hxx>
#include <com/sun/star/util/XCancellable.hpp>
-
#include <sot/storage.hxx>
#include <sot/storinfo.hxx>
#include "statemnt.hxx"
#include "scmdstrm.hxx"
-
-#ifndef _RETSRTM_HXX
#include "retstrm.hxx"
-#endif
-
#if OSL_DEBUG_LEVEL > 1
#include "editwin.hxx"
#endif
#include "rcontrol.hxx"
#include <automation/communi.hxx>
#include "testtool.hxx"
-
#include "profiler.hxx"
-
#include "recorder.hxx"
-
#include "testtool.hrc"
#include <basic/svtmsg.hrc>
-
#include <algorithm>
-
+#include <vcl/dibtools.hxx>
using namespace com::sun::star::frame;
using namespace com::sun::star::uno;
@@ -3932,7 +3898,7 @@ sal_Bool StatementControl::HandleVisible
SvFileStream fOut;
fOut.Open(aString1,STREAM_STD_WRITE);
- aBmp.Write(fOut);
+ WriteDIB(aBmp, fOut, true, true);
if ( fOut.GetError() )
ReportError( aUId, GEN_RES_STR1( S_ERROR_SAVING_IMAGE, UniString::CreateFromInt32( fOut.GetError() ) ) );
fOut.Close();
Modified: openoffice/branches/l10n/main/automation/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/automation/util/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/automation/util/makefile.mk (original)
+++ openoffice/branches/l10n/main/automation/util/makefile.mk Sun Feb 3 13:23:59 2013
@@ -130,18 +130,18 @@ DEF3DES =Communication
# --- TESTTOOL IDE ------------------------------------------------------
-APP1TARGET=testtool
+#APP1TARGET=testtool
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN)
-.ELSE
-APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN)
-.ENDIF
-APP1STDLIBS= \
+#.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
+#APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN)
+#.ELSE
+#APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN)
+#.ENDIF
+#APP1STDLIBS= \
$(APP3RDLIB) \
$(SAMPLE3RDLIB)
-APP1STDLIBS+= \
+#APP1STDLIBS+= \
$(CPPUHELPERLIB) \
$(TOOLSLIB) \
$(UNOTOOLSLIB) \
@@ -156,54 +156,54 @@ APP1STDLIBS+= \
$(SIMPLECMLIB) \
$(COMMUNILIB)
-.IF "$(GUI)"=="UNX"
-APP1STDLIBS+= \
+#.IF "$(GUI)"=="UNX"
+#APP1STDLIBS+= \
$(VOSLIB) $(SALLIB) $(BASICLIB)
-APP1STDLIBS+=$(CPPULIB)
-.ENDIF
-.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
-APP1STDLIBS+=$(CPPULIB)
-.ENDIF
+#APP1STDLIBS+=$(CPPULIB)
+#.ENDIF
+#.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
+#APP1STDLIBS+=$(CPPULIB)
+#.ENDIF
-.IF "$(GUI)"=="WNT"
-APP1STDLIBS += \
+#.IF "$(GUI)"=="WNT"
+#APP1STDLIBS += \
$(SHELL32LIB) \
$(ADVAPI32LIB)
-.ENDIF # "$(GUI)"=="WNT"
+#.ENDIF # "$(GUI)"=="WNT"
-.IF "$(OS)" == "SOLARIS"
-APP1STDLIBS+= -lXm
-.ENDIF
+#.IF "$(OS)" == "SOLARIS"
+#APP1STDLIBS+= -lXm
+#.ENDIF
-.IF "$(GUI)" == "UNX"
-.IF "$(OS)" == "LINUX"
-APP1STDLIBS+= -lXext -lX11 -lSM -lICE
-.ENDIF
-.IF "$(OS)"=="MACOSX"
-APP1STDLIBS+= -lapp -lsample
-.ENDIF
-.ENDIF
+#.IF "$(GUI)" == "UNX"
+#.IF "$(OS)" == "LINUX"
+#APP1STDLIBS+= -lXext -lX11 -lSM -lICE
+#.ENDIF
+#.IF "$(OS)"=="MACOSX"
+#APP1STDLIBS+= -lapp -lsample
+#.ENDIF
+#.ENDIF
-APP1LIBS=\
+#APP1LIBS=\
$(LB)$/testtool.lib
-APP1OBJS= $(OBJ)$/testbasi.obj \
+#APP1OBJS= $(OBJ)$/testbasi.obj \
$(OBJ)$/cmdbasestream.obj \
$(OBJ)$/svcommstream.obj
# --- TESTTOOL MINIAPP ------------------------------------------------------
# ressources are linked here
-RESLIB1NAME=tma
-RESLIB1SRSFILES= \
+#RESLIB1NAME=tma
+#RESLIB1SRSFILES= \
$(SRS)$/miniapp.srs
-APP3TARGET=miniapp
-APP3STDLIBS= \
+#APP3TARGET=miniapp
+#APP3STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(UCBHELPERLIB) \
@@ -214,31 +214,31 @@ APP3STDLIBS= \
$(SVTOOLLIB) \
$(VCLLIB)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-APP3STDLIBS+= \
+#.IF "$(GUI)"=="UNX"
+#.IF "$(OS)"=="MACOSX"
+#APP3STDLIBS+= \
$(VOSLIB) $(SALLIB) $(LIBSTLPORT)
-.ELSE
-APP3STDLIBS+= \
+#.ELSE
+#APP3STDLIBS+= \
$(VOSLIB) $(SALLIB)
-.ENDIF
-.ENDIF
+#.ENDIF
+#.ENDIF
# $(AUTOMATIONLIB) is build in SHL1TARGET
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-APP3DEPN=$(SHL1TARGETN)
-.ELSE
-APP3DEPN=$(SHL1IMPLIBN)
-.ENDIF
+#.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
+#APP3DEPN=$(SHL1TARGETN)
+#.ELSE
+#APP3DEPN=$(SHL1IMPLIBN)
+#.ENDIF
-APP3LIBS= \
+#APP3LIBS= \
$(LB)$/miniapp.lib
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
+#.IF "$(GUI)" != "UNX"
+#.IF "$(COM)" != "GCC"
# win16 braucht ein appobj
-APP3OBJS= $(OBJ)$/testapp.obj
-.ENDIF
-.ENDIF
+#APP3OBJS= $(OBJ)$/testapp.obj
+#.ENDIF
+#.ENDIF
# --- Targets -----------------------------------------------------------
Modified: openoffice/branches/l10n/main/avmedia/source/win/framegrabber.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/avmedia/source/win/framegrabber.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/avmedia/source/win/framegrabber.cxx (original)
+++ openoffice/branches/l10n/main/avmedia/source/win/framegrabber.cxx Sun Feb 3 13:23:59 2013
@@ -47,6 +47,7 @@
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
#include <unotools/localfilehelper.hxx>
+#include <vcl/dibtools.hxx>
#define AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_DirectX"
#define AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_DirectX"
@@ -191,7 +192,7 @@ uno::Reference< graphic::XGraphic > SAL_
SvMemoryStream aMemStm( pBuffer, nSize, STREAM_READ | STREAM_WRITE );
Bitmap aBmp;
- if( aBmp.Read( aMemStm, false ) && !aBmp.IsEmpty() )
+ if( ReadDIB(aBmp, aMemStm, false ) && !aBmp.IsEmpty() )
{
const Graphic aGraphic( aBmp );
xRet = aGraphic.GetXGraphic();
Modified: openoffice/branches/l10n/main/basegfx/source/polygon/b2dlinegeometry.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/basegfx/source/polygon/b2dlinegeometry.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/basegfx/source/polygon/b2dlinegeometry.cxx (original)
+++ openoffice/branches/l10n/main/basegfx/source/polygon/b2dlinegeometry.cxx Sun Feb 3 13:23:59 2013
@@ -726,7 +726,7 @@ namespace basegfx
if(0.0 != fCutPos)
{
- const B2DPoint aCutPoint(interpolate(aStartPoint, aStartPoint + rTangentPrev, fCutPos));
+ const B2DPoint aCutPoint(aStartPoint + (rTangentPrev * fCutPos));
aEdgePolygon.append(aCutPoint);
}
Modified: openoffice/branches/l10n/main/basic/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/basic/prj/build.lst?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/basic/prj/build.lst (original)
+++ openoffice/branches/l10n/main/basic/prj/build.lst Sun Feb 3 13:23:59 2013
@@ -1,7 +1,6 @@
sb basic : L10N:l10n offuh oovbaapi svtools xmlscript framework salhelper LIBXSLT:libxslt NULL
sb basic usr1 - all sb_mkout NULL
sb basic\inc nmake - all sb_inc NULL
-sb basic\source\app nmake - all sb_app sb_class sb_inc NULL
sb basic\source\basmgr nmake - all sb_mgr sb_inc NULL
sb basic\source\classes nmake - all sb_class sb_inc NULL
sb basic\source\comp nmake - all sb_comp sb_inc NULL
@@ -9,5 +8,5 @@ sb basic\source\runtime nmake - all
sb basic\source\sample nmake - all sb_samp sb_inc NULL
sb basic\source\sbx nmake - all sb_sbx sb_inc NULL
sb basic\source\uno nmake - all sb_uno sb_inc NULL
-sb basic\util nmake - all sb_util sb_app sb_class sb_comp sb_mgr sb_rt sb_samp sb_sbx sb_uno NULL
+sb basic\util nmake - all sb_util sb_class sb_comp sb_mgr sb_rt sb_samp sb_sbx sb_uno NULL
Modified: openoffice/branches/l10n/main/basic/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/basic/prj/d.lst?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/basic/prj/d.lst (original)
+++ openoffice/branches/l10n/main/basic/prj/d.lst Sun Feb 3 13:23:59 2013
@@ -13,12 +13,10 @@ mkdir: %COMMON_DEST%\res%_EXT%
..\%__SRC%\bin\sb?????.dll %_DEST%\bin%_EXT%\sb?????.dll
..\%__SRC%\bin\sb?????.sym %_DEST%\bin%_EXT%\sb?????.sym
..\%__SRC%\misc\sb?????.map %_DEST%\bin%_EXT%\sb?????.map
-..\%__SRC%\bin\stt*.res %_DEST%\bin%_EXT%\stt*.res
..\%__SRC%\bin\sb*.res %_DEST%\bin%_EXT%\sb*.res
-..\%__SRC%\lib\app.lib %_DEST%\lib%_EXT%\app.lib
-..\%__SRC%\lib\libapp.a %_DEST%\lib%_EXT%\libapp.a
..\%__SRC%\lib\sample.lib %_DEST%\lib%_EXT%\sample.lib
..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
+..\%__SRC%\lib\sb.lib %_DEST%\lib%_EXT%\sb.lib
mkdir: %_DEST%\inc%_EXT%\basic
..\inc\basic\*.hxx %_DEST%\inc%_EXT%\basic\*.hxx
Modified: openoffice/branches/l10n/main/basic/source/runtime/methods.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/basic/source/runtime/methods.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/basic/source/runtime/methods.cxx (original)
+++ openoffice/branches/l10n/main/basic/source/runtime/methods.cxx Sun Feb 3 13:23:59 2013
@@ -19,17 +19,12 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
-
#include <tools/date.hxx>
#include <basic/sbxvar.hxx>
-#ifndef _VOS_PROCESS_HXX
#include <vos/process.hxx>
-#endif
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/sound.hxx>
@@ -44,6 +39,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <tools/wldcrd.hxx>
#include <i18npool/lang.h>
+#include <vcl/dibtools.hxx>
#include "runtime.hxx"
#include "sbunoobj.hxx"
@@ -4189,8 +4185,8 @@ RTLFUNC(LoadPicture)
if( pStream != NULL )
{
Bitmap aBmp;
- *pStream >> aBmp;
- Graphic aGraphic( aBmp );
+ ReadDIB(aBmp, *pStream, true);
+ Graphic aGraphic(aBmp);
SbxObjectRef xRef = new SbStdPicture;
((SbStdPicture*)(SbxObject*)xRef)->SetGraphic( aGraphic );
Modified: openoffice/branches/l10n/main/basic/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/basic/util/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/basic/util/makefile.mk (original)
+++ openoffice/branches/l10n/main/basic/util/makefile.mk Sun Feb 3 13:23:59 2013
@@ -98,14 +98,6 @@ SRS1FILES= \
$(SRS)$/classes.srs \
$(SRS)$/sbx.srs
-# --- TESTTOOL IDE ------------------------------------------------------
-# The resources are linked here
-
-RESLIB1NAME=stt
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= \
- $(SRS)$/app.srs
-
RESLIB2NAME=sb
RESLIB2IMAGES=$(PRJ)$/res
RESLIB2SRSFILES= \
Modified: openoffice/branches/l10n/main/boost/boost_freebsd.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/boost/boost_freebsd.patch?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/boost/boost_freebsd.patch (original)
+++ openoffice/branches/l10n/main/boost/boost_freebsd.patch Sun Feb 3 13:23:59 2013
@@ -248,7 +248,20 @@ Index: boost/archive/shared_ptr_helper.h
typedef int ioctl_arg_type;
typedef uint32_t u_long_type;
typedef uint16_t u_short_type;
---- misc/boost_1_48_0/boost/pool/pool.hpp.orig 2011-12-15 18:21:40.000000000 +0300
+--- misc/boost_1_48_0/boost/lexical_cast.hpp.orig 2013-01-06 17:10:22.000000000 -0500
++++ misc/build/boost_1_48_0/boost/lexical_cast.hpp 2013-01-06 17:11:25.000000000 -0500
+@@ -648,8 +648,8 @@
+ , const CharT opening_brace, const CharT closing_brace)
+ {
+ using namespace std;
+- const wchar_t minus = lcast_char_constants<wchar_t>::minus;
+- const wchar_t plus = lcast_char_constants<wchar_t>::plus;
++ const CharT minus = lcast_char_constants<CharT>::minus;
++ const CharT plus = lcast_char_constants<CharT>::plus;
+ const int inifinity_size = 8;
+
+ bool has_minus = false;
+ --- misc/boost_1_48_0/boost/pool/pool.hpp.orig 2011-12-15 18:21:40.000000000 +0300
+++ misc/build/boost_1_48_0/boost/pool/pool.hpp 2011-12-15 18:22:05.000000000 +0300
@@ -346,7 +346,7 @@
// For alignment reasons, this used to be defined to be lcm(requested_size, sizeof(void *), sizeof(size_type)),
Modified: openoffice/branches/l10n/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx (original)
+++ openoffice/branches/l10n/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx Sun Feb 3 13:23:59 2013
@@ -24,6 +24,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_bridges.hxx"
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
+#include <exception>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <dlfcn.h>
Modified: openoffice/branches/l10n/main/canvas/source/cairo/cairo_devicehelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/cairo/cairo_devicehelper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/cairo/cairo_devicehelper.cxx (original)
+++ openoffice/branches/l10n/main/canvas/source/cairo/cairo_devicehelper.cxx Sun Feb 3 13:23:59 2013
@@ -19,28 +19,21 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_canvas.hxx"
#include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
-
#include <osl/mutex.hxx>
#include <cppuhelper/compbase1.hxx>
-
#include <com/sun/star/lang/NoSupportException.hpp>
-
#include <toolkit/helper/vclunohelper.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/tools/unopolypolygon.hxx>
-
#include <vcl/canvastools.hxx>
-
+#include <vcl/dibtools.hxx>
#include <tools/stream.hxx>
-
#include "cairo_spritecanvas.hxx"
#include "cairo_canvasbitmap.hxx"
#include "cairo_devicehelper.hxx"
@@ -267,8 +260,8 @@ namespace cairocanvas
const ::Point aEmptyPoint;
bool bOldMap( mpRefDevice->IsMapModeEnabled() );
mpRefDevice->EnableMapMode( sal_False );
- aStream << mpRefDevice->GetBitmap(aEmptyPoint,
- mpRefDevice->GetOutputSizePixel());
+ const ::Bitmap aTempBitmap(mpRefDevice->GetBitmap(aEmptyPoint, mpRefDevice->GetOutputSizePixel()));
+ WriteDIB(aTempBitmap, aStream, false, true);
mpRefDevice->EnableMapMode( bOldMap );
++nFilePostfixCount;
Modified: openoffice/branches/l10n/main/canvas/source/vcl/bitmapbackbuffer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/vcl/bitmapbackbuffer.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/vcl/bitmapbackbuffer.cxx (original)
+++ openoffice/branches/l10n/main/canvas/source/vcl/bitmapbackbuffer.cxx Sun Feb 3 13:23:59 2013
@@ -85,6 +85,7 @@ namespace vclcanvas
{
// VDev content is more current than bitmap - copy contents before!
mpVDev->EnableMapMode( sal_False );
+ mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
const Point aEmptyPoint;
*maBitmap = mpVDev->GetBitmapEx( aEmptyPoint,
mpVDev->GetOutputSizePixel() );
@@ -105,6 +106,7 @@ namespace vclcanvas
if( mbVDevContentIsCurrent && mpVDev )
{
mpVDev->EnableMapMode( sal_False );
+ mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
aSize = mpVDev->GetOutputSizePixel();
}
@@ -148,6 +150,7 @@ namespace vclcanvas
{
// fill with bitmap content
mpVDev->EnableMapMode( sal_False );
+ mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
const Point aEmptyPoint;
mpVDev->DrawBitmapEx( aEmptyPoint, *maBitmap );
}
Modified: openoffice/branches/l10n/main/canvas/source/vcl/canvashelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/vcl/canvashelper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/vcl/canvashelper.cxx (original)
+++ openoffice/branches/l10n/main/canvas/source/vcl/canvashelper.cxx Sun Feb 3 13:23:59 2013
@@ -162,6 +162,7 @@ namespace vclcanvas
{
mp2ndOutDev = rOutDev;
mp2ndOutDev->getOutDev().EnableMapMode( sal_False );
+ mp2ndOutDev->getOutDev().SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
}
void CanvasHelper::clear()
@@ -173,6 +174,7 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
rOutDev.SetLineColor( COL_WHITE );
rOutDev.SetFillColor( COL_WHITE );
rOutDev.DrawRect( Rectangle( Point(),
@@ -184,6 +186,7 @@ namespace vclcanvas
rOutDev2.SetDrawMode( DRAWMODE_DEFAULT );
rOutDev2.EnableMapMode( sal_False );
+ rOutDev2.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
rOutDev2.SetLineColor( COL_WHITE );
rOutDev2.SetFillColor( COL_WHITE );
rOutDev2.DrawRect( Rectangle( Point(),
@@ -934,6 +937,7 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
// TODO(F2): Support alpha vdev canvas here
const Point aEmptyPoint(0,0);
@@ -963,6 +967,7 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
Bitmap aBitmap( rOutDev.GetBitmap(aRect.TopLeft(),
aRect.GetSize()) );
@@ -1016,6 +1021,7 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
const Rectangle aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
const sal_uInt16 nBitCount( ::std::min( (sal_uInt16)24U,
@@ -1142,6 +1148,7 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
const Size aBmpSize( rOutDev.GetOutputSizePixel() );
@@ -1179,6 +1186,7 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
const Size aBmpSize( rOutDev.GetOutputSizePixel() );
@@ -1218,6 +1226,7 @@ namespace vclcanvas
OutputDevice* p2ndOutDev = NULL;
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
if( mp2ndOutDev )
p2ndOutDev = &mp2ndOutDev->getOutDev();
Modified: openoffice/branches/l10n/main/canvas/source/vcl/devicehelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/vcl/devicehelper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/vcl/devicehelper.cxx (original)
+++ openoffice/branches/l10n/main/canvas/source/vcl/devicehelper.cxx Sun Feb 3 13:23:59 2013
@@ -19,27 +19,24 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_canvas.hxx"
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
#include <canvas/canvastools.hxx>
-
#include <rtl/instance.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/canvastools.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/tools/unopolypolygon.hxx>
+#include <vcl/dibtools.hxx>
#include "devicehelper.hxx"
#include "spritecanvas.hxx"
#include "spritecanvashelper.hxx"
#include "canvasbitmap.hxx"
-
using namespace ::com::sun::star;
namespace vclcanvas
@@ -227,8 +224,7 @@ namespace vclcanvas
OutputDevice& rOutDev = mpOutDev->getOutDev();
bool bOldMap( rOutDev.IsMapModeEnabled() );
rOutDev.EnableMapMode( sal_False );
- aStream << rOutDev.GetBitmap(aEmptyPoint,
- rOutDev.GetOutputSizePixel());
+ WriteDIB(rOutDev.GetBitmap(aEmptyPoint, rOutDev.GetOutputSizePixel()), aStream, false, true);
rOutDev.EnableMapMode( bOldMap );
++nFilePostfixCount;
Modified: openoffice/branches/l10n/main/canvas/source/vcl/impltools.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/vcl/impltools.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/vcl/impltools.hxx (original)
+++ openoffice/branches/l10n/main/canvas/source/vcl/impltools.hxx Sun Feb 3 13:23:59 2013
@@ -137,14 +137,16 @@ namespace vclcanvas
public:
explicit OutDevStateKeeper( OutputDevice& rOutDev ) :
mpOutDev( &rOutDev ),
- mbMappingWasEnabled( mpOutDev->IsMapModeEnabled() )
+ mbMappingWasEnabled( mpOutDev->IsMapModeEnabled() ),
+ mnAntiAliasing( mpOutDev->GetAntialiasing() )
{
init();
}
explicit OutDevStateKeeper( const OutDevProviderSharedPtr& rOutDev ) :
mpOutDev( rOutDev.get() ? &(rOutDev->getOutDev()) : NULL ),
- mbMappingWasEnabled( mpOutDev ? mpOutDev->IsMapModeEnabled() : false )
+ mbMappingWasEnabled( mpOutDev ? mpOutDev->IsMapModeEnabled() : false ),
+ mnAntiAliasing( mpOutDev ? mpOutDev->GetAntialiasing() : 0 )
{
init();
}
@@ -154,6 +156,8 @@ namespace vclcanvas
if( mpOutDev )
{
mpOutDev->EnableMapMode( mbMappingWasEnabled );
+ mpOutDev->SetAntialiasing( mnAntiAliasing );
+
mpOutDev->Pop();
}
}
@@ -165,11 +169,13 @@ namespace vclcanvas
{
mpOutDev->Push();
mpOutDev->EnableMapMode(sal_False);
+ mpOutDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
}
}
- OutputDevice* mpOutDev;
- const bool mbMappingWasEnabled;
+ OutputDevice* mpOutDev;
+ const bool mbMappingWasEnabled;
+ const sal_uInt16 mnAntiAliasing;
};
::Point mapRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& rPoint,
Modified: openoffice/branches/l10n/main/canvas/source/vcl/spritecanvashelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/vcl/spritecanvashelper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/vcl/spritecanvashelper.cxx (original)
+++ openoffice/branches/l10n/main/canvas/source/vcl/spritecanvashelper.cxx Sun Feb 3 13:23:59 2013
@@ -95,6 +95,7 @@ namespace vclcanvas
// wouldn't save much render time, and b) will clutter
// scrolled sprite content outside this area)
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
rOutDev.SetClipRegion( rRequestedArea );
// repaint affected sprite directly to output device (at
@@ -329,6 +330,7 @@ namespace vclcanvas
// flush to screen
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
rOutDev.SetClipRegion();
rOutDev.DrawOutDev( aEmptyPoint, aOutDevSize,
aEmptyPoint, aOutDevSize,
@@ -574,6 +576,7 @@ namespace vclcanvas
// paint background
maVDev->EnableMapMode( sal_False );
+ maVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
maVDev->SetClipRegion();
maVDev->DrawOutDev( aEmptyPoint, aOutputSize,
aOutputPosition, aOutputSize,
@@ -591,6 +594,7 @@ namespace vclcanvas
// flush to screen
rOutDev.EnableMapMode( sal_False );
+ rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
rOutDev.DrawOutDev( aOutputPosition, aOutputSize,
aEmptyPoint, aOutputSize,
*maVDev );
Modified: openoffice/branches/l10n/main/canvas/source/vcl/spritedevicehelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/vcl/spritedevicehelper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/vcl/spritedevicehelper.cxx (original)
+++ openoffice/branches/l10n/main/canvas/source/vcl/spritedevicehelper.cxx Sun Feb 3 13:23:59 2013
@@ -19,24 +19,21 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_canvas.hxx"
#include <canvas/debug.hxx>
#include <canvas/canvastools.hxx>
-
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/canvastools.hxx>
#include <basegfx/tools/canvastools.hxx>
+#include <vcl/dibtools.hxx>
#include "spritedevicehelper.hxx"
#include "spritecanvas.hxx"
#include "spritecanvashelper.hxx"
#include "canvasbitmap.hxx"
-
using namespace ::com::sun::star;
namespace vclcanvas
@@ -144,8 +141,8 @@ namespace vclcanvas
const ::Point aEmptyPoint;
mpBackBuffer->getOutDev().EnableMapMode( sal_False );
- aStream << mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint,
- mpBackBuffer->getOutDev().GetOutputSizePixel());
+ mpBackBuffer->getOutDev().SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+ WriteDIB(mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint, mpBackBuffer->getOutDev().GetOutputSizePixel()), aStream, false, true);
}
++nFilePostfixCount;
Modified: openoffice/branches/l10n/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx (original)
+++ openoffice/branches/l10n/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx Sun Feb 3 13:23:59 2013
@@ -180,6 +180,9 @@ DrawViewWrapper::DrawViewWrapper( SdrMod
pOutlinerPool->SetPoolDefaultItem( SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT ) ); // 12pt
}
+ // #121463# Use big handles by default
+ SetMarkHdlSizePixel(9);
+
ReInit();
}
Modified: openoffice/branches/l10n/main/chart2/source/controller/main/ChartController_Tools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/chart2/source/controller/main/ChartController_Tools.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/chart2/source/controller/main/ChartController_Tools.cxx (original)
+++ openoffice/branches/l10n/main/chart2/source/controller/main/ChartController_Tools.cxx Sun Feb 3 13:23:59 2013
@@ -340,9 +340,9 @@ void ChartController::executeDispatch_Pa
else if( aDataHelper.HasFormat( FORMAT_BITMAP ))
{
// bitmap (non-graphic-manager)
- Bitmap aBmp;
- if( aDataHelper.GetBitmap( FORMAT_BITMAP, aBmp ))
- aGraphic = Graphic( aBmp );
+ BitmapEx aBmpEx;
+ if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ))
+ aGraphic = Graphic( aBmpEx );
}
else if( aDataHelper.HasFormat( FORMAT_STRING ))
{
Modified: openoffice/branches/l10n/main/chart2/source/controller/main/ChartController_Window.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/chart2/source/controller/main/ChartController_Window.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/chart2/source/controller/main/ChartController_Window.cxx (original)
+++ openoffice/branches/l10n/main/chart2/source/controller/main/ChartController_Window.cxx Sun Feb 3 13:23:59 2013
@@ -140,12 +140,11 @@ bool lcl_MoveObjectLogic(
void lcl_insertMenuCommand(
const uno::Reference< awt::XPopupMenu > & xMenu,
- const uno::Reference< awt::XMenuExtended > & xMenuEx,
sal_Int16 nId, const ::rtl::OUString & rCommand )
{
static ::rtl::OUString aEmptyString;
xMenu->insertItem( nId, aEmptyString, 0, -1 );
- xMenuEx->setCommand( nId, rCommand );
+ xMenu->setCommand( nId, rCommand );
}
OUString lcl_getFormatCommandForObjectCID( const OUString& rCID )
@@ -1041,15 +1040,14 @@ void ChartController::execute_Command( c
uno::Reference< awt::XPopupMenu > xPopupMenu(
m_xCC->getServiceManager()->createInstanceWithContext(
C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY );
- uno::Reference< awt::XMenuExtended > xMenuEx( xPopupMenu, uno::UNO_QUERY );
- if( xPopupMenu.is() && xMenuEx.is())
+ if( xPopupMenu.is())
{
sal_Int16 nUniqueId = 1;
ObjectType eObjectType = ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() );
Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( getModel() );
OUString aFormatCommand( lcl_getFormatCommandForObjectCID( m_aSelection.getSelectedCID() ) );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, aFormatCommand );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, aFormatCommand );
//some commands for dataseries and points:
//-----
@@ -1101,17 +1099,17 @@ void ChartController::execute_Command( c
if( bIsPoint )
{
if( bHasDataLabelAtPoint )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabel") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatDataLabel") );
if( !bHasDataLabelAtPoint )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabel") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertDataLabel") );
else
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabel") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteDataLabel") );
if( bSelectedPointIsFormatted )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetDataPoint"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:ResetDataPoint"));
xPopupMenu->insertSeparator( -1 );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataSeries") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatDataSeries") );
}
Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries ) );
@@ -1127,8 +1125,8 @@ void ChartController::execute_Command( c
if( bJapaneseStyle )
{
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockLoss") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockGain") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatStockLoss") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatStockGain") );
}
}
}
@@ -1139,15 +1137,15 @@ void ChartController::execute_Command( c
}
if( bHasDataLabelsAtSeries )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabels") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatDataLabels") );
if( xTrendline.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendline") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatTrendline") );
if( bHasEquation )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
if( xMeanValue.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMeanValue") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatMeanValue") );
if( bHasYErrorBars )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatYErrorBars") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatYErrorBars") );
//if( nIdBeforeFormat != nUniqueId )
xPopupMenu->insertSeparator( -1 );
@@ -1155,15 +1153,15 @@ void ChartController::execute_Command( c
//const sal_Int32 nIdBeforeInsert = nUniqueId;
if( !bHasDataLabelsAtSeries )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabels") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertDataLabels") );
if( !xTrendline.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendline") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTrendline") );
else if( !bHasEquation )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
if( !xMeanValue.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMeanValue") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertMeanValue") );
if( !bHasYErrorBars )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertYErrorBars") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertYErrorBars") );
//if( nIdBeforeInsert != nUniqueId )
// xPopupMenu->insertSeparator( -1 );
@@ -1171,32 +1169,31 @@ void ChartController::execute_Command( c
//const sal_Int32 nIdBeforeDelete = nUniqueId;
if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabels") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteDataLabels") );
if( xTrendline.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendline") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteTrendline") );
if( bHasEquation )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
if( xMeanValue.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMeanValue") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteMeanValue") );
if( bHasYErrorBars )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteYErrorBars") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteYErrorBars") );
if( bHasFormattedDataPointsOtherThanSelected )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetAllDataPoints"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:ResetAllDataPoints"));
//if( nIdBeforeDelete != nUniqueId )
xPopupMenu->insertSeparator( -1 );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId, C2U(".uno:ArrangeRow"));
uno::Reference< awt::XPopupMenu > xArrangePopupMenu(
m_xCC->getServiceManager()->createInstanceWithContext(
C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY );
- uno::Reference< awt::XMenuExtended > xArrangeMenuEx( xArrangePopupMenu, uno::UNO_QUERY );
- if( xArrangePopupMenu.is() && xArrangeMenuEx.is())
+ if( xArrangePopupMenu.is() )
{
sal_Int16 nSubId = nUniqueId + 1;
- lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId++, C2U(".uno:Forward") );
- lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId, C2U(".uno:Backward") );
+ lcl_insertMenuCommand( xArrangePopupMenu, nSubId++, C2U(".uno:Forward") );
+ lcl_insertMenuCommand( xArrangePopupMenu, nSubId, C2U(".uno:Backward") );
xPopupMenu->setPopupMenu( nUniqueId, xArrangePopupMenu );
nUniqueId = nSubId;
}
@@ -1204,17 +1201,17 @@ void ChartController::execute_Command( c
}
else if( OBJECTTYPE_DATA_CURVE == eObjectType )
{
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquationAndR2") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertR2Value") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteR2Value") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTrendlineEquationAndR2") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertR2Value") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteR2Value") );
}
else if( OBJECTTYPE_DATA_CURVE_EQUATION == eObjectType )
{
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertR2Value") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteR2Value") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertR2Value") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteR2Value") );
}
//some commands for axes: and grids
@@ -1238,38 +1235,38 @@ void ChartController::execute_Command( c
bHasTitle = TitleHelper::getCompleteString( xTitled->getTitleObject() ).getLength()>0;
if( OBJECTTYPE_AXIS != eObjectType && bIsAxisVisible )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatAxis") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatAxis") );
if( OBJECTTYPE_GRID != eObjectType && bIsMajorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMajorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatMajorGrid") );
if( OBJECTTYPE_SUBGRID != eObjectType && bIsMinorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMinorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatMinorGrid") );
xPopupMenu->insertSeparator( -1 );
if( OBJECTTYPE_AXIS != eObjectType && !bIsAxisVisible )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertAxis") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertAxis") );
if( OBJECTTYPE_GRID != eObjectType && !bIsMajorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMajorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertMajorGrid") );
if( OBJECTTYPE_SUBGRID != eObjectType && !bIsMinorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMinorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertMinorGrid") );
if( !bHasTitle )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertAxisTitle") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertAxisTitle") );
if( bIsAxisVisible )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteAxis") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteAxis") );
if( bIsMajorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMajorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteMajorGrid") );
if( bIsMinorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMinorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteMinorGrid") );
}
}
if( OBJECTTYPE_DATA_STOCK_LOSS == eObjectType )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockGain") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatStockGain") );
else if( OBJECTTYPE_DATA_STOCK_GAIN == eObjectType )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockLoss") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatStockLoss") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:TransformDialog"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:TransformDialog"));
if( OBJECTTYPE_PAGE == eObjectType || OBJECTTYPE_DIAGRAM == eObjectType
|| OBJECTTYPE_DIAGRAM_WALL == eObjectType
@@ -1279,24 +1276,24 @@ void ChartController::execute_Command( c
if( OBJECTTYPE_UNKNOWN != eObjectType )
xPopupMenu->insertSeparator( -1 );
bool bHasLegend = LegendHelper::hasLegend( xDiagram );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTitles") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTitles") );
if( !bHasLegend )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertLegend") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertLegend") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertRemoveAxes") );
if( bHasLegend )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteLegend") );
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteLegend") );
}
//-----
xPopupMenu->insertSeparator( -1 );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramType"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DataRanges"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramData"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:View3D"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DiagramType"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DataRanges"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DiagramData"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:View3D"));
xPopupMenu->insertSeparator( -1 );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Cut"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Copy"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Paste"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:Cut"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:Copy"));
+ lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:Paste"));
::svt::ContextMenuHelper aContextMenuHelper( m_xFrame );
Point aPos( rCEvt.GetMousePosPixel() );
Modified: openoffice/branches/l10n/main/chart2/source/controller/main/ChartTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/chart2/source/controller/main/ChartTransferable.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/chart2/source/controller/main/ChartTransferable.cxx (original)
+++ openoffice/branches/l10n/main/chart2/source/controller/main/ChartTransferable.cxx Sun Feb 3 13:23:59 2013
@@ -101,7 +101,7 @@ sal_Bool ChartTransferable::GetData( con
else if( nFormat == FORMAT_BITMAP )
{
Graphic aGraphic( m_xMetaFileGraphic );
- bResult = SetBitmap( aGraphic.GetBitmap(), rFlavor );
+ bResult = SetBitmapEx( aGraphic.GetBitmapEx(), rFlavor );
}
}
Modified: openoffice/branches/l10n/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx (original)
+++ openoffice/branches/l10n/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx Sun Feb 3 13:23:59 2013
@@ -223,7 +223,8 @@ void DragMethod_RotateDiagram::CreateOve
// transform to 2D view coordinates
aPolyPolygon.transform(rVCScene.getObjectTransformation());
- sdr::overlay::OverlayPolyPolygonStriped* pNew = new ::sdr::overlay::OverlayPolyPolygonStriped(aPolyPolygon);
+ sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled(
+ aPolyPolygon);
rOverlayManager.add(*pNew);
addToOverlayObjectList(*pNew);
}
Modified: openoffice/branches/l10n/main/chart2/source/view/main/VDataSeries.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/chart2/source/view/main/VDataSeries.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/chart2/source/view/main/VDataSeries.cxx (original)
+++ openoffice/branches/l10n/main/chart2/source/view/main/VDataSeries.cxx Sun Feb 3 13:23:59 2013
@@ -309,7 +309,7 @@ void VDataSeries::doSortByXValues()
}
//do sort
- std::sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() );
+ std::stable_sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() );
//fill the sorted points back to the mambers
m_aValues_X.Doubles.realloc( m_nPointCount );
Modified: openoffice/branches/l10n/main/cli_ure/source/basetypes/assembly.cs
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cli_ure/source/basetypes/assembly.cs?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cli_ure/source/basetypes/assembly.cs (original)
+++ openoffice/branches/l10n/main/cli_ure/source/basetypes/assembly.cs Sun Feb 3 13:23:59 2013
@@ -20,4 +20,4 @@
*************************************************************/
[assembly:System.Reflection.AssemblyDescription( "CLI-UNO: Language Binding specific types" )]
-[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )]
+[assembly: System.Reflection.AssemblyCompany("Apache Software Foundation")]
Modified: openoffice/branches/l10n/main/cli_ure/source/native/assembly.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cli_ure/source/native/assembly.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cli_ure/source/native/assembly.cxx (original)
+++ openoffice/branches/l10n/main/cli_ure/source/native/assembly.cxx Sun Feb 3 13:23:59 2013
@@ -29,4 +29,4 @@
[assembly:System::Reflection::AssemblyProduct( "CLI-UNO Language Binding" )];
[assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )];
[assembly:System::Reflection::AssemblyDelaySign(true)];
-[assembly:System::Reflection::AssemblyCompany( "OpenOffice.org" )];
+[assembly:System::Reflection::AssemblyCompany( "Apache Software Foundation" )];
Modified: openoffice/branches/l10n/main/cli_ure/source/native/native_bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cli_ure/source/native/native_bootstrap.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cli_ure/source/native/native_bootstrap.cxx (original)
+++ openoffice/branches/l10n/main/cli_ure/source/native/native_bootstrap.cxx Sun Feb 3 13:23:59 2013
@@ -52,7 +52,9 @@ namespace cli_ure {
WCHAR * resolveLink(WCHAR * path);
}
-#define INSTALL_PATH L"Software\\OpenOffice.org\\UNO\\InstallPath"
+// INSTALL_PATH value needs to correspond to the Windows registry subkey
+// in main\scp2\source\ooo\registryitem_ooo.scp
+#define INSTALL_PATH L"Software\\Apache OpenOffice\\UNO\\InstallPath"
#define BASIS_LINK L"\\basis-link"
#define URE_LINK L"\\ure-link"
#define URE_BIN L"\\bin"
@@ -128,7 +130,7 @@ void oneDirUp(LPTSTR io_path)
for example c:/openoffice.org 3/program
This path is either obtained from the environment variable UNO_PATH
or the registry item
- "Software\\OpenOffice.org\\UNO\\InstallPath"
+ "Software\\Apache OpenOffice\\UNO\\InstallPath"
either in HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE
The return value must be freed with delete[]
*/
@@ -330,8 +332,8 @@ namespace util
Bootstrapping requires the existence of many libraries which are contained
in an URE installation. To find and load these libraries the Windows
- registry keys HKEY_CURRENT_USER\Software\OpenOffice.org\Layer\URE\1
- and HKEY_LOCAL_MACHINE\Software\OpenOffice.org\Layer\URE\1 are examined.
+ registry keys HKEY_CURRENT_USER\Software\Apache OpenOffice\Layer\URE\1
+ and HKEY_LOCAL_MACHINE\Software\Apache OpenOffice\Layer\URE\1 are examined.
These contain a named value UREINSTALLLOCATION which holds a path to the URE
installation folder.
*/
Modified: openoffice/branches/l10n/main/cli_ure/source/ure/assembly.cs
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cli_ure/source/ure/assembly.cs?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cli_ure/source/ure/assembly.cs (original)
+++ openoffice/branches/l10n/main/cli_ure/source/ure/assembly.cs Sun Feb 3 13:23:59 2013
@@ -20,4 +20,4 @@
*************************************************************/
[assembly:System.Reflection.AssemblyDescription( "CLI-UNO Runtime Library" )]
-[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )]
+[assembly: System.Reflection.AssemblyCompany("Apache Software Foundation")]
Modified: openoffice/branches/l10n/main/cli_ure/unotypes/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cli_ure/unotypes/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cli_ure/unotypes/makefile.mk (original)
+++ openoffice/branches/l10n/main/cli_ure/unotypes/makefile.mk Sun Feb 3 13:23:59 2013
@@ -54,8 +54,8 @@ $(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/
--out $@ \
--keyfile $(BIN)$/cliuno.snk \
--assembly-version $(CLI_URETYPES_NEW_VERSION) \
- --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
- --assembly-company "OpenOffice.org" \
+ --assembly-description "This assembly contains metadata for the Apache OpenOffice API." \
+ --assembly-company "Apache Software Foundation" \
$(SOLARBINDIR)$/udkapi.rdb
#do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.
Modified: openoffice/branches/l10n/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/configure.in?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/configure.in (original)
+++ openoffice/branches/l10n/main/configure.in Sun Feb 3 13:23:59 2013
@@ -360,7 +360,7 @@ AC_ARG_ENABLE(kde4,
],,)
AC_ARG_ENABLE(binfilter,
[ --enable-binfilter Enable legacy binary file formats filters
-],,enable_binfilter=yes)
+],,enable_binfilter=no)
AC_ARG_ENABLE(rpath,
[ --disable-rpath Disable the use of relative paths in shared libraries
],,)
@@ -4137,8 +4137,8 @@ if test -n "$with_system_lucene" -o -n "
AC_MSG_RESULT([external])
SYSTEM_LUCENE=YES
if test -z $LUCENE_CORE_JAR; then
- AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar,
- [ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar ],
+ AC_CHECK_FILE(/usr/share/java/lucene-core-2.9.4.jar,
+ [ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.9.4.jar ],
[
AC_CHECK_FILE(/usr/share/java/lucene-core.jar,
[ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ],
@@ -6672,8 +6672,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "
AC_MSG_RESULT([external])
if test "$ENABLE_MEDIAWIKI" = "YES"; then
if test -z $COMMONS_CODEC_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar,
- [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar,
+ [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.6.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
[ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
@@ -6687,8 +6687,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "
fi
if test -z $COMMONS_LANG_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar,
- [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-lang-2.4.jar,
+ [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.4.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
[ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
Modified: openoffice/branches/l10n/main/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java (original)
+++ openoffice/branches/l10n/main/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java Sun Feb 3 13:23:59 2013
@@ -70,7 +70,7 @@ public class StorageNativeOutputStream {
* @param b the data.
* @param off the start offset in the data.
* @param len the number of bytes to write.
- * @exception IOException if an I/O error occurs. In particular,
+ * @exception java.io.IOException if an I/O error occurs. In particular,
* an <code>IOException</code> is thrown if the output
* stream is closed.
*/
@@ -83,7 +83,7 @@ public class StorageNativeOutputStream {
* <code>write(b, 0, b.length)</code>.
*
* @param b the data.
- * @exception IOException if an I/O error occurs.
+ * @exception java.io.IOException if an I/O error occurs.
* @see java.io.OutputStream#write(byte[], int, int)
*/
public native void write(String key,String _file,byte[] b) throws java.io.IOException;
@@ -98,7 +98,7 @@ public class StorageNativeOutputStream {
* @param key The name of the data source.
* @param _file The name of the file to write to.
*
- * @exception IOException if an I/O error occurs.
+ * @exception java.io.IOException if an I/O error occurs.
*/
public native void close(String key,String _file) throws java.io.IOException;
@@ -115,7 +115,7 @@ public class StorageNativeOutputStream {
* @param key The name of the data source.
* @param _file The name of the file to write to.
* @param b the <code>byte</code>.
- * @exception IOException if an I/O error occurs. In particular,
+ * @exception java.io.IOException if an I/O error occurs. In particular,
* an <code>IOException</code> may be thrown if the
* output stream has been closed.
*/
@@ -133,7 +133,7 @@ public class StorageNativeOutputStream {
* @param key The name of the data source.
* @param _file The name of the file to write to.
*
- * @exception IOException if an I/O error occurs.
+ * @exception java.io.IOException if an I/O error occurs.
*/
public native void flush(String key,String _file) throws java.io.IOException;
Modified: openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/CRMDatabase.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/CRMDatabase.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/CRMDatabase.java (original)
+++ openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/CRMDatabase.java Sun Feb 3 13:23:59 2013
@@ -88,7 +88,7 @@ public class CRMDatabase
* creates a CRMDatabase from an existing document, given by URL
* @param _orb
* @param _existingDocumentURL
- * @throws Exceptio
+ * @throws Exception
*/
public CRMDatabase( XMultiServiceFactory _orb, final String _existingDocumentURL ) throws Exception
{
Modified: openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/DataSource.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/DataSource.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/DataSource.java (original)
+++ openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/DataSource.java Sun Feb 3 13:23:59 2013
@@ -156,4 +156,4 @@ public class DataSource
{
return (String)impl_getPropertyValue( "Name" );
}
-};
+}
Modified: openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java (original)
+++ openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java Sun Feb 3 13:23:59 2013
@@ -77,4 +77,4 @@ public class HsqlColumnDescriptor
ForeignTable = _ForeignTable;
ForeignColumn = _ForeignColumn;
}
-};
+}
Modified: openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/QueryDefinition.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/QueryDefinition.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/QueryDefinition.java (original)
+++ openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/QueryDefinition.java Sun Feb 3 13:23:59 2013
@@ -67,4 +67,4 @@ public class QueryDefinition
catch (PropertyVetoException e) { }
catch (IllegalArgumentException e) { }
}
-};
+}
Modified: openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/RowSet.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/RowSet.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/RowSet.java (original)
+++ openoffice/branches/l10n/main/connectivity/qa/connectivity/tools/RowSet.java Sun Feb 3 13:23:59 2013
@@ -292,4 +292,4 @@ public class RowSet implements XRowSet,
XComponent rowSetComp = UnoRuntime.queryInterface( XComponent.class, m_rowSet );
rowSetComp.dispose();
}
-};
+}
Modified: openoffice/branches/l10n/main/cppu/inc/com/sun/star/uno/Reference.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cppu/inc/com/sun/star/uno/Reference.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cppu/inc/com/sun/star/uno/Reference.hxx (original)
+++ openoffice/branches/l10n/main/cppu/inc/com/sun/star/uno/Reference.hxx Sun Feb 3 13:23:59 2013
@@ -171,18 +171,21 @@ inline Reference< interface_type >::Refe
template< class interface_type >
inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) )
{
+ _pInterface = NULL;
_pInterface = iquery_throw( rRef.get() );
}
//__________________________________________________________________________________________________
template< class interface_type >
inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) )
{
+ _pInterface = NULL;
_pInterface = iquery_throw( pInterface );
}
//__________________________________________________________________________________________________
template< class interface_type >
inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) )
{
+ _pInterface = NULL;
_pInterface = iquery_throw( typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass
? static_cast< XInterface * >( rAny.pReserved ) : 0 );
}
@@ -190,12 +193,14 @@ inline Reference< interface_type >::Refe
template< class interface_type >
inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
{
+ _pInterface = NULL;
_pInterface = iset_throw( rRef.get() );
}
//__________________________________________________________________________________________________
template< class interface_type >
inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
{
+ _pInterface = NULL;
_pInterface = iset_throw( pInterface );
}
#endif
Modified: openoffice/branches/l10n/main/cppu/inc/cppu/Enterable.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cppu/inc/cppu/Enterable.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cppu/inc/cppu/Enterable.hxx (original)
+++ openoffice/branches/l10n/main/cppu/inc/cppu/Enterable.hxx Sun Feb 3 13:23:59 2013
@@ -46,16 +46,16 @@ public:
virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) = 0;
virtual int v_isValid (rtl::OUString * pReason) = 0;
- virtual ~Enterable() {};
+ virtual ~Enterable() {}
public:
inline explicit Enterable(void);
- inline void enter(void) {m_enter(this);};
- inline void leave(void) {m_leave(this);};
+ inline void enter(void) {m_enter(this);}
+ inline void leave(void) {m_leave(this);}
- inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);};
- inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);};
+ inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);}
+ inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);}
inline void callInto(uno_EnvCallee * pCallee, ...);
inline void callOut (uno_EnvCallee * pCallee, ...);
@@ -67,12 +67,12 @@ private:
Enterable & operator = (Enterable const &);
};
-extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); };
-extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); };
+extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); }
+extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); }
extern "C" inline void Enterable_call_callInto_v(void * context, uno_EnvCallee * pCallee, va_list * pParam)
- { ((Enterable *)context)->v_callInto_v(pCallee, pParam); };
+ { ((Enterable *)context)->v_callInto_v(pCallee, pParam); }
extern "C" inline void Enterable_call_callOut_v (void * context, uno_EnvCallee * pCallee, va_list * pParam)
- { ((Enterable *)context)->v_callOut_v(pCallee, pParam); };
+ { ((Enterable *)context)->v_callOut_v(pCallee, pParam); }
extern "C" inline int Enterable_call_isValid (void * context, rtl_uString ** pReason)
{return ((Enterable *)context)->v_isValid((rtl::OUString *)pReason);}