[Libreoffice] [PATCH] Possibly unused OTempFileService class
Hi,
It seems like OTempFileService, defined and implemented in
libs-gui/unotools/source/ucbhelper is unused.
There's no mention of this name elsewhere in the tree, and LibreOffice
builds and run fine without the files removed by the attached patch.
One of the methods of this class is already in the list of unused functions.
Howewer, since it involves UNO, this code may be loaded at runtime by an
obscure corner of the gui I'm not aware of.
Could someone confirm if it can be safely removed (or not) ?
--
Francois Tigeot
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index b77a8eb..d762a5b 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -138,7 +138,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
unotools/source/ucbhelper/ucbhelper \
unotools/source/ucbhelper/ucblockbytes \
unotools/source/ucbhelper/ucbstreamhelper \
-unotools/source/ucbhelper/xtempfile \
))
# vim: set noet sw=4 ts=4:
diff --git a/unotools/source/ucbhelper/XTempFile.hxx
b/unotools/source/ucbhelper/XTempFile.hxx
deleted file mode 100644
index fcadd28..000
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- 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.
- *
- /
-#ifndef _XTEMPFILE_HXX_
-#define _XTEMPFILE_HXX_
-
-#include com/sun/star/io/XInputStream.hpp
-#include com/sun/star/io/XOutputStream.hpp
-#include com/sun/star/io/XSeekable.hpp
-#include com/sun/star/io/XStream.hpp
-#include com/sun/star/io/XTempFile.hpp
-#include com/sun/star/io/XTruncate.hpp
-#include com/sun/star/lang/XSingleComponentFactory.hpp
-#include com/sun/star/lang/XMultiServiceFactory.hpp
-#include com/sun/star/lang/XServiceInfo.hpp
-#include cppuhelper/implbase5.hxx
-#include cppuhelper/propertysetmixin.hxx
-#include osl/mutex.hxx
-
-class SvStream;
-namespace utl { class TempFile; }
-
-typedef ::cppu::WeakImplHelper5 ::com::sun::star::io::XTempFile
-, ::com::sun::star::io::XInputStream
- ,
::com::sun::star::io::XOutputStream
- ,
::com::sun::star::io::XTruncate
- ,
::com::sun::star::lang::XServiceInfo
-
-OTempFileBase;
-
-class OTempFileService :
-public OTempFileBase,
-public ::cppu::PropertySetMixin ::com::sun::star::io::XTempFile
-{
-protected:
-::utl::TempFile* mpTempFile;
-::osl::Mutex maMutex;
-SvStream* mpStream;
-sal_Bool mbRemoveFile;
-sal_Bool mbInClosed;
-sal_Bool mbOutClosed;
-
-sal_Int64 mnCachedPos;
-sal_Bool mbHasCachedPos;
-
-void checkError () const;
-void checkConnected ();
-
-public:
-OTempFileService (::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext const context);
-
-//Methods
-// XInterface
-virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type aType )
-throw (::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL acquire( )
-throw ();
-virtual void SAL_CALL release( )
-throw ();
-// XTypeProvider
-virtual ::com::sun::star::uno::Sequence ::com::sun::star::uno::Type
SAL_CALL getTypes( )
-throw (::com::sun::star::uno::RuntimeException);
-virtual ::com::sun::star::uno::Sequence ::sal_Int8 SAL_CALL
getImplementationId( )
-throw (::com::sun::star::uno::RuntimeException);
-
-// XTempFile
-virtual ::sal_Bool SAL_CALL getRemoveFile()
-throw
Re: [Libreoffice] Enabling ccache
2011/7/16 Nguyen Vu Hung (KiEi) vuh...@ki-ei.com: Hi all, I have 2 quick questions: Is that ccache automatically detected and used if it is my $PATH (~/bin) How can I tell if ccache is used? ccache -s will give you stats about ccache usage... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Possibly unused OTempFileService class
On Sun, 2011-07-17 at 08:13 +0200, Francois Tigeot wrote: Hi, It seems like OTempFileService, defined and implemented in libs-gui/unotools/source/ucbhelper is unused. There's no mention of this name elsewhere in the tree, and LibreOffice builds and run fine without the files removed by the attached patch. One of the methods of this class is already in the list of unused functions. I don't see any OTempFileService methods in the unused list ? Howewer, since it involves UNO, this code may be loaded at runtime by an obscure corner of the gui I'm not aware of. unotools/util/utl.component registers that a component called com.sun.star.io.comp.TempFile which provides the com.sun.star.io.TempFile service is available in the unotools lib Where an extra utl string is to be prefixed to the stock component_getFactory entry point string to give an entry point of utl_component_getFactory as the symbol which can be dlsymed and executed with the component name (com.sun.star.io.comp.TempFile) in order to get one. utl_component_getFactory then calls OTempFileService::createServiceFactory_Static - XTempFile_createInstance - XTempFile_createInstance and returns a OTempFileService. So, its used by anything which asks for com.sun.star.io.TempFile e.g. http://opengrok.libreoffice.org/xref/components/package/source/zippackage/ZipPackageStream.cxx#188 where that ..-createInstance(com.sun.star.io.TempFile) call should get mapped to an appropiate call to utl_component_getFactory to basically get a OTempFileService back. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Enabling ccache
Hi Nguyen, *, 2011/7/17 Nguyen Vu Hung (KiEi) vuh...@ki-ei.com: Is that ccache automatically detected and used if it is my $PATH (~/bin) No. Either you have it setup using symlinks in your PATH, i.e. you have gcc → ccache g++ → ccache in ~/bin or you have to export CC to ccache gcc and CXX to ccache g++ when running autogen/configure ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] [PUSHED] Re: svtools/source/contnr/imivctl1.cxx not matching imivctl1.hxx
Maciej, Sorry about that. I try to change them in pairs and I must have missed that one. On 32bit GCC 4.0, sal_uLong and size_t are the same and don't error; however, people doing 64bit builds have issues. I changed the .hxx instead of the .cxx; we really should be using size_t instead of sal_uLong. Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] Re: svtools/source/contnr/imivctl1.cxx not matching imivctl1.hxx
Dnia 2011-07-17, nie o godzinie 06:49 -0700, Joseph Powers pisze: I changed the .hxx instead of the .cxx; we really should be using size_t instead of sal_uLong. Thanks! I will remember this. Maciej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Preserve RTF \'00 sequences (NUL) in strings
---
svtools/source/svrtf/parrtf.cxx | 22 +-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 0b722d8..0c60834 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -341,7 +341,27 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
ByteString aByteString;
while (1)
{
-aByteString.Append((char)GetHexValue());
+char c = (char)GetHexValue();
+
+if (c)
+{
+aByteString.Append(c);
+}
+else
+{
+/* \'00 is a valid internal character in a
+* string in RTF, however ByteString::Append
+* does nothing if '\0' is passed in. It is
+* otherwise capable of handling strings with
+* embedded NULs, so add a '\1' and then
+* change it, as ByteString::SetChar does not
+* care if the character is '\0'.
+*/
+int nLen = aByteString.Len();
+
+aByteString.Append('\001');
+aByteString.SetChar(nLen, '\0');
+}
bool bBreak = false;
sal_Char nSlash = '\\';
--
1.7.2.5
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Fix 33898 - import/export xrefs to numbered paras
---
sw/source/filter/rtf/rtffld.cxx | 50 -
sw/source/filter/ww8/ww8atr.cxx | 12 +++
sw/source/filter/ww8/ww8par5.cxx | 63 +++--
3 files changed, 65 insertions(+), 60 deletions(-)
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index f5d9058..ccac5f1 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -813,8 +813,7 @@ int SwRTFParser::MakeFieldInst( String rFieldStr )
case RTFFLD_REF:
{
String sOrigBkmName;
-bool bChapterNr = false;
-bool bAboveBelow = false;
+REFERENCEMARK eFormat = REF_CONTENT;
RtfFieldSwitch aRFS( aSaveStr );
while( !aRFS.IsAtEnd() )
@@ -828,42 +827,35 @@ int SwRTFParser::MakeFieldInst( String rFieldStr )
sOrigBkmName = sParam;
break;
+/* References to numbers in Word could be either to a
numbered
+paragraph or to a chapter number. However Word does not
seem to
+have the capability we do, of refering to the chapter
number some
+other bookmark is in. As a result, cross-references to
chapter
+numbers in a word document will be cross-references to a
numbered
+paragraph, being the chapter heading paragraph. As it
happens, our
+cross-references to numbered paragraphs will do the right
thing
+when the target is a numbered chapter heading, so there is
no need
+for us to use the REF_CHAPTER bookmark format on import.
+*/
case 'n':
+eFormat = REF_NUMBER_NO_CONTEXT;
+break;
case 'r':
+eFormat = REF_NUMBER;
+break;
case 'w':
-bChapterNr = true; // activate flag 'Chapter Number'
+eFormat = REF_NUMBER_FULL_CONTEXT;
break;
case 'p':
-bAboveBelow = true;
+eFormat = REF_UPDOWN;
break;
}
}
-if (!bAboveBelow || bChapterNr)
-{
-if (bChapterNr)
-{
-SwGetRefField aFld(
-(SwGetRefFieldType*)pDoc-GetSysFldType( RES_GETREFFLD
),
-sOrigBkmName,REF_BOOKMARK,0,REF_CHAPTER);
-pDoc-InsertPoolItem( *pPam, SwFmtFld( aFld ), 0 );
-}
-else
-{
-SwGetRefField aFld(
-(SwGetRefFieldType*)pDoc-GetSysFldType( RES_GETREFFLD
),
-sOrigBkmName,REF_BOOKMARK,0,REF_CONTENT);
-pDoc-InsertPoolItem( *pPam, SwFmtFld( aFld ), 0 );
-}
-}
-
-if( bAboveBelow )
-{
-SwGetRefField aFld( (SwGetRefFieldType*)
-pDoc-GetSysFldType( RES_GETREFFLD ), sOrigBkmName,
REF_BOOKMARK, 0,
-REF_UPDOWN );
-pDoc-InsertPoolItem(*pPam, SwFmtFld(aFld), 0);
-}
+SwGetRefField aFld(
+(SwGetRefFieldType*)pDoc-GetSysFldType( RES_GETREFFLD ),
+sOrigBkmName,REF_BOOKMARK,0,eFormat);
+pDoc-InsertPoolItem( *pPam, SwFmtFld( aFld ), 0 );
}
break;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 0ea9201..1464e42 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2831,6 +2831,18 @@ void AttributeOutputBase::TextField( const SwFmtFld
rField )
sStr = FieldString(eFld);
sStr += GetExport().GetBookmarkName(nSubType,
rRFld.GetSetRefName(), 0);
+switch (pFld-GetFormat())
+{
+case REF_NUMBER:
+sStr.APPEND_CONST_ASC( \\r);
+break;
+case REF_NUMBER_NO_CONTEXT:
+sStr.APPEND_CONST_ASC( \\n);
+break;
+case REF_NUMBER_FULL_CONTEXT:
+sStr.APPEND_CONST_ASC( \\w);
+break;
+}
break;
case REF_FOOTNOTE:
case REF_ENDNOTE:
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 759293d..62d73b6 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2089,8 +2089,7 @@ eF_ResT SwWW8ImplReader::Read_F_Set( WW8FieldDesc* pF,
Re: [Libreoffice] [litmus] - buildid: tag no longer exists in 3.4 help - About LibreOffice
gibi schrieb: There is no more tag line in any of the 3.4 versionrc files ... at least in linux-64 (I didn't check for Windows) Hi, for being able to refer Daily dev-builds a unique build identifier has been created (http://cgit.freedesktop.org/libreoffice/bootstrap/commit/?h=libreoffice-3-4id=66b5a6f985281f31d0ba654e539c1df7ae283b7a). May be that should be used for all builds and converted for a normal user readable version for the official builds? I believe Litmus also should be used tests in Master-Trunk from time to time. Kind regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] sylk unit tests
Hi Caolán, Hmm, well I've now added a sylk import unit test to sc, i.e. http://cgit.freedesktop.org/libreoffice/calc/commit/?id=8ac49ef8ab4f065d7b729dcb15505c602c77 Thanks, but as Nigel pointed out it's hard to unit test every peace of LO and I don't think my small change is worth it. Later on I will mail my Patch getting rid of SvULongs in calc. Best Regards, Maciej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Major mode of Emacs for editing LibreOffice BASIC
Hi all, I would like to introduce my pet project libo-basic-mode: https://github.com/tabe/libo-basic-mode so that it can obtain your kind review. It offers a major mode of Emacs for editing LibreOffice BASIC, including * syntax highlight * indentation support * command to call macro * command to insert or complete UNO constant * command to lookup UNO API by name (via api.openoffice.org) The major mode may be useful not only for end users editing macro but also for those who hack the LibreOffice code base with emacs, because we have a lot of BASIC code in some modules e.g. testautomation. Moreover it is under GPL/LGPL/MPL triple license, so possible to be merged into the LibreOffice distribution if you like. Cheers, -- Takeshi Abe ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] SfxIntegerListItem constructor used by DataPointItemConverter and SeriesOptionsItemConverter
Hi, I'm working on getting rid of SvULongs in calc. Mainly SvULongs are used by SfxIntegerListItem which is then used in calc. I would like to add a constructor SfxIntegerListItem::SfxIntegerListItem( const ::com::sun::star::uno::Sequence sal_Int32 rList ), because DataPointItemConverter and SeriesOptionsItemConverter are copying from Sequence to SvULongs and then in SfxIntegerListItem SvLongs is copied to Sequence. Files: /calc/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx:644 /calc/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx:436 /libs-gui/svl/source/items/ilstitem.cxx:47 Best Regards, Maciej Rumianowski ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Ask for a long-term and friendly cooperative relations with you!
Dear Friend, Hello! It is a pleasure to write to you this e-mail, this is Matthew from China. This e-mail is to contact you and hope to establish a long-term and friendly cooperative relations with you. We are the largest professional manufacturer in electrical products in China.Our products are exported to many countries all over the world, Now we hope you will be interested in our products (junction box、KWH meter、distribution box、miniature circuit breaker、timer、contactor、relay etc).Each product has its own series. Welcome to our Website: www.sunfad.com Having high regard for our products please,They are very cheap but high quality. If you want to import any one kind of them or any kinds of them, Do not hesitate to contact with us, thank you! In the website, we have found your information, we can supply to you most of electrical products in the best quality and the lowest price, how about to cooperate with us for long-term? Look forward to your further information,Your kind reply will be highly appreciated for us! Thanks and best regards! Yours friend, Matthew -***-SUNFAD ELECTRICAL GROUP CO., LTD. Add:XIANGJINYANG LIUSHI WENZHOU 325604 ZHEJIANG, CHINA www.sunfad.com Msn: ahaq...@163.comSkype: sunfadcn Tel: 0086-577-27862819 0086-577-62717181 Fax: 0086-577-27862859 E-mail: market...@sunfad.com ahaq...@163.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [GSoC 2011][svgexport] weekly report #8
Hi all, first off I received the confirmation from Google that I passed the midterm evaluation, I know that part of this result is due to my mentors, Thorsten and Fridrich but also to all those LibreOffice community members that helped me to solve several issues. So a big thank to everyone! :) This week I spent all time in reading source code and documentation, so you will not find any new patch. Anyway this is the work I performed from the last report: == 1 == Analyzed the implementation of JessyInk about animation effects and slide transitions. == 2 == Played with Impress effects and created a simple animation for each possible settings. Implemented a routine for print out all the animation effect of a shape. I found out that effect properties of shapes are fake-properties: nothing about the effect involving the shape can be extracted from them. Asked for help ... == 3 == ... and I readily got help from Fridrik Strba and Radek Doulík. The latter one pointed out that the implementation for exporting a presentation in powerpoint where it is shown the correct way to access all animation effects that belong to a given slide. I read the essential parts of SMIL documentation supported by Impress. == 4 == I started reading the AnimationExport implementation and I looked inside an odp presentation document to see how exported animations look like. You can read more details on my updated log book here: https://docs.google.com/document/d/12pIrnHkqcUu9xUbI7qblTofx1P-A4gP6J-4D2oEvphE/edit?hl=en_US Cheers, Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] small problems with --enable-split-app-modules
I'm just moving the packaging process for ArchLinux to make use of
--enable-split-app-modules in 3.4.2rc1. I'm running into some small problems:
1) I have to pass yes to the install process due to some overwritten
files: yes | make DESTDIR=${srcdir}/fakeinstall distro-pack-install
Installer finished
Installation finished, you can now execute:
/usr/lib/libreoffice/program/soffice
./bin/distro-install-clean-up
Cleaning up ...
Fixing permissions...
Checking for DESTDIR inside installed files...
./bin/distro-install-desktop-integration
Copying icons ..
Copying GNOME icons ..
chmod: cannot operate on dangling symlink
`/build/src/fakeinstall/usr/bin/libreoffice'
/build/src/build
mv: try to overwrite `base.desktop', overriding mode 0444 (r--r--r--)? j
mv: try to overwrite `calc.desktop', overriding mode 0444 (r--r--r--)? j
mv: try to overwrite `draw.desktop', overriding mode 0444 (r--r--r--)? j
mv: try to overwrite `impress.desktop', overriding mode 0444 (r--r--r--)? j
mv: try to overwrite `javafilter.desktop', overriding mode 0444 (r--r--r--)? j
mv: try to overwrite `math.desktop', overriding mode 0444 (r--r--r--)? j
mv: try to overwrite `printeradmin.desktop', overriding mode 0444 (r--r--r--)? j
mv: try to overwrite `qstart.desktop', overriding mode 0444 (r--r--r--)? j
mv: try to overwrite `startcenter.desktop', overriding mode 0444 (r--r--r--)? j
mv: try to overwrite `writer.desktop', overriding mode 0444 (r--r--r--)? j
/build/src/build
Install /usr/bin/lobase
Install /usr/share/man/man1/lobase.1.gz
2) the /usr/share/applications/base.desktop file goes not only into the base
filelist but also into the common
pkg file list. I had to remove it from the common pkg file list.
3) I'm running into a build issue when using --with-lang=:
Error: ../unxlngx6.pro/misc/sysui/dummy/localize.sdf 0 Bytes!
Error: 1 damaged files encountered
I'm removing the --with-lang or add --with-lang=en-US now to get
en-US langpack included. But there's no full langpack/helpfile file list
created.
Only the splitted files in orig/gid_Modules_... are there.
Any idea how to get the full langpack file list for installation?
Without any langpack installed I get this error that I can solve with
installing
any other langpack from the rpms, but there's now en-US langpack:
[andyrtr@workstation64 trunk]$ libreoffice
Missing vcl resource. This indicates that files vital to localization are
missing. You might have a corrupt installation.
terminate called after throwing an instance of
'com::sun::star::uno::RuntimeException'
Beside this this splitting looks working well, also all desktop integration
seems to work.
-Andy
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [GSoC][performance] report - week #8
Hi all,
So, this week I have removed all component_getImplementation methods
but one. I have also prefixed some component_getFactory methods but I
guess I can do that only in modules with gbuild, so there is a lot
more to be done. I have prepared more and hopefully I would be able to
push that in the near future.
Then I was playing with feature/gnumake4 branch. I have learned
something I will need.
I have also prepared some patches to convert modules to gbuild. I
guess I will be working on this next week.
What should I do with patches? Send for review to the list? maybe with [PATCH] ?
Or just push them myself.
Then in scaddins I found two idl files. Can they be addded to offapi
or udkapi? I don't know what's the difference.
And also when converting to new build system I still don't understand
some things. For example with libraries and RepositoryFixes.
And I found commit:
http://cgit.freedesktop.org/libreoffice/bootstrap/commit/?id=f0d67eeeac0c615a928004082a0a7aadc5c03106
Using new build system we want to have libs declared with STD_LIB_FILE ?
I guess I will ask more next time.
About the linking optimization. The libraries we want to merge have to
be built in tail_build ?
If not, that's great and probably we could try to merge some next week ?
But if they have to be there it's not good because we have to convert
a lot of modules to get the right one there.
And Michael, could you please push attached diff ? I think it's last
thing not in master which should be there.
Best regards,
Matus
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index f86fd32..74eb3e8 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -834,7 +834,6 @@ Reference XInterface ORegistryFactoryHelper::createModuleFactory()
OUString aActivatorUrl;
OUString aActivatorName;
OUString aLocation;
-OUString aPrefix;
ReferenceXRegistryKey xActivatorKey = xImplementationKey-openKey(
OUString( RTL_CONSTASCII_USTRINGPARAM(/UNO/ACTIVATOR) ) );
@@ -850,15 +849,6 @@ Reference XInterface ORegistryFactoryHelper::createModuleFactory()
OUString( RTL_CONSTASCII_USTRINGPARAM(/UNO/LOCATION) ) );
if( xLocationKey.is() xLocationKey-getValueType() == RegistryValueType_ASCII )
aLocation = xLocationKey-getAsciiValue();
-
-ReferenceXRegistryKey xPrefixKey = xImplementationKey-openKey(
-OUString( RTL_CONSTASCII_USTRINGPARAM(/UNO/PREFIX) ) );
-if( xPrefixKey.is() xPrefixKey-getValueType() == RegistryValueType_ASCII )
-{
-aPrefix = xPrefixKey-getAsciiValue();
-if( aPrefix.getLength() != 0 )
-aPrefix = aPrefix + OUSTR(_);
-}
}
else
{
@@ -893,17 +883,6 @@ Reference XInterface ORegistryFactoryHelper::createModuleFactory()
ReferenceXInterface x = xSMgr-createInstance( aActivatorName );
ReferenceXImplementationLoader xLoader( x, UNO_QUERY );
ReferenceXInterface xMF;
-if( aActivatorName == OUString( RTL_CONSTASCII_USTRINGPARAM(com.sun.star.loader.SharedLibrary) ) )
-{
-try
-{
-return loadSharedLibComponentFactory( bootstrap_expandUri( aLocation ), OUString(), aImplementationName, xSMgr, xImplementationKey, aPrefix );
-}
-catch ( IllegalArgumentException e )
-{
-throw RuntimeException( e.Message, e.Context );
-}
-}
if (xLoader.is())
{
xFactory = xLoader-activate( aImplementationName, aActivatorUrl, aLocation, xImplementationKey );
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 9c27a1f..34c79b1 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -209,7 +209,7 @@ ReferenceXInterface SAL_CALL DllComponentLoader::activate(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(/UNO/ACTIVATOR) ) );
if (xActivatorKey.is() xActivatorKey-getValueType() == RegistryValueType_ASCII )
{
-ReferenceXRegistryKey xPrefixKey = xActivatorKey-openKey(
+ReferenceXRegistryKey xPrefixKey = xKey-openKey(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(/UNO/PREFIX) ) );
if( xPrefixKey.is() xPrefixKey-getValueType() == RegistryValueType_ASCII )
{
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [litmus] - buildid: tag no longer exists in 3.4 help - About LibreOffice
Le 17/07/2011 17:02, Rainer Bielefeld a écrit : gibi schrieb: There is no more tag line in any of the 3.4 versionrc files ... at least in linux-64 (I didn't check for Windows) Hi, for being able to refer Daily dev-builds a unique build identifier has been created (http://cgit.freedesktop.org/libreoffice/bootstrap/commit/?h=libreoffice-3-4id=66b5a6f985281f31d0ba654e539c1df7ae283b7a). May be that should be used for all builds and converted for a normal user readable version for the official builds? Well, Litmus users are not exactly end-users, we can grep a string in a version[rc|.ini] file or whatever. So we just need to know which string should be used and how to catch this tag from the installation package. (For example it could have been 3.4.2-201 as we can find in the name of each rpm file) I believe Litmus also should be used tests in Master-Trunk from time to time. Sure! :-) Thanks for your time. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Get rid of SvULongs in calc
Hi,
I'm sending a Patch which converts SvULongs to std::vector sal_uLong
.
I would like to add a constructor
SfxIntegerListItem::SfxIntegerListItem( const ::com::sun::star::uno::Sequence
sal_Int32 rList ), because DataPointItemConverter and
SeriesOptionsItemConverter are copying from Sequence to SvULongs and then in
SfxIntegerListItem SvLongs is copied to Sequence.
As I wrote before I have added a constructor to SfxIntegerListItem, is
it okay?
Best Regards,
Maciej
From 6af35271b8738116393900ba349354d1f3f0bf1b Mon Sep 17 00:00:00 2001
From: Maciej Rumianowski maciej.rumianow...@gmail.com
Date: Sun, 17 Jul 2011 23:24:45 +0200
Subject: [PATCH] Get rid of SvULongs in calc
Instead of SvULongs use ::std::vector sal_uLong
---
.../itemsetwrapper/DataPointItemConverter.cxx |6 +++---
.../itemsetwrapper/SeriesOptionsItemConverter.cxx |6 +++---
chart2/source/view/main/ChartItemPool.cxx |5 ++---
sc/source/ui/docshell/impex.cxx| 11 +--
sc/source/ui/view/tabvwsh3.cxx |8
5 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 3802ffc..fb1c5f8 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -641,10 +641,10 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS:
{
-SvULongs aList;
+/*SvULongs aList;
for ( sal_Int32 nN=0; nNm_aAvailableLabelPlacements.getLength(); nN++ )
-aList.Insert( m_aAvailableLabelPlacements[nN], sal::static_int_cast sal_uInt16 (nN) );
-rOutItemSet.Put( SfxIntegerListItem( nWhichId, aList ) );
+aList.Insert( m_aAvailableLabelPlacements[nN], sal::static_int_cast sal_uInt16 (nN) );*/
+rOutItemSet.Put( SfxIntegerListItem( nWhichId, m_aAvailableLabelPlacements ) );
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index a199b66..dd844c6 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -433,10 +433,10 @@ void SeriesOptionsItemConverter::FillSpecialItem(
}
case SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS:
{
-SvULongs aList;
+/*SvULongs aList;
for ( sal_Int32 nN=0; nNm_aSupportedMissingValueTreatments.getLength(); nN++ )
-aList.Insert( m_aSupportedMissingValueTreatments[nN], sal::static_int_cast sal_uInt16 (nN) );
-rOutItemSet.Put( SfxIntegerListItem( nWhichId, aList ) );
+aList.Insert( m_aSupportedMissingValueTreatments[nN], sal::static_int_cast sal_uInt16 (nN) );*/
+rOutItemSet.Put( SfxIntegerListItem( nWhichId, m_aSupportedMissingValueTreatments ) );
break;
}
case SCHATTR_INCLUDE_HIDDEN_CELLS:
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 2cdac8f..da10db9 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -63,8 +63,7 @@ ChartItemPool::ChartItemPool():
ppPoolDefaults[SCHATTR_DATADESCR_SHOW_SYMBOL- SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_SYMBOL);
ppPoolDefaults[SCHATTR_DATADESCR_SEPARATOR - SCHATTR_START] = new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR,C2U( ));
ppPoolDefaults[SCHATTR_DATADESCR_PLACEMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_DATADESCR_PLACEMENT,0);
-SvULongs aTmp;
-ppPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS,aTmp);
+ppPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, ::std::vector sal_uLong () );
ppPoolDefaults[SCHATTR_DATADESCR_NO_PERCENTVALUE- SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE);
ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE - SCHATTR_START] = new SfxUInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0);
ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE);
@@ -157,7 +156,7 @@ ChartItemPool::ChartItemPool():
ppPoolDefaults[SCHATTR_CLOCKWISE- SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, sal_False );
ppPoolDefaults[SCHATTR_MISSING_VALUE_TREATMENT- SCHATTR_START] = new SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT, 0);
-
Re: [Libreoffice] problem of master build cannot launch.
Yifan J wrote: Firstly, I found smoketest fails on the HEAD (with error officeconnection.cxx:140), then I tried to launch soffice.bin in solver/350 manually, but soffice.bin crashes immedialy even before splash screen appears. I came back yesterday and made from scratch a new local repository and I've still got this same pb. I compile on a Linux x86 with this autogen : --enable-symbols --enable-binfilters --enable-ext-barcode --enable-ext-diagram --enable-ext-google-docs --enable-ext-hunart --enable-ext-lightproof --enable-ext-nlpsolver --enable-ext-ct2n --enable-ext-numbertext --enable-ext-oooblogger --enable-ext-pdfimport --enable-ext-presenter-console --enable-ext-presenter-minimizer --enable-ext-report-builder --enable-ext-scripting-beanshell --enable-ext-scripting-javascript --enable-ext-scripting-python --enable-ext-typo --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher --enable-dbus --enable-graphite --enable-evolution2 --enable-werror --enable-debug --enable-dbgutil --enable-crashdump --enable-kde4 --enable-dependency-tracking gcc (Debian 4.6.1-1) 4.6.1 with kernel 2.6.39-2-686-pae For the moment, I found nothing which explains this, I'm still searching. Julien. -- View this message in context: http://nabble.documentfoundation.org/problem-of-master-build-cannot-launch-tp3147505p3177627.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Need help with symbols in object dialog of chart data series
Hi all, I want to add further standard symbols for data points in line charts and xy-charts for to provide all standard symbols that are defined in ODF1.2. At the current stage of my developing, I can already select the new symbols, they are shown as designed in the chart, they are saved to file and reloaded. But now I am stuck with the data series (data point) object property dialog. Perhaps someone can give me a hint? (1) There is a drop-down menu Select in the object property dialog of a data series or data point. In the drop-down menu is an item Symbols. It opens a list of the implemented standard symbols. The list itself is filled correctly with all standard symbols including the new ones and I can select them. But some of the symbols are displayed at a wrong position. Where is the code that paints the symbols to this list? (2) There is a preview of line and symbol in the lower part of the mentioned dialog. The symbols are not displayed in original ratio, but stretched to a square. As a result, the new 'horizontal bar' and 'vertical bar' look like a square in this preview. In the chart itself the new symbols are painted correctly. Where is the code for painting this preview? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [MHST][EasyHack] #38830 code review request
Hi, We've submitted a patch for easy hack number #34697 (#38830) about printing current page https://bugs.freedesktop.org/show_bug.cgi?id=38830 https://bugs.freedesktop.org/show_bug.cgi?id=34697 Above easy hacks are marked as duplicate so I've submitted to #34697. Please help me to review it :) Thanks and Best Regards, Ta Tung ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [litmus] - buildid: tag no longer exists in 3.4 help - About LibreOffice
Hi Petr, Is there a constant rule for checking the exact version from UI directly? For example, Help-About LibreOffice 3.4 340m1(Build:103) At the moment, it looks the Build:103 means 3.4.1 RC 3. Does it reliable enough? Thanks for help! Best wishes, Yifan On Sat, Jul 16, 2011 at 06:38:45PM +0200, gibi wrote: Hello testers fellows, on litmus (for example here: https://tcm.documentfoundation.org/run_tests.cgi?test_run_id=16) The help on More information about how to determine the build ID How do I determine the build ID? contains: buildIDHelpText To determine the LibreOffice build ID, go to Help ? About LibreOffice, and look at the tag line. For example, |tag libreoffice-3.3.1.2| means that |libreoffice-3.3.1.2| is your build ID. /buildIDHelpText There is no more tag line in any of the 3.4 versionrc files ... at least in linux-64 (I didn't check for Windows) Ok, I guess that the 3.4.2rc1 should be libreoffice-3.4.2.1 but where could we find the new build ID we should use to report in Litmus? It would be nice if a litmus admin could update the buildIDHelpText for the 3.4 branch. Thanks a lot! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Yifan Jiang Libreoffice Contact: yifan - irc.freenode.net/libreoffice = http://www.libreoffice.org/ http://www.documentfoundation.org/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [MHST][Easy Hack] Get current page number for printing
On 07/16/2011 05:02 AM, Ta Duc Tung wrote: Hi, 1. How to get current page number for printing? We've found a variable mnCurPage from printdlg.cxx but it seems not to be the right one. I think it is current page number for preview in print dialog. If I were writing a macro and I wanted to know, I would probably get this from the view cursor (but that is just a guess). -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
