You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2014/03/19 11:15:07 UTC
svn commit: r1579184 [19/33] - in /openoffice/branches/alg_writerframes: ./
ext_sources/ extras/l10n/source/de/ extras/l10n/source/es/
extras/l10n/source/eu/ extras/l10n/source/hi/ extras/l10n/source/kk/
extras/l10n/source/lt/ extras/l10n/source/nb/ ex...
Modified: openoffice/branches/alg_writerframes/main/odk/settings/settings.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/odk/settings/settings.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/odk/settings/settings.mk (original)
+++ openoffice/branches/alg_writerframes/main/odk/settings/settings.mk Wed Mar 19 10:14:42 2014
@@ -72,7 +72,6 @@ EXE_EXT=.exe
COPY=copy
SHAREDLIB_EXT=dll
SHAREDLIB_OUT=$(OUT_BIN)
-PACKAGE_LIB_DIR=windows.plt
UNOPKG_PLATFORM=Windows
OSEP=^<
@@ -153,18 +152,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess
ifeq "$(PROCTYPE)" "sparc"
PLATFORM=solsparc
-PACKAGE_LIB_DIR=solaris_sparc.plt
UNOPKG_PLATFORM=Solaris_SPARC
JAVA_PROC_TYPE=sparc
else
ifeq "$(PROCTYPE)" "sparc64"
PLATFORM=solsparc
-PACKAGE_LIB_DIR=solaris_sparc64.plt
UNOPKG_PLATFORM=Solaris_SPARC64
JAVA_PROC_TYPE=sparcv9
else
PLATFORM=solintel
-PACKAGE_LIB_DIR=solaris_x86.plt
UNOPKG_PLATFORM=Solaris_x86
JAVA_PROC_TYPE=i386
endif
@@ -260,24 +256,20 @@ ifneq (,$(findstring linux,$(PLATFORM)))
PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1 | sed -e 's/^i.86$$/i386/')
PLATFORM=linux
-PACKAGE_LIB_DIR=linux_$(PROCTYPE).plt
UNOPKG_PLATFORM=Linux_$(PROCTYPE)
JAVA_PROC_TYPE=$(PROCTYPE)
ifeq "$(PROCTYPE)" "i386"
-PACKAGE_LIB_DIR=linux_x86.plt
UNOPKG_PLATFORM=Linux_x86
JAVA_PROC_TYPE=i386
endif
ifeq "$(PROCTYPE)" "powerpc"
-PACKAGE_LIB_DIR=linux_powerpc.plt
UNOPKG_PLATFORM=Linux_PowerPC
JAVA_PROC_TYPE=ppc
endif
ifeq "$(PROCTYPE)" "sparc"
-PACKAGE_LIB_DIR=linux_sparc.plt
UNOPKG_PLATFORM=Linux_SPARC
JAVA_PROC_TYPE=sparc
endif
@@ -383,41 +375,30 @@ endif
#
###########################################################################
ifneq (,$(findstring darwin,$(PLATFORM)))
-# Settings for MacOSX using gcc 4.0.1 compiler
+# Settings for MacOSX using LLVM version 4.2 (clang-425.0.28)
PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
# Default is MacOSX on a Intel machine
PLATFORM=macosx
-ifeq "$(PROCTYPE)" "i386"
-PACKAGE_LIB_DIR=macosx_x86.plt
-UNOPKG_PLATFORM=MacOSX_x86
-JAVA_PROC_TYPE=x86
-else
ifeq "$(PROCTYPE)" "x86_64"
-PACKAGE_LIB_DIR=macosx_x86.plt
-UNOPKG_PLATFORM=MacOSX_x86
-JAVA_PROC_TYPE=x86
-else
-PACKAGE_LIB_DIR=macosx_ppc.plt
-UNOPKG_PLATFORM=MacOSX_PowerPC
-JAVA_PROC_TYPE=ppc
-endif
+UNOPKG_PLATFORM=MacOSX_x86_64
endif
+
JAVABIN=Commands
-GCC_VERSION =$(shell gcc -dumpversion| cut -d"." -f1,2)
-ifeq "$(GCC_VERSION)" "4.2"
-GCC_ARCH_OPTION=-arch i386
-endif
+GCC_ARCH_OPTION=-arch x86_64
OS=MACOSX
PS=/
ICL=\$$
-CC=gcc-$(GCC_VERSION)
-LINK=g++-$(GCC_VERSION)
-LIB=g++-$(GCC_VERSION)
+CC=`xcrun -f clang` -arch x86_64
+CXX=`xcrun -f clang++` -arch x86_64 -std=c++11
+LINK=`xcrun -f clang++` -arch x86_64 -std=c++11
+LIB=`xcrun -f clang++` -arch x86_64 -std=c++11
+INSTALLTOOL=`xcrun -f install_name_tool`
+
ECHO=@echo
MKDIR=mkdir -p
CAT=cat
@@ -428,6 +409,8 @@ SHAREDLIB_OUT=$(OUT_LIB)
COMID=gcc3
CPPU_ENV=gcc3
+COMID=s5abi
+CPPU_ENV=s5abi
OSEP=\<
CSEP=\>
@@ -459,15 +442,16 @@ SALHELPERDYLIB=-Wl,-dylib_file,@________
REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
-INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3
+INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3
-INSTALL_NAME_URELIBS_BIN=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3
+INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3
EMPTYSTRING=
PATH_SEPARATOR=:
-CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION)
-CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden
+CC_FLAGS_JNI=-c -fPIC -fno-common $(GCC_ARCH_OPTION)
+CC_FLAGS=-c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden
+
# -O is necessary for inlining (see gcc documentation)
ifeq "$(DEBUG)" "yes"
CC_FLAGS_JNI+=-g
@@ -512,19 +496,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess
ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
PLATFORM=kfreebsd
ifeq "$(PROCTYPE)" "x86_64"
-PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
UNOPKG_PLATFORM=kFreeBSD_x86_64
else
-PACKAGE_LIB_DIR=kfreebsd_x86.plt
UNOPKG_PLATFORM=kFreeBSD_x86
endif
else
PLATFORM=freebsd
ifeq "$(PROCTYPE)" "x86_64"
-PACKAGE_LIB_DIR=freebsd_x86_64.plt
UNOPKG_PLATFORM=FreeBSD_x86_64
else
-PACKAGE_LIB_DIR=freebsd_x86.plt
UNOPKG_PLATFORM=FreeBSD_x86
endif
endif
Modified: openoffice/branches/alg_writerframes/main/odk/settings/std.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/odk/settings/std.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/odk/settings/std.mk (original)
+++ openoffice/branches/alg_writerframes/main/odk/settings/std.mk Wed Mar 19 10:14:42 2014
@@ -54,13 +54,18 @@ OFFICE_SERVICES="$(subst \\,\,$(OFFICE_P
OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
-JAVA_OPTIONS=
ifneq "$(OO_SDK_JAVA_HOME)" ""
JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
ifeq "$(JAVA_BITS)" "64-Bit"
-ifneq "$(PLATFORM)" "linux"
-JAVA_OPTIONS=-d32
+JAVA_OPTIONS=-32
+
+ifeq "$(PLATFORM)" "linux"
+JAVA_OPTIONS=
endif
+ifeq "$(PLATFORM)" "macosx"
+JAVA_OPTIONS=
+endif
+
endif
endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/awt/XMouseMotionListener.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/awt/XMouseMotionListener.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/awt/XMouseMotionListener.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/awt/XMouseMotionListener.idl Wed Mar 19 10:14:42 2014
@@ -56,7 +56,7 @@ published interface XMouseMotionListener
//-------------------------------------------------------------------------
- /** is invoked when the mouse button has been moved on a window
+ /** is invoked when the mouse pointer has been moved on a window
(with no buttons down).
*/
void mouseMoved( [in] com::sun::star::awt::MouseEvent e );
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/EmptyUndoStackException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/EmptyUndoStackException.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/EmptyUndoStackException.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/EmptyUndoStackException.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,42 +7,33 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_document_EmptyUndoStackException_idl__
#define __com_sun_star_document_EmptyUndoStackException_idl__
#include <com/sun/star/util/InvalidStateException.idl>
-//==================================================================================================================
-
module com { module sun { module star { module document {
-//==================================================================================================================
-
/** is raised when an operation is attemption at an XUndoManager which requires a non-empty stack
of undo actions, and this requirement is not fullfilled.
+ @since OpenOffice 3.4
*/
-published exception EmptyUndoStackException : ::com::sun::star::util::InvalidStateException
+exception EmptyUndoStackException : ::com::sun::star::util::InvalidStateException
{
};
-//==================================================================================================================
-
}; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoContextNotClosedException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoContextNotClosedException.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoContextNotClosedException.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoContextNotClosedException.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,42 +7,33 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_document_UndoContextNotClosedException_idl__
#define __com_sun_star_document_UndoContextNotClosedException_idl__
#include <com/sun/star/util/InvalidStateException.idl>
-//==================================================================================================================
-
module com { module sun { module star { module document {
-//==================================================================================================================
-
/** is thrown when an operation is attempted at an <type>XUndoManager</type> which requires all undo
contexts to be closed, but this requirement is not fullfilled.
+ @since OpenOffice 3.4
*/
-published exception UndoContextNotClosedException : ::com::sun::star::util::InvalidStateException
+exception UndoContextNotClosedException : ::com::sun::star::util::InvalidStateException
{
};
-//==================================================================================================================
-
}; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoFailedException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoFailedException.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoFailedException.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoFailedException.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,47 +7,38 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_document_UndoFailedException_idl__
#define __com_sun_star_document_UndoFailedException_idl__
#include <com/sun/star/uno/Exception.idl>
-//==================================================================================================================
-
module com { module sun { module star { module document {
-//==================================================================================================================
-
/** thrown when reverting to re-applying an undoable action fails.
@see XUndoAction::undo
@see XUndoManager::undo
+ @since OpenOffice 3.4
*/
-published exception UndoFailedException : ::com::sun::star::uno::Exception
+exception UndoFailedException : ::com::sun::star::uno::Exception
{
/** describes the reason why the operation failed. Usually, this member will carry an exception.
*/
any Reason;
};
-//==================================================================================================================
-
}; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoManagerEvent.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoManagerEvent.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoManagerEvent.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/UndoManagerEvent.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,38 +7,33 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_document_UndoManagerEvent_idl__
#define __com_sun_star_document_UndoManagerEvent_idl__
#include <com/sun/star/lang/EventObject.idl>
-//==================================================================================================================
-
module com { module sun { module star { module document {
-//==================================================================================================================
-
/** is an event sent by an <type>XUndoManager</type> implementation when the Undo/Redo stacks of the manager are
modified.
@see XUndoManager
@see XUndoManagerListener
@see XUndoAction
+ @since OpenOffice 3.4
*/
-published struct UndoManagerEvent : ::com::sun::star::lang::EventObject
+struct UndoManagerEvent : ::com::sun::star::lang::EventObject
{
/** the title of the undo action which is described by the event
@see XUndoAction::Title
@@ -51,10 +46,6 @@ published struct UndoManagerEvent : ::co
long UndoContextDepth;
};
-//==================================================================================================================
-
}; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoAction.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoAction.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoAction.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoAction.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,35 +7,30 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_document_XUndoAction_idl__
#define __com_sun_star_document_XUndoAction_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/document/UndoFailedException.idl>
-//==================================================================================================================
-
module com { module sun { module star { module document {
-//==================================================================================================================
-
/** represents a single (undoable) action on a document
+ @since OpenOffice 3.4
*/
-published interface XUndoAction
+interface XUndoAction
{
/** reverts the action represented by the instance
@@ -64,10 +59,6 @@ published interface XUndoAction
[attribute, readonly] string Title;
};
-//==================================================================================================================
-
}; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManager.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManager.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManager.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManager.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_document_XUndoManager_idl__
#define __com_sun_star_document_XUndoManager_idl__
@@ -33,17 +31,13 @@
#include <com/sun/star/lang/IllegalArgumentException.idl>
#include <com/sun/star/lang/WrappedTargetException.idl>
-//==================================================================================================================
-
module com { module sun { module star { module document {
-published interface XUndoAction;
-published interface XUndoManagerListener;
-
-//==================================================================================================================
+interface XUndoAction;
+interface XUndoManagerListener;
/** provides access to the undo/redo stacks of a document
-
+ <p></p>
<h3>Undo</h3>
<p>Changes to a document usually result in recording of information how to undo those changes, if desired. A so-called
undo action records the information how to undo a single change. Undo actions are maintained in a stack, so that
@@ -72,8 +66,10 @@ published interface XUndoManagerListener
<p>An Undo manager can be locked and unlocked, using the <member>XLockable::lock</member> and
<member>XLockable::unlock</member> methods. When it is locked, then every attempt to add an undo action, or to
enter or leave an Undo context, will be silently ignored.</p>
+
+ @since OpenOffice 3.4
*/
-published interface XUndoManager
+interface XUndoManager
{
/** allows <a href="#locking">locking</a> the undo manager.
*/
@@ -325,10 +321,6 @@ published interface XUndoManager
);
};
-//==================================================================================================================
-
}; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManagerListener.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManagerListener.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManagerListener.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManagerListener.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,37 +7,32 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_document_XUndoManagerListener_idl__
#define __com_sun_star_document_XUndoManagerListener_idl__
#include <com/sun/star/document/UndoManagerEvent.idl>
#include <com/sun/star/lang/XEventListener.idl>
-//==================================================================================================================
-
module com { module sun { module star { module document {
-//==================================================================================================================
-
/** implemented by components which want to be notified of changes in the Undo/Redo stacks of an Undo manager.
@see XUndoManager
+ @since OpenOffice 3.4
*/
-published interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
+interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
{
/** is called when an undo action is added to the undo stack.
@@ -132,10 +127,6 @@ published interface XUndoManagerListener
void cancelledContext( [in] UndoManagerEvent i_event );
};
-//==================================================================================================================
-
}; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManagerSupplier.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManagerSupplier.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManagerSupplier.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/document/XUndoManagerSupplier.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,46 +7,38 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_document_XUndoManagerSupplier_idl__
#define __com_sun_star_document_XUndoManagerSupplier_idl__
#include <com/sun/star/uno/XInterface.idl>
-//==================================================================================================================
-
module com { module sun { module star { module document {
-published interface XUndoManager;
-
-//==================================================================================================================
+interface XUndoManager;
/** provides access to an XUndoManager.
+
+ @since OpenOffice 3.4
*/
-published interface XUndoManagerSupplier
+interface XUndoManagerSupplier
{
/** returns the Undo manager associated with the component.
*/
XUndoManager getUndoManager();
};
-//==================================================================================================================
-
}; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/sheet/Shape.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/sheet/Shape.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/sheet/Shape.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/sheet/Shape.idl Wed Mar 19 10:14:42 2014
@@ -45,7 +45,7 @@ service Shape
/** contains the object where this shape is anchored on.
<p> Possible objects are XSpreadsheet and XCell.</p>
*/
- [readonly, property] com::sun::star::uno::XInterface Anchor;
+ [property] com::sun::star::uno::XInterface Anchor;
//-------------------------------------------------------------------------
/** contains the horizontal position of the object (1/100 mm).
<p> The position is relative to the anchor object.</p>
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl Wed Mar 19 10:14:42 2014
@@ -75,9 +75,6 @@ interface XRangeBasedSmartTagRecognizer:
@param eDataType
This value indicates the type of the passed text.
- @param aLocale
- Is used to indicate the language of the passed text.
-
@param xTextMarkup
This object is used to submit any recognized smart tags
to the calling application.
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/Wizard.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/Wizard.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/Wizard.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/Wizard.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,37 +7,33 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_ui_dialogs_Wizard_idl__
#define __com_sun_star_ui_dialogs_Wizard_idl__
#include <com/sun/star/ui/dialogs/XWizard.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-//==================================================================================================================
-
module com { module sun { module star { module ui { module dialogs {
-published interface XWizardController;
-
-//==================================================================================================================
+interface XWizardController;
/** provides a framework for implementing a wizard dialog.
+
+ @since OpenOffice 3.3
*/
-published service Wizard : XWizard
+service Wizard : XWizard
{
/** creates a wizard with a single execution path
@param PageIds
@@ -63,10 +59,6 @@ published service Wizard : XWizard
);
};
-//==================================================================================================================
-
}; }; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/WizardButton.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/WizardButton.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/WizardButton.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/WizardButton.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,30 +7,26 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_ui_dialogs_WizardButton_idl__
#define __com_sun_star_ui_dialogs_WizardButton_idl__
-//==================================================================================================================
-
module com { module sun { module star { module ui { module dialogs {
-//==================================================================================================================
-
/** denotes the buttons found in a <type>Wizard</type>
+
+ @since OpenOffice 3.3
*/
constants WizardButton
{
@@ -48,10 +44,6 @@ constants WizardButton
const short HELP = 5;
};
-//==================================================================================================================
-
}; }; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,30 +7,26 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_ui_dialogs_WizardTravelType_idl__
#define __com_sun_star_ui_dialogs_WizardTravelType_idl__
-//==================================================================================================================
-
module com { module sun { module star { module ui { module dialogs {
-//==================================================================================================================
-
/** denotes ways to leave a <type>Wizard</type>'s page
+
+ @since OpenOffice 3.3
*/
constants WizardTravelType
{
@@ -42,10 +38,6 @@ constants WizardTravelType
const short FINISH = 3;
};
-//==================================================================================================================
-
}; }; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizard.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizard.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizard.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizard.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_ui_dialogs_XWizard_idl__
#define __com_sun_star_ui_dialogs_XWizard_idl__
@@ -29,12 +27,9 @@
#include <com/sun/star/container/NoSuchElementException.idl>
#include <com/sun/star/awt/XWindow.idl>
-//==================================================================================================================
module com { module sun { module star { module ui { module dialogs {
-//==================================================================================================================
-
-published interface XWizardPage;
+interface XWizardPage;
/** is the main interface implemented by the <type>Wizard</type> services.
@@ -75,8 +70,10 @@ published interface XWizardPage;
@see XWizardController
@see XWizardPage
+
+ @since OpenOffice 3.3
*/
-published interface XWizard
+interface XWizard
{
interface XExecutableDialog;
@@ -216,10 +213,6 @@ published interface XWizard
, ::com::sun::star::util::InvalidStateException );
};
-//==================================================================================================================
-
}; }; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizardController.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizardController.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizardController.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizardController.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,34 +7,30 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_ui_dialogs_XWizardController_idl__
#define __com_sun_star_ui_dialogs_XWizardController_idl__
#include <com/sun/star/ui/dialogs/XWizardPage.idl>
-//==================================================================================================================
-
module com { module sun { module star { module ui { module dialogs {
-//==================================================================================================================
-
/** is the interface of a client-provided controller of a custom <type>Wizard</type>.
+
+ @since OpenOffice 3.3
*/
-published interface XWizardController
+interface XWizardController
{
/** creates a page
@@ -73,10 +69,6 @@ published interface XWizardController
boolean confirmFinish();
};
-//==================================================================================================================
-
}; }; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizardPage.idl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizardPage.idl (original)
+++ openoffice/branches/alg_writerframes/main/offapi/com/sun/star/ui/dialogs/XWizardPage.idl Wed Mar 19 10:14:42 2014
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,34 +7,30 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_ui_dialogs_XWizardPage_idl__
#define __com_sun_star_ui_dialogs_XWizardPage_idl__
#include <com/sun/star/awt/XWindow.idl>
-//==================================================================================================================
-
module com { module sun { module star { module ui { module dialogs {
-//==================================================================================================================
-
/** is a single page of a <type>Wizard</type>
+
+ @since OpenOffice 3.3
*/
-published interface XWizardPage : ::com::sun::star::lang::XComponent
+interface XWizardPage : ::com::sun::star::lang::XComponent
{
/** provides read-only access to the window of the page
*/
@@ -74,10 +70,6 @@ published interface XWizardPage : ::com:
boolean canAdvance();
};
-//==================================================================================================================
-
}; }; }; }; };
-//==================================================================================================================
-
#endif
Modified: openoffice/branches/alg_writerframes/main/offapi/type_reference/typelibrary_history.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/type_reference/typelibrary_history.txt?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/offapi/type_reference/typelibrary_history.txt (original)
+++ openoffice/branches/alg_writerframes/main/offapi/type_reference/typelibrary_history.txt Wed Mar 19 10:14:42 2014
@@ -208,3 +208,9 @@
23/03/2013 (arielch): TaskID=121946
css::ucb::XWebDAVCommandEnvironment: use enums to identify WebDAV/HTTP methods
+
+09/03/2014 (arielch): TaskID=124385
+ Unpublish the Undo API
+
+10/03/2014 (arielch): TaskID=124398
+ Unpublish the Wizard API
Modified: openoffice/branches/alg_writerframes/main/offapi/type_reference/types.rdb
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/offapi/type_reference/types.rdb?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/alg_writerframes/main/ooo_custom_images/dev/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/ooo_custom_images/dev/introabout/intro.png?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/alg_writerframes/main/ooo_custom_images/dev_nologo/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/ooo_custom_images/dev_nologo/introabout/intro.png?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/alg_writerframes/main/ooo_custom_images/nologo/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/ooo_custom_images/nologo/introabout/intro.png?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/alg_writerframes/main/oox/source/core/xmlfilterbase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/oox/source/core/xmlfilterbase.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/oox/source/core/xmlfilterbase.cxx (original)
+++ openoffice/branches/alg_writerframes/main/oox/source/core/xmlfilterbase.cxx Wed Mar 19 10:14:42 2014
@@ -87,6 +87,7 @@ struct XmlFilterBaseImpl
TextFieldStack maTextFieldStack;
explicit XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException );
+ ~XmlFilterBaseImpl();
};
// ----------------------------------------------------------------------------
@@ -121,6 +122,10 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( co
maFastParser.registerNamespace( NMSP_markupCompat ); // i123528
}
+XmlFilterBaseImpl::~XmlFilterBaseImpl()
+{
+}
+
// ============================================================================
XmlFilterBase::XmlFilterBase( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
@@ -133,6 +138,14 @@ XmlFilterBase::XmlFilterBase( const Refe
XmlFilterBase::~XmlFilterBase()
{
+ // #118640# Reset the DocumentHandler at the FastSaxParser manually; this is
+ // needed since the mechanism is that instances of FragmentHandler execute
+ // their stuff (creating objects, setting attributes, ...) on being destroyed.
+ // They get destroyed by setting a new DocumentHandler. This also happens in
+ // the following implicit destruction chain of ~XmlFilterBaseImpl, but in that
+ // case it's member RelationsMap maRelationsMap will be destroyed, but maybe
+ // still be used by ~FragmentHandler -> crash.
+ mxImpl->maFastParser.setDocumentHandler( 0 );
}
// ----------------------------------------------------------------------------
Modified: openoffice/branches/alg_writerframes/main/oox/source/drawingml/shape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/oox/source/drawingml/shape.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/oox/source/drawingml/shape.cxx (original)
+++ openoffice/branches/alg_writerframes/main/oox/source/drawingml/shape.cxx Wed Mar 19 10:14:42 2014
@@ -185,7 +185,8 @@ void Shape::addShape(
void Shape::applyShapeReference( const Shape& rReferencedShape )
{
- mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) );
+ if ( rReferencedShape.mpTextBody.get() )
+ mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) );
maShapeProperties = rReferencedShape.maShapeProperties;
mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties( *rReferencedShape.mpLinePropertiesPtr.get() ) );
mpFillPropertiesPtr = FillPropertiesPtr( new FillProperties( *rReferencedShape.mpFillPropertiesPtr.get() ) );
Modified: openoffice/branches/alg_writerframes/main/oox/source/export/drawingml.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/oox/source/export/drawingml.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/oox/source/export/drawingml.cxx (original)
+++ openoffice/branches/alg_writerframes/main/oox/source/export/drawingml.cxx Wed Mar 19 10:14:42 2014
@@ -426,6 +426,14 @@ OUString DrawingML::WriteImage( const Gr
sMediaType = US( "image/gif" );
sExtension = ".gif";
break;
+
+ // #15508# added BMP type for better exports
+ // export not yet active, so adding for reference (not checked)
+ case GFX_LINK_TYPE_NATIVE_BMP:
+ sMediaType = US( "image/bmp" );
+ sExtension = ".bmp";
+ break;
+
case GFX_LINK_TYPE_NATIVE_JPG:
sMediaType = US( "image/jpeg" );
sExtension = ".jpeg";
Modified: openoffice/branches/alg_writerframes/main/oox/source/ppt/pptshapecontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/oox/source/ppt/pptshapecontext.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/oox/source/ppt/pptshapecontext.cxx (original)
+++ openoffice/branches/alg_writerframes/main/oox/source/ppt/pptshapecontext.cxx Wed Mar 19 10:14:42 2014
@@ -164,8 +164,13 @@ Reference< XFastContextHandler > PPTShap
{
SlidePersistPtr pMasterPersist( mpSlidePersistPtr->getMasterPersist() );
if ( pMasterPersist.get() )
- pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder,
- pPPTShapePtr->getSubTypeIndex(), pMasterPersist->getShapes()->getChildren() );
+ {
+ if ( mpSlidePersistPtr->isNotesPage() )
+ pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder, -1, pMasterPersist->getShapes()->getChildren() );
+ else
+ pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder,
+ pPPTShapePtr->getSubTypeIndex(), pMasterPersist->getShapes()->getChildren() );
+ }
}
if ( pPlaceholder.get() )
{
Modified: openoffice/branches/alg_writerframes/main/oox/source/ppt/presentationfragmenthandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/oox/source/ppt/presentationfragmenthandler.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/oox/source/ppt/presentationfragmenthandler.cxx (original)
+++ openoffice/branches/alg_writerframes/main/oox/source/ppt/presentationfragmenthandler.cxx Wed Mar 19 10:14:42 2014
@@ -268,6 +268,14 @@ void PresentationFragmentHandler::endDoc
SlidePersistPtr pNotesPersistPtr( new SlidePersist( rFilter, sal_False, sal_True, xNotesPage,
ShapePtr( new PPTShape( Slide, "com.sun.star.drawing.GroupShape" ) ), mpTextListStyle ) );
FragmentHandlerRef xNotesFragmentHandler( new SlideFragmentHandler( getFilter(), aNotesFragmentPath, pNotesPersistPtr, Slide ) );
+ // import notesMaster slide for notes slide shapes format
+ OUString aNotesMasterFragmentPath = xNotesFragmentHandler->getFragmentPathFromFirstType( CREATE_OFFICEDOC_RELATION_TYPE( "notesMaster" ) );
+ SlidePersistPtr pNotesMasterPersistPtr( new SlidePersist( rFilter, sal_True/*sal_False*/, sal_True, xNotesPage,
+ ShapePtr( new PPTShape( Slide, "com.sun.star.drawing.GroupShape" ) ), mpTextListStyle ) );
+ FragmentHandlerRef xNotesMasterFragmentHandler( new SlideFragmentHandler( getFilter(), aNotesMasterFragmentPath, pNotesMasterPersistPtr, Slide ) );
+ importSlide( xNotesMasterFragmentHandler, pNotesMasterPersistPtr );
+ pNotesMasterPersistPtr->createXShapes( rFilter );
+ pNotesPersistPtr->setMasterPersist(pNotesMasterPersistPtr);
rFilter.getNotesPages().push_back( pNotesPersistPtr );
rFilter.setActualSlidePersist( pNotesPersistPtr );
importSlide( xNotesFragmentHandler, pNotesPersistPtr );
Modified: openoffice/branches/alg_writerframes/main/oox/source/ppt/slidepersist.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/oox/source/ppt/slidepersist.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/oox/source/ppt/slidepersist.cxx (original)
+++ openoffice/branches/alg_writerframes/main/oox/source/ppt/slidepersist.cxx Wed Mar 19 10:14:42 2014
@@ -179,7 +179,7 @@ void setTextStyle( Reference< beans::XPr
oox::drawingml::TextListStylePtr& pTextListStylePtr, int nLevel )
{
::oox::drawingml::TextParagraphPropertiesPtr pTextParagraphPropertiesPtr( pTextListStylePtr->getListStyle()[ nLevel ] );
- if( pTextParagraphPropertiesPtr == NULL )
+ if( !bool(pTextParagraphPropertiesPtr) )
{
// no properties. return
return;
Modified: openoffice/branches/alg_writerframes/main/oox/source/ppt/timenodelistcontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/oox/source/ppt/timenodelistcontext.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/oox/source/ppt/timenodelistcontext.cxx (original)
+++ openoffice/branches/alg_writerframes/main/oox/source/ppt/timenodelistcontext.cxx Wed Mar 19 10:14:42 2014
@@ -76,27 +76,32 @@ namespace oox { namespace ppt {
{
}
- sal_Int32 get()
+ Any get()
{
sal_Int32 nColor;
+ Sequence< double > aHSL( 3 );
+ Any aColor;
switch( colorSpace )
{
case AnimationColorSpace::HSL:
- nColor = ( ( ( one * 128 ) / 360 ) & 0xff ) << 16
- | ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8
- | ( ( ( three * 128 ) / 1000 ) & 0xff );
+ aHSL[ 0 ] = double(one) / 100000;
+ aHSL[ 1 ] = double(two) / 100000;
+ aHSL[ 2 ] = double(three) / 100000;
+ aColor = Any(aHSL);
break;
case AnimationColorSpace::RGB:
nColor = ( ( ( one * 128 ) / 1000 ) & 0xff ) << 16
| ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8
| ( ( ( three * 128 ) / 1000 ) & 0xff );
+ aColor = Any(nColor);
break;
default:
nColor = 0;
+ aColor = Any( nColor );
break;
}
- return nColor;
+ return aColor;
}
sal_Int16 colorSpace;
@@ -504,7 +509,7 @@ namespace oox { namespace ppt {
if( maFromClr.isUsed() )
mpNode->setFrom( Any( maFromClr.getColor( rGraphicHelper ) ) );
if( mbHasByColor )
- mpNode->setBy( Any ( m_byColor.get() ) );
+ mpNode->setBy( m_byColor.get() );
}
}
@@ -804,7 +809,7 @@ namespace oox { namespace ppt {
if(attribs.hasAttribute( XML_by ) )
{
sal_Int32 nBy = attribs.getInteger( XML_by, 0 );
- pNode->setBy( makeAny( nBy ) );
+ pNode->setBy( makeAny( (double)nBy ) );
}
if(attribs.hasAttribute( XML_from ) )
{
Modified: openoffice/branches/alg_writerframes/main/oox/source/token/tokens.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/oox/source/token/tokens.txt?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/oox/source/token/tokens.txt (original)
+++ openoffice/branches/alg_writerframes/main/oox/source/token/tokens.txt Wed Mar 19 10:14:42 2014
@@ -144,6 +144,7 @@ EnhancedMetaFile
Extend
Extension
External
+Fallback
False
FieldCodes
FileBinding
@@ -2109,7 +2110,6 @@ factor
fade
fadeDir
fallback
-Fallback
false
family
fans
Modified: openoffice/branches/alg_writerframes/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/postprocess/packcomponents/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/postprocess/packcomponents/makefile.mk Wed Mar 19 10:14:42 2014
@@ -310,11 +310,13 @@ my_components += \
.IF "$(OS)" == "MACOSX"
my_components += \
- avmediaQuickTime \
fps_aqua \
macab1 \
macbe1 \
MacOSXSpell
+.IF "${MACOSX_DEPLOYMENT_TARGET}" == ""
+ my_components += avmediaQuickTime
+.END
.END
.IF "$(OS)" == "WNT"
Modified: openoffice/branches/alg_writerframes/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/postprocess/rebase/coffbase.txt?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/postprocess/rebase/coffbase.txt (original)
+++ openoffice/branches/alg_writerframes/main/postprocess/rebase/coffbase.txt Wed Mar 19 10:14:42 2014
@@ -239,7 +239,6 @@ sn_tools.dll 0x000000005e7a0000 0x00
so_activex.dll 0x000000005e770000 0x00020000
socomp.dll 0x000000005e750000 0x00010000
sofficeapp.dll 0x000000005e6e0000 0x00060000
-soldepmi.dll 0x000000005e6a0000 0x00030000
solvermi.dll 0x000000005e680000 0x00010000
sotmi.dll 0x000000005e620000 0x00050000
spellmi.dll 0x000000005e5e0000 0x00030000
Modified: openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/FixedTextColor.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/FixedTextColor.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/FixedTextColor.cxx (original)
+++ openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/FixedTextColor.cxx Wed Mar 19 10:14:42 2014
@@ -250,7 +250,7 @@ namespace rptui
if ( pUnoObj ) // this doesn't need to be done for shapes
{
::boost::shared_ptr<OSectionWindow> pSectionWindow = pController->getSectionWindow(xSection);
- if (pSectionWindow != NULL)
+ if( bool(pSectionWindow) )
{
OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice
OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView
Modified: openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx (original)
+++ openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx Wed Mar 19 10:14:42 2014
@@ -184,7 +184,7 @@ namespace rptui
{
// Rectangle aRect = pUnoObj->GetCurrentBoundRect();
::boost::shared_ptr<OSectionWindow> pSectionWindow = m_rReportController.getSectionWindow(xSection);
- if (pSectionWindow != NULL)
+ if( bool(pSectionWindow))
{
OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice
OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView
Modified: openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/ViewsWindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/ViewsWindow.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/ViewsWindow.cxx (original)
+++ openoffice/branches/alg_writerframes/main/reportdesign/source/ui/report/ViewsWindow.cxx Wed Mar 19 10:14:42 2014
@@ -464,10 +464,8 @@ void OViewsWindow::Paste()
if (nCurrentPosition > 0)
{
pRet = (*(--aIter));
- if (pRet == NULL)
- {
- pRet = (*m_aSections.begin());
- }
+ if( !bool(pRet) )
+ pRet = (*m_aSections.begin());
}
else
{
@@ -482,10 +480,8 @@ void OViewsWindow::Paste()
if ((nCurrentPosition + 1) < nSize)
{
pRet = *(++aIter);
- if (pRet == NULL)
- {
- pRet = (*(--aEnd));
- }
+ if( !bool(pRet) )
+ pRet = (*(--aEnd));
}
else
{
Modified: openoffice/branches/alg_writerframes/main/sal/inc/sal/mathconf.h
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sal/inc/sal/mathconf.h?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sal/inc/sal/mathconf.h (original)
+++ openoffice/branches/alg_writerframes/main/sal/inc/sal/mathconf.h Wed Mar 19 10:14:42 2014
@@ -55,7 +55,7 @@ extern "C" {
/* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#if defined(__GNUC__) // workaround gcc bug 14608
+#if defined(__GNUC__) && !defined(__clang__) // workaround gcc bug 14608
#if (__GNUC_MINOR__ >= 3) // gcc>=4.3 has a builtin
#define SAL_MATH_FINITE(d) __builtin_isfinite(d)
#else
Modified: openoffice/branches/alg_writerframes/main/sal/osl/os2/module.c
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sal/osl/os2/module.c?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sal/osl/os2/module.c (original)
+++ openoffice/branches/alg_writerframes/main/sal/osl/os2/module.c Wed Mar 19 10:14:42 2014
@@ -22,8 +22,6 @@
-#include "system.h"
-
#include <osl/module.h>
#include <osl/diagnose.h>
#include <osl/file.h>
@@ -32,106 +30,103 @@
#include <stdlib.h>
#include <dlfcn.h>
-int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
+#include "system.h"
-// static data for holding SAL dll module and full path
-static HMODULE hModSal;
-static char szSalDir[ _MAX_PATH];
-static char szSalDrive[ _MAX_PATH];
+/* implemented in file.cxx */
+int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
/*****************************************************************************/
/* osl_loadModule */
/*****************************************************************************/
-ULONG APIENTRY _DosLoadModule (PSZ pszObject, ULONG uObjectLen, PCSZ pszModule,
- PHMODULE phmod)
-{
- APIRET rc;
- rc = DosLoadModule( pszObject, uObjectLen, pszModule, phmod);
- // YD 22/05/06 issue again if first call fails (why?)
- if (rc == ERROR_INVALID_PARAMETER)
- rc = DosLoadModule( pszObject, uObjectLen, pszModule, phmod);
- return rc;
-}
-
-oslModule SAL_CALL osl_loadAsciiModule( const sal_Char* pModuleName, sal_Int32 nRtldMode )
-{
- rtl_uString* pUniName = NULL;
- rtl_uString_newFromAscii( &pUniName, pModuleName );
- oslModule aModule = osl_loadModule( pUniName, nRtldMode );
- rtl_uString_release( pUniName );
- return aModule;
-}
-
oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMode)
{
- HMODULE hModule;
- BYTE szErrorMessage[256];
- APIRET rc;
oslModule pModule=0;
rtl_uString* ustrTmp = NULL;
OSL_ENSURE(ustrModuleName,"osl_loadModule : string is not valid");
/* ensure ustrTmp hold valid string */
- if( osl_File_E_None != osl_getSystemPathFromFileURL( ustrModuleName, &ustrTmp ) )
- rtl_uString_assign( &ustrTmp, ustrModuleName );
+ if (osl_File_E_None != osl_getSystemPathFromFileURL(ustrModuleName, &ustrTmp))
+ rtl_uString_assign(&ustrTmp, ustrModuleName);
- if( ustrTmp )
+ if (ustrTmp)
{
char buffer[PATH_MAX];
- if( UnicodeToText( buffer, PATH_MAX, ustrTmp->buffer, ustrTmp->length ) )
- {
- char drive[_MAX_DRIVE], dir[_MAX_DIR];
- char fname[_MAX_FNAME], ext[_MAX_EXT];
- char* dot;
- // 21/02/2006 YD dll names must be 8.3: since .uno.dll files
- // have hardcoded names, I'm truncating names here and also in
- // the build system
- _splitpath (buffer, drive, dir, fname, ext);
- if (strlen(fname)>8)
- fname[8] = 0; // truncate to 8.3
- dot = strchr( fname, '.');
- if (dot)
- *dot = '\0'; // truncate on dot
- // if drive is not specified, remove starting \ from dir name
- // so dll is loaded from LIBPATH
- if (drive[0] == 0 && dir[0] == '\\' && dir[1] == '\\') {
- while( dir[0] == '\\')
- strcpy( dir, dir+1);
- }
- _makepath( buffer, drive, dir, fname, ext);
+ if (UnicodeToText(buffer, PATH_MAX, ustrTmp->buffer, ustrTmp->length))
+ pModule = osl_loadAsciiModule(buffer, nRtldMode);
+ rtl_uString_release(ustrTmp);
+ }
-#if OSL_DEBUG_LEVEL>10
- debug_printf("osl_loadModule module %s", buffer);
+ return pModule;
+}
+
+/*****************************************************************************/
+/* osl_loadAsciiModule */
+/*****************************************************************************/
+
+oslModule SAL_CALL osl_loadAsciiModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode)
+{
+ char drive[_MAX_DRIVE], dir[_MAX_DIR];
+ char fname[_MAX_FNAME], ext[_MAX_EXT];
+ char buffer[PATH_MAX];
+ char* dot;
+ void* hModule;
+
+ if (!pszModuleName)
+ return NULL;
+
+ // 21/02/2006 YD dll names must be 8.3: since .uno.dll files
+ // have hardcoded names, I'm truncating names here and also in
+ // the build system
+ _splitpath (pszModuleName, drive, dir, fname, ext);
+ if (strlen(fname)>8)
+ fname[8] = 0; // truncate to 8.3
+ dot = strchr( fname, '.');
+ if (dot)
+ *dot = '\0'; // truncate on dot
+
+ // if drive is not specified, remove starting \ from dir name
+ // so dll is loaded from LIBPATH
+ if (drive[0] == 0 && dir[0] == '\\' && dir[1] == '\\') {
+ while( dir[0] == '\\')
+ strcpy( dir, dir+1);
+ }
+ _makepath( buffer, drive, dir, fname, ext);
+
+#if OSL_DEBUG_LEVEL>1
+ debug_printf("osl_loadModule module %s", buffer);
#endif
- hModule = dlopen( buffer, RTLD_LOCAL);
- if (hModule != NULL )
- pModule = (oslModule)hModule;
- else
- {
- sal_Char szError[ PATH_MAX*2 ];
- sprintf( szError, "Module: %s; errno: %d;\n"
- "Please contact technical support and report above informations.\n\n",
- buffer, errno );
+
+ hModule = dlopen( buffer, RTLD_LOCAL);
+ if (hModule != NULL)
+ return (oslModule)hModule;
+
+ // do not show in case rc=2 ENOENT, we must parse dlerror
+ // string to detect it
+ char* err = dlerror();
+ if (!err)
+ return NULL;
+
+ if (strstr( err, "rc=2") != NULL)
+ return NULL;
+
+ sal_Char szError[ PATH_MAX*2 ];
+ sprintf( szError, "Module: %s;\n error: %s;\n\n"
+ "Please contact technical support and report above informations.\n\n",
+ buffer, err);
#if OSL_DEBUG_LEVEL>0
- fprintf( stderr, szError);
+ debug_printf("osl_loadModule error %s", szError);
#endif
- debug_printf("osl_loadModule error %s", szError);
-#ifndef OSL_DEBUG_LEVEL
- WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
- szError, "Critical error: DosLoadModule failed",
- 0, MB_ERROR | MB_OK | MB_MOVEABLE);
+#if (OSL_DEBUG_LEVEL==0) || !defined(OSL_DEBUG_LEVEL)
+ WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
+ szError, "Critical error: DosLoadModule failed",
+ 0, MB_ERROR | MB_OK | MB_MOVEABLE);
#endif
- }
- }
- }
-
- rtl_uString_release( ustrTmp );
- return pModule;
+ return NULL;
}
/*****************************************************************************/
@@ -143,27 +138,45 @@ osl_getModuleHandle(rtl_uString *pModule
{
HMODULE hmod;
APIRET rc;
- rc = DosQueryModuleHandle(pModuleName->buffer, &hmod);
- if( rc == NO_ERROR)
+
+ OSL_ENSURE(pModuleName,"osl_loadModule : string is not valid");
+
+ if (pModuleName)
{
- *pResult = (oslModule) hmod;
- return sal_True;
+ char buffer[PATH_MAX];
+
+ if (UnicodeToText(buffer, PATH_MAX, pModuleName->buffer,
+ pModuleName->length))
+ {
+ rc = DosQueryModuleHandle(buffer, &hmod);
+ if( rc == NO_ERROR)
+ {
+ *pResult = (oslModule) hmod;
+ return sal_True;
+ }
+ }
}
-
+
return sal_False;
}
/*****************************************************************************/
/* osl_unloadModule */
/*****************************************************************************/
-void SAL_CALL osl_unloadModule(oslModule Module)
+void SAL_CALL osl_unloadModule(oslModule hModule)
{
-#if OSL_DEBUG_LEVEL>0
- if (!Module)
- fprintf( stderr, "osl_unloadModule NULL HANDLE.\n");
-#endif
-
- DosFreeModule((HMODULE)Module);
+ if (hModule)
+ {
+ int nRet = dlclose(hModule);
+#if OSL_DEBUG_LEVEL > 1
+ if (nRet != 0)
+ {
+ debug_printf( "osl_unloadModule failed with %s\n", dlerror());
+ }
+#else
+ (void) nRet;
+#endif /* if OSL_DEBUG_LEVEL */
+ }
}
/*****************************************************************************/
Modified: openoffice/branches/alg_writerframes/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/inc/document.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/inc/document.hxx (original)
+++ openoffice/branches/alg_writerframes/main/sc/inc/document.hxx Wed Mar 19 10:14:42 2014
@@ -465,7 +465,7 @@ public:
public:
SC_DLLPUBLIC ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT,
SfxObjectShell* pDocShell = NULL );
- SC_DLLPUBLIC ~ScDocument();
+ SC_DLLPUBLIC virtual ~ScDocument();
inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
GetServiceManager() const { return xServiceManager; }
@@ -503,6 +503,7 @@ public:
ScFieldEditEngine* CreateFieldEditEngine();
void DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine);
+ // Note: the returned ScRangeName is volatile, and it can be changed at any time.
SC_DLLPUBLIC ScRangeName* GetRangeName();
void SetRangeName( ScRangeName* pNewRangeName );
SCTAB GetMaxTableNumber() { return nMaxTableNumber; }
Modified: openoffice/branches/alg_writerframes/main/sc/inc/filter.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/inc/filter.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/inc/filter.hxx (original)
+++ openoffice/branches/alg_writerframes/main/sc/inc/filter.hxx Wed Mar 19 10:14:42 2014
@@ -129,7 +129,7 @@ class ScFormatFilterPlugin {
// scfilt plugin symbol
extern "C" {
- ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void);
+ SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void);
}
class ScFormatFilter {
Modified: openoffice/branches/alg_writerframes/main/sc/inc/refdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/inc/refdata.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/inc/refdata.hxx (original)
+++ openoffice/branches/alg_writerframes/main/sc/inc/refdata.hxx Wed Mar 19 10:14:42 2014
@@ -76,6 +76,10 @@ struct SC_DLLPUBLIC ScSingleRefData
// No default ctor, because used in ScRawToken union, set InitFlags!
inline void InitFlags() { bFlags = 0; } // all FALSE
+
+ // #123870# Make it possible to init members to some defined values
+ inline void InitMembers() { nRow = nRelRow = 0; nCol = nRelCol = 0; nTab = nRelTab = 0; }
+
// InitAddress: InitFlags and set address
inline void InitAddress( const ScAddress& rAdr );
inline void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab );
@@ -157,6 +161,14 @@ struct ScComplexRefData // Compl
inline void InitFlags()
{ Ref1.InitFlags(); Ref2.InitFlags(); }
+
+ // #123870# Make it possible to init members to some defined values
+ inline void InitMembers()
+ {
+ Ref1.InitMembers();
+ Ref2.InitMembers();
+ }
+
inline void InitRange( const ScRange& rRange )
{
Ref1.InitAddress( rRange.aStart );
Modified: openoffice/branches/alg_writerframes/main/sc/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/prj/build.lst?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/prj/build.lst (original)
+++ openoffice/branches/alg_writerframes/main/sc/prj/build.lst Wed Mar 19 10:14:42 2014
@@ -6,7 +6,6 @@ sc sc\res get - all sc_res NULL
sc sc\res\imglst\inputwin get - all sc_resiw NULL
sc sc\res\imglst\navipi get - all sc_resna NULL
sc sc\res\imglst\apptbx get - all sc_resap NULL
-sc sc\source\core\inc get - all sc_coinc NULL
sc sc\source\ui\inc get - all sc_uiinc NULL
sc sc\source\filter\inc get - all sc_fiinc NULL
sc sc\addin\inc get - all sc_adinc NULL
Modified: openoffice/branches/alg_writerframes/main/sc/source/core/data/docpool.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/source/core/data/docpool.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/source/core/data/docpool.cxx (original)
+++ openoffice/branches/alg_writerframes/main/sc/source/core/data/docpool.cxx Wed Mar 19 10:14:42 2014
@@ -734,6 +734,7 @@ SfxItemPresentation lcl_HFPresentation
{
aText += GetMetricText( (long)nLeftMargin,
eCoreMetric, ePresentationMetric, pIntl );
+ aText += sal_Unicode(' ');
aText += EE_RESSTR(GetMetricId(ePresentationMetric));
}
aText += cpDelim;
@@ -750,6 +751,7 @@ SfxItemPresentation lcl_HFPresentation
{
aText += GetMetricText( (long)nRightMargin,
eCoreMetric, ePresentationMetric, pIntl );
+ aText += sal_Unicode(' ');
aText += EE_RESSTR(GetMetricId(ePresentationMetric));
}
}
Modified: openoffice/branches/alg_writerframes/main/sc/source/core/data/documen3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/source/core/data/documen3.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/source/core/data/documen3.cxx (original)
+++ openoffice/branches/alg_writerframes/main/sc/source/core/data/documen3.cxx Wed Mar 19 10:14:42 2014
@@ -95,6 +95,9 @@ ScRangeName* ScDocument::GetRangeName()
void ScDocument::SetRangeName( ScRangeName* pNewRangeName )
{
+ if (pRangeName == pNewRangeName)
+ return;
+
if (pRangeName)
delete pRangeName;
pRangeName = pNewRangeName;
Modified: openoffice/branches/alg_writerframes/main/sc/source/core/data/drwlayer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/source/core/data/drwlayer.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/source/core/data/drwlayer.cxx (original)
+++ openoffice/branches/alg_writerframes/main/sc/source/core/data/drwlayer.cxx Wed Mar 19 10:14:42 2014
@@ -274,11 +274,17 @@ ScDrawLayer::ScDrawLayer( ScDocument* pD
// #95129# SJ: set FontHeight pool defaults without changing static SdrEngineDefaults
SfxItemPool* pOutlinerPool = rOutliner.GetEditTextObjectPool();
if ( pOutlinerPool )
+ {
pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT )); // 12Pt
+ pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT_CJK )); // 12Pt
+ }
SfxItemPool* pHitOutlinerPool = rHitOutliner.GetEditTextObjectPool();
if ( pHitOutlinerPool )
+ {
pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT )); // 12Pt
-
+ pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT_CJK )); // 12Pt
+ }
+
// initial undo mode as in Calc document
if( pDoc )
EnableUndo( pDoc->IsUndoEnabled() );
Modified: openoffice/branches/alg_writerframes/main/sc/source/core/data/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/source/core/data/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/source/core/data/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/sc/source/core/data/makefile.mk Wed Mar 19 10:14:42 2014
@@ -31,6 +31,7 @@ PROJECTPCH=core_pch
PROJECTPCHSOURCE=..\pch\core_pch
AUTOSEG=true
+ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
Modified: openoffice/branches/alg_writerframes/main/sc/source/core/data/table2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/source/core/data/table2.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/source/core/data/table2.cxx (original)
+++ openoffice/branches/alg_writerframes/main/sc/source/core/data/table2.cxx Wed Mar 19 10:14:42 2014
@@ -155,18 +155,24 @@ void ScTable::InsertRow( SCCOL nStartCol
if (!maRowManualBreaks.empty())
{
- std::set<SCROW>::reverse_iterator rit = maRowManualBreaks.rbegin();
- while (rit != maRowManualBreaks.rend())
+ std::vector<SCROW> aUpdatedBreaks;
+
+ while ( ! maRowManualBreaks.empty())
{
- SCROW nRow = *rit;
- if (nRow < nStartRow)
- break; // while
- else
- {
- maRowManualBreaks.erase( (++rit).base());
- maRowManualBreaks.insert( static_cast<SCROW>( nRow + nSize));
- }
+ std::set<SCROW>::iterator aLast (--maRowManualBreaks.end());
+
+ // Check if there are more entries that have to be processed.
+ if (*aLast < nStartRow)
+ break;
+
+ // Remember the updated break location and erase the entry.
+ aUpdatedBreaks.push_back(static_cast<SCROW>(*aLast + nSize));
+ maRowManualBreaks.erase(aLast);
}
+
+ // Insert the updated break locations.
+ if ( ! aUpdatedBreaks.empty())
+ maRowManualBreaks.insert(aUpdatedBreaks.begin(), aUpdatedBreaks.end());
}
}
@@ -261,18 +267,24 @@ void ScTable::InsertCol( SCCOL nStartCol
if (!maColManualBreaks.empty())
{
- std::set<SCCOL>::reverse_iterator rit = maColManualBreaks.rbegin();
- while (rit != maColManualBreaks.rend())
+ std::vector<SCCOL> aUpdatedBreaks;
+
+ while ( ! maColManualBreaks.empty())
{
- SCCOL nCol = *rit;
- if (nCol < nStartCol)
- break; // while
- else
- {
- maColManualBreaks.erase( (++rit).base());
- maColManualBreaks.insert( static_cast<SCCOL>( nCol + nSize));
- }
+ std::set<SCCOL>::iterator aLast (--maColManualBreaks.end());
+
+ // Check if there are more entries that have to be processed.
+ if (*aLast < nStartRow)
+ break;
+
+ // Remember the updated break location and erase the entry.
+ aUpdatedBreaks.push_back(static_cast<SCCOL>(*aLast + nSize));
+ maColManualBreaks.erase(aLast);
}
+
+ // Insert the updated break locations.
+ if ( ! aUpdatedBreaks.empty())
+ maColManualBreaks.insert(aUpdatedBreaks.begin(), aUpdatedBreaks.end());
}
}
Modified: openoffice/branches/alg_writerframes/main/sc/source/core/tool/addincol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/source/core/tool/addincol.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/source/core/tool/addincol.cxx (original)
+++ openoffice/branches/alg_writerframes/main/sc/source/core/tool/addincol.cxx Wed Mar 19 10:14:42 2014
@@ -752,7 +752,6 @@ sal_Bool lcl_ValidReturnType( const uno:
IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<uno::Any> >*)0) ) );
}
}
- return sal_False;
}
ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdlClass>& xClass )
Modified: openoffice/branches/alg_writerframes/main/sc/source/core/tool/interpr1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sc/source/core/tool/interpr1.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sc/source/core/tool/interpr1.cxx (original)
+++ openoffice/branches/alg_writerframes/main/sc/source/core/tool/interpr1.cxx Wed Mar 19 10:14:42 2014
@@ -7681,7 +7681,7 @@ bool IsDBCS(sal_Unicode ch)
}
sal_Int32 getLengthB(String &str)
{
- sal_Int32 index = 0;
+ xub_StrLen index = 0;
sal_Int32 length = 0;
if(0 == str.Len())
return 0;