[Libreoffice-commits] .: smoketest/CppunitTest_smoketest.mk
smoketest/CppunitTest_smoketest.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 9bbc7cf94a05ce71c34421816005fae1692fb5bd Author: David Tardon dtar...@redhat.com Date: Tue Apr 10 11:52:36 2012 +0200 get subsequentcheck unstuck diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index 16a6ea3..0fc2ab5 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -48,6 +48,8 @@ else my_soffice:=path:$(OUTDIR)/installation/opt/program/soffice endif +$(eval $(call gb_CppunitTest_use_ure,smoketest)) + $(eval $(call gb_CppunitTest_add_arguments,smoketest,\ -env:arg-soffice=$(my_soffice) \ -env:arg-user=$(WORKDIR)/CustomTarget/smoketest \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - android/experiments redland/raptor redland/rasqal redland/redland
android/experiments/DocumentLoader/Makefile | 10 ++
redland/raptor/makefile.mk|4
redland/raptor/raptor-1.4.18.patch.no-soname | 11 +++
redland/rasqal/makefile.mk|3 +++
redland/rasqal/rasqal-0.9.16.patch.no-soname | 11 +++
redland/redland/makefile.mk |3 +++
redland/redland/redland-1.0.8.patch.no-soname | 11 +++
7 files changed, 53 insertions(+)
New commits:
commit 34592de6135e88ccf0172229b55c864584ac9fa9
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Apr 10 12:52:55 2012 +0300
More libraries
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index 0c1e666..5dea15a 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -52,6 +52,8 @@ copy-stuff:
comphelpgcc3 \
datelo \
dbaxmllo \
+ dbtoolslo \
+ evtattlo \
expwrap.uno \
fastsax.uno \
fileacc \
@@ -60,6 +62,7 @@ copy-stuff:
foruilo \
freetype \
frmlo \
+ fsstorage.uno \
gcc3_uno \
hwplo \
i18nisolang1gcc3 \
@@ -77,6 +80,7 @@ copy-stuff:
jvmaccessgcc3 \
jvmfwk \
lo-bootstrap \
+ localebe1.uno \
localedata_en \
localedata_others \
lwpftlo \
@@ -84,6 +88,9 @@ copy-stuff:
msfilterlo \
msworkslo \
ooxlo \
+ raptor \
+ rasqal \
+ rdf \
reflection.uno \
reg \
saxlo \
@@ -108,6 +115,7 @@ copy-stuff:
uno_sal \
uno_salhelpergcc3 \
uno_cppuhelpergcc3 \
+ unordflo \
unoxmllo \
utllo \
vbahelperlo \
@@ -118,6 +126,8 @@ copy-stuff:
xml2 \
xmlfdlo \
xmlreader \
+ xmlsecurity \
+ xslt \
xstor \
); do \
$(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
commit ed1db9186336e11de293b9c74c08e0284e8a1702
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Apr 10 12:33:59 2012 +0300
No sonames on Android
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index a2a3bd3..54a46ab 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -75,6 +75,10 @@ PATCH_FILES+=raptor-1.4.18.libxml.patch
PATCH_FILES+=raptor-1.4.18.libxslt.patch
.ENDIF
+.IF $(OS)==ANDROID
+PATCH_FILES+=$(TARFILE_NAME).patch.no-soname
+.ENDIF
+
.IF $(OS)==WNT
.IF $(COM)==GCC
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
diff --git a/redland/raptor/raptor-1.4.18.patch.no-soname
b/redland/raptor/raptor-1.4.18.patch.no-soname
new file mode 100644
index 000..66d1eff
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.no-soname
@@ -0,0 +1,11 @@
+--- misc/raptor-1.4.18/configure
misc/build/raptor-1.4.18/configure
+@@ -7848,7 +7848,7 @@
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+- archive_cmds='$CC '$tmp_sharedflag$tmp_addflag' $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_cmds='$CC '$tmp_sharedflag$tmp_addflag' $libobjs $deplibs
$compiler_flags -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds='$echo { global: $output_objdir/$libname.ver~
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 6f356db..dabaf78 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -61,6 +61,9 @@ OOO_PATCH_FILES= \
PATCH_FILES=$(OOO_PATCH_FILES)
+.IF $(OS)==ANDROID
+PATCH_FILES+=$(TARFILE_NAME).patch.no-soname
+.ENDIF
.IF $(OS)==WNT
.IF $(COM)==GCC
diff --git a/redland/rasqal/rasqal-0.9.16.patch.no-soname
b/redland/rasqal/rasqal-0.9.16.patch.no-soname
new file mode 100644
index 000..08c54ac
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.no-soname
@@ -0,0 +1,11 @@
+--- misc/rasqal-0.9.16/configure
misc/build/rasqal-0.9.16/configure
+@@ -7848,7 +7848,7 @@
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+- archive_cmds='$CC '$tmp_sharedflag$tmp_addflag' $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_cmds='$CC '$tmp_sharedflag$tmp_addflag' $libobjs $deplibs
$compiler_flags -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds='$echo { global: $output_objdir/$libname.ver~
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
[Libreoffice-commits] .: sfx2/source sw/source xmloff/source
sfx2/source/doc/sfxbasemodel.cxx| 13 -
sw/source/core/swg/SwXMLTextBlocks1.cxx |2 +-
xmloff/source/meta/xmlversion.cxx |2 +-
3 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 1ae4c87367d1719a100b61eb694a7a186d2e8d6b
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Apr 10 12:40:00 2012 +0200
char[] - const char[].
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5ec029e..02a4b9a 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3402,17 +3402,12 @@ uno::Reference ui::XUIConfigurationManager SAL_CALL
SfxBaseModel::getUIConfig
{
SfxObjectShell* pObjShell =
SfxBaseModel::GetObjectShell();
-char aNum[] =
private:resource/toolbar/custom_OOo1x_0;
-char aTitle[] = Toolbar 0;
-sal_Int32 nNumIndex = strlen( aNum )-1;
-sal_Int32 nTitleIndex = strlen( aTitle )-1;
+rtl::OUString aNum(
private:resource/toolbar/custom_OOo1x_ );
+rtl::OUString aTitle( Toolbar );
for ( sal_Int32 i = 0; i rToolbars.getLength(); i++ )
{
-aNum[nNumIndex]++;
-aTitle[nTitleIndex]++;
-
-rtl::OUString aCustomTbxName(
RTL_CONSTASCII_USTRINGPARAM( aNum ));
-rtl::OUString aCustomTbxTitle(
RTL_CONSTASCII_USTRINGPARAM( aTitle ));
+rtl::OUString aCustomTbxName = aNum +
rtl::OUString::valueOf( i + 1 );
+rtl::OUString aCustomTbxTitle = aTitle +
rtl::OUString::valueOf( i + 1 );
uno::Reference container::XIndexContainer
xToolbar = rToolbars[i];
ConvertSlotsToCommands( pObjShell, xToolbar );
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx
b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 62a2494..3a20eb8 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -50,7 +50,7 @@
#define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE |
STREAM_NOCREATE )
#define STREAM_STGWRITE ( STREAM_READ | STREAM_WRITE | STREAM_SHARE_DENYWRITE )
-sal_Char XMLN_BLOCKLIST[] = BlockList.xml;
+const char XMLN_BLOCKLIST[] = BlockList.xml;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/meta/xmlversion.cxx
b/xmloff/source/meta/xmlversion.cxx
index 9b2cb9d..3940fdd 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -48,7 +48,7 @@ using ::rtl::OUString;
//
-sal_Char XMLN_VERSIONSLIST[] = VersionList.xml;
+const char XMLN_VERSIONSLIST[] = VersionList.xml;
//
// #110897#
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source sal/inc sdext/source slideshow/source svx/source
connectivity/source/commontools/RowFunctionParser.cxx|
2 -
sal/inc/osl/diagnose.hxx |
13
sdext/source/presenter/PresenterAccessibility.cxx|
16 +-
slideshow/source/engine/animationnodes/animationbasenode.cxx |
2 -
slideshow/source/engine/animationnodes/animationbasenode.hxx |
2 -
slideshow/source/engine/animationnodes/animationcolornode.hxx|
2 -
slideshow/source/engine/animationnodes/animationnodefactory.cxx |
2 -
slideshow/source/engine/animationnodes/animationpathmotionnode.hxx |
2 -
slideshow/source/engine/animationnodes/animationsetnode.hxx |
2 -
slideshow/source/engine/animationnodes/animationtransformnode.hxx|
2 -
slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx |
2 -
slideshow/source/engine/animationnodes/basecontainernode.cxx |
2 -
slideshow/source/engine/animationnodes/basecontainernode.hxx |
2 -
slideshow/source/engine/animationnodes/basenode.cxx |
2 -
slideshow/source/engine/animationnodes/basenode.hxx |
2 -
slideshow/source/engine/animationnodes/nodetools.cxx |
2 -
slideshow/source/engine/animationnodes/nodetools.hxx |
4 +-
slideshow/source/engine/animationnodes/paralleltimecontainer.hxx |
2 -
slideshow/source/engine/animationnodes/propertyanimationnode.hxx |
2 -
slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx |
2 -
slideshow/source/engine/shapes/viewshape.cxx |
2 -
slideshow/source/engine/slideshowimpl.cxx|
2 -
slideshow/source/engine/slideview.cxx|
6 +--
slideshow/source/engine/smilfunctionparser.cxx |
2 -
slideshow/source/inc/animationnodefactory.hxx|
2 -
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx|
2 -
26 files changed, 43 insertions(+), 40 deletions(-)
New commits:
commit 20662349e1b9f82c7cd372a06cba9fc4c750b723
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Apr 10 13:34:48 2012 +0200
disable clang warning about something that cannot be fixed without BIC
change
diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index 840f7a3..95f5093 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -70,8 +70,21 @@ SAL_DLLPUBLIC void SAL_CALL
osl_detail_ObjectRegistry_revokeObject(
::osl::detail::ObjectRegistryData rData, void const* pObj )
SAL_THROW_EXTERN_C();
+// These functions presumably should not be extern C, but changing
+// that would break binary compatibility.
+#if SUPD 400
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored -Wreturn-type-c-linkage
+#endif
+#endif
SAL_DLLPUBLIC ::osl::Mutex SAL_CALL osl_detail_ObjectRegistry_getMutex()
SAL_THROW_EXTERN_C();
+#if SUPD 400
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+#endif
} // extern C
commit 912e36e911201742633e7c0a0a56f247735ee09c
Author: Rob Snelders programm...@ertai.nl
Date: Thu Apr 5 22:40:21 2012 +0200
Remove VERBOSE part 3
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx
b/connectivity/source/commontools/RowFunctionParser.cxx
index 077f9bd..0bb5f60 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -32,7 +32,7 @@
// But watch out, the parser might have
// state not visible to this code!
#define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
-#if defined(VERBOSE) defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL = 2 defined(DBG_UTIL)
#include typeinfo
#define BOOST_SPIRIT_DEBUG
#endif
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx
b/sdext/source/presenter/PresenterAccessibility.cxx
index 18ba0e7..ff90539 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -59,8 +59,6 @@ using ::rtl::OUString;
#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)))
-#define VERBOSE
-
//= PresenterAccessibleObject =
namespace sdext { namespace presenter {
@@ -784,12 +782,8 @@ void SAL_CALL PresenterAccessible::focusGained (const
css::awt::FocusEvent rEve
throw (cssu::RuntimeException)
{
(void)rEvent;
-
-#ifdef VERBOSE
-OSL_TRACE(PresenterAccessible::focusGained at %x and window %x\r, this,
-mxMainWindow.get());
-#endif
-
+SAL_INFO(sdext.presenter, OSL_THIS_FUNC :
PresenterAccessible::focusGained at this
+ and window mxMainWindow.get());
[Libreoffice-commits] .: 3 commits - solenv/gbuild sw/inc sw/source
solenv/gbuild/UnoApiTarget.mk |6 +++---
sw/inc/editsh.hxx |1 -
sw/source/core/edit/edattr.cxx |1 +
sw/source/ui/shells/textsh1.cxx |8 +---
4 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 37af4b002422f889ceecc21474a4b049f516b72e
Author: Aldo Román Nureña aldo.roman.nur...@gmail.com
Date: Sun Apr 8 23:39:12 2012 -0500
fdo#35042: previous color applied instead of no fill
There was a missing line when last select highlight color was no fill
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 1e8ef39..9cb232b 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1120,15 +1120,17 @@ void SwTextShell::Execute(SfxRequest rReq)
if(pItem)
{
aSet = ((const SvxColorItem*)pItem)-GetValue();
-rEdtWin.SetTextBackColor(aSet);
+rEdtWin.SetTextBackColor(aSet); //select last color
}
+else
+rEdtWin.SetTextBackColor(Color(COL_TRANSPARENT)); //if last
was no fill
if(!pApply (rWrtSh.HasSelection() || rReq.IsAPI()))
{
SvxBrushItem aBrushItem(RES_CHRATR_BACKGROUND);
if(pItem)
-aBrushItem.SetColor(aSet);
+aBrushItem.SetColor(aSet); //set the selected color
else
-aBrushItem.SetColor(Color(COL_TRANSPARENT));
+aBrushItem.SetColor(Color(COL_TRANSPARENT));//set no
fill color
rWrtSh.SetAttr( aBrushItem );
}
else if(!pApply || pApply-nColor !=
SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
commit 2dca19256f28b04aed07c63f10ba07c16ff81542
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 10 13:03:01 2012 +0200
move include out of editsh.hxx
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 051d39a..ecb77d5 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -44,7 +44,6 @@
#include tblenum.hxx
#include IMark.hxx
-#include algorithm
#include vector
#include set
#include swundo.hxx
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 8ccb5d3..d2b7a70 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -56,6 +56,7 @@
#include charfmt.hxx // #i27615#
#include numrule.hxx
+#include algorithm
/*
* harte Formatierung (Attribute)
commit 7042f9bc5b4bdf64555ce7313425702594cdb7e2
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 10 12:00:31 2012 +0200
UnoApiTarget.mk: whitespace
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 02d2391..64ed831 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -196,7 +196,7 @@ $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) :| \
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES += $(2)/$(3).idl
$(call gb_UnoApiTarget_get_dep_target,$(1)) : \
- $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))
+ $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))
$(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) : \
$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done)
endif
@@ -301,10 +301,10 @@ $(call gb_UnoApiHeadersTarget_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs_native,\
rm -rf \
$(call gb_UnoApiHeadersTarget_get_dir,$*) \
- $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \
+ $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \
$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*)
\
$(call gb_UnoApiHeadersTarget_get_target,$*) \
- $(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*))
\
+ $(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*))
\
$(call
gb_UnoApiHeadersTarget_get_comprehensive_target,$*)
define gb_UnoApiHeadersTarget_UnoApiHeadersTarget
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - binfilter/bf_sch binfilter/bf_svtools binfilter/bf_sw binfilter/inc
binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx |5
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 426
binfilter/bf_svtools/source/misc/tl_tstring.cxx | 94 ---
binfilter/bf_svtools/source/misc/tl_tustring.cxx| 426
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 30 -
binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx | 12
binfilter/inc/bf_sw/iodetect.hxx|2
binfilter/inc/bf_tools/string.hxx | 64 --
8 files changed, 454 insertions(+), 605 deletions(-)
New commits:
commit c1ed15532ca066c67d05432c3e2f99c7feccbaf9
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 10 12:49:13 2012 +0100
WaE: msvc potentially used uninitialized
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 4cd3f56..b8e0722 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -1180,7 +1180,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType(
Sw3IoImp rIo )
/*N*/ pType = lcl_sw3io_InSetExpFieldType( rIo );
/*N*/ else
/*N*/ {
-/*N*/ USHORT nPoolId;
+/*N*/ USHORT nPoolId=0;
/*N*/ *rIo.pStrm nPoolId;
/*N*/
/*N*/ // fix #26064#: Namen der 3 Label-Numernkreise: Hier wird die
@@ -1196,8 +1196,8 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType(
Sw3IoImp rIo )
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ UINT16 nSeqNo;
-/*N*/ BYTE cFlags;
+/*N*/ UINT16 nSeqNo=0;
+/*N*/ BYTE cFlags=0;
/*N*/ String aFormula, aExpand, aPrompt;
/*N*/ *rIo.pStrm cFlags;
/*N*/ rIo.InString( *rIo.pStrm, aFormula );
@@ -1256,8 +1256,8 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType(
Sw3IoImp rIo )
/*N*/ {
/*N*/ pType = 0;
/*N*/
-/*N*/ BYTE cFlags;
-/*N*/ UINT16 nPoolId, nSeqNo=0, nSeqVal=0;
+/*N*/ BYTE cFlags=0;
+/*N*/ UINT16 nPoolId=0, nSeqNo=0, nSeqVal=0;
/*N*/ String aFormula, aPrompt, aExpand;
/*N*/ *rIo.pStrm cFlags nPoolId;
/*N*/ rIo.InString( *rIo.pStrm, aFormula );
@@ -1314,9 +1314,9 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType(
Sw3IoImp rIo )
/*N*/ SwField* lcl_sw3io_InHiddenParaField( Sw3IoImp rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32 )
/*N*/ {
-/*N*/ BYTE bHidden;
-/*N*/ String aCond;
+/*N*/ BYTE bHidden=FALSE;
/*N*/ *rIo.pStrm bHidden;
+/*N*/ String aCond;
/*N*/ rIo.InString( *rIo.pStrm, aCond );
/*N*/ SwHiddenParaField* pFld = new SwHiddenParaField(
(SwHiddenParaFieldType*)pType, aCond );
/*N*/ pFld-SetHidden( (BOOL) bHidden );
@@ -1326,7 +1326,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType(
Sw3IoImp rIo )
/*N*/ SwField* lcl_sw3io_InDocInfoField40( Sw3IoImp rIo, SwFieldType* pType,
/*N*/USHORT nSubType, UINT32 rFmt )
/*N*/ {
-/*N*/ UINT16 nSub;
+/*N*/ UINT16 nSub=0;
/*N*/ *rIo.pStrm nSub;
/*N*/ nSubType |= nSub;
/*N*/
@@ -1338,12 +1338,12 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType(
Sw3IoImp rIo )
/*N*/ SwField* lcl_sw3io_InDocInfoField( Sw3IoImp rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32 rFmt )
/*N*/ {
-/*N*/ BYTE cFlags;
/*N*/ SwDocInfoField *pFld = new SwDocInfoField( (SwDocInfoFieldType*)pType,
/*N*/ nSubType, rFmt );
/*N*/
-/*N*/ String aContent;
+/*N*/ BYTE cFlags=FALSE;
/*N*/ *rIo.pStrm cFlags;
+/*N*/ String aContent;
/*N*/ rIo.InString( *rIo.pStrm, aContent );
/*N*/ pFld-SetExpansion(aContent);
/*N*/ if( cFlags 0x01 )
@@ -1415,9 +1415,9 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType(
Sw3IoImp rIo )
/*N*/ SwField* lcl_sw3io_InDBSetNumberField( Sw3IoImp rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32 )
/*N*/ {
-/*N*/ String aDBName;
-/*N*/ INT32 n;
+/*N*/ INT32 n=0;
/*N*/ *rIo.pStrm n;
+/*N*/ String aDBName;
/*N*/ if( rIo.IsVersion( SWG_MULTIDB, SWG_EXPORT31, SWG_DESKTOP40 ) )
/*N*/ {
/*N*/ USHORT nPoolId;
@@ -1436,8 +1436,8 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType(
Sw3IoImp rIo )
/*N*/USHORT, UINT32 )
/*N*/ {
/*N*/ String aData;
-/*N*/ UINT16 nSubType;
/*N*/ rIo.InString( *rIo.pStrm, aData );
+/*N*/ UINT16 nSubType=0;
/*N*/ *rIo.pStrm nSubType;
/*N*/ SwExtUserField* pFld = new SwExtUserField( (SwExtUserFieldType*)pType,
nSubType );
/*N*/ ((SwExtUserFieldType*)pType)-SetData( aData );
@@ -1466,8 +1466,8 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType(
Sw3IoImp rIo )
/*N*/ SwField* lcl_sw3io_InRefPageSetField( Sw3IoImp rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32 )
/*N*/ {
-INT16 nOffset;
-BYTE cIsOn;
+INT16 nOffset=0;
+BYTE cIsOn=FALSE;
[Libreoffice-commits] .: unotools/inc
unotools/inc/unotools/bootstrap.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dcf24756e5b866a62639ade71df4352f1b8471b1 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 10 12:52:14 2012 +0100 fix typo diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index 922f417..d964cf3 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/unotools/inc/unotools/bootstrap.hxx @@ -62,7 +62,7 @@ namespace utl static rtl::OUString getBuildIdData(rtl::OUString const _sDefault); /// retrieve the BuildVersion information item; uses the given default, if not found -static rtl::OUString getBuildVersion(rtl::OUOUString const _sDefault); +static rtl::OUString getBuildVersion(rtl::OUString const _sDefault); /// reload cached data static void reloadData(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: slideshow/source
slideshow/source/engine/smilfunctionparser.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c8c911f129fd63450116ab95907f789301fce43 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 10 13:11:57 2012 +0100 fix build diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index c7f64cf..c1b630e 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -53,7 +53,7 @@ #endif #include boost/spirit/include/classic_core.hpp -#if OSL_DEBUG_LEVEL = 2 +#if OSL_DEBUG_LEVEL 0 #include iostream #endif #include functional ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/doc/docinf.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 628d2e71aca4a97723efe36bc398a06e36f199a8 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 10 13:13:24 2012 +0100 fix tinderbox diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index 3048a3e..136d9cf 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -241,7 +241,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( rGlobSect.SetFileTimeValue( PROPID_EDITTIME, aEditTime ); rGlobSect.SetStringValue( PROPID_REVNUMBER, -rtl::OUString::valueOf( i_xDocProps-getEditingCycles() ) ); +rtl::OUString::valueOf( static_castsal_Int32(i_xDocProps-getEditingCycles()) ) ); if ( i_pThumb i_pThumb-getLength() ) rGlobSect.SetThumbnailValue( PROPID_THUMBNAIL, *i_pThumb ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/inc xmloff/source
xmloff/inc/xmloff/txtparae.hxx |6 ++
xmloff/source/text/txtparae.cxx | 92 ++--
2 files changed, 94 insertions(+), 4 deletions(-)
New commits:
commit 7a1c5e54afe4e4ef7e17c2e9c969cd41221edc28
Author: Brennan Vincent brenn...@email.arizona.edu
Date: Sun Apr 8 14:45:01 2012 -0700
Partial fix for bug 30711
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index 11e0140..c5d3e75 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.hxx
@@ -110,6 +110,9 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public
XMLStyleExport
::std::vector XMLTextListsHelper* maTextListsHelperStack;
enum FrameType { FT_TEXT, FT_GRAPHIC, FT_EMBEDDED, FT_SHAPE };
+public:
+
+enum FieldmarkType { NONE, TEXT, CHECK }; // Used for simulating
fieldmarks in OpenDocument 1.n Strict (for n = 2). CHECK currently ignored.
protected:
@@ -430,7 +433,8 @@ protected:
const ::com::sun::star::uno::Reference
::com::sun::star::text::XTextRange rTextRange,
sal_Bool bAutoStyles,
-bool rPrevCharWasSpace );
+bool rPrevCharWasSpace,
+FieldmarkType openFieldmarkType );
void exportListChange( const XMLTextNumRuleInfo rPrvInfo,
const XMLTextNumRuleInfo rNextInfo );
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 522d43f..922dce1 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2182,6 +2182,10 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
static OUString sMeta(RTL_CONSTASCII_USTRINGPARAM(InContentMetadata));
bool bPrevCharIsSpace = bPrvChrIsSpc;
+/* This is used for exporting to strict OpenDocument 1.2, in which case
traditional
+ * bookmarks are used instead of fieldmarks. */
+FieldmarkType openFieldMark = NONE;
+
while( rTextEnum-hasMoreElements() )
{
ReferenceXPropertySet xPropSet(rTextEnum-nextElement(), UNO_QUERY);
@@ -2196,7 +2200,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
if( sType.equals(sText))
{
exportTextRange( xTxtRange, bAutoStyles,
- bPrevCharIsSpace );
+ bPrevCharIsSpace, openFieldMark);
}
else if( sType.equals(sTextField))
{
@@ -2261,6 +2265,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
}
else if (sType.equals(sTextFieldStart))
{
+/* As of now, textmarks are a proposed extension to the
OpenDocument standard. */
if ( GetExport().getDefaultVersion() ==
SvtSaveOptions::ODFVER_LATEST )
{
ReferenceXNamed
xBookmark(xPropSet-getPropertyValue(sBookmark), UNO_QUERY);
@@ -2280,6 +2285,46 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
}
GetExport().EndElement(XML_NAMESPACE_FIELD,
XML_FIELDMARK_START, sal_False);
}
+/* The OpenDocument standard does not include support for
TextMarks for now, so use bookmarks instead. */
+else
+{
+Reference ::com::sun::star::text::XFormField
xFormField(xPropSet-getPropertyValue(sBookmark), UNO_QUERY);
+if (xFormField.is())
+{
+Reference ::com::sun::star::container::XNameAccess
xParameters(xFormField-getParameters(), UNO_QUERY);
+if (xParameters.is() xParameters-hasByName(Name))
+{
+const Any aValue = xParameters-getByName(Name);
+const Type aValueType = aValue.getValueType();
+if (aValueType == ::getCppuType((OUString*)0))
+{
+OUString sValue;
+aValue = sValue;
+GetExport().AddAttribute(XML_NAMESPACE_TEXT,
XML_NAME, sValue);
+}
+}
+GetExport().StartElement(XML_NAMESPACE_TEXT,
XML_BOOKMARK_START, sal_False);
+GetExport().EndElement(XML_NAMESPACE_TEXT,
XML_BOOKMARK_START, sal_False);
+const OUString sFieldType = xFormField-getFieldType();
+if (sFieldType == ODF_FORMTEXT)
+{
+openFieldMark = TEXT;
+}
+else if (sFieldType == ODF_FORMCHECKBOX)
+{
+openFieldMark = CHECK;
+}
+else
+{
+openFieldMark = NONE;
+}
+
[Libreoffice-commits] .: unusedcode.easy vbahelper/source
unusedcode.easy|2
vbahelper/source/vbahelper/vbafontbase.cxx | 62 -
2 files changed, 64 deletions(-)
New commits:
commit 231520e7bb996f5ec211ff7e4f64e20f112d8789
Author: Gábor Stefanik netrolller...@gmail.com
Date: Sat Apr 7 19:28:05 2012 +0200
Kill vbaFontBase::get/setUnderline
diff --git a/unusedcode.easy b/unusedcode.easy
index effe4e4..5611973 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -298,8 +298,6 @@ VCLXDevice::IsCreatedWithToolkit() const
VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
VCLXRadioButton::getFirstActionListener()
-VbaFontBase::getUnderline()
-VbaFontBase::setUnderline(com::sun::star::uno::Any const)
VbaFoundFilesEnum::SetFileList(com::sun::star::uno::Sequencertl::OUString)
VbaFoundFilesEnum::VbaFoundFilesEnum()
VclEventListeners2::~VclEventListeners2()
diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx
b/vbahelper/source/vbahelper/vbafontbase.cxx
index 3f681c6..59dc77f 100644
--- a/vbahelper/source/vbahelper/vbafontbase.cxx
+++ b/vbahelper/source/vbahelper/vbafontbase.cxx
@@ -276,66 +276,4 @@ VbaFontBase::setColor( const uno::Any _color ) throw
(uno::RuntimeException)
mxFont-setPropertyValue( VBAFONTBASE_PROPNAME( CharColor, TextColor
), XLRGBToOORGB(_color) );
}
-void SAL_CALL
-VbaFontBase::setUnderline( const uno::Any /*aValue*/ ) throw (
uno::RuntimeException )
-{
-/*
-// default
-sal_Int32 nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
-aValue = nValue;
-switch ( nValue )
-{
-// NOTE:: #TODO #FIMXE
-// xlUnderlineStyleDoubleAccounting xlUnderlineStyleSingleAccounting
-// don't seem to be supported in Openoffice.
-// The import filter converts them to single or double underlines as
appropriate
-// So, here at the moment we are similarly silently converting
-// xlUnderlineStyleSingleAccounting to xlUnderlineStyleSingle.
-
-case excel::XlUnderlineStyle::xlUnderlineStyleNone:
-nValue = awt::FontUnderline::NONE;
-break;
-case excel::XlUnderlineStyle::xlUnderlineStyleSingle:
-case excel::XlUnderlineStyle::xlUnderlineStyleSingleAccounting:
-nValue = awt::FontUnderline::SINGLE;
-break;
-case excel::XlUnderlineStyle::xlUnderlineStyleDouble:
-case excel::XlUnderlineStyle::xlUnderlineStyleDoubleAccounting:
-nValue = awt::FontUnderline::DOUBLE;
-break;
-default:
-throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Unknown value for Underline)), uno::Reference
uno::XInterface () );
-}
-
-mxFont-setPropertyValue( VBAFONTBASE_PROPNAME( CharUnderline,
FontUnderline ), uno::Any( nValue ) );
-*/
-
-}
-
-uno::Any SAL_CALL
-VbaFontBase::getUnderline() throw ( uno::RuntimeException )
-{
-sal_Int32 nValue = awt::FontUnderline::NONE;
-mxFont-getPropertyValue( VBAFONTBASE_PROPNAME( CharUnderline,
FontUnderline ) ) = nValue;
-/*
-switch ( nValue )
-{
-case awt::FontUnderline::DOUBLE:
-nValue = excel::XlUnderlineStyle::xlUnderlineStyleDouble;
-break;
-case awt::FontUnderline::SINGLE:
-nValue = excel::XlUnderlineStyle::xlUnderlineStyleSingle;
-break;
-case awt::FontUnderline::NONE:
-nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
-break;
-default:
-throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Unknown value retrieved for Underline) ),
uno::Reference uno::XInterface () );
-
-}
-*/
-return uno::makeAny( nValue );
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/inc canvas/source unusedcode.easy
canvas/inc/canvas/parametricpolypolygon.hxx |6 --
canvas/source/tools/parametricpolypolygon.cxx | 15 ---
unusedcode.easy |1 -
3 files changed, 22 deletions(-)
New commits:
commit c73f01822c40d8b7c928e3d6fd0729805cf58c07
Author: Gábor Stefanik netrolller...@gmail.com
Date: Sat Apr 7 21:18:39 2012 +0200
Remove unused constructor for ParametricPolyPolygon
diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx
b/canvas/inc/canvas/parametricpolypolygon.hxx
index d1f2d81..16a6916 100644
--- a/canvas/inc/canvas/parametricpolypolygon.hxx
+++ b/canvas/inc/canvas/parametricpolypolygon.hxx
@@ -149,12 +149,6 @@ namespace canvas
const ::basegfx::B2DPolygon
rGradientPoly,
GradientType
eType,
const ::com::sun::star::uno::Sequence
::com::sun::star::uno::Sequence doublecolors,
- const ::com::sun::star::uno::Sequence double
stops );
-ParametricPolyPolygon( const ::com::sun::star::uno::Reference
- ::com::sun::star::rendering::XGraphicDevice
rDevice,
- const ::basegfx::B2DPolygon
rGradientPoly,
- GradientType
eType,
- const ::com::sun::star::uno::Sequence
::com::sun::star::uno::Sequence doublecolors,
const ::com::sun::star::uno::Sequence double
stops,
double
nAspectRatio );
ParametricPolyPolygon( const ::com::sun::star::uno::Reference
diff --git a/canvas/source/tools/parametricpolypolygon.cxx
b/canvas/source/tools/parametricpolypolygon.cxx
index 45e9c0d..ea7675a 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -238,21 +238,6 @@ namespace canvas
const ::basegfx::B2DPolygon
rGradientPoly,
GradientType
eType,
const uno::Sequence
uno::Sequence double rColors,
- const uno::Sequence double
rStops ) :
-ParametricPolyPolygon_Base( m_aMutex ),
-mxDevice( rDevice ),
-maValues( rGradientPoly,
- rColors,
- rStops,
- 1.0,
- eType )
-{
-}
-
-ParametricPolyPolygon::ParametricPolyPolygon( const uno::Reference
rendering::XGraphicDevice rDevice,
- const ::basegfx::B2DPolygon
rGradientPoly,
- GradientType
eType,
- const uno::Sequence
uno::Sequence double rColors,
const uno::Sequence double
rStops,
double
nAspectRatio ) :
ParametricPolyPolygon_Base( m_aMutex ),
diff --git a/unusedcode.easy b/unusedcode.easy
index 5611973..6504e38 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -702,7 +702,6 @@ cairocanvas::CanvasHelper::flush() const
cairocanvas::CanvasHelper::getPalette()
cairocanvas::SpriteDeviceHelper::getSurface()
cairocanvas::TextLayout::draw(_cairo*)
-canvas::ParametricPolyPolygon::ParametricPolyPolygon(com::sun::star::uno::Referencecom::sun::star::rendering::XGraphicDevice
const, basegfx::B2DPolygon const,
canvas::ParametricPolyPolygon::GradientType,
com::sun::star::uno::Sequencecom::sun::star::uno::Sequencedouble const,
com::sun::star::uno::Sequencedouble const)
canvas::PropertySetHelper::PropertySetHelper(std::__debug::vectorcanvas::tools::ValueMapcanvas::PropertySetHelper::Callbacks::MapEntry,
std::allocatorcanvas::tools::ValueMapcanvas::PropertySetHelper::Callbacks::MapEntry
const)
canvas::createSurfaceProxyManager(boost::shared_ptrcanvas::IRenderModule
const)
canvas::tools::ElapsedTime::getTimeBase() const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 95803f44cfa0dc62b500e931e401e0593b0c3eae Author: Miklos Vajna vmik...@suse.cz Date: Tue Apr 10 15:42:23 2012 +0200 fdo#47802 fix crash on RTF import of shapes inside tables We already ignore textframes inside tables, the same should be done with textboxes till they can be handled properly. diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 6277004..729e569 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1128,7 +1128,11 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) m_aStates.top().nDestinationState = DESTINATION_SHAPE; break; case RTF_SHPINST: -m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION; +// Don't try to support shapes inside tables for now. +if (m_pCurrentBuffer != m_aTableBuffer) +m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION; +else +m_aStates.top().nDestinationState = DESTINATION_SKIP; break; case RTF_NESTTABLEPROPS: m_aStates.top().nDestinationState = DESTINATION_NESTEDTABLEPROPERTIES; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotest/source
unotest/source/cpp/officeconnection.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b37acfc09e9f24ca602bd1f9343b6af60d0656bc
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 10 16:30:05 2012 +0200
Obtain resolver before spawning process_ in setUp
...so that tearDown does not hang waiting for (idling) process_ to terminate
if setUp throws an exception when obtaining resolver.
diff --git a/unotest/source/cpp/officeconnection.cxx
b/unotest/source/cpp/officeconnection.cxx
index 3791ddd..e8ccd66 100644
--- a/unotest/source/cpp/officeconnection.cxx
+++ b/unotest/source/cpp/officeconnection.cxx
@@ -59,6 +59,9 @@ OfficeConnection::OfficeConnection(): process_(0) {}
OfficeConnection::~OfficeConnection() {}
void OfficeConnection::setUp() {
+css::uno::Reference css::bridge::XUnoUrlResolver resolver(
+css::bridge::UnoUrlResolver::create(
+cppu::defaultBootstrap_InitialComponentContext()));
rtl::OUString desc;
rtl::OUString argSoffice;
CPPUNIT_ASSERT(
@@ -119,9 +122,6 @@ void OfficeConnection::setUp() {
\soffice\ argument starts with neither \path:\ nor
\connect:\);
}
-css::uno::Reference css::bridge::XUnoUrlResolver resolver(
-css::bridge::UnoUrlResolver::create(
-cppu::defaultBootstrap_InitialComponentContext()));
for (;;) {
try {
context_ =
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/productversion.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4045e770193ae632aca7075105dda89686c597d6 Author: Petr Mladek pmla...@suse.cz Date: Tue Apr 10 16:25:19 2012 +0200 use x.y.z version also for desktop integration packages (fdo#47840) This version scheme is used for other packages as well. It is important for the desktop integration packages now because we started reseting buildid for each bugfix release (fdo#47840). This value is used also for the release number of Linux packages. diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 398241d..5a186bc 100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -45,7 +45,8 @@ PKGDIR=$(BIN) .INCLUDE : productversion.mk -PKGVERSION = $(PRODUCTVERSION) +PKGVERSION = $(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONMICRO) + # gnome-vfs treats everything behind the last '.' as an icon extension, # even though the icon_filename in '.keys' is specified as filename # without extension. Since it also does not know how to handle 2-writer ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: python/makefile.mk
python/makefile.mk |5 + 1 file changed, 5 insertions(+) New commits: commit b773045fa0470776e37731d5bb9805bfb0cc4a7e Author: Laurent Godard lgodard.li...@laposte.net Date: Tue Apr 10 16:07:47 2012 +0100 to find the headers and (static) library of our internal openssl diff --git a/python/makefile.mk b/python/makefile.mk index 3f35d4c..e66acb7 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -65,6 +65,11 @@ CONFIGURE_DIR= BUILD_DIR= MYCWD=$(shell @pwd)/$(INPATH)/misc/build +#we want to be sure we use our internal openssl if +#that's enabled +CC+:=-I$(SOLARINCDIR)$/external +python_LDFLAGS+=-L$(SOLARLIBDIR) + # CLFLAGS get overwritten in Makefile.pre.in .IF $(SYSBASE)!= CC+:=-I$(SYSBASE)$/usr$/include ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sysui/desktop
sysui/desktop/productversion.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 58e524761aabb4bfc214e0375aaa4ec94b3e8903 Author: Petr Mladek pmla...@suse.cz Date: Tue Apr 10 16:25:19 2012 +0200 use x.y.z version also for desktop integration packages (fdo#47840) This version scheme is used for other packages as well. It is important for the desktop integration packages now because we started reseting buildid for each bugfix release (fdo#47840). This value is used also for the release number of Linux packages. (cherry picked from commit 4045e770193ae632aca7075105dda89686c597d6) Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 398241d..5a186bc 100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -45,7 +45,8 @@ PKGDIR=$(BIN) .INCLUDE : productversion.mk -PKGVERSION = $(PRODUCTVERSION) +PKGVERSION = $(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONMICRO) + # gnome-vfs treats everything behind the last '.' as an icon extension, # even though the icon_filename in '.keys' is specified as filename # without extension. Since it also does not know how to handle 2-writer ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: python/makefile.mk
python/makefile.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit e6d4795e52643a8e940f79c1ee6510cc14fdfb38 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 10 16:45:48 2012 +0100 extra love for incompatible expat on macosx diff --git a/python/makefile.mk b/python/makefile.mk index e66acb7..5043b28 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -65,10 +65,12 @@ CONFIGURE_DIR= BUILD_DIR= MYCWD=$(shell @pwd)/$(INPATH)/misc/build +.IF $(SYSTEM_OPENSSL) != YES #we want to be sure we use our internal openssl if #that's enabled CC+:=-I$(SOLARINCDIR)$/external python_LDFLAGS+=-L$(SOLARLIBDIR) +.ENDIF # CLFLAGS get overwritten in Makefile.pre.in .IF $(SYSBASE)!= ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/inc/appoptio.hxx| 29 --
sc/inc/formulaopt.hxx | 124
sc/inc/sc.hrc |6
sc/inc/scmod.hxx |5
sc/source/core/tool/appoptio.cxx | 238
sc/source/core/tool/formulaopt.cxx | 361 +
sc/source/ui/app/scmod.cxx | 120 ++--
sc/source/ui/docshell/docsh3.cxx |4
sc/source/ui/docshell/docsh6.cxx | 20 +-
sc/source/ui/inc/docsh.hxx |3
sc/source/ui/optdlg/tpformula.cxx | 153 ---
12 files changed, 616 insertions(+), 448 deletions(-)
New commits:
commit bf0629e09d176555aaa10f60061b206103cc0295
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Tue Apr 10 00:09:40 2012 +0200
Grouping ScFormulaOptions
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 39d9c33..f640f05 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -177,6 +177,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/doubleref \
sc/source/core/tool/editutil \
sc/source/core/tool/filtopt \
+ sc/source/core/tool/formulaopt \
sc/source/core/tool/formulaparserpool \
sc/source/core/tool/formularesult \
sc/source/core/tool/hints \
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 7c69f88..b7f5fe8 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -91,26 +91,6 @@ public:
ScOptionsUtil::KeyBindingType GetKeyBindingType() const { return
meKeyBindingType; }
voidSetKeyBindingType( ScOptionsUtil::KeyBindingType e ) {
meKeyBindingType = e; }
-void SetFormulaSyntax( ::formula::FormulaGrammar::Grammar eGram ) {
eFormulaGrammar = eGram; }
-::formula::FormulaGrammar::Grammar GetFormulaSyntax() const { return
eFormulaGrammar; }
-
-void SetUseEnglishFuncName( bool bVal ) { bUseEnglishFuncName = bVal; }
-bool GetUseEnglishFuncName() const { return bUseEnglishFuncName; }
-
-void SetFormulaSepArg(const ::rtl::OUString rSep) { aFormulaSepArg =
rSep; }
-::rtl::OUString GetFormulaSepArg() const { return aFormulaSepArg; }
-
-void SetFormulaSepArrayRow(const ::rtl::OUString rSep) {
aFormulaSepArrayRow = rSep; }
-::rtl::OUString GetFormulaSepArrayRow() const { return
aFormulaSepArrayRow; }
-
-void SetFormulaSepArrayCol(const ::rtl::OUString rSep) {
aFormulaSepArrayCol = rSep; }
-::rtl::OUString GetFormulaSepArrayCol() const { return
aFormulaSepArrayCol; }
-
-void ResetFormulaSeparators();
-
-static void GetDefaultFormulaSeparators(rtl::OUString rSepArg,
rtl::OUString rSepArrayCol, rtl::OUString rSepArrayRow);
-static const LocaleDataWrapper GetLocaleDataWrapper();
-
const ScAppOptions operator= ( const ScAppOptions rOpt );
private:
@@ -133,12 +113,6 @@ private:
sal_Int32 nDefaultObjectSizeHeight;
sal_BoolmbShowSharedDocumentWarning;
ScOptionsUtil::KeyBindingType meKeyBindingType;
-bool bUseEnglishFuncName; // use English function name even if the
locale is not English.
-::formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar
used to switch different formula syntax
-
-::rtl::OUString aFormulaSepArg;
-::rtl::OUString aFormulaSepArrayRow;
-::rtl::OUString aFormulaSepArrayCol;
};
@@ -158,7 +132,6 @@ class ScAppCfg : public ScAppOptions
ScLinkConfigItemaSortListItem;
ScLinkConfigItemaMiscItem;
ScLinkConfigItemaCompatItem;
-ScLinkConfigItemaFormulaItem;
DECL_LINK( LayoutCommitHdl, void* );
DECL_LINK( InputCommitHdl, void* );
@@ -167,7 +140,6 @@ class ScAppCfg : public ScAppOptions
DECL_LINK( SortListCommitHdl, void* );
DECL_LINK( MiscCommitHdl, void* );
DECL_LINK( CompatCommitHdl, void* );
-DECL_LINK( FormulaCommitHdl, void* );
com::sun::star::uno::Sequencertl::OUString GetLayoutPropertyNames();
com::sun::star::uno::Sequencertl::OUString GetInputPropertyNames();
@@ -176,7 +148,6 @@ class ScAppCfg : public ScAppOptions
com::sun::star::uno::Sequencertl::OUString GetSortListPropertyNames();
com::sun::star::uno::Sequencertl::OUString GetMiscPropertyNames();
com::sun::star::uno::Sequencertl::OUString GetCompatPropertyNames();
-com::sun::star::uno::Sequencertl::OUString GetFormulaPropertyNames();
public:
ScAppCfg();
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
new file mode 100644
index 000..50d3b9c
--- /dev/null
+++ b/sc/inc/formulaopt.hxx
@@ -0,0 +1,124 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
[Libreoffice-commits] .: sc/source tools/inc tools/source
sc/source/filter/dif/difimp.cxx | 60 ++---
sc/source/filter/inc/dif.hxx|5 -
sc/source/ui/dbgui/asciiopt.cxx | 12 +--
sc/source/ui/dbgui/csvgrid.cxx | 25 +++
sc/source/ui/dbgui/csvtablebox.cxx |4 -
sc/source/ui/dbgui/scuiasciiopt.cxx |4 -
sc/source/ui/docshell/impex.cxx | 125 +---
sc/source/ui/inc/asciiopt.hxx |6 -
sc/source/ui/inc/csvcontrol.hxx |2
sc/source/ui/inc/csvgrid.hxx|4 -
sc/source/ui/inc/csvtablebox.hxx|2
sc/source/ui/inc/impex.hxx |9 +-
sc/source/ui/inc/scuiasciiopt.hxx |4 -
sc/source/ui/vba/vbarange.cxx |6 -
tools/inc/tools/stream.hxx | 67 +--
tools/source/stream/stream.cxx | 51 ++
16 files changed, 267 insertions(+), 119 deletions(-)
New commits:
commit 8cd05e9cf1152b21528c6f1a5bda3d949dc49791
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 10 18:30:07 2012 +0200
resolved fdo#48501 enable line size 64k in SvStream::Read*Line()
CSV and other text formats may come with line sizes 64k that so far were
truncated due to limitations in ByteString/UniString/String, even if one
line
consists of several fields that each are 64k.
Introduced additional SvStream methods that read into rtl::OString and
rtl::OUString and let SvStream::ReadUniOrByteStringLine() fill solely an
rtl::OUString.
Made Calc CSV import use those.
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 19189a1..1ffae6a 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -312,7 +312,7 @@ TOPIC DifParser::GetNextTopic( void )
};
STATE eS = S_START;
-String aLine;
+rtl::OUString aLine;
nVector = 0;
nVal = 0;
@@ -360,7 +360,7 @@ TOPIC DifParser::GetNextTopic( void )
break;
case S_VectorVal:
{
-const sal_Unicode* pCur = aLine.GetBuffer();
+const sal_Unicode* pCur = aLine.getStr();
pCur = ScanIntVal( pCur, nVector );
@@ -375,10 +375,11 @@ TOPIC DifParser::GetNextTopic( void )
}
break;
case S_Data:
-OSL_ENSURE( aLine.Len() = 2,
+OSL_ENSURE( aLine.getLength() = 2,
+GetNextTopic(): String ist zu kurz! );
-if( aLine.Len() 2 )
-aData = aLine.Copy( 1, aLine.Len() - 2 );
+OSL_ENSURE( aLine.getLength() - 2 = STRING_MAXLEN,
GetNextTopic(): line doesn't fit into data);
+if( aLine.getLength() 2 )
+aData = aLine.copy( 1, aLine.getLength() - 2 );
else
aData.Erase();
eS = S_END;
@@ -448,16 +449,16 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode*
pPossibleNumericData )
return eRet;
}
-bool DifParser::ReadNextLine( String rStr )
+bool DifParser::ReadNextLine( rtl::OUString rStr )
{
-if( aLookAheadLine.Len() == 0 )
+if( aLookAheadLine.isEmpty() )
{
return rIn.ReadUniOrByteStringLine( rStr, rIn.GetStreamCharSet() );
}
else
{
rStr = aLookAheadLine;
-aLookAheadLine.Erase();
+aLookAheadLine = rtl::OUString();
return true;
}
}
@@ -469,10 +470,10 @@ bool DifParser::LookAhead()
const sal_Unicode* pAktBuffer;
bool bValidStructure = false;
-OSL_ENSURE( aLookAheadLine.Len() == 0, *DifParser::LookAhead(): LookAhead
called twice in a row );
+OSL_ENSURE( aLookAheadLine.isEmpty(), *DifParser::LookAhead(): LookAhead
called twice in a row );
rIn.ReadUniOrByteStringLine( aLookAheadLine, rIn.GetStreamCharSet() );
-pAktBuffer = aLookAheadLine.GetBuffer();
+pAktBuffer = aLookAheadLine.getStr();
switch( *pAktBuffer )
{
@@ -493,7 +494,7 @@ bool DifParser::LookAhead()
}
break;
case '1': // String Data
-if( Is1_0( aLookAheadLine.GetBuffer() ) )
+if( Is1_0( aLookAheadLine.getStr() ) )
{
bValidStructure = true;
}
@@ -505,12 +506,12 @@ bool DifParser::LookAhead()
DATASET DifParser::GetNextDataset( void )
{
DATASET eRet = D_UNKNOWN;
-String aLine;
+rtl::OUString aLine;
const sal_Unicode* pAktBuffer;
ReadNextLine( aLine );
-pAktBuffer = aLine.GetBuffer();
+pAktBuffer = aLine.getStr();
switch( *pAktBuffer )
{
@@ -520,9 +521,9 @@ DATASET DifParser::GetNextDataset( void )
if( Is1_0( pAktBuffer ) )
{
ReadNextLine( aLine );
-if( IsBOT( aLine.GetBuffer() ) )
+if( IsBOT( aLine.getStr() ) )
eRet =
[Libreoffice-commits] .: sal/inc
sal/inc/osl/diagnose.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3082f7f06b261b951315f096afae34c6b571cc06 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Apr 10 20:11:08 2012 +0200 make OSL_ASSERT print the failed expression, not just OSL_ASSERT diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h index 9a6112b..f094abe 100644 --- a/sal/inc/osl/diagnose.h +++ b/sal/inc/osl/diagnose.h @@ -150,7 +150,7 @@ SAL_DLLPUBLIC pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugM #if OSL_DEBUG_LEVEL 0 #define OSL_ASSERT(c) \ -SAL_DETAIL_WARN_IF_FORMAT(!(c), legacy.osl, OSL_ASSERT) +SAL_DETAIL_WARN_IF_FORMAT(!(c), legacy.osl, OSL_ASSERT: %s, #c) #define OSL_ENSURE(c, m) SAL_DETAIL_WARN_IF_FORMAT(!(c), legacy.osl, %s, m) #define OSL_FAIL(m) SAL_DETAIL_WARN_IF_FORMAT(sal_True, legacy.osl, %s, m) #else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack solenv/bin
instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt |7
+++
instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt |7
+++
instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt |3 +++
solenv/bin/make_installer.pl|4
4 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit da2ec9aac3699c951c544a51acd6ab3aede706eb
Author: Andras Timar ati...@suse.com
Date: Tue Apr 10 20:45:46 2012 +0200
fdo#48411 Find install location during help pack install
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
new file mode 100644
index 000..85e9539
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
@@ -0,0 +1,7 @@
+Property Signature_
+s72s72
+AppSearch PropertySignature_
+INSTALLLOCATIONinstalluser
+INSTALLLOCATIONinstallmachine
+INSTALLLOCATIONinstalluserdev
+INSTALLLOCATIONinstallmachinedev
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
new file mode 100644
index 000..8a15810
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
@@ -0,0 +1,7 @@
+Signature_ RootKey NameType
+s72i2 s255S255I2
+RegLocator Signature_
+installuser1
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
+installmachine 2
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
+installuserdev 1
Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
+installmachinedev 2
Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
new file mode 100644
index 000..5004a55
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
@@ -0,0 +1,3 @@
+Signature FileNameMinVersion MaxVersion MinSize MaxSize
MinDate MaxDate Languages
+s72s255S20 S20 I4 I4 I4 I4 S255
+Signature Signature
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 21f2077..5cc8306 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1750,10 +1750,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
# adding the files from the binary directory into the binary table
installer::windows::binary::update_binary_table($languageidtdir,
$filesinproductlanguageresolvedarrayref, $binarytablefiles);
-# setting patch codes to detect installed products
-
-if (( $installer::globals::patch ) || (
$installer::globals::languagepack ) || ( $installer::globals::helppack ) || (
$allvariableshashref-{'PDFCONVERTER'} )) {
installer::windows::patch::update_patch_tables($languageidtdir,
$allvariableshashref); }
-
# Adding Windows Installer CustomActions
installer::windows::idtglobal::addcustomactions($languageidtdir,
$windowscustomactionsarrayref, $filesinproductlanguageresolvedarrayref);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |1
solenv/bin/modules/installer/windows/patch.pm | 155 --
2 files changed, 156 deletions(-)
New commits:
commit 13a7880bc0dfc1248f1fdc884ca257248bfad2bb
Author: Andras Timar ati...@suse.com
Date: Tue Apr 10 21:01:07 2012 +0200
remove unused installer::windows::patch module
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 5cc8306..baf4b08 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -77,7 +77,6 @@ use installer::windows::media;
use installer::windows::mergemodule;
use installer::windows::msiglobal;
use installer::windows::msp;
-use installer::windows::patch;
use installer::windows::property;
use installer::windows::removefile;
use installer::windows::registry;
diff --git a/solenv/bin/modules/installer/windows/patch.pm
b/solenv/bin/modules/installer/windows/patch.pm
deleted file mode 100644
index 5364641..000
--- a/solenv/bin/modules/installer/windows/patch.pm
+++ /dev/null
@@ -1,155 +0,0 @@
-#*
-#
-# 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.
-#
-#*
-
-package installer::windows::patch;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-
-# Creating the file Upgrade.idt dynamically
-# Content:
-# UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty
-
-
-sub update_patch_tables
-{
-my ($basedir, $allvariables) = @_;
-
-my $reglocatfile = ;
-my $appsearchfile = ;
-
-my $reglocatfilename = $basedir . $installer::globals::separator .
RegLocat.idt;
-my $appsearchfilename = $basedir . $installer::globals::separator .
AppSearc.idt;
-my $signaturefilename = $basedir . $installer::globals::separator .
Signatur.idt;
-
-if ( -f $reglocatfilename )
-{
-$reglocatfile = installer::files::read_file($reglocatfilename);
-}
-else
-{
-my @reglocattable = ();
-$reglocatfile = \@reglocattable;
-installer::windows::idtglobal::write_idt_header($reglocatfile,
reglocat);
-}
-
-if ( -f $appsearchfilename )
-{
-$appsearchfile = installer::files::read_file($appsearchfilename);
-}
-else
-{
-my @appsearchtable = ();
-$appsearchfile = \@appsearchtable;
-installer::windows::idtglobal::write_idt_header($appsearchfile,
appsearch);
-}
-
-if ( -f $signaturefilename )
-{
-$signaturefile = installer::files::read_file($signaturefilename);
-}
-else
-{
-my @signaturetable = ();
-$signaturefile = \@signaturetable;
-installer::windows::idtglobal::write_idt_header($signaturefile,
signatur);
-}
-
-# Writing content into this tables
-
-if ( ! $allvariables-{'PATCHCODEFILE'} ) {
installer::exiter::exit_program(ERROR: Variable PATCHCODEFILE must be defined
for Windows patches!, update_patch_tables); }
-my $patchcodesfilename = $installer::globals::idttemplatepath .
$installer::globals::separator . $allvariables-{'PATCHCODEFILE'};
-my $patchcodefile = installer::files::read_file($patchcodesfilename);
-
-my $number = 0;
-
-for ( my $i = 0; $i = $#{$patchcodefile}; $i++ )
-{
-my $oneline = ${$patchcodefile}[$i];
-
-if ( $oneline =~ /^\s*\#/ ) { next; } # this is a comment line
-if ( $oneline =~ /^\s*$/ ) { next; }
-
-my $code = ;
-if ( $oneline =~ /^\s*(\S+)\s/ ) { $code = $1; }
-
-foreach my $name ( sort keys %installer::globals::installlocations )
-{
-$number++;
-my $signature = dir . $number . user;
-my $rootvalue = 1;
-my $registryname = ;
-
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/filter.hxx |8 -
sc/source/filter/html/htmlexp.cxx |2
sc/source/filter/html/htmlimp.cxx |8 -
sc/source/filter/inc/eeimport.hxx |2
sc/source/filter/inc/ftools.hxx |6 -
sc/source/filter/inc/htmlimp.hxx |2
sc/source/filter/rtf/eeimpars.cxx |2
sc/source/ui/docshell/impex.cxx | 200 +++---
sc/source/ui/inc/impex.hxx| 94 -
9 files changed, 162 insertions(+), 162 deletions(-)
New commits:
commit dd6e7fb5b31d9801977e16d853963ddcf0794a27
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 10 21:03:26 2012 +0200
sal_Bool to bool
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index eb6229d..80dace2 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -88,7 +88,7 @@ class ScEEAbsImport {
virtual sal_uLong Read( SvStream rStream, const String rBaseURL ) = 0;
virtual ScRange GetRange() = 0;
virtual voidWriteToDocument(
-sal_Bool bSizeColsRows = false, double nOutputFactor = 1.0,
+bool bSizeColsRows = false, double nOutputFactor = 1.0,
SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
};
@@ -107,11 +107,11 @@ class ScFormatFilterPlugin {
const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32
nDifOption = SC_DIFOPT_EXCEL ) = 0;
virtual FltError ScImportRTF( SvStream, const String rBaseURL,
ScDocument*, ScRange rRange ) = 0;
virtual FltError ScImportHTML( SvStream, const String rBaseURL,
ScDocument*, ScRange rRange, double nOutputFactor = 1.0,
- sal_Bool bCalcWidthHeight = sal_True,
SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
+ bool bCalcWidthHeight = true,
SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
// various import helpers
virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange
rRange ) = 0;
-virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String
rBaseURL, const ScRange rRange, sal_Bool bCalcWidthHeight ) = 0;
+virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String
rBaseURL, const ScRange rRange, bool bCalcWidthHeight ) = 0;
virtual String GetHTMLRangeNameList( ScDocument* pDoc, const
String rOrigName ) = 0;
// various export filters
@@ -123,7 +123,7 @@ class ScFormatFilterPlugin {
sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
virtual FltError ScExportDif( SvStream, ScDocument*, const ScRange
rRange, const CharSet eDest,
sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
-virtual FltError ScExportHTML( SvStream, const String rBaseURL,
ScDocument*, const ScRange rRange, const CharSet eDest, sal_Bool bAll,
+virtual FltError ScExportHTML( SvStream, const String rBaseURL,
ScDocument*, const ScRange rRange, const CharSet eDest, bool bAll,
const String rStreamPath, String rNonConvertibleChars ) =
0;
virtual FltError ScExportRTF( SvStream, ScDocument*, const ScRange
rRange, const CharSet eDest ) = 0;
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index af0689a..a8aa11b 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -148,7 +148,7 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] =
//
FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream rStrm, const
String rBaseURL, ScDocument* pDoc,
-const ScRange rRange, const CharSet /*eNach*/, sal_Bool bAll,
+const ScRange rRange, const CharSet /*eNach*/, bool bAll,
const String rStreamPath, String rNonConvertibleChars )
{
ScHTMLExport aEx( rStrm, rBaseURL, pDoc, rRange, bAll, rStreamPath );
diff --git a/sc/source/filter/html/htmlimp.cxx
b/sc/source/filter/html/htmlimp.cxx
index 34b13ae..0b953ec 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -60,18 +60,18 @@
//
FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream rStream, const
String rBaseURL, ScDocument *pDoc,
-ScRange rRange, double nOutputFactor, sal_Bool bCalcWidthHeight,
SvNumberFormatter* pFormatter,
+ScRange rRange, double nOutputFactor, bool bCalcWidthHeight,
SvNumberFormatter* pFormatter,
bool bConvertDate )
{
ScHTMLImport aImp( pDoc, rBaseURL, rRange, bCalcWidthHeight );
FltError nErr = (FltError) aImp.Read( rStream, rBaseURL );
ScRange aR = aImp.GetRange();
rRange.aEnd = aR.aEnd;
-aImp.WriteToDocument( sal_True, nOutputFactor, pFormatter, bConvertDate );
+aImp.WriteToDocument( true, nOutputFactor, pFormatter, bConvertDate );
return nErr;
}
-ScEEAbsImport
[Libreoffice-commits] .: 4 commits - sc/source
sc/source/filter/excel/excform.cxx | 36 +++-
sc/source/filter/excel/read.cxx| 12 ++--
sc/source/filter/inc/imp_op.hxx|4 ++--
3 files changed, 27 insertions(+), 25 deletions(-)
New commits:
commit a7f07eab97d9f52431329cb96bc1bf5ebd7da13d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 10 15:01:19 2012 -0400
bnc#755775: Set numeric formula results when importing xls document.
Without this, calculation upon import may incorrectly show #VALUE!
in some cells when the iterative calculation option is turned on.
This is on par with what we do during the ods document import.
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 02ba65f..4fcf976 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -158,7 +158,9 @@ void ImportExcel::Formula(
{
if( eErr != ConvOK )
ExcelToSc::SetError( *pCell, eErr );
-(void)fCurVal;
+
+if (!rtl::math::isNan(fCurVal))
+pCell-SetHybridDouble(fCurVal);
}
GetXFRangeBuffer().SetXF( aScPos, nXF );
commit ff0314bf92cd300ddedad566ab0303ddf5e95c17
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 10 14:46:02 2012 -0400
Method signature cleanup.
Taking a reference to double makes no sense here. Plus the bool.
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 0279b41..02ba65f 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -111,8 +111,8 @@ void ImportExcel::Formula4()
}
-void ImportExcel::Formula( const XclAddress rXclPos,
-sal_uInt16 nXF, sal_uInt16 nFormLen, double rCurVal, sal_Bool bShrFmla )
+void ImportExcel::Formula(
+const XclAddress rXclPos, sal_uInt16 nXF, sal_uInt16 nFormLen, double
fCurVal, bool bShrFmla)
{
ConvErr eErr = ConvOK;
@@ -158,7 +158,7 @@ void ImportExcel::Formula( const XclAddress rXclPos,
{
if( eErr != ConvOK )
ExcelToSc::SetError( *pCell, eErr );
-(void)rCurVal;
+(void)fCurVal;
}
GetXFRangeBuffer().SetXF( aScPos, nXF );
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 57a3374..fc56de7 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -184,8 +184,8 @@ protected:
voidBof5( void ); // 0x0809
// ---
-voidFormula( const XclAddress rXclPos,
-sal_uInt16 nXF, sal_uInt16 nFormLen, double
rCurVal, sal_Bool bShrFmla );
+void Formula(
+const XclAddress rXclPos, sal_uInt16 nXF, sal_uInt16 nFormLen, double
fCurVal, bool bShrFmla);
// - excform.cxx
virtual voidEndSheet( void );
commit 8bc22acaa0825c734e4f2dda177ad93b61b488a2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 10 14:28:00 2012 -0400
Zelle-Cell, Ergebnis-Result and bit of cleanup.
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index c5d2228..0279b41 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -120,25 +120,25 @@ void ImportExcel::Formula( const XclAddress rXclPos,
if( GetAddressConverter().ConvertAddress( aScPos, rXclPos, GetCurrScTab(),
true ) )
{
// Formula will be read next, length in nFormLen
-const ScTokenArray* pErgebnis = 0;
-sal_BoolbConvert;
+const ScTokenArray* pResult = NULL;
+bool bConvert = false;
pFormConv-Reset( aScPos );
if( bShrFmla )
-bConvert = !pFormConv-GetShrFmla( pErgebnis, maStrm, nFormLen );
+bConvert = !pFormConv-GetShrFmla( pResult, maStrm, nFormLen );
else
-bConvert = sal_True;
+bConvert = true;
if( bConvert )
-eErr = pFormConv-Convert( pErgebnis, maStrm, nFormLen, true,
FT_CellFormula);
+eErr = pFormConv-Convert( pResult, maStrm, nFormLen, true,
FT_CellFormula);
-ScFormulaCell* pZelle = NULL;
+ScFormulaCell* pCell = NULL;
-if( pErgebnis )
+if (pResult)
{
-pZelle = new ScFormulaCell( pD, aScPos, pErgebnis );
-pD-PutCell( aScPos.Col(), aScPos.Row(), aScPos.Tab(), pZelle,
true );
+pCell = new ScFormulaCell( pD, aScPos, pResult );
+pD-PutCell( aScPos.Col(), aScPos.Row(), aScPos.Tab(), pCell, true
);
}
else
{
@@ -148,16 +148,16 @@ void ImportExcel::Formula( const XclAddress rXclPos,
if( eCellType == CELLTYPE_FORMULA )
{
pD-GetCell( aScPos.Col(),
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5a5f77c3b57fb1c91a178190c1db12606295bf17
Author: Andras Timar ati...@suse.com
Date: Tue Apr 10 21:38:10 2012 +0200
use correct gid of version.ini
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 9ff56c2..52711c6 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1833,7 +1833,7 @@ sub put_msiproductversion_into_bootstrapfile
{
my $onefile = ${$filesref}[$i];
-if ( $onefile-{'gid'} eq gid_Profile_Version_Ini )
+if ( $onefile-{'gid'} eq gid_Brand_Profile_Version_Ini )
{
my $file = installer::files::read_file($onefile-{'sourcepath'});
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/scerrors.hxx |5 +-
sc/source/ui/dbgui/csvgrid.cxx |5 ++
sc/source/ui/docshell/docsh.cxx | 16 ++---
sc/source/ui/docshell/impex.cxx | 70 +---
sc/source/ui/inc/impex.hxx | 13 +--
sc/source/ui/src/scerrors.src |4 ++
6 files changed, 77 insertions(+), 36 deletions(-)
New commits:
commit 684cf5cca6ea6c8fc2743f1622f624f668db9e84
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 10 23:50:29 2012 +0200
resolved fdo#48516 use max columns exceeded message if appropriate
In CSV import, instead of SCWARN_IMPORT_RANGE_OVERFLOW use
SCWARN_IMPORT_ROW_OVERFLOW and SCWARN_IMPORT_COLUMN_OVERFLOW that already
existed, additionally introduced SCWARN_IMPORT_CELL_OVERFLOW if single field
data exceeds STRING_MAXLEN.
Row overflow takes precedence over column overflow that takes precedence
over
cell overflow.
diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx
index fc6b9cb..ea7e590 100644
--- a/sc/inc/scerrors.hxx
+++ b/sc/inc/scerrors.hxx
@@ -60,9 +60,10 @@
// ERRCODE_CLASS_IMPORT - does not display Read-Error in MsgBox
#define SCWARN_IMPORT_RANGE_OVERFLOW ( 1 | ERRCODE_CLASS_IMPORT |
ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
-#define SCWARN_IMPORT_ROW_OVERFLOW ( 2 | ERRCODE_CLASS_IMPORT |
ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
-#define SCWARN_IMPORT_COLUMN_OVERFLOW ( 3 | ERRCODE_CLASS_IMPORT |
ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
+#define SCWARN_IMPORT_ROW_OVERFLOW ( 2 | ERRCODE_CLASS_IMPORT |
ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
+#define SCWARN_IMPORT_COLUMN_OVERFLOW ( 3 | ERRCODE_CLASS_IMPORT |
ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
#define SCWARN_IMPORT_SHEET_OVERFLOW ( 4 | ERRCODE_CLASS_IMPORT |
ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
+#define SCWARN_IMPORT_CELL_OVERFLOW ( 5 | ERRCODE_CLASS_IMPORT |
ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
// ERRCODE_CLASS_EXPORT - does not display Write-Error in MsgBox
#define SCWARN_EXPORT_NONCONVERTIBLE_CHARS ( 1 | ERRCODE_CLASS_EXPORT |
ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 09d3651..68c6fd9 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -750,7 +750,10 @@ void ScCsvGrid::ImplSetTextLineSep(
{
// scan for next cell text
bool bIsQuoted = false;
-pChar = ScImportExport::ScanNextFieldFromString( pChar, aCellText,
cTextSep, pSepChars, bMergeSep, bIsQuoted );
+bool bOverflowCell = false;
+pChar = ScImportExport::ScanNextFieldFromString( pChar, aCellText,
+cTextSep, pSepChars, bMergeSep, bIsQuoted, bOverflowCell );
+/* TODO: signal overflow somewhere in UI */
// update column width
sal_Int32 nWidth = Max( CSV_MINCOLWIDTH, aCellText.Len() + sal_Int32(
1 ) );
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 3e931c4..57e2ee4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1170,7 +1170,8 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium rMedium )
}
FltError eError = eERR_OK;
-sal_Bool bOverflow = false;
+bool bOverflowRow, bOverflowCol, bOverflowCell;
+bOverflowRow = bOverflowCol = bOverflowCell = false;
if( ! rMedium.IsStorage() )
{
@@ -1186,7 +1187,9 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium rMedium )
eError = bRet ? eERR_OK : SCERR_IMPORT_CONNECT;
aDocument.StartAllListeners();
aDocument.SetDirty();
-bOverflow = aImpEx.IsOverflow();
+bOverflowRow = aImpEx.IsOverflowRow();
+bOverflowCol = aImpEx.IsOverflowCol();
+bOverflowCell = aImpEx.IsOverflowCell();
}
else
{
@@ -1199,10 +1202,13 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium rMedium )
if (!GetError())
SetError(eError, ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
}
-else if ( bOverflow )
+else if (!GetError() (bOverflowRow || bOverflowCol ||
bOverflowCell))
{
-if (!GetError())
-SetError(SCWARN_IMPORT_RANGE_OVERFLOW, ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+// precedence: row, column, cell
+FltError nWarn = (bOverflowRow ? SCWARN_IMPORT_ROW_OVERFLOW :
+(bOverflowCol ? SCWARN_IMPORT_COLUMN_OVERFLOW :
+ SCWARN_IMPORT_CELL_OVERFLOW));
+SetError( nWarn, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
OSL_LOG_PREFIX ) ));
}
bSetColWidths = sal_True;
bSetSimpleTextColWidths = sal_True;
diff
