date:20130416

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3405

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3405
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4eee6a02ea545b93a93d18d9c5e200ed8b831c29
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulelah Alarifi asalar...@kacst.edu.sa
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

[Libreoffice-commits] core.git: sc/uiconfig

2013-04-16 Thread Abdulelah Alarifi

 sc/uiconfig/scalc/ui/goalseekdlg.ui |  244 
 1 file changed, 244 insertions(+)

New commits:
commit 163a64ef2610f2f3e1f3a9acc5bf1e9545b02ffe
Author: Abdulelah Alarifi asalar...@kacst.edu.sa
Date:   Tue Apr 16 11:52:10 2013 +0300

Converted Tools - Goal Seek widget.

Change-Id: I4eee6a02ea545b93a93d18d9c5e200ed8b831c29
Reviewed-on: https://gerrit.libreoffice.org/3405
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/uiconfig/scalc/ui/goalseekdlg.ui 
b/sc/uiconfig/scalc/ui/goalseekdlg.ui
new file mode 100644
index 000..d9166d33
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/goalseekdlg.ui
@@ -0,0 +1,244 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=goalseek
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesGoal Seek/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=spacing2/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=ok
+property name=labelgtk-ok/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+  object class=GtkGrid id=grid1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=row_spacing6/property
+property name=column_spacing12/property
+child
+  object class=GtkLabel id=label2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yes_Formula 
cell/property
+property name=use_underlineTrue/property
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
+

Re: [Libreoffice-qa] Enhancements - Getting User Input

On 16/04/13 15:04, Robinson Tryon wrote:
  If they wanted to work on them, they would work on
  them independently on the voting results.
 
 Hmm... I imagine that some of the volunteers might like a little
 guidance as to what bugs/issues are most affecting our users right
 now?
 
Or, like me, they have very definite ideas on what they want to do.

I'm trying hard to work on the database (but a sick wife doesn't make
life easy :-)

I've also got very definite ideas about what I'd like to see in LO that
I can't really tackle (a reveal codes screen a la WordPerfect).

I agree with others - the only way you could really get this to work is
for a company to sponsor it and agree to pay for the selected enhancements.

The other way to allow people to vote is to have a bounty system - but
that's not fair to volunteers either, as chances are they won't get paid
for adding enhancements important to them.

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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - xmlhelp/prj

2013-04-16 Thread Petr Mladek

 xmlhelp/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3b593c9b9c014bbfffa3d19b7649229d2c4747b3
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Apr 16 18:14:55 2013 +0200

xmlhelp depends on vcl now

The dependency has been added by the commit icon style fixes in local help

Change-Id: Icb2d5b14c5d71221bda272cf63a53512c9b21fc9

diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index f88ac06..e39297e 100644
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
@@ -1,3 +1,3 @@
-xh  xmlhelp :   comphelper ucbhelper LIBXSLT:libxslt unoil 
javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools NULL
+xh  xmlhelp :   comphelper ucbhelper LIBXSLT:libxslt unoil 
javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools vcl NULL
 xh xmlhelp 
usr1-   all xh_mkout NULL
 xh xmlhelp\prj nmake   -   all 
xh_prj NULL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Master branch now requires liborcus 0.5.0 or higher.

2013-04-16 Thread Kohei Yoshida

On Sat, Apr 13, 2013 at 5:55 AM, Bjoern Michaelsen 
bjoern.michael...@canonical.com wrote:

 Hi Kohei,

 On Sat, Apr 13, 2013 at 02:46:33AM -0400, Kohei Yoshida wrote:
  FYI, I've updated liborcus on the master branch just now. You now need
  liborcus 0.5.0 or higher in order to build.  It took me 2 days just to
  integrate this piece, but I've ensured that it builds both on Linux and
  Windows. So hopefully no major build issues.

 You mentioned some trouble with the build system on Windows elsewhere and I
 assume it was about this one. Could you elaborate on that? Did the trouble
 stem
 from gbuild itself, from our use of cygwin or from MSVC particularities?


I'd say gbuild itself, compounded by some regular build breakage related to
ccache (particular if you use a combination of gcc-wrapper with ccache
directly specified in CC and CXX environment variables), and the very weird
handling of DLL's by MSVC.  The slow build process on Windows didn't make
the whole experience any better.

But you need to understand that this whole frustration of mine comes from
my emotional self, not my logical self. And I've been on this list long
enough to know that what typically follows after such an emotional venting
post is normally some logical reasoning on why things are how they are,
and my logical self understands that there is no solution for this.  So,
I'd rather not try to improve the situation which would likely not go
anywhere and/or only create more work on others.

Having said that, if I were to point out one major concern with the current
build system is that we are creating so many layers of abstractions,
indirections just to make the system more elegant that, it's becoming
increasing hard for non-build system experts to do anything non-trivial.
So, for a non-build system expert such as myself, the choices are either 1)
don't do anything non-trivial, such as integrating an external library into
the build, or 2) become a build expert yourself.



 BTW, this seems like a prime example benefitting from upload to gerrit,
 let
 someone schudule a test build on all platforms -- any reason you skipped
 that?


Skipped?  I don't use gerrit for things that need to be done right away. So
it wasn't even an option.  I needed that to be done right away so that I
could move on to doing other things which depended on it. Putting that up
on gerrit and wait for a few days or more was never an option for this.
Plus, the whole feature branch needed to be merged, which isn't a typical
use case for gerrit review system anyway.

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

Re: patch for postgresql driver

On 16/04/13 16:13, Lubos Lunak wrote:
 On Tuesday 16 of April 2013, Wols Lists wrote:
 The attached patch is not in logerrit (I've yet to set that up), and
 there's an error in it so I'm hoping someone can help. It does a TODO in
 the file, but I can't get my argument casting right - in the original
 code, matchIgnoreAsciiCaseAsciiL wraps its argument in
 RTL_CONSTASCII_STRINGPARAM. This is defined in sal/inc/rtl/string.h and
 passes both the string and its length. So me removing it is obviously a
 mistake, but it's got some integrity checking in there and I just can't
 get it to pass that.
 
  Actually removing it is not a mistake. The macro is a cumbersome 
 micro-optimization and here it presumably doesn't make any difference. Just 
 calling matchIgnoreAsciiCase() should do.
 
  Also note that LO has SAL_N_ELEMENTS macro for getting the number of items 
 in 
 an array.
 
Okay, looks like SAL_N_ELEMENTS does just as required. But calling
matchIgnoreAsciiCase still doesn't work ...

/home/anthony/gitstuff/loffice/connectivity/source/drivers/postgresql/pq_connection.cxx:502:68:
error: no matching function for call to
‘rtl::OUString::matchIgnoreAsciiCase(const char*) const’
/home/anthony/gitstuff/loffice/connectivity/source/drivers/postgresql/pq_connection.cxx:502:68:
note: candidates are:
/home/anthony/gitstuff/loffice/instdir/unxlngx6.pro/sdk/include/rtl/ustring.hxx:654:14:
note: sal_Bool rtl::OUString::matchIgnoreAsciiCase(const rtl::OUString,
sal_Int32) const
/home/anthony/gitstuff/loffice/instdir/unxlngx6.pro/sdk/include/rtl/ustring.hxx:654:14:
note:   no known conversion for argument 1 from ‘const char*’ to ‘const
rtl::OUString’
/home/anthony/gitstuff/loffice/instdir/unxlngx6.pro/sdk/include/rtl/ustring.hxx:667:64:
note: templateclass T typename
rtl::internal::ConstCharArrayDetectorT, bool::Type
rtl::OUString::matchIgnoreAsciiCase(T, sal_Int32) const

I need to force some type of type conversion - basically from const
char * to const rtl::OUString, I presume.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - xmlhelp/prj

2013-04-16 Thread Petr Mladek

 xmlhelp/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 243df043a4ee78509049c5fd5a9f72cce46b029c
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Apr 16 18:14:55 2013 +0200

xmlhelp depends on vcl now

The dependency has been added by the commit icon style fixes in local help

Change-Id: Icb2d5b14c5d71221bda272cf63a53512c9b21fc9
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index f88ac06..e39297e 100644
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
@@ -1,3 +1,3 @@
-xh  xmlhelp :   comphelper ucbhelper LIBXSLT:libxslt unoil 
javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools NULL
+xh  xmlhelp :   comphelper ucbhelper LIBXSLT:libxslt unoil 
javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools vcl NULL
 xh xmlhelp 
usr1-   all xh_mkout NULL
 xh xmlhelp\prj nmake   -   all 
xh_prj NULL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/source

2013-04-16 Thread Stephan Bergmann

 scripting/source/stringresource/stringresource.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 617e7c623167308e6fb8501822158fe1af72ba47
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Apr 16 19:07:36 2013 +0200

Missing include

Change-Id: I1be082b7db5592ad5090cf3ffaafe708bb1d9be4

diff --git a/scripting/source/stringresource/stringresource.cxx 
b/scripting/source/stringresource/stringresource.cxx
index 5bc2842..689f6f7 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -32,7 +32,7 @@
 #include com/sun/star/container/XNameAccess.hpp
 #include com/sun/star/ucb/SimpleFileAccess.hpp
 
-
+#include rtl/tencinfo.h
 #include rtl/ustrbuf.hxx
 #include rtl/strbuf.hxx
 #include tools/urlobj.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cppu/source

 cppu/source/uno/lbenv.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 8a9398fad0c5267f25ce8bc68eb63e91334faff5
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 16 20:24:07 2013 +0300

WaE: variable 'hMod' set but not used

Change-Id: Iae64943671a576159be0fa311bc503aa96b2b5df

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index bab6ffd..2337318 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1052,7 +1052,6 @@ static bool loadEnv(OUString const   cLibStem,
 uno_Environment * pEnv)
 {
 #ifdef DISABLE_DYNLOADING
-oslModule hMod;
 uno_initEnvironmentFunc fpInit;
 
 if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME _uno )
@@ -1068,9 +1067,6 @@ static bool loadEnv(OUString const   cLibStem,
 #endif
 return false;
 }
-// In the DISABLE_DYNLOADING case the functions that hMod is
-// passed to below don't do anything with it anyway.
-hMod = 0;
 #else
 // late init with some code from matching uno language binding
 // will be unloaded by environment
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] forward RTL_CONTEXT_foo logging to SAL_INFO in default debug...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3421

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/3421/1

forward RTL_CONTEXT_foo logging to SAL_INFO in default debugging

* RTL_CONTEXT_foo is originally intended to be used for performance
  measurement, but mostly unused right now
* however its macros are sprinkled all over the codebase and might
  provide good help for ad-hoc debugging, and prevent SAL_INFO
  duplication
* if there is no performance logging, these macros are now forwarded to
  SAL_INFO with logarea logfile or $AREA.logfile

Change-Id: I495c8924e5b55124f7eac68eccda074d0740c117
---
M sal/inc/rtl/logfile.hxx
1 file changed, 15 insertions(+), 3 deletions(-)



diff --git a/sal/inc/rtl/logfile.hxx b/sal/inc/rtl/logfile.hxx
index 5ee0739..e29c4af 100644
--- a/sal/inc/rtl/logfile.hxx
+++ b/sal/inc/rtl/logfile.hxx
@@ -21,6 +21,8 @@
 
 #include rtl/logfile.h
 #include rtl/string.hxx
+#include rtl/strbuf.hxx
+#include sal/log.hxx
 
 namespace rtl
 {
@@ -161,9 +163,19 @@
 rtl_logfile_trace( \n )
 
 #else
-#define RTL_LOGFILE_CONTEXT( instance, name )  ((void)0)
-#define RTL_LOGFILE_CONTEXT_AUTHOR( instance, project, author, name )  
((void)0)
-#define RTL_LOGFILE_CONTEXT_TRACE( instance, message )  ((void)0)
+#define RTL_LOGFILE_FORWARD_VIA_SAL_LOG(area, message) \
+do { \
+OStringBuffer full_area; \
+full_area.append(OString(area)); \
+if(full_area.getLength()) \
+full_area.append(.); \
+full_area.append(OString(logfile)); \
+SAL_INFO(full_area.makeStringAndClear().getStr(), message); \
+} while (false)
+
+#define RTL_LOGFILE_CONTEXT( instance, name )  
RTL_LOGFILE_FORWARD_VIA_SAL_LOG(, name)
+#define RTL_LOGFILE_CONTEXT_AUTHOR( instance, project, author, name )  
RTL_LOGFILE_FORWARD_VIA_SAL_LOG(project, name)
+#define RTL_LOGFILE_CONTEXT_TRACE( instance, message )  
RTL_LOGFILE_FORWARD_VIA_SAL_LOG(, message)
 #define RTL_LOGFILE_CONTEXT_TRACE1( instance, frmt, arg1 ) ((void)arg1,(void)0)
 #define RTL_LOGFILE_CONTEXT_TRACE2( instance, frmt, arg1, arg2 ) 
((void)arg1,(void)arg2,(void)0)
 #define RTL_LOGFILE_CONTEXT_TRACE3( instance, frmt, arg1, arg2 , arg3 ) 
((void)arg1,(void)arg2,(void)arg3,(void)0)

-- 
To view, visit https://gerrit.libreoffice.org/3421
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I495c8924e5b55124f7eac68eccda074d0740c117
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com

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

[PATCH] fdo#62096 - replace some O(U)String compareTo with ==

2013-04-16 Thread Artur Dryomov (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3422

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/3422/1

fdo#62096 - replace some O(U)String compareTo with ==

Change-Id: I98d04d7da4c2b7ea0b769df9c2bfa8c1ad86bf2d
---
M package/source/xstor/xfactory.cxx
M package/source/zippackage/zipfileaccess.cxx
M sal/workben/testfile.cxx
M sd/source/ui/remotecontrol/DiscoveryService.cxx
M sdext/source/pdfimport/wrapper/wrapper.cxx
M sfx2/source/appl/xpackcreator.cxx
M sfx2/source/doc/ownsubfilterservice.cxx
M sot/source/unoolestorage/xolesimplestorage.cxx
M svtools/source/hatchwindow/documentcloser.cxx
M svtools/source/hatchwindow/hatchwindowfactory.cxx
M svx/source/form/datanavi.cxx
M swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
M vcl/generic/fontmanager/fontcache.cxx
M vcl/unx/generic/dtrans/X11_clipboard.cxx
M vcl/unx/generic/dtrans/X11_droptarget.cxx
M vcl/unx/generic/dtrans/X11_selection.cxx
M vcl/unx/kde/UnxFilePicker.cxx
M vcl/unx/kde4/KDE4FilePicker.cxx
18 files changed, 29 insertions(+), 29 deletions(-)



diff --git a/package/source/xstor/xfactory.cxx 
b/package/source/xstor/xfactory.cxx
index 8cf91ed..11fb074 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -294,7 +294,7 @@
 uno::Sequence OUString  aSeq = impl_staticGetSupportedServiceNames();
 
 for ( sal_Int32 nInd = 0; nInd  aSeq.getLength(); nInd++ )
-if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
+if ( ServiceName == aSeq[nInd] )
 return sal_True;
 
 return sal_False;
diff --git a/package/source/zippackage/zipfileaccess.cxx 
b/package/source/zippackage/zipfileaccess.cxx
index 09a6e89..4365482 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -469,7 +469,7 @@
 uno::Sequence OUString  aSeq = impl_staticGetSupportedServiceNames();
 
 for ( sal_Int32 nInd = 0; nInd  aSeq.getLength(); nInd++ )
-if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
+if ( ServiceName == aSeq[nInd] )
 return sal_True;
 
 return sal_False;
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index 473e25a..f4b1df9 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -1760,7 +1760,7 @@
 }
 
 
-if ( str1[0].compareTo(str1[1]) == 0 )
+if ( str1[0] == str1[1] )
 print_error( rtl::OString( Reset ),FileBase::E_None );
 else
 print_error( rtl::OString( Reset ),FileBase::E_invalidError );
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx 
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index a19cb32..e18b89f 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -93,7 +93,7 @@
 socklen_t aLen = sizeof( aAddr );
 recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) aAddr, aLen 
);
 OString aString( aBuffer, strlen( LOREMOTE_SEARCH ) );
-if ( aString.compareTo( LOREMOTE_SEARCH ) == 0 )
+if ( aString == LOREMOTE_SEARCH )
 {
 OStringBuffer aStringBuffer(LOREMOTE_ADVERTISE\n);
 aStringBuffer.append( OUStringToOString(
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx 
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 87f2b85..622995b 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -297,7 +297,7 @@
 {
 const OString aSubPathMarker( subpath );
 
-if( 0 != readNextToken().compareTo( aSubPathMarker ) )
+if( readNextToken() != aSubPathMarker )
 OSL_PRECOND(false, broken path);
 
 basegfx::B2DPolyPolygon aResult;
@@ -313,7 +313,7 @@
 sal_Int32 nDummy=m_nCharIndex;
 OString aCurrToken( m_aLine.getToken(m_nNextToken,' ',nDummy) );
 
-while( m_nCharIndex != -1  0 != aCurrToken.compareTo(aSubPathMarker) 
)
+while( m_nCharIndex != -1  aCurrToken != aSubPathMarker )
 {
 sal_Int32 nCurveFlag;
 doublenX, nY;
@@ -634,11 +634,11 @@
 const sal_Int32 nImageSize( readInt32() );
 
 OUString   aFileName;
-if( aToken.compareTo( aPngMarker ) == 0 )
+if( aToken == aPngMarker )
 aFileName = aPngFile;
-else if( aToken.compareTo( aJpegMarker ) == 0 )
+else if( aToken == aJpegMarker )
 aFileName = aJpegFile;
-else if( aToken.compareTo( aPbmMarker ) == 0 )
+else if( aToken == aPbmMarker )
 aFileName = aPbmFile;
 else
 {
diff --git a/sfx2/source/appl/xpackcreator.cxx 
b/sfx2/source/appl/xpackcreator.cxx
index c71d291..c7fef6e 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -178,7 +178,7 @@
 uno::Sequence OUString  aSeq = impl_getStaticSupportedServiceNames();
 
 for ( sal_Int32 nInd = 0; nInd  aSeq.getLength(); nInd++ )
-if (

[Libreoffice-commits] core.git: sc/source

 sc/source/filter/html/htmlpars.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 162676d826200a6612da195f5241490ee307f498
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 16 20:42:54 2013 +0300

Add missing #include rtl/tencinfo.h

Change-Id: Iad969bf9b32cbfe045248fb17dc4c0d7c66c2c94

diff --git a/sc/source/filter/html/htmlpars.cxx 
b/sc/source/filter/html/htmlpars.cxx
index 40d4fd1..94bd17d 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -49,6 +49,8 @@
 #include tools/urlobj.hxx
 #include tools/tenccvt.hxx
 
+#include rtl/tencinfo.h
+
 #include htmlpars.hxx
 #include global.hxx
 #include document.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Removing C++ SDK examples, clearly encouraging Python extensions

2013-04-16 Thread Olivier R.

Hi,


Tor Lillqvist-2 wrote
 Needed also for soffice.bin . (I don't recall, but it might be that
 editbin doesn't believe a file called .bin is an exectuable, so you
 might need to temporarily rename soffice.bin to foo.exe, run editbin
 on it, and rename back.)

Thanks. It works. (Renaming soffice.bin is not necessary.)
It doesn’t display errors while running, but it’s possible to get them with
:

try:
# code
except:
traceback.print_exc()

So that’s really useful.


Tor Lillqvist-2 wrote
 We could just add a few lines of code to a suitable place that would
 make all our programs automatically show stdout and stderr in the
 console shell if they are started from a such, on Windows.

Looks good to me.

Regards,
Olivier



--
View this message in context: 
http://nabble.documentfoundation.org/LibreOffice-prints-on-tuesdays-tp4047259p4050370.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

GSoC-2013 Support for Firebird Database in Base

2013-04-16 Thread Jitesh Varandani

Sir
I'm a undergraduate from BITS Pilani pursuing my MSc in Information Systems.
I went through GSoC ideas and i show my interest in LibreOffice database.
I have a command in C and SQL as well as good experience on Linux.
So please help me to as where to start and what else is required to do.
Thanks
Jitesh Varandani
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

 sw/source/filter/ww8/docxattributeoutput.cxx |1 +
 sw/source/filter/ww8/rtfattributeoutput.cxx  |1 +
 sw/source/filter/ww8/writerwordglue.cxx  |2 ++
 3 files changed, 4 insertions(+)

New commits:
commit 564cff72197f992afc19c127a721d4792d38c4cf
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 16 20:59:59 2013 +0300

Add missing #include rtl/tencinfo.h

Change-Id: I4d9a28b50f773857f8f6af7df4a0968f8bb1de4a

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index c988b39..95ce729 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -98,6 +98,7 @@
 #include txtinet.hxx
 
 #include osl/file.hxx
+#include rtl/tencinfo.h
 #include vcl/embeddedfontshelper.hxx
 
 #include com/sun/star/i18n/ScriptType.hpp
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 25d3a08..c4bcba1 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -29,6 +29,7 @@
 #include fchrfmt.hxx
 
 #include rtl/ustring.hxx
+#include rtl/tencinfo.h
 #include svtools/rtfkeywd.hxx
 
 #include editeng/fontitem.hxx
diff --git a/sw/source/filter/ww8/writerwordglue.cxx 
b/sw/source/filter/ww8/writerwordglue.cxx
index bcb1253..9211de6 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -25,6 +25,8 @@
 #include algorithm//std::find_if
 #include functional   //std::unary_function
 
+#include rtl/tencinfo.h
+
 #include unicode/ubidi.h  //ubidi_getLogicalRun
 #include tools/tenccvt.hxx//GetExtendedTextEncoding
 #include com/sun/star/i18n/ScriptType.hpp //ScriptType
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

 sw/source/filter/ww8/writerwordglue.cxx |   42 
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 30fd46fd54c764dae676fc70dd2a207bc38a3870
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 16 21:01:41 2013 +0300

Bin pointless comments describing allegedly why each #include is needed

Change-Id: I3f4405a598cb11fb1c529517eb96260beed9cb86

diff --git a/sw/source/filter/ww8/writerwordglue.cxx 
b/sw/source/filter/ww8/writerwordglue.cxx
index 9211de6..f606030 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -22,30 +22,30 @@
 #include doc.hxx
 #include writerhelper.hxx
 
-#include algorithm//std::find_if
-#include functional   //std::unary_function
+#include algorithm
+#include functional
 
 #include rtl/tencinfo.h
 
-#include unicode/ubidi.h  //ubidi_getLogicalRun
-#include tools/tenccvt.hxx//GetExtendedTextEncoding
-#include com/sun/star/i18n/ScriptType.hpp //ScriptType
-
-#include unotools/fontcvt.hxx  //GetSubsFontName
-#include editeng/paperinf.hxx  //lA0Width...
-#include editeng/lrspitem.hxx  //SvxLRSpaceItem
-#include editeng/ulspitem.hxx  //SvxULSpaceItem
-#include editeng/boxitem.hxx   //SvxBoxItem
-#include editeng/fontitem.hxx  //SvxFontItem
-#include frmfmt.hxx//SwFrmFmt
-#include fmtclds.hxx   //SwFmtCol
-#include hfspacingitem.hxx //SwHeaderAndFooterEatSpacingItem
-#include fmtfsize.hxx  //SwFmtFrmSize
-#include swrect.hxx//SwRect
-#include fmthdft.hxx   //SwFmtHeader/SwFmtFooter
-#include frmatr.hxx//GetLRSpace...
-#include ndtxt.hxx //SwTxtNode
-#include breakit.hxx   //pBreakIt
+#include unicode/ubidi.h
+#include tools/tenccvt.hxx
+#include com/sun/star/i18n/ScriptType.hpp
+
+#include unotools/fontcvt.hxx
+#include editeng/paperinf.hxx
+#include editeng/lrspitem.hxx
+#include editeng/ulspitem.hxx
+#include editeng/boxitem.hxx
+#include editeng/fontitem.hxx
+#include frmfmt.hxx
+#include fmtclds.hxx
+#include hfspacingitem.hxx
+#include fmtfsize.hxx
+#include swrect.hxx
+#include fmthdft.hxx
+#include frmatr.hxx
+#include ndtxt.hxx
+#include breakit.hxx
 #include i18nlangtag/mslangid.hxx
 
 #define ASSIGN_CONST_ASC(s) AssignAscii(s)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlscript/Module_xmlscript.mk xmlscript/Package_dtd.mk xmlscript/Package_inc.mk

2013-04-16 Thread Bjoern Michaelsen

 xmlscript/Module_xmlscript.mk |1 +
 xmlscript/Package_dtd.mk  |   17 +
 xmlscript/Package_inc.mk  |7 ---
 3 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit f4ebb99de6e93f6d38e7b0486d66e99a196b1f6e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Apr 16 20:04:19 2013 +0200

separate inc and dtd packages in xmlscript for global header move

Change-Id: I3e00e33d4e684b18d4e30e115db69fbface76982

diff --git a/xmlscript/Module_xmlscript.mk b/xmlscript/Module_xmlscript.mk
index 5c74712..f0bf26d 100644
--- a/xmlscript/Module_xmlscript.mk
+++ b/xmlscript/Module_xmlscript.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,xmlscript))
 
 $(eval $(call gb_Module_add_targets,xmlscript,\
 Library_xmlscript \
+Package_dtd \
 Package_inc \
 ))
 
diff --git a/xmlscript/Package_dtd.mk b/xmlscript/Package_dtd.mk
new file mode 100644
index 000..60e8871
--- /dev/null
+++ b/xmlscript/Package_dtd.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,xmlscript_dtd,$(SRCDIR)/xmlscript))
+
+$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/dialog.dtd,dtd/dialog.dtd))
+$(eval $(call 
gb_Package_add_file,xmlscript_dtd,bin/libraries.dtd,dtd/libraries.dtd))
+$(eval $(call 
gb_Package_add_file,xmlscript_dtd,bin/library.dtd,dtd/library.dtd))
+$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/module.dtd,dtd/module.dtd))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Package_inc.mk b/xmlscript/Package_inc.mk
index 3be4832..ca3dae9 100644
--- a/xmlscript/Package_inc.mk
+++ b/xmlscript/Package_inc.mk
@@ -9,7 +9,6 @@
 
 $(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript))
 
-# headers
 $(eval $(call 
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlscriptdllapi.h,inc/xmlscript/xmlscriptdllapi.h))
 $(eval $(call 
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xml_helper.hxx,inc/xmlscript/xml_helper.hxx))
 $(eval $(call 
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmldlg_imexp.hxx,inc/xmlscript/xmldlg_imexp.hxx))
@@ -17,10 +16,4 @@ $(eval $(call 
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmllib_imexp.hxx,i
 $(eval $(call 
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlmod_imexp.hxx,inc/xmlscript/xmlmod_imexp.hxx))
 $(eval $(call 
gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlns.h,inc/xmlscript/xmlns.h))
 
-# dtds
-$(eval $(call gb_Package_add_file,xmlscript_inc,bin/dialog.dtd,dtd/dialog.dtd))
-$(eval $(call 
gb_Package_add_file,xmlscript_inc,bin/libraries.dtd,dtd/libraries.dtd))
-$(eval $(call 
gb_Package_add_file,xmlscript_inc,bin/library.dtd,dtd/library.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_inc,bin/module.dtd,dtd/module.dtd))
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

fdo#61189 - Printer Bug Triage Needed - Office PS Laser Printer Required

2013-04-16 Thread Joel Madero

Another one of those really specific bugs that need triaged. Someone 
using LibreOffice in an office setting should be able to triage this one 
but you'll need a office quality PS printer (ie. no cheap ink jet will 
do the trick).


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


Thanks in advance, please reply if you're able to triage it so others 
know it's been done.



Best,
Joel



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

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - bridges/test i18npool/source sdext/source stoc/source testtools/source toolkit/source

2013-04-16 Thread Stephan Bergmann

 bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx |4 +-
 bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx |2 -
 i18npool/source/transliteration/transliteration_Numeric.cxx   |6 
++--
 sdext/source/presenter/PresenterController.cxx|2 -
 stoc/source/registry_tdprovider/functiondescription.cxx   |4 +-
 stoc/source/registry_tdprovider/methoddescription.cxx |2 -
 testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx|6 
++--
 toolkit/source/awt/stylesettings.cxx  |2 -
 toolkit/source/awt/vclxwindow1.cxx|   14 
--
 9 files changed, 20 insertions(+), 22 deletions(-)

New commits:
commit 88adf7858ff6a35b555204bded03d11fd7ea8128
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Apr 16 13:52:02 2013 +0200

rhbz#867808 Do not throw RuntimeException by pointer

(cherry picked from commit e46564a0a6a74da90785a1b910d33e2b5bfdcfd9, plus
63b4633cf7b0da9eba63e752cec72cb10ed9d93e Related: rhbz#867808 if one person
threw by pointer... and 336353a87e6003e685aab87ea74a158546e1f297 Related
rhbz#867808: More apparently bogus 'throw new ...' in C++ code)
Conflicts:
bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
sdext/source/presenter/PresenterController.cxx
stoc/source/registry_tdprovider/functiondescription.cxx
stoc/source/registry_tdprovider/methoddescription.cxx
toolkit/source/awt/vclxwindow1.cxx

Change-Id: I22b7d3d642e7ee0488d6b726a331d328065bbee7
Reviewed-on: https://gerrit.libreoffice.org/3420
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git 
a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx 
b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index 4571a17..d5b3b65 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -85,7 +85,7 @@ sal_Int32 Client::run(css::uno::Sequence rtl::OUString  
const )
 css::uno::Reference css::lang::XMultiComponentFactory  factory(
 context-getServiceManager());
 if (!factory.is()) {
-throw new css::uno::RuntimeException(
+throw css::uno::RuntimeException(
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( no component context 
service manager )),
 static_cast cppu::OWeakObject * (this));
 }
@@ -105,7 +105,7 @@ sal_Int32 Client::run(css::uno::Sequence rtl::OUString  
const )
 }
 relay-start(this);
 if (!data.setData(reinterpret_cast void * (12345))) {
-throw new css::uno::RuntimeException(
+throw css::uno::RuntimeException(
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
osl::ThreadData::setData failed )),
 static_cast cppu::OWeakObject * (this));
 }
diff --git 
a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx 
b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index 0e6898b..c80355e 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -74,7 +74,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
 css::uno::Reference css::lang::XMultiComponentFactory  factory(
 context-getServiceManager());
 if (!factory.is()) {
-throw new css::uno::RuntimeException(
+throw css::uno::RuntimeException(
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( no component context 
service manager )),
 static_cast cppu::OWeakObject * (this));
 }
diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx 
b/i18npool/source/transliteration/transliteration_Numeric.cxx
index 3156a4c..de7eab5 100644
--- a/i18npool/source/transliteration/transliteration_Numeric.cxx
+++ b/i18npool/source/transliteration/transliteration_Numeric.cxx
@@ -47,21 +47,21 @@ OUString SAL_CALL
 transliteration_Numeric::folding( const OUString /*inStr*/, sal_Int32 
/*startPos*/, sal_Int32 /*nCount*/, Sequence sal_Int32  /*offset*/ )
 throw(RuntimeException)
 {
-throw (new RuntimeException());
+throw RuntimeException();
 }
 
 sal_Bool SAL_CALL
 transliteration_Numeric::equals( const OUString /*str1*/, sal_Int32 /*pos1*/, 
sal_Int32 /*nCount1*/, sal_Int32 /*nMatch1*/, const OUString /*str2*/, 
sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32 /*nMatch2*/ )
 throw(RuntimeException)
 {
-throw (new RuntimeException());
+throw RuntimeException();
 }
 
 Sequence OUString  SAL_CALL
 transliteration_Numeric::transliterateRange( const OUString /*str1*/, const

[Libreoffice-commits] core.git: officecfg/registry sd/inc sd/sdi sd/source sd/uiconfig svx/inc

2013-04-16 Thread Jakub Golebiewski

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu   |
5 +
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
8 +
 sd/inc/sdcommands.h  |
1 
 sd/sdi/SlideSorterController.sdi |
5 +
 sd/sdi/sdraw.sdi |   
25 +
 sd/source/ui/inc/DrawViewShell.hxx   |
1 
 sd/source/ui/inc/OutlineViewShell.hxx|
1 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx   |   
26 +
 sd/source/ui/view/drviewse.cxx   |   
45 -
 sd/source/ui/view/outlnvs2.cxx   |   
46 --
 sd/uiconfig/simpress/menubar/menubar.xml |
1 
 svx/inc/svx/svxids.hrc   |
1 
 12 files changed, 147 insertions(+), 18 deletions(-)

New commits:
commit baffab9a4ffca9a4940a3310937d6e858e66cc1f
Author: Jakub Golebiewski kub...@gmail.com
Date:   Tue Apr 9 23:45:52 2013 +0200

Bug 58505 - Tweak F5 for slide display, and add Shift-F5

Added menu entry to start the presentation from current slide.
Changed Start Presentation menu entry behavior so it starts
from the first slide.

Change-Id: Iebba85d2d1dcacad7da6b050e2152be5c0d47261

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index fd649ba..6cf3ae3 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2234,6 +2234,11 @@
 /node
 node oor:name=F5_SHIFT oor:op=replace
  prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS 
- NO TRANSLATE/value
+  value xml:lang=en-US.uno:PresentationThisSlide/value
+ /prop
+/node
+node oor:name=F5_SHIFT_MOD2 oor:op=replace
+ prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS 
- NO TRANSLATE/value
   value xml:lang=en-US.uno:RestoreEditingView/value
  /prop
 /node
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d135cd13..9efa408 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -37,6 +37,14 @@
   value1/value
 /prop
   /node
+  node oor:name=.uno:PresentationThisSlide oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USSl~ide Show From This Slide/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:Remote oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USImpress R~emote/value
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index daecfe8..f64e686 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -94,6 +94,7 @@
 #define CMD_SID_OUTLINE_TEXT_AUTOFIT.uno.OutlineTextAutofit
 #define CMD_SID_PAGESETUP   .uno:PageSetup
 #define CMD_SID_PRESENTATION.uno:Presentation
+#define CMD_SID_PRESENTATION_THIS_SLIDE 
.uno:PresentationThisSlide
 #define CMD_SID_REMOTE_DLG  .uno:Remote
 #define CMD_SID_PRESENTATION_LAYOUT .uno:PresentationLayout
 #define CMD_SID_RENAMELAYER .uno:RenameLayer
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index f38a3a8..5b717d1 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -136,6 +136,11 @@ interface SlideSorterView
 ExecMethod = FuTemporary ;
 StateMethod = GetMenuState ;
 ]
+SID_PRESENTATION_THIS_SLIDE // ole : no, status : ?
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
 SID_HIDE_SLIDE // ole : no, status : ?
 [
 ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 83b4d04..5e913a2 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -5196,6 +5196,31 @@ SfxVoidItem Presentation SID_PRESENTATION
 ]
 
 //--
+SfxVoidItem PresentationThisSlide SID_PRESENTATION_THIS_SLIDE
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Asynchron;
+
+

[PUSHED libreoffice-3-6] rhbz#867808 Do not throw RuntimeException by pointer

2013-04-16 Thread David Tardon (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3420

Approvals:
  David Tardon: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3420
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I22b7d3d642e7ee0488d6b726a331d328065bbee7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

[Libreoffice-commits] core.git: configure.ac include/postmac.h include/postwin.h include/premac.h include/prewin.h include/shlinfo.rc include/version.hrc include/wntgcci solenv/inc

2013-04-16 Thread Matúš Kukan

 configure.ac |5 
 include/postmac.h|   41 ++
 include/postwin.h|  252 +++
 include/premac.h |   50 +++
 include/prewin.h |   77 +++
 include/shlinfo.rc   |   72 +++
 include/version.hrc  |   51 +++
 include/wntgcci/jni_md.h |   42 ++
 include/wntgcci/sehandler.hxx|  128 +++
 solenv/inc/postmac.h |   41 --
 solenv/inc/postwin.h |  252 ---
 solenv/inc/premac.h  |   50 ---
 solenv/inc/prewin.h  |   77 ---
 solenv/inc/shlinfo.rc|   72 ---
 solenv/inc/version.hrc   |   51 ---
 solenv/inc/win32/jni_md.h|   42 --
 solenv/inc/wntgcci/sehandler.hxx |  128 ---
 17 files changed, 715 insertions(+), 716 deletions(-)

New commits:
commit be421269f95446307d1168e17e1fe9ee7d9a0a66
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Tue Apr 16 10:10:57 2013 +0200

move headers from solenv/inc/ to include/

Change-Id: Ieb6cba645b3535f7d683d2aefa5599d04d9994f3
Reviewed-on: https://gerrit.libreoffice.org/3403
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/configure.ac b/configure.ac
index 64e574e7..d2db9e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3769,7 +3769,6 @@ linux-android*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLARINC=$SOLARINC -I$SRC_ROOT/solenv/inc/$OUTPATH
 SOLARLIB=-L${SOLARVER}/${OUTPATH}${PROEXT}/lib
 ;;
 
@@ -3801,7 +3800,7 @@ mingw*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLARINC=$SOLARINC -I$SRC_ROOT/solenv/inc/win32 
-I$SRC_ROOT/solenv/inc/$OUTPATH
+SOLARINC=$SOLARINC -I$SRC_ROOT/include/wntgcci
 SOLARLIB=-L${SOLARVER}/${OUTPATH}${PROEXT}/lib
 ;;
 
@@ -3941,7 +3940,7 @@ else
 INSTDIR=${BUILDDIR}/instdir/${INPATH}
 fi
 OUTDIR=${SOLARVER}/${INPATH}
-SOLARINC=-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc 
-I${INSTDIR}/${SDKDIR}/include -I$SRC_ROOT/solenv/inc $SOLARINC
+SOLARINC=-I. -I$SRC_ROOT/include -I${SOLARVER}/$INPATH/inc/external 
-I${SOLARVER}/$INPATH/inc -I${INSTDIR}/${SDKDIR}/include $SOLARINC
 AC_SUBST(COM)
 AC_SUBST(CPU)
 AC_SUBST(CPUNAME)
diff --git a/include/postmac.h b/include/postmac.h
new file mode 100644
index 000..f157e67
--- /dev/null
+++ b/include/postmac.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#undef Button
+#undef Byte
+#undef Control
+#undef Cursor
+#undef DirInfo
+#undef FontInfo
+#undef LSize
+#undef Line
+#undef MemoryBlock
+#undef ModalDialog
+#undef Palette
+#undef Pattern
+#undef Point
+#undef Polygon
+#undef Ptr
+#undef Region
+#undef SetCursor
+#undef Size
+#undef StringPtr
+#undef TimeValue
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/postwin.h b/include/postwin.h
new file mode 100644
index 000..1ec0943
--- /dev/null
+++ b/include/postwin.h
@@ -0,0 +1,252 @@
+/* -*- 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

Re: patch for postgresql driver

On Tue, Apr 16, 2013 at 6:36 PM, Wols Lists antli...@youngman.org.uk wrote:

 I need to force some type of type conversion - basically from const
 char * to const rtl::OUString, I presume.

You can either call
   matchIgnoreAsciiCase( OUString ( p ) )
or
   matchIgnoreAsciiCase( p, strlen(p) )
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vbahelper/source

 vbahelper/source/msforms/vbanewfont.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2c4a7fa98383ca46bca9f6c222ac19e0b940b874
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 16 21:26:51 2013 +0300

Add missing #include rtl/tencinfo.h

Change-Id: Ic00146442a679c39d0af4a287cbcf759826f35cd

diff --git a/vbahelper/source/msforms/vbanewfont.cxx 
b/vbahelper/source/msforms/vbanewfont.cxx
index 1880529..c4b5472 100644
--- a/vbahelper/source/msforms/vbanewfont.cxx
+++ b/vbahelper/source/msforms/vbanewfont.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include rtl/tencinfo.h
 #include vbanewfont.hxx
 #include com/sun/star/awt/FontWeight.hpp
 #include com/sun/star/awt/FontSlant.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] move headers from solenv/inc/ to include/

2013-04-16 Thread David Tardon (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3403

Approvals:
  David Tardon: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3403
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb6cba645b3535f7d683d2aefa5599d04d9994f3
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: David Tardon dtar...@redhat.com
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

Re: [PATCH] BUG#62096 Replace O(U)String compareTo with ==

2013-04-16 Thread Janit Anjaria

Hey!

I am hereby attaching my patch for fdo #62096 :

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

Any suggestions would be great to be implemented.

Regards,
Janit

On Tue, Apr 16, 2013 at 11:52 PM, Janit Anjaria jani...@gmail.com wrote:

 Hey Stephan!
 I think that was due to hurry(the things for != things)...and yeah i
 dont know ,i overlooked the build and hence i suppose the thing you just
 mentioned about child_process.cxx is one of those rotten tests.

 And yes,ill surely look into the matter with identation(i generally do
 take care of it,but because of a lil hurry as i am also working on the
 project -i had mailed on the list simultaneously ...so swamped with too
 much of code ! :P )

 Hope this finds you in good health.

 Regards,
 Janit


 On Tue, Apr 16, 2013 at 6:30 PM, Stephan Bergmann sberg...@redhat.comwrote:

 On 04/15/2013 03:19 PM, Janit Anjaria wrote:

 I am hereby attaching my patch for fdo #62096 :

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

 Any suggestions would be great to be implemented.


 First, note that

   s.compareTo(t) != 0

 is /not/ the same as

   s == t

 Second, did you build and test your change?  It looks like
 sal/qa/rtl/process/child_**process.cxx is one of those rotting tests
 that is not built nor executed, not even with a top-level make check.

 Also, please take care not to mess up the indentation of lines, making
 the if indented only three instead of four spaces.

 Stephan





0001-fdo-62096-Replace-O-U-String-compareTo-with.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] Re: Bug 58505 - Tweak F5 for slide display, and add Shift-F5

2013-04-16 Thread Thorsten Behrens

I wrote:
 Jan Holesovsky wrote:
  Looks like great work to me - if you clarify the situation with the
  accelerator, I think we can push that, unless Thorsten has more
  ideas of course :-)
  
 Nope. :)
 
So, since I don't see why this should not be merged to master, I did
just that - thanks a lot for your fix, Jakub!

Can you please subsequently give us a license statement for your
changes, see
https://wiki.documentfoundation.org/Development/Developers#Example_Statement ?

And I'm curious what you would be up to next - I guess you might be
bored by EasyHacks, so
https://wiki.documentfoundation.org/Development/Impress#Draw.2FImpress_bugs
has a nice list of more involved bugs. :)

Looking fwd to your next patch,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] BUG#62096 Replace O(U)String compareTo with ==

2013-04-16 Thread JorenDC


Hi Janit,

I see your patches keeps passing by. Sending your patch by email is not 
wrong, but we have another handy tool to review/comment/... patches - 
Gerrit.


Please have a look at 
https://wiki.documentfoundation.org/Development/gerrit#Setting_Yourself_Up_For_Gerrit 
so you can send them that way. I think that's a lot easier for 
developers to review and leave comments.


Just my 0,02EUR (please be aware of the currency exchange ;-) )

Kind regards,
Joren

Op 16-04-13 20:30, Janit Anjaria schreef:

Hey!

I am hereby attaching my patch for fdo #62096 :

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

Any suggestions would be great to be implemented.

Regards,
Janit

On Tue, Apr 16, 2013 at 11:52 PM, Janit Anjaria jani...@gmail.com 
mailto:jani...@gmail.com wrote:


Hey Stephan!
I think that was due to hurry(the things for != things)...and
yeah i dont know ,i overlooked the build and hence i suppose the
thing you just mentioned about child_process.cxx is one of those
rotten tests.

And yes,ill surely look into the matter with identation(i
generally do take care of it,but because of a lil hurry as i am
also working on the project -i had mailed on the list
simultaneously ...so swamped with too much of code ! :P )

Hope this finds you in good health.

Regards,
Janit


On Tue, Apr 16, 2013 at 6:30 PM, Stephan Bergmann
sberg...@redhat.com mailto:sberg...@redhat.com wrote:

On 04/15/2013 03:19 PM, Janit Anjaria wrote:

I am hereby attaching my patch for fdo #62096 :

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

Any suggestions would be great to be implemented.


First, note that

  s.compareTo(t) != 0

is /not/ the same as

  s == t

Second, did you build and test your change?  It looks like
sal/qa/rtl/process/child_process.cxx is one of those rotting
tests that is not built nor executed, not even with a
top-level make check.

Also, please take care not to mess up the indentation of
lines, making the if indented only three instead of four spaces.

Stephan





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


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

[Libreoffice-commits] core.git: solenv/gbuild

2013-04-16 Thread David Tardon

 solenv/gbuild/platform/WNT_INTEL_GCC.mk |2 +-
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eda61605d1843a87fc67039fa73be616040b581d
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 16 20:39:36 2013 +0200

fix path for shlinfo.rc for WinResTarget

Change-Id: If70bdfc3eed5f9873c95404d0d1f5723b0e51140

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index ce4b1b7..7b26863 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -273,7 +273,7 @@ endef
 
 define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(2))
-$(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_rcfile,$(2),include/shlinfo)
 $(call gb_WinResTarget_add_defs,$(2),\
-DVERVARIANT=$(LIBO_VERSION_PATCH) \
-DRES_APP_VENDOR=$(OOO_VENDOR) \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 3f41f1f..d56801f 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -330,7 +330,7 @@ endef
 
 define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(2))
-$(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_rcfile,$(2),include/shlinfo)
 $(call gb_WinResTarget_add_defs,$(2),\
-DVERVARIANT=$(LIBO_VERSION_PATCH) \
-DRES_APP_VENDOR=$(OOO_VENDOR) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: cherry-pick across renames [was: minutes of ESC call ...]

2013-04-16 Thread Miklos Vajna

Hi,

On Tue, Apr 16, 2013 at 10:06:02AM -0500, Norbert Thiebaud 
nthieb...@gmail.com wrote:
  I think Norbert meant:
 
 [...]
 Yep

Ah, I see. I hoped we won't have to deal with that, just like we didn't
deal with the conflicts caused by the rtl:: prefix mass-removal. I just
asked the contributor to rebase his/her patch against latest master and
said sorry for the pain. ;-)

 That sound reasonable... I just would like to know what value
 'increase massively' actually is :-)

We'll know that when we get there. The patch I linked can give you the
number once a cherry-pick fails.

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sfx2/inc sfx2/source

 sfx2/inc/sfx2/bindings.hxx   |3 -
 sfx2/source/control/bindings.cxx |   95 ---
 2 files changed, 52 insertions(+), 46 deletions(-)

New commits:
commit d3a279cbd308486250e2b652aac01d41e2a52f14
Author: Noel Grandin n...@peralex.com
Date:   Fri Apr 12 09:38:45 2013 +0200

Convert usage of SfxPtrArray to std::vector

Change-Id: I38664f59e4cfa7354196437901175c9ef9aa9006
Reviewed-on: https://gerrit.libreoffice.org/3356
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 73ac3dc..9479e8f 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -121,6 +121,7 @@ private:
 const SfxFoundCache_Impl* pFound,
 const SfxPoolItem *pItem,
 SfxItemState eItemState );
+SAL_DLLPRIVATE SfxStateCache* GetStateCache( sal_uInt16 nId, sal_uInt16 
*pPos);
 DECL_DLLPRIVATE_LINK( NextJob_Impl, Timer * );
 
 public:
@@ -149,7 +150,7 @@ public:
 sal_Bool IsBound( sal_uInt16 nMsgId, sal_uInt16 nStartSearchAt = 0 
);
 
 const SfxSlot*   GetSlot( sal_uInt16 nMsgId );
-SfxStateCache*   GetStateCache( sal_uInt16 nId, sal_uInt16 *pPos = 0 );
+SfxStateCache*   GetStateCache( sal_uInt16 nId);
 SAL_DLLPRIVATE SfxStateCache* GetAnyStateCache_Impl( sal_uInt16 nId );
 /**
  * @param rpState the caller has to delete the pointer
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index d2981d4..5df40c1 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -93,7 +93,7 @@ typedef boost::unordered_map sal_uInt16, bool  
InvalidateSlotMap;
 
 //
 
-DECL_PTRARRAY(SfxStateCacheArr_Impl, SfxStateCache*, 32, 16)
+typedef std::vectorSfxStateCache* SfxStateCacheArr_Impl;
 
 //
 
@@ -264,9 +264,8 @@ SfxBindings::~SfxBindings()
 DeleteControllers_Impl();
 
 // Delete Caches
-sal_uInt16 nCount = pImp-pCaches-Count();
-for ( sal_uInt16 nCache = 0; nCache  nCount; ++nCache )
-delete pImp-pCaches-GetObject(nCache);
+for(SfxStateCacheArr_Impl::const_iterator it = pImp-pCaches-begin(); it 
!= pImp-pCaches-end(); ++it)
+delete *it;
 
 DELETEZ( pImp-pWorkWin );
 
@@ -279,34 +278,34 @@ SfxBindings::~SfxBindings()
 void SfxBindings::DeleteControllers_Impl()
 {
 // in the first round delete SfxPopupWindows
-sal_uInt16 nCount = pImp-pCaches-Count();
+sal_uInt16 nCount = pImp-pCaches-size();
 sal_uInt16 nCache;
 for ( nCache = 0; nCache  nCount; ++nCache )
 {
 // Remember were you are
-SfxStateCache *pCache = pImp-pCaches-GetObject(nCache);
+SfxStateCache *pCache = (*pImp-pCaches)[nCache];
 sal_uInt16 nSlotId = pCache-GetId();
 
 // Delete SfxPopupWindow
 pCache-DeleteFloatingWindows();
 
 // Re-align, because the cache may have been reduced
-sal_uInt16 nNewCount = pImp-pCaches-Count();
+sal_uInt16 nNewCount = pImp-pCaches-size();
 if ( nNewCount  nCount )
 {
 nCache = GetSlotPos(nSlotId);
 if ( nCache = nNewCount ||
- nSlotId != pImp-pCaches-GetObject(nCache)-GetId() )
+ nSlotId != (*pImp-pCaches)[nCache]-GetId() )
 --nCache;
 nCount = nNewCount;
 }
 }
 
 // Delete all Caches
-for ( nCache = pImp-pCaches-Count(); nCache  0; --nCache )
+for ( nCache = pImp-pCaches-size(); nCache  0; --nCache )
 {
 // Get Cache via ::com::sun::star::sdbcx::Index
-SfxStateCache *pCache = pImp-pCaches-GetObject(nCache-1);
+SfxStateCache *pCache = (*pImp-pCaches)[ nCache-1 ];
 
 // unbind all controllers in the cache
 SfxControllerItem *pNext;
@@ -321,9 +320,9 @@ void SfxBindings::DeleteControllers_Impl()
 pCache-GetInternalController()-UnBind();
 
 // Delete Cache
-if( nCache-1  pImp-pCaches-Count() )
+if( nCache-1  (sal_uInt16) pImp-pCaches-size() )
 delete (*pImp-pCaches)[nCache-1];
-pImp-pCaches-Remove(nCache-1, 1);
+pImp-pCaches-erase(pImp-pCaches-begin()+ nCache - 1);
 }
 
 if( pImp-pUnoCtrlArr )
@@ -372,8 +371,8 @@ void SfxBindings::HidePopupCtrls_Impl( bool bHide )
 pImp-ePopupAction = SFX_POPUP_SHOW;
 }
 
-for ( sal_uInt16 nCache = 0; nCache  pImp-pCaches-Count(); ++nCache )
-pImp-pCaches-GetObject(nCache)-DeleteFloatingWindows();
+for(SfxStateCacheArr_Impl::const_iterator it = pImp-pCaches-begin(); it 
!= pImp-pCaches-end(); ++it)
+(*it)-DeleteFloatingWindows();
 pImp-ePopupAction = SFX_POPUP_DELETE;
 }
 
@@ -639,6 +638,14 @@ SfxStateCache*

[PUSHED] Convert usage of SfxPtrArray to std::vector

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3356

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3356
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I38664f59e4cfa7354196437901175c9ef9aa9006
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Noel Grandin noelgran...@gmail.com

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

[Libreoffice-commits] core.git: vbahelper/source

2013-04-16 Thread Bjoern Michaelsen

 vbahelper/source/msforms/vbanewfont.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6b08209ae4cebe9c71fe5496499f2e9a4d42def3
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Apr 16 20:54:35 2013 +0200

add missing include

diff --git a/vbahelper/source/msforms/vbanewfont.cxx 
b/vbahelper/source/msforms/vbanewfont.cxx
index c4b5472..0acd862 100644
--- a/vbahelper/source/msforms/vbanewfont.cxx
+++ b/vbahelper/source/msforms/vbanewfont.cxx
@@ -19,6 +19,7 @@
 
 #include rtl/tencinfo.h
 #include vbanewfont.hxx
+#include rtl/tencinfo.h
 #include com/sun/star/awt/FontWeight.hpp
 #include com/sun/star/awt/FontSlant.hpp
 #include com/sun/star/awt/FontStrikeout.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

 sfx2/source/dialog/tabdlg.cxx |   72 ++
 1 file changed, 32 insertions(+), 40 deletions(-)

New commits:
commit a43dc5802eacca8451e65bf2229858cfe89408eb
Author: Noel Grandin n...@peralex.com
Date:   Fri Apr 12 15:35:07 2013 +0200

Convert SfxPtrArray to std::vector in SfxTabDialogItem

Also simplify the use-site, we don't need to new it.

Change-Id: I310f2027fb777380b8bddb73b169021f5448a6f6
Reviewed-on: https://gerrit.libreoffice.org/3358
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index ac88e91..cefa164 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -156,14 +156,14 @@ void SfxTabDialogController::StateChanged( sal_uInt16 
/*nSID*/, SfxItemState /*e
 pDialog-Hide();
 }
 
-DECL_PTRARRAY(SfxTabDlgData_Impl, Data_Impl *, 4,4)
+typedef std::vectorData_Impl* SfxTabDlgData_Impl;
 
 struct TabDlg_Impl
 {
-sal_BoolbModified   : 1,
+sal_BoolbModified   : 1,
 bModal  : 1,
 bHideResetBtn   : 1;
-SfxTabDlgData_Impl* pData;
+SfxTabDlgData_Impl  aData;
 
 SfxTabDialogController* pController;
 
@@ -172,21 +172,20 @@ struct TabDlg_Impl
 bModified   ( sal_False ),
 bModal  ( sal_True ),
 bHideResetBtn   ( sal_False ),
-pData   ( new SfxTabDlgData_Impl( nCnt ) ),
 pController ( NULL )
-{}
+{
+aData.reserve( nCnt );
+}
 ~TabDlg_Impl()
 {
 delete pController;
-delete pData;
 }
 };
 
-Data_Impl* Find( SfxTabDlgData_Impl rArr, sal_uInt16 nId, sal_uInt16* pPos = 
0 );
 
-Data_Impl* Find( SfxTabDlgData_Impl rArr, sal_uInt16 nId, sal_uInt16* pPos )
+static Data_Impl* Find( const SfxTabDlgData_Impl rArr, sal_uInt16 nId, 
sal_uInt16* pPos = 0)
 {
-const sal_uInt16 nCount = rArr.Count();
+const sal_uInt16 nCount = rArr.size();
 
 for ( sal_uInt16 i = 0; i  nCount; ++i )
 {
@@ -511,10 +510,9 @@ SfxTabDialog::~SfxTabDialog()
 {
 SavePosAndId();
 
-const sal_uInt16 nCount = pImpl-pData-Count();
-for ( sal_uInt16 i = 0; i  nCount; ++i )
+for ( SfxTabDlgData_Impl::const_iterator it = pImpl-aData.begin(); it != 
pImpl-aData.end(); ++it )
 {
-Data_Impl* pDataObject = pImpl-pData-GetObject(i);
+Data_Impl* pDataObject = *it;
 
 if ( pDataObject-pTabPage )
 {
@@ -778,7 +776,7 @@ sal_Bool SfxTabDialog::IsApplyButtonEnabled() const
 
 void SfxTabDialog::Start_Impl()
 {
-DBG_ASSERT( pImpl-pData-Count() == m_pTabCtrl-GetPageCount(), not all 
pages registered );
+DBG_ASSERT( pImpl-aData.size() == m_pTabCtrl-GetPageCount(), not all 
pages registered );
 sal_uInt16 nActPage = m_pTabCtrl-GetPageId( 0 );
 
 // load old settings, when exists
@@ -847,7 +845,7 @@ void SfxTabDialog::AddTabPage
// requested when created
 )
 {
-pImpl-pData-Append(
+pImpl-aData.push_back(
 new Data_Impl( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ) );
 }
 
@@ -867,7 +865,7 @@ sal_uInt16 SfxTabDialog::AddTabPage
 )
 {
 sal_uInt16 nId = m_pTabCtrl-GetPageId(rName);
-pImpl-pData-Append(
+pImpl-aData.push_back(
 new Data_Impl( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ) );
 return nId;
 }
@@ -888,7 +886,7 @@ sal_uInt16 SfxTabDialog::AddTabPage
 assert(pCreateFunc);
 GetTabPageRanges pRangesFunc = pFact-GetTabPageRangesFunc(nPageCreateId);
 sal_uInt16 nPageId = m_pTabCtrl-GetPageId(rName);
-pImpl-pData-Append(new Data_Impl(nPageId, pCreateFunc, pRangesFunc, 
false));
+pImpl-aData.push_back(new Data_Impl(nPageId, pCreateFunc, pRangesFunc, 
false));
 return nPageId;
 }
 
@@ -914,7 +912,7 @@ void SfxTabDialog::AddTabPage
 DBG_ASSERT( TAB_PAGE_NOTFOUND == m_pTabCtrl-GetPagePos( nId ),
 Double Page-Ids in the Tabpage );
 m_pTabCtrl-InsertPage( nId, rRiderText, nPos );
-pImpl-pData-Append(
+pImpl-aData.push_back(
 new Data_Impl( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ) );
 }
 
@@ -941,7 +939,7 @@ void SfxTabDialog::AddTabPage
 DBG_ASSERT( TAB_PAGE_NOTFOUND == m_pTabCtrl-GetPagePos( nId ),
 Duplicate Page-Ids in the Tabpage );
 m_pTabCtrl-InsertPage( nId, rRiderBitmap, nPos );
-pImpl-pData-Append(
+pImpl-aData.push_back(
 new Data_Impl( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ) );
 }
 #endif
@@ -958,7 +956,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
 {
 sal_uInt16 nPos = 0;
 m_pTabCtrl-RemovePage( nId );
-Data_Impl* pDataObject = Find( *pImpl-pData, nId, nPos );
+Data_Impl* pDataObject = Find( pImpl-aData, nId, nPos );
 
 if ( pDataObject )
 {
@@ -979,7 +977,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )

[PUSHED] Convert SfxPtrArray to std::vector in SfxTabDialogItem

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3358

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3358
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I310f2027fb777380b8bddb73b169021f5448a6f6
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] core.git: sfx2/inc sfx2/source

 sfx2/inc/sfx2/objface.hxx   |   17 --
 sfx2/source/control/objface.cxx |   65 ++--
 2 files changed, 30 insertions(+), 52 deletions(-)

New commits:
commit 3f153805b84e91dec3819a15ae04d2ba1a9721dc
Author: Noel Grandin n...@peralex.com
Date:   Fri Apr 12 16:24:02 2013 +0200

Convert SfxObjectUIArr_Impl from SfxPtrArr to std::vector

Also
- remove dead class definition SfxIFConfig_Impl, which was
  using SfxObjectUIArr_Impl
- simplify declaration sites, we don't need to dynamically allocate
  these arrays

Change-Id: I0f7110a324cc37f2eb2567cc066099ea4d86276c
Reviewed-on: https://gerrit.libreoffice.org/3359
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index 90315d0..8e1f772 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -32,14 +32,11 @@
 struct SfxFormalArgument;
 struct SfxInterface_Impl;
 class  SfxConfigItem;
-class  SfxIFConfig_Impl;
-class  SfxObjectUIArr_Impl ;
 class  SfxModule;
 class  SvStream;
 
 class SFX2_DLLPUBLIC SfxInterface
 {
-friend class SfxIFConfig_Impl;
 friend class SfxSlotPool;
 
 const char* pName;  // Sfx-internal name of interface
@@ -123,20 +120,6 @@ inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos 
) const
 return nPos  nCount? pSlots+nPos: 0;
 }
 
-class SfxIFConfig_Impl
-{
-friend class SfxInterface;
-sal_uInt16  nCount;
-SfxObjectUIArr_Impl*pObjectBars;
-
-public:
-SfxIFConfig_Impl();
-~SfxIFConfig_Impl();
-sal_BoolStore(SvStream);
-voidRegisterObjectBar( sal_uInt16, const ResId, sal_uInt32 
nFeature, const String* pST=0 );
-sal_uInt16  GetType();
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 90be4b5..8b9e0f9 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -77,16 +77,16 @@ struct SfxObjectUI_Impl
 }
 };
 
-DECL_PTRARRAY(SfxObjectUIArr_Impl, SfxObjectUI_Impl*, 2, 2)
+typedef std::vectorSfxObjectUI_Impl* SfxObjectUIArr_Impl;
 
 struct SfxInterface_Impl
 {
-SfxObjectUIArr_Impl*pObjectBars;// registered ObjectBars
-SfxObjectUIArr_Impl*pChildWindows;  // registered ChildWindows
+SfxObjectUIArr_Impl aObjectBars;// registered ObjectBars
+SfxObjectUIArr_Impl aChildWindows;  // registered ChildWindows
 ResId   aPopupRes;  // registered PopupMenu
 ResId   aStatBarRes;// registered StatusBar
 SfxModule*  pModule;
-sal_BoolbRegistered;
+sal_BoolbRegistered;
 
 SfxInterface_Impl() :
 aPopupRes(0,*SfxApplication::GetOrCreate()-GetSfxResManager()),
@@ -94,20 +94,15 @@ struct SfxInterface_Impl
 , pModule(NULL)
 , bRegistered(sal_False)
 {
-pObjectBars   = new SfxObjectUIArr_Impl;
-pChildWindows = new SfxObjectUIArr_Impl;
 }
 
 ~SfxInterface_Impl()
 {
-sal_uInt16 n;
-for (n=0; npObjectBars-Count(); n++)
-delete (*pObjectBars)[n];
-delete pObjectBars;
-
-for (n=0; npChildWindows-Count(); n++)
-delete (*pChildWindows)[n];
-delete pChildWindows;
+for (SfxObjectUIArr_Impl::const_iterator it = aObjectBars.begin(); it 
!= aObjectBars.end(); ++it)
+delete *it;
+
+for (SfxObjectUIArr_Impl::const_iterator it = aChildWindows.begin(); 
it != aChildWindows.end(); ++it)
+delete *it;
 }
 };
 
@@ -404,7 +399,7 @@ void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, 
const ResId rResId, sal_
 {
 SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, 
pStr );
 if ( pUI )
-pImpData-pObjectBars-Append(pUI);
+pImpData-aObjectBars.push_back(pUI);
 }
 
 SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId 
rResId, sal_uInt32 nFeature, const String *pStr )
@@ -447,10 +442,10 @@ const ResId SfxInterface::GetObjectBarResId( sal_uInt16 
nNo ) const
 }
 
 #ifdef DBG_UTIL
-sal_uInt16 nObjBarCount = pImpData-pObjectBars-Count();
+sal_uInt16 nObjBarCount = pImpData-aObjectBars.size();
 DBG_ASSERT( nNonObjBarCount,Objectbar is unknown! );
 #endif
-return (*pImpData-pObjectBars)[nNo]-aResId;
+return pImpData-aObjectBars[nNo]-aResId;
 }
 
 //
@@ -471,10 +466,10 @@ sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo 
) const
 }
 
 #ifdef DBG_UTIL
-sal_uInt16 nObjBarCount = pImpData-pObjectBars-Count();
+sal_uInt16 nObjBarCount = pImpData-aObjectBars.size();
 DBG_ASSERT( nNonObjBarCount,Objectbar is unknown! );
 #endif
-return

Re: [PATCH] BUG#62096 Replace O(U)String compareTo with ==

2013-04-16 Thread Janit Anjaria

Hey Joren!

Yeah i have had a look at this wiki page :
https://wiki.documentfoundation.org/Development/gerrit#Setting_Yourself_Up_For_Gerrit

lng back(when i started hacking on LO codebase) and had played around
with it for a time being .But seriously and frankly speaking i am more
comfortable on this,but i am sure i will try to work on gerrit(as there is
always a scope to learn something new..and this has been a wonderful
leaning experience since then) now so as to ease the work.

Hope this finds you in good health.

Regards,
Janit

On Wed, Apr 17, 2013 at 12:08 AM, JorenDC joren.libreoff...@telenet.bewrote:

Hi Janit,

I see your patches keeps passing by. Sending your patch by email is not
wrong, but we have another handy tool to review/comment/... patches -
Gerrit.

Please have a look at
https://wiki.documentfoundation.org/Development/gerrit#Setting_Yourself_Up_For_Gerritso
you can send them that way. I think that's a lot easier for developers
to review and leave comments.

Just my 0,02€ (please be aware of the currency exchange ;-) )

Kind regards,
Joren

Op 16-04-13 20:30, Janit Anjaria schreef:

Hey!

I am hereby attaching my patch for fdo #62096 :

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

Any suggestions would be great to be implemented.

Regards,
Janit

On Tue, Apr 16, 2013 at 11:52 PM, Janit Anjaria jani...@gmail.com wrote:

Hey Stephan!
I think that was due to hurry(the things for != things)...and yeah i
dont know ,i overlooked the build and hence i suppose the thing you just
mentioned about child_process.cxx is one of those rotten tests.

And yes,ill surely look into the matter with identation(i generally do
take care of it,but because of a lil hurry as i am also working on the
project -i had mailed on the list simultaneously ...so swamped with too
much of code ! :P )

Hope this finds you in good health.

Regards,
Janit

On Tue, Apr 16, 2013 at 6:30 PM, Stephan Bergmann sberg...@redhat.comwrote:

On 04/15/2013 03:19 PM, Janit Anjaria wrote:

I am hereby attaching my patch for fdo #62096 :

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

Any suggestions would be great to be implemented.

First, note that

s.compareTo(t) != 0

is /not/ the same as

s == t

Second, did you build and test your change? It looks like
sal/qa/rtl/process/child_process.cxx is one of those rotting tests that is
not built nor executed, not even with a top-level make check.

Also, please take care not to mess up the indentation of lines, making
the if indented only three instead of four spaces.

Stephan

___
LibreOffice mailing
listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[PUSHED] Convert SfxObjectUIArr_Impl from SfxPtrArr to std::vector

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3359

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3359
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f7110a324cc37f2eb2567cc066099ea4d86276c
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] core.git: sfx2/source

 sfx2/source/doc/docfac.cxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 9b9f1c4b6f21eb30eb365da3cca4ca4a1d2d0069
Author: Noel Grandin n...@peralex.com
Date:   Fri Apr 12 16:35:25 2013 +0200

Convert SfxViewFactoryArr_Impl from SfxPtrArray to std::vector

Change-Id: I25c8edc51f97af9de2563a8dba7387a2be9f4fd5
Reviewed-on: https://gerrit.libreoffice.org/3360
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 25254aa..574bc54 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -57,7 +57,7 @@ using namespace ::com::sun::star;
 
 //
 
-DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 )
+typedef std::vectorSfxViewFactory* SfxViewFactoryArr_Impl;
 
 //
 
@@ -147,9 +147,9 @@ void SfxObjectFactory::RegisterViewFactory
 #if OSL_DEBUG_LEVEL  0
 {
 const String sViewName( rFactory.GetAPIViewName() );
-for ( sal_uInt16 i = 0; i  pImpl-aViewFactoryArr.Count(); ++i )
+for ( SfxViewFactoryArr_Impl::const_iterator it = 
pImpl-aViewFactoryArr.begin(); it != pImpl-aViewFactoryArr.end(); ++it )
 {
-if ( !pImpl-aViewFactoryArr[i]-GetAPIViewName().Equals( 
sViewName ) )
+if ( !(*it)-GetAPIViewName().Equals( sViewName ) )
 continue;
 OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
 SfxObjectFactory::RegisterViewFactory: duplicate view name 
'));
@@ -160,20 +160,19 @@ void SfxObjectFactory::RegisterViewFactory
 }
 }
 #endif
-sal_uInt16 nPos;
-for ( nPos = 0;
-  nPos  pImpl-aViewFactoryArr.Count() 
-  pImpl-aViewFactoryArr[nPos]-GetOrdinal() = rFactory.GetOrdinal();
-  ++nPos )
+SfxViewFactoryArr_Impl::iterator it = pImpl-aViewFactoryArr.begin();
+for ( ; it != pImpl-aViewFactoryArr.end() 
+  (*it)-GetOrdinal() = rFactory.GetOrdinal();
+  ++it )
 /* empty loop */;
-pImpl-aViewFactoryArr.Insert(nPos, rFactory);
+pImpl-aViewFactoryArr.insert(it, rFactory);
 }
 
 //
 
 sal_uInt16 SfxObjectFactory::GetViewFactoryCount() const
 {
-return pImpl-aViewFactoryArr.Count();
+return pImpl-aViewFactoryArr.size();
 }
 
 //
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vbahelper/source

2013-04-16 Thread Bjoern Michaelsen

 vbahelper/source/msforms/vbanewfont.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f789cdaea74e84243bc2e917173c6a750b20
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Apr 16 21:11:18 2013 +0200

Revert add missing include

This reverts commit 6b08209ae4cebe9c71fe5496499f2e9a4d42def3.

diff --git a/vbahelper/source/msforms/vbanewfont.cxx 
b/vbahelper/source/msforms/vbanewfont.cxx
index 0acd862..c4b5472 100644
--- a/vbahelper/source/msforms/vbanewfont.cxx
+++ b/vbahelper/source/msforms/vbanewfont.cxx
@@ -19,7 +19,6 @@
 
 #include rtl/tencinfo.h
 #include vbanewfont.hxx
-#include rtl/tencinfo.h
 #include com/sun/star/awt/FontWeight.hpp
 #include com/sun/star/awt/FontSlant.hpp
 #include com/sun/star/awt/FontStrikeout.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Convert SfxViewFactoryArr_Impl from SfxPtrArray to std::vect...

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3360

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3360
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I25c8edc51f97af9de2563a8dba7387a2be9f4fd5
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk

2013-04-16 Thread Caolán McNamara

 sc/AllLangResTarget_sc.mk   |1 
 sc/UIConfig_scalc.mk|1 
 sc/inc/globstr.hrc  |7 +
 sc/source/ui/inc/solvrdlg.hrc   |   39 --
 sc/source/ui/inc/solvrdlg.hxx   |   21 ++---
 sc/source/ui/miscdlgs/solvrdlg.cxx  |  118 +++
 sc/source/ui/src/globstr.src|   16 
 sc/source/ui/src/solvrdlg.src   |  133 
 sc/uiconfig/scalc/ui/goalseekdlg.ui |   39 +++---
 9 files changed, 117 insertions(+), 258 deletions(-)

New commits:
commit ddc27e4d5496edd558d48747b8830d393550aa30
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Apr 16 15:51:19 2013 +0100

adapt code to goal seek dialog .ui conversion

Change-Id: Ic3edf3f42365630c903f4e2cf63103a8f59311bb

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index ff58ce3..2f079c6 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
 sc/source/ui/src/toolbox.src \
 sc/source/ui/src/scfuncs.src \
 sc/source/ui/src/textdlgs.src \
-sc/source/ui/src/solvrdlg.src \
 sc/source/ui/src/sc.src \
 sc/source/ui/src/pseudo.src \
 sc/source/ui/src/subtdlg.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 07cb7be..5c7e11e 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/deletecontents \
sc/uiconfig/scalc/ui/externaldata \
sc/uiconfig/scalc/ui/formatcellsdialog \
+   sc/uiconfig/scalc/ui/goalseekdlg \
sc/uiconfig/scalc/ui/insertname \
sc/uiconfig/scalc/ui/insertsheet \
sc/uiconfig/scalc/ui/managenamesdialog \
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 058349e..6392110 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -670,7 +670,12 @@
 
 #define STR_MULTI_SELECT537
 
-#define STR_COUNT   538
+#define STR_INVALIDVAL  538
+#define STR_INVALIDVAR  539
+#define STR_INVALIDFORM 540
+#define STR_NOFORMULA   541
+
+#define STR_COUNT   542
 
 #endif
 
diff --git a/sc/source/ui/inc/solvrdlg.hrc b/sc/source/ui/inc/solvrdlg.hrc
deleted file mode 100644
index 1881a4c..000
--- a/sc/source/ui/inc/solvrdlg.hrc
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include sc.hrc // -RID_SCDLG_SOLVER
-
-#define ED_FORMULACELL  1
-#define ED_TARGETVAL2
-#define ED_VARCELL  3
-#define FT_FORMULACELL  1
-#define FT_TARGETVAL2
-#define FT_VARCELL  3
-#define RB_FORMULACELL  1
-#define RB_VARCELL  2
-#define FL_VARIABLES1
-#define BTN_OK  1
-#define BTN_CANCEL  2
-#define BTN_HELP1
-#define STR_INVALIDVAL  1
-#define STR_INVALIDVAR  2
-#define STR_INVALIDFORM 3
-#define STR_NOFORMULA   4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index 30290c0..871bde4 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -55,21 +55,18 @@ public:
 virtual sal_BoolClose();
 
 private:
-FixedLine   aFlVariables;
-FixedText   aFtFormulaCell;
-formula::RefEditaEdFormulaCell;
-formula::RefButton  aRBFormulaCell;
+FixedText*  m_pFtFormulaCell;
+formula::RefEdit*   m_pEdFormulaCell;
+formula::RefButton* m_pRBFormulaCell;
 
-FixedText   aFtTargetVal;
-EditaEdTargetVal;
+Edit*   m_pEdTargetVal;
 
-FixedText   aFtVariableCell;
-formula::RefEditaEdVariableCell;
-formula::RefButton  aRBVariableCell;
+FixedText*  m_pFtVariableCell;
+formula::RefEdit*   m_pEdVariableCell;
+formula::RefButton* m_pRBVariableCell;
 
-OKButtonaBtnOk;
-CancelButton

[Libreoffice-commits] core.git: sfx2/source

 sfx2/source/appl/workwin.cxx |   80 +++
 sfx2/source/inc/workwin.hxx  |4 +-
 2 files changed, 38 insertions(+), 46 deletions(-)

New commits:
commit f1c91970cba512452bb138c5af262b910068589e
Author: Noel Grandin n...@peralex.com
Date:   Fri Apr 12 17:06:07 2013 +0200

Convert SfxChildList_Impl from SfxPtrArr to std::vector

and simplify use site

Change-Id: I287c280e1206f72dfaff4f38c24c8997e726887a
Reviewed-on: https://gerrit.libreoffice.org/3388
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 2f43e60..d9aa77c 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -524,14 +524,14 @@ sal_uInt16 ChildTravelValue( SfxChildAlignment eAlign )
 void SfxWorkWindow::Sort_Impl()
 {
 aSortedList.clear();
-for (sal_uInt16 i=0; ipChildren-Count(); i++)
+for (sal_uInt16 i = 0; i  aChildren.size(); ++i)
 {
-SfxChild_Impl *pCli = (*pChildren)[i];
+SfxChild_Impl *pCli = aChildren[i];
 if (pCli)
 {
 sal_uInt16 k;
 for (k=0; kaSortedList.size(); k++)
-if (ChildAlignValue((*pChildren)[aSortedList[k]]-eAlign) 
+if (ChildAlignValue( aChildren[aSortedList[k]]-eAlign ) 
 ChildAlignValue(pCli-eAlign))
 break;
 aSortedList.insert( aSortedList.begin() + k, i );
@@ -614,13 +614,10 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings 
rB, SfxWorkWindow* pPar
 pBindings-SetWorkWindow_Impl( this );
 
 pChildWins = new SfxChildWindows_Impl;
-pChildren = new SfxChildList_Impl;
 
 // For the ObjectBars a integral place in the Childlist is reserved,
 // so that they always come in a defined order.
-SfxChild_Impl* pChild=0;
-for (sal_uInt16 n=0; n  SFX_OBJECTBAR_MAX; ++n)
-pChildren-Insert(0,pChild);
+aChildren.insert( aChildren.begin(), SFX_OBJECTBAR_MAX, NULL );
 
 // create and initialize layout manager listener
 Reference com::sun::star::frame::XFrame  xFrame = GetFrameInterface();
@@ -648,8 +645,7 @@ SfxWorkWindow::~SfxWorkWindow()
 }
 
 // Delete help structure for Child-Windows
-DBG_ASSERT( pChildren-Count() == 0, dangling children );
-delete pChildren;
+DBG_ASSERT( aChildren.empty(), dangling children );
 delete pChildWins;
 
 if ( m_xLayoutManagerListener.is() )
@@ -744,7 +740,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
 // Delete StatusBar
 ResetStatusBar_Impl();
 
-// Delete ObjectBars (this is done last, so that pChildren does not
+// Delete ObjectBars (this is done last, so that aChildren does not
 // receive dead Pointers)
 for ( sal_uInt16 i = 0; i  aObjBarList.size(); i++ )
 {
@@ -757,7 +753,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
 
 // ObjectBars are all released at once, since they occupy a
 // fixed contiguous area in the array pChild
-pChildren-Remove(0, SFX_OBJECTBAR_MAX);
+aChildren.clear();
 bSorted = sal_False;
 
 nChildren = 0;
@@ -839,7 +835,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
 
 for ( sal_uInt16 n=0; naSortedList.size(); ++n )
 {
-SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
+SfxChild_Impl* pCli = aChildren[aSortedList[n]];
 if ( !pCli-pWin )
 continue;
 
@@ -981,7 +977,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window 
rWindow,
 SfxChildAlignment eAlign, sal_Bool bCanGetFocus )
 {
 DBG_CHKTHIS(SfxWorkWindow, 0);
-DBG_ASSERT( pChildren-Count()  255, too many children );
+DBG_ASSERT( aChildren.size()  255, too many children );
 DBG_ASSERT( SfxChildAlignValid(eAlign), invalid align );
 DBG_ASSERT( !FindChild_Impl(rWindow), child registered more than once );
 
@@ -993,10 +989,10 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window 
rWindow,
 eAlign, rWindow.IsVisible());
 pChild-bCanGetFocus = bCanGetFocus;
 
-pChildren-Insert(pChildren-Count(), pChild);
+aChildren.push_back(pChild);
 bSorted = sal_False;
 nChildren++;
-return (*pChildren)[pChildren-Count()-1];
+return aChildren.back();
 }
 
 //
@@ -1007,19 +1003,18 @@ void SfxWorkWindow::ReleaseChild_Impl( Window rWindow )
 
 SfxChild_Impl *pChild = 0;
 sal_uInt16 nPos;
-for ( nPos = 0; nPos  pChildren-Count(); ++nPos )
+for ( nPos = 0; nPos  aChildren.size(); ++nPos )
 {
-pChild = (*pChildren)[nPos];
-if ( pChild )
-  if ( pChild-pWin == rWindow )
+pChild = aChildren[nPos];
+if ( pChild  pChild-pWin == rWindow )
 break;
 }
 
-if ( nPos  pChildren-Count() )
+if ( nPos  aChildren.size() )

[PUSHED] Convert SfxChildList_Impl from SfxPtrArr to std::vector

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3388

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3388
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I287c280e1206f72dfaff4f38c24c8997e726887a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] core.git: helpcontent2

2013-04-16 Thread Caolán McNamara

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 431b265af7a66c15a35e8a388d2aa8c9ddb106e1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Apr 16 20:23:34 2013 +0100

Updated core
Project: help  0a2a1d9d34779e473405adcae1a96710686c9cec

diff --git a/helpcontent2 b/helpcontent2
index e1ab4a2..0a2a1d9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e1ab4a2eb199583079e4c87e945534488c64228e
+Subproject commit 0a2a1d9d34779e473405adcae1a96710686c9cec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

2013-04-16 Thread Caolán McNamara

 helpers/help_hid.lst   |9 -
 source/text/scalc/01/0604.xhp  |   14 +++---
 source/text/shared/00/0001.xhp |4 ++--
 3 files changed, 9 insertions(+), 18 deletions(-)

New commits:
commit 0a2a1d9d34779e473405adcae1a96710686c9cec
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Apr 16 20:23:34 2013 +0100

adapt help ids for goal seek dialog .ui conversion

Change-Id: If4d94e8d3cea5dcdf605bd5362fa17be76925537

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 62159de..1fd405d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6607,10 +6607,6 @@ sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943,
 sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD1,1495681326,
 sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD2,1495681328,
 sc_Edit_RID_SCDLG_SIMPLEREF_ED_ASSIGN,2568996875,
-sc_Edit_RID_SCDLG_SOLVER_DOUBLE_ED_VALUE,1495517185,
-sc_Edit_RID_SCDLG_SOLVER_ED_FORMULACELL,2567374849,
-sc_Edit_RID_SCDLG_SOLVER_ED_TARGETVAL,2567374850,
-sc_Edit_RID_SCDLG_SOLVER_ED_VARCELL,2567374851,
 sc_Edit_RID_SCDLG_SPEC_FILTER_ED_COPY_AREA,2567096327,
 sc_Edit_RID_SCDLG_SPEC_FILTER_ED_CRITERIA_AREA,2567096372,
 sc_Edit_RID_SCDLG_STRINPUT_ED_INPUT,1493469194,
@@ -6662,8 +6658,6 @@ 
sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_VARIABLECELLS,2569219587,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
 sc_ImageButton_RID_SCDLG_SIMPLEREF_RB_ASSIGN,2569006604,
-sc_ImageButton_RID_SCDLG_SOLVER_RB_FORMULACELL,2567384577,
-sc_ImageButton_RID_SCDLG_SOLVER_RB_VARCELL,2567384578,
 sc_ImageButton_RID_SCDLG_SPEC_FILTER_RB_COPY_AREA,2567106056,
 sc_ImageButton_RID_SCDLG_SPEC_FILTER_RB_CRITERIA_AREA,2567106101,
 sc_ImageButton_RID_SCDLG_TABOP_RB_COLCELL,2567908867,
@@ -6732,7 +6726,6 @@ sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD3,1493749274,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP1,1493749275,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP2,1493749276,
 sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA,2567507478,
-sc_ListBox_RID_SCDLG_SOLVEROPTIONS_LB_ENGINE,1495485953,
 sc_ListBox_RID_SCDLG_SPEC_FILTER_LB_COPY_AREA,2567097862,
 sc_ListBox_RID_SCDLG_SPEC_FILTER_LB_CRITERIA_AREA,2567097907,
 sc_ListBox_RID_SCPAGE_CONTENT_LB_COLOR,958189115,
@@ -6786,7 +6779,6 @@ sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657,
 sc_MultiListBox_RID_SCDLG_SHOW_TAB_LB_ENTRYLIST,1494993931,
 sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
 sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593,
-sc_NumericField_RID_SCDLG_SOLVER_INTEGER_NF_VALUE,1495504897,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
 sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_ADD,1493537385,
@@ -6814,7 +6806,6 @@ 
sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET1,1495667315,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET2,1495667318,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET3,1495667321,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET4,1495667324,
-sc_PushButton_RID_SCDLG_SOLVEROPTIONS_BTN_EDIT,1495486977,
 sc_PushButton_RID_SCPAGE_USERLISTS_BTN_ADD,956846594,
 sc_PushButton_RID_SCPAGE_USERLISTS_BTN_COPY,956846596,
 sc_PushButton_RID_SCPAGE_USERLISTS_BTN_NEW,956846593,
diff --git a/source/text/scalc/01/0604.xhp 
b/source/text/scalc/01/0604.xhp
index 0cad17f..12e960f 100644
--- a/source/text/scalc/01/0604.xhp
+++ b/source/text/scalc/01/0604.xhp
@@ -28,7 +28,7 @@
 /meta
 body
 bookmark xml-lang=en-US branch=hid/.uno:GoalSeekDialog id=bm_id4741970 
localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:GoalSeekDialog id=bm_id3153088 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/goalseekdlg/GoalSeekDialog id=bm_id3153088 
localize=false/
 paragraph role=heading id=hd_id3155629 xml-lang=en-US level=1 
l10n=U oldref=1Goal Seek/paragraph
 paragraph role=paragraph id=par_id3145119 xml-lang=en-US l10n=U 
oldref=2variable id=zielwertsuchetextahelp 
hid=.uno:GoalSeekDialogOpens a dialog where you can solve an equation with a 
variable./ahelp
 /variable After a successful search, a dialog with the results opens, 
allowing you to apply the result and the target value directly to the 
cell./paragraph
@@ -37,15 +37,15 @@
 /section
 paragraph role=heading id=hd_id3149656 xml-lang=en-US level=2 
l10n=U oldref=3Default/paragraph
 paragraph role=paragraph id=par_id3151211 xml-lang=en-US l10n=U 
oldref=4In this section, you can define the variables in your 
formula./paragraph
-bookmark xml-lang=en-US 
branch=hid/sc:Edit:RID_SCDLG_SOLVER:ED_FORMULACELL id=bm_id3145171 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/goalseekdlg/formulaedit id=bm_id3145171 
localize=false/
 paragraph role=heading id=hd_id3150869 xml-lang=en-US level=3 
l10n=U oldref=5Formula cell/paragraph
-paragraph role=paragraph id=par_id3153194 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SC:EDIT:RID_SCDLG_SOLVER:ED_FORMULACELLIn the formula 
cell,

[Libreoffice-commits] core.git: sfx2/source

 sfx2/source/appl/workwin.cxx |  125 ---
 sfx2/source/inc/workwin.hxx  |   10 ---
 2 files changed, 63 insertions(+), 72 deletions(-)

New commits:
commit 74af27fef6505d4e47b53ea765b9cc4a96629fa4
Author: Noel Grandin n...@peralex.com
Date:   Mon Apr 15 09:57:55 2013 +0200

Convert SfxChildWindows_Impl from SfxPtrArr to std::vector

- also remove dead struct SfxSplitWin_Impl

Change-Id: I408bd994b206963b5ac115f4d47fc79c6687e051
Reviewed-on: https://gerrit.libreoffice.org/3390
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d9aa77c..435bddd 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -613,8 +613,6 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings 
rB, SfxWorkWindow* pPar
 
 pBindings-SetWorkWindow_Impl( this );
 
-pChildWins = new SfxChildWindows_Impl;
-
 // For the ObjectBars a integral place in the Childlist is reserved,
 // so that they always come in a defined order.
 aChildren.insert( aChildren.begin(), SFX_OBJECTBAR_MAX, NULL );
@@ -646,7 +644,6 @@ SfxWorkWindow::~SfxWorkWindow()
 
 // Delete help structure for Child-Windows
 DBG_ASSERT( aChildren.empty(), dangling children );
-delete pChildWins;
 
 if ( m_xLayoutManagerListener.is() )
 m_xLayoutManagerListener-dispose();
@@ -689,11 +686,11 @@ void SfxWorkWindow::DeleteControllers_Impl()
 }
 
 // Delete Child-Windows
-for ( n=0; npChildWins-Count(); )
+for ( n=0; naChildWins.size(); )
 {
-SfxChildWin_Impl* pCW = (*pChildWins)[n];
-pChildWins-Remove(n);
-   SfxChildWindow *pChild = pCW-pWin;
+SfxChildWin_Impl* pCW = aChildWins[n];
+aChildWins.erase(aChildWins.begin());
+SfxChildWindow *pChild = pCW-pWin;
 if (pChild)
 {
 pChild-Hide();
@@ -960,9 +957,9 @@ SvBorder SfxWorkWindow::Arrange_Impl()
 
 sal_Bool SfxWorkWindow::PrepareClose_Impl()
 {
-for (sal_uInt16 n=0; npChildWins-Count(); n++)
+for (sal_uInt16 n=0; naChildWins.size(); n++)
 {
-SfxChildWin_Impl *pCW  = (*pChildWins)[n];
+SfxChildWin_Impl *pCW  = aChildWins[n];
 SfxChildWindow *pChild = pCW-pWin;
 if ( pChild  !pChild-QueryClose() )
 return sal_False;
@@ -1057,9 +1054,9 @@ void SfxWorkWindow::ShowChildren_Impl()
 {
 // We have to find the SfxChildWin_Impl to retrieve the
 // SFX_CHILDWIN flags that can influence visibility.
-for (sal_uInt16 n=0; npChildWins-Count(); n++)
+for (sal_uInt16 n=0; naChildWins.size(); n++)
 {
-SfxChildWin_Impl* pCWin = (*pChildWins)[n];
+SfxChildWin_Impl* pCWin = aChildWins[n];
 SfxChild_Impl*pChild  = pCWin-pCli;
 if ( pChild == pCli )
 {
@@ -1142,8 +1139,8 @@ void SfxWorkWindow::ResetObjectBars_Impl()
 for ( n = 0; n  aObjBarList.size(); n++ )
 aObjBarList[n].bDestroy = sal_True;
 
-for ( n = 0; n  pChildWins-Count(); ++n )
-(*pChildWins)[n]-nId = 0;
+for ( n = 0; n  aChildWins.size(); ++n )
+aChildWins[n]-nId = 0;
 }
 
 //
@@ -1435,9 +1432,9 @@ bool SfxWorkWindow::AllowChildWindowCreation_Impl( const 
SfxChildWin_Impl i_rCW
 void SfxWorkWindow::UpdateChildWindows_Impl()
 {
 // any current or in the context available Childwindows
-for ( sal_uInt16 n=0; npChildWins-Count(); n++ )
+for ( sal_uInt16 n=0; naChildWins.size(); n++ )
 {
-SfxChildWin_Impl *pCW = (*pChildWins)[n];
+SfxChildWin_Impl *pCW = aChildWins[n];
 SfxChildWindow *pChildWin = pCW-pWin;
 sal_Bool bCreate = sal_False;
 if ( pCW-nId  !pCW-bDisabled   (pCW-aInfo.nFlags  
SFX_CHILDWIN_ALWAYSAVAILABLE || IsVisible_Impl( pCW-nVisibility ) ) )
@@ -1680,9 +1677,9 @@ sal_Bool SfxWorkWindow::IsVisible_Impl()
 //
 void SfxWorkWindow::HidePopups_Impl(sal_Bool bHide, sal_Bool bParent, 
sal_uInt16 nId )
 {
-for ( sal_uInt16 n = 0; n  pChildWins-Count(); ++n )
+for ( sal_uInt16 n = 0; n  aChildWins.size(); ++n )
 {
-SfxChildWindow *pCW = (*pChildWins)[n]-pWin;
+SfxChildWindow *pCW = aChildWins[n]-pWin;
 if (pCW  pCW-GetAlignment() == SFX_ALIGN_NOALIGNMENT  
pCW-GetType() != nId)
 {
 Window *pWin = pCW-GetWindow();
@@ -1722,9 +1719,9 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier 
eChild,
 else
 {
 // configure direct childwindow
-for (sal_uInt16 n=0; npChildWins-Count(); n++)
+for (sal_uInt16 n=0; naChildWins.size(); n++)
 {
-pCW = (*pChildWins)[n];
+pCW = aChildWins[n];

[PUSHED] Convert SfxChildWindows_Impl from SfxPtrArr to std::vector

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3390

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3390
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I408bd994b206963b5ac115f4d47fc79c6687e051
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

Re: patch for postgresql driver

On Tue, Apr 16, 2013 at 03:16:25PM +0100, Wols Lists wrote:
 The attached patch is not in logerrit (I've yet to set that up), and
 there's an error in it so I'm hoping someone can help. It does a TODO in
 the file, but I can't get my argument casting right - in the original
 code, matchIgnoreAsciiCaseAsciiL wraps its argument in
 RTL_CONSTASCII_STRINGPARAM. This is defined in sal/inc/rtl/string.h and
 passes both the string and its length. So me removing it is obviously a
 mistake, but it's got some integrity checking in there and I just can't
 get it to pass that.

RTL_CONSTASCII_STRINGPARAM is a hack/optimisation specific to
compile-time constants. With your change, the string is not anymore a
compile-time constant, so just use

 equalsIgnoreAsciiCaseAscii()

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

[Libreoffice-commits] core.git: sc/source

2013-04-16 Thread Joren De Cuyper

 sc/source/ui/src/globstr.src   |   18 +-
 sc/source/ui/view/viewfun2.cxx |   12 +---
 2 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit af4a947174aafe669c129c54c304caa43d90eac7
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date:   Thu Apr 11 15:43:20 2013 +0200

fdo#63290 - UI: Goal Seek - incorrect term current cell

Previous patch was a review patch I submitted to send to the UX advice
mailinglist. Cor proposed a better wording for the label name,
see https://bugs.freedesktop.org/show_bug.cgi?id=63290#c4 and has been
revised a bit more since then.

Change-Id: I0cd1fac43ba3fed55fbb16e4f9bbf6836c1436b2
Reviewed-on: https://gerrit.libreoffice.org/3338
Reviewed-by: Joren De Cuyper joren.libreoff...@telenet.be
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 54001c4..a545d40 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -443,31 +443,23 @@ Resource RID_GLOBSTR
 };
 String STR_MSSG_SOLVE_0
 {
-Text [ en-US ] = Goal Seek successful.\n ;
+Text [ en-US ] = Goal Seek succeeded. Result:  ;
 };
 String STR_MSSG_SOLVE_1
 {
-Text [ en-US ] = Result ( ;
+Text [ en-US ] = \n\nInsert the result into the variable cell? ;
 };
 String STR_MSSG_SOLVE_2
 {
-Text [ en-US ] = ). Apply setting to spreadsheet? ;
+Text [ en-US ] = Goal Seek failed.\n\n ;
 };
 String STR_MSSG_SOLVE_3
 {
-Text [ en-US ] = Goal Seek not successful.\n ;
+Text [ en-US ] = Insert the closest value ( ;
 };
 String STR_MSSG_SOLVE_4
 {
-Text [ en-US ] = No exact value found. \n ;
-};
-String STR_MSSG_SOLVE_5
-{
-Text [ en-US ] = Insert closest value ( ;
-};
-String STR_MSSG_SOLVE_6
-{
-Text [ en-US ] = )? ;
+Text [ en-US ] = ) into the variable cell anyway? ;
 };
 String STR_TABLE_GESAMTERGEBNIS
 {
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index a097ca6..b61d3ab 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1854,18 +1854,16 @@ void ScViewFunc::Solve( const ScSolveParam rParam )
 
 if ( bExact )
 {
-aMsgStr  = ScGlobal::GetRscString( STR_MSSG_SOLVE_0 );
-aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_1 );
+aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_0 );
 aMsgStr += String( aResStr );
-aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_2 );
+aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_1 );
 }
 else
 {
-aMsgStr  = ScGlobal::GetRscString( STR_MSSG_SOLVE_3 );
-aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_4 );
-aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_5 );
+aMsgStr  = ScGlobal::GetRscString( STR_MSSG_SOLVE_2 );
+aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_3 );
 aMsgStr += String( aResStr );
-aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_6 );
+aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_4 );
 }
 
 MessBox aBox( GetViewData()-GetDialogParent(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#63290 - UI: Goal Seek - incorrect term current cell

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3338

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved
  Joren De Cuyper: Looks good to me, but someone else must approve


-- 
To view, visit https://gerrit.libreoffice.org/3338
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0cd1fac43ba3fed55fbb16e4f9bbf6836c1436b2
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be
Gerrit-Reviewer: Stefan Knorr heinzless...@gmail.com

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

Need help

2013-04-16 Thread Anurag Kanungo

Hello,

Finally i was able to build the libre office using the clang compiler on
master branch and i built it on open suse . But my compiler plugings are
not working as it says compiler headers missing .

Please guide me how to proceed in an easy hack... I have removed some of
the warnings , like invalid arguments , unused macros and invalid data type
conversions using a simple text editor , but i don't know .. How to proceed
further . Please guide.

On Monday, April 15, 2013, Thorsten Behrens wrote:

 Anurag Kanungo wrote:
  $ ./g checkout -b libreoffice-4-0 origin/libreoffice-4-0(Branch
  libreoffice-4-0)
 
 Hi Anurag,

 for clang stuff, I'd suggest you use the master branch, much more
 fixes in there. In general, though, as you've been told on the mailing
 list, if you want to tackle that task, some amount of fiddling with
 the details is expected. In your case, I'd suggest using
 --with-system-graphite and see if you get further (provided the master
 build breaks at the same place).

  And even i tried using gcc and g++ compiler... I got the same error.
 
 That appears exceedingly unlikely, if you switch compiler, at any rate
 make sure to run make clean before rebuilding.

 (and let's keep further questions and discussions to the public list)

 HTH,

 --

 Thorsten Behrens

 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg; GF: Jeff
 Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg)

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

Re: GSoC-2013 Support for Firebird Database in Base

2013-04-16 Thread Robinson Tryon

On Tue, Apr 16, 2013 at 1:50 PM, Jitesh Varandani
jitesh.varand...@gmail.com wrote:
 Sir
 I'm a undergraduate from BITS Pilani pursuing my MSc in Information Systems.
 I went through GSoC ideas and i show my interest in LibreOffice database.
 I have a command in C and SQL as well as good experience on Linux.
 So please help me to as where to start and what else is required to do.

Hi Jitesh,

Welcome to the LibreOffice project!

Please take a look at the 'How to apply' section of our GSoC page for
the basic information you'll need to know about us and the way that we
work with Summer of code students:
https://wiki.documentfoundation.org/GSoC#How_to_apply

We're a strong proponent of people jumping in and hacking on the code,
so please clone the LibreOffice repo and take a look at the Easy Hacks
page:
https://wiki.documentfoundation.org/Development
https://wiki.documentfoundation.org/Easy_Hacks#Easy_Programming_tasks

The developers' IRC channel is at #libreoffice-dev

Doing some QA work can be a great way to learn more about LibreOffice.
The QA Team is very friendly and always happy to introduce new people
to the project. Please feel free to join us in #libreoffice-qa and let
us know that you're an applicant for GSoC.

On a more personal note, I'm excited that you're interested in the
Firebird database work. Replacing HSQLDB has been a long-standing
request, and we'd all benefit from your work on this task. Good luck
with your application!

Cheers,
--Robinson 'qubit' Tryon
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: patch for postgresql driver

On 16/04/13 19:25, Noel Grandin wrote:
 On Tue, Apr 16, 2013 at 6:36 PM, Wols Lists antli...@youngman.org.uk wrote:

 I need to force some type of type conversion - basically from const
 char * to const rtl::OUString, I presume.
 
 You can either call
matchIgnoreAsciiCase( OUString ( p ) )
 or
matchIgnoreAsciiCase( p, strlen(p) )
 
This still refuses to work. I'm guessing the problem lies in my
declaration of the array...

   static const char* keyword_list[] = {
password,
user,
port,
dbname,
connect_timeout,
options,
requiressl
};

for( int i = 0; i  args.getLength() ; ++i )
{
bool append = false;
//for( int j = 0; j  (int) ( sizeof( keyword_list ) / sizeof(
char * )); j++)
for( int j = 0; j  (int) SAL_N_ELEMENTS( keyword_list ); j++)
{
if( args[i].Name.matchIgnoreAsciiCase( OUString(
keyword_list[j]), strlen( keyword_list[j] )))
{

/home/anthony/gitstuff/loffice/connectivity/source/drivers/postgresql/pq_connection.cxx:
In function ‘void pq_sdbc_driver::properties2arrays(const
com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue,
const
com::sun::star::uno::Referencecom::sun::star::script::XTypeConverter,
rtl_TextEncoding, pq_sdbc_driver::cstr_vector,
pq_sdbc_driver::cstr_vector)’:
/home/anthony/gitstuff/loffice/connectivity/source/drivers/postgresql/pq_connection.cxx:502:77:
error: invalid conversion from ‘const char*’ to ‘sal_Unicode {aka short
unsigned int}’ [-fpermissive]
/home/anthony/gitstuff/loffice/instdir/unxlngx6.pro/sdk/include/rtl/ustring.hxx:150:14:
error:   initializing argument 1 of
‘rtl::OUString::OUString(sal_Unicode)’ [-fpermissive]
make[1]: ***
[/home/anthony/gitstuff/loffice/workdir/unxlngx6.pro/CxxObject/connectivity/source/drivers/postgresql/pq_connection.o]
Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [build] Error 2

Bear in mind arrays of strings is funny, I'm guessing the test to make
sure the conversion is allowed is exploding.

If we look at the definition of RTL_CONSTASCII_STRINGPARAM

#define RTL_CONSTASCII_STRINGPARAM( constAsciiStr ) ((constAsciiStr)[0]), \
((sal_Int32)SAL_N_ELEMENTS(constAsciiStr)-1)

it's doing something weird with the first argument as a validity check.
I'm feeding it the second dimension of a string array. I wonder.

Is the following valid syntax, and would it fix the problem?

   static const char* keyword_list[] = {
(password),
(user)
}

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

[Libreoffice-commits] core.git: sfx2/inc sfx2/source

 sfx2/inc/sfx2/dispatch.hxx   |4 +
 sfx2/source/control/dispatch.cxx |   99 ++-
 2 files changed, 49 insertions(+), 54 deletions(-)

New commits:
commit 7e4db91a3900fd0bbce0f0592a045458a37862b3
Author: Noel Grandin n...@peralex.com
Date:   Mon Apr 15 11:21:16 2013 +0200

Convert SfxShellStack_Impl from SfxPtrArr to std::vector

Change-Id: I1ffd615a505029242a87337c9ef42c8156c42d70
Reviewed-on: https://gerrit.libreoffice.org/3394
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index c7aaae3..2b02a5e 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -28,11 +28,11 @@
 #include sfx2/bindings.hxx
 #include sfx2/viewfrm.hxx
 #include map
+#include vector
 
 class SfxSlotServer;
 class SfxShell;
 class SfxRequest;
-class SfxShellStack_Impl;
 class SfxHintPoster;
 class SfxViewFrame;
 class SfxBindings;
@@ -41,6 +41,8 @@ class SfxPopupMenuManager;
 class SfxModule;
 struct SfxDispatcher_Impl;
 
+typedef std::vectorSfxShell* SfxShellStack_Impl;
+
 namespace com
 {
 namespace sun
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 16a83a1..26fd6f0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -30,6 +30,7 @@
 #include stdio.h
 #include stdarg.h
 #include stdlib.h  // due to bsearch
+#include algorithm
 
 #include svtools/helpopt.hxx
 
@@ -37,7 +38,6 @@
 #include appdata.hxx
 #include sfx2/sfxhelp.hxx
 #include sfx2/dispatch.hxx
-#include sfx2/minstack.hxx
 #include sfx2/msg.hxx
 #include sfx2/objface.hxx
 #include sfx2/bindings.hxx
@@ -67,8 +67,6 @@ DBG_NAME(SfxDispatcherFillState)
 
 typedef std::vectorSfxRequest* SfxRequestPtrArray;
 
-DECL_PTRSTACK(SfxShellStack_Impl, SfxShell*, 8, 4 );
-
 struct SfxToDo_Impl
 {
 SfxShell*  pCluster;
@@ -552,14 +550,15 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const 
SfxShell rShell, sal_Bool bDee
 for(std::dequeSfxToDo_Impl::reverse_iterator i = 
pImp-aToDoStack.rbegin(); i != pImp-aToDoStack.rend(); ++i)
 {
 if(i-bPush)
-aStack.Push(i-pCluster);
+aStack.push_back(i-pCluster);
 else
 {
 SfxShell* pPopped(NULL);
 do
 {
-DBG_ASSERT( aStack.Count(), popping from empty stack );
-pPopped = aStack.Pop();
+DBG_ASSERT( !aStack.empty(), popping from empty stack );
+pPopped = aStack.back();
+aStack.pop_back();
 }
 while(i-bUntil  pPopped != i-pCluster);
 DBG_ASSERT(pPopped == i-pCluster, popping unpushed 
SfxInterface);
@@ -568,9 +567,9 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell 
rShell, sal_Bool bDee
 
 sal_Bool bReturn;
 if ( bDeep )
-bReturn = aStack.Contains(rShell);
+bReturn = std::find(aStack.begin(), aStack.end(), rShell) != 
aStack.end();
 else
-bReturn = aStack.Top() == rShell;
+bReturn = aStack.back() == rShell;
 return bReturn;
 }
 
@@ -596,15 +595,15 @@ sal_uInt16 SfxDispatcher::GetShellLevel( const SfxShell 
rShell )
 SFX_STACK(SfxDispatcher::GetShellLevel);
 Flush();
 
-for ( sal_uInt16 n = 0; n  pImp-aStack.Count(); ++n )
-if ( pImp-aStack.Top( n ) == rShell )
+for ( sal_uInt16 n = 0; n  pImp-aStack.size(); ++n )
+if ( *( pImp-aStack.rbegin() + n ) == rShell )
 return n;
 if ( pImp-pParent )
 {
 sal_uInt16 nRet = pImp-pParent-GetShellLevel(rShell);
 if ( nRet == USHRT_MAX )
 return nRet;
-return  nRet + pImp-aStack.Count();
+return  nRet + pImp-aStack.size();
 }
 
 return USHRT_MAX;
@@ -624,9 +623,9 @@ SfxShell *SfxDispatcher::GetShell(sal_uInt16 nIdx) const
 */
 
 {
-sal_uInt16 nShellCount = pImp-aStack.Count();
+sal_uInt16 nShellCount = pImp-aStack.size();
 if ( nIdx  nShellCount )
-return pImp-aStack.Top(nIdx);
+return *(pImp-aStack.rbegin() + nIdx);
 else if ( pImp-pParent )
 return pImp-pParent-GetShell( nIdx - nShellCount );
 return 0;
@@ -717,8 +716,8 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, 
SfxViewFrame* /* pOld */ )
 if ( IsAppDispatcher() )
 return;
 
-for ( int i = int(pImp-aStack.Count()) - 1; i = 0; --i )
-pImp-aStack.Top( (sal_uInt16) i )-DoActivate_Impl(pImp-pFrame, 
bMDI);
+for ( int i = int(pImp-aStack.size()) - 1; i = 0; --i )
+(*(pImp-aStack.rbegin() + i ))-DoActivate_Impl(pImp-pFrame, bMDI);
 
 if ( bMDI  pImp-pFrame )
 {
@@ -743,8 +742,8 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, 
SfxViewFrame* /* pOld */ )
 
 void SfxDispatcher::DoParentActivate_Impl()
 {
-for ( int i = int(pImp-aStack.Count()) - 1; i = 0; --i )
-pImp-aStack.Top( (sal_uInt16) i )-ParentActivate();
+

[PATCH] WIP: date/time IDL datatypes incompatible change

2013-04-16 Thread Lionel Elie Mamane (via Code Review)

Hello LibreOffice gerrit bot, Eike Rathke,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2783

to look at the new patch set (#21).

Change subject: WIP: date/time IDL datatypes incompatible change
..

WIP: date/time IDL datatypes incompatible change

Done:
 - nanosecond precision
 - signed (allowed negative) year

TODO: timezone

Also: assorted improvements / bugfixes in date/time handling code.
Some factorisation of copy/pasted code.

Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6
---
M basic/source/runtime/methods.cxx
M comphelper/source/misc/anycompare.cxx
M comphelper/source/misc/types.cxx
M connectivity/inc/connectivity/dbconversion.hxx
M connectivity/source/commontools/FValue.cxx
M connectivity/source/commontools/dbconversion.cxx
M connectivity/source/drivers/calc/CTable.cxx
M connectivity/source/drivers/dbase/DTable.cxx
M connectivity/source/drivers/file/FDateFunctions.cxx
M connectivity/source/drivers/jdbc/ConnectionLog.cxx
M connectivity/source/drivers/kab/KResultSet.cxx
M connectivity/source/drivers/macab/macabutilities.hxx
M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
M connectivity/source/drivers/odbcbase/OResultSet.cxx
M connectivity/source/drivers/postgresql/pq_tools.cxx
M connectivity/source/inc/odbc/OTools.hxx
M editeng/source/items/flditem.cxx
M editeng/source/uno/unofield.cxx
M extensions/source/logging/csvformatter.cxx
M extensions/source/logging/logrecord.cxx
M extensions/source/logging/plaintextformatter.cxx
M extensions/source/propctrlr/formcomponenthandler.cxx
M extensions/source/propctrlr/standardcontrol.cxx
M filter/source/msfilter/svdfppt.cxx
M forms/qa/integration/forms/TimeValidator.java
M forms/source/component/Time.cxx
M forms/source/xforms/convert.cxx
M forms/source/xforms/datatypes.cxx
M framework/source/jobs/jobdata.cxx
M odk/examples/DevelopersGuide/Forms/TimeValidator.java
M offapi/com/sun/star/util/Date.idl
M offapi/com/sun/star/util/DateTime.idl
M offapi/com/sun/star/util/DateTimeRange.idl
M offapi/com/sun/star/util/Duration.idl
M offapi/com/sun/star/util/Time.idl
M offapi/type_reference/types.rdb
M oox/source/core/xmlfilterbase.cxx
M oox/source/dump/dumperbase.cxx
M oox/source/ppt/comments.cxx
M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
M reportbuilder/java/org/libreoffice/report/SDBCReportData.java
M reportdesign/source/filter/xml/xmlControlProperty.cxx
M sax/qa/cppunit/test_converter.cxx
M sax/source/tools/converter.cxx
M sc/inc/chgtrack.hxx
M sc/source/core/data/dbdocutl.cxx
M sc/source/core/data/dpobject.cxx
M sc/source/core/tool/chgtrack.cxx
M sc/source/core/tool/chgviset.cxx
M sc/source/core/tool/interpr2.cxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/filter/oox/unitconverter.cxx
M sc/source/filter/xcl97/XclExpChangeTrack.cxx
M sc/source/filter/xcl97/XclImpChangeTrack.cxx
M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
M sc/source/filter/xml/XMLConverter.cxx
M sc/source/ui/docshell/docsh3.cxx
M sc/source/ui/miscdlgs/sharedocdlg.cxx
M sc/source/ui/unoobj/fielduno.cxx
M sc/source/ui/view/viewfun6.cxx
M scripting/source/pyprov/pythonscript.py
M sd/source/filter/eppt/eppt.cxx
M sd/source/filter/eppt/pptx-epptooxml.cxx
M sd/source/ui/annotations/annotationmanager.cxx
M sd/source/ui/dlg/animobjs.cxx
M sfx2/qa/complex/sfx2/DocumentProperties.java
M sfx2/source/appl/sfxpicklist.cxx
M sfx2/source/bastyp/frmhtmlw.cxx
M sfx2/source/bastyp/helper.cxx
M sfx2/source/dialog/dinfdlg.cxx
M sfx2/source/dialog/versdlg.cxx
M sfx2/source/doc/SfxDocumentMetaData.cxx
M sfx2/source/doc/objcont.cxx
M sfx2/source/doc/oleprops.cxx
M sfx2/source/view/viewprn.cxx
M svl/source/items/dateitem.cxx
M svl/source/misc/fstathelper.cxx
M svtools/source/contnr/DocumentInfoPreview.cxx
M svtools/source/contnr/contentenumeration.cxx
M svtools/source/misc/templatefoldercache.cxx
M svtools/source/svhtml/parhtml.cxx
M svtools/source/table/cellvalueconversion.cxx
M svx/source/fmcomp/gridcell.cxx
M sw/source/core/doc/doccomp.cxx
M sw/source/core/doc/docglbl.cxx
M sw/source/core/doc/docredln.cxx
M sw/source/core/fields/docufld.cxx
M sw/source/core/fields/flddat.cxx
M sw/source/core/unocore/swunohelper.cxx
M sw/source/core/unocore/unoredline.cxx
M sw/source/filter/ww8/wrtww8.cxx
M sw/source/filter/ww8/ww8par.cxx
M sw/source/filter/xml/XMLRedlineImportHelper.cxx
M tools/Library_tl.mk
M tools/inc/tools/datetime.hxx
M tools/inc/tools/time.hxx
M tools/source/datetime/datetime.cxx
M tools/source/datetime/ttime.cxx
M tools/source/inet/inetmsg.cxx
M tools/source/rc/rc.cxx
M ucb/source/sorter/sortresult.cxx
M ucb/source/ucp/cmis/cmis_content.cxx
M ucb/source/ucp/file/shell.cxx
M ucb/source/ucp/ftp/ftpdirp.cxx
M ucb/source/ucp/ftp/ftpdirp.hxx
M unotools/inc/unotools/datetime.hxx
M unotools/source/i18n/localedatawrapper.cxx
M unotools/source/misc/datetime.cxx
M unotools/source/ucbhelper/ucbhelper.cxx

[PUSHED] Convert SfxShellStack_Impl from SfxPtrArr to std::vector

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3394

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3394
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ffd615a505029242a87337c9ef42c8156c42d70
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] core.git: sfx2/inc sfx2/Package_inc.mk sfx2/source

 sfx2/Package_inc.mk |1 
 sfx2/inc/sfx2/minstack.hxx  |   56 
 sfx2/source/menu/mnumgr.cxx |1 
 3 files changed, 58 deletions(-)

New commits:
commit 187a592df9bc9c1ef4b53fe6dce40a3c74f6bb67
Author: Noel Grandin n...@peralex.com
Date:   Mon Apr 15 11:26:43 2013 +0200

remove dead code minstack.hxx

Change-Id: I67a7a4c51188187c1ab234f8e9d2634eb018badf
Reviewed-on: https://gerrit.libreoffice.org/3397
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 228cc62..4c08af5 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -74,7 +74,6 @@ $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.h
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
-$(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
deleted file mode 100644
index d4de0da..000
--- a/sfx2/inc/sfx2/minstack.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFXMINSTACK_HXX
-#define _SFXMINSTACK_HXX
-
-#include sfx2/minarray.hxx
-
-#define DECL_PTRSTACK( ARR, T, nI, nG ) \
-DECL_PTRARRAY( ARR##arr_, T, nI, nG ) \
-class ARR: private ARR##arr_ \
-{ \
-public: \
-ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \
-ARR##arr_( nInitSize, nGrowSize ) \
-{} \
-\
-ARR( const ARR rOrig ): \
-ARR##arr_( rOrig ) \
-{} \
-\
-sal_uInt16  Count() const { return ARR##arr_::Count(); } \
-voidPush( T rElem ) { Append( rElem ); } \
-T   Top( sal_uInt16 nLevel = 0 ) const \
-{ return (*this)[Count()-nLevel-1]; } \
-T   Bottom() const { return (*this)[0]; } \
-T   Pop() \
-{   T aRet = (*this)[Count()-1]; \
-Remove( Count()-1, 1 ); \
-return aRet; \
-} \
-T*   operator*() \
-{ return (*this)[Count()-1]; } \
-voidClear() { ARR##arr_::Clear(); } \
-sal_BoolContains( const T pItem ) const \
-{ return ARR##arr_::Contains( pItem ); } \
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index a83e975..0a2f0ca 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -52,7 +52,6 @@
 #include virtmenu.hxx
 #include sfx2/msg.hxx
 #include sfx2/dispatch.hxx
-#include sfx2/minstack.hxx
 #include sfx2/app.hxx
 #include sfxtypes.hxx
 #include sfx2/bindings.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] remove dead code minstack.hxx

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3397

Approvals:
  Thomas Arnhold: Looks good to me, but someone else must approve
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3397
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I67a7a4c51188187c1ab234f8e9d2634eb018badf
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

[Libreoffice-commits] core.git: sfx2/source

 sfx2/source/appl/workwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3fa18254a24c1f260ff655fce9f100da800a28c
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 16 23:08:41 2013 +0300

Fix error: cannot cast from type 'int' to pointer type 'SfxChild_Impl *'

Change-Id: Ic38b7fcb07d0cbc9a701207e0085b42d3471a786

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 435bddd..195278e 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -615,7 +615,7 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings 
rB, SfxWorkWindow* pPar
 
 // For the ObjectBars a integral place in the Childlist is reserved,
 // so that they always come in a defined order.
-aChildren.insert( aChildren.begin(), SFX_OBJECTBAR_MAX, NULL );
+aChildren.insert( aChildren.begin(), SFX_OBJECTBAR_MAX, 
(SfxChild_Impl*)NULL );
 
 // create and initialize layout manager listener
 Reference com::sun::star::frame::XFrame  xFrame = GetFrameInterface();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/source include/postx.h include/prex.h tools/inc tools/Package_inc.mk vcl/inc vcl/unx

 canvas/source/cairo/cairo_xlib_cairo.cxx  |4 -
 include/postx.h   |   65 ++
 include/prex.h|   60 
 tools/Package_inc.mk  |2 
 tools/inc/tools/postx.h   |   65 --
 tools/inc/tools/prex.h|   60 
 vcl/inc/unx/gtk/gtkdata.hxx   |4 -
 vcl/inc/unx/gtk/gtkframe.hxx  |4 -
 vcl/inc/unx/gtk/gtkgdi.hxx|4 -
 vcl/inc/unx/salbmp.h  |4 -
 vcl/inc/unx/saldata.hxx   |4 -
 vcl/inc/unx/salframe.h|4 -
 vcl/inc/unx/salgdi.h  |4 -
 vcl/inc/unx/salunx.h  |4 -
 vcl/inc/unx/salvd.h   |4 -
 vcl/inc/unx/svsys.h   |4 -
 vcl/inc/unx/wmadaptor.hxx |4 -
 vcl/unx/generic/app/i18n_cb.cxx   |4 -
 vcl/unx/generic/app/i18n_ic.cxx   |4 -
 vcl/unx/generic/app/i18n_im.cxx   |4 -
 vcl/unx/generic/app/i18n_status.cxx   |4 -
 vcl/unx/generic/app/randrwrapper.cxx  |4 -
 vcl/unx/generic/app/saldata.cxx   |4 -
 vcl/unx/generic/app/saldisp.cxx   |4 -
 vcl/unx/generic/app/sm.cxx|4 -
 vcl/unx/generic/app/wmadaptor.cxx |4 -
 vcl/unx/generic/desktopdetect/desktopdetector.cxx |4 -
 vcl/unx/generic/dtrans/X11_dndcontext.hxx |4 -
 vcl/unx/generic/dtrans/X11_selection.cxx  |4 -
 vcl/unx/generic/dtrans/X11_selection.hxx  |4 -
 vcl/unx/generic/dtrans/bmp.hxx|4 -
 vcl/unx/generic/gdi/salbmp.cxx|4 -
 vcl/unx/generic/gdi/salgdi.cxx|4 -
 vcl/unx/generic/gdi/salvd.cxx |4 -
 vcl/unx/generic/gdi/xrender_peer.hxx  |4 -
 vcl/unx/generic/window/salframe.cxx   |4 -
 vcl/unx/generic/window/salobj.cxx |4 -
 vcl/unx/gtk/window/gtkframe.cxx   |4 -
 38 files changed, 191 insertions(+), 193 deletions(-)

New commits:
commit 70b45b2f55174bbdbf254f3efa755ffddb3d2721
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 16 23:11:22 2013 +0300

Move {pre,post}x.h to where {pre,post}mac.h and {pre,post}win.h are

Change-Id: I561aa6cc1de7ed6128d25c82cd493d5d5718e052

diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx 
b/canvas/source/cairo/cairo_xlib_cairo.cxx
index 3086fd5..8b26292 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -19,10 +19,10 @@
 
 #include utility
 
-#include tools/prex.h
+#include prex.h
 #include X11/extensions/Xrender.h
 #include X11/Xlib.h
-#include tools/postx.h
+#include postx.h
 
 #include cairo_xlib_cairo.hxx
 
diff --git a/include/postx.h b/include/postx.h
new file mode 100644
index 000..7bce135
--- /dev/null
+++ b/include/postx.h
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef _POSTX_H
+#define _POSTX_H
+
+#if defined __cplusplus
+}
+#endif
+
+/* X Types */
+#undef Window
+#undef BYTE
+#undef INT8
+#undef INT64
+#undef BOOL
+#undef Font
+#undef Cursor
+#undef String
+#undef KeyCode
+#undef Region
+#undef Icon
+#undef Time
+#undef Boolean
+
+#undef Min
+#undef Max
+#undef DestroyAll
+#undef Success
+
+#undef Printer
+#undef Orientation
+
+#undef GetToken
+#undef ReleaseToken
+#undef InitializeToken
+#undef NextRequest
+
+#ifdef KeyPress
+#if KeyPress != 2
+Error KeyPress must be Equal 2
+#endif
+#undef KeyPress
+#endif
+#define XLIB_KeyPress 2
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/prex.h b/include/prex.h
new file mode 100644
index 000..e513880
--- /dev/null
+++ b/include/prex.h
@@ -0,0 +1,60 @@
+/* -*- Mode: C++;

Re: Basic font for labels in a Base form

2013-04-16 Thread Dan Lewis


On 04/16/2013 02:05 AM, Lionel Elie Mamane wrote:

On Thu, Mar 28, 2013 at 10:43:30AM -0400, Dan Lewis wrote:

  Edit a Base form using LibreOffice 4.0.2.2 (32 bit Debian).
Control+right click a label in the form. Select Control from the
context menu. Click the elliplse ( ... ) for the Font property.
Click the Font tab in the Character dialog.
   Why is it that the Family font listed contains eight different
fonts as the (Default) font? Tools  Options  LibreOffice Writer

Basic Fonts permits me to select my fonts and font sized that I

want to use. Why does Base ignore these selections?
  Observation: LibreOffice 4.0.2.1 64 bit Debian uses the fonts I
selected in Tools  Options  LibreOffice Writer  Basic Fonts.

I don't know, and your reproductions instructions are not detailed
enough for me to understand. If there is a bug, I'd be glad to
understand it (our bugzilla is the best place for discussing bugs) and
review/commit a patch fixing it.

 Edit a Base form. Click one of the controls and then click the 
Control tool which opens the Properties dialog. Go down to the Font 
property. Click the ellipse to its right to open the Character dialog. 
For 4.0.2.2 (64 bit), the family font is Liberation Sans which is what I 
selected as mentioned above. However, for 4.0.2.2 (32 bit), the Font 
Property shows (Default). Clicking its ellipse, I opened the Character 
dialog. In the Font tab, I saw this as the font family (I copied this 
from the dialog):
Segoe UI;Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany 
AMT;Albany;Arial;Nimbus Sans L;Interface 
User;Geneva;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans Serif.
 Additional comment: Below the font family list was this quote: 
This font has not been installed. The closest available font will be used.


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

Re: patch for postgresql driver

On 16/04/13 20:28, Lionel Elie Mamane wrote:
 On Tue, Apr 16, 2013 at 03:16:25PM +0100, Wols Lists wrote:
 The attached patch is not in logerrit (I've yet to set that up), and
 there's an error in it so I'm hoping someone can help. It does a TODO in
 the file, but I can't get my argument casting right - in the original
 code, matchIgnoreAsciiCaseAsciiL wraps its argument in
 RTL_CONSTASCII_STRINGPARAM. This is defined in sal/inc/rtl/string.h and
 passes both the string and its length. So me removing it is obviously a
 mistake, but it's got some integrity checking in there and I just can't
 get it to pass that.
 
 RTL_CONSTASCII_STRINGPARAM is a hack/optimisation specific to
 compile-time constants. With your change, the string is not anymore a
 compile-time constant, so just use
 
  equalsIgnoreAsciiCaseAscii()
 
Thanks! I think that's got it working!

I'm puzzled that it's not a compile-time constant - I tried

static const char* const keyword_list[] = {

without success, too. Bearing in mind it's never going to change forcing
it to const makes sense, but hey, if it works ...

As soon as LO has built successfully, I'll sort out the patch and ask
someone to test it :-)

I've got a system that's almost ready to use as a dev system on which to
put postgreSQL, mariadb, etc etc but I need to find time ... :-)

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

[Libreoffice-commits] core.git: starmath/inc starmath/source

 starmath/inc/utility.hxx|  104 +++---
 starmath/source/utility.cxx |  150 ++--
 2 files changed, 64 insertions(+), 190 deletions(-)

New commits:
commit c6e9926468b1ab7eade9c1afc9e2216dd7c97330
Author: Noel Grandin n...@peralex.com
Date:   Mon Apr 15 14:32:24 2013 +0200

Convert SmFontPickList from SfxPtrArr to std::vector

- removing SmPickList in the process, since it's only used
  as a base class for SmFontPickList
- and remove dynamic allocation, since we're always making our
  own copy, just store the data inline in the vector

Change-Id: Idedff240456788c473ac49bdaa3f6d27a217e3d6
Reviewed-on: https://gerrit.libreoffice.org/3398
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 0f4a748..01a41cd 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -19,12 +19,12 @@
 #ifndef UTILITY_HXX
 #define UTILITY_HXX
 
-#include sfx2/minarray.hxx
 #include vcl/font.hxx
 #include vcl/fixed.hxx
 #include vcl/combobox.hxx
 #include vcl/lstbox.hxx
 #include tools/fract.hxx
+#include deque
 
 
 inline long SmPtsTo100th_mm(long nNumPts)
@@ -114,115 +114,39 @@ SmFace  operator *= (SmFace rFace, const Fraction 
rFrac);
 
 
 //
-// SmPickList
-//
-
-class SmPickList : public SfxPtrArr
-{
-protected:
-sal_uInt16  nSize;
-
-virtual void   *CreateItem(const void *pItem) = 0;
-virtual voidDestroyItem(void *pItem) = 0;
-
-virtual boolCompareItem(const void *pFirstItem, const void 
*pSecondItem) const = 0;
-
-virtual OUString GetStringItem(void *pItem) = 0;
-
-void   *GetPtr(sal_uInt16 nPos) const { return 
SfxPtrArr::GetObject(nPos); }
-void  *GetPtr(sal_uInt16 nPos) { return SfxPtrArr::GetObject(nPos); }
-voidInsertPtr(sal_uInt16 nPos, void *pItem) { 
SfxPtrArr::Insert(nPos, pItem); }
-voidRemovePtr(sal_uInt16 nPos, sal_uInt16 nCount = 1) { 
SfxPtrArr::Remove(nPos, nCount); }
-
-public:
-SmPickList(sal_uInt16 nInitSize = 0, sal_uInt16 nMaxSize = 5);
-virtual ~SmPickList();
-
-SmPickList   operator = (const SmPickList rList);
-
-void   *Get(sal_uInt16 nPos = 0) const { return GetPtr(nPos); }
-using   SfxPtrArr::Insert;
-voidInsert(const void* pItem);
-voidUpdate(const void* pItem, const void *pNewItem);
-using   SfxPtrArr::Remove;
-voidRemove(const void* pItem);
-
-using   SfxPtrArr::operator [];
-void   *operator [] (sal_uInt16 nPos) const { return GetPtr(nPos); }
-
-sal_uInt16  GetSize() const { return nSize; }
-sal_uInt16  Count() const { return SfxPtrArr::Count(); }
-
-voidClear();
-};
-
-
-
-//
 // SmFontPickList
 //
 
 class SmFontDialog;
 
-class SmFontPickList : public SmPickList
+class SmFontPickList
 {
 protected:
-virtual void   *CreateItem(const void *pItem);
-virtual voidDestroyItem(void *pItem);
+sal_uInt16 nMaxItems;
+std::dequeFont aFontVec;
 
-virtual boolCompareItem(const void *pFirstItem, const void 
*pSecondItem) const;
-
-virtual OUString GetStringItem(void *pItem);
+bool CompareItem(const Font  rFirstFont, const Font  rSecondFont) 
const;
+OUString GetStringItem(const Font rItem);
 
 public:
-SmFontPickList()
-: SmPickList(0, 5) {}
-SmFontPickList(sal_uInt16 nInitSize, sal_uInt16 nMaxSize)
-: SmPickList(nInitSize, nMaxSize) {}
-SmFontPickList(const SmPickList rOrig )
-: SmPickList(rOrig) {}
+SmFontPickList(sal_uInt16 nMax = 5) : nMaxItems(nMax) {}
 virtual ~SmFontPickList() { Clear(); }
 
-using   SfxPtrArr::Insert;
 virtual voidInsert(const Font rFont);
-using   SmPickList::Update;
 virtual voidUpdate(const Font rFont, const Font rNewFont);
-using   SfxPtrArr::Remove;
 virtual voidRemove(const Font rFont);
 
-using   SmPickList::Contains;
-inline bool Contains(const Font rFont) const;
-inline Font Get(sal_uInt16 nPos = 0) const;
+void Clear();
+bool Contains(const Font rFont) const;
+Font Get(sal_uInt16 nPos = 0) const;
 
-inline SmFontPickList  operator = (const SmFontPickList rList);
-using   SfxPtrArr::operator [];
-inline Font operator [] (sal_uInt16 nPos) const;
+SmFontPickList  operator = (const SmFontPickList rList);
+Font operator [] (sal_uInt16 nPos) const;
 
 voidReadFrom(const SmFontDialog rDialog);
 voidWriteTo(SmFontDialog rDialog) const;
 };
 
-inline SmFontPickList SmFontPickList::operator = (const SmFontPickList rList)
-{
-*(SmPickList *)this = *(SmPickList *)rList; return *this;
-}
-
-inline Font SmFontPickList::operator

[Libreoffice-commits] core.git: cui/source sfx2/inc sfx2/Library_sfx.mk sfx2/Package_inc.mk sfx2/source

 cui/source/inc/acccfg.hxx   |1 
 cui/source/inc/cfg.hxx  |1 
 cui/source/inc/selector.hxx |1 
 sfx2/Library_sfx.mk |1 
 sfx2/Package_inc.mk |1 
 sfx2/inc/arrdecl.hxx|1 
 sfx2/inc/sfx2/bindings.hxx  |1 
 sfx2/inc/sfx2/minarray.hxx  |  110 ---
 sfx2/source/bastyp/minarray.cxx |  230 
 sfx2/source/control/msgpool.cxx |1 
 sfx2/source/control/objface.cxx |1 
 sfx2/source/dialog/tabdlg.cxx   |1 
 sfx2/source/inc/workwin.hxx |1 
 13 files changed, 351 deletions(-)

New commits:
commit e2ce3538943c510efa8041fca3c83728acf3a155
Author: Noel Grandin n...@peralex.com
Date:   Mon Apr 15 15:18:43 2013 +0200

remove dead class SfxPtrAr and it's header sfx/inc/sfx2/minarray.hxx

Change-Id: I23c9f905e6f679299f95baa6d8d4bafa97a3f19a
Reviewed-on: https://gerrit.libreoffice.org/3399
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 19eba29..2354998 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -43,7 +43,6 @@
 #include svtools/treelistbox.hxx
 #include sfx2/tabdlg.hxx
 #include sfx2/basedlgs.hxx
-#include sfx2/minarray.hxx
 #include cfgutil.hxx
 
 class SfxMacroInfoItem;
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 84ecf04..62686df 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -40,7 +40,6 @@
 #include com/sun/star/uno/XComponentContext.hpp
 #include com/sun/star/lang/XSingleComponentFactory.hpp
 
-#include sfx2/minarray.hxx
 #include sfx2/tabdlg.hxx
 #include vector
 #include vcl/msgbox.hxx
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 4c14e99..40c8a64 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -30,7 +30,6 @@
 #include com/sun/star/container/XNameAccess.hpp
 #include com/sun/star/script/browse/XBrowseNode.hpp
 
-#include sfx2/minarray.hxx
 #include boost/ptr_container/ptr_vector.hpp
 
 #define SVX_CFGGROUP_FUNCTION 1
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 98adaa9..cf0ed52 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -122,7 +122,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/bastyp/frmhtmlw \
 sfx2/source/bastyp/helper \
 sfx2/source/bastyp/mieclip \
-sfx2/source/bastyp/minarray \
 sfx2/source/bastyp/progress \
 sfx2/source/bastyp/sfxhtml \
 sfx2/source/bastyp/sfxresid \
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 4c08af5..0b49d4b 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -72,7 +72,6 @@ $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
-$(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 04ea256..0cfdf60 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -19,7 +19,6 @@
 #ifndef _SFX_ARRDECL_HXX
 #define _SFX_ARRDECL_HXX
 
-#include sfx2/minarray.hxx
 #include vector
 
 class SfxObjectShell;
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 9479e8f..664673c 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -34,7 +34,6 @@
 //  some other includes
 
//
 
-#include sfx2/minarray.hxx
 #include sfx2/viewfrm.hxx
 
 
//
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
deleted file mode 100644
index 48ea05b..000
--- a/sfx2/inc/sfx2/minarray.hxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor

[PUSHED] remove dead class SfxPtrAr and it's header sfx/inc/sfx2/mina...

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3399

Approvals:
  Thomas Arnhold: Looks good to me, but someone else must approve
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3399
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I23c9f905e6f679299f95baa6d8d4bafa97a3f19a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

[PUSHED] Convert SmFontPickList from SfxPtrArr to std::vector

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3398

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3398
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idedff240456788c473ac49bdaa3f6d27a217e3d6
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[PATCH] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

2013-04-16 Thread Ioan Radu (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3423

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/3423/1

fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

 - replaced osl_trace with sal_info
 - replaced dbg_* with sal_*

Change-Id: Ie5d3ae7d2c5dbaaed30d0b39740748845c9f1641
---
M xmloff/source/chart/SchXMLAxisContext.cxx
M xmloff/source/chart/SchXMLChartContext.cxx
M xmloff/source/chart/SchXMLExport.cxx
3 files changed, 71 insertions(+), 103 deletions(-)



diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx 
b/xmloff/source/chart/SchXMLAxisContext.cxx
index b14618f..1a83c20 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -180,7 +180,7 @@
 aPropName = HasZAxisTitle;
 break;
 case SCH_XML_AXIS_UNDEF:
-OSL_TRACE( Invalid axis );
+SAL_INFO(xmloff.chart, Invalid axis );
 break;
 }
 xDiaProp-setPropertyValue( aPropName, uno::makeAny(sal_True) );
@@ -217,7 +217,7 @@
 aPropName = HasZAxisHelpGrid;
 break;
 case SCH_XML_AXIS_UNDEF:
-OSL_TRACE( Invalid axis );
+SAL_INFO(xmloff.chart, Invalid axis );
 break;
 }
 xDiaProp-setPropertyValue( aPropName, uno::makeAny(sal_True) );
@@ -364,7 +364,7 @@
 }
 catch( uno::Exception  )
 {
-OSL_TRACE( Couldn't get axis );
+SAL_INFO(xmloff.chart, Couldn't get axis );
 }
 
 return xAxis;
@@ -423,7 +423,7 @@
 aPropName = HasSecondaryXAxis;
 break;
 case SCH_XML_AXIS_UNDEF:
-OSL_TRACE( Invalid axis );
+SAL_INFO(xmloff.chart, Invalid axis );
 break;
 }
 try
@@ -432,7 +432,7 @@
 }
 catch( beans::UnknownPropertyException  )
 {
-OSL_TRACE( Couldn't turn on axis );
+SAL_INFO(xmloff.chart, Couldn't turn on axis );
 }
 if( m_aCurrentAxis.eDimension==SCH_XML_AXIS_Z )
 {
@@ -443,7 +443,7 @@
 }
 catch( beans::UnknownPropertyException  )
 {
-OSL_TRACE( Couldn't turn on z axis );
+SAL_INFO(xmloff.chart, Couldn't turn on z axis );
 }
 if( !bSettingZAxisSuccedded )
 return;
@@ -460,7 +460,7 @@
 }
 catch( beans::UnknownPropertyException  )
 {
-OSL_TRACE( Couldn't turn on x axis );
+SAL_INFO(xmloff.chart, Couldn't turn on x axis );
 }
 }
 
@@ -602,7 +602,7 @@
 }
 catch( beans::UnknownPropertyException  )
 {
-OSL_TRACE( Property String for Title not available );
+SAL_INFO(xmloff.chart, Property String for Title not available 
);
 }
 }
 }
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx 
b/xmloff/source/chart/SchXMLChartContext.cxx
index 034a2f6..5aeb93b 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -57,6 +57,7 @@
 #include com/sun/star/chart2/XChartTypeContainer.hpp
 #include com/sun/star/chart2/XTitled.hpp
 
+
 using namespace com::sun::star;
 using namespace ::xmloff::token;
 using com::sun::star::uno::Reference;
@@ -104,7 +105,7 @@
 }
 catch(const uno::Exception)
 {
-OSL_FAIL( Exception caught while moving data to candlestick series );
+SAL_WARN(xmloff.chart, Exception caught while moving data to 
candlestick series );
 }
 }
 
@@ -163,7 +164,7 @@
 catch(const uno::Exception ex)
 {
 OString aBStr(OUStringToOString(ex.Message, 
RTL_TEXTENCODING_ASCII_US));
-OSL_TRACE( Exception caught while removing empty chart types: %s, 
aBStr.getStr());
+SAL_INFO(xmloff.chart, Exception caught while removing empty chart 
types:   aBStr);
 }
 }
 
@@ -246,7 +247,7 @@
 const SvXMLTokenMap rAttrTokenMap = mrImportHelper.GetChartAttrTokenMap();
 
 uno::Reference embed::XVisualObject  xVisualObject( 
mrImportHelper.GetChartDocument(), uno::UNO_QUERY);
-DBG_ASSERT(xVisualObject.is(),need xVisualObject for page size);
+SAL_WARN_IF(!xVisualObject.is(), xmloff.chart, need xVisualObject for 
page size);
 if( xVisualObject.is() )
 maChartSize = xVisualObject-getVisualAreaSize( 
embed::Aspects::MSOLE_CONTENT ); //#i103460# take the size given from the 
parent frame as default
 
@@ -332,7 +333,7 @@
 
 if( aOldChartTypeName.isEmpty() )
 {
-OSL_FAIL( need a charttype to create a diagram );
+SAL_WARN(xmloff.chart, need a charttype to create a diagram );
 //set a fallback value:
 OUString aChartClass_Bar( GetXMLToken(XML_BAR ) );
 aOldChartTypeName = SchXMLTools::GetChartTypeByClassName( 
aChartClass_Bar, true /* bUseOldNames */ );
@@ -360,7 +361,7 @@
 }
 catch(const uno::Exception)
 {
-OSL_FAIL( Exception during import

[Libreoffice-commits] core.git: sw/source

 sw/source/core/inc/drawfont.hxx |9 ++---
 sw/source/core/text/txtfly.cxx  |4 +-
 sw/source/core/txtnode/fntcache.cxx |   61 +---
 sw/source/core/txtnode/fntcap.cxx   |6 +--
 sw/source/core/txtnode/swfont.cxx   |   12 +++
 5 files changed, 46 insertions(+), 46 deletions(-)

New commits:
commit 7cac1bc73c53d8bfb0b7d87966ae19ce2e918883
Author: Noel Grandin n...@peralex.com
Date:   Tue Apr 16 15:28:39 2013 +0200

Convert SwDrawTextInfo.pText from XubString to OUString

Change-Id: Ie567feb315a018a1f5bd794a4d12435865e67ec4
Reviewed-on: https://gerrit.libreoffice.org/3417
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index a577fa0..204a1a7 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -22,6 +22,7 @@
 
 #include tools/solar.h
 #include tools/string.hxx
+#include tools/debug.hxx
 
 class SwTxtFrm;
 class OutputDevice;
@@ -42,7 +43,7 @@ class SwDrawTextInfo
 ViewShell* pSh;
 const SwScriptInfo* pScriptInfo;
 const Point* pPos;
-const XubString* pText;
+const OUString* pText;
 const SwWrongList* pWrong;
 const SwWrongList* pGrammarCheck;
 const SwWrongList* pSmartTags;
@@ -103,7 +104,7 @@ public:
 #endif
 
 SwDrawTextInfo( ViewShell *pS, OutputDevice rO, const SwScriptInfo* pSI,
-const XubString rSt, xub_StrLen nI, xub_StrLen nL,
+const OUString rSt, xub_StrLen nI, xub_StrLen nL,
 sal_uInt16 nW = 0, sal_Bool bB = sal_False )
 {
 pFrm = NULL;
@@ -202,7 +203,7 @@ public:
 return pHyphPos;
 }
 
-const XubString GetText() const
+const OUString GetText() const
 {
 return *pText;
 }
@@ -415,7 +416,7 @@ public:
 #endif
 }
 
-void SetText( const XubString rNew )
+void SetText( const OUString rNew )
 {
 pText = rNew;
 }
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index e38086a..3735e52 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -482,7 +482,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf )
 SwRect aRect( rInf.GetPos(), rInf.GetSize() );
 if( rInf.GetSpace() )
 {
-xub_StrLen nTmpLen = STRING_LEN == rInf.GetLen() ? 
rInf.GetText().Len() :
+xub_StrLen nTmpLen = STRING_LEN == rInf.GetLen() ? 
rInf.GetText().getLength() :
   rInf.GetLen();
 if( rInf.GetSpace()  0 )
 {
@@ -490,7 +490,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf )
 const xub_StrLen nEndPos = rInf.GetIdx() + nTmpLen;
 for( xub_StrLen nPos = rInf.GetIdx(); nPos  nEndPos; ++nPos )
 {
-if( CH_BLANK == rInf.GetText().GetChar( nPos ) )
+if( CH_BLANK == rInf.GetText()[ nPos ] )
 ++nSpaceCnt;
 }
 if( nSpaceCnt )
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 40369b0..84d18b9 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -219,7 +219,7 @@ static void lcl_calcLinePos( const CalcLinePosData rData,
const long nTmpSpaceAdd = rData.rInf.GetSpace() / SPACING_PRECISION_FACTOR;
 
if ( nEnd  rData.nCnt
-CH_BLANK == rData.rInf.GetText().GetChar( rData.rInf.GetIdx() + nEnd 
) )
+CH_BLANK == rData.rInf.GetText()[ rData.rInf.GetIdx() + nEnd ] )
{
if( nEnd + 1 == rData.nCnt )
nBlank -= nTmpSpaceAdd;
@@ -933,7 +933,7 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
 pTmpFont-SetColor( aOldColor );
 
 if ( STRING_LEN == rInf.GetLen() )
-rInf.SetLen( rInf.GetText().Len() );
+rInf.SetLen( rInf.GetText().getLength() );
 
 
 //
@@ -974,7 +974,7 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
 long nNextFix;
 
 // punctuation characters are not centered
-sal_Unicode cChar = rInf.GetText().GetChar( rInf.GetIdx() );
+sal_Unicode cChar = rInf.GetText()[ rInf.GetIdx() ];
 sal_uInt8 nType = lcl_WhichPunctuation( cChar );
 switch ( nType )
 {
@@ -997,7 +997,7 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
 nNextFix += nWidthPerChar;
 
 // punctuation characters are not centered
-cChar = rInf.GetText().GetChar( rInf.GetIdx() + j );
+cChar = rInf.GetText()[ rInf.GetIdx() + j ];
 nType = lcl_WhichPunctuation( cChar );
 switch ( nType )
 {
@@ -1099,14 +1099,14 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
 {
 for( xub_StrLen i = 0; i  rInf.GetLen(); i++, 
nKernSum +=

[PUSHED] Convert SwDrawTextInfo.pText from XubString to OUString

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3417

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3417
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie567feb315a018a1f5bd794a4d12435865e67ec4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Noel Grandin noelgran...@gmail.com

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

Re: [Libreoffice-qa] Triaging Goals - Net Minus 10 per Day Against Version 4

2013-04-16 Thread Marc Kaulisch


Hi guys,

I started to go through this list and I can confirm four bugs (see 
below) where formatting is lost when documents are saved in .doc format.
Somehow we still have a problem with this file format which is still a 
very often used one.


I have not looked for duplicates, but my guess is that there could be 
root cause for this problem. You might want to have a closer look.


Best regards,


Marc


https://bugs.freedesktop.org/show_bug.cgi?id=63535
https://bugs.freedesktop.org/show_bug.cgi?id=62216
https://bugs.freedesktop.org/show_bug.cgi?id=61956
https://bugs.freedesktop.org/show_bug.cgi?id=63603




Am 15.04.2013 21:20, schrieb Joel Madero:

Hi All,

I think this is a completely manageable goal and will help ensure the 
next minor release of 4 is free of blockers.


https://bugs.freedesktop.org/buglist.cgi?list_id=285261query_format=advancedbug_status=UNCONFIRMEDversion=4.0.0.0.alpha0%2B%20Masterversion=4.0.0.0.alpha1version=4.0.0.0.beta1version=4.1.0.0.alpha0%2B%20Masterversion=4.0.0.0.beta2version=4.0.0.1%20rcversion=4.0.0.2%20rcversion=4.0.0.3%20releaseversion=4.0.1.1%20rcversion=4.0.1.2%20releaseversion=4.0.2.1%20rcversion=4.0.2.2%20releaseproduct=LibreOffice

Our team has been quite active and got the list down from 260 just 
Friday (-70 almost), 10 a day net down would mean in less than a month 
we will be at 0 which would be amazing.



Please take 10-15 minutes to look at the list and triage a bug or two.


Thanks all!


Best,
Joel

P.S. As always I'll get a short report daily to say YES WE MADE IT! 
or a plead for more assistance :)


--
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com mailto:jmadero@gmail.com



___
List Name: Libreoffice-qa mailing list
Mail address: libreoffice...@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


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

Re: [Libreoffice-qa] Triaging Goals - Net Minus 10 per Day Against Version 4

2013-04-16 Thread Joel Madero

On Tue, Apr 16, 2013 at 2:07 PM, Marc Kaulisch m...@kaulisch.de wrote:

  Hi guys,

 I started to go through this list and I can confirm four bugs (see below)
 where formatting is lost when documents are saved in .doc format.
 Somehow we still have a problem with this file format which is still a
 very often used one.


Excellent, thanks Marc!


 I have not looked for duplicates, but my guess is that there could be root
 cause for this problem. You might want to have a closer look.


Sounds good :)


Also for future reference - here is a prioritization chart which helps
prioritize bugs:
https://wiki.documentfoundation.org/images/0/06/Prioritizing_Bugs_Flowchart.jpg


Thanks again,
Joel

-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] Triaging Goals - Net Minus 10 per Day Against Version 4

2013-04-16 Thread Joel Madero

Thanks to the great work of our team, some help from devs, and a couple new
people along the way, we're now down to 162 bugs, down  nearly 30 just in
the past 36 hours.

Many of the remaining 162 are quite complicated so any input from devs,
advanced users, etc... greatly appreciated. Also some require specific
setups (such as webdav), so if you see tricky ones and feel like you can
tackle them, please prioritize accordingly :)


Best,
Joel



-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] libvisio.git: src/lib

2013-04-16 Thread Fridrich Štrba

 src/lib/VSDContentCollector.cpp |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 471f32deacf03b44749d62eed99bbb873bbe1fe5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Apr 16 23:42:57 2013 +0200

Trying to get the short texts right

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index eb1e2d3..e668666 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -590,8 +590,12 @@ void libvisio::VSDContentCollector::_flushText()
   }
   if (tmpBuffer.size() = 2)
   {
-tmpBuffer[tmpBuffer.size() - 2] = 0;
-tmpBuffer[tmpBuffer.size() - 1] = 0;
+if (tmpBuffer[tmpBuffer.size() - 1] == 0  
(tmpBuffer[tmpBuffer.size() - 2] == 0x0a ||
+tmpBuffer[tmpBuffer.size() - 2] == '\n' || 
tmpBuffer[tmpBuffer.size() - 2] == 0x0e))
+{
+  tmpBuffer.pop_back();
+  tmpBuffer.pop_back();
+}
   }
   else
 tmpBuffer.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: patch for postgresql driver

2013-04-16 Thread Michael Meeks

Hi Wols,

On Tue, 2013-04-16 at 21:03 +0100, Wols Lists wrote:
 if( args[i].Name.matchIgnoreAsciiCase( OUString(
 keyword_list[j]), strlen( keyword_list[j] )))
 {

I guess that a different matchIgnoreAsciiCase call is happening and/or
the OUString constructor is confused :-)

-if( args[i].Name.matchIgnoreAsciiCase( OUString(keyword_list[j]), strlen( 
keyword_list[j] )))
+if( args[i].Name.matchIgnoreAsciiCase( OUString(keyword_list[j], strlen( 
keyword_list[j] 

Or somesuch, or use matchIgnoreAsciiCaseL instead - which might be 
better.

HTH !

Michael.

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

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

[Libreoffice-commits] core.git: bean/com

2013-04-16 Thread Chris Sherlock

 bean/com/sun/star/comp/beans/CallWatchThread.java   |9 -
 bean/com/sun/star/comp/beans/ContainerFactory.java  |2 
 bean/com/sun/star/comp/beans/Frame.java |6 -
 bean/com/sun/star/comp/beans/JavaWindowPeerFake.java|   16 +--
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |   76 +++-
 bean/com/sun/star/comp/beans/LocalOfficeWindow.java |   16 +--
 bean/com/sun/star/comp/beans/NativeConnection.java  |6 -
 bean/com/sun/star/comp/beans/NativeService.java |2 
 bean/com/sun/star/comp/beans/NoConnectionException.java |4 
 bean/com/sun/star/comp/beans/NoDocumentException.java   |2 
 bean/com/sun/star/comp/beans/OOoBean.java   |   71 ++
 bean/com/sun/star/comp/beans/OfficeConnection.java  |4 
 bean/com/sun/star/comp/beans/OfficeWindow.java  |8 -
 bean/com/sun/star/comp/beans/Wrapper.java   |5 -
 14 files changed, 106 insertions(+), 121 deletions(-)

New commits:
commit 43debfae8326ad98f9d130aa450f59ad49577d55
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Tue Apr 16 22:38:26 2013 +1000

General cleanup of OfficeBeans

Cleaned up Java source files:
+ removed unnecessary commented out code
+ corrected many spelling errors
+ formatting changes (remove decorations from comments,
  whitespacing, etc.)

Change-Id: I4133908ceac874b273fe409d763b3ddbfc2055e5
Reviewed-on: https://gerrit.libreoffice.org/3413
Reviewed-by: Noel Grandin noelgran...@gmail.com
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/bean/com/sun/star/comp/beans/CallWatchThread.java 
b/bean/com/sun/star/comp/beans/CallWatchThread.java
index ce6ed6a..31f3a8c 100644
--- a/bean/com/sun/star/comp/beans/CallWatchThread.java
+++ b/bean/com/sun/star/comp/beans/CallWatchThread.java
@@ -19,13 +19,12 @@
 package com.sun.star.comp.beans;
 
 
-//---
 /** Helper class to watch calls into OOo with a timeout.
  */
-//Do not add the thread instances to a threadgroup. When testing the bean in
-//an applet it turned out the ThreadGroup was in an inconsistent state
-//after navigating off the site that contains the applet and back to it.
-//That was tested with a Sun JRE 1.4.2_06
+// Do not add the thread instances to a threadgroup. When testing the bean in
+// an applet it turned out the ThreadGroup was in an inconsistent state
+// after navigating off the site that contains the applet and back to it.
+// That was tested with a Sun JRE 1.4.2_06
 public class CallWatchThread extends Thread
 {
 private static boolean DEBUG = false;
diff --git a/bean/com/sun/star/comp/beans/ContainerFactory.java 
b/bean/com/sun/star/comp/beans/ContainerFactory.java
index c707a71..d06a082 100644
--- a/bean/com/sun/star/comp/beans/ContainerFactory.java
+++ b/bean/com/sun/star/comp/beans/ContainerFactory.java
@@ -21,7 +21,7 @@ package com.sun.star.comp.beans;
 import java.awt.Container;
 
 /**
- * This interface reprecents an AWT container factory.
+ * This interface represents an AWT container factory.
  *
  * @deprecated
  *
diff --git a/bean/com/sun/star/comp/beans/Frame.java 
b/bean/com/sun/star/comp/beans/Frame.java
index cd68bb7..b14b633 100644
--- a/bean/com/sun/star/comp/beans/Frame.java
+++ b/bean/com/sun/star/comp/beans/Frame.java
@@ -49,7 +49,7 @@ public class Frame
 // com.sun.star.frame.XFrame
 //--
 
-public void initialize( /*IN*/com.sun.star.awt.XWindow xWindow )
+public void initialize( /*IN*/ com.sun.star.awt.XWindow xWindow )
 {
 xFrame.initialize( xWindow );
 }
@@ -79,7 +79,7 @@ public class Frame
 xFrame.setName( aName );
 }
 
-public com.sun.star.frame.XFrame findFrame( /*IN*/String aTargetFrameName, 
/*IN*/int nSearchFlags )
+public com.sun.star.frame.XFrame findFrame( /*IN*/ String 
aTargetFrameName, /*IN*/ int nSearchFlags )
 {
 return xFrame.findFrame( aTargetFrameName, nSearchFlags );
 }
@@ -104,7 +104,7 @@ public class Frame
 return xFrame.isActive();
 }
 
-public boolean setComponent( /*IN*/com.sun.star.awt.XWindow 
xComponentWindow, /*IN*/ com.sun.star.frame.XController xController )
+public boolean setComponent( /*IN*/ com.sun.star.awt.XWindow 
xComponentWindow, /*IN*/ com.sun.star.frame.XController xController )
 {
 return xFrame.setComponent( xComponentWindow, xController );
 }
diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java 
b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
index da235ff..7bcfa7a 100644
--- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++ b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
@@ -25,7 +25,7 @@ import com.sun.star.awt.*;
  *
  * @since OOo 2.0.0
  */
-/* package */ class

[PUSHED] General cleanup of OfficeBeans

2013-04-16 Thread Thomas Arnhold (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3413

Approvals:
  Noel Grandin: Looks good to me, but someone else must approve
  Thomas Arnhold: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3413
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4133908ceac874b273fe409d763b3ddbfc2055e5
Gerrit-PatchSet: 8
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com
Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com
Gerrit-Reviewer: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

[Libreoffice-commits] core.git: sc/source

2013-04-16 Thread Markus Mohrhard

 sc/source/filter/xml/xmlcondformat.cxx |   50 -
 1 file changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 9e0f880937174486030612961a518260fc76005e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Apr 15 04:33:38 2013 +0200

let us use startsWith instead of indexOf

Change-Id: I185a5a6f1d85c9e3e7ee5115b100b724031b6c03

diff --git a/sc/source/filter/xml/xmlcondformat.cxx 
b/sc/source/filter/xml/xmlcondformat.cxx
index cc00ba7..d8e0810 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -402,15 +402,15 @@ namespace {
 
 void GetConditionData(const OUString rValue, ScConditionMode eMode, 
OUString rExpr1, OUString rExpr2)
 {
-if(rValue.indexOf(unique) == 0)
+if(rValue.startsWith(unique))
 {
 eMode = SC_COND_NOTDUPLICATE;
 }
-else if(rValue.indexOf(duplicate) == 0)
+else if(rValue.startsWith(duplicate))
 {
 eMode = SC_COND_DUPLICATE;
 }
-else if(rValue.indexOf(between) == 0)
+else if(rValue.startsWith(between))
 {
 const sal_Unicode* pStr = rValue.getStr();
 const sal_Unicode* pStart = pStr + 8;
@@ -419,7 +419,7 @@ void GetConditionData(const OUString rValue, 
ScConditionMode eMode, OUString
 rExpr2 = ScXMLConditionHelper::getExpression( pStart, pEnd, ')');
 eMode = SC_COND_BETWEEN;
 }
-else if(rValue.indexOf(not-between) == 0)
+else if(rValue.startsWith(not-between))
 {
 const sal_Unicode* pStr = rValue.getStr();
 const sal_Unicode* pStart = pStr + 12;
@@ -428,37 +428,37 @@ void GetConditionData(const OUString rValue, 
ScConditionMode eMode, OUString
 rExpr2 = ScXMLConditionHelper::getExpression( pStart, pEnd, ')');
 eMode = SC_COND_NOTBETWEEN;
 }
-else if(rValue.indexOf(=) == 0)
+else if(rValue.startsWith(=))
 {
 rExpr1 = rValue.copy(2);
 eMode = SC_COND_EQLESS;
 }
-else if(rValue.indexOf(=) == 0)
+else if(rValue.startsWith(=))
 {
 rExpr1 = rValue.copy(2);
 eMode = SC_COND_EQGREATER;
 }
-else if(rValue.indexOf(!=) == 0)
+else if(rValue.startsWith(!=))
 {
 rExpr1 = rValue.copy(2);
 eMode = SC_COND_NOTEQUAL;
 }
-else if(rValue.indexOf('') == 0)
+else if(rValue.startsWith())
 {
 rExpr1 = rValue.copy(1);
 eMode = SC_COND_LESS;
 }
-else if(rValue.indexOf('=') == 0)
+else if(rValue.startsWith(=))
 {
 rExpr1 = rValue.copy(1);
 eMode = SC_COND_EQUAL;
 }
-else if(rValue.indexOf('') == 0)
+else if(rValue.startsWith())
 {
 rExpr1 = rValue.copy(1);
 eMode = SC_COND_GREATER;
 }
-else if(rValue.indexOf(formula-is) == 0)
+else if(rValue.startsWith(formula-is))
 {
 const sal_Unicode* pStr = rValue.getStr();
 const sal_Unicode* pStart = pStr + 11;
@@ -466,7 +466,7 @@ void GetConditionData(const OUString rValue, 
ScConditionMode eMode, OUString
 rExpr1 = ScXMLConditionHelper::getExpression( pStart, pEnd, ')');
 eMode = SC_COND_DIRECT;
 }
-else if(rValue.indexOf(top-elements) == 0)
+else if(rValue.startsWith(top-elements))
 {
 const sal_Unicode* pStr = rValue.getStr();
 const sal_Unicode* pStart = pStr + 13;
@@ -474,7 +474,7 @@ void GetConditionData(const OUString rValue, 
ScConditionMode eMode, OUString
 rExpr1 = ScXMLConditionHelper::getExpression( pStart, pEnd, ')');
 eMode = SC_COND_TOP10;
 }
-else if(rValue.indexOf(bottom-elements) == 0)
+else if(rValue.startsWith(bottom-elements))
 {
 const sal_Unicode* pStr = rValue.getStr();
 const sal_Unicode* pStart = pStr + 16;
@@ -482,7 +482,7 @@ void GetConditionData(const OUString rValue, 
ScConditionMode eMode, OUString
 rExpr1 = ScXMLConditionHelper::getExpression( pStart, pEnd, ')');
 eMode = SC_COND_BOTTOM10;
 }
-else if(rValue.indexOf(top-percent) == 0)
+else if(rValue.startsWith(top-percent))
 {
 const sal_Unicode* pStr = rValue.getStr();
 const sal_Unicode* pStart = pStr + 12;
@@ -490,7 +490,7 @@ void GetConditionData(const OUString rValue, 
ScConditionMode eMode, OUString
 rExpr1 = ScXMLConditionHelper::getExpression( pStart, pEnd, ')');
 eMode = SC_COND_TOP_PERCENT;
 }
-else if(rValue.indexOf(bottom-percent) == 0)
+else if(rValue.startsWith(bottom-percent))
 {
 const sal_Unicode* pStr = rValue.getStr();
 const sal_Unicode* pStart = pStr + 15;
@@ -498,31 +498,31 @@ void GetConditionData(const OUString rValue, 
ScConditionMode eMode, OUString
 rExpr1 = ScXMLConditionHelper::getExpression( pStart, pEnd, ')');
 eMode = SC_COND_BOTTOM_PERCENT;
 }
-else if(rValue.indexOf(above-average) == 0)
+else if(rValue.startsWith(above-average))
 {
 eMode = SC_COND_ABOVE_AVERAGE;

[Libreoffice-commits] core.git: svx/source

2013-04-16 Thread Takeshi Abe

 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx  |   
 4 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx  |   
 4 
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx |   
 4 
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx |   
 4 
 svx/source/unodraw/UnoGraphicExporter.cxx  |   
10 -
 svx/source/unodraw/UnoNameItemTable.cxx|   
 4 
 svx/source/unodraw/recoveryui.cxx  |   
 2 
 svx/source/unodraw/unomtabl.cxx|   
12 -
 svx/source/unodraw/unopage.cxx |   
 4 
 svx/source/unodraw/unoprov.cxx |   
10 -
 svx/source/unodraw/unoshap2.cxx|   
 2 
 svx/source/unodraw/unoshap3.cxx|   
 6 
 svx/source/unodraw/unoshap4.cxx|   
 4 
 svx/source/unodraw/unoshape.cxx|   
16 -
 svx/source/unodraw/unoshcol.cxx|   
 4 
 svx/source/unodraw/unoshtxt.cxx|   
82 +-
 16 files changed, 86 insertions(+), 86 deletions(-)

New commits:
commit 01c135776601cb767fb45456739596c50499820f
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Apr 17 09:12:54 2013 +0900

sal_Bool to bool

Change-Id: Id2ba5cf09227945fd97ef6f7e63cb40fa646

diff --git 
a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx 
b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 3d08218..656c06a 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -253,7 +253,7 @@ void DictionaryList::addEntry( const OUString rTerm, const 
OUString rMapping
 if( hasTerm( rTerm ) )
 return;
 
-DictionaryEntry* pEntry = new DictionaryEntry( rTerm, rMapping, 
nConversionPropertyType, sal_True );
+DictionaryEntry* pEntry = new DictionaryEntry( rTerm, rMapping, 
nConversionPropertyType, true );
 SvTreeListEntry* pLBEntry = InsertEntryToColumn( makeTabString( *pEntry ), 
nPos );
 pLBEntry-SetUserData( pEntry );
 SelectRow( GetEntryPos( pLBEntry ) );
@@ -421,7 +421,7 @@ SvLBoxItem* DictionaryList::getItemAtColumn( 
SvTreeListEntry* pEntry, sal_uInt16
 
 DictionaryEntry::DictionaryEntry( const OUString rTerm, const OUString 
rMapping
 , sal_Int16 nConversionPropertyType
-, sal_Bool bNewEntry )
+, bool bNewEntry )
 : m_aTerm( rTerm )
 , m_aMapping( rMapping )
 , m_nConversionPropertyType( nConversionPropertyType )
diff --git 
a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx 
b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 2728ac9..c0681ff 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -49,7 +49,7 @@ struct DictionaryEntry
 {
 DictionaryEntry( const OUString rTerm, const OUString rMapping
 , sal_Int16 nConversionPropertyType 
//linguistic2::ConversionPropertyType
-, sal_Bool bNewEntry = sal_False );
+, bool bNewEntry = false );
 
 virtual ~DictionaryEntry();
 
@@ -59,7 +59,7 @@ struct DictionaryEntry
 OUString m_aMapping;
 sal_Int16 m_nConversionPropertyType; 
//linguistic2::ConversionPropertyType
 
-sal_Bool  m_bNewEntry;
+bool m_bNewEntry;
 };
 
 class DictionaryList : public SvHeaderTabListBox
diff --git 
a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx 
b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 4082018..5c8e11f 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -47,8 +47,8 @@ ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( 
const uno::Reference
 : m_xCC( xContext )
 , m_xParentWindow( 0 )
 , m_pDialog( 0 )
-, m_bDisposed(sal_False)
-, m_bInDispose(sal_False)
+, m_bDisposed(false)
+, m_bInDispose(false)
 , m_aContainerMutex()
 , m_aDisposeEventListeners(m_aContainerMutex)
 {
diff --git 
a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx 
b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index 0e8b89c..c2553a9 100644

[Libreoffice-commits] core.git: officecfg/registry

2013-04-16 Thread Thomas Arnhold

 officecfg/registry/schema/org/openoffice/Office/Commands.xcs|   11 --
 officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs  |   12 --
 officecfg/registry/schema/org/openoffice/Office/Draw.xcs|   48 
-
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |1 
 officecfg/registry/schema/org/openoffice/Office/Labels.xcs  |8 -
 officecfg/registry/schema/org/openoffice/Office/Math.xcs|   14 --
 officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs |8 -
 officecfg/registry/schema/org/openoffice/Office/SFX.xcs |8 -
 officecfg/registry/schema/org/openoffice/Office/Security.xcs|8 -
 officecfg/registry/schema/org/openoffice/Office/Substitution.xcs|9 -
 officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs   |8 -
 officecfg/registry/schema/org/openoffice/Office/Views.xcs   |8 -
 officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs   |   15 --
 officecfg/registry/schema/org/openoffice/UserProfile.xcs|   53 
--
 officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs  |   12 --
 officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs  |   14 --
 officecfg/registry/schema/org/openoffice/ucb/Store.xcs  |   16 ---
 17 files changed, 253 deletions(-)

New commits:
commit 3ca9820f14cfc1b579fe8196c225b0f099312f6d
Author: Thomas Arnhold tho...@arnhold.org
Date:   Wed Apr 17 02:44:27 2013 +0200

remove some newlines at eof

and one last author tag

Change-Id: I4fa21ba3cb4b76327ae476f2f7f75152db478f76

diff --git a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
index d5a9f2b..3d95490 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
@@ -45,14 +45,3 @@
/group
/component
 /oor:component-schema
-
-
-
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs 
b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index dbf4af0..f458163 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -1086,15 +1086,3 @@
/group
/component
 /oor:component-schema
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index 2ebb96c..501d67b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -982,51 +982,3 @@
/group
/component
 /oor:component-schema
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index ec0c12b..c724ca7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1602,7 +1602,6 @@
 /info
 prop oor:name=Path oor:type=xs:string oor:nillable=false
 info
-authorGM/author
 desc
 Access path, where images were loaded last time.
 The default is work directory.
diff --git a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
index 0e23852..8be9e95 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
@@ -56,11 +56,3 @@
/set
/component
 /oor:component-schema
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index b494bd7..d379aa6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -1183,17 +1183,3 @@
/set
/component
 /oor:component-schema
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git 
a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs 
b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
index e405e7f..6848a7f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
@@ -40,11 +40,3 @@
/set
/component
 /oor:component-schema
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs 
b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
index 78df4e7..34d8e1f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
+++

[Libreoffice-commits] core.git: solenv/bin

2013-04-16 Thread Peter Foley

 solenv/bin/install-gdb-printers |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 346431a13853c651ca4fb4db7893bfc7bfcbf2ab
Author: Peter Foley pefol...@verizon.net
Date:   Tue Apr 16 21:12:12 2013 -0400

fix gdb pretty-printers for non-merged

Change-Id: I7e248a48ee8443b0f9209be708ce65dab57275f7

diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 9f94d10f..9a465dd 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -184,8 +184,11 @@ if [[ -n ${MERGELIBS} ]]; then
 make_autoload sw program libswlo.$DYLIB
 fi
 else
+make_autoload cppu ure-link/lib libuno_cppu.$DYLIB.3
+make_autoload sal ure-link/lib libuno_sal.$DYLIB.3
 make_autoload svl program libsvllo.$DYLIB
 make_autoload tl program libtllo.$DYLIB
+make_autoload sw program libswlo.$DYLIB
 fi
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: patch for postgresql driver

On Tue, Apr 16, 2013 at 09:24:03PM +0100, Wols Lists wrote:
 On 16/04/13 20:28, Lionel Elie Mamane wrote:
 On Tue, Apr 16, 2013 at 03:16:25PM +0100, Wols Lists wrote:

 I can't get my argument casting right - in the original
 code, matchIgnoreAsciiCaseAsciiL wraps its argument in
 RTL_CONSTASCII_STRINGPARAM.

 RTL_CONSTASCII_STRINGPARAM is a hack/optimisation specific to
 compile-time constants. With your change, the string is not anymore
 a compile-time constant, so just use

  equalsIgnoreAsciiCaseAscii()

 I'm puzzled that it's not a compile-time constant

Well, it is not even a run-time constant: at each iteration of the
loop, it is a different value.

 As soon as LO has built successfully, I'll sort out the patch and ask
 someone to test it :-)

The PostgreSQL driver is (particularly) my area, so keep me in CC.

If you are interested in working on the Postgres driver, have a look
at https://bugs.freedesktop.org/show_bug.cgi?id=43369

There are also a few bugs I didn't have time to look at.

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

Re: [Libreoffice-commits] core.git: 7 commits - liborcus/ExternalProject_liborcus.mk Library_merged.mk RepositoryModule_host.mk sd/source solenv/bin solenv/gbuild solenv/gdb solenv/Package_gdb.mk

2013-04-16 Thread Peter Foley

Miklos,

Sorry, should be fixed now.

Thanks,

Peter

On Mon, Apr 15, 2013 at 10:55 AM, Miklos Vajna vmik...@suse.cz wrote:
 Hi Peter,

 On Sat, Apr 13, 2013 at 05:15:30PM -0700, Peter Foley pefol...@verizon.net 
 wrote:
 commit ffe09728cb829016dbbe24ffc5ed10cfc15cfd5c
 Author: Peter Foley pefol...@verizon.net
 Date:   Sat Apr 13 17:11:26 2013 -0400

 adapt gdb pretty-printers to libmerged

 Change-Id: I80236f3c69abe713ddfa8111e8ff76f83954def4

 This broke pretty-printers here, using a non-libmerged build. On master,
 simply no -gdb.py is installed:

 $ ls -l solver/*/lib/libswlo*
 -rwxr-xr-x 1 vmiklos users 280466633 ápr   15 08:19 
 solver/unxlngx6/lib/libswlo.so

 Correct output on -4-0:

 $ ls -l solver/*/lib/libswlo*
 -rwxr-xr-x 1 vmiklos users 22337100 ápr   13 13:53 
 solver/unxlngx6/lib/libswlo.so
 -rw-r--r-- 1 vmiklos users 1617 márc   4 09:56 
 solver/unxlngx6/lib/libswlo.so-gdb.py

 After I reverted this commit and did a make dev-install, pretty-printers
 work again.  Could you please look into this?

 Thanks,

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

[Libreoffice-commits] core.git: officecfg/registry

2013-04-16 Thread Thomas Arnhold

 officecfg/registry/schema/org/openoffice/LDAP.xcs |   96 ++
 1 file changed, 63 insertions(+), 33 deletions(-)

New commits:
commit fe4260c53e7df91a4d2dad06104d7979a212de29
Author: Thomas Arnhold tho...@arnhold.org
Date:   Wed Apr 17 03:13:23 2013 +0200

reformat xml file with xmllint

maybe this should be done for all files in officecfg...

xmllint --format --recover foo.xml

Change-Id: I1fe97a84a706b7d51e21d268cbf7baf32eb0f8f0

diff --git a/officecfg/registry/schema/org/openoffice/LDAP.xcs 
b/officecfg/registry/schema/org/openoffice/LDAP.xcs
index ff99a65..18db511 100644
--- a/officecfg/registry/schema/org/openoffice/LDAP.xcs
+++ b/officecfg/registry/schema/org/openoffice/LDAP.xcs
@@ -18,37 +18,67 @@
  --
 !DOCTYPE oor:component-schema SYSTEM ../../../component-schema.dtd
 oor:component-schema xmlns:oor=http://openoffice.org/2001/registry; 
xmlns:xs=http://www.w3.org/2001/XMLSchema; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; oor:name=LDAP 
oor:package=org.openoffice xml:lang=en-US
-info
-descSpecifies the LDAP related settings/desc
-/info
-templates
-group oor:name=ServerDefinition
-infodescSpecifies LDAP server settings/desc/info
-prop oor:name=Server oor:type=xs:stringinfodescHost name 
of LDAP Server/desc/info
-/prop
-prop oor:name=Port oor:type=xs:int 
oor:nillable=falseinfodescPort number of the LDAP Server/desc/info
-   value389/value
-/prop
-prop oor:name=BaseDN oor:type=xs:stringinfodescRoot 
entry of the LDAP server/desc/info
-/prop
-   /group
-/templates
-   component
-   group oor:name=UserDirectory
-infodescSpecifies LDAP settings used for UserProfile 
settings/desc/info
-prop oor:name=SearchUser oor:type=xs:stringinfodescDN of 
user with read-only access to LDAP repository. Only required if anonymous 
access is not supported./desc/info
-/prop
-prop oor:name=SearchPassword 
oor:type=xs:stringinfodescPassword of Search User. Only required if 
anonymous access is not supported./desc/info
-/prop
-prop oor:name=UserObjectClass 
oor:type=xs:stringinfodescName of User entity object class in LDAP 
repository/desc/info
-   /prop
-   prop oor:name=UserUniqueAttribute 
oor:type=xs:stringinfodescName of User entity unique attribute in LDAP 
repository/desc/info
-   /prop
-   prop oor:name=Mapping 
oor:type=xs:stringinfodescObsolete and unused/desc/info
-/prop
-   node-ref oor:name=ServerDefinition 
oor:node-type=ServerDefinition
-   infodescSpecifies the LDAP related 
settings/desc/info
-   /node-ref
-   /group
-/component
+  info
+descSpecifies the LDAP related settings/desc
+  /info
+  templates
+group oor:name=ServerDefinition
+  info
+descSpecifies LDAP server settings/desc
+  /info
+  prop oor:name=Server oor:type=xs:string
+info
+  descHost name of LDAP Server/desc
+/info
+  /prop
+  prop oor:name=Port oor:type=xs:int oor:nillable=false
+info
+  descPort number of the LDAP Server/desc
+/info
+value389/value
+  /prop
+  prop oor:name=BaseDN oor:type=xs:string
+info
+  descRoot entry of the LDAP server/desc
+/info
+  /prop
+/group
+  /templates
+  component
+group oor:name=UserDirectory
+  info
+descSpecifies LDAP settings used for UserProfile settings/desc
+  /info
+  prop oor:name=SearchUser oor:type=xs:string
+info
+  descDN of user with read-only access to LDAP repository. Only 
required if anonymous access is not supported./desc
+/info
+  /prop
+  prop oor:name=SearchPassword oor:type=xs:string
+info
+  descPassword of Search User. Only required if anonymous access is 
not supported./desc
+/info
+  /prop
+  prop oor:name=UserObjectClass oor:type=xs:string
+info
+  descName of User entity object class in LDAP repository/desc
+/info
+  /prop
+  prop oor:name=UserUniqueAttribute oor:type=xs:string
+info
+  descName of User entity unique attribute in LDAP repository/desc
+/info
+  /prop
+  prop oor:name=Mapping oor:type=xs:string
+info
+  descObsolete and unused/desc
+/info
+  /prop
+  node-ref oor:name=ServerDefinition oor:node-type=ServerDefinition
+info
+  descSpecifies the LDAP related settings/desc
+/info
+  /node-ref
+/group
+  /component
 /oor:component-schema
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

officecfg: reformat using xmllint

2013-04-16 Thread Thomas Arnhold


Hi,

does anyone have objections against running xmllint on officecfg like 
fe4260c53e7df91a4d2dad06104d7979a212de29 did?


Those xml files are such messed up that this would be a pretty good 
improvement in my eyes.


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

Re: Basic font for labels in a Base form

On Thu, Mar 28, 2013 at 10:43:30AM -0400, Dan Lewis wrote:
  Edit a Base form using LibreOffice 4.0.2.2 (32 bit Debian).
 Control+right click a label in the form. Select Control from the
 context menu. Click the elliplse ( ... ) for the Font property.
 Click the Font tab in the Character dialog.

   Why is it that the Family font listed contains eight different
 fonts as the (Default) font? Tools  Options  LibreOffice Writer
  Basic Fonts permits me to select my fonts and font sized that I
 want to use. Why does Base ignore these selections?

  Observation: LibreOffice 4.0.2.1 64 bit Debian uses the fonts I
 selected in Tools  Options  LibreOffice Writer  Basic Fonts.

I don't know, and your reproductions instructions are not detailed
enough for me to understand. If there is a bug, I'd be glad to
understand it (our bugzilla is the best place for discussing bugs) and
review/commit a patch fixing it.

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

cherry-pick across renames [was: minutes of ESC call ...]

On Thu, Mar 28, 2013 at 09:34:16PM +0100, Miklos Vajna wrote:

 On Thu, Mar 28, 2013 at 05:26:29PM +, Michael Meeks 
 michael.me...@suse.com wrote:
 + instead have the global headers in one central global directory
 + check behaviour of git-cherry-pick (Miklos)

 Yes, both cherry-pick and revert should support renames,

Great, how do you make it do that? That is _so_ not my experience,
when cherry-picking commits touching reportbuilder/java/{com,org}
to/from libreoffice-4-0 from/to master.

Basically, everything reportbuilder/java/com/sun/star was renamed to
reportbuilder/java/org/libreoffice in

commit 6f28efc2a8a559cc8c37aa883f4de0b59d4fc79c
Author: David Ostrovsky da...@ostrovsky.org
Date:   Thu Mar 7 08:17:56 2013 +0100

When cherry-picking a commit in libreoffice-4-0 to master, I get a
deleted on our side error, and the *complete* file recreated in
reportbuilder/java/com/sun/star/foo/bar.java

I then basically have to either make the same change again manually on
the right file, or generate the patch and manually apply it to the
right file.

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

Re: Error while running a Daily Build

2013-04-16 Thread Jean-Baptiste Faure

Hi,

Le 15/04/2013 21:03, Sameer Deshmukh a écrit :
 Hello everyone,

 I downloaded and successfully installed an LO daily build on my Ubuntu
 32 bit PC. While Writer from the daily build I'm getting the following
 error:
 Syntax error: word unexpected (expecting ))

 Can someone please help?

 The build package downloaded was this:

 master~2013-04-15_11.27.08_LibreOfficeDev_4.1.0.0.alpha0_Linux_x86-64_rpm.tar.gz
 I could not find a 32 bit thing anywhere so downloaded this one?

 Could the error be because of that?
Yes, generally you can't run a 64 bits program on a 32 bits OS.

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

[Libreoffice-commits] libmspub.git: 2 commits - src/lib

2013-04-16 Thread Fridrich Štrba

 src/lib/MSPUBCollector.cpp |   53 +++--
 src/lib/MSPUBCollector.h   |2 -
 src/lib/MSPUBParser.cpp|   15 +---
 src/lib/MSPUBParser2k.cpp  |2 -
 src/lib/MSPUBParser97.cpp  |2 -
 src/lib/PolygonUtils.cpp   |   14 +--
 src/lib/ShapeInfo.h|7 ++---
 7 files changed, 43 insertions(+), 52 deletions(-)

New commits:
commit 45093bd820c2e7863aebed9b106488021a641061
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Apr 16 09:25:20 2013 +0200

*.is_initialized() - status

diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 36f51ca..895b736 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -333,7 +333,7 @@ std::vectorint 
libmspub::MSPUBCollector::getShapeAdjustValues(const ShapeInfo
 
 boost::optionalstd::vectorlibmspub::TextParagraph  
libmspub::MSPUBCollector::getShapeText(const ShapeInfo info) const
 {
-  if (info.m_textId.is_initialized())
+  if (!!info.m_textId)
   {
 unsigned stringId = info.m_textId.get();
 const std::vectorTextParagraph *ptr_str = 
getIfExists_const(m_textStringsById, stringId);
@@ -350,11 +350,11 @@ void 
libmspub::MSPUBCollector::setupShapeStructures(ShapeGroupElement elt)
   ShapeInfo *ptr_info = getIfExists(m_shapeInfosBySeqNum, elt.getSeqNum());
   if (ptr_info)
   {
-if (ptr_info-m_imgIndex.is_initialized())
+if (!!ptr_info-m_imgIndex)
 {
   unsigned index = ptr_info-m_imgIndex.get();
   int rot = 0;
-  if (ptr_info-m_innerRotation.is_initialized())
+  if (!!ptr_info-m_innerRotation)
 rot = ptr_info-m_innerRotation.get();
   if (index - 1  m_images.size())
   {
@@ -390,7 +390,7 @@ boost::functionvoid(void) 
libmspub::MSPUBCollector::paintShape(const ShapeInfo
   bool hasStroke = false;
   bool hasBorderArt = false;
   boost::optionalunsigned maybeBorderImg = info.m_borderImgIndex;
-  if (maybeBorderImg.is_initialized()  !info.m_lines.empty())
+  if (!!maybeBorderImg  !info.m_lines.empty())
   {
 hasStroke = true;
 hasBorderArt = true;
@@ -409,7 +409,7 @@ boost::functionvoid(void) 
libmspub::MSPUBCollector::paintShape(const ShapeInfo
   WPXString fill = graphicsProps[draw:fill] ? 
graphicsProps[draw:fill]-getStr() : none;
   bool hasFill = fill != none;
   boost::optionalstd::vectorTextParagraph  maybeText = getShapeText(info);
-  bool hasText = maybeText.is_initialized();
+  bool hasText = !!maybeText;
   bool makeLayer = hasBorderArt ||
(hasStroke  hasFill) || (hasStroke  hasText) || 
(hasFill  hasText);
   if (makeLayer)
@@ -432,7 +432,7 @@ boost::functionvoid(void) 
libmspub::MSPUBCollector::paintShape(const ShapeInfo
   BorderPosition borderPosition =
 hasBorderArt ? INSIDE_SHAPE : 
info.m_borderPosition.get_value_or(HALF_INSIDE_SHAPE);
   ShapeType type;
-  if (info.m_cropType.is_initialized())
+  if (!!info.m_cropType)
   {
 type = info.m_cropType.get();
   }
@@ -460,7 +460,7 @@ boost::functionvoid(void) 
libmspub::MSPUBCollector::paintShape(const ShapeInfo
 width -= 2 * borderImgWidth;
   }
 }
-if (info.m_pictureRecolor.is_initialized())
+if (!!info.m_pictureRecolor)
 {
   Color obc = info.m_pictureRecolor.get().getFinalColor(m_paletteColors);
   graphicsProps.insert(draw:color-mode, greyscale);
@@ -472,7 +472,7 @@ boost::functionvoid(void) 
libmspub::MSPUBCollector::paintShape(const ShapeInfo
static_castdouble(obc.g) / 255.0, WPX_PERCENT);
 }
 bool shadowPropsInserted = false;
-if (info.m_shadow.is_initialized())
+if (!!info.m_shadow)
 {
   const Shadow s = info.m_shadow.get();
   if (!needsEmulation(s))
@@ -496,7 +496,7 @@ boost::functionvoid(void) 
libmspub::MSPUBCollector::paintShape(const ShapeInfo
 writeCustomShape(type, graphicsProps, m_painter, x, y, height, width,
  true, foldedTransform,
  std::vectorLine(), 
boost::bind(libmspub::MSPUBCollector::getCalculationValue, this, info, _1, 
false, adjustValues), m_paletteColors, info.getCustomShape());
-if (info.m_pictureRecolor.is_initialized())
+if (!!info.m_pictureRecolor)
 {
   graphicsProps.remove(draw:color-mode);
   graphicsProps.remove(draw:red);
@@ -581,7 +581,7 @@ boost::functionvoid(void) 
libmspub::MSPUBCollector::paintShape(const ShapeInfo
   m_painter-drawRectangle(leftRectProps);
   std::vectorunsigned::const_iterator iOffset = ba.m_offsets.begin();
   boost::optionalColor oneBitColor;
-  if (info.m_lineBackColor.is_initialized())
+  if (!!info.m_lineBackColor)
   {
 oneBitColor = 
info.m_lineBackColor.get().getFinalColor(m_paletteColors);
   }
@@ -732,7 +732,7 @@ boost::functionvoid(void) 
libmspub::MSPUBCollector::paintShape(const ShapeInfo
   height = strokeCoord.getHeightIn();
   width = strokeCoord.getWidthIn();

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_n

2013-04-16 Thread Andras Timar

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |   10 
+-
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt |   10 
+-
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |   10 
+-
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt   |   10 
+-
 instsetoo_native/inc_ure/windows/msi_templates/Property.idt |   10 
+-
 5 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit f76d59c750b781c35eba554fad97a6ec971e6e84
Author: Andras Timar ati...@suse.com
Date:   Mon May 21 12:08:58 2012 +0200

[SUSE only] ARP Summary Information for SUSE/Novell

Change-Id: I7573e4507cd420b70b7bafc590e0743a1dd55ef4

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index b8a970c..6cb7e5c 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -7,11 +7,11 @@ AgreeToLicenseNo
 ApplicationUsers   AllUsers
 ALLUSERS   1
 ARPCOMMENTSARPCOMMENTSTEMPLATE
-ARPCONTACT OOO_ARPCONTACTTEMPLATE
-ARPHELPLINKOOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE   OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO   OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT SUSE Technical Services
+ARPHELPLINKhttp://www.suse.com/products/libreoffice
+ARPHELPTELEPHONE   
http://www.novell.com/common/inc/requestcall_overlay.html
+ARPURLINFOABOUThttp://www.suse.com/products/libreoffice
+ARPURLUPDATEINFO   http://download.novell.com/patch/finder/#familyId=8668
 DefaultUIFont  Tahoma8
 DialogCaption  Windows Installer
 DiskPrompt [1]
diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
index b8a970c..6cb7e5c 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
@@ -7,11 +7,11 @@ AgreeToLicenseNo
 ApplicationUsers   AllUsers
 ALLUSERS   1
 ARPCOMMENTSARPCOMMENTSTEMPLATE
-ARPCONTACT OOO_ARPCONTACTTEMPLATE
-ARPHELPLINKOOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE   OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO   OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT SUSE Technical Services
+ARPHELPLINKhttp://www.suse.com/products/libreoffice
+ARPHELPTELEPHONE   
http://www.novell.com/common/inc/requestcall_overlay.html
+ARPURLINFOABOUThttp://www.suse.com/products/libreoffice
+ARPURLUPDATEINFO   http://download.novell.com/patch/finder/#familyId=8668
 DefaultUIFont  Tahoma8
 DialogCaption  Windows Installer
 DiskPrompt [1]
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 44d2c38..301dd7b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -7,11 +7,11 @@ AgreeToLicenseNo
 ApplicationUsers   AllUsers
 ALLUSERS   1
 ARPCOMMENTSARPCOMMENTSTEMPLATE
-ARPCONTACT OOO_ARPCONTACTTEMPLATE
-ARPHELPLINKOOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE   OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO   OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT SUSE Technical Services
+ARPHELPLINKhttp://www.suse.com/products/libreoffice
+ARPHELPTELEPHONE   
http://www.novell.com/common/inc/requestcall_overlay.html
+ARPURLINFOABOUThttp://www.suse.com/products/libreoffice
+ARPURLUPDATEINFO   http://download.novell.com/patch/finder/#familyId=8668
 DefaultUIFont  Tahoma8
 DialogCaption  Windows Installer
 DiskPrompt [1]
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index cdcaea4..91858c2 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -6,11 +6,11 @@ _IsSetupTypeMin   Typical
 AgreeToLicense No
 ApplicationUsers   AllUsers
 ARPCOMMENTSARPCOMMENTSTEMPLATE
-ARPCONTACT OOO_ARPCONTACTTEMPLATE
-ARPHELPLINKOOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE   OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO   OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT SUSE Technical Services
+ARPHELPLINKhttp://www.suse.com/products/libreoffice
+ARPHELPTELEPHONE   
http://www.novell.com/common/inc/requestcall_overlay.html
+ARPURLINFOABOUThttp://www.suse.com/products/libreoffice
+ARPURLUPDATEINFO

[PATCH] WIP: date/time IDL datatypes incompatible change

2013-04-16 Thread Lionel Elie Mamane (via Code Review)

Hello LibreOffice gerrit bot, Eike Rathke,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2783

to look at the new patch set (#20).

Change subject: WIP: date/time IDL datatypes incompatible change
..

WIP: date/time IDL datatypes incompatible change

Done:
 - nanosecond precision
 - signed (allowed negative) year

TODO: timezone

Also: assorted improvements / bugfixes in date/time handling code.
Some factorisation of copy/pasted code.

Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6
---
M basic/source/runtime/methods.cxx
M comphelper/source/misc/anycompare.cxx
M comphelper/source/misc/types.cxx
M connectivity/inc/connectivity/dbconversion.hxx
M connectivity/source/commontools/FValue.cxx
M connectivity/source/commontools/dbconversion.cxx
M connectivity/source/drivers/calc/CTable.cxx
M connectivity/source/drivers/dbase/DTable.cxx
M connectivity/source/drivers/file/FDateFunctions.cxx
M connectivity/source/drivers/jdbc/ConnectionLog.cxx
M connectivity/source/drivers/kab/KResultSet.cxx
M connectivity/source/drivers/macab/macabutilities.hxx
M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
M connectivity/source/drivers/odbcbase/OResultSet.cxx
M connectivity/source/drivers/postgresql/pq_tools.cxx
M connectivity/source/inc/odbc/OTools.hxx
M editeng/source/items/flditem.cxx
M editeng/source/uno/unofield.cxx
M extensions/source/logging/csvformatter.cxx
M extensions/source/logging/logrecord.cxx
M extensions/source/logging/plaintextformatter.cxx
M extensions/source/propctrlr/formcomponenthandler.cxx
M extensions/source/propctrlr/standardcontrol.cxx
M filter/source/msfilter/svdfppt.cxx
M forms/qa/integration/forms/TimeValidator.java
M forms/source/component/Time.cxx
M forms/source/xforms/convert.cxx
M forms/source/xforms/datatypes.cxx
M framework/source/jobs/jobdata.cxx
M odk/examples/DevelopersGuide/Forms/TimeValidator.java
M offapi/com/sun/star/util/Date.idl
M offapi/com/sun/star/util/DateTime.idl
M offapi/com/sun/star/util/DateTimeRange.idl
M offapi/com/sun/star/util/Duration.idl
M offapi/com/sun/star/util/Time.idl
M offapi/type_reference/types.rdb
M oox/source/core/xmlfilterbase.cxx
M oox/source/dump/dumperbase.cxx
M oox/source/ppt/comments.cxx
M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
M reportbuilder/java/org/libreoffice/report/SDBCReportData.java
M reportdesign/source/filter/xml/xmlControlProperty.cxx
M sax/qa/cppunit/test_converter.cxx
M sax/source/tools/converter.cxx
M sc/inc/chgtrack.hxx
M sc/source/core/data/dbdocutl.cxx
M sc/source/core/data/dpobject.cxx
M sc/source/core/tool/chgtrack.cxx
M sc/source/core/tool/chgviset.cxx
M sc/source/core/tool/interpr2.cxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/filter/oox/unitconverter.cxx
M sc/source/filter/xcl97/XclExpChangeTrack.cxx
M sc/source/filter/xcl97/XclImpChangeTrack.cxx
M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
M sc/source/filter/xml/XMLConverter.cxx
M sc/source/ui/docshell/docsh3.cxx
M sc/source/ui/miscdlgs/sharedocdlg.cxx
M sc/source/ui/unoobj/fielduno.cxx
M sc/source/ui/view/viewfun6.cxx
M scripting/source/pyprov/pythonscript.py
M sd/source/filter/eppt/eppt.cxx
M sd/source/filter/eppt/pptx-epptooxml.cxx
M sd/source/ui/annotations/annotationmanager.cxx
M sd/source/ui/dlg/animobjs.cxx
M sfx2/qa/complex/sfx2/DocumentProperties.java
M sfx2/source/appl/sfxpicklist.cxx
M sfx2/source/bastyp/frmhtmlw.cxx
M sfx2/source/bastyp/helper.cxx
M sfx2/source/dialog/dinfdlg.cxx
M sfx2/source/dialog/versdlg.cxx
M sfx2/source/doc/SfxDocumentMetaData.cxx
M sfx2/source/doc/objcont.cxx
M sfx2/source/doc/oleprops.cxx
M sfx2/source/view/viewprn.cxx
M svl/source/items/dateitem.cxx
M svl/source/misc/fstathelper.cxx
M svtools/source/contnr/DocumentInfoPreview.cxx
M svtools/source/contnr/contentenumeration.cxx
M svtools/source/misc/templatefoldercache.cxx
M svtools/source/svhtml/parhtml.cxx
M svtools/source/table/cellvalueconversion.cxx
M svx/source/fmcomp/gridcell.cxx
M sw/source/core/doc/doccomp.cxx
M sw/source/core/doc/docglbl.cxx
M sw/source/core/doc/docredln.cxx
M sw/source/core/fields/docufld.cxx
M sw/source/core/fields/flddat.cxx
M sw/source/core/unocore/swunohelper.cxx
M sw/source/core/unocore/unoredline.cxx
M sw/source/filter/ww8/wrtww8.cxx
M sw/source/filter/ww8/ww8par.cxx
M sw/source/filter/xml/XMLRedlineImportHelper.cxx
M tools/Library_tl.mk
M tools/inc/tools/datetime.hxx
M tools/inc/tools/time.hxx
M tools/source/datetime/datetime.cxx
M tools/source/datetime/ttime.cxx
M tools/source/inet/inetmsg.cxx
M tools/source/rc/rc.cxx
M ucb/source/sorter/sortresult.cxx
M ucb/source/ucp/cmis/cmis_content.cxx
M ucb/source/ucp/file/shell.cxx
M ucb/source/ucp/ftp/ftpdirp.cxx
M ucb/source/ucp/ftp/ftpdirp.hxx
M unotools/inc/unotools/datetime.hxx
M unotools/source/i18n/localedatawrapper.cxx
M unotools/source/misc/datetime.cxx
M unotools/source/ucbhelper/ucbhelper.cxx

[PATCH] move headers from solenv/inc/ to include/