[ooo-build-commit] Branch 'ooo/master' - 3 commits - binfilter/bf_forms binfilter/bf_so3 binfilter/filter filter/source oox/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Sep 18 17:48:24 PDT 2009
binfilter/bf_forms/util/makefile.mk | 16 ----------
binfilter/bf_so3/source/inplace/applet2.cxx | 12 -------
binfilter/bf_so3/source/inplace/makefile.mk | 7 ++--
binfilter/bf_so3/source/misc/factory.cxx | 4 +-
binfilter/bf_so3/util/makefile.mk | 4 --
binfilter/filter/source/bf_offwrp/makefile.mk | 1
filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu | 6 +--
filter/source/config/fragments/types/writer_PocketWord_File.xcu | 6 +--
oox/source/core/filterbase.cxx | 10 +++---
9 files changed, 17 insertions(+), 49 deletions(-)
New commits:
commit e5f4990205bac958a90cafc3f5ec86df66203d4d
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Sep 18 12:31:43 2009 +0000
CWS-TOOLING: integrate CWS calc32stopper1
2009-09-15 15:43:23 +0200 dr r276180 : newpic
2009-09-15 15:41:13 +0200 dr r276179 : newpic
2009-09-15 14:58:14 +0200 dr r276178 : #i104905# fixed note handling while importing from external data
2009-09-15 13:47:43 +0200 dr r276173 : #i104905# fixed note handling while importing from database
2009-09-15 11:56:00 +0200 dr r276164 : #i104155# prevent crash loading docx
2009-09-15 10:40:43 +0200 dr r276154 : #i104990#
2009-09-15 10:27:31 +0200 dr r276152 : #i104990# enable saving BIFF8 with password/encryption
2009-09-15 10:26:40 +0200 dr r276151 : #i104990# enable saving BIFF8 with password/encryption
2009-09-14 19:13:11 +0200 dr r276145 : #i105007# missing cleanup for deleted headers
2009-09-14 19:06:57 +0200 dr r276144 : #i105007# missing cleanup for deleted headers
2009-09-14 18:53:39 +0200 dr r276143 : #i104915# prevent crashes and misbehaviour when dealing with note cells: enter matrix, enter mult.op
2009-09-14 13:57:00 +0200 dr r276109 : #160184# make drilldown working in exported pivottables, ported to DEV300
2009-09-11 15:16:08 +0200 nn r276068 : #i104987# MoveBlock: pass bCut parameter
2009-09-11 15:15:22 +0200 nn r276067 : #i104986# CopyToClip: correct order of parameters
2009-09-11 09:45:59 +0200 dr r276053 : correct milestone
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index d289255..c5b4233 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -89,7 +89,7 @@ public:
explicit DocumentOpenedGuard( const OUString& rUrl );
~DocumentOpenedGuard();
- inline bool isValid() const { return maUrl.getLength() > 0; }
+ inline bool isValid() const { return mbValid; }
private:
DocumentOpenedGuard( const DocumentOpenedGuard& );
@@ -100,15 +100,15 @@ private:
UrlSet& mrUrls;
OUString maUrl;
+ bool mbValid;
};
DocumentOpenedGuard::DocumentOpenedGuard( const OUString& rUrl ) :
mrUrls( UrlPool::get() )
{
::osl::MutexGuard aGuard( *this );
- OSL_ENSURE( (rUrl.getLength() == 0) || (mrUrls.count( rUrl ) == 0),
- "DocumentOpenedGuard::DocumentOpenedGuard - filter called recursively for this document" );
- if( (rUrl.getLength() > 0) && (mrUrls.count( rUrl ) == 0) )
+ mbValid = (rUrl.getLength() == 0) || (mrUrls.count( rUrl ) == 0);
+ if( mbValid && (rUrl.getLength() > 0) )
{
mrUrls.insert( rUrl );
maUrl = rUrl;
@@ -118,7 +118,7 @@ DocumentOpenedGuard::DocumentOpenedGuard( const OUString& rUrl ) :
DocumentOpenedGuard::~DocumentOpenedGuard()
{
::osl::MutexGuard aGuard( *this );
- if( isValid() )
+ if( maUrl.getLength() > 0 )
mrUrls.erase( maUrl );
}
commit 566215fa408d8599c591be455373c9658df52728
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Sep 18 11:54:06 2009 +0000
CWS-TOOLING: integrate CWS dtrans2vcl
2009-09-09 19:47:56 +0200 pl r276016 : merge fix for #i104390# into moved code
2009-09-07 12:50:47 +0200 pl r275891 : remove nonexistant header
2009-09-04 16:47:05 +0200 pl r275819 : forgot calling convention for Windoze
2009-09-04 13:27:36 +0200 pl r275800 : #150926# remove X11 dependency
2009-09-04 13:19:08 +0200 pl r275799 : #150926# move mac dtrans service to vcl to be used in service implementation
2009-09-03 21:19:01 +0200 pl r275774 : fix warning, adjust comment
2009-09-03 18:36:01 +0200 pl r275768 : no more sjlib
2009-09-03 17:56:49 +0200 pl r275767 : remove unused X11 link dependency
2009-09-03 17:43:35 +0200 pl r275766 : headless not used in X11 case
2009-09-03 17:34:36 +0200 pl r275765 : #150926# bye bye sj2
2009-09-03 16:19:04 +0200 pl r275761 : #150926# bye bye sj2, x11 dependenices removed where not necessary
2009-09-01 17:22:54 +0200 pl r275674 : #150926# step 1: move X11 code from dtrans to vcl, adapt glue code
diff --git a/binfilter/bf_forms/util/makefile.mk b/binfilter/bf_forms/util/makefile.mk
index 49271b6..c290e93 100644
--- a/binfilter/bf_forms/util/makefile.mk
+++ b/binfilter/bf_forms/util/makefile.mk
@@ -92,22 +92,6 @@ RES1FILELIST=\
RESLIB1NAME=$(TARGET)
RESLIB1SRSFILES=$(RES1FILELIST)
-.IF "$(GUI)"=="UNX"
-
-# [ed] 6/19/02 Only add in libraries for X11 OS X builds
-
-.IF "$(OS)"=="MACOSX"
-.IF "$(GUIBASE)"=="unx"
-SHL1STDLIBS +=\
- -lX11 -lXt -lXmu
-.ENDIF
-.ELSE
-SHL1STDLIBS +=\
- -lX11
-.ENDIF # OS == MACOSX
-
-.ENDIF
-
# --- Targets ----------------------------------
.INCLUDE : target.mk
diff --git a/binfilter/bf_so3/source/inplace/applet2.cxx b/binfilter/bf_so3/source/inplace/applet2.cxx
index 30ac77e..2e484e0 100644
--- a/binfilter/bf_so3/source/inplace/applet2.cxx
+++ b/binfilter/bf_so3/source/inplace/applet2.cxx
@@ -37,9 +37,6 @@
#include <tools/list.hxx>
#include <tools/urlobj.hxx>
#include <tools/debug.hxx>
-#ifdef SOLAR_JAVA
-#include <sj2/sjapplet.hxx>
-#endif
#include "insdlg.hxx"
#include <svuidlg.hrc>
#include <bf_so3/ipenv.hxx>
@@ -100,9 +97,6 @@ struct SvAppletData_Impl
//============== SvAppletEnvironment ======================================
//=========================================================================
class SvAppletEnvironment : public SvInPlaceEnvironment
-#ifdef SOLAR_JAVA
- , public SjApplet2
-#endif
{
protected:
virtual void RectsChangedPixel( const Rectangle & rObjRect,
@@ -196,9 +190,6 @@ SvAppletEnvironment::~SvAppletEnvironment()
Die angelegten Fenster werden zerst"ort.
*/
{
-#ifdef SOLAR_JAVA
- appletClose(); // Fenster Reparent
-#endif
Window * pAppletWin = GetEditWin();
// statt DeleteEditWin() auf NULL setzen und durch den Manager
// zerst"oren
@@ -226,9 +217,6 @@ void SvAppletEnvironment::RectsChangedPixel
*/
{
SvInPlaceEnvironment::RectsChangedPixel( rObjRect, rClip );
-#ifdef SOLAR_JAVA
- setSizePixel( rObjRect.GetSize() );
-#endif
}
//=========================================================================
diff --git a/binfilter/bf_so3/source/inplace/makefile.mk b/binfilter/bf_so3/source/inplace/makefile.mk
index 763b2e3..123bbc2 100644
--- a/binfilter/bf_so3/source/inplace/makefile.mk
+++ b/binfilter/bf_so3/source/inplace/makefile.mk
@@ -44,6 +44,7 @@ TARGET=so3_inplace
# --- Files --------------------------------------------------------
SLOFILES= \
+ $(SLO)$/applet2.obj \
$(SLO)$/outplace.obj \
$(SLO)$/embobj.obj \
$(SLO)$/client.obj \
@@ -52,13 +53,13 @@ SLOFILES= \
$(SLO)$/protocol.obj \
$(SLO)$/soconv.obj \
$(SLO)$/ipenv.obj \
- $(SLO)$/applet2.obj \
$(SLO)$/plugin.obj
EXCEPTIONSFILES= \
- $(SLO)$/plugin.obj \
- $(SLO)$/applet2.obj
+ $(SLO)$/applet2.obj \
+ $(SLO)$/plugin.obj
+
# --- Tagets -------------------------------------------------------
diff --git a/binfilter/bf_so3/source/misc/factory.cxx b/binfilter/bf_so3/source/misc/factory.cxx
index b2fdd87..98fca45 100644
--- a/binfilter/bf_so3/source/misc/factory.cxx
+++ b/binfilter/bf_so3/source/misc/factory.cxx
@@ -65,7 +65,7 @@
#include <bf_so3/ipenv.hxx>
#include <bf_so3/protocol.hxx>
#include "bf_so3/plugin.hxx"
-#include "bf_so3/applet.hxx"
+// #include "bf_so3/applet.hxx"
#include "bf_so3/soerr.hxx"
#include <comphelper/classids.hxx>
#include "insdlg.hxx"
@@ -198,7 +198,7 @@ BOOL SvFactory::Init()
pSoApp->aInfoClassMgr.SV_CLASS_REGISTER( SvEmbeddedInfoObject );
pSoApp->aInfoClassMgr.SV_CLASS_REGISTER( SvInfoObject );
SvPlugInObject::ClassFactory();
- SvAppletObject::ClassFactory();
+ // SvAppletObject::ClassFactory();
SvOutPlaceObject::ClassFactory();
}
diff --git a/binfilter/bf_so3/util/makefile.mk b/binfilter/bf_so3/util/makefile.mk
index 0a4723b..96f5390 100644
--- a/binfilter/bf_so3/util/makefile.mk
+++ b/binfilter/bf_so3/util/makefile.mk
@@ -98,10 +98,6 @@ SHL1STDLIBS=$(VOSLIB) \
ole2disp.lib typelib.lib
.ENDIF
-.IF "$(SOLAR_JAVA)" != ""
-SHL1STDLIBS+=$(SJLIB)
-.ENDIF
-
.IF "$(GUI)"=="UNX"
SHL1DEPN= $(LIB1TARGET)
.ELSE
diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk b/binfilter/filter/source/bf_offwrp/makefile.mk
index 6091042..49680b3 100644
--- a/binfilter/filter/source/bf_offwrp/makefile.mk
+++ b/binfilter/filter/source/bf_offwrp/makefile.mk
@@ -56,7 +56,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1IMPLIB= ibf_wrp
SHL1STDLIBS= \
$(BFSO3LIB) \
- $(SJLIB) \
$(BFSVTOOLLIB) \
$(BFOFALIB) \
$(VCLLIB) \
commit 3b0b93de626423209c5450c10c77bba006336eba
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Fri Sep 18 10:15:03 2009 +0000
CWS-TOOLING: integrate CWS mba32issues02
2009-09-17 mb93783 merge commit
2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial
2009-09-01 mba #101455#: code simplification
2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no
2009-08-25 mba merge to m55
2009-07-29 mba cleanup after rebase
2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI
2009-07-27 mba adding dictionary changes from broken svn CWS
2009-07-27 mba adding dictionary changes from broken svn CWS
2009-07-27 mba apply patch from broken svn CWS
diff --git a/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu b/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu
index aa1f68e..516d9da 100644
--- a/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu
+++ b/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu
@@ -1,12 +1,12 @@
<node oor:name="writer_AportisDoc_PalmDB_File" oor:op="replace" >
- <prop oor:name="DetectService"/>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>pdb</value></prop>
- <prop oor:name="MediaType"/>
+ <prop oor:name="MediaType"><value>application/x-aportisdoc</value></prop>
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>AportisDoc Palm DB</value></prop>
<prop oor:name="UIName">
<value>AportisDoc (Palm)</value>
</prop>
- <prop oor:name="ClipboardFormat"/>
+ <prop oor:name="ClipboardFormat"><value>doctype:TEXt</value></prop>
</node>
diff --git a/filter/source/config/fragments/types/writer_PocketWord_File.xcu b/filter/source/config/fragments/types/writer_PocketWord_File.xcu
index 3e2e4d2..61c50a9 100644
--- a/filter/source/config/fragments/types/writer_PocketWord_File.xcu
+++ b/filter/source/config/fragments/types/writer_PocketWord_File.xcu
@@ -1,12 +1,12 @@
<node oor:name="writer_PocketWord_File" oor:op="replace" >
- <prop oor:name="DetectService"/>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>psw</value></prop>
- <prop oor:name="MediaType"/>
+ <prop oor:name="MediaType"><value>application/x-pocket-word</value></prop>
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>PocketWord File</value></prop>
<prop oor:name="UIName">
<value>Pocket Word</value>
</prop>
- <prop oor:name="ClipboardFormat"/>
+ <prop oor:name="ClipboardFormat"><value>doctype:pwi</value></prop>
</node>
More information about the ooo-build-commit
mailing list