[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 64926061f538f0a6e2cd1f6b824b9b864db744c1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 20 15:20:26 2011 +
WaE: possibly uninitialized
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
index 6f6b2d0..c05989f 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
@@ -146,7 +146,7 @@ void ScXMLExportDatabaseRanges::WriteImportDescriptor(const
uno::Sequence beans
sal_Int32 nProperties = aImportDescriptor.getLength();
::rtl::OUString sDatabaseName;
::rtl::OUString sSourceObject;
-sheet::DataImportMode nSourceType;
+sheet::DataImportMode nSourceType = sheet::DataImportMode_NONE;
sal_Bool bNative = sal_False;
for (sal_Int16 i = 0; i nProperties; i++)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lingucomponent/Library_spell.mk
lingucomponent/Library_spell.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 2d9aac80a17b61f8339b80a4bc1555940255a8ff Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 10:20:10 2011 + msvc2008 hunspell linked to icuuc diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index a66b4ba..f7aa804 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_static_libs,spell,\ $(eval $(call gb_Library_use_externals,spell,\ hunspell \ + icuuc \ )) $(eval $(call gb_Library_add_exception_objects,spell,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lingucomponent/Makefile
lingucomponent/Makefile |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6fd747bf0e1f8374d52e26e823d2186275d5e8fb Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 10:22:14 2011 + make this Makefile the same as all the others so that make inside an source ./Env.Host.sh environment works the same as make outside that env diff --git a/lingucomponent/Makefile b/lingucomponent/Makefile index 44c7d7c..7bbbe6c 100644 --- a/lingucomponent/Makefile +++ b/lingucomponent/Makefile @@ -2,7 +2,7 @@ #* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -31,6 +31,7 @@ ifeq ($(strip $(SOLARENV)),) include $(dir $(realpath $(firstword $(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk else +gb_SourceEnvAndRecurse_STAGE=gbuild include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - solenv/gbuild
solenv/gbuild/extensions/post_AuxTargets.mk | 58 1 file changed, 50 insertions(+), 8 deletions(-) New commits: commit 7fe74faa3ca3bf4edd9e317af1be07f77bb19403 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Dec 14 14:17:36 2011 +0100 bootstrap can be kept in both phases as it has a proper touchfile diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index b98ef3d..119536c 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -27,6 +27,14 @@ .PHONY: id tags docs distro-pack-install install fetch clean-host clean-build bootstrap +$(WORKDIR)/bootstrap: + @cd $(SRCDIR) ./bootstrap + @mkdir -p $(dir $@) touch $@ + +bootstrap: $(WORKDIR)/bootstrap + +autogen.lastrun: + ifneq ($(gb_SourceEnvAndRecurse_STAGE),buildpl) id: @@ -56,14 +64,6 @@ fetch: $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in $(if $(filter reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo cannot reconfigure from within solarenv rm -f $(SRCDIR)/Env.Host.sh exit 2) -autogen.lastrun: - - -$(WORKDIR)/bootstrap: - @cd $(SRCDIR) ./bootstrap - @mkdir -p $(dir $@) touch $@ - -bootstrap: $(WORKDIR)/bootstrap ifeq ($(strip $(gb_PARTIALBUILD)),) @@ -113,15 +113,6 @@ distro-pack-install: $(SRCDIR)/Env.Host.sh: @true -autogen.lastrun: - @true - -$(WORKDIR)/bootstrap: - @true - -bootstrap: - @true - clean-host: @true commit 00bc8fc77ac26ddcbcdba9ed02ce711a0dd322cc Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Dec 14 12:13:23 2011 +0100 adding noop rules for auxtargets in buildpl, moved deps of buildpl into that phase diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index 13dd2e0..b98ef3d 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -44,10 +44,13 @@ distro-pack-install: install $(SRCDIR)/bin/distro-install-sdk $(SRCDIR)/bin/distro-install-file-lists -$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download - $(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) ./download ./ooo.lst touch $@,touch $@) -fetch: $(SRCDIR)/src.downloaded +#these need to stay in the buildpl phase as buildpl depends on them +$(SRCDIR)/src.downloaded: + @true + +fetch: + @true # fixme: can we prevent these exports in the first place? $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in @@ -55,6 +58,7 @@ $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in autogen.lastrun: + $(WORKDIR)/bootstrap: @cd $(SRCDIR) ./bootstrap @mkdir -p $(dir $@) touch $@ @@ -88,6 +92,48 @@ install: build endif +else +$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download + $(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) ./download ./ooo.lst touch $@,touch $@) + +fetch: $(SRCDIR)/src.downloaded + +id: + @true + +tags: + @true + +docs: + @true + +distro-pack-install: + @true + +$(SRCDIR)/Env.Host.sh: + @true + +autogen.lastrun: + @true + +$(WORKDIR)/bootstrap: + @true + +bootstrap: + @true + +clean-host: + @true + +clean-build: + @true + +distclean: + @true + +install: + @true + endif # vim:set shiftwidth=4 softtabstop=4 noexpandtab: commit a7b6b855a2d5390a80ad52a027d2382051bc168c Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Dec 14 12:02:25 2011 +0100 skip AuxTargets in buildpl phase diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index da31aa6..13dd2e0 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -27,6 +27,8 @@ .PHONY: id tags docs distro-pack-install install fetch clean-host clean-build bootstrap +ifneq ($(gb_SourceEnvAndRecurse_STAGE),buildpl) + id: @create-ids @@ -86,5 +88,6 @@ install: build endif +endif # vim:set shiftwidth=4 softtabstop=4 noexpandtab: commit 96c6bf45549e5742858d8ed12ce97ed6251805aa Author: Peter Foley pefol...@verizon.net Date: Sun Dec 11 19:39:58 2011 -0500 alow make to run autogen.sh if autogen.lastrun doesn't exist diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index 7622047..da31aa6 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -51,6 +51,8 @@ fetch: $(SRCDIR)/src.downloaded $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in $(if $(filter reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo cannot reconfigure from within solarenv rm -f
[Libreoffice-commits] .: cppcanvas/inc cppcanvas/source
cppcanvas/inc/cppcanvas/basegfxfactory.hxx|6 ---
cppcanvas/source/inc/implrenderer.hxx |5 --
cppcanvas/source/mtfrenderer/emfplus.cxx | 28 --
cppcanvas/source/mtfrenderer/implrenderer.cxx | 48
cppcanvas/source/wrapper/basegfxfactory.cxx | 50 --
5 files changed, 137 deletions(-)
New commits:
commit 070eff8cf1ad7763b8b730336f11032893b77049
Author: August Sodora aug...@gmail.com
Date: Wed Dec 21 00:22:06 2011 -0500
callcatcher: Remove unused code
diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
index 5cb87aa..dbb8d12 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
@@ -75,7 +75,6 @@ namespace cppcanvas
coordinate space as the source polygon
*/
PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr,
const ::basegfx::B2DPolygon rPoly ) const;
-PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr,
const ::basegfx::B2DPolyPolygon rPoly ) const;
/** Create an uninitialized bitmap with the given size
*/
@@ -85,10 +84,6 @@ namespace cppcanvas
*/
BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr,
const ::basegfx::B2ISize rSize ) const;
-/** Create a text portion with the given content string
- */
-TextSharedPtr createText( const CanvasSharedPtr, const
::rtl::OUString ) const;
-
private:
friend struct InitInstance2;
@@ -100,7 +95,6 @@ namespace cppcanvas
BaseGfxFactory(const BaseGfxFactory);
BaseGfxFactory operator=( const BaseGfxFactory );
};
-
}
#endif /* _CPPCANVAS_BASEGFXFACTORY_HXX */
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 3c1ec6d..edf69be 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -174,9 +174,6 @@ static float GetSwapFloat( SvStream rSt )
ImplRenderer( const CanvasSharedPtrrCanvas,
const GDIMetaFilerMtf,
const Parameters rParms );
-ImplRenderer( const CanvasSharedPtrrCanvas,
- const BitmapEx rBmpEx,
- const Parameters rParms );
virtual ~ImplRenderer();
@@ -210,10 +207,8 @@ static float GetSwapFloat( SvStream rSt )
void ReadRectangle (SvStream s, float x, float y, float width,
float height, sal_uInt32 flags = 0);
void ReadPoint (SvStream s, float x, float y, sal_uInt32 flags
= 0);
void MapToDevice (double x, double y);
-::basegfx::B2DPoint Map (::basegfx::B2DPoint p);
::basegfx::B2DPoint Map (double ix, double iy);
::basegfx::B2DSize MapSize (double iwidth, double iheight);
-::basegfx::B2DRange MapRectangle (double ix, double iy, double
iwidth, double iheight);
private:
// default: disabled copy/assignment
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 91c9560..8ccb75b 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -825,11 +825,6 @@ namespace cppcanvas
y = 100*nMmY*y/nPixY;
}
-::basegfx::B2DPoint ImplRenderer::Map (::basegfx::B2DPoint p)
-{
-return Map (p.getX (), p.getY ());
-}
-
::basegfx::B2DPoint ImplRenderer::Map (double ix, double iy)
{
double x, y;
@@ -863,29 +858,6 @@ namespace cppcanvas
return ::basegfx::B2DSize (w, h);
}
-::basegfx::B2DRange ImplRenderer::MapRectangle (double ix, double iy,
double iwidth, double iheight)
-{
-double x, y, w, h;
-
-x = ix*aWorldTransform.eM11 + iy*aWorldTransform.eM21 +
aWorldTransform.eDx;
-y = ix*aWorldTransform.eM12 + iy*aWorldTransform.eM22 +
aWorldTransform.eDy;
-w = iwidth*aWorldTransform.eM11 + iheight*aWorldTransform.eM21;
-h = iwidth*aWorldTransform.eM12 + iheight*aWorldTransform.eM22;
-
-MapToDevice (x, y);
-MapToDevice (w, h);
-
-x -= nFrameLeft;
-y -= nFrameTop;
-
-x *= aBaseTransform.eM11;
-y *= aBaseTransform.eM22;
-w *= aBaseTransform.eM11;
-h *= aBaseTransform.eM22;
-
-return ::basegfx::B2DRange (x, y, x + w, y + h);
-}
-
#define COLOR(x) \
::vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x 24), \
(x 16) 0xff, \
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 65b9d21..8dde2f0 100644
---
[Libreoffice-commits] .: sfx2/source svtools/AllLangResTarget_svt.mk svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source svtools/util
sfx2/source/appl/app.cxx| 106 -
svtools/AllLangResTarget_svt.mk |1
svtools/Library_svt.mk |1
svtools/Package_inc.mk |2
svtools/inc/svtools/helpid.hrc |6
svtools/inc/svtools/testtool.hxx| 78
svtools/source/misc/helpagentwindow.cxx |3
svtools/source/plugapp/testtool.hrc | 55 -
svtools/source/plugapp/testtool.src | 194
svtools/source/plugapp/ttprops.cxx | 36 -
svtools/util/hidother.src |3
11 files changed, 485 deletions(-)
New commits:
commit eeecf625351238f90c61c82b403bd65e35d7833e
Author: August Sodora aug...@gmail.com
Date: Wed Dec 21 06:49:39 2011 -0500
Remove TTProperties
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index de0f385..d611d94 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -26,7 +26,6 @@
*
/
-
#if defined UNX
#include limits.h
#else // UNX
@@ -153,109 +152,6 @@ static SfxHelp*pSfxHelp = NULL;
namespace
{
-class SfxPropertyHandler : public PropertyHandler
-{
-virtual void Property( ApplicationProperty );
-};
-
-void SfxPropertyHandler::Property( ApplicationProperty rProp )
-{
-TTProperties* pTTProperties = PTR_CAST( TTProperties, rProp );
-if ( pTTProperties )
-{
-pTTProperties-nPropertyVersion = TT_PROPERTIES_VERSION;
-switch ( pTTProperties-nActualPR )
-{
-case TT_PR_SLOTS:
-{
-pTTProperties-nSidOpenUrl = SID_OPENURL;
-pTTProperties-nSidFileName = SID_FILE_NAME;
-pTTProperties-nSidNewDocDirect = SID_NEWDOCDIRECT;
-pTTProperties-nSidCopy = SID_COPY;
-pTTProperties-nSidPaste = SID_PASTE;
-pTTProperties-nSidSourceView = SID_SOURCEVIEW;
-pTTProperties-nSidSelectAll = SID_SELECTALL;
-pTTProperties-nSidReferer = SID_REFERER;
-pTTProperties-nActualPR = 0;
-}
-break;
-case TT_PR_DISPATCHER:
-{
-// interface for TestTool
-SfxViewFrame* pViewFrame=0;
-SfxDispatcher* pDispatcher=0;
-pViewFrame = SfxViewFrame::Current();
-if ( !pViewFrame )
-pViewFrame = SfxViewFrame::GetFirst();
-if ( pViewFrame )
-pDispatcher = pViewFrame-GetDispatcher();
-else
-pDispatcher = NULL;
-if ( !pDispatcher )
-pTTProperties-nActualPR = TT_PR_ERR_NODISPATCHER;
-else
-{
-
pDispatcher-SetExecuteMode(EXECUTEMODE_DIALOGASYNCHRON);
-if ( pTTProperties-mnSID == SID_NEWDOCDIRECT
- || pTTProperties-mnSID == SID_OPENDOC )
-{
-SfxPoolItem** pArgs = pTTProperties-mppArgs;
-SfxAllItemSet aSet( SFX_APP()-GetPool() );
-if ( pArgs *pArgs )
-{
-for ( SfxPoolItem **pArg = pArgs; *pArg;
++pArg )
-aSet.Put( **pArg );
-}
-if ( pTTProperties-mnSID == SID_NEWDOCDIRECT )
-{
-String aFactory =
String::CreateFromAscii(private:factory/);
-if ( pArgs *pArgs )
-{
-SFX_ITEMSET_ARG( aSet, pFactoryName,
SfxStringItem, SID_NEWDOCDIRECT, sal_False );
-if ( pFactoryName )
-aFactory += pFactoryName-GetValue();
-else
-aFactory +=
String::CreateFromAscii(swriter);
-}
-else
-aFactory +=
String::CreateFromAscii(swriter);
-
-aSet.Put( SfxStringItem( SID_FILE_NAME,
aFactory ) );
-aSet.ClearItem( SID_NEWDOCDIRECT );
-pTTProperties-mnSID = SID_OPENDOC;
-}
-
-aSet.Put( SfxStringItem( SID_TARGETNAME,
DEFINE_CONST_UNICODE(_blank) ) );
-if ( pDispatcher-ExecuteFunction(
pTTProperties-mnSID, aSet, pTTProperties-mnMode )
-
[Libreoffice-commits] .: sal/inc sal/osl sal/util store/source xmlreader/source
sal/inc/osl/file.h | 45 sal/osl/unx/file.cxx | 56 - sal/osl/w32/file.cxx |7 + sal/util/sal.map |5 +++ store/source/lockbyte.cxx | 14 ++ xmlreader/source/xmlreader.cxx |4 +- 6 files changed, 112 insertions(+), 19 deletions(-) New commits: commit e3ab0fd9016bc24c5a0eb0807f171d5025c3bb79 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Dec 21 13:51:50 2011 +0200 osl_unmapFile can't work for files bundled inside the .apk on Android On Android, when an app is installed, arbitrary files bundled in the app won't be unpacked into actual separate files in the file system. They will exist only as archive entries in the .apk file (which is a zip archive). The SDK tooling puts such files under the /assets folder in the .apk. The LibreOffice bootstrapping code for Android maps the .apk file into memory. osl_openFile() knows about the /assets special case, and uses a separate abstraction for such memory-mapped files. Obviously, when producing an .apk, one needs to make sure these bundled files are not compressed, if one wants to be able to use them directly from the memory-mapped .apk file. We do that in our test and sample Android projects. When mapping such files under /assets , just return a pointer to the file's location inside the mapped .apk archive. We can't use the old osl_unmapFile() on such mapped files, as that would unexpectedly unmap fairly arbitrary pages of the .apk mapping, wreaking havoc on later use of the same pages. So, introduce a new osl_unmapMappedFile() function that takes also the oslFileHandle originally passed to osl_mapFile(). Use this instead in the few places where the code actually called osl_unmapFile(). Make sure osl_mapFile() is nonexistent on Android. diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h index cc12b1c..ecf9e60 100644 --- a/sal/inc/osl/file.h +++ b/sal/inc/osl/file.h @@ -680,6 +680,12 @@ typedef void *oslFileHandle; @param uFlags [in] Specifies the open mode. +On Android, if the file path is below the /assets folder, the file +exists only as a hopefully uncompressed element inside the app +package (.apk), which has been mapped into memory as a whole by +the LibreOffice Android bootstrapping code. So files opened from +there aren't actually files in the OS sense. + @return osl_File_E_None on successbr osl_File_E_NOMEM not enough memory for allocating structures br @@ -837,6 +843,15 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileSize( /** Map a shared file into memory. +Don't know what the shared is supposed to mean there? Also, +obviously this API can be used to map *part* of a file into +memory, and different parts can be mapped separately even. + +On Android, if the Handle refers to a file that is actually inside +the app package (.apk zip archive), no new mapping is created, +just a pointer to the file inside the already mapped .apk is +returned. + @since UDK 3.2.10 */ SAL_DLLPUBLIC oslFileError SAL_CALL osl_mapFile ( @@ -848,8 +863,19 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_mapFile ( ); +#ifndef ANDROID + /** Unmap a shared file from memory. +Ditto here, why do we need to mention shared? + +This function just won't work on Android in general where for +(uncompressed) files inside the .apk, per SDK conventions in the +/assets folder, osl_mapFile() returns a pointer to the file inside +the already by LibreOffice Android-specific bootstrapping code +mmapped .apk archive. We can't go and randomly munmap part of the +.apk archive. So this function is not present on Android. + @since UDK 3.2.10 */ SAL_DLLPUBLIC oslFileError SAL_CALL osl_unmapFile ( @@ -857,6 +883,25 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_unmapFile ( sal_uInt64 uLength ); +#endif + +/** Unmap a file segment from memory. + +Like osl_unmapFile(), but takes also the oslFileHandle argument +passed to osl_mapFile() when creating this mapping. + +On Android, for files below /assets, i.e. located inside the app +archive (.apk), this won't actually unmap anything; all the .apk +stays mapped. + +@since UDK 3.6 + */ +SAL_DLLPUBLIC oslFileError SAL_CALL osl_unmapMappedFile ( + oslFileHandle Handle, + void* pAddr, + sal_uInt64 uLength +); + /** Read a number of bytes from a file. diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index f060413..458554e 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -865,7 +865,6 @@ SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle *pHandl eRet = oslTranslateFileError (OSL_FET_ERROR, ENOMEM); return eRet; } -pImpl-m_kind =
[Libreoffice-commits] .: default_images/svtools
dev/null |binary 1 file changed New commits: commit 7167559379cd44e0160ba20c69cbb6954887e32b Author: August Sodora aug...@gmail.com Date: Wed Dec 21 07:13:00 2011 -0500 Remove unused icons diff --git a/default_images/svtools/res/ttall.png b/default_images/svtools/res/ttall.png deleted file mode 100644 index 2282805..000 Binary files a/default_images/svtools/res/ttall.png and /dev/null differ diff --git a/default_images/svtools/res/ttdef.png b/default_images/svtools/res/ttdef.png deleted file mode 100644 index c555da7..000 Binary files a/default_images/svtools/res/ttdef.png and /dev/null differ diff --git a/default_images/svtools/res/tthid.png b/default_images/svtools/res/tthid.png deleted file mode 100644 index 5050d4e..000 Binary files a/default_images/svtools/res/tthid.png and /dev/null differ diff --git a/default_images/svtools/res/ttremote.png b/default_images/svtools/res/ttremote.png deleted file mode 100644 index f9fe926..000 Binary files a/default_images/svtools/res/ttremote.png and /dev/null differ diff --git a/default_images/svtools/res/ttshow.png b/default_images/svtools/res/ttshow.png deleted file mode 100644 index f3ac574..000 Binary files a/default_images/svtools/res/ttshow.png and /dev/null differ diff --git a/default_images/svtools/res/ttshow2.png b/default_images/svtools/res/ttshow2.png deleted file mode 100644 index b6fb4a3..000 Binary files a/default_images/svtools/res/ttshow2.png and /dev/null differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - 3 commits - extensions/inc extensions/Library_updchk.mk extensions/source extensions/util sal/systools solenv/gbuild
extensions/Library_updchk.mk |5
extensions/inc/appsettings.hxx | 45 -
extensions/source/unoactivex/main/initwindowpeer.cxx | 87 ---
extensions/source/update/check/onlinecheck.cxx | 69 +++
extensions/source/update/check/updatecheck.cxx | 33 -
extensions/util/hidother.src | 428 ---
sal/systools/win32/onlineupdate/makefile.mk | 78 ---
sal/systools/win32/onlineupdate/onlinecheck.cxx | 69 ---
sal/systools/win32/onlineupdate/onlinecheck.dxp | 28 -
solenv/gbuild/platform/WNT_INTEL_GCC.mk |1
solenv/gbuild/platform/WNT_INTEL_MSC.mk |1
11 files changed, 81 insertions(+), 763 deletions(-)
New commits:
commit ba507c41ba991b72da34da58b6a5d61bc1a7822e
Author: Matúš Kukan matus.ku...@gmail.com
Date: Wed Dec 21 13:22:52 2011 +0100
gbuild: WNT: register wininet library
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index e8fe616..ac7e4be 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -284,6 +284,7 @@ gb_Library_PLAINLIBS_NONE += \
uwinapi \
winmm \
version \
+ wininet \
winspool \
ws2_32 \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index de562a7..638aade 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -424,6 +424,7 @@ gb_Library_PLAINLIBS_NONE += \
uuid \
uwinapi \
version \
+ wininet \
winmm \
winspool \
ws2_32 \
commit 6c6055750dd4c0ddcff06fcf5b6d93d576245633
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Dec 19 16:37:06 2011 +0100
move onlinecheck.cxx from sal to extensions
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index a16f2a2..c5286de 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -51,6 +51,11 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,updchk,\
ole32 \
shell32 \
+ wininet \
+))
+
+$(eval $(call gb_Library_add_exception_objects,updchk,\
+ extensions/source/update/check/onlinecheck \
))
endif # OS WNT
diff --git a/extensions/source/update/check/onlinecheck.cxx
b/extensions/source/update/check/onlinecheck.cxx
new file mode 100644
index 000..0a76539
--- /dev/null
+++ b/extensions/source/update/check/onlinecheck.cxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#ifdef _MSC_VER
+#pragma warning( disable: 4668 )
+#endif
+
+#include sal/types.h
+#include sal/macros.h
+
+#define WIN32_LEAN_AND_MEAN
+#include windows.h
+#include wininet.h
+
+#ifdef UNICODE
+#define _UNICODE
+#endif
+#include tchar.h
+
+// #i71984
+extern C bool SAL_CALL WNT_hasInternetConnection()
+{
+DWORD dwFlags;
+TCHAR szConnectionName[1024];
+
+#ifndef __MINGW32__
+__try {
+#endif
+BOOL fIsConnected = InternetGetConnectedStateEx(
+dwFlags,
+szConnectionName,
+SAL_N_ELEMENTS(szConnectionName),
+0 );
+
+return fIsConnected ? true : false;
+
+#ifndef __MINGW32__
+} __except( EXCEPTION_EXECUTE_HANDLER ) {
+return false;
+}
+#endif
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/updatecheck.cxx
b/extensions/source/update/check/updatecheck.cxx
index 66acb88..d0b204a 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -85,6 +85,7 @@ namespace uno = com::sun::star::uno ;
#define PROPERTY_DEFAULT_TEXT UNISTRING(DefaultText)
#define
[Libreoffice-commits] .: oox/source package/source padmin/source pyuno/source
oox/source/export/SchXMLSeriesHelper.cxx |6 ++--
oox/source/export/chartexport.cxx | 11 +++-
package/source/xstor/ohierarchyholder.cxx |2 -
package/source/xstor/xstorage.cxx | 18 +++---
package/source/zippackage/ZipPackage.cxx |8 +++---
padmin/source/pamain.cxx |2 -
pyuno/source/module/pyuno.cxx | 28 +++---
pyuno/source/module/pyuno_adapter.cxx | 10 +++
pyuno/source/module/pyuno_callable.cxx|8 +++---
pyuno/source/module/pyuno_except.cxx |6 ++--
pyuno/source/module/pyuno_gc.cxx |2 -
pyuno/source/module/pyuno_module.cxx | 38 +++---
pyuno/source/module/pyuno_runtime.cxx |4 +--
pyuno/source/module/pyuno_type.cxx|6 ++--
14 files changed, 74 insertions(+), 75 deletions(-)
New commits:
commit 7958f8244cc3e554b1339b14c7e589dfcbb0526c
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Dec 21 21:57:16 2011 +0900
catch exception by constant reference
diff --git a/oox/source/export/SchXMLSeriesHelper.cxx
b/oox/source/export/SchXMLSeriesHelper.cxx
index e233b8a..5723122 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/SchXMLSeriesHelper.cxx
@@ -76,7 +76,7 @@ using ::rtl::OUString;
}
}
}
-catch( uno::Exception ex )
+catch( const uno::Exception ex )
{
(void)ex; // avoid warning for pro build
@@ -212,7 +212,7 @@ uno::Reference beans::XPropertySet
SchXMLSeriesHelper::createOldAPISeriesProp
}
}
}
-catch( uno::Exception rEx )
+catch( const uno::Exception rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE( Exception caught
SchXMLSeriesHelper::createOldAPISeriesPropertySet: %s,
@@ -250,7 +250,7 @@ uno::Reference beans::XPropertySet
SchXMLSeriesHelper::createOldAPIDataPointP
}
}
}
-catch( uno::Exception rEx )
+catch( const uno::Exception rEx )
{
(void)rEx; // avoid warning for pro build
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index fb4d013..e757b1e 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -216,7 +216,7 @@ Reference chart2::data::XLabeledDataSequence
lcl_getCategories( const Referen
}
}
}
-catch( uno::Exception ex )
+catch( const uno::Exception ex )
{
(void)ex; // avoid warning for pro build
OSL_FAIL( rtl::OUStringToOString(
@@ -334,7 +334,7 @@ bool lcl_isSeriesAttachedToFirstAxis(
xProp-getPropertyValue( OUString(
RTL_CONSTASCII_USTRINGPARAM(AttachedAxisIndex) ) ) = nAxisIndex;
bResult = (0==nAxisIndex);
}
-catch( uno::Exception ex )
+catch( const uno::Exception ex )
{
(void)ex; // avoid warning for pro build
OSL_FAIL( rtl::OUStringToOString(
@@ -495,9 +495,8 @@ bool lcl_SequenceHasUnhiddenData( const uno::Reference
chart2::data::XDataSeque
if( !aHiddenValues.getLength() )
return true;
}
-catch( uno::Exception e )
+catch( uno::Exception )
{
-(void)e; // avoid warning
return true;
}
}
@@ -787,7 +786,7 @@ void ChartExport::InitRangeSegmentationProperties( const
Reference chart2::XCha
}
}
}
-catch( uno::Exception ex )
+catch( const uno::Exception ex )
{
(void)ex; // avoid warning for pro build
OSL_FAIL( rtl::OUStringToOString(
@@ -2573,7 +2572,7 @@ void ChartExport::exportDataPoints(
xPropSet =
SchXMLSeriesHelper::createOldAPIDataPointPropertySet(
xSeries, nElement, getModel() );
}
-catch( uno::Exception rEx )
+catch( const uno::Exception rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE( Exception caught during Export of data point:
%s,
diff --git a/package/source/xstor/ohierarchyholder.cxx
b/package/source/xstor/ohierarchyholder.cxx
index cc36e46..9ab6b15 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -335,7 +335,7 @@ void SAL_CALL OHierarchyElement_Impl::commited( const
::com::sun::star::lang::Ev
{
Commit();
}
-catch( uno::Exception e )
+catch( const uno::Exception e )
{
throw lang::WrappedTargetRuntimeException(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Can
not commit storage sequence! ) ),
diff --git a/package/source/xstor/xstorage.cxx
b/package/source/xstor/xstorage.cxx
index 7ba64a5..f5a3fdb 100644
--- a/package/source/xstor/xstorage.cxx
+++
[Libreoffice-commits] .: sfx2/inc sfx2/source
sfx2/inc/sfx2/dispatch.hxx |3 -
sfx2/source/appl/app.cxx |1
sfx2/source/appl/appcfg.cxx |1
sfx2/source/control/dispatch.cxx | 86 ---
4 files changed, 91 deletions(-)
New commits:
commit 073431d26d39216a7f5f85489ecd4eb60806ee88
Author: August Sodora aug...@gmail.com
Date: Wed Dec 21 08:37:20 2011 -0500
More removal from TTProperties
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 0591d1f..de65742 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -125,9 +125,6 @@ public:
virtual ~SfxDispatcher();
-virtual sal_uInt16 ExecuteFunction( sal_uInt16 nSID, SfxPoolItem**
ppArgs=0, sal_uInt16 nMode=0 );
-sal_uInt16 ExecuteFunction( sal_uInt16 nSID, const
SfxItemSet rArgs , sal_uInt16 nMode=0 );
-
virtual voidSetExecuteMode( sal_uInt16 );
const SfxPoolItem* Execute( sal_uInt16 nSlot,
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d611d94..81bf1f6 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -138,7 +138,6 @@
#include unotools/syslocaleoptions.hxx
#include unotools/syslocale.hxx
#include framework/addonsoptions.hxx
-#include svtools/ttprops.hxx
#include unotools/extendedsecurityoptions.hxx
#include rtl/instance.hxx
#include rtl/strbuf.hxx
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 8fa9c07..f035e02 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -49,7 +49,6 @@
#define _SVSTDARR_STRINGS
#include svl/svstdarr.hxx
-#include svtools/ttprops.hxx
#include sfx2/sfxsids.hrc
#include sot/exchange.hxx
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 44d0a51..a720354 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -36,7 +36,6 @@
#include svl/eitem.hxx
#include svl/undo.hxx
#include vcl/wrkwin.hxx
-#include svtools/ttprops.hxx
#include stdio.h
#include stdarg.h
#include stdlib.h // due to bsearch
@@ -995,91 +994,6 @@ void MappedPut_Impl( SfxAllItemSet rSet, const
SfxPoolItem rItem )
#define SFX_USE_BINDINGS 0x8000
#endif
-sal_uInt16 SfxDispatcher::ExecuteFunction( sal_uInt16 nSlot, SfxPoolItem
**pArgs,
- sal_uInt16 nMode )
-{
-if ( !nMode )
-nMode = pImp-nStandardMode;
-
-// through Bindings/Interceptor? (then the return value is not exact)
-sal_Bool bViaBindings = SFX_USE_BINDINGS == ( nMode SFX_USE_BINDINGS );
-nMode = ~sal_uInt16(SFX_USE_BINDINGS);
-if ( bViaBindings GetBindings() )
-return GetBindings()-Execute( nSlot, (const SfxPoolItem **) pArgs,
nMode )
-? EXECUTE_POSSIBLE
-: EXECUTE_NO;
-
-// otherwise through the Dispatcher
-if ( IsLocked(nSlot) )
-return 0;
-SfxShell *pShell = 0;
-SfxCallMode eCall = SFX_CALLMODE_SYNCHRON;
-sal_uInt16 nRet = EXECUTE_NO;
-const SfxSlot *pSlot = 0;
-if ( GetShellAndSlot_Impl( nSlot, pShell, pSlot, sal_False, sal_False ) )
-{
-// Feasibility test before
-if ( pSlot-IsMode( SFX_SLOT_FASTCALL ) ||
-pShell-CanExecuteSlot_Impl( *pSlot ) )
-nRet = EXECUTE_POSSIBLE;
-
-if ( nMode == EXECUTEMODE_ASYNCHRON )
-eCall = SFX_CALLMODE_ASYNCHRON;
-else if ( nMode == EXECUTEMODE_DIALOGASYNCHRON pSlot-IsMode(
SFX_SLOT_HASDIALOG ) )
-eCall = SFX_CALLMODE_ASYNCHRON;
-else if ( pSlot-GetMode() SFX_SLOT_ASYNCHRON )
-eCall = SFX_CALLMODE_ASYNCHRON;
-if ( pArgs *pArgs )
-{
-SfxAllItemSet aSet( pShell-GetPool() );
-for ( SfxPoolItem **pArg = pArgs; *pArg; ++pArg )
-MappedPut_Impl( aSet, **pArg );
-SfxRequest aReq( nSlot, eCall, aSet );
-_Execute( *pShell, *pSlot, aReq, eCall );
-}
-else
-{
-SfxRequest aReq( nSlot, eCall, pShell-GetPool() );
-_Execute( *pShell, *pSlot, aReq, eCall );
-}
-}
-
-return nRet;
-}
-
-sal_uInt16 SfxDispatcher::ExecuteFunction( sal_uInt16 nSlot, const SfxItemSet
rArgs,
- sal_uInt16 nMode )
-{
-if ( !nMode )
-nMode = pImp-nStandardMode;
-
-// otherwise through the Dispatcher
-if ( IsLocked(nSlot) )
-return 0;
-SfxShell *pShell = 0;
-SfxCallMode eCall = SFX_CALLMODE_SYNCHRON;
-sal_uInt16 nRet = EXECUTE_NO;
-const SfxSlot *pSlot = 0;
-if ( GetShellAndSlot_Impl( nSlot, pShell, pSlot, sal_False, sal_False ) )
-{
-// Feasibility test before
-if ( pSlot-IsMode( SFX_SLOT_FASTCALL ) ||
-pShell-CanExecuteSlot_Impl( *pSlot ) )
-nRet = EXECUTE_POSSIBLE;
-
-if ( nMode == EXECUTEMODE_ASYNCHRON )
-eCall = SFX_CALLMODE_ASYNCHRON;
-
[Libreoffice-commits] .: 2 commits - sal/osl solenv/gbuild
sal/osl/unx/system.c |4 ++-- solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk |8 +--- solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk | 13 + 3 files changed, 16 insertions(+), 9 deletions(-) New commits: commit 1c184292ad65907a5c19458ae4366c5af67d4828 Author: Robert Nagy robert.n...@gmail.com Date: Wed Dec 21 15:15:36 2011 +0100 sync the gb_LinkTarget__command_dynamiclink function from unxgcc.mk diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk index b9a47da..acebb04 100644 --- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk @@ -33,19 +33,19 @@ gb_STDLIBS := pthread include $(GBUILDDIR)/platform/unxgcc.mk -gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS - define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ -mkdir -p $(dir $(1)) \ + mkdir -p $(dir $(1)) \ $(gb_CXX) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ @@ -56,4 +56,6 @@ mkdir -p $(dir $(1)) \ $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1)) endef +gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS + # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk index 89724a6..5eaa617 100644 --- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk @@ -32,24 +32,29 @@ gb_STDLIBS := pthread include $(GBUILDDIR)/platform/unxgcc.mk -gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS - define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ -mkdir -p $(dir $(1)) \ + mkdir -p $(dir $(1)) \ $(gb_CXX) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ + $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ + $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ $(LIBS) \ $(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)) \ - -o $(1)) + -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1))) + $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1)) endef +gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS + # vim: set noet sw=4: commit 891d78eb4655f197877fe58c2c23c460e2a402c9 Author: Robert Nagy robert.n...@gmail.com Date: Wed Dec 21 15:06:53 2011 +0100 use the internal gethostbyname_r() implementation on OpenBSD too diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c index b74aff5..bf3e51e 100644 --- a/sal/osl/unx/system.c +++ b/sal/osl/unx/system.c @@ -33,7 +33,7 @@ static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER; /* struct passwd differs on some platforms */ -#if defined(MACOSX) || defined(IOS) +#if defined(MACOSX) || defined(IOS) || defined(OPENBSD) extern int h_errno; @@ -124,7 +124,7 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result, return
[Libreoffice-commits] .: sal/Library_sal.mk solenv/gbuild
sal/Library_sal.mk |4 +++- solenv/gbuild/platform/macosx.mk |1 - 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 683e471f3559b3dc40dc697576baf0be9612b1fc Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Dec 21 15:26:55 2011 +0100 gbuild, sal: dl is linux only diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 93bc646..6f940db 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -56,10 +56,12 @@ $(eval $(call gb_Library_add_defs,sal,\ $(eval $(call gb_Library_add_linked_libs,sal,\ $(if $(filter $(GUI),UNX), \ $(if $(filter $(OS),ANDROID),, \ - dl \ pthread \ ) \ ) \ + $(if $(filter $(OS),LINUX), \ + dl \ + ) \ $(if $(filter $(OS),SOLARIS), \ nsl \ socket \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index f7f3440..ef82a82 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -265,7 +265,6 @@ gb_Library_PLAINLIBS_NONE += \ Cocoa \ objc \ OpenGL \ - dl \ m \ pthread \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - hyphen/hyphen-2.7.1-2.8.3.patch
hyphen/hyphen-2.7.1-2.8.3.patch |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20e249e471312192a158abb313d8ba0c969a9bd3
Author: László Németh nem...@numbertext.org
Date: Wed Dec 21 14:03:19 2011 +0100
Fix #43931 (bad hyphenation of French words with hyphen and apostrophe)
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/hyphen/hyphen-2.7.1-2.8.3.patch b/hyphen/hyphen-2.7.1-2.8.3.patch
index 047ce13..51ab23a 100644
--- a/hyphen/hyphen-2.7.1-2.8.3.patch
+++ b/hyphen/hyphen-2.7.1-2.8.3.patch
@@ -243,7 +243,7 @@
+/* default first level: hyphen and ASCII apostrophe */
+if (!dict[0]-utf8) hnj_hyphen_load_line(NOHYPHEN '\n, dict[k],
hashtab);
+else hnj_hyphen_load_line(NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99\n,
dict[k], hashtab);
-+strcpy(buf, 1-1/=,1,1\n); // buf rewritten by hnj_hyphen_load here
++strcpy(buf, 1-1\n); // buf rewritten by hnj_hyphen_load here
+hnj_hyphen_load_line(buf, dict[k], hashtab); /* remove hyphen */
+hnj_hyphen_load_line(1'1\n, dict[k], hashtab); /* ASCII apostrophe */
+if (dict[0]-utf8) {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/Library_tl.mk tools/source
tools/Library_tl.mk|2 +-
tools/source/stream/stream.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f5eb8a2fc2e56c0950db2fafeded593d569d43e9
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 21 14:32:08 2011 +
I hate you poxy msvc
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 2724575..8dc9215 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,tl,\
))
$(eval $(call gb_Library_add_defs,tl,\
--DTOOLS_DLLIMPLEMENTATION \
+-DTOOLS_DLLIMPLEMENTATION -DNOMINMAX\
))
$(eval $(call gb_Library_add_api,tl,\
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 2a5cd4a..3cfb900 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1287,7 +1287,7 @@ SvStream SvStream::operator(float r)
SvStream SvStream::operator(double r)
{
-double n;
+double n = 0;
READNUMBER_WITHOUT_SWAP(double, n)
if (good())
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: mythes/makefile.mk mythes/mythes-1.2.0-android.patch mythes/mythes-1.2.0-makefile-mk.diff mythes/mythes-1.2.0-vanilla-th-gen-idx.patch mythes/mythes-1.2.1-rhbz675806.patch ooo
mythes/makefile.mk |5 ++--- mythes/mythes-1.2.0-android.patch|4 ++-- mythes/mythes-1.2.0-makefile-mk.diff |4 ++-- mythes/mythes-1.2.0-vanilla-th-gen-idx.patch |6 +++--- mythes/mythes-1.2.1-rhbz675806.patch |4 ++-- ooo.lst.in |2 +- 6 files changed, 12 insertions(+), 13 deletions(-) New commits: commit da3e169a393d59b23c92187d0da80b92caf78308 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 14:37:07 2011 + bump mythes to 1.2.2 diff --git a/mythes/makefile.mk b/mythes/makefile.mk index c663077..f10d0a0 100644 --- a/mythes/makefile.mk +++ b/mythes/makefile.mk @@ -36,15 +36,14 @@ TARGET=mythes # --- Files -TARFILE_NAME=mythes-1.2.0 -TARFILE_MD5=067201ea8b126597670b5eff72e1f66c +TARFILE_NAME=mythes-1.2.2 +TARFILE_MD5=e1e255dc43dbcbb34cb19e8a0eba90ae ADDITIONAL_FILES += makefile.mk PATCH_FILES=\ mythes-1.2.0-vanilla-th-gen-idx.patch \ mythes-1.2.0-makefile-mk.diff \ -mythes-1.2.1-rhbz675806.patch \ mythes-1.2.0-android.patch .IF $(GUI)==UNX diff --git a/mythes/mythes-1.2.0-android.patch b/mythes/mythes-1.2.0-android.patch index 2b74414..efd9104 100644 --- a/mythes/mythes-1.2.0-android.patch +++ b/mythes/mythes-1.2.0-android.patch @@ -1,5 +1,5 @@ misc/mythes-1.2.0/config.sub 2010-02-27 16:52:52.0 +0100 -+++ misc/build/mythes-1.2.0/config.sub 2011-09-26 23:39:04.0 +0200 +--- misc/mythes-1.2.2/config.sub 2010-02-27 16:52:52.0 +0100 misc/build/mythes-1.2.2/config.sub 2011-09-26 23:39:04.0 +0200 @@ -123,7 +123,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` diff --git a/mythes/mythes-1.2.0-makefile-mk.diff b/mythes/mythes-1.2.0-makefile-mk.diff index 30cdf46..1020153 100644 --- a/mythes/mythes-1.2.0-makefile-mk.diff +++ b/mythes/mythes-1.2.0-makefile-mk.diff @@ -1,5 +1,5 @@ misc/mythes-1.2.0/makefile.mk 2010-05-14 23:36:09.0 +0200 -+++ misc/build/mythes-1.2.0/makefile.mk2010-05-14 23:35:14.0 +0200 +--- misc/mythes-1.2.2/makefile.mk 2010-05-14 23:36:09.0 +0200 misc/build/mythes-1.2.2/makefile.mk2010-05-14 23:35:14.0 +0200 @@ -1 +1,90 @@ -dummy +#* diff --git a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch b/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch index 776fac4..c893fa9 100644 --- a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch +++ b/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch @@ -1,5 +1,5 @@ misc/mythes-1.2.0.orig/th_gen_idx.pl -+++ misc/build/mythes-1.2.0/th_gen_idx.pl +--- misc/mythes-1.2.2.orig/th_gen_idx.pl misc/build/mythes-1.2.2/th_gen_idx.pl @@ -1,11 +1,32 @@ -#!/usr/bin/perl - @@ -28,7 +28,7 @@ +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). # --# typcially invoked as follows: +-# typically invoked as follows: -# cat th_en_US_new.dat | ./th_gen_idx.pl th_en_US_new.idx +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see diff --git a/mythes/mythes-1.2.1-rhbz675806.patch b/mythes/mythes-1.2.1-rhbz675806.patch index be50bee..7ad311a 100644 --- a/mythes/mythes-1.2.1-rhbz675806.patch +++ b/mythes/mythes-1.2.1-rhbz675806.patch @@ -1,5 +1,5 @@ misc/mythes-1.2.0/mythes.cxx 2011-02-08 10:42:57.262964286 + -+++ misc/build/mythes-1.2.0/mythes.cxx 2011-02-08 10:43:06.305076490 + +--- misc/mythes-1.2.2/mythes.cxx 2011-02-08 10:42:57.262964286 + misc/build/mythes-1.2.2/mythes.cxx 2011-02-08 10:43:06.305076490 + @@ -14,6 +14,7 @@ encoding = NULL; list = NULL; diff --git a/ooo.lst.in b/ooo.lst.in index bac48e7..b06780a 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -53,7 +53,7 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz 061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 -067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz +e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/Library_sot.mk
sot/Library_sot.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 56c0d3b569ba62eafe94f79299e5afb83f2f891b Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 15:16:26 2011 + disable min as macro under msvc diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index cc5271d..1c008a1 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_api,sot,\ )) $(eval $(call gb_Library_add_defs,sot,\ --DSOT_DLLIMPLEMENTATION \ +-DSOT_DLLIMPLEMENTATION -DNOMINMAX\ )) $(eval $(call gb_Library_add_linked_libs,sot,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source configure.in set_soenv.in
bridges/source/cpp_uno/shared/makefile.mk |4
bridges/source/cpp_uno/shared/vtablefactory.cxx |8
configure.in|2 ++
set_soenv.in|1 +
4 files changed, 15 insertions(+)
New commits:
commit b8b22391ae7f87c8fb495a9e6839ed508fdaf932
Author: Robert Nagy robert.n...@gmail.com
Date: Wed Dec 21 16:16:22 2011 +0100
only use posix_fallocate() if it's actually available
diff --git a/bridges/source/cpp_uno/shared/makefile.mk
b/bridges/source/cpp_uno/shared/makefile.mk
index 4ce8122..c71ba6b 100644
--- a/bridges/source/cpp_uno/shared/makefile.mk
+++ b/bridges/source/cpp_uno/shared/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
+.IF $(HAVE_POSIX_FALLOCATE) == YES
+CDEFS += -DHAVE_POSIX_FALLOCATE
+.ENDIF
+
SLOFILES = \
$(SLO)$/bridge.obj \
$(SLO)$/component.obj \
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index b049c7f..830d899 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -264,10 +264,18 @@ bool VtableFactory::createBlock(Block block, sal_Int32
slotCount) const
}
unlink(tmpfname);
delete[] tmpfname;
+#if defined(HAVE_POSIX_FALLOCATE)
int err = posix_fallocate(block.fd, 0, block.size);
+#else
+int err = ftruncate(block.fd, block.size);
+#endif
if (err != 0)
{
+#if defined(HAVE_POSIX_FALLOCATE)
SAL_WARN(bridges, posix_fallocate failed with code err);
+#else
+SAL_WARN(bridges, truncation of executable memory area failed
with code err);
+#endif
close(block.fd);
block.fd = -1;
break;
diff --git a/configure.in b/configure.in
index 49c9758..897403a 100644
--- a/configure.in
+++ b/configure.in
@@ -3879,6 +3879,8 @@ fi
if test $with_alloc = internal -o -z $with_alloc; then
AC_MSG_RESULT([internal])
fi
+AC_CHECK_FUNCS(posix_fallocate, HAVE_POSIX_FALLOCATE=YES,
[HAVE_POSIX_FALLOCATE=NO])
+AC_SUBST(HAVE_POSIX_FALLOCATE)
AC_SUBST(ALLOC)
dnl ===
diff --git a/set_soenv.in b/set_soenv.in
index 06c8b30..b88c0cf 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1934,6 +1934,7 @@ ToFile( HUNSPELL_LIBS, @HUNSPELL_LIBS@,e );
ToFile( SYSTEM_LPSOLVE,@SYSTEM_LPSOLVE@, e );
ToFile( HAVE_GETOPT, @HAVE_GETOPT@, e );
ToFile( HAVE_READDIR_R,@HAVE_READDIR_R@, e );
+ToFile( HAVE_POSIX_FALLOCATE,@HAVE_POSIX_FALLOCATE@, e );
ToFile( SYSTEM_LIBC, @SYSTEM_LIBC@, e );
ToFile( SYSTEM_HYPH, @SYSTEM_HYPH@, e );
ToFile( HYPHEN_LIB,@HYPHEN_LIB@, e );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: mythes/prj
mythes/prj/d.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2a76860a496a8a624e9e44d20c24252d59f88463 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 15:19:30 2011 + update delivering the correct version diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst index 375161f..f2f46c2 100644 --- a/mythes/prj/d.lst +++ b/mythes/prj/d.lst @@ -1,7 +1,7 @@ ..\%__SRC%\slb\libmythes.lib %_DEST%\lib\libmythes.lib ..\%__SRC%\inc\mythes.hxx %_DEST%\inc\mythes.hxx -..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a +..\%__SRC%\misc\build\mythes-1.2.2\.libs\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a ..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a -..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin\th_gen_idx.pl +..\%__SRC%\misc\build\mythes-1.2.2\th_gen_idx.pl %_DEST%\bin\th_gen_idx.pl ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk vcl/win
vcl/Library_vcl.mk |2 +- vcl/win/source/gdi/salgdi3.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit c010c77dc3d240413d584d5837de4be1b164517e Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 15:26:59 2011 + explicitly write an 8 bit empty string diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f18c18f..95a307f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,vcl,\ )) $(eval $(call gb_Library_add_defs,vcl,\ --DVCL_DLLIMPLEMENTATION \ +-DVCL_DLLIMPLEMENTATION -DNOMINMAX \ -DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,cui)\ \ -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ )) diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 32fd0f3..8d86069 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -210,7 +210,7 @@ ImplFontAttrCache::~ImplFontAttrCache() ++aIter; } // EOF Marker -write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString(), RTL_TEXTENCODING_UTF8); +write_lenPrefixed_uInt8s_FromOStringsal_uInt16(aCacheFile, rtl::OString()); } } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin
solenv/bin/modules/installer/download.pm |1 -
1 file changed, 1 deletion(-)
New commits:
commit 3b5aa17f83643d09dc7300f06dd191f4bb26f23e
Author: Petr Mladek pmla...@suse.cz
Date: Wed Dec 21 16:36:09 2011 +0100
do not use ABOUTBOXPRODUCTVERSIONSUFFIX in download name
I did not read the code carfully enough when added this line few days ago.
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index bc6ac27..5f186b7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -425,7 +425,6 @@ sub get_download_version
$version = $allvariables-{'PRODUCTVERSION'};
if (( $allvariables-{'ABOUTBOXPRODUCTVERSION'} ) (
$allvariables-{'ABOUTBOXPRODUCTVERSION'} ne )) { $version =
$allvariables-{'ABOUTBOXPRODUCTVERSION'}; }
-if (( $allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ) (
$allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ne )) { $version =
$allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'}; }
if (( $allvariables-{'SHORT_PRODUCTEXTENSION'} ) (
$allvariables-{'SHORT_PRODUCTEXTENSION'} ne )) { $version = $version .
$allvariables-{'SHORT_PRODUCTEXTENSION'}; }
return $version;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/download.pm |1 -
1 file changed, 1 deletion(-)
New commits:
commit c84ac758aa081f2b642aa9b96fda8496d0d66188
Author: Petr Mladek pmla...@suse.cz
Date: Wed Dec 21 16:36:09 2011 +0100
do not use ABOUTBOXPRODUCTVERSIONSUFFIX in download name
I did not read the code carfully enough when added this line few days ago.
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index bc6ac27..5f186b7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -425,7 +425,6 @@ sub get_download_version
$version = $allvariables-{'PRODUCTVERSION'};
if (( $allvariables-{'ABOUTBOXPRODUCTVERSION'} ) (
$allvariables-{'ABOUTBOXPRODUCTVERSION'} ne )) { $version =
$allvariables-{'ABOUTBOXPRODUCTVERSION'}; }
-if (( $allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ) (
$allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ne )) { $version =
$allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'}; }
if (( $allvariables-{'SHORT_PRODUCTEXTENSION'} ) (
$allvariables-{'SHORT_PRODUCTEXTENSION'} ne )) { $version = $version .
$allvariables-{'SHORT_PRODUCTEXTENSION'}; }
return $version;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/printdata.hxx | 11 +--
sw/inc/unotxdoc.hxx |3 +--
sw/source/core/view/printdata.cxx | 14 --
sw/source/ui/inc/view.hxx |3 +--
sw/source/ui/uiview/view.cxx | 18 --
sw/source/ui/uno/unotxdoc.cxx | 33 +
sw/source/ui/uno/unotxvw.cxx |8
7 files changed, 48 insertions(+), 42 deletions(-)
New commits:
commit 69aedb82d728422db891ba02f7c25f1873cb1f6b
Author: Michael Stahl mst...@redhat.com
Date: Wed Dec 21 16:39:22 2011 +0100
sw: fdo#39159 fdo#40482: temp selection print doc:
Ensure that the printing temp selection document is not destroyed
prematurely by SwXTextView::NotifySelChanged, called via
ViewOptionAdjustStop, by retaining the temp doc object shell not
at the View but in SwRenderData.
Not restoring the view options for selections does not actually work,
because having a selection surprisingly does not imply printing a
temp document: the preview also uses a selection.
(view option regression from cd690d2e72be410058376c416a40ff5d918fb0f7)
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 8d29336..02d56b8 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -28,10 +28,10 @@
#ifndef SW_PRINTDATA_HXX
#define SW_PRINTDATA_HXX
-
#include sal/types.h
#include rtl/ustring.hxx
#include vcl/print.hxx
+#include sfx2/objsh.hxx
#include boost/scoped_ptr.hpp
@@ -244,6 +244,10 @@ class SwRenderData
rtl::OUString m_aPageRange;
+// temp print document -- must live longer than m_pViewOptionAdjust!
+// also this is a Lock and not a Ref because Ref does not delete the doc
+SfxObjectShellLock m_xTempDocShell;
+
// the view options to be applied for printing
::boost::scoped_ptrSwViewOptionAdjust_Impl m_pViewOptionAdjust;
@@ -266,9 +270,12 @@ public:
void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt,
OutputDevice *pOutDev );
void DeletePostItData();
+SfxObjectShellLock const GetTempDocShell() const;
+void SetTempDocShell(SfxObjectShellLock const);
+
bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != 0; }
bool NeedNewViewOptionAdjust( const ViewShell ) const;
-void ViewOptionAdjustStart( ViewShell rSh, const SwViewOption
rViewOptions, bool bIsTmpSelection );
+void ViewOptionAdjustStart( ViewShell rSh, const SwViewOption
rViewOptions);
void ViewOptionAdjust( SwPrintData const* const pPrtOptions );
void ViewOptionAdjustStop();
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 5d61a9a..42d646f 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -589,10 +589,9 @@ class SwViewOptionAdjust_Impl
{
ViewShell m_rShell;
SwViewOptionm_aOldViewOptions;
-bool m_bIsTmpSelection;
public:
-SwViewOptionAdjust_Impl( ViewShell rSh, const SwViewOption rViewOptions,
bool bIsTmpSelection );
+SwViewOptionAdjust_Impl( ViewShell rSh, const SwViewOption rViewOptions
);
~SwViewOptionAdjust_Impl();
void AdjustViewOptions( SwPrintData const* const pPrtOptions );
bool checkShell( const ViewShell rCompare ) const
diff --git a/sw/source/core/view/printdata.cxx
b/sw/source/core/view/printdata.cxx
index 47b1fa3..870ecbe 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -93,20 +93,30 @@ void SwRenderData::DeletePostItData()
}
}
+SfxObjectShellLock const SwRenderData::GetTempDocShell() const
+{
+return m_xTempDocShell;
+}
+void SwRenderData::SetTempDocShell(SfxObjectShellLock const xShell)
+{
+m_xTempDocShell = xShell;
+}
+
bool SwRenderData::NeedNewViewOptionAdjust( const ViewShell rCompare ) const
{
return m_pViewOptionAdjust ? ! m_pViewOptionAdjust-checkShell( rCompare )
: true;
}
-void SwRenderData::ViewOptionAdjustStart( ViewShell rSh, const SwViewOption
rViewOptions, bool bIsTmpSelection )
+void SwRenderData::ViewOptionAdjustStart(
+ViewShell rSh, const SwViewOption rViewOptions)
{
if (m_pViewOptionAdjust)
{
OSL_FAIL(error: there should be no ViewOptionAdjust active when
calling this function );
}
m_pViewOptionAdjust.reset(
-new SwViewOptionAdjust_Impl( rSh, rViewOptions, bIsTmpSelection ));
+new SwViewOptionAdjust_Impl( rSh, rViewOptions ));
}
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 4445edf..4f374af 100755
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -641,8 +641,7 @@ public:
void NotifyDBChanged();
-SfxObjectShellLock GetTmpSelectionDoc();
-SfxObjectShellLock GetOrCreateTmpSelectionDoc();
+SfxObjectShellLock CreateTmpSelectionDoc();
voidAddTransferable(SwTransferable rTransferable);
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index d9489a6..b3bbf87 100644
---
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/printdata.hxx | 11 +--
sw/inc/unotxdoc.hxx |3 +--
sw/source/core/view/printdata.cxx | 14 --
sw/source/ui/inc/view.hxx |3 +--
sw/source/ui/uiview/view.cxx | 18 --
sw/source/ui/uno/unotxdoc.cxx | 33 +
sw/source/ui/uno/unotxvw.cxx |8
7 files changed, 48 insertions(+), 42 deletions(-)
New commits:
commit 89d2733e16ae6233deea6bef3193bd45c89b854c
Author: Michael Stahl mst...@redhat.com
Date: Wed Dec 21 16:39:22 2011 +0100
sw: fdo#39159 fdo#40482: temp selection print doc:
Ensure that the printing temp selection document is not destroyed
prematurely by SwXTextView::NotifySelChanged, called via
ViewOptionAdjustStop, by retaining the temp doc object shell not
at the View but in SwRenderData.
Not restoring the view options for selections does not actually work,
because having a selection surprisingly does not imply printing a
temp document: the preview also uses a selection.
(view option regression from cd690d2e72be410058376c416a40ff5d918fb0f7)
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 8d29336..02d56b8 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -28,10 +28,10 @@
#ifndef SW_PRINTDATA_HXX
#define SW_PRINTDATA_HXX
-
#include sal/types.h
#include rtl/ustring.hxx
#include vcl/print.hxx
+#include sfx2/objsh.hxx
#include boost/scoped_ptr.hpp
@@ -244,6 +244,10 @@ class SwRenderData
rtl::OUString m_aPageRange;
+// temp print document -- must live longer than m_pViewOptionAdjust!
+// also this is a Lock and not a Ref because Ref does not delete the doc
+SfxObjectShellLock m_xTempDocShell;
+
// the view options to be applied for printing
::boost::scoped_ptrSwViewOptionAdjust_Impl m_pViewOptionAdjust;
@@ -266,9 +270,12 @@ public:
void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt,
OutputDevice *pOutDev );
void DeletePostItData();
+SfxObjectShellLock const GetTempDocShell() const;
+void SetTempDocShell(SfxObjectShellLock const);
+
bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != 0; }
bool NeedNewViewOptionAdjust( const ViewShell ) const;
-void ViewOptionAdjustStart( ViewShell rSh, const SwViewOption
rViewOptions, bool bIsTmpSelection );
+void ViewOptionAdjustStart( ViewShell rSh, const SwViewOption
rViewOptions);
void ViewOptionAdjust( SwPrintData const* const pPrtOptions );
void ViewOptionAdjustStop();
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 5d61a9a..42d646f 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -589,10 +589,9 @@ class SwViewOptionAdjust_Impl
{
ViewShell m_rShell;
SwViewOptionm_aOldViewOptions;
-bool m_bIsTmpSelection;
public:
-SwViewOptionAdjust_Impl( ViewShell rSh, const SwViewOption rViewOptions,
bool bIsTmpSelection );
+SwViewOptionAdjust_Impl( ViewShell rSh, const SwViewOption rViewOptions
);
~SwViewOptionAdjust_Impl();
void AdjustViewOptions( SwPrintData const* const pPrtOptions );
bool checkShell( const ViewShell rCompare ) const
diff --git a/sw/source/core/view/printdata.cxx
b/sw/source/core/view/printdata.cxx
index 47b1fa3..870ecbe 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -93,20 +93,30 @@ void SwRenderData::DeletePostItData()
}
}
+SfxObjectShellLock const SwRenderData::GetTempDocShell() const
+{
+return m_xTempDocShell;
+}
+void SwRenderData::SetTempDocShell(SfxObjectShellLock const xShell)
+{
+m_xTempDocShell = xShell;
+}
+
bool SwRenderData::NeedNewViewOptionAdjust( const ViewShell rCompare ) const
{
return m_pViewOptionAdjust ? ! m_pViewOptionAdjust-checkShell( rCompare )
: true;
}
-void SwRenderData::ViewOptionAdjustStart( ViewShell rSh, const SwViewOption
rViewOptions, bool bIsTmpSelection )
+void SwRenderData::ViewOptionAdjustStart(
+ViewShell rSh, const SwViewOption rViewOptions)
{
if (m_pViewOptionAdjust)
{
OSL_FAIL(error: there should be no ViewOptionAdjust active when
calling this function );
}
m_pViewOptionAdjust.reset(
-new SwViewOptionAdjust_Impl( rSh, rViewOptions, bIsTmpSelection ));
+new SwViewOptionAdjust_Impl( rSh, rViewOptions ));
}
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 4445edf..4f374af 100755
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -641,8 +641,7 @@ public:
void NotifyDBChanged();
-SfxObjectShellLock GetTmpSelectionDoc();
-SfxObjectShellLock GetOrCreateTmpSelectionDoc();
+SfxObjectShellLock CreateTmpSelectionDoc();
voidAddTransferable(SwTransferable rTransferable);
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index d9489a6..b3bbf87 100644
---
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/inc sw/source
sw/inc/printdata.hxx | 11 +--
sw/inc/unotxdoc.hxx |3 +--
sw/source/core/view/printdata.cxx | 14 --
sw/source/ui/inc/view.hxx |3 +--
sw/source/ui/uiview/view.cxx | 18 --
sw/source/ui/uno/unotxdoc.cxx | 33 +
sw/source/ui/uno/unotxvw.cxx |8
7 files changed, 48 insertions(+), 42 deletions(-)
New commits:
commit 871ad55dccbd7121e005a66e3c51f55a236d2b04
Author: Michael Stahl mst...@redhat.com
Date: Wed Dec 21 16:39:22 2011 +0100
sw: fdo#39159 fdo#40482: temp selection print doc:
Ensure that the printing temp selection document is not destroyed
prematurely by SwXTextView::NotifySelChanged, called via
ViewOptionAdjustStop, by retaining the temp doc object shell not
at the View but in SwRenderData.
Not restoring the view options for selections does not actually work,
because having a selection surprisingly does not imply printing a
temp document: the preview also uses a selection.
(view option regression from cd690d2e72be410058376c416a40ff5d918fb0f7)
(cherry picked from commit 89d2733e16ae6233deea6bef3193bd45c89b854c)
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 8d29336..02d56b8 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -28,10 +28,10 @@
#ifndef SW_PRINTDATA_HXX
#define SW_PRINTDATA_HXX
-
#include sal/types.h
#include rtl/ustring.hxx
#include vcl/print.hxx
+#include sfx2/objsh.hxx
#include boost/scoped_ptr.hpp
@@ -244,6 +244,10 @@ class SwRenderData
rtl::OUString m_aPageRange;
+// temp print document -- must live longer than m_pViewOptionAdjust!
+// also this is a Lock and not a Ref because Ref does not delete the doc
+SfxObjectShellLock m_xTempDocShell;
+
// the view options to be applied for printing
::boost::scoped_ptrSwViewOptionAdjust_Impl m_pViewOptionAdjust;
@@ -266,9 +270,12 @@ public:
void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt,
OutputDevice *pOutDev );
void DeletePostItData();
+SfxObjectShellLock const GetTempDocShell() const;
+void SetTempDocShell(SfxObjectShellLock const);
+
bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != 0; }
bool NeedNewViewOptionAdjust( const ViewShell ) const;
-void ViewOptionAdjustStart( ViewShell rSh, const SwViewOption
rViewOptions, bool bIsTmpSelection );
+void ViewOptionAdjustStart( ViewShell rSh, const SwViewOption
rViewOptions);
void ViewOptionAdjust( SwPrintData const* const pPrtOptions );
void ViewOptionAdjustStop();
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 5d61a9a..42d646f 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -589,10 +589,9 @@ class SwViewOptionAdjust_Impl
{
ViewShell m_rShell;
SwViewOptionm_aOldViewOptions;
-bool m_bIsTmpSelection;
public:
-SwViewOptionAdjust_Impl( ViewShell rSh, const SwViewOption rViewOptions,
bool bIsTmpSelection );
+SwViewOptionAdjust_Impl( ViewShell rSh, const SwViewOption rViewOptions
);
~SwViewOptionAdjust_Impl();
void AdjustViewOptions( SwPrintData const* const pPrtOptions );
bool checkShell( const ViewShell rCompare ) const
diff --git a/sw/source/core/view/printdata.cxx
b/sw/source/core/view/printdata.cxx
index 47b1fa3..870ecbe 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -93,20 +93,30 @@ void SwRenderData::DeletePostItData()
}
}
+SfxObjectShellLock const SwRenderData::GetTempDocShell() const
+{
+return m_xTempDocShell;
+}
+void SwRenderData::SetTempDocShell(SfxObjectShellLock const xShell)
+{
+m_xTempDocShell = xShell;
+}
+
bool SwRenderData::NeedNewViewOptionAdjust( const ViewShell rCompare ) const
{
return m_pViewOptionAdjust ? ! m_pViewOptionAdjust-checkShell( rCompare )
: true;
}
-void SwRenderData::ViewOptionAdjustStart( ViewShell rSh, const SwViewOption
rViewOptions, bool bIsTmpSelection )
+void SwRenderData::ViewOptionAdjustStart(
+ViewShell rSh, const SwViewOption rViewOptions)
{
if (m_pViewOptionAdjust)
{
OSL_FAIL(error: there should be no ViewOptionAdjust active when
calling this function );
}
m_pViewOptionAdjust.reset(
-new SwViewOptionAdjust_Impl( rSh, rViewOptions, bIsTmpSelection ));
+new SwViewOptionAdjust_Impl( rSh, rViewOptions ));
}
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 45e4405..1290883 100755
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -643,8 +643,7 @@ public:
void NotifyDBChanged();
-SfxObjectShellLock GetTmpSelectionDoc();
-SfxObjectShellLock GetOrCreateTmpSelectionDoc();
+SfxObjectShellLock CreateTmpSelectionDoc();
voidAddTransferable(SwTransferable rTransferable);
diff --git
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/extensions/post_AuxTargets.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 12775a8890726df230e2c8c93bacf552eee14b47 Author: Rene Engelhard r...@debian.org Date: Wed Dec 21 17:19:28 2011 +0100 don't remove configure and aclocal.m4 in distclean anymore diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index 119536c..72414b7 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -78,8 +78,8 @@ clean-build: distclean: clean if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi - cd $(SRCDIR) rm -rf Env.Host.sh aclocal.m4 autogen.lastrun autom4te.cache \ - bin/repo-list build_env config.log config.status configure \ + cd $(SRCDIR) rm -rf Env.Host.sh autogen.lastrun autom4te.cache \ + bin/repo-list build_env config.log config.status \ desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ set_soenv set_soenv.last set_soenv.stamp src.downloaded warn ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/Library_sfx.mk
sfx2/Library_sfx.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 98d75b3506520bd5db7071a2d9379fb7c565b9d9 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 16:38:55 2011 + ditch min/max as macros under msvc diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index b8f5d37..893aa3f 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,sfx,\ )) $(eval $(call gb_Library_add_defs,sfx,\ --DSFX2_DLLIMPLEMENTATION \ +-DSFX2_DLLIMPLEMENTATION -DNOMINMAX \ )) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_so3
binfilter/bf_so3/util/makefile.pmk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e22e6ff0b54c4b52326b4168ce40a15bc673d214 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 16:39:02 2011 + ditch min/max as macros under msvc diff --git a/binfilter/bf_so3/util/makefile.pmk b/binfilter/bf_so3/util/makefile.pmk index 40c5820..8167472 100644 --- a/binfilter/bf_so3/util/makefile.pmk +++ b/binfilter/bf_so3/util/makefile.pmk @@ -26,5 +26,5 @@ #* # Reduction of exported symbols: -CDEFS += -DSO3_DLLIMPLEMENTATION +CDEFS += -DSO3_DLLIMPLEMENTATION -DNOMINMAX VISIBILITY_HIDDEN=TRUE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_sw binfilter/inc
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx |4
binfilter/bf_sw/source/core/ole/sw_ndole.cxx |2 +-
binfilter/inc/bf_sd/sdfilter.hxx |2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit baf8f39900cd4763dd4bb325907010969ecc1670
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 21 16:55:21 2011 +
WaE: silence some msvc warnings
diff --git a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
index bcc481d..9bf7c6e 100644
--- a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
+++ b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
@@ -136,6 +136,10 @@ SdXMLFilter::SdXMLFilter( SfxMedium rMedium,
SdDrawDocShell rDocShell, sal_Boo
{
}
+SdXMLFilter::~SdXMLFilter()
+{
+}
+
//
-
sal_Bool SdXMLFilter::Import()
diff --git a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
index 7bd619c..d1e2683 100644
--- a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
+++ b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
@@ -68,7 +68,7 @@ public:
void Load();
-SvPtrarr::Count;
+using SvPtrarr::Count;
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence rtl::OUString
aPropertyNames );
diff --git a/binfilter/inc/bf_sd/sdfilter.hxx b/binfilter/inc/bf_sd/sdfilter.hxx
index 45af8d0..98bd862 100644
--- a/binfilter/inc/bf_sd/sdfilter.hxx
+++ b/binfilter/inc/bf_sd/sdfilter.hxx
@@ -66,7 +66,7 @@ protected:
public:
SdFilter( SfxMedium rMedium, SdDrawDocShell
rDocShell, sal_Bool bShowProgress );
-~SdFilter();
+virtual ~SdFilter();
virtual sal_BoolImport();
virtual sal_BoolExport();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svl/inc svl/source
svl/inc/svl/zforlist.hxx|3 +
svl/source/numbers/zforfind.hxx |8 +--
svl/source/numbers/zforlist.cxx | 103
3 files changed, 70 insertions(+), 44 deletions(-)
New commits:
commit 9c1d304d0df21b6ae63dbd4db737f0d21a51f227
Author: Eike Rathke er...@redhat.com
Date: Wed Dec 21 17:54:12 2011 +0100
resolved fdo#37978 - Date formatting in Spreadsheet is inconsistent
* SvNumberFormatter::IsNumberFormat() ISO 8601 date input results in
-mm-dd format if no other date format was set.
* SvNumberFormatter::GetInputLineString() preserves ISO 8601 date format for
editing if such was set.
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index afcb326..ffae629 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -595,6 +595,9 @@ public:
/// Whether nFIndex is a special builtin format
bool IsSpecialStandardFormat( sal_uInt32 nFIndex, LanguageType eLnge );
+/** Return the corresponding edit format of a format. */
+sal_uInt32 GetEditFormat( double fNumber, sal_uInt32 nFIndex, short eType,
LanguageType eLnge );
+
/// Return the reference date
Date* GetNullDate();
/// Return the standard decimal precision
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index d949217..9c557b7 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -69,6 +69,10 @@ public:
/// get threshold of two-digit year input
sal_uInt16 GetYear2000() const { return nYear2000; }
+// Whether input may be a ISO 8601 date format, -mm-dd...
+// checks if at least 3 numbers and first number31
+bool MayBeIso8601();
+
private:
SvNumberFormatter* pFormatter;
String* pUpperMonthText;// Array of month names,
uppercase
@@ -256,10 +260,6 @@ private:
const String rString,
const SvNumberformat* pFormat = NULL );
-// Whether input may be a ISO 8601 date format, -mm-dd...
-// checks if at least 3 numbers and first number31
-bool MayBeIso8601();
-
// Compare rString to substring of array indexed by nString
// nString == 0x = last substring
bool ScanStringNumFor(
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8901784..295a618 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1155,7 +1155,6 @@ bool SvNumberFormatter::IsNumberFormat(const String
sString,
const SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);
if (!pFormat)
{
-// OSL_FAIL(SvNumberFormatter:: Unbekanntes altes Zahlformat (2));
ChangeIntl(IniLnge);
FType = NUMBERFORMAT_NUMBER;
}
@@ -1168,21 +1167,25 @@ bool SvNumberFormatter::IsNumberFormat(const String
sString,
}
bool res;
short RType = FType;
-// Ergebnistyp
-// ohne def-Kennung
-if (RType == NUMBERFORMAT_TEXT) // Zahlzelle
-Stringz.
-res = false;
+if (RType == NUMBERFORMAT_TEXT)
+res = false;// type text preset = no conversion to number
else
res = pStringScanner-IsNumberFormat(sString, RType, fOutNumber,
pFormat);
-if (res !IsCompatible(FType, RType)) // unpassender Typ
+if (res !IsCompatible(FType, RType)) // non-matching type
{
switch ( RType )
{
+case NUMBERFORMAT_DATE :
+// Preserve ISO 8601 input.
+if (pStringScanner-MayBeIso8601())
+F_Index = GetFormatIndex( NF_DATE_DIN_MMDD, ActLnge );
+else
+F_Index = GetStandardFormat( RType, ActLnge );
+break;
case NUMBERFORMAT_TIME :
-{
if ( pStringScanner-GetDecPos() )
-{ // 100stel Sekunden
+{ // 100th seconds
if ( pStringScanner-GetAnzNums() 3 || fOutNumber 0.0 )
F_Index = GetFormatIndex( NF_TIME_HH_MMSS00, ActLnge );
else
@@ -1192,7 +1195,6 @@ bool SvNumberFormatter::IsNumberFormat(const String
sString,
F_Index = GetFormatIndex( NF_TIME_HH_MMSS, ActLnge );
else
F_Index = GetStandardFormat( RType, ActLnge );
-}
break;
default:
F_Index = GetStandardFormat( RType, ActLnge );
@@ -1435,50 +1437,38 @@ sal_uInt32 SvNumberFormatter::GetStandardFormat( double
fNumber, sal_uInt32 nFIn
}
}
-void SvNumberFormatter::GetInputLineString(const double fOutNumber,
- sal_uInt32 nFIndex,
- String sOutString)
+sal_uInt32
[Libreoffice-commits] .: svl/inc svl/source
svl/inc/svl/zforlist.hxx|3 +
svl/source/numbers/zforfind.hxx |8 +--
svl/source/numbers/zforlist.cxx | 103
3 files changed, 70 insertions(+), 44 deletions(-)
New commits:
commit 6c37252eb93db161edfd234696604774e9ee1d8c
Author: Eike Rathke er...@redhat.com
Date: Wed Dec 21 17:51:48 2011 +0100
resolved fdo#37978 - Date formatting in Spreadsheet is inconsistent
* SvNumberFormatter::IsNumberFormat() ISO 8601 date input results in
-mm-dd format if no other date format was set.
* SvNumberFormatter::GetInputLineString() preserves ISO 8601 date format for
editing if such was set.
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index afcb326..ffae629 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -595,6 +595,9 @@ public:
/// Whether nFIndex is a special builtin format
bool IsSpecialStandardFormat( sal_uInt32 nFIndex, LanguageType eLnge );
+/** Return the corresponding edit format of a format. */
+sal_uInt32 GetEditFormat( double fNumber, sal_uInt32 nFIndex, short eType,
LanguageType eLnge );
+
/// Return the reference date
Date* GetNullDate();
/// Return the standard decimal precision
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index d949217..9c557b7 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -69,6 +69,10 @@ public:
/// get threshold of two-digit year input
sal_uInt16 GetYear2000() const { return nYear2000; }
+// Whether input may be a ISO 8601 date format, -mm-dd...
+// checks if at least 3 numbers and first number31
+bool MayBeIso8601();
+
private:
SvNumberFormatter* pFormatter;
String* pUpperMonthText;// Array of month names,
uppercase
@@ -256,10 +260,6 @@ private:
const String rString,
const SvNumberformat* pFormat = NULL );
-// Whether input may be a ISO 8601 date format, -mm-dd...
-// checks if at least 3 numbers and first number31
-bool MayBeIso8601();
-
// Compare rString to substring of array indexed by nString
// nString == 0x = last substring
bool ScanStringNumFor(
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8901784..295a618 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1155,7 +1155,6 @@ bool SvNumberFormatter::IsNumberFormat(const String
sString,
const SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);
if (!pFormat)
{
-// OSL_FAIL(SvNumberFormatter:: Unbekanntes altes Zahlformat (2));
ChangeIntl(IniLnge);
FType = NUMBERFORMAT_NUMBER;
}
@@ -1168,21 +1167,25 @@ bool SvNumberFormatter::IsNumberFormat(const String
sString,
}
bool res;
short RType = FType;
-// Ergebnistyp
-// ohne def-Kennung
-if (RType == NUMBERFORMAT_TEXT) // Zahlzelle
-Stringz.
-res = false;
+if (RType == NUMBERFORMAT_TEXT)
+res = false;// type text preset = no conversion to number
else
res = pStringScanner-IsNumberFormat(sString, RType, fOutNumber,
pFormat);
-if (res !IsCompatible(FType, RType)) // unpassender Typ
+if (res !IsCompatible(FType, RType)) // non-matching type
{
switch ( RType )
{
+case NUMBERFORMAT_DATE :
+// Preserve ISO 8601 input.
+if (pStringScanner-MayBeIso8601())
+F_Index = GetFormatIndex( NF_DATE_DIN_MMDD, ActLnge );
+else
+F_Index = GetStandardFormat( RType, ActLnge );
+break;
case NUMBERFORMAT_TIME :
-{
if ( pStringScanner-GetDecPos() )
-{ // 100stel Sekunden
+{ // 100th seconds
if ( pStringScanner-GetAnzNums() 3 || fOutNumber 0.0 )
F_Index = GetFormatIndex( NF_TIME_HH_MMSS00, ActLnge );
else
@@ -1192,7 +1195,6 @@ bool SvNumberFormatter::IsNumberFormat(const String
sString,
F_Index = GetFormatIndex( NF_TIME_HH_MMSS, ActLnge );
else
F_Index = GetStandardFormat( RType, ActLnge );
-}
break;
default:
F_Index = GetStandardFormat( RType, ActLnge );
@@ -1435,50 +1437,38 @@ sal_uInt32 SvNumberFormatter::GetStandardFormat( double
fNumber, sal_uInt32 nFIn
}
}
-void SvNumberFormatter::GetInputLineString(const double fOutNumber,
- sal_uInt32 nFIndex,
- String sOutString)
+sal_uInt32
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs|2 +- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit f47ee3cd6113ff1312ca49b38d733ec293c423c1 Author: Jan Holesovsky ke...@suse.cz Date: Wed Dec 21 18:54:08 2011 +0100 Don't show the non-printing characters by default. diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 10ff191..73645db 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1131,7 +1131,7 @@ descDetermines whether certain settings are applied (display of tab stops, spaces, breaks)/desc labelMeta characters/label /info - valuetrue/value + valuefalse/value /prop prop oor:name=ParagraphEnd oor:type=xs:boolean !-- OldPath: Writer/Contents/Nonprinting_characters -- diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index c5f7b1d..4d6fd70 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -116,7 +116,7 @@ descDetermines whether certain settings are applied or not (display of tab stops, spaces, breaks)./desc labelMeta characters/label /info - valuetrue/value + valuefalse/value /prop prop oor:name=ParagraphEnd oor:type=xs:boolean !-- OldPath: HTML_Editor/Content/Nonprinting_characters -- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs|2 +- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 40fe511d0ed56d4481cad9c278899f3b9167cdb5 Author: Jan Holesovsky ke...@suse.cz Date: Wed Dec 21 18:54:08 2011 +0100 Don't show the non-printing characters by default. diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 10ff191..73645db 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1131,7 +1131,7 @@ descDetermines whether certain settings are applied (display of tab stops, spaces, breaks)/desc labelMeta characters/label /info - valuetrue/value + valuefalse/value /prop prop oor:name=ParagraphEnd oor:type=xs:boolean !-- OldPath: Writer/Contents/Nonprinting_characters -- diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index c5f7b1d..4d6fd70 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -116,7 +116,7 @@ descDetermines whether certain settings are applied or not (display of tab stops, spaces, breaks)./desc labelMeta characters/label /info - valuetrue/value + valuefalse/value /prop prop oor:name=ParagraphEnd oor:type=xs:boolean !-- OldPath: HTML_Editor/Content/Nonprinting_characters -- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/inc sc/source sw/source
sc/inc/chgtrack.hxx| 42 +++--
sc/source/core/tool/chgtrack.cxx | 139 -
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 12 -
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |2
sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx |6
sc/source/ui/inc/acredlin.hxx |8
sc/source/ui/miscdlgs/acredlin.cxx | 99 ++--
sw/source/core/text/inftxt.hxx | 19 +-
8 files changed, 180 insertions(+), 147 deletions(-)
New commits:
commit 3d96cb2527b5899b4d1bda3cef78110f321718e5
Author: Michael Stahl mst...@redhat.com
Date: Wed Dec 21 20:13:52 2011 +0100
ScChangeActionTable conversion: small corrections
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index ef5ec99..937fb97 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -4032,7 +4032,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
{
ScChangeAction* p = GetAction(
((ScChangeActionReject*)pCur)-GetRejectAction() );
-if ( p != pAct rMap.find( p-GetActionNumber() ) !=
rMap.end() )
+if (p != pAct rMap.find( p-GetActionNumber() ) ==
rMap.end())
cStack.push( p );
}
}
@@ -4200,8 +4200,9 @@ sal_Bool ScChangeTrack::Reject( ScChangeAction* pAct,
ScChangeActionMap* pMap,
if ( pAct-HasDependent() !bRecursion )
{
OSL_ENSURE( pMap, ScChangeTrack::Reject: Insert ohne map );
-ScChangeActionMap::iterator itChangeAction;
-for( itChangeAction = pMap-begin(); itChangeAction != pMap-end()
bOk; ++itChangeAction )
+ScChangeActionMap::reverse_iterator itChangeAction;
+for (itChangeAction = pMap-rbegin();
+ itChangeAction != pMap-rend() bOk; ++itChangeAction)
{
// keine Contents restoren, die eh geloescht werden wuerden
if ( itChangeAction-second-GetType() == SC_CAT_CONTENT )
commit 713d69d96038fdd5479de076270c2186f95c2630
Author: Marcel Metz mm...@adrian-broher.net
Date: Wed Dec 21 20:00:03 2011 +0100
fdo#38832 Replace ScChangeActionTable with std::map
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 5dc02d8..9dd27ca 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -30,11 +30,11 @@
#define SC_CHGTRACK_HXX
#include deque
+#include map
#include stack
#include tools/string.hxx
#include tools/datetime.hxx
-#include tools/table.hxx
#include tools/mempool.hxx
#include tools/link.hxx
#include unotools/options.hxx
@@ -952,6 +952,7 @@ struct ScChangeTrackMsgInfo
// MsgQueue for notification via ModifiedLink
typedef std::dequeScChangeTrackMsgInfo* ScChangeTrackMsgQueue;
typedef std::stackScChangeTrackMsgInfo* ScChangeTrackMsgStack;
+typedef std::mapsal_uLong, ScChangeAction* ScChangeActionMap;
enum ScChangeTrackMergeState
{
@@ -962,9 +963,6 @@ enum ScChangeTrackMergeState
SC_CTMS_OTHER
};
-// Table, additionally to pFirst/pNext/pLast/pPrev, to enable fast access by
ActionNumber and by list
-DECLARE_TABLE( ScChangeActionTable, ScChangeAction* )
-
// Internally generated actions start at this value (nearly all bits set)
// and are decremented, to keep values in a table seperated from normal
actions.
#define SC_CHGTRACK_GENERATED_START ((sal_uInt32) 0xfff0)
@@ -981,9 +979,9 @@ class ScChangeTrack : public utl::ConfigurationListener
static const SCSIZEnContentSlots;
com::sun::star::uno::Sequence sal_Int8aProtectPass;
-ScChangeActionTable aTable;
-ScChangeActionTable aGeneratedTable;
-ScChangeActionTable aPasteCutTable;
+ScChangeActionMap aMap;
+ScChangeActionMap aGeneratedMap;
+ScChangeActionMap aPasteCutMap;
ScChangeTrackMsgQueue aMsgQueue;
ScChangeTrackMsgStack aMsgStackTmp;
ScChangeTrackMsgStack aMsgStackFinal;
@@ -1097,7 +1095,7 @@ class ScChangeTrack : public utl::ConfigurationListener
// is NULL otherwise.
// bRecursion == called from reject with table
sal_BoolReject( ScChangeAction*,
-ScChangeActionTable*, sal_Bool bRecursion
);
+ScChangeActionMap*, sal_Bool bRecursion );
#endif // SC_CHGTRACK_CXX
@@ -1126,9 +1124,21 @@ public:
sal_BoolIsGenerated( sal_uLong nAction ) const
{ return nAction = nGeneratedMin; }
ScChangeAction* GetAction( sal_uLong nAction ) const
-{ return aTable.Get( nAction ); }
+{
+ScChangeActionMap::const_iterator it = aMap.find(
[Libreoffice-commits] .: sc/source
sc/source/core/tool/chgtrack.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit c1db721af6286ae4c3164075337d81e943845938
Author: Eike Rathke er...@redhat.com
Date: Wed Dec 21 20:45:40 2011 +0100
ScChangeActionTable conversion: another correction
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 937fb97..d38d0ce 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -3143,13 +3143,16 @@ void ScChangeTrack::Undo( sal_uLong nStartAction,
sal_uLong nEndAction, bool bMe
{
ScChangeActionMap::iterator itCut =
aPasteCutMap.find( nCut );
-if ( itCut == aMap.end() )
+if ( itCut != aPasteCutMap.end() )
+{
+OSL_ENSURE( aMap.find( nCut ) ==
aMap.end(), ScChangeTrack::Undo: nCut dup );
+Append( itCut-second, nCut );
+aPasteCutMap.erase( itCut );
+}
+else
{
OSL_FAIL( ScChangeTrack::Undo: nCut not
found );
}
-
-Append( itCut-second, nCut );
-aPasteCutMap.erase( nCut );
}
EndBlockModify( nEnd );
ResetLastCut();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/helpex.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c9bc4a04064f15906ab94cd6c0b175609f3a2ad2
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Dec 21 21:22:31 2011 +0100
rtl::OString::copy with count too large raises assert.
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index 1925285..2680c59 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -213,10 +213,10 @@ int _cdecl main( int argc, char *argv[] )
}else if ( sOutputFileX.getLength() sOutputFileY.getLength()
hasInputList ) { // Merge multiple files ?
if ( bMergeMode ){
-ifstream aFStream( sInputFile.copy( 1 , sInputFile.getLength()
).getStr() , ios::in );
+ifstream aFStream( sInputFile.copy( 1 ).getStr() , ios::in );
if( !aFStream ){
-cerr ERROR: - helpex - Can't open the file
sInputFile.copy( 1 , sInputFile.getLength() ).getStr() \n;
+cerr ERROR: - helpex - Can't open the file
sInputFile.copy( 1 ).getStr() \n;
exit(-1);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/layout/paintfrm.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e09b9a635ee23ce162e1733fc804a2cc182bc25f
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Dec 21 22:09:46 2011 +0100
Header/Footer,Page Break: fix bad test for printing mode (fdo#43962)
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index c33da28..387d8a3 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3323,7 +3323,7 @@ drawinglayer::primitive2d::Primitive2DSequence
lcl_CreateDashedIndicatorPrimitiv
void SwPageFrm::PaintBreak( ) const
{
-if ( !pGlobalShell-GetViewOptions()-IsPrinting()
+if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER
!pGlobalShell-GetViewOptions()-IsPDFExport()
!pGlobalShell-IsPreView() )
{
@@ -3358,7 +3358,7 @@ void SwPageFrm::PaintBreak( ) const
void SwColumnFrm::PaintBreak( ) const
{
-if ( !pGlobalShell-GetViewOptions()-IsPrinting()
+if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER
!pGlobalShell-GetViewOptions()-IsPDFExport()
!pGlobalShell-IsPreView() )
{
@@ -3465,7 +3465,7 @@ void SwPageFrm::PaintDecorators( ) const
{
SwRect aBodyRect( pBody-Frm() );
-if ( !pGlobalShell-GetViewOptions()-IsPrinting()
+if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER
!pGlobalShell-GetViewOptions()-IsPDFExport()
!pGlobalShell-IsPreView()
pGlobalShell-IsShowHeaderFooterSeparator( ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/layout/paintfrm.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5e772cda4008fc26bdbd015041d40806b5c339f0
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Dec 21 22:09:46 2011 +0100
Header/Footer,Page Break: fix bad test for printing mode (fdo#43962)
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index c33da28..387d8a3 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3323,7 +3323,7 @@ drawinglayer::primitive2d::Primitive2DSequence
lcl_CreateDashedIndicatorPrimitiv
void SwPageFrm::PaintBreak( ) const
{
-if ( !pGlobalShell-GetViewOptions()-IsPrinting()
+if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER
!pGlobalShell-GetViewOptions()-IsPDFExport()
!pGlobalShell-IsPreView() )
{
@@ -3358,7 +3358,7 @@ void SwPageFrm::PaintBreak( ) const
void SwColumnFrm::PaintBreak( ) const
{
-if ( !pGlobalShell-GetViewOptions()-IsPrinting()
+if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER
!pGlobalShell-GetViewOptions()-IsPDFExport()
!pGlobalShell-IsPreView() )
{
@@ -3465,7 +3465,7 @@ void SwPageFrm::PaintDecorators( ) const
{
SwRect aBodyRect( pBody-Frm() );
-if ( !pGlobalShell-GetViewOptions()-IsPrinting()
+if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER
!pGlobalShell-GetViewOptions()-IsPDFExport()
!pGlobalShell-IsPreView()
pGlobalShell-IsShowHeaderFooterSeparator( ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/prj
binfilter/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a51112e20353448245e140500c38066590ff Author: Peter Foley pefol...@verizon.net Date: Wed Dec 21 19:21:41 2011 -0500 make binfilter depend on tail_build instead of basic When feature/gbuild_extensions is merged to master basic will be included in tail_build. To avoid a build failure in binfilter after the merge this patch makes binfilter depend on tail_build since tail_build depends on and will soon include basic. diff --git a/binfilter/prj/build.lst b/binfilter/prj/build.lst index d264514..11bd302 100644 --- a/binfilter/prj/build.lst +++ b/binfilter/prj/build.lst @@ -1,4 +1,4 @@ -bf binfilter : basic vcl xmlscript connectivity framework svtools offapi LIBXSLT:libxslt NULL +bf binfilter : tail_build vcl xmlscript connectivity framework svtools offapi LIBXSLT:libxslt NULL bf binfilter usr1- all bf_mkout NULL bf binfilter\bf_svtools\source\inc get - all bf_svt_sinc NULL bf binfilter\bf_svtools\source\config nmake - all bf_svt_config NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - Module_tail_build.mk tail_build/prj
Module_tail_build.mk |1 + tail_build/prj/build.lst |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 79b252a56db8f1c2159d3269de415ffe2f2d9bb1 Author: Peter Foley pefol...@verizon.net Date: Wed Dec 21 19:37:48 2011 -0500 add framework to tail_build diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 764b9fc..df73553 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ filter \ forms \ formula \ +framework \ hwpfilter \ idl \ lingucomponent \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 87ca96d..f1ef4f8 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker framework javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL +tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL tb tail_build\prj nmake - all tb_prj NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/inc writerfilter/source
writerfilter/inc/resourcemodel/TagLogger.hxx| 11 +++
writerfilter/source/resourcemodel/TagLogger.cxx | 69
2 files changed, 80 insertions(+)
New commits:
commit acfdec468d54d44f94ca6752bbbfbdab07ef9a0c
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Dec 22 01:46:33 2011 +0100
writerfilter: fix dbglevel=2 build
This basically reverts e8f980d10cf95b8bced1ca18a55b2a4784f6dcc9 and
b0e993d42e1df8c68c4c2684ab9dda27a1329594, while keeping callcatcher
happy.
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx
b/writerfilter/inc/resourcemodel/TagLogger.hxx
index 44dc901..f5ca4eb 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -73,7 +73,18 @@ namespace writerfilter
void element(const std::string name);
void unoPropertySet(uno::Referencebeans::XPropertySet rPropSet);
#endif
+#if OSL_DEBUG_LEVEL 1
+void startElement(const std::string name);
+#endif
void attribute(const std::string name, const std::string value);
+#if OSL_DEBUG_LEVEL 1
+void attribute(const std::string name, const ::rtl::OUString
value);
+void attribute(const std::string name, sal_uInt32 value);
+void attribute(const std::string name, const uno::Any aAny);
+void chars(const std::string chars);
+void chars(const ::rtl::OUString chars);
+void endElement();
+#endif
#ifdef DEBUG_CONTEXT_HANDLER
void propertySet(writerfilter::ReferenceProperties::Pointer_t props,
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx
b/writerfilter/source/resourcemodel/TagLogger.cxx
index dcdd461..7ee16fe 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -156,6 +156,15 @@ namespace writerfilter
#endif
+#if OSL_DEBUG_LEVEL 1
+void TagLogger::startElement(const string name)
+{
+xmlChar* xmlName = xmlCharStrdup( name.c_str() );
+xmlTextWriterStartElement( pWriter, xmlName );
+xmlFree( xmlName );
+}
+#endif
+
void TagLogger::attribute(const string name, const string value)
{
xmlChar* xmlName = xmlCharStrdup( name.c_str() );
@@ -166,6 +175,66 @@ namespace writerfilter
xmlFree( xmlName );
}
+#if OSL_DEBUG_LEVEL 1
+void TagLogger::attribute(const string name, const ::rtl::OUString
value)
+{
+attribute( name, OUStringToOString( value, RTL_TEXTENCODING_ASCII_US
).getStr() );
+}
+
+void TagLogger::attribute(const string name, sal_uInt32 value)
+{
+xmlChar* xmlName = xmlCharStrdup( name.c_str() );
+xmlTextWriterWriteFormatAttribute( pWriter, xmlName,
+ % SAL_PRIuUINT32, value );
+xmlFree( xmlName );
+}
+
+void TagLogger::attribute(const string name, const uno::Any aAny)
+{
+string aTmpStrInt;
+string aTmpStrFloat;
+string aTmpStrString;
+
+sal_Int32 nInt = 0;
+float nFloat = 0.0;
+::rtl::OUString aStr;
+
+xmlChar* xmlName = xmlCharStrdup( name.c_str() );
+if ( aAny = nInt )
+{
+xmlTextWriterWriteFormatAttribute( pWriter, xmlName,
+ % SAL_PRIdINT32, nInt );
+}
+else if ( aAny = nFloat )
+{
+xmlTextWriterWriteFormatAttribute( pWriter, xmlName,
+ %f, nFloat );
+}
+else if ( aAny = aStr )
+{
+attribute( name, aStr );
+}
+xmlFree( xmlName );
+}
+
+void TagLogger::chars(const string rChars)
+{
+xmlChar* xmlChars = xmlCharStrdup( rChars.c_str() );
+xmlTextWriterWriteString( pWriter, xmlChars );
+xmlFree( xmlChars );
+}
+
+void TagLogger::chars(const ::rtl::OUString rChars)
+{
+chars(OUStringToOString(rChars, RTL_TEXTENCODING_ASCII_US).getStr());
+}
+
+void TagLogger::endElement()
+{
+xmlTextWriterEndElement( pWriter );
+}
+#endif
+
#ifdef DEBUG_CONTEXT_HANDLER
class PropertySetDumpHandler : public Properties
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/dmapper/GraphicImport.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 1c84402c87142f1f473c08dbac926a683f86f067
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Dec 22 02:19:00 2011 +0100
fdo#40937 fix RTF import of images with invalid crop data
Add a try-catch, so in case setting crop data fails, the size data will
be still set.
(cherry picked from commit 3c86591749aae36f997944d9c972d1c71b21bc7b)
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 744361d..2bb6693 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1475,8 +1475,17 @@ uno::Reference text::XTextContent
GraphicImport::createGraphicObject( const b
lcl_CalcCrop( m_pImpl-nRightCrop, aGraphicSize.Width );
-
xGraphicProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_GRAPHIC_CROP ),
-uno::makeAny(text::GraphicCrop(m_pImpl-nTopCrop,
m_pImpl-nBottomCrop, m_pImpl-nLeftCrop, m_pImpl-nRightCrop)));
+// We need a separate try-catch here, otherwise a bad crop
setting will also nuke the size settings as well.
+try
+{
+
xGraphicProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_GRAPHIC_CROP ),
+
uno::makeAny(text::GraphicCrop(m_pImpl-nTopCrop, m_pImpl-nBottomCrop,
m_pImpl-nLeftCrop, m_pImpl-nRightCrop)));
+}
+catch (const uno::Exception e)
+{
+clog __FILE__ : __LINE__ failed.
Message :;
+clog rtl::OUStringToOString (e.Message,
RTL_TEXTENCODING_UTF8).getStr() endl;
+}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: avmedia/Library_avmediawin.mk
avmedia/Library_avmediawin.mk |4 1 file changed, 4 insertions(+) New commits: commit 881ea5470aa45c90a3a4b20d5126095ab353acc3 Author: Peter Foley pefol...@verizon.net Date: Wed Dec 21 20:56:34 2011 -0500 fix build with msvc diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index bf09a03..df0e5d8 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -35,6 +35,10 @@ $(eval $(call gb_Library_set_include,avmediawin,\ -I$(realpath $(SRCDIR)/avmedia/source/inc) \ )) +$(eval $(call gb_Library_add_defs,avmediawin,\ + -DNOMINMAX \ +)) + $(eval $(call gb_Library_add_api,avmediawin,\ udkapi \ offapi \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
