date:20120427

RE: need help: clean build of master does not run

2012-04-27 Thread Winfried Donkers

Yay, that is from before my fix.  So my theory that the problem should
be solved by now is not yet proven wrong.

Congratulations :)

at the second attempt is odd (unless you explicitly start soffice.bin
instead of soffice)

I did

Winfried
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: advice needed: bug44456 addition of ODF-formula datedif to calc

2012-04-27 Thread Winfried Donkers

@Eike and @Regina:

Thank you for your reactions.
Unfortunately I have to be absent for a couple of days, so I cannot respond to 
you, nor put your advises/suggenstions into the code yet.
But I will get back to you and make the enhancement fit to submit :-)

Winfried
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: libxmlsec/makefile.mk

2012-04-27 Thread Tor Lillqvist

 libxmlsec/makefile.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit ec913638c55a41b0ac354f9f564d13a8f53449f3
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Apr 26 23:22:47 2012 +0300

Add comment telling that the MinGW stuff here is not for cross-compilation

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 64a9ca8..1470503 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -99,6 +99,10 @@ xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
+
+# Note that this is obsolete crack for building *locally* on Windows with 
MinGW,
+# something we don't see the point in here in LibreOffice
+
 CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no 
--with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl 
--build=i586-pc-mingw32 --host=i586-pc-mingw32 CC=$(xmlsec_CC) 
LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/) LIBS=$(xmlsec_LIBS) 
LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP=$(WRAPCMD) objdump
 
 .IF $(SYSTEM_NSS) != YES
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New feature for libre Calc

2012-04-27 Thread Michael Meeks

Hi Bandula,

On Thu, 2012-04-26 at 22:37 -0700, Bandula Rodrigo wrote:
 Would like to suggest  a small feature that is used in ms xl. It
 goes like this :

This is not a suitable list for feature requests - it is for developers
discussing patches, fixes and questions about the code.

 We are using libre office in more than 300 computers now. and no
 complains. only this accounts people are complaining.

So, for a successful large deployment it is recommended that you pay
for enterprise support - that has a couple of benefits: first you help
indirectly fund the improvement of LibreOffice, and because of that you
can get your specific feature requests and bugs dealt with. Faliing a
support contract, you could contract individual features with local
developers :-)

All the best,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: need help: clean build of master does not run

2012-04-27 Thread Stephan Bergmann


On 04/27/2012 08:29 AM, Winfried Donkers wrote:

at the second attempt is odd (unless you explicitly start soffice.bin
instead of soffice)


I did


Ah, that's by design, then.  When soffice.bin detects upon start-up that 
the per-user information about bundled or shared extensions is outdated, 
it updates that information and then exits with a special exit code (81) 
that causes the wrapping process (on Linux that's oosplash, in turn 
started from soffice) to restart soffice.bin automatically.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: support for repeating format code in calc

2012-04-27 Thread Noel Power


Hi Eike,

I had a little further look,

On 25/04/12 10:37, Noel Power wrote:
maybe I am naive, isn't this complicating things ( right/left 
justified ? ) doesn't it just fill to available width ( granted with 
assumed knowledge of column width border size etc. ) with 0 or more of 
the character to repeat ? I would expect an existing left/center/right 
justification on the cell to be ignored when this 'special' format 
code is specified ( admittedly I haven't tried this... )
ok, I didn't test exhaustively but just some quick testing. Hopefully I 
changed the correct thing, with mso 2002 I modified the cell|format 
cells|allignment|horizontal ( used values center, left, right etc. ) 
which didn't seem to affect the display. So if I did tested the right 
thing then it would seem that justification is ignored in this case.


[...]
Afaics  with mso ( 2002 at least) and libreoffice  the formatter fails 
silently,
seems to be the case with again some quick testing ( which kindof sucks 
I guess )
I mean generally I suppose people just rely on the preview and/or 
applying the format to show you if the format worked. With that in 
mind I would specify ( in whatever specification blurb we might 
provide ) that we expect only one '*[char]' in the format but in the 
event of more that one occurrence we take ( to be decided ) either the 
first or last one and ignore the others.
again with some quick testing looks like in this case excel will take 
the last specified repeat and use that.


[...]


I assume also left/centered/right justification affects things for
leading/trailing fills.
unless Excel does this I would avoid such complication like the plague 
( especially given my complete ignorance in such matters ;-) ) Saying 
that I didn't test even what would happen on the calc side with same :-/
see above, seems ( and imho sensibly ) to ignore justification when the 
repeat code is encountered

[...]



we could use

 String aFill;
 aFill.Expand( nNumCharsToInsert, mnChar);
 aTmpStr.Insert( aFill, mnPos);

to avoid multiple reallocations with character-based Insert.

we just should use that, I will change it thanks!

I *will* change that (just need  to get around to it )

thanks,

Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 3 commits - cui/AllLangResTarget_cui.mk cui/Library_cui.mk cui/source officecfg/registry svx/inc unusedcode.easy xmlsecurity/source

2012-04-27 Thread Caolán McNamara

 cui/AllLangResTarget_cui.mk|1 
 cui/Library_cui.mk |1 
 cui/source/inc/cuires.hrc  |4 
 cui/source/inc/helpid.hrc  |1 
 cui/source/options/certpath.cxx|  266 +
 cui/source/options/certpath.hrc|   72 +++
 cui/source/options/certpath.hxx|   69 +++
 cui/source/options/certpath.src|  110 +
 cui/source/options/fontsubs.cxx|8 
 cui/source/options/optinet2.cxx|   52 ++
 cui/source/options/optinet2.hrc|5 
 cui/source/options/optinet2.hxx|   15 
 cui/source/options/optinet2.src|   20 
 cui/source/options/optjava.cxx |6 
 cui/source/options/optjava.src |2 
 cui/source/options/webconninfo.cxx |6 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 
 svx/inc/svx/simptabl.hxx   |4 
 unusedcode.easy|2 
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx   |   83 ++--
 20 files changed, 665 insertions(+), 67 deletions(-)

New commits:
commit 207313157688d79cb0d53e920a03423c81a7bc23
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Apr 27 10:50:08 2012 +0100

Resolves: fdo#39825 Make detection of certificate folder ui-configurable

Display in the (unix) options gui the NSS cert dir that has been 
auto-detected
for use with digital signatures. Show the other detected possibilities and
allow it to be overridden.

The autodetection should basically work out of the box, but if there's some
bustage at least the UI can be used to sort it out and/or let developers
debug it.

This removes the need for the horrible MOZILLA_CERTIFICATE_FOLDER hack,
though that's still supported.

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index c4ef420..b0cd1de 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
 cui/source/dialogs/tbxform.src \
 cui/source/dialogs/thesdlg.src \
 cui/source/dialogs/zoom.src \
+cui/source/options/certpath.src \
 cui/source/options/connpooloptions.src \
 cui/source/options/dbregister.src \
 cui/source/options/doclinkdialog.src \
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 1251306..089014e 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -134,6 +134,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 cui/source/factory/cuiresmgr \
 cui/source/factory/dlgfact \
 cui/source/factory/init \
+cui/source/options/certpath \
 cui/source/options/cfgchart \
 cui/source/options/connpoolconfig \
 cui/source/options/connpooloptions \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index b782942..17ca8b5 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -173,7 +173,7 @@
 #define RID_SVXERR_JRE_NOT_RECOGNIZED   (RID_SVX_START + 256)
 #define RID_SVXERR_JRE_FAILED_VERSION   (RID_SVX_START + 257)
 #define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START +  0 )
-#define RID_SVX_MSGBOX_JAVA_RESTART2( RID_SVX_START +  1 )
+#define RID_SVX_MSGBOX_OPTIONS_RESTART  ( RID_SVX_START +  1 )
 #define RID_SVXDLG_LNG_ED_NUM_PREBREAK  (RID_SVX_START +  830)
 #define RID_SVXDLG_EDIT_MODULES (RID_SVX_START +  831)
 #define RID_SVXSTR_PATH_NAME_START  (RID_SVX_START + 1003)
@@ -434,6 +434,8 @@
 #define RID_CUISTR_CONTROLS_INVISIBLE   (RID_SVX_START + 
1196)
 #define RID_CUISTR_CONTROLS_INSERTTABLE (RID_SVX_START + 
1197)
 
+#define RID_SVXDLG_CERTPATH (RID_SVX_START + 
1198)
+
 #define RID_CUI_DIALOG_COLORPICKER  (RID_SVX_START + 3)
 
 #endif
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index ea1bcd1..65c7180 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -397,6 +397,7 @@
 #define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY  
CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY
 #define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY  
CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY
 #define HID_HYPERLINK_DIALOG
CUI_HID_HYPERLINK_DIALOG
+#define HID_DLG_CERTPATH   
CUI_HID_DLG_CERTPATH
 
 #endif
 
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
new file mode 100644
index 000..b220125
---

[Libreoffice-commits] .: 2 commits - filter/Executable_svg2odf.mk filter/Library_svgfilter.mk filter/source

2012-04-27 Thread Caolán McNamara

 filter/Executable_svg2odf.mk |2 +-
 filter/Library_svgfilter.mk  |1 +
 filter/source/config/cache/basecontainer.cxx |2 +-
 filter/source/config/cache/filterfactory.cxx |6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 7fd546207223f3a5d86f4d9399df52da9fbb9c23
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Apr 27 11:35:28 2012 +0100

WaE: fix various msvc2008 warnings

Change-Id: Ic4db9792177754222da324bfce58eee06b74c3bf

diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk
index 329ca8e..aa4e44c 100644
--- a/filter/Executable_svg2odf.mk
+++ b/filter/Executable_svg2odf.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\
$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_cxxobjects,svg2odf,\
+$(eval $(call gb_Executable_add_exception_objects,svg2odf,\
 filter/source/svg/test/svg2odf \
 filter/source/svg/test/odfserializer \
 ))
diff --git a/filter/source/config/cache/basecontainer.cxx 
b/filter/source/config/cache/basecontainer.cxx
index 642c726..f8f26a1 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -342,7 +342,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const 
::rtl::OUString sItem)
 aItem = pCache-getItem(m_eType, sItem);
 pCache-addStatePropsToItem(m_eType, sItem, aItem); // add implicit 
props Finalized/Mandatory
 }
-catch(const css::container::NoSuchElementException exNotExist)
+catch(const css::container::NoSuchElementException)
 {
 throw;
 }
diff --git a/filter/source/config/cache/filterfactory.cxx 
b/filter/source/config/cache/filterfactory.cxx
index 935ada0..fb24a65 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -414,7 +414,7 @@ OUStringList 
FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
 // It match the query ...
 lResult.push_back(sName);
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 { continue; }
@@ -539,7 +539,7 @@ OUStringList 
FilterFactory::impl_getListOfInstalledModules() const
 OUStringList lModules(xModuleConfig-getElementNames());
 return lModules;
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 {}
@@ -633,7 +633,7 @@ OUStringList 
FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
 return lSortedFilters;
 }
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 {}
commit fd96b86c0a8cf1c40946e2aa2e4fc4f92839c5dc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Apr 27 11:34:45 2012 +0100

missing FILTER_DLLIMPLEMENTATION define

possibly svg2odf didn't work under windows, etc.

Change-Id: I5f30130b988105337706dee64cac900f4ef399ae

diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index c37938f..c03714f 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -25,6 +25,7 @@ $(eval $(call 
gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter
 
 $(eval $(call gb_Library_add_defs,svgfilter,\
-DUSE_MODERN_SPIRIT \
+   -DFILTER_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_set_include,svgfilter,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need Writer Painting Advice

2012-04-27 Thread Michael Stahl

On 27/04/12 12:56, Andrew Higginson wrote:
 Hi,
  
 I want to draw something like the file attached.
  
 It will be a box that apears when a user goes full screen (basically to
 say, you are in full screen mode, press KEY to go back)
  
 I need it to be drawn 'above' any pages, so that when the user scrolls,
 it stays in the same
 place (so it is not similar to the new header and footer blue boxes, in
 that they are per
 page, this needs to be one box for the whole document)
  
 So what I need to know is in which control's Paint() method do I need to
 put the painting code for this?

i don't know, but the document content is painted from
SwRootFrm::Paint(), which therefore is a place where you should _not_
implement this (because everything in there depends on which part of the
document is currently displayed), but if you set a breakpoint there and
go a bit up the stack then perhaps you'll see a more suitable location...

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

a stab at removing atl stuff. window experience needed.

2012-04-27 Thread Caolán McNamara

In an effort to make building under windows a pain-free as possible. I'm
playing with removing the atl usage in embedserv seeing as MSVC2008
Express doesn't come with it.

voodoo-programming in embedserv using:
http://samscode.blogspot.com/2009/10/atl-removal-part-1-removing-begincommap.html

I end up with the attached.

a) I haven't a clue what embedserv even does, or how to test it ?
b) I see that we have...

CComModule _Module;
BEGIN_OBJECT_MAP(ObjectMap)
END_OBJECT_MAP()

_Module.Init(ObjectMap, hInstance, NULL);
...
_Module.Term();

because I'm clueless, I'm wondering if this even makes sense when we
have an empty OBJECT_MAP ?, or is still doing some necessary reference
counting of the module itself ? I mean we could follow
http://samscode.blogspot.com/2009/10/atl-removal-part-3-tackling-module-and.html
 and convert it over. But might be a bit silly to do that if its just some 
non-functional stub left over form some wizard generated code.

C.
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index 4cc20c3..c8089da 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -55,16 +55,6 @@ $(eval $(call gb_Library_use_libraries,emser,\
 	$(gb_STDLIBS) \
 ))
 
-ifeq ($(USE_DEBUG_RUNTIME),)
-$(eval $(call gb_Library_add_libs,emser,\
-	$(ATL_LIB)/atls.lib \
-))
-else
-$(eval $(call gb_Library_add_libs,emser,\
-	$(ATL_LIB)/atlsd.lib \
-))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,emser,\
 	embedserv/source/embed/docholder \
 	embedserv/source/embed/ed_idataobj \
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 306c7aa..7d4f7df 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -75,6 +75,8 @@ using namespace ::com::sun::star;
 
 extern ::rtl::OUString  getFilterNameFromGUID_Impl( GUID* );
 
+_COM_SMARTPTR_TYPEDEF(IOleInPlaceActiveObject, __uuidof(IOleInPlaceActiveObject));
+
 // add mutex locking ???
 
 DocumentHolder::DocumentHolder(
@@ -528,7 +530,7 @@ HRESULT DocumentHolder::UIActivate()
 //3.  Set the active object
 
 OLECHAR starOffice[] = {'S','t','a','r','O','f','f','i','c','e',0};
-CComPtr IOleInPlaceActiveObject  pObj = new CIIAObj( this );
+IOleInPlaceActiveObjectPtr pObj = new CIIAObj( this );
 
 if (NULL!=m_pIOleIPFrame)
 m_pIOleIPFrame-SetActiveObject(
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index d4f75f4..4d570c5 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -29,25 +29,12 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-// actually this workaround should be in presys.h!
-//#define UINT64 USE_WIN_UINT64
-//#define INT64 USE_WIN_INT64
-//#define UINT32 USE_WIN_UINT32
-//#define INT32 USE_WIN_INT32
-
 #include embeddoc.hxx
 
-//#undef UINT64
-//#undef INT64
-//#undef UINT32
-//#undef INT32
-
-
 #include com/sun/star/uno/Any.h
 #include com/sun/star/uno/Exception.hpp
 #include com/sun/star/datatransfer/XTransferable.hpp
 
-
 #include osl/thread.h
 
 using namespace ::com::sun::star;
@@ -149,7 +136,7 @@ STDMETHODIMP EmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIUM * pM
 if ( !( pFormatetc-tymed  TYMED_ISTORAGE ) )
 return DV_E_TYMED;
 
-CComPtr IStorage  pNewStg;
+IStoragePtr pNewStg;
 HRESULT hr = StgCreateDocfile( NULL, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, 0, pNewStg );
 if ( FAILED( hr ) || !pNewStg ) return STG_E_MEDIUMFULL;
 
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index 8eadce0..f6f163e 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -44,12 +44,13 @@
 #include com/sun/star/frame/XComponentLoader.hpp
 #include com/sun/star/util/XUrlTransformer.hpp
 
-
 #include osl/mutex.hxx
 #include osl/diagnose.h
 
 #include string.h
 
+_COM_SMARTPTR_TYPEDEF(IMalloc, __uuidof(IMalloc));
+
 #define EXT_STREAM_LENGTH 16
 
 using namespace ::com::sun::star;
@@ -276,8 +277,8 @@ HRESULT EmbedDocument_Impl::SaveTo_Impl( IStorage* pStg )
 
 // for saveto operation the master storage
 // should not enter NoScribble mode
-CComPtr IStream  pOrigOwn = m_pOwnStream;
-CComPtr IStream  pOrigExt = m_pExtStream;
+IStreamPtr pOrigOwn = m_pOwnStream;
+IStreamPtr pOrigExt = m_pExtStream;
 HRESULT hr = Save( pStg, sal_False );
 pStg-Commit( STGC_ONLYIFCURRENT );
 m_pOwnStream = pOrigOwn;
@@ -579,8 +580,8 @@ STDMETHODIMP EmbedDocument_Impl::Load( IStorage *pStg )
 
 if ( FAILED( hr ) )
 {
-m_pOwnStream = CComPtr IStream ();
-m_pExtStream = CComPtr IStream ();
+m_pOwnStream = IStreamPtr();
+m_pExtStream = IStreamPtr();
 hr = pStg-DestroyElement( reinterpret_castLPCWSTR(aOfficeEmbedStreamName.getStr()) );
 hr = pStg-DestroyElement(

Re: Need Writer Painting Advice

2012-04-27 Thread Regina Henschel


Hi Andrew,

Andrew Higginson schrieb:

Hi,

I want to draw something like the file attached.

It will be a box that apears when a user goes full screen (basically to
say, you are in full screen mode, press KEY to go back)

I need it to be drawn 'above' any pages, so that when the user scrolls, it
stays in the same
place (so it is not similar to the new header and footer blue boxes, in
that they are per
page, this needs to be one box for the whole document)


The full screen mode has a little toolbar window with title Full 
screen, that behaves the same way as you want. Perhaps you can tweak it 
to show your desired text and looks like you want.


Kind regards
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License Statement

2012-04-27 Thread Marc-André Laverdière

Hello,

Just to make sure it is out there...

all of my past and future contributions are licensed under the
MPL/LGPLv3+ dual license until further notice.

Marc-André LAVERDIÈRE
Perseverance must finish its work so that you may be mature and complete,
not lacking anything. -James 1:4
http://asimplediscipleslife.blogspot.com/
mlaverd.theunixplace.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: chart2/qa sc/qa test/inc test/source

2012-04-27 Thread Markus Mohrhard

 chart2/qa/unit/data/tolerance.xml |7 +++
 sc/qa/extras/regression-test.cxx  |7 ---
 test/inc/test/xmldiff.hxx |2 +-
 test/source/diff/diff.cxx |   10 --
 4 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit 60d39b758dc9308d6ce7464875b3a17f26be3d79
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Apr 27 13:50:37 2012 +0200

add tolerance to chart regression test

Change-Id: I5e7694571815df48e54488a33435bb7d022e6889

diff --git a/chart2/qa/unit/data/tolerance.xml 
b/chart2/qa/unit/data/tolerance.xml
new file mode 100644
index 000..d2c00fb
--- /dev/null
+++ b/chart2/qa/unit/data/tolerance.xml
@@ -0,0 +1,7 @@
+?xml version=1.0?
+tolerances
+tolerance elementName=XShape attribName=positionX value=2 
relative=false/
+tolerance elementName=XShape attribName=positionY value=2 
relative=false/
+tolerance elementName=XShape attribName=sizeX value=2 
relative=false/
+tolerance elementName=XShape attribName=sizeY value=2 
relative=false/
+/tolerances
diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx
index 77a7557..2c28105 100644
--- a/sc/qa/extras/regression-test.cxx
+++ b/sc/qa/extras/regression-test.cxx
@@ -65,14 +65,15 @@ using namespace ::com::sun::star::uno;
 
 namespace {
 
-bool checkDumpAgainstFile( const rtl::OUString rDump, const rtl::OUString 
aFilePath )
+bool checkDumpAgainstFile( const rtl::OUString rDump, const rtl::OUString 
aFilePath, const rtl::OUString rToleranceFile)
 {
 rtl::OString aOFile = rtl::OUStringToOString(aFilePath, 
RTL_TEXTENCODING_UTF8);
+rtl::OString aToleranceFile = rtl::OUStringToOString(rToleranceFile, 
RTL_TEXTENCODING_UTF8);
 
 CPPUNIT_ASSERT_MESSAGE(dump is empty, !rDump.isEmpty());
 
 rtl::OString aDump = rtl::OUStringToOString(rDump, RTL_TEXTENCODING_UTF8);
-XMLDiff aDiff(aOFile.getStr(), 
aDump.getStr(),static_castint(rDump.getLength()));
+XMLDiff aDiff(aOFile.getStr(), 
aDump.getStr(),static_castint(rDump.getLength()), aToleranceFile.getStr());
 
 return aDiff.compare();
 }
@@ -148,7 +149,7 @@ void ScChartRegressionTest::test()
 
 rtl::OUString aDump = xDumper-dump();
 std::cout  aDump;
-bool bCompare = checkDumpAgainstFile( aDump, 
getPathFromSrc(/chart2/qa/unit/data/reference/testChart.xml) );
+bool bCompare = checkDumpAgainstFile( aDump, 
getPathFromSrc(/chart2/qa/unit/data/reference/testChart.xml), 
getPathFromSrc(/chart2/qa/unit/data/tolerance.xml) );
 CPPUNIT_ASSERT(bCompare);
 }
 
diff --git a/test/inc/test/xmldiff.hxx b/test/inc/test/xmldiff.hxx
index a787132..c092637 100644
--- a/test/inc/test/xmldiff.hxx
+++ b/test/inc/test/xmldiff.hxx
@@ -78,7 +78,7 @@ class OOO_DLLPUBLIC_TEST XMLDiff
 public:
 XMLDiff(const std::string file1, const std::string file2, const 
std::string toleranceFile);
 XMLDiff(const std::string file1, const std::string file2);
-XMLDiff(const char* pFileName, const char* pContent, int size);
+XMLDiff(const char* pFileName, const char* pContent, int size, const char* 
pToleranceFileName);
 ~XMLDiff();
 
 bool compare();
diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx
index 8587fd7..574805d 100644
--- a/test/source/diff/diff.cxx
+++ b/test/source/diff/diff.cxx
@@ -56,10 +56,14 @@ XMLDiff::XMLDiff(const std::string file1, const 
std::string file2)
 xmlFile2 = xmlParseFile(file2.c_str());
 }
 
-XMLDiff::XMLDiff( const char* pFileName, const char* pContent, int size)
+XMLDiff::XMLDiff( const char* pFileName, const char* pContent, int size, const 
char* pToleranceFile)
 {
 xmlFile1 = xmlParseFile(pFileName);
 xmlFile2 = xmlParseMemory(pContent, size);
+
+xmlDocPtr xmlToleranceFile = xmlParseFile(pToleranceFile);
+loadToleranceFile(xmlToleranceFile);
+xmlFreeDoc(xmlToleranceFile);
 }
 
 XMLDiff::~XMLDiff()
@@ -84,7 +88,9 @@ void readAttributesForTolerance(xmlNodePtr node, tolerance 
tol)
 tol.value = val;
 
 xmlChar* relative = xmlGetProp(node, BAD_CAST(relative));
-bool rel = xmlXPathCastStringToBoolean(relative);
+bool rel = false;
+if(xmlStrEqual(relative, BAD_CAST(true)))
+rel = true;
 xmlFree(relative);
 tol.relative = rel;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-04-27 Thread Miklos Vajna

 sw/source/filter/ww8/ww8graf.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e652ba3c7357e0396498629891a1391ace67c4d7
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Apr 27 14:30:16 2012 +0200

n#757910 fix WW8 import of textboxes with thin border/inner margin

There were two problems here:

First, nLineThick was already in twips, so converting it again from EMU
rendered thin borders invisible.

Second, when the border width is set to zero, that means a minimal
border, but we interpreted it as default width (which resulted in less
space for the textbox contents than required).

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index b044636..65431a5 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1568,7 +1568,7 @@ sal_Int32 
SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color rLineColor,
 SvxBorderLine aLine;
 aLine.SetColor( rLineColor );
 
-aLine.SetWidth( long ( nLineThick / 65 ) ); // Convert EMUs to Twips
+aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is 
already in twips
 aLine.SetStyle( nIdx );
 
 for(sal_uInt16 nLine = 0; nLine  4; ++nLine)
@@ -1625,7 +1625,8 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* 
pSdrObj,
 // Rahmen-GROESSE benoetigt!
 SvxBoxItem aBox(sw::util::ItemGetSvxBoxItem(rFlySet, RES_BOX));
 // dashed oder solid wird zu solid
-sal_Int32 nLineThick = 0, nOutside=0;
+// WW-default: 0.75 pt = 15 twips
+sal_Int32 nLineThick = 15, nOutside=0;
 
 // check if LineStyle is *really* set!
 const SfxPoolItem* pItem;
@@ -1640,7 +1641,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* 
pSdrObj,
 nLineThick = WW8ITEMVALUE(rOldSet, XATTR_LINEWIDTH, XLineWidthItem);
 
 if( !nLineThick )
-nLineThick = 15; // WW-default: 0.75 pt
+nLineThick = 1; // for Writer, zero is no border, so set a 
minimal value
 
 nOutside = MatchSdrBoxIntoFlyBoxItem(aLineColor, eLineStyle,
 eDashing, eShapeType, nLineThick, aBox);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - fpicker/source sfx2/source

2012-04-27 Thread Stephan Bergmann

 fpicker/source/office/PlacesListBox.cxx |2 +-
 sfx2/source/doc/guisaveas.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 449440706c6db8f10d37321ed1280d986d07b9f3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Apr 27 14:38:50 2012 +0200

NOINITIALSELECTION important for Save As

...as otherwise the initial selection would overwrite the passed-in
directory where to save to.

Change-Id: Iafb3aa8a120a777f9bf15c00ab3b9c0379bd3b2c

diff --git a/fpicker/source/office/PlacesListBox.cxx 
b/fpicker/source/office/PlacesListBox.cxx
index 5338cb7..708b500 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -40,7 +40,7 @@ namespace css = com::sun::star;
 using rtl::OUString;
 
 PlacesListBox_Impl::PlacesListBox_Impl( Window* pParent, const rtl::OUString 
rTitle ) :
-SvHeaderTabListBox( pParent, WB_TABSTOP ),
+SvHeaderTabListBox( pParent, WB_TABSTOP | WB_NOINITIALSELECTION ),
 mpHeaderBar( NULL )
 {
 Size aBoxSize = pParent-GetSizePixel( );
commit 41b0d974e40ba777955dd22a09a0bfe44d17fdeb
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Apr 27 14:34:25 2012 +0200

SetDisplayDirectory is deprecated

...and SetDisplayFolder seems correct here, anyway, given that 
aReccomendedDir (sic)
denotes a directory, not a file.

Change-Id: I2f77e8e9fe0948a028f344639d383726b4b8641d

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 4009639..3231bde 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -957,7 +957,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 
nStoreMode,
 
 ::rtl::OUString aReccomendedDir = GetReccomendedDir( aSuggestedDir );
 if ( !aReccomendedDir.isEmpty() )
-pFileDlg-SetDisplayDirectory( aReccomendedDir );
+pFileDlg-SetDisplayFolder( aReccomendedDir );
 ::rtl::OUString aReccomendedName = GetReccomendedName( aSuggestedName, 
aAdjustToType );
 if ( !aReccomendedName.isEmpty() )
 pFileDlg-SetFileName( aReccomendedName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: a stab at removing atl stuff. window experience needed.

2012-04-27 Thread Regina Henschel

Hi Caolán,

Caolán McNamara schrieb:

In an effort to make building under windows a pain-free as possible.
I'm playing with removing the atl usage in embedserv seeing as
MSVC2008 Express doesn't come with it.

But there is a way to get the needed libraries.
https://wiki.documentfoundation.org/Development/BuildingOnWindowsWithCygwinAndMSVCExpress#Getting_ATL_work_with_Visual_Studio_Express

voodoo-programming in embedserv using:
http://samscode.blogspot.com/2009/10/atl-removal-part-1-removing-begincommap.html

I end up with the attached.

a) I haven't a clue what embedserv even does, or how to test it ? b)
I see that we have...

CComModule _Module; BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP()

_Module.Init(ObjectMap, hInstance, NULL); ... _Module.Term();

because I'm clueless, I'm wondering if this even makes sense when we
have an empty OBJECT_MAP ?, or is still doing some necessary
reference counting of the module itself ? I mean we could follow
http://samscode.blogspot.com/2009/10/atl-removal-part-3-tackling-module-and.html
and convert it over. But might be a bit silly to do that if its just
some non-functional stub left over form some wizard generated code.

I don't know about the code. But I thought atl is needed for OLE
embedding. You should be able to use MathType for example. You can test
it with a new OLE object of type PaintBrush. (Insert Object OLE
object From file seems to be broken in the moment.)

Kind regards
Regina

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Removed unused methods

2012-04-27 Thread Jan Holesovsky

Hi Jesus,

Jesús Corrius píše v Čt 26. 04. 2012 v 15:52 +0200:

 I have added a comment so it doesn't happen again:
 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=34fe1bed19e4cf66500d7e7817eb251c42f8f439

#ifdef WNT / #endif would be better ;-) - can you do that, please?

Thank you,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-ux-advise] [PUSHED] fdo#48870: Remove cookie handling code.

2012-04-27 Thread Stefan Knorr (Astron)

Hi Gabor, Michael,

        No doubt Astron will be glad to see that cookie image die ;-)

No doubt, I am. Thank you, Gabor!


        On the 'cleanup themes to help artists' front, bug:

        https://bugs.freedesktop.org/show_bug.cgi?id=48873

        could use being split into smaller pieces, and checking / removing them
 in chunks - having tons of obsolete images around there is just annoying
 for the artists :-)

Oh wow, hadn't seen that bug. Sounds great!

Astron.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: a stab at removing atl stuff. window experience needed.

2012-04-27 Thread Jesús Corrius

On Fri, Apr 27, 2012 at 1:28 PM, Caolán McNamara caol...@redhat.com wrote:
 In an effort to make building under windows a pain-free as possible. I'm
 playing with removing the atl usage in embedserv seeing as MSVC2008
 Express doesn't come with it.

And mingw doesn't compile it...

There's also some problematic code in shellextensions, I think.

 a) I haven't a clue what embedserv even does, or how to test it ?

I used to develop COM+ stuff in plain C (much fun) like 10 years ago.
I just remember the basics but I surely remember how to test it. I can
help you with that. In fact, I will try the component this weekend if
I have some spare time. It would be a lot of fun.

 b) I see that we have...

 CComModule _Module;
 BEGIN_OBJECT_MAP(ObjectMap)
 END_OBJECT_MAP()

 _Module.Init(ObjectMap, hInstance, NULL);
 ...
 _Module.Term();

 because I'm clueless, I'm wondering if this even makes sense when we
 have an empty OBJECT_MAP ?, or is still doing some necessary reference
 counting of the module itself ? I mean we could follow
 http://samscode.blogspot.com/2009/10/atl-removal-part-3-tackling-module-and.html
  and convert it over. But might be a bit silly to do that if its just some 
 non-functional stub left over form some wizard generated code.

Right. If my memory serves me well, this code was almost an exact copy
of an MSDN old sample with a few changes here and there. So I wouldn't
be surprised if some parts of the code are just there because they
were in the sample.

The code in the blog post looks perfectly well to me. And yes,
everything you find there is required.

-- 
Jesús Corrius je...@softcatala.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: a stab at removing atl stuff. window experience needed.

2012-04-27 Thread Jesús Corrius

 I don't know about the code. But I thought atl is needed for OLE embedding.
 You should be able to use MathType for example.  You can test it with a new
 OLE object of type PaintBrush. (Insert  Object  OLE object  From file
 seems to be broken in the moment.)

ATL is just a helper to make COM+ development easier, usually used in
conjunction with MFC.
You can do everything without it, but then you have to write more code.

-- 
Jesús Corrius je...@softcatala.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: chart2/qa

2012-04-27 Thread Markus Mohrhard

 chart2/qa/unit/data/tolerance.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fb4bbfbaccb6ac4ecf04384684827d9d0969f167
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Apr 27 15:10:44 2012 +0200

increase tolerance for now for clang tinderbox

see fdo#49221

Change-Id: I77ac9a80b497048c4729376f486f34a27f489067

diff --git a/chart2/qa/unit/data/tolerance.xml 
b/chart2/qa/unit/data/tolerance.xml
index d2c00fb..895c994 100644
--- a/chart2/qa/unit/data/tolerance.xml
+++ b/chart2/qa/unit/data/tolerance.xml
@@ -1,7 +1,7 @@
 ?xml version=1.0?
 tolerances
 tolerance elementName=XShape attribName=positionX value=2 
relative=false/
-tolerance elementName=XShape attribName=positionY value=2 
relative=false/
+tolerance elementName=XShape attribName=positionY value=1.2 
relative=true/
 tolerance elementName=XShape attribName=sizeX value=2 
relative=false/
-tolerance elementName=XShape attribName=sizeY value=2 
relative=false/
+tolerance elementName=XShape attribName=sizeY value=1.2 
relative=true/
 /tolerances
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Removed unused methods

2012-04-27 Thread Stephan Bergmann


On 04/27/2012 02:54 PM, Jan Holesovsky wrote:

Jesús Corrius píše v Čt 26. 04. 2012 v 15:52 +0200:

I have added a comment so it doesn't happen again:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=34fe1bed19e4cf66500d7e7817eb251c42f8f439


#ifdef WNT / #endif would be better


Would it really be better?  With our huge configuration matrix, I guess 
there will always be functions left unused for some specific 
configurations.  #ifdef'ing up the code to avoid that in general would 
IMO not make the code better, but worse (by cluttering it with #ifdefs).


If a class has some generally-useful--looking member functions that 
happen to only be used with certain configurations, I see nothing bad 
with leaving them in unconditionally.  (Note, I have no idea whether the 
given FontSelectPattern ctor qualifies.)


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: chart2/qa

2012-04-27 Thread Markus Mohrhard

 chart2/qa/unit/data/tolerance.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 26966ebf030c4d988284c78d9772c0f9ae0e5383
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Apr 27 15:15:24 2012 +0200

increase the tollerance for x differences for sberg's tinderbox

Change-Id: I0538e1ccebf81d1cbcfe2756045ebb9e876e50ac

diff --git a/chart2/qa/unit/data/tolerance.xml 
b/chart2/qa/unit/data/tolerance.xml
index 895c994..82e9e45 100644
--- a/chart2/qa/unit/data/tolerance.xml
+++ b/chart2/qa/unit/data/tolerance.xml
@@ -1,7 +1,7 @@
 ?xml version=1.0?
 tolerances
-tolerance elementName=XShape attribName=positionX value=2 
relative=false/
+tolerance elementName=XShape attribName=positionX value=1.01 
relative=true/
 tolerance elementName=XShape attribName=positionY value=1.2 
relative=true/
-tolerance elementName=XShape attribName=sizeX value=2 
relative=false/
+tolerance elementName=XShape attribName=sizeX value=1.01 
relative=true/
 tolerance elementName=XShape attribName=sizeY value=1.2 
relative=true/
 /tolerances
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED][PATCH] Fix debug message and remove useless try...catch from ImplImageTree::loadImage

2012-04-27 Thread Caolán McNamara

On Thu, 2012-04-26 at 00:08 +0200, Gábor Stefanik wrote:
 The debug message references a different file name than what is
 actually being loaded.
 
 Also, the try...catch block looks superfluous, it merely re-throws
 whatever exception it has caught.

Seems to be the case alright, pushed now, thanks for this.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED][REVIEW:3-5] fdo#48876 fix RTF import of \sl without \slmult

2012-04-27 Thread Caolán McNamara

On Thu, 2012-04-26 at 10:50 +0200, Miklos Vajna wrote:
 Hi,
 
 See
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=99b875a
 
 Regression from 3.4; backported patch attached.

Seems sane, pushed.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source

2012-04-27 Thread Caolán McNamara

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit beef79827164be4e5a60310515fa6aaf8d76237c
Author: Miklos Vajna vmik...@suse.cz
Date:   Sat Apr 21 12:53:22 2012 +0200

fdo#48876 fix RTF import of \sl without \slmult

(backport of 99b875aee04a808fb28715fb0e143a2b00332832)

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ff81727..fd57905 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2404,9 +2404,15 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 }
 break;
 case RTF_SL:
-if (nParam  0)
 {
-// NS_sprm::LN_PDyaLine could be used, but that won't work 
with slmult
+// This is similar to RTF_ABSH, negative value means 'exact', 
positive means 'at least'.
+RTFValue::Pointer_t pValue(new 
RTFValue(NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_atLeast));
+if (nParam  0)
+{
+pValue.reset(new 
RTFValue(NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_exact));
+pIntValue.reset(new RTFValue(-nParam));
+}
+
m_aStates.top().aParagraphAttributes-push_back(make_pair(NS_ooxml::LN_CT_Spacing_lineRule,
 pValue));
 
m_aStates.top().aParagraphAttributes-push_back(make_pair(NS_ooxml::LN_CT_Spacing_line,
 pIntValue));
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - dbaccess/Library_dbaxml.mk dbaccess/Library_dbui.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk vcl/source

2012-04-27 Thread Caolán McNamara

 dbaccess/Library_dbaxml.mk  |3 ---
 dbaccess/Library_dbu.mk |4 ++--
 dbaccess/Library_dbui.mk|4 ++--
 dbaccess/Library_sdbt.mk|3 ---
 vcl/source/gdi/impimagetree.cxx |   13 -
 5 files changed, 8 insertions(+), 19 deletions(-)

New commits:
commit eb1a4bb908534b68527a9746aca4b6d5dd6a538d
Author: GÃ¡bor Stefanik netrolller...@gmail.com
Date:   Wed Apr 25 23:49:06 2012 +0200

Fix debug message and remove useless try...catch from 
ImplImageTree::loadImage

diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 31f507c..14dfcd1 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -170,15 +170,10 @@ bool ImplImageTree::loadImage(
 if (found || !loadMissing)
 return found;
 
-try {
-OSL_TRACE(
-ImplImageTree::loadImage exception couldn't load \%s\, fetching 
missing_icon.png,
-rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr());
-found = loadDefaultImage(style, bitmap);
-} catch (css::uno::RuntimeException ) {
-throw;
-}
-return found;
+OSL_TRACE(
+ImplImageTree::loadImage exception couldn't load \%s\, fetching 
default image,
+rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr());
+return loadDefaultImage(style, bitmap);
 }
 
 bool ImplImageTree::loadDefaultImage(
commit d4e9eb3db2c9abcfdfbb0dc3889873db2f788e58
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Apr 27 13:50:26 2012 +0100

WaE: exception handlers used in code without unwind support

Change-Id: I1efec5017927d06c519f65312ab29e2b19a6cff6

diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index 093a2eb..0854533 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -86,9 +86,6 @@ $(eval $(call gb_Library_add_exception_objects,dbaxml,\
 dbaccess/source/filter/xml/xmlTableFilterList \
 dbaccess/source/filter/xml/xmlTableFilterPattern \
 dbaccess/source/shared/flt_reghelper \
-))
-
-$(eval $(call gb_Library_add_noexception_objects,dbaxml,\
 dbaccess/source/shared/xmlstrings \
 ))
 
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 44d75b5..5d9462c 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -87,6 +87,7 @@ $(eval $(call 
gb_Library_set_componentfile,dbu,dbaccess/util/dbu))
 
 $(eval $(call gb_Library_add_exception_objects,dbu,\
 dbaccess/source/shared/dbu_reghelper \
+dbaccess/source/shared/dbustrings \
 dbaccess/source/ui/app/AppController \
 dbaccess/source/ui/app/AppControllerDnD \
 dbaccess/source/ui/app/AppControllerGen \
@@ -156,6 +157,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
 dbaccess/source/ui/dlg/indexdialog \
 dbaccess/source/ui/dlg/indexfieldscontrol \
 dbaccess/source/ui/dlg/odbcconfig \
+dbaccess/source/ui/dlg/optionalboolitem \
 dbaccess/source/ui/dlg/paramdialog \
 dbaccess/source/ui/dlg/queryfilter \
 dbaccess/source/ui/dlg/queryorder \
@@ -266,9 +268,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
 ))
 
 $(eval $(call gb_Library_add_noexception_objects,dbu,\
-dbaccess/source/shared/dbustrings \
 dbaccess/source/ui/control/ScrollHelper \
-dbaccess/source/ui/dlg/optionalboolitem \
 dbaccess/source/ui/querydesign/TableFieldInfo \
 ))
 
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index a8f6aa2..ca2c126 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Library_use_libraries,dbui,\
 endif
 
 $(eval $(call gb_Library_add_exception_objects,dbui,\
+   dbaccess/source/shared/dbustrings \
dbaccess/source/ui/app/AppDetailView \
dbaccess/source/ui/app/AppController \
dbaccess/source/ui/app/AppControllerDnD \
@@ -143,6 +144,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/dlg/dlgsave \
dbaccess/source/ui/dlg/admincontrols \
dbaccess/source/ui/dlg/adminpages \
+   dbaccess/source/ui/dlg/optionalboolitem \
dbaccess/source/ui/dlg/queryorder \
dbaccess/source/ui/dlg/queryfilter \
dbaccess/source/ui/dlg/paramdialog \
@@ -274,14 +276,12 @@ $(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/ui/browser/AsyncronousLink \
dbaccess/source/ui/dlg/dlgsize \
dbaccess/source/ui/dlg/dlgattr \
-   dbaccess/source/ui/dlg/optionalboolitem \
dbaccess/source/ui/querydesign/TableFieldInfo \
dbaccess/source/ui/querydesign/QTableConnectionData \
dbaccess/source/ui/querydesign/QTableWindowData \
dbaccess/source/ui/querydesign/ConnectionLine \
dbaccess/source/ui/querydesign/ConnectionLineData \
dbaccess/source/shared/dbu_reghelper \
-   dbaccess/source/shared/dbustrings \
 ))
 
 # the following source file can't be compiled with optimization by some

1 2 3 >

1 - 100 of 216 matches

Mail list logo